Merge branch 'develop' into bug/ssh_focus

# Conflicts:
#	mRemoteV1/UI/Forms/frmMain.cs

.github/CONTRIBUTING.md

@@ -1,58 +1,24 @@
-# Welcome!
+**Hello, and welcome to the mRemoteNG project!**
 
-We are really glad you are interested in contributing to mRemoteNG!
+Open source software is best when shared with others. This also applies to the work that goes into the software. Your ideas and passion are what make this software great!
+There are many ways that you can help improve mRemoteNG, even if you don't know how to program:
 
-Open source software is best when shared with others. This also applies to the work that goes into the software. Your ideas and passion are what make this software great.
+- add documentation or "how-to" articles on the Wiki
+- answer support questions on the forum
+- add or improve a translation
+- submit a pull request for a bug or feature ticket
 
-
-### Ways you can contribute
-There are many ways that you can help improve mRemoteNG, even if you don't know how to program.
-
-For example, you might:
-- add documentation or "how-to" articles on the [Wiki](https://github.com/mRemoteNG/mRemoteNG/wiki)
-- answer support questions on the [forum](http://forum.mremoteng.org)
-- [add or improve a translation](https://github.com/mRemoteNG/mRemoteNG/wiki/How-to-Help-Translating-mRemoteNG)
-- submit a [pull request](https://github.com/mRemoteNG/mRemoteNG/pulls) for a [bug or feature ticket](https://github.com/mRemoteNG/mRemoteNG/issues)
-
-
-# Submitting GitHub Issues
 The GitHub Issue tracker is our preferred channel for bug reports and feature requests.
-- For questions or general discussion, please use [our public Gitter chat](https://gitter.im/mRemoteNG/PublicChat) or the [forum](http://forum.mremoteng.org).
-- If you find a security vulnerability, do **NOT** open an issue. Email support@mremoteng.org instead.
+For questions or general discussion, please use [our public Gitter chat](https://gitter.im/mRemoteNG/PublicChat) or the [forum](http://forum.mremoteng.org).
 
-### Bug reports
-A bug is any behavior that does not consistently produce the expected result.
+If you find a security vulnerability, do **NOT** open an issue. Email security@mremoteng.org instead.
 
-Guidelines for bug reports:
-1. Do not open bug reports for questions.
-1. Use the GitHub Issue search to make sure your bug hasn't already been reported.
-1. Include as much detailed information as possible. We've included a default template when opening an issue to make this easier.
+You'll find all information on our GitHub workflow in our [Wiki](https://github.com/mRemoteNG/mRemoteNG/wiki), or you can use these links:
 
-### Feature requests
-Feature requests are great! Take some time to compose a well thought out proposal. It's up to you to convince the project maintainers that your feature is a good idea. To ensure your request receives the consideration that it deserves, include as much detail as possible. For example:
-- What is the purpose of the new feature?
-- What situation led you to want this feature?
-- How does the application perform now and how would the new feature change this?
-- If applicable, consider including visual mock-ups to show us what you mean.
+- [Branches](https://github.com/mRemoteNG/mRemoteNG/wiki/Branches)
+- [Bug Repots](https://github.com/mRemoteNG/mRemoteNG/wiki/Bug-Reports)
+- [Feature Requests](https://github.com/mRemoteNG/mRemoteNG/wiki/Feature-Requests)
+- [Pull Requests](https://github.com/mRemoteNG/mRemoteNG/wiki/Pull-Requests)
 
-# Pull requests
-Good pull requests are a huge help! If you haven't already, please consider reading [GitHub's guide to contributing to open source](https://guides.github.com/activities/contributing-to-open-source/)
-
-Our requests when it comes to pull requests:
-- Be clear about what your PR seeks to do.
-- Keep your PR focused. It should be clear what code changed to achieve your stated goal.
-- Add or update tests when possible. Some of the code base is still very hard to effectively test. If you can, please try to create or update tests that relate to your PR.
-- Please talk with one of the project maintainers before starting work on large pull requests. Otherwise, you run the risk of putting a lot of time into a feature or refactor that gets denied.
-- If you have access to Static Code Analysis tools (like ReSharper), please don't analyze/fix everything in one giant PR. As great as these tools are, they can sometimes cause unintended problems.
-
-# Code Style
-- Please make use of simple types and var where possible
-- Prefer "using" over .Dispose()
-- Avoid nesting "using"
-
-# Your first contributions
 Want to help but don't know where to start? Check out the issues that we've labeled with [`Help Wanted`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3A%22Help+Wanted%22) or [`ready`](https://github.com/mRemoteNG/mRemoteNG/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3A%22ready%22). These will vary in difficulty, but should be possible for new contributors.
-
-Want to help but don't know C#? Check out the issues that we've labeled with [`Documentation`](https://github.com/mRemoteNG/mRemoteNG/labels/Documentation).
-
-Sorry, we currently do not have any tags for truly beginner-friendly issues :(
+Even if you don't know C# you can heck out the issues that we've labeled with [`Documentation`](https://github.com/mRemoteNG/mRemoteNG/labels/Documentation).

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,11 +19,14 @@
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Updated translation
 
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] I have read the **CONTRIBUTING** document.
 - [ ] My code follows the code style of this project.
+- [ ] This pull request does not target the master branch.
+- [ ] I have updated the changelog file accordingly.
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation accordingly.
-- [ ] I have read the **CONTRIBUTING** document.

.gitignore

@@ -285,4 +285,4 @@ InstallerProjects/Installer/Resources/License.rtf
 
 # gh-pages info
 runlocal.bat
-/_site
+/_site

CHANGELOG.md

@@ -3,8 +3,35 @@ 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).
 
+## [Unreleased]
+### Added
+- #1512: Added option to close panel from right click menu
+- #1434: Revised sort button in connection tree to be able to sort in both orders
+- #1400: Added file download handling to HTTP(S) connections using Gecko
+- #1385: Added option to start mRemoteNG minimized
+- #826: Allow selecting RDP version to use when connecting
+### Changed
+- #1468: Improved mRemoteNG startup time
+- #1443: Chinese (simplified) translation improvements
+- #1437: Norwegian translation improvements
+- #1239: Increased default key derivation function (KDF) iterations from 1000 to 10000
+- #718: Moved port property from 'protocol' to 'connection' section
+- Moved most RDP enums outside of the RDP protocol class. Scripts which reference these enums will need to be updated.
+### Fixed
+- #1447: Exception occurs when resetting layout
+- #1439: Searching in hosts tree loses first keystroke
+- #1428: Fixed a rare error when checking for FIPS
+- #1426: Tabbing is reversed in config window
+- #1425: Connections didn't always respect the panel property
+- #841: Allow for sorting in port scan results
+- #617: Added missing description for password protect field in root node
+- #553: Browser language not set when using Gecko rendering engine
+- #323: Wallpaper always shows in RDP connections, even when turned off
+
+
 ## [1.77.0] - 2019-04-29
 ### Added
+- #1422: Added possibility to connect to virtual machines running on Hyper-V
 - #1414: Add "Remote Audio Capture" option for RDP
 - #1336: Added ability to run External tools on folders
 - #1320: Added ability to favorite items in the connection tree
@@ -30,7 +57,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - #416: Added ability to Enable/Disable Clipboard Sharing for RDP connections
 - #321: Added support for displaying on HiDPI screens
 ### Changed
+- #1430: Revised options dialog to prevent components from overlapping in some translations (e.g. russian)
 - #1389: Connection config window refactoring. Default connection info buttons now always available.
+- #1384: Revised help files and switched to sphinx as a documentation system
 - #1223: Open External Links in Default Web Browser
 - #1129: Spanish translation improvements
 - #1072: Russian translation improvements

InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs

@@ -12,7 +12,7 @@
         <File Id="LicenseFile" Name="License.txt" Source="$(var.SolutionDir)COPYING.TXT" KeyPath="yes" />
       </Component>
       <Component Id="C.Readme" Guid="*">
-        <File Id="ReadmeFile" Name="Readme.txt" Source="$(var.SolutionDir)README.TXT" KeyPath="yes" />
+        <File Id="ReadmeFile" Name="Readme.txt" Source="$(var.SolutionDir)README.md" KeyPath="yes" />
       </Component>
       <Component Id="C.TileManifest" Guid="*">
         <File Id="TileManifest" Name="mRemoteNG.VisualElementsManifest.xml" Source="$(var.SolutionDir)mRemoteV1\bin\Release\mRemoteNG.VisualElementsManifest.xml" KeyPath="yes" />

InstallerProjects/Installer/Installer.wixproj

@@ -44,7 +44,6 @@
     <Content Include="Resources\AppIcon.ico" />
     <Content Include="Resources\Installer_Header.png" />
     <Content Include="Resources\Installer_Side.png" />
-    <Content Include="Resources\License.rtf" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="CustomActions" />

InstallerProjects/Installer/Resources/License.rtf

@@ -1,329 +1,82 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f4\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Helvetica;}
-{\f5\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070409020205020404}Courier;}{\f5\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070409020205020404}Courier;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
-{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f80\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;}{\f81\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}
-{\f83\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f84\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f85\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f86\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}
-{\f87\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f88\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}
-{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}
-{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
-{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
-{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
-\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 
-\ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused 
-Normal Table;}}{\*\rsidtbl \rsid472762\rsid14623029}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator Faryan Rezagholi}{\creatim\yr2019\mo4\dy25\hr3\min56}
-{\revtim\yr2019\mo4\dy25\hr3\min57}{\version2}{\edmins1}{\nofpages5}{\nofwords2221}{\nofchars12664}{\nofcharsws14856}{\vern97}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
-\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
-\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701
-\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot14623029 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2
-\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6
-\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang 
-{\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {
-\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5         GNU GENERAL PUBLIC LICENSE\line            Version 2, June 1991
-\par }{\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-\par }{\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5             Preamble
-\par }{\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all it
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4 
- users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License ins
-\hich\af4\dbch\af31505\loch\f4 t\hich\af4\dbch\af31505\loch\f4 ead.) You can apply it to your programs, too.
-\par \hich\af4\dbch\af31505\loch\f4 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this
-\hich\af4\dbch\af31505\loch\f4  service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-\par \hich\af4\dbch\af31505\loch\f4 To protect your rights, we need to make restrictions tha\hich\af4\dbch\af31505\loch\f4 
-t forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-\par \hich\af4\dbch\af31505\loch\f4 For example, if you distribute copies of such a \hich\af4\dbch\af31505\loch\f4 
-program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-\par \hich\af4\dbch\af31505\loch\f4 We protect your rights wit\hich\af4\dbch\af31505\loch\f4 h two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-\par \hich\af4\dbch\af31505\loch\f4 Also, for each author's protection and ours, we want to make certain that everyone understands that the\hich\af4\dbch\af31505\loch\f4 
-re is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors
-\hich\af4\dbch\af31505\loch\f4 '\hich\af4\dbch\af31505\loch\f4  reputations.
-\par \hich\af4\dbch\af31505\loch\f4 
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we 
-\hich\af4\dbch\af31505\loch\f4 have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-\par \hich\af4\dbch\af31505\loch\f4 The precise terms and conditions for copying, distribution and modification follow.
-\par }{\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5         GNU GENERAL PUBLIC LICENSE
-\par }{\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 TERMS AND CONDITIONS FOR COPYING, DIS\hich\af4\dbch\af31505\loch\f4 TRIBUTION AND MODIFICATION
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 0.\tab \hich\af4\dbch\af31505\loch\f4 
-This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such pro
-\hich\af4\dbch\af31505\loch\f4 
-gram or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another lan
-\hich\af4\dbch\af31505\loch\f4 g\hich\af4\dbch\af31505\loch\f4 uage. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The a\hich\af4\dbch\af31505\loch\f4 
-ct of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program 
-\hich\af4\dbch\af31505\loch\f4 d\hich\af4\dbch\af31505\loch\f4 oes.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 1.\tab 
-You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intac
-\hich\af4\dbch\af31505\loch\f4 t all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 You may charge a fee for the physical act of transferring a copy, and you may at yo
-\hich\af4\dbch\af31505\loch\f4 ur option offer warranty protection in exchange for a fee.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 2.\tab 
-You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 \hich\af4\dbch\af31505\loch\f4 
-above, provided that you also meet all of these conditions:
-\par }\pard \ltrpar\ql \fi-360\li720\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 a)\tab 
-You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-\par \hich\af4\dbch\af31505\loch\f4 b)\tab You must cause any work that you distribute or publish, that in wh\hich\af4\dbch\af31505\loch\f4 
-ole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-\par \hich\af4\dbch\af31505\loch\f4 c)\tab If the modified program normally reads commands interactively when run, you must cau\hich\af4\dbch\af31505\loch\f4 
-se it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that user
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4 
- may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not require
-\hich\af4\dbch\af31505\loch\f4 d\hich\af4\dbch\af31505\loch\f4  to print an announcement.)
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, 
-\hich\af4\dbch\af31505\loch\f4 
-and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License
-,\hich\af4\dbch\af31505\loch\f4  whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-\par \hich\af4\dbch\af31505\loch\f4 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the in\hich\af4\dbch\af31505\loch\f4 
-tent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-\par \hich\af4\dbch\af31505\loch\f4 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a\hich\af4\dbch\af31505\loch\f4 
- storage or distribution medium does not bring the other work under the scope of this License.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 3.\tab 
-You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sect\hich\af4\dbch\af31505\loch\f4 ions 1 and 2 above provided that you also do one of the following:
-\par }\pard \ltrpar\ql \fi-360\li720\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 a)\tab 
-Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software i\hich\af4\dbch\af31505\loch\f4 nterchange; or,
-\par \hich\af4\dbch\af31505\loch\f4 b)\tab 
-Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source co
-\hich\af4\dbch\af31505\loch\f4 de, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-\par \hich\af4\dbch\af31505\loch\f4 c)\tab Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allow\hich\af4\dbch\af31505\loch\f4 
-ed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-The source code for a work means the preferred form of the work for making modifications t\hich\af4\dbch\af31505\loch\f4 
-o it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a specia
-\hich\af4\dbch\af31505\loch\f4 l\hich\af4\dbch\af31505\loch\f4 
- exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that comp
-\hich\af4\dbch\af31505\loch\f4 o\hich\af4\dbch\af31505\loch\f4 nent itself accompanies the executable.
-\par \hich\af4\dbch\af31505\loch\f4 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the sourc
-\hich\af4\dbch\af31505\loch\f4 e code, even though third parties are not compelled to copy the source along with the object code.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 4.\tab 
-You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, su\hich\af4\dbch\af31505\loch\f4 
-blicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties 
-\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 emain in full compliance.
-\par \hich\af4\dbch\af31505\loch\f4 5.\tab 
-You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do n
-\hich\af4\dbch\af31505\loch\f4 
-ot accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or w
-\hich\af4\dbch\af31505\loch\f4 o\hich\af4\dbch\af31505\loch\f4 rks based on it.
-\par \hich\af4\dbch\af31505\loch\f4 6.\tab 
-Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You ma
-\hich\af4\dbch\af31505\loch\f4 y not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-\par \hich\af4\dbch\af31505\loch\f4 7.\tab If, as a consequence of a court judgment or allegation of patent infringem\hich\af4\dbch\af31505\loch\f4 
-ent or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you c
-\hich\af4\dbch\af31505\loch\f4 a\hich\af4\dbch\af31505\loch\f4 
-nnot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redist
-\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 
-ibution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 If any portion of this section is held in\hich\af4\dbch\af31505\loch\f4 
-valid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-\par \hich\af4\dbch\af31505\loch\f4 It is not the purpose of this section to induce you to infringe any patents or\hich\af4\dbch\af31505\loch\f4 
- other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generou
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4 
- contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a license
-\hich\af4\dbch\af31505\loch\f4 e\hich\af4\dbch\af31505\loch\f4  cannot impose that choice.
-\par \hich\af4\dbch\af31505\loch\f4 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 8.\tab 
-If the distribution and/or use of the Program is restricted in certain countries either by patents or by copy\hich\af4\dbch\af31505\loch\f4 
-righted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.
-\hich\af4\dbch\af31505\loch\f4  \hich\af4\dbch\af31505\loch\f4 In such case, this License incorporates the limitation as if written in the body of this License.
-\par \hich\af4\dbch\af31505\loch\f4 9.\tab The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in \hich\af4\dbch\af31505\loch\f4 
-spirit to the present version, but may differ in detail to address new problems or concerns.
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you h\hich\af4\dbch\af31505\loch\f4 
-ave the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by t
-\hich\af4\dbch\af31505\loch\f4 h\hich\af4\dbch\af31505\loch\f4 e Free Software Foundation.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 10.\tab 
-If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundati\hich\af4\dbch\af31505\loch\f4 
-on, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software general
-\hich\af4\dbch\af31505\loch\f4 l\hich\af4\dbch\af31505\loch\f4 y.
-\par }\pard \ltrpar\ql \li360\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5         NO WARRANTY
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 11.\tab 
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGR
-\hich\af4\dbch\af31505\loch\f4 
-AM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH Y
-\hich\af4\dbch\af31505\loch\f4 O\hich\af4\dbch\af31505\loch\f4 U. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-\par \hich\af4\dbch\af31505\loch\f4 12.\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDIS\hich\af4\dbch\af31505\loch\f4 
-TRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDE
-\hich\af4\dbch\af31505\loch\f4 R\hich\af4\dbch\af31505\loch\f4 
-ED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-\par }\pard \ltrpar\ql \li360\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin360\itap0\pararsid14623029 {\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5      END OF TERMS AND CONDITIONS\line \line }{\rtlch\fcs1 
-\af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 
-\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
-9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
-5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
-b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
-0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
-a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
-c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
-0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
-a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
-4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
-4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210007b740aaca0600008f1a0000160000007468656d652f7468656d652f
-7468656d65312e786d6cec595b8bdb46147e2ff43f08bd3bbe49be2cf1065bb69336bb49889d943cceda636bb2238dd18c776342a0244f7d2914d2d28706fad6
-87521a68a0a12ffd310b1bdaf447f4cc489667ec71f6420aa1640d8b34face996fce39face48ba7aed51449d239c70c2e2965bbe52721d1c8fd898c4d3967b6f
-d82f345c870b148f1165316eb90bccdd6bbb9f7e7215ed881047d801fb98efa0961b0a31db2916f9088611bfc26638866b13964448c069322d8e13740c7e235a
-ac944ab5628448ec3a318ac0ededc9848cb033942edddda5f31e85d358703930a2c940bac68685c28e0fcb12c1173ca089738468cb8579c6ec78881f09d7a188
-0bb8d0724beacf2dee5e2da29dcc888a2db69a5d5ffd657699c1f8b0a2e64ca607f9a49ee77bb576ee5f01a8d8c4f5eabd5aaf96fb5300341ac14a532eba4fbf
-d3ec74fd0cab81d2438bef6ebd5b2d1b78cd7f758373db973f03af40a97f6f03dfef07104503af4029dedfc07b5ebd1278065e81527c6d035f2fb5bb5eddc02b
-5048497cb8812ef9b56ab05c6d0e99307ac30a6ffa5ebf5ec99caf50500d7975c929262c16db6a2d420f59d2078004522448ec88c50c4fd008aa3840941c24c4
-d923d3100a6f8662c661b85429f54b55f82f7f9e3a5211413b1869d6921730e11b43928fc34709998996fb39787535c8e9ebd7274f5f9d3cfdfde4d9b393a7bf
-66732b5786dd0d144f75bbb73f7df3cf8b2f9dbf7ffbf1edf36fd3a9d7f15cc7bff9e5ab377ffcf92ef7b0e255284ebf7bf9e6d5cbd3efbffeebe7e716efed04
-1de8f0218930776ee163e72e8b608116fef820b998c5304444b768c7538e622467b1f8ef89d040df5a208a2cb80e36e3783f01a9b101afcf1f1a8407613217c4
-e2f1661819c07dc6688725d628dc947369611ecee3a97df264aee3ee2274649b3b40b191e5de7c061a4b6c2e83101b34ef50140b34c531168ebcc60e31b6acee
-0121465cf7c928619c4d84f380381d44ac21199203a39a56463748047959d80842be8dd8ecdf773a8cda56ddc5472612ee0d442de487981a61bc8ee602453697
-4314513de07b48843692834532d2713d2e20d3534c99d31b63ce6d36b71358af96f49b2033f6b4efd345642213410e6d3ef710633ab2cb0e831045331b7640e2
-50c77ec60fa144917387091b7c9f9977883c873ca0786bbaef136ca4fb6c35b8070aab535a1588bc324f2cb9bc8e9951bf83059d20aca4061a80a1eb1189cf14
-f93579f7ff3b7907113dfde1856545ef47d2ed8e8d7c5c50ccdb09b1de4d37d6247c1b6e5db803968cc987afdb5d348fef60b855369bd747d9fe28dbeeff5eb6
-b7ddcfef5fac57fa0cd22db7ade9765d6ddea3ad7bf709a174201614ef71b57de7d095c67d189476eab915e7cf72b3100ee59d0c1318b86982948d9330f10511
-e1204433d8e3975de964ca33d753eecc1887adbf1ab6fa96783a8ff6d9387d642d97e5e3692a1e1c89d578c9cfc7e17143a4e85a7df51896bb576ca7ea717949
-40da5e8484369949a26a21515f0eca20a98773089a85845ad97b61d1b4b06848f7cb546db0006a795660dbe4c066abe5fa1e9880113c55218ac7324f69aa97d9
-55c97c9f99de164ca302600fb1ac8055a69b92ebd6e5c9d5a5a5768e4c1b24b4723349a8c8a81ec64334c65975cad1f3d0b868ae9bab941af46428d47c505a2b
-1af5c6bb585c36d760b7ae0d34d69582c6ce71cbad557d2899119ab5dc093cfac3613483dae172bb8be814de9f8d4492def097519659c24517f1300db8129d54
-0d222270e25012b55cb9fc3c0d34561aa2b8952b20081f2cb926c8ca87460e926e26194f267824f4b46b2332d2e929287caa15d6abcafcf26069c9e690ee4138
-3e760ee83cb98ba0c4fc7a5906704c38bc012aa7d11c1378a5990bd9aafed61a5326bbfa3b455543e938a2b310651d4517f314aea43ca7a3cef2186867d99a21
-a05a48b2467830950d560faad14df3ae9172d8da75cf369291d34473d5330d55915dd3ae62c60ccb36b016cbcb35798dd532c4a0697a874fa57b5d729b4bad5b
-db27e45d02029ec7cfd275cfd110346aabc90c6a92f1a60c4bcdce46cddeb15ce019d4ced32434d5af2dddaec52def11d6e960f0529d1fecd6ab168626cb7da5
-8ab4faf6a17f9e60070f413cbaf022784e0557a9848f0f09820dd140ed4952d9805be491c86e0d3872e60969b98f4b7edb0b2a7e502835fc5ec1ab7aa542c36f
-570b6ddfaf967b7eb9d4ed549e4063116154f6d3ef2e7d780d4517d9d71735bef105265abe69bb32625191a92f2c45455c7d812957b67f81710888cee35aa5df
-ac363bb542b3daee17bc6ea7516806b54ea15b0beadd7e37f01bcdfe13d7395260af5d0dbc5aaf51a89583a0e0d54a927ea359a87b954adbabb71b3daffd24db
-c6c0ca53f9c86201e155bc76ff050000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72
-656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c08
-2e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd0
-8a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa
-4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000000000005b436f
-6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100005f72
-656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210007b740aaca0600008f1a00001600000000000000000000000000d60200
-007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000000000000000000000
-00d40900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000cf0a00000000}
-{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
-617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
-6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
-656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
-{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
-\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;
-\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;
-\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;
-\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;
-\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;
-\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
-\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;
-\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
-\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
-\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
-\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
-\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
-\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;
-\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
-\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;
-\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;
-\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
-\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
-\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
-\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
-\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
-\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
-\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
-\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
-\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
-\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000
-4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
-d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000030c4
-1a380afbd401feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1         GNU GENERAL PUBLIC LICENSE\line
+           Version 2, June 1991\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1             Preamble\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The precise terms and conditions for copying, distribution and modification follow.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1         GNU GENERAL PUBLIC LICENSE\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 0.\tx360\tab This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 1.\tx360\tab You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 2.\tx360\tab You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 a)\tx360\tab You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 b)\tx360\tab You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 c)\tx360\tab If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\sa180\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 3.\tx360\tab You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 a)\tx360\tab Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 b)\tx360\tab Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 c)\tx360\tab Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\sa180\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 4.\tx360\tab You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 5.\tx360\tab You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 6.\tx360\tab Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 7.\tx360\tab If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 8.\tx360\tab If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 9.\tx360\tab The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 10.\tx360\tab If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 \f1         NO WARRANTY\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 11.\tx360\tab BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 12.\tx360\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 \f1      END OF TERMS AND CONDITIONS\line
+\line
+How to Apply These Terms to Your New Programs\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 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.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 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.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 <one line to give the program's name and a brief idea of what it does.>\line
+Copyright (C) <year>  <name of author>\line
+\line
+This program is free software; you can redistribute it and/or modify\line
+it under the terms of the GNU General Public License as published by\line
+the Free Software Foundation; either version 2 of the License, or\line
+(at your option) any later version.\line
+\line
+This program is distributed in the hope that it will be useful,\line
+but WITHOUT ANY WARRANTY; without even the implied warranty of\line
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\line
+GNU General Public License for more details.\line
+\line
+You should have received a copy of the GNU General Public License along\line
+with this program; if not, write to the Free Software Foundation, Inc.,\line
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Gnomovision version 69, Copyright (C) year name of author\line
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\line
+This is free software, and you are welcome to redistribute it\line
+under certain conditions; type `show c' for details.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands {\f1 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 {\f1 show w' and}show c'; they could even be mouse-clicks or menu items--whatever suits your program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 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:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 , 1 April 1989 Ty Coon, President of Vice\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 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.\par}
+}

InstallerProjects/Installer/mRemoteNGV1.wxs

@@ -32,8 +32,6 @@
 
 
     <InstallUISequence>
-      <Custom Action="CheckIfRdpDtlsUpdateInstalled" After="AppSearch">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
-      <Custom Action="CheckIfMinimumRdpInstalled" After="CheckIfRdpDtlsUpdateInstalled">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
       <LaunchConditions After="SetWIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
       <Custom Action="CheckIfLegacyVersionInstalled" After="LaunchConditions" />
       <Custom Action="UninstallLegacyVersion" After="CheckIfLegacyVersionInstalled">(NOT Installed) AND (LEGACYVERSIONINSTALLED = 1)</Custom>

README.MD

@@ -7,6 +7,7 @@
 [![Github Releases](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/total.svg?style=flat-square)](https://github.com/mRemoteNG/mRemoteNG/releases/)
 
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
+[![Documentation Status](https://readthedocs.org/projects/mremoteng/badge/?version=latest)](https://mremoteng.readthedocs.io/en/latest/?badge=latest)
 
 | Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
@@ -37,23 +38,20 @@ For a detailed feature list and general usage support, refer to the [User Manual
 
 ## Installation
 
-Before installing make sure you have all the required [prerequisites](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites).
+mRemoteNG is supported on Windows 7 or later. Before installing make sure you fullfill all the [minimum requirements](https://mremoteng.readthedocs.io/en/latest/installation/minimum_requirements.html).
 
 mRemoteNG is available as a redistributable msi package, and can be downloaded from the following locations:
 * [GitHub](https://github.com/mRemoteNG/mRemoteNG/releases)
 * [Project Website](https://mremoteng.org/download)
 
-mRemoteNG is supported on Windows 7 or later.
-Windows 7 and Windows Server 2008 installations must ensure the [listed required updates](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites#full-list-of-required-windows-updates-for-windows-7--server-2008-clients) are installed and active.
-
 ## Contribute
 
 If you find mRemoteNG useful and would like to contribute, it would be greatly appreciated. When you contribute, you make it possible for the team to cover the costs of producing mRemoteNG.
 
 ### Submit Code
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/Development) on how to configure your development environment and submit a pull request.
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to configure your development environment and submit a pull request.
 
 ### Translate
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/How%20to%20Help%20Translating%20mRemoteNG) on how to help make mRemoteNG a polyglot
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to help make mRemoteNG a polyglot
 
 [![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)

Readme.txt

@@ -1,25 +0,0 @@
-mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
-
-It allows you to store all your remote connections in a simple yet powerful interface.
-
-Currently these protocols are supported:
-
- * RDP (Remote Desktop)
- * VNC (Virtual Network Computing)
- * ICA (Independent Computing Architecture)
- * SSH (Secure Shell)
- * Telnet (TELecommunication NETwork)
- * HTTP/S (Hypertext Transfer Protocol)
- * Rlogin (Rlogin)
- * RAW
-
-mRemoteNG can be installed on Windows 7 or later.
-
-Windows 7 systems require RDP version 8:   
-https://support.microsoft.com/en-us/kb/2592687   
-OR   
-https://support.microsoft.com/en-us/kb/2923545   
-
-Windows 8+ support RDP version 8+ out of the box.
-
-RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).

Tools/copy_tiles.ps1

@@ -12,8 +12,6 @@ Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 Write-Output "Copying TILES folder to output"
 
 $sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteV1\Resources\Tiles' ) 
-$DestinationDir = $TargetDir 
-
-robocopy $sourceFiles $DestinationDir *.*
+robocopy $sourceFiles $TargetDir *.*
 
 Write-Output ""

Tools/create_upg_chk_files.ps1

@@ -30,7 +30,7 @@ function New-MsiUpdateFileContent {
     $fileContents = `
 "Version: $version
 dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($MsiFile.Name)
-clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.md
 CertificateThumbprint: $certThumbprint
 Checksum: $hash"
     Write-Output $fileContents

Tools/postbuild_mremotev1.ps1

@@ -42,7 +42,7 @@ Format-Table -AutoSize -Wrap -InputObject @{
 & "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
-& "$PSScriptRoot\move_help_files.ps1" -TargetDir $TargetDir
+& "$PSScriptRoot\sphinx_docs.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$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

Tools/sphinx_docs.ps1

@@ -1,23 +1,23 @@
-param (
-    [string]
+param (	
+	[string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+	
+	[string]
     [Parameter(Mandatory=$true)]
     $TargetDir
 )
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 
+Write-Output "Building HTML-Documentation with Sphinx"
+
 $path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help"
-
-Write-Output "Moving Help files to correct directory"
-
+$path_SphinxSourceDir = Join-Path -Path $SolutionDir -ChildPath "mremoteV1\Documentation"
 # Remove stale Help files, if they exist
 if (Test-Path -Path $path_HelpFilesDir) {
     Remove-Item -Path $path_HelpFilesDir -Recurse -Force
 }
-
-# Move Help files
-Move-Item -Path (Join-Path -Path $TargetDir -ChildPath "Resources\Help") -Destination $path_HelpFilesDir -Force
-Start-Sleep -Seconds 2
-Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "Resources") -Recurse -Force
+sphinx-build $path_SphinxSourceDir $path_HelpFilesDir
 
 Write-Output ""

Tools/tidy_files_for_release.ps1

@@ -13,7 +13,12 @@ Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 # Remove unnecessary files from Release versions
 if ($ConfigurationName -match "Release") {
     Write-Output "Removing unnecessary files from Release versions"
-    Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
+
+    $test = Join-Path -Path $TargetDir -ChildPath "app.publish"
+    if (Test-Path  $test -PathType Container) {
+        Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
+    }
+
     $filesToDelete = Get-ChildItem -Path $TargetDir -Recurse -Include @(
         "*.publish",
         "*.xml",

appveyor.yml

@@ -1,46 +0,0 @@
-version: 1.76.{build}
-pull_requests:
-  do_not_increment_build_number: true
-skip_tags: true
-skip_branch_with_pr: true
-image: Visual Studio 2017
-configuration:
-- Release
-- Release Portable
-- Release Installer
-platform: x86
-shallow_clone: true
-clone_depth: 1
-install:
-- ps: >-
-    date
-
-    mRemoteV1\Resources\CitrixReceiver.exe ENABLE_SSON="No" /silent /noreboot /EnableCEIP=false /AutoUpdateCheck=disabled /EnableTracing=false | out-null
-
-    date
-before_build:
-- cmd: >-
-    echo %TIME%
-
-    nuget restore
-
-    echo %TIME%
-build:
-  project: mRemoteV1.sln
-  parallel: true
-  verbosity: normal
-after_build:
-- ps: "if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {\n    Write-Output \"NOT running via Appveyor - Exiting\"\n    Exit\n}\n\n$appvDir = $Env:APPVEYOR_BUILD_FOLDER\n\nWrite-Output \"Appveyor Build Dir: '$($appvDir)'\"\n$ConfigurationName = $Env:CONFIGURATION.Trim()\nWrite-Output \"Config Name (tirmmed): '$($ConfigurationName)'\"\n\n\n$SIGCHECK=\"Tools\\exes\\sigcheck.exe\"\n$SEVENZIP=\"Tools\\7zip\\7za.exe\"\n\nif ($ConfigurationName -eq \"Release Portable\") {\n    Write-Output \"Packaging Release Portable ZIP\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    $PortableZip=\"Release\\mRemoteNG-Portable-$($version).zip\"\n\n    Remove-Item -Recurse \"mRemoteV1\\bin\\package\" -ErrorAction SilentlyContinue | Out-Null\n    New-Item \"mRemoteV1\\bin\\package\" -ItemType  \"directory\" | Out-Null\n    \n    Copy-Item \"mRemoteV1\\Resources\\PuTTYNG.exe\" -Destination \"mRemoteV1\\bin\\package\"\n\n    Copy-Item \"mRemoteV1\\bin\\$ConfigurationName\\*\" -Destination \"mRemoteV1\\bin\\package\" -Recurse -Force -Exclude *.pdb\n    Copy-Item \"*.txt\" -Destination \"mRemoteV1\\bin\\package\"\n\n    Write-Output \"Creating portable ZIP file $($PortableZip)\"\n    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue\n    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip \".\\mRemoteV1\\bin\\package\\*.*\"\n}\nelse {\n    Write-Output \"We will not zip anything - this isnt a portable release build.\"\n}\n\nWrite-Output \"\"\nWrite-Output \"\"\n\nif ($ConfigurationName -match \"Release\" -And $ConfigurationName -ne \"Release Installer\") {\n    Write-Output \"Packaging debug symbols\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    if ($ConfigurationName -match \"Portable\") {\n        $zipFilePrefix = \"mRemoteNG-Portable-symbols\"\n    } else {\n        $zipFilePrefix = \"mRemoteNG-symbols\"\n    }\n\n    $outputZipPath=\"Release\\$zipFilePrefix-$($version).zip\"\n\n    Write-Output \"Creating debug symbols ZIP file $($outputZipPath)\"\n    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue\n    $SymPath = (Join-Path -Path mRemoteV1\\bin\\$($ConfigurationName) -ChildPath \"*.pdb\")\n    if(Test-Path \"$SymPath\") {\n    	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath \"$SymPath\"\n    } else {\n    	Write-Output \"No Debugging Symbols Found...\"\n    }\n    	\n}\nelse {\n    Write-Output \"We will not package debug symbols for this configuration $($ConfigurationName)\"\n}\n\nWrite-Output \"\""
-test:
-  assemblies:
-    only:
-    - mRemoteNGTests\bin\$(configuration)\mRemoteNGTests.dll
-artifacts:
-- path: Release\*.msi
-  name: mRemoteNG-installer.msi
-- path: Release\mRemoteNG-Portable-1.*.zip
-  name: mRemoteNG-portable.zip
-- path: Release\mRemoteNG-Portable-symbols*.zip
-  name: mRemoteNG-Portable-symbols.zip
-- path: Release\mRemoteNG-symbols*.zip
-  name: mRemoteNG-symbols.zip

mRemoteNG.Specs/App.config

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
-  </configSections>
+  
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -13,14 +11,26 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
   </startup>
-  <specFlow>
-    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
-    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
-    <unitTestProvider name="NUnit" />
-  </specFlow>
+  
 </configuration>

mRemoteNG.Specs/Features/CredentialRepository.feature.cs

@@ -59,7 +59,7 @@ namespace mRemoteNG.Specs.Features
         
         public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
-            testRunner.OnScenarioStart(scenarioInfo);
+            testRunner.OnScenarioStart();
         }
         
         public virtual void ScenarioCleanup()
@@ -73,7 +73,7 @@ namespace mRemoteNG.Specs.Features
         [Ignore("Cred Repo not implmented currently.")]
         public virtual void LoadCredentialRepository()
         {
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Load credential repository", new string[] {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Load credential repository", "", new string[] {
                         "credentials"});
 #line 7
 this.ScenarioSetup(scenarioInfo);
@@ -94,7 +94,7 @@ this.ScenarioSetup(scenarioInfo);
         [Ignore("Cred Repo not implmented currently.")]
         public virtual void AddCredentialRecord()
         {
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add credential record", ((string[])(null)));
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add credential record", "", ((string[])(null)));
 #line 13
 this.ScenarioSetup(scenarioInfo);
 #line 14
@@ -116,7 +116,7 @@ this.ScenarioSetup(scenarioInfo);
         [Ignore("Cred Repo not implmented currently.")]
         public virtual void UnloadCredentialRepository()
         {
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Unload credential repository", ((string[])(null)));
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Unload credential repository", "", ((string[])(null)));
 #line 20
 this.ScenarioSetup(scenarioInfo);
 #line 21

mRemoteNG.Specs/Features/CredentialRepositoryList.feature.cs

@@ -60,7 +60,7 @@ namespace mRemoteNG.Specs.Features
         
         public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
-            testRunner.OnScenarioStart(scenarioInfo);
+            testRunner.OnScenarioStart();
         }
         
         public virtual void ScenarioCleanup()
@@ -74,7 +74,7 @@ namespace mRemoteNG.Specs.Features
         [Ignore("Cred Repo not implmented currently.")]
         public virtual void AddANewCredentialRepository()
         {
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add a new credential repository", new string[] {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add a new credential repository", "", new string[] {
                         "credentials"});
 #line 7
 this.ScenarioSetup(scenarioInfo);
@@ -95,7 +95,7 @@ this.ScenarioSetup(scenarioInfo);
         [Ignore("Cred Repo not implmented currently.")]
         public virtual void RemoveACredentialRepository()
         {
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Remove a credential repository", ((string[])(null)));
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Remove a credential repository", "", ((string[])(null)));
 #line 13
 this.ScenarioSetup(scenarioInfo);
 #line 14

mRemoteNG.Specs/mRemoteNG.Specs.csproj

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <Import Project="..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props" Condition="Exists('..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props')" />
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,7 +18,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -24,8 +26,9 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -34,22 +37,43 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="BoDi, Version=1.4.1.0, Culture=neutral, PublicKeyToken=ff7cd5ea2744b496, processorArchitecture=MSIL">
+      <HintPath>..\packages\BoDi.1.4.1\lib\net45\BoDi.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="Gherkin, Version=6.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
+      <HintPath>..\packages\Gherkin.6.0.0\lib\net45\Gherkin.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="TechTalk.SpecFlow, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.2.2.1\lib\net45\TechTalk.SpecFlow.dll</HintPath>
+    <Reference Include="TechTalk.SpecFlow, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
+      <HintPath>..\packages\SpecFlow.3.0.224\lib\net45\TechTalk.SpecFlow.dll</HintPath>
+    </Reference>
+    <Reference Include="TechTalk.SpecFlow.NUnit.SpecFlowPlugin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
+      <HintPath>..\packages\SpecFlow.NUnit.3.0.224\lib\net45\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.dll</HintPath>
+    </Reference>
+    <Reference Include="Utf8Json, Version=1.3.7.0, Culture=neutral, PublicKeyToken=8a73d3ba7e392e27, processorArchitecture=MSIL">
+      <HintPath>..\packages\Utf8Json.1.3.7\lib\net45\Utf8Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -96,8 +120,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets'))" />
   </Target>
+  <Import Project="..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets" Condition="Exists('..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

mRemoteNG.Specs/packages.config

@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
-  <package id="NUnit" version="3.11.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.9.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net46" />
+  <package id="BoDi" version="1.4.1" targetFramework="net46" />
+  <package id="Gherkin" version="6.0.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net46" />
+  <package id="NUnit" version="3.12.0" targetFramework="net46" />
+  <package id="NUnit.Console" version="3.10.0" targetFramework="net46" />
+  <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.5" targetFramework="net46" />
+  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.6" targetFramework="net46" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
-  <package id="NUnit.Runners" version="3.9.0" targetFramework="net46" />
-  <package id="SpecFlow" version="2.2.1" targetFramework="net46" />
-  <package id="SpecFlow.NUnit" version="2.2.1" targetFramework="net46" />
-  <package id="SpecFlow.NUnit.Runners" version="2.2.1" targetFramework="net46" />
+  <package id="NUnit.Runners" version="3.10.0" targetFramework="net46" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net46" />
+  <package id="SpecFlow" version="3.0.224" targetFramework="net46" />
+  <package id="SpecFlow.NUnit" version="3.0.224" targetFramework="net46" />
+  <package id="SpecFlow.NUnit.Runners" version="3.0.224" targetFramework="net46" />
+  <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net46" />
+  <package id="Utf8Json" version="1.3.7" targetFramework="net46" />
 </packages>

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs

@@ -83,7 +83,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 PostExtApp = "SomePostExtApp",
                 MacAddress = "SomeMacAddress",
                 UserField = "SomeUserField",
-                Favorite = true,
+                VmId = "SomeVmId",
                 ExtApp = "SomeExtApp",
                 VNCProxyUsername = "SomeVNCProxyUsername",
                 VNCProxyPassword = "SomeVNCProxyPassword",
@@ -94,13 +94,15 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 RDGatewayHostname = "SomeRDGatewayHostname",
                 Protocol = ProtocolType.ICA,
                 Port = 999,
+                Favorite = true,
                 UseConsoleSession = true,
                 UseCredSsp = true,
+                UseVmId = false,
                 RenderingEngine = HTTPBase.RenderingEngine.Gecko,
                 ICAEncryptionStrength = IcaProtocol.EncryptionStrength.Encr40Bit,
-                RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth,
-                Colors = RdpProtocol.RDPColors.Colors16Bit,
-                Resolution = RdpProtocol.RDPResolutions.Res1366x768,
+                RDPAuthenticationLevel = AuthenticationLevel.WarnOnFailedAuth,
+                Colors = RDPColors.Colors16Bit,
+                Resolution = RDPResolutions.Res1366x768,
                 AutomaticResize = true,
                 DisplayWallpaper = true,
                 DisplayThemes = true,
@@ -111,7 +113,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 RedirectPorts = true,
                 RedirectPrinters = true,
                 RedirectSmartCards = true,
-                RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer,
+                RedirectSound = RDPSounds.LeaveAtRemoteComputer,
                 RedirectAudioCapture = true,
                 RedirectKeys = true,
                 VNCCompression = ProtocolVNC.Compression.Comp4,
@@ -122,8 +124,8 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 VNCColors = ProtocolVNC.Colors.Col8Bit,
                 VNCSmartSizeMode = ProtocolVNC.SmartSizeMode.SmartSAspect,
                 VNCViewOnly = true,
-                RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Detect,
-                RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard
+                RDGatewayUsageMethod = RDGatewayUsageMethod.Detect,
+                RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard
             };
         }
 
@@ -162,25 +164,14 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
 
             public static IEnumerable InheritanceTestCases()
             {
-                var ignoreProperties = new[]
-                {
-                    nameof(ConnectionInfoInheritance.EverythingInherited),
-                    nameof(ConnectionInfoInheritance.Parent)
-                };
-                var properties = typeof(ConnectionInfoInheritance)
-                    .GetProperties()
-                    .Where(property => !ignoreProperties.Contains(property.Name));
-                var testCases = new List<TestCaseData>();
-                var testInheritance = GetTestConnectionWithAllInherited().Inheritance;
+	            var testInheritance = GetTestConnectionWithAllInherited().Inheritance;
+                var properties = testInheritance.GetProperties();
 
-                foreach (var property in properties)
-                {
-                    testCases.Add(
-                        new TestCaseData(property.Name)
-                            .Returns(property.GetValue(testInheritance)));
-                }
-
-                return testCases;
+                return properties
+	                .Select(property => 
+		                new TestCaseData(property.Name)
+			                .Returns(property.GetValue(testInheritance)))
+	                .ToList();
             }
         }
     }

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs

@@ -19,9 +19,9 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedGatewayHostname = "gatewayhostname.domain.com";
         private const string ExpectedLoadBalanceInfo = "tsv://MS Terminal Services Plugin.1.RDS-NAME";
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDPColors ExpectedColors = RdpProtocol.RDPColors.Colors24Bit;
+        private const RDPColors ExpectedColors = RDPColors.Colors24Bit;
         private const bool ExpectedBitmapCaching = false;
-        private const RdpProtocol.RDPResolutions ExpectedResolutionMode = RdpProtocol.RDPResolutions.FitToWindow;
+        private const RDPResolutions ExpectedResolutionMode = RDPResolutions.FitToWindow;
         private const bool ExpectedWallpaperDisplay = true;
         private const bool ExpectedThemesDisplay = true;
         private const bool ExpectedFontSmoothing = true;
@@ -30,7 +30,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const bool ExpectedDriveRedirection = true;
         private const bool ExpectedPortRedirection = true;
         private const bool ExpectedPrinterRedirection = true;
-        private const RdpProtocol.RDPSounds ExpectedSoundRedirection = RdpProtocol.RDPSounds.BringToThisComputer;
+        private const RDPSounds ExpectedSoundRedirection = RDPSounds.BringToThisComputer;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs

@@ -24,20 +24,20 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedPassword = "passwordHere!";
         private const bool ExpectedUseConsoleSession = true;
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+        private const RDGatewayUsageMethod ExpectedGatewayUsageMethod = RDGatewayUsageMethod.Always;
         private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net";
         private const string ExpectedGatewayUsername = "gatewayusername";
         private const string ExpectedGatewayDomain = "innerdomain";
         private const string ExpectedGatewayPassword = "gatewayPassword123";
-        private const RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow;
-        private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit;
-        private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay;
+        private const RDPResolutions ExpectedRdpResolution = RDPResolutions.FitToWindow;
+        private const RDPColors ExpectedRdpColorDepth = RDPColors.Colors24Bit;
+        private const RDPSounds ExpectedAudioRedirection = RDPSounds.DoNotPlay;
         private const bool ExpectedKeyRedirection = true;
         private const bool ExpectedSmartcardRedirection = true;
         private const bool ExpectedDriveRedirection = true;
         private const bool ExpectedPortRedirection = true;
         private const bool ExpectedPrinterRedirection = true;
-        private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth;
+        private const AuthenticationLevel ExpectedAuthLevel = AuthenticationLevel.WarnOnFailedAuth;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs

@@ -23,20 +23,20 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedPassword = "passwordHere!";
         private const bool ExpectedUseConsoleSession = true;
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+        private const RDGatewayUsageMethod ExpectedGatewayUsageMethod = RDGatewayUsageMethod.Always;
         private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net";
         private const string ExpectedGatewayUsername = "gatewayusername";
         private const string ExpectedGatewayDomain = "innerdomain";
         private const string ExpectedGatewayPassword = "gatewayPassword123";
-        private const RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow;
-        private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit;
-        private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay;
+        private const RDPResolutions ExpectedRdpResolution = RDPResolutions.FitToWindow;
+        private const RDPColors ExpectedRdpColorDepth = RDPColors.Colors24Bit;
+        private const RDPSounds ExpectedAudioRedirection = RDPSounds.DoNotPlay;
         private const bool ExpectedKeyRedirection = true;
         private const bool ExpectedSmartcardRedirection = true;
         private const bool ExpectedDriveRedirection = true;
         private const bool ExpectedPortRedirection = true;
         private const bool ExpectedPrinterRedirection = true;
-        private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+        private const AuthenticationLevel ExpectedAuthLevel = AuthenticationLevel.AuthRequired;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs

@@ -165,7 +165,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+            _testAbstractConnectionInfoData.RDPAuthenticationLevel = AuthenticationLevel.AuthRequired;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -201,7 +201,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+            _testAbstractConnectionInfoData.RDGatewayUsageMethod = RDGatewayUsageMethod.Always;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -219,7 +219,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard;
+            _testAbstractConnectionInfoData.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -255,7 +255,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.Resolution = RdpProtocol.RDPResolutions.Res1366x768;
+            _testAbstractConnectionInfoData.Resolution = RDPResolutions.Res1366x768;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -273,7 +273,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.Colors = RdpProtocol.RDPColors.Colors16Bit;
+            _testAbstractConnectionInfoData.Colors = RDPColors.Colors16Bit;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -372,7 +372,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+            _testAbstractConnectionInfoData.RedirectSound = RDPSounds.DoNotPlay;
             Assert.That(wasCalled, Is.True);
         }
 

mRemoteNGTests/Connection/DefaultConnectionInfoTests.cs

@@ -50,7 +50,7 @@ namespace mRemoteNGTests.Connection
             DefaultConnectionInfo.Instance.SaveTo(saveTarget);
 
 			var valueInSource = property.GetValue(DefaultConnectionInfo.Instance).ToString();
-			var valueInDestination = saveTarget.GetType().GetProperty(property.Name).GetValue(saveTarget).ToString();
+			var valueInDestination = saveTarget.GetType().GetProperty(property.Name)?.GetValue(saveTarget)?.ToString();
             Assert.That(valueInDestination, Is.EqualTo(valueInSource));
         }
 

mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs

@@ -12,7 +12,7 @@ namespace mRemoteNGTests.Connection.Protocol
 {
 	public class IntegratedProgramTests
 	{
-		private readonly ExternalTool _extTool = new ExternalTool
+		private readonly ExternalTool _extTool = new ExternalTool(new ConnectionInitiator(new ProtocolFactory()))
 		{
 			DisplayName = "notepad",
 			FileName = @"%windir%\system32\notepad.exe",
@@ -50,7 +50,7 @@ namespace mRemoteNGTests.Connection.Protocol
 
 		private InterfaceControl BuildInterfaceControl(string extAppName, ProtocolBase sut)
 		{
-			var connectionWindow = new ConnectionWindow(new DockContent());
+			var connectionWindow = new ConnectionWindow(new DockContent(), new ConnectionInitiator(new ProtocolFactory()));
             var connectionInfo = new ConnectionInfo {ExtApp = extAppName, Protocol = ProtocolType.IntApp};
             return new InterfaceControl(connectionWindow, sut, connectionInfo);
 		}

mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs

@@ -51,6 +51,8 @@
 		public TType MacAddress { get; set; }
         public TType UserField { get; set; }
         public TType Favorite { get; set; }
+        public TType VmId { get; set; }
+        public TType UseVmId { get; set; }
         public TType VNCCompression { get; set; }
 		public TType VNCEncoding { get; set; }
 		public TType VNCAuthMode { get; set; }
@@ -62,5 +64,6 @@
 		public TType VNCColors { get; set; }
 		public TType VNCSmartSizeMode { get; set; }
 		public TType VNCViewOnly { get; set; }
+		public TType RdpVersion { get; set; }
 	}
 }

mRemoteNGTests/UI/Forms/OptionsFormSetupAndTeardown.cs

@@ -1,4 +1,6 @@
-using NUnit.Framework;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using NUnit.Framework;
 using mRemoteNG.UI.Forms;
 
 namespace mRemoteNGTests.UI.Forms
@@ -15,7 +17,7 @@ namespace mRemoteNGTests.UI.Forms
         [SetUp]
         public void Setup()
         {
-            _optionsForm = new FrmOptions();
+            _optionsForm = new FrmOptions(new ConnectionInitiator(new ProtocolFactory()));
             _optionsForm.Show();
         }
 

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs

@@ -222,12 +222,13 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                 : new ConnectionInfo();
 
             node.Protocol = protocol;
-            node.Resolution = RdpProtocol.RDPResolutions.Res800x600;
-            node.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Never;
-            node.RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.Yes;
-            node.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+            node.Resolution = RDPResolutions.Res800x600;
+            node.RDGatewayUsageMethod = RDGatewayUsageMethod.Never;
+            node.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes;
+            node.RedirectSound = RDPSounds.DoNotPlay;
             node.VNCAuthMode = ProtocolVNC.AuthMode.AuthVNC;
             node.VNCProxyType = ProtocolVNC.ProxyType.ProxyNone;
+            node.UseVmId = false;
             node.Inheritance.TurnOffInheritanceCompletely();
 
             return node;
@@ -266,6 +267,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Domain),
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.UseVmId),
                         nameof(ConnectionInfo.UseConsoleSession),
                         nameof(ConnectionInfo.RDPAuthenticationLevel),
                         nameof(ConnectionInfo.RDPMinutesToIdleTimeout),
@@ -287,6 +289,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.RedirectSmartCards),
                         nameof(ConnectionInfo.RedirectSound),
                         nameof(ConnectionInfo.RedirectAudioCapture),
+						nameof(ConnectionInfo.RdpVersion)
                     });
                     break;
                 case ProtocolType.VNC:

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs

@@ -18,12 +18,12 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
             RunVerification();
         }
 
-        [TestCase(RdpProtocol.RDGatewayUsageMethod.Always)]
-        [TestCase(RdpProtocol.RDGatewayUsageMethod.Detect)]
-        public void RdGatewayPropertiesShown_WhenRdGatewayUsageMethodIsNotNever(RdpProtocol.RDGatewayUsageMethod gatewayUsageMethod)
+        [TestCase(RDGatewayUsageMethod.Always)]
+        [TestCase(RDGatewayUsageMethod.Detect)]
+        public void RdGatewayPropertiesShown_WhenRdGatewayUsageMethodIsNotNever(RDGatewayUsageMethod gatewayUsageMethod)
         {
             ConnectionInfo.RDGatewayUsageMethod = gatewayUsageMethod;
-            ConnectionInfo.RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.Yes;
+            ConnectionInfo.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes;
             ExpectedPropertyList.AddRange(new []
             {
                 nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
@@ -33,11 +33,11 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
             RunVerification();
         }
 
-        [TestCase(RdpProtocol.RDGatewayUseConnectionCredentials.No)]
-        [TestCase(RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard)]
-        public void RdGatewayPropertiesShown_WhenRDGatewayUseConnectionCredentialsIsNotYes(RdpProtocol.RDGatewayUseConnectionCredentials useConnectionCredentials)
+        [TestCase(RDGatewayUseConnectionCredentials.No)]
+        [TestCase(RDGatewayUseConnectionCredentials.SmartCard)]
+        public void RdGatewayPropertiesShown_WhenRDGatewayUseConnectionCredentialsIsNotYes(RDGatewayUseConnectionCredentials useConnectionCredentials)
         {
-            ConnectionInfo.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+            ConnectionInfo.RDGatewayUsageMethod = RDGatewayUsageMethod.Always;
             ConnectionInfo.RDGatewayUseConnectionCredentials = useConnectionCredentials;
             ExpectedPropertyList.AddRange(new []
             {
@@ -54,15 +54,15 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
         [Test]
         public void SoundQualityPropertyShown_WhenRdpSoundsSetToBringToThisComputer()
         {
-            ConnectionInfo.RedirectSound = RdpProtocol.RDPSounds.BringToThisComputer;
+            ConnectionInfo.RedirectSound = RDPSounds.BringToThisComputer;
             ExpectedPropertyList.Add(nameof(mRemoteNG.Connection.ConnectionInfo.SoundQuality));
 
             RunVerification();
         }
 
-        [TestCase(RdpProtocol.RDPResolutions.FitToWindow)]
-        [TestCase(RdpProtocol.RDPResolutions.Fullscreen)]
-        public void AutomaticResizePropertyShown_WhenResolutionIsDynamic(RdpProtocol.RDPResolutions resolution)
+        [TestCase(RDPResolutions.FitToWindow)]
+        [TestCase(RDPResolutions.Fullscreen)]
+        public void AutomaticResizePropertyShown_WhenResolutionIsDynamic(RDPResolutions resolution)
         {
             ConnectionInfo.Resolution = resolution;
             ExpectedPropertyList.Add(nameof(mRemoteNG.Connection.ConnectionInfo.AutomaticResize));

mRemoteNGTests/UI/Window/ConnectionTreeWindowTests.cs

@@ -1,4 +1,6 @@
 using System.Threading;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
 using mRemoteNG.UI.Window;
 using NUnit.Framework;
 using WeifenLuo.WinFormsUI.Docking;
@@ -13,7 +15,7 @@ namespace mRemoteNGTests.UI.Window
         [SetUp]
         public void Setup()
         {
-            _connectionTreeWindow = new ConnectionTreeWindow(new DockContent());
+            _connectionTreeWindow = new ConnectionTreeWindow(new DockContent(), new ConnectionInitiator(new ProtocolFactory()));
         }
 
         [TearDown]

mRemoteNGTests/app.config

@@ -10,6 +10,14 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>

mRemoteNGTests/mRemoteNGTests.csproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -58,21 +59,21 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.4\lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NSubstitute, Version=4.0.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <HintPath>..\packages\NSubstitute.4.0.0\lib\net46\NSubstitute.dll</HintPath>
+    <Reference Include="NSubstitute, Version=4.2.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.4.2.0\lib\net46\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="NUnitForms">
       <HintPath>nUnitForms\bin\NUnitForms.dll</HintPath>
@@ -341,7 +342,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

mRemoteNGTests/packages.config

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.4" targetFramework="net46" />
-  <package id="Castle.Core" version="4.3.1" targetFramework="net46" />
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net46" />
+  <package id="Castle.Core" version="4.4.0" targetFramework="net46" />
   <package id="DockPanelSuite" version="3.0.6" targetFramework="net46" />
   <package id="log4net" version="2.0.8" targetFramework="net46" />
-  <package id="NSubstitute" version="4.0.0" targetFramework="net46" />
-  <package id="NUnit" version="3.11.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.9.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net46" />
+  <package id="NSubstitute" version="4.2.0" targetFramework="net46" />
+  <package id="NUnit" version="3.12.0" targetFramework="net46" />
+  <package id="NUnit.Console" version="3.10.0" targetFramework="net46" />
+  <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.5" targetFramework="net46" />
+  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.6" targetFramework="net46" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net46" />
   <package id="ObjectListView.Official" version="2.9.1" targetFramework="net46" />
-  <package id="OpenCover" version="4.6.519" targetFramework="net46" />
+  <package id="OpenCover" version="4.7.922" targetFramework="net46" />
   <package id="ReportGenerator" version="3.0.2" targetFramework="net46" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" />

mRemoteV1.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 14.0.25420.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteV1", "mRemoteV1\mRemoteV1.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
@@ -100,25 +100,24 @@ Global
 		{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 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|Any CPU
+		{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

mRemoteV1/.editorconfig

@@ -13,6 +13,15 @@ indent_size = 4
 trim_trailing_whitespace = true
 charset = utf-8-bom
 
+# reStructuredText
+[*.rst]
+charset = utf-8
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 3
+max_line_length = 120
+
 # Organize usings
 dotnet_sort_system_directives_first = true
 
@@ -41,4 +50,4 @@ csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_around_binary_operators = before_and_after
 csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
 csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false

mRemoteV1/App/CompatibilityChecker.cs

@@ -1,11 +1,11 @@
-using Microsoft.Win32;
-using mRemoteNG.App.Info;
-using mRemoteNG.UI.TaskDialog;
-using System;
+using System;
 using System.Diagnostics;
 using System.Windows.Forms;
+using Microsoft.Win32;
+using mRemoteNG.App.Info;
 using mRemoteNG.Messages;
 using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.App
 {
@@ -55,21 +55,18 @@ namespace mRemoteNG.App
 
         private static bool FipsPolicyEnabledForServer2003()
         {
-            var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa");
-            var fipsPolicy = regKey?.GetValue("FIPSAlgorithmPolicy");
-            if (fipsPolicy == null) return false;
-            fipsPolicy = Convert.ToInt32(fipsPolicy);
-            return (int)fipsPolicy != 0;
+            var regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa");
+            if (!(regKey?.GetValue("FIPSAlgorithmPolicy") is int fipsPolicy))
+                return false;
+            return fipsPolicy != 0;
         }
 
         private static bool FipsPolicyEnabledForServer2008AndNewer()
         {
-            var regKey =
-                Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy");
-            var fipsPolicy = regKey?.GetValue("Enabled");
-            if (fipsPolicy == null) return false;
-            fipsPolicy = Convert.ToInt32(fipsPolicy);
-            return (int)fipsPolicy != 0;
+            var regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy");
+            if (!(regKey?.GetValue("Enabled") is int fipsPolicy))
+                return false;
+            return fipsPolicy != 0;
         }
 
         private static void CheckLenovoAutoScrollUtility(MessageCollector messageCollector)

mRemoteV1/App/Info/GeneralAppInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -11,10 +11,10 @@ namespace mRemoteNG.App.Info
 {
     public static class GeneralAppInfo
     {
-        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 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 static string ApplicationVersion = Application.ProductVersion;
         public static readonly string ProductName = Application.ProductName;
 

mRemoteV1/App/Initialization/StartupDataLogger.cs

@@ -76,7 +76,7 @@ namespace mRemoteNG.App.Initialization
             var architecture = string.Empty;
             try
             {
-                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
+                foreach (var o in new ManagementObjectSearcher("SELECT AddressWidth FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
                     .Get())
                 {
                     var managementObject = (ManagementObject)o;

mRemoteV1/App/ProgramRoot.cs

@@ -27,7 +27,7 @@ namespace mRemoteNG.App
             CatchAllUnhandledExceptions();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            FrmSplashScreen frmSplashScreen = FrmSplashScreen.getInstance();
+            var frmSplashScreen = FrmSplashScreen.getInstance();
             frmSplashScreen.Show();
             Application.Run(FrmMain.Default);
         }
@@ -88,8 +88,11 @@ namespace mRemoteNG.App
             if (!FrmSplashScreen.getInstance().IsDisposed)
                 FrmSplashScreen.getInstance().Close();
 
+            if (FrmMain.Default.IsDisposed) return;
+            
             var window = new UnhandledExceptionWindow(e.Exception, false);
             window.ShowDialog(FrmMain.Default);
+            
         }
 
         private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)

mRemoteV1/App/Runtime.cs

@@ -1,4 +1,4 @@
-using mRemoteNG.App.Info;
+using mRemoteNG.App.Info;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
 using mRemoteNG.Credential;

mRemoteV1/App/Windows.cs

@@ -1,4 +1,5 @@
 using System;
+using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.UI;
 using mRemoteNG.UI.Forms;
@@ -20,7 +21,7 @@ namespace mRemoteNG.App
 
         internal static ConnectionTreeWindow TreeForm
         {
-            get => _treeForm ?? (_treeForm = new ConnectionTreeWindow());
+            get => _treeForm ?? (_treeForm = new ConnectionTreeWindow(ConnectionInitiator));
             set => _treeForm = value;
         }
 
@@ -29,6 +30,7 @@ namespace mRemoteNG.App
         internal static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow();
         private static UpdateWindow UpdateForm { get; set; } = new UpdateWindow();
         internal static SSHTransferWindow SshtransferForm { get; private set; } = new SSHTransferWindow();
+        internal static IConnectionInitiator ConnectionInitiator { get; set; }
 
 
         public static void Show(WindowType windowType)
@@ -50,7 +52,7 @@ namespace mRemoteNG.App
                         _adimportForm.Show(dockPanel);
                         break;
                     case WindowType.Options:
-                        using (var optionsForm = new FrmOptions())
+                        using (var optionsForm = new FrmOptions(ConnectionInitiator))
                         {
                             optionsForm.ShowDialog(dockPanel);
                         }
@@ -73,7 +75,7 @@ namespace mRemoteNG.App
                         break;
                     case WindowType.ExternalApps:
                         if (_externalappsForm == null || _externalappsForm.IsDisposed)
-                            _externalappsForm = new ExternalToolsWindow();
+                            _externalappsForm = new ExternalToolsWindow(ConnectionInitiator);
                         _externalappsForm.Show(dockPanel);
                         break;
                     case WindowType.PortScan:

mRemoteV1/ClassDiagram1.cd

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="mRemoteNG.Connection.Info" Collapsed="true">
-    <Position X="29.5" Y="0.5" Width="1.5" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-      <Compartment Name="Nested Types" Collapsed="false" />
-    </Compartments>
-    <NestedTypes>
-      <Enum Name="mRemoteNG.Connection.Info.Force" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Info.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Enum>
-      <Class Name="mRemoteNG.Connection.Info.Inheritance">
-        <Compartments>
-          <Compartment Name="Properties" Collapsed="true" />
-          <Compartment Name="Methods" Collapsed="true" />
-        </Compartments>
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Info.Inheritance.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Class>
-    </NestedTypes>
-    <TypeIdentifier>
-      <HashCode>nsdT4YQ80AjyrN6+C3B3TRVBrwEyVASPjA5epmmggHg=</HashCode>
-      <FileName>Connection\Connection.Info.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.List" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="27.75" Y="1.5" Width="1.5" />
-    <Compartments>
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAIAAAAAAAAAAAAACAAAAAQAAkAAAAAAAAAAAABEAAA=</HashCode>
-      <FileName>Connection\Connection.List.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.PuttyBase">
-    <Position X="17.25" Y="3.25" Width="2.75" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <NestedTypes>
-      <Enum Name="mRemoteNG.Connection.Protocol.PuttyBase.Putty_Protocol" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.PuttyBase.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Enum>
-      <Enum Name="mRemoteNG.Connection.Protocol.PuttyBase.Putty_SSHVersion" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.PuttyBase.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Enum>
-    </NestedTypes>
-    <TypeIdentifier>
-      <HashCode>BjAAQAAAQBAAgAAAgAAAAIAAAAAADoAAAAQAAAGAQgA=</HashCode>
-      <FileName>Connection\Connection.Protocol.PuttyBase.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Converter" Collapsed="true">
-    <Position X="26" Y="0.5" Width="1.5" />
-    <Compartments>
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Connection.Protocol.Protocols.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Base">
-    <Position X="12.25" Y="0.5" Width="1.5" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-      <Compartment Name="Events" Collapsed="true" />
-    </Compartments>
-    <NestedTypes>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.SetTagToNothingCB" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.ErrorOccuredEventHandler" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.ClosingEventHandler" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.ConnectedEventHandler" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.DisconnectedEventHandler" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.DisposeControlCB" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.ConnectingEventHandler" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.ClosedEventHandler" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-      <Delegate Name="mRemoteNG.Connection.Protocol.Base.DisposeInterfaceCB" Collapsed="true">
-        <TypeIdentifier>
-          <NewMemberFileName>Connection\Connection.Protocol.Base.cs</NewMemberFileName>
-        </TypeIdentifier>
-      </Delegate>
-    </NestedTypes>
-    <TypeIdentifier>
-      <HashCode>ACSAAQAMAABAQQADAgBUoMSAlIAQAAgAAAAAkwGoABA=</HashCode>
-      <FileName>Connection\Connection.Protocol.Base.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.InterfaceControl" Collapsed="true">
-    <Position X="26" Y="1.5" Width="1.5" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Properties" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAACAAAAAAAACAAABKAAAAAAAAAAAAAEAAABA=</HashCode>
-      <FileName>Connection\Connection.InterfaceControl.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Icon" Collapsed="true">
-    <Position X="27.75" Y="0.5" Width="1.5" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-      <Compartment Name="Methods" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAIAAAAAAAABACAAEAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
-      <FileName>Connection\Connection.Icon.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.VNC.ProtocolVNC" Collapsed="true">
-    <Position X="10" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AxQAAAAAIAgAAQABAAAAAYAQAQAAAAAAAAAAAEAAwAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\Connection.Protocol.VNC.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Telnet.ProtocolTelnet" Collapsed="true">
-    <Position X="16.75" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\Telnet\Connection.Protocol.Telnet.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.SSH.ProtocolSSH1" Collapsed="true">
-    <Position X="21.25" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\SSH\Connection.Protocol.SSH1.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.SSH.ProtocolSSH2" Collapsed="true">
-    <Position X="23.5" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\SSH\Connection.Protocol.SSH2.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Serial.ProtocolSerial" Collapsed="true">
-    <Position X="19" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\Serial\Connection.Protocol.Serial.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Rlogin.ProtocolRlogin" Collapsed="true">
-    <Position X="14.5" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\Rlogin\Connection.Protocol.Rlogin.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.RDP.ProtocolRDP" Collapsed="true">
-    <Position X="3.25" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>ACQRAAAFIAQgIQACAIBACIAAQaAABIIbAIgUYgEAgAE=</HashCode>
-      <FileName>Connection\Protocol\RDP\Connection.Protocol.RDP.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.RAW.ProtocolRAW" Collapsed="true">
-    <Position X="12.25" Y="5.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\RAW\Connection.Protocol.RAW.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.ICA.ProtocolICA" Collapsed="true">
-    <Position X="1" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAEAABAAAAAQADAABAIIAIAQABBAAAAIiAAAAEAgA=</HashCode>
-      <FileName>Connection\Protocol\ICA\Connection.Protocol.ICA.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Http.ProtocolHTTP" Collapsed="true">
-    <Position X="5.5" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\Http\Connection.Protocol.HTTP.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Http.HTTPBase" Collapsed="true">
-    <Position X="6.75" Y="3.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AQAAAQAAABAAAQAIAAAAAKCAAAAAAAEAAAAAABAAAUA=</HashCode>
-      <FileName>Connection\Protocol\Http\Connection.Protocol.HTTPBase.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="mRemoteNG.Connection.Protocol.Http.ProtocolHTTPS" Collapsed="true">
-    <Position X="7.75" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\Http\Connection.Protocol.HTTPS.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Enum Name="mRemoteNG.Connection.Protocol.Protocols" Collapsed="true">
-    <Position X="29.5" Y="3.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AEAwAgAAAQAQAEAAAAAAAAAAJAEABAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Connection.Protocol.Protocols.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.Defaults" Collapsed="true">
-    <Position X="26" Y="3.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.SpecialKeys" Collapsed="true">
-    <Position X="29.5" Y="4.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.Compression" Collapsed="true">
-    <Position X="29.5" Y="2.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAIAAAAAAAkAAAAAAAQAgAAQAAIAABAAAAAIBAIAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.Encoding" Collapsed="true">
-    <Position X="27.75" Y="3.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAQAEBAAIAAAAAAAIAAAEAAAQgAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.AuthMode" Collapsed="true">
-    <Position X="26" Y="2.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAACAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.ProxyType" Collapsed="true">
-    <Position X="26" Y="4.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>BAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACAACAAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.Colors" Collapsed="true">
-    <Position X="27.75" Y="2.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAI=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="mRemoteNG.Connection.Protocol.VNC.SmartSizeMode" Collapsed="true">
-    <Position X="27.75" Y="4.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAIAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAA=</HashCode>
-      <FileName>Connection\Protocol\VNC\VNCEnum.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>

mRemoteV1/ClassDiagram2.cd

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="mRemoteNG.Connection.New.ConnectionRecordImp" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="7.75" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAQAAAAAIAAAAAAAAAAAIIVAAAAAAAAAAAAAAAAAABA=</HashCode>
-      <FileName>Connection\New\ConnectionRecordImp.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Orientation="Left" Position="0.1" />
-  </Class>
-  <Interface Name="mRemoteNG.Connection.New.Connectable">
-    <Position X="2.75" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAQAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\New\Connectable.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="mRemoteNG.Connection.New.ConnectionRecord">
-    <Position X="5" Y="2.5" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAIAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\New\ConnectionRecord.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="mRemoteNG.Connection.New.Protocol">
-    <Position X="1.5" Y="2.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAIAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\New\Protocol.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="mRemoteNG.Connection.New.ProtocolRDP">
-    <Position X="0.5" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\New\ProtocolRDP.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="mRemoteNG.Connection.New.ProtocolSSH">
-    <Position X="2.75" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Connection\New\ProtocolSSH.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="mRemoteNG.Connection.RecordList" Collapsed="true">
-    <Position X="7.75" Y="1.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAIAAAAAAAAAAAAACAAAAAQAAkAAAAAAAAAAAABEAAA=</HashCode>
-      <FileName>Connection\New\RecordList.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>

mRemoteV1/Config/Connections/XmlConnectionsSaver.cs

@@ -32,19 +32,16 @@ namespace mRemoteNG.Config.Connections
             try
             {
                 var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
-                                                                                 cryptographyProvider,
-                                                                                 connectionTreeModel
-                                                                                     .RootNodes.OfType<RootNodeInfo>()
-                                                                                     .First().PasswordString
-                                                                                     .ConvertToSecureString(),
-                                                                                 _saveFilter);
-                var xmlConnectionsSerializer =
-                    new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer)
-                    {
-                        UseFullEncryption = mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile
-                    };
-                var xml = xmlConnectionsSerializer.Serialize(connectionTreeModel);
+                var serializerFactory = new XmlConnectionSerializerFactory();
+                
+                var xmlConnectionsSerializer = serializerFactory.Build(
+                    cryptographyProvider,
+                    connectionTreeModel,
+                    _saveFilter,
+                    mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile);
+
+                var rootNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
+                var xml = xmlConnectionsSerializer.Serialize(rootNode);
 
                 var fileDataProvider = new FileDataProviderWithRollingBackup(_connectionFileName);
                 fileDataProvider.Save(xml);

mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs

@@ -95,13 +95,12 @@ namespace mRemoteNG.Config.Serializers.Csv
             connectionRecord.Password = headers.Contains("Password") ? connectionCsv[headers.IndexOf("Password")] : "";
             connectionRecord.Domain = headers.Contains("Domain") ? connectionCsv[headers.IndexOf("Domain")] : "";
             connectionRecord.Hostname = headers.Contains("Hostname") ? connectionCsv[headers.IndexOf("Hostname")] : "";
-            connectionRecord.PuttySession =
-                headers.Contains("PuttySession") ? connectionCsv[headers.IndexOf("PuttySession")] : "";
+            connectionRecord.VmId = headers.Contains("VmId") ? connectionCsv[headers.IndexOf("VmId")] : "";
+            connectionRecord.PuttySession = headers.Contains("PuttySession") ? connectionCsv[headers.IndexOf("PuttySession")] : "";
             connectionRecord.LoadBalanceInfo = headers.Contains("LoadBalanceInfo")
                 ? connectionCsv[headers.IndexOf("LoadBalanceInfo")]
                 : "";
-            connectionRecord.PreExtApp =
-                headers.Contains("PreExtApp") ? connectionCsv[headers.IndexOf("PreExtApp")] : "";
+            connectionRecord.PreExtApp = headers.Contains("PreExtApp") ? connectionCsv[headers.IndexOf("PreExtApp")] : "";
             connectionRecord.PostExtApp =
                 headers.Contains("PostExtApp") ? connectionCsv[headers.IndexOf("PostExtApp")] : "";
             connectionRecord.MacAddress =
@@ -158,6 +157,13 @@ namespace mRemoteNG.Config.Serializers.Csv
                     connectionRecord.UseCredSsp = value;
             }
 
+            if (headers.Contains("UseVmId"))
+            {
+                bool value;
+                if (bool.TryParse(connectionCsv[headers.IndexOf("UseVmId")], out value))
+                    connectionRecord.UseVmId = value;
+            }
+
             if (headers.Contains("RenderingEngine"))
             {
                 HTTPBase.RenderingEngine value;
@@ -174,21 +180,21 @@ namespace mRemoteNG.Config.Serializers.Csv
 
             if (headers.Contains("RDPAuthenticationLevel"))
             {
-                RdpProtocol.AuthenticationLevel value;
+                AuthenticationLevel value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RDPAuthenticationLevel")], out value))
                     connectionRecord.RDPAuthenticationLevel = value;
             }
 
             if (headers.Contains("Colors"))
             {
-                RdpProtocol.RDPColors value;
+                RDPColors value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("Colors")], out value))
                     connectionRecord.Colors = value;
             }
 
             if (headers.Contains("Resolution"))
             {
-                RdpProtocol.RDPResolutions value;
+                RDPResolutions value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("Resolution")], out value))
                     connectionRecord.Resolution = value;
             }
@@ -272,7 +278,7 @@ namespace mRemoteNG.Config.Serializers.Csv
 
             if (headers.Contains("RedirectSound"))
             {
-                RdpProtocol.RDPSounds value;
+                RDPSounds value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RedirectSound")], out value))
                     connectionRecord.RedirectSound = value;
             }
@@ -349,14 +355,14 @@ namespace mRemoteNG.Config.Serializers.Csv
 
             if (headers.Contains("RDGatewayUsageMethod"))
             {
-                RdpProtocol.RDGatewayUsageMethod value;
+                RDGatewayUsageMethod value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUsageMethod")], out value))
                     connectionRecord.RDGatewayUsageMethod = value;
             }
 
             if (headers.Contains("RDGatewayUseConnectionCredentials"))
             {
-                RdpProtocol.RDGatewayUseConnectionCredentials value;
+                RDGatewayUseConnectionCredentials value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUseConnectionCredentials")], out value))
                     connectionRecord.RDGatewayUseConnectionCredentials = value;
             }
@@ -368,6 +374,12 @@ namespace mRemoteNG.Config.Serializers.Csv
                     connectionRecord.Favorite = value;
             }
 
+            if (headers.Contains("RdpVersion"))
+            {
+                if (Enum.TryParse(connectionCsv[headers.IndexOf("RdpVersion")], true, out RdpVersion version))
+                    connectionRecord.RdpVersion = version;
+            }
+
             #region Inheritance
 
             if (headers.Contains("InheritCacheBitmaps"))
@@ -545,6 +557,13 @@ namespace mRemoteNG.Config.Serializers.Csv
                     connectionRecord.Inheritance.UseCredSsp = value;
             }
 
+            if (headers.Contains("InheritUseVmId"))
+            {
+                bool value;
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseVmId")], out value))
+                    connectionRecord.Inheritance.UseVmId = value;
+            }
+
             if (headers.Contains("InheritRenderingEngine"))
             {
                 bool value;
@@ -559,6 +578,13 @@ namespace mRemoteNG.Config.Serializers.Csv
                     connectionRecord.Inheritance.Username = value;
             }
 
+            if (headers.Contains("InheritVmId"))
+            {
+                bool value;
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritVmId")], out value))
+                    connectionRecord.Inheritance.VmId = value;
+            }
+
             if (headers.Contains("InheritICAEncryptionStrength"))
             {
                 bool value;
@@ -770,6 +796,13 @@ namespace mRemoteNG.Config.Serializers.Csv
                     connectionRecord.Inheritance.RedirectAudioCapture = value;
             }
 
+            if (headers.Contains("InheritRdpVersion"))
+            {
+                bool value;
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRdpVersion")], out value))
+                    connectionRecord.Inheritance.RdpVersion = value;
+            }
+
             #endregion
 
             return connectionRecord;

mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs

@@ -55,11 +55,26 @@ namespace mRemoteNG.Config.Serializers.Csv
                 sb.Append("Password;");
             if (_saveFilter.SaveDomain)
                 sb.Append("Domain;");
-            sb.Append(
-                      "Hostname;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;RedirectAudioCapture;");
+
+            sb.Append("Hostname;VmId;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;UseVmId;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;" +
+                      "LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;" +
+                      "CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;" +
+                      "PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;" +
+                      "VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;" +
+                      "RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;RedirectAudioCapture;RdpVersion;");
+
             if (_saveFilter.SaveInheritance)
-                sb.Append(
-                          "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectClipboard;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;InheritUseConsoleSession;InheritUseCredSsp;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritFavorite;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain;InheritRDPAlertIdleTimeout;InheritRDPMinutesToIdleTimeout;InheritSoundQuality;InheritRedirectAudioCapture;");
+                sb.Append("InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;" +
+                          "InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;" +
+                          "InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;" +
+                          "InheritRedirectClipboard;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;" +
+                          "InheritUseConsoleSession;InheritUseCredSsp;InheritUseVmId;InheritVmId;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;" +
+                          "InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;" +
+                          "InheritFavorite;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;" +
+                          "InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;" +
+                          "InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;" +
+                          "InheritRDGatewayPassword;InheritRDGatewayDomain;InheritRDPAlertIdleTimeout;InheritRDPMinutesToIdleTimeout;InheritSoundQuality;" +
+                          "InheritRedirectAudioCapture;InheritRdpVersion");
         }
 
         private void SerializeNodesRecursive(ConnectionInfo node, StringBuilder sb)
@@ -101,11 +116,13 @@ namespace mRemoteNG.Config.Serializers.Csv
                 sb.Append(FormatForCsv(con.Domain));
 
             sb.Append(FormatForCsv(con.Hostname))
+              .Append(FormatForCsv(con.VmId))
               .Append(FormatForCsv(con.Protocol))
               .Append(FormatForCsv(con.PuttySession))
               .Append(FormatForCsv(con.Port))
               .Append(FormatForCsv(con.UseConsoleSession))
               .Append(FormatForCsv(con.UseCredSsp))
+              .Append(FormatForCsv(con.UseVmId))
               .Append(FormatForCsv(con.RenderingEngine))
               .Append(FormatForCsv(con.ICAEncryptionStrength))
               .Append(FormatForCsv(con.RDPAuthenticationLevel))
@@ -148,7 +165,8 @@ namespace mRemoteNG.Config.Serializers.Csv
               .Append(FormatForCsv(con.RDGatewayUsername))
               .Append(FormatForCsv(con.RDGatewayPassword))
               .Append(FormatForCsv(con.RDGatewayDomain))
-              .Append(FormatForCsv(con.RedirectAudioCapture));
+              .Append(FormatForCsv(con.RedirectAudioCapture))
+              .Append(FormatForCsv(con.RdpVersion));
 
 
             if (!_saveFilter.SaveInheritance)
@@ -179,6 +197,8 @@ namespace mRemoteNG.Config.Serializers.Csv
               .Append(FormatForCsv(con.Inheritance.AutomaticResize))
               .Append(FormatForCsv(con.Inheritance.UseConsoleSession))
               .Append(FormatForCsv(con.Inheritance.UseCredSsp))
+              .Append(FormatForCsv(con.Inheritance.UseVmId))
+              .Append(FormatForCsv(con.Inheritance.VmId))
               .Append(FormatForCsv(con.Inheritance.RenderingEngine))
               .Append(FormatForCsv(con.Inheritance.Username))
               .Append(FormatForCsv(con.Inheritance.ICAEncryptionStrength))
@@ -210,7 +230,8 @@ namespace mRemoteNG.Config.Serializers.Csv
               .Append(FormatForCsv(con.Inheritance.RDPAlertIdleTimeout))
               .Append(FormatForCsv(con.Inheritance.RDPMinutesToIdleTimeout))
               .Append(FormatForCsv(con.Inheritance.SoundQuality))
-              .Append(FormatForCsv(con.Inheritance.RedirectAudioCapture));
+              .Append(FormatForCsv(con.Inheritance.RedirectAudioCapture))
+              .Append(FormatForCsv(con.Inheritance.RdpVersion));
         }
 
         private string FormatForCsv(object value)

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs

@@ -89,26 +89,28 @@ namespace mRemoteNG.Config.Serializers.MsSql
             connectionInfo.Domain = (string)dataRow["DomainName"];
             connectionInfo.Password = DecryptValue((string)dataRow["Password"]);
             connectionInfo.Hostname = (string)dataRow["Hostname"];
+            connectionInfo.VmId = (string)dataRow["VmId"];
             connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]);
             connectionInfo.PuttySession = (string)dataRow["PuttySession"];
             connectionInfo.Port = (int)dataRow["Port"];
             connectionInfo.UseConsoleSession = (bool)dataRow["ConnectToConsole"];
             connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"];
+            connectionInfo.UseVmId = (bool)dataRow["UseVmId"];
             connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine),
                                                                                   (string)dataRow["RenderingEngine"]);
             connectionInfo.ICAEncryptionStrength =
                 (IcaProtocol.EncryptionStrength)Enum.Parse(typeof(IcaProtocol.EncryptionStrength),
                                                            (string)dataRow["ICAEncryptionStrength"]);
             connectionInfo.RDPAuthenticationLevel =
-                (RdpProtocol.AuthenticationLevel)Enum.Parse(typeof(RdpProtocol.AuthenticationLevel),
+                (AuthenticationLevel)Enum.Parse(typeof(AuthenticationLevel),
                                                             (string)dataRow["RDPAuthenticationLevel"]);
             connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"];
             connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"];
             connectionInfo.LoadBalanceInfo = (string)dataRow["LoadBalanceInfo"];
             connectionInfo.Colors =
-                (RdpProtocol.RDPColors)Enum.Parse(typeof(RdpProtocol.RDPColors), (string)dataRow["Colors"]);
+                (RDPColors)Enum.Parse(typeof(RDPColors), (string)dataRow["Colors"]);
             connectionInfo.Resolution =
-                (RdpProtocol.RDPResolutions)Enum.Parse(typeof(RdpProtocol.RDPResolutions),
+                (RDPResolutions)Enum.Parse(typeof(RDPResolutions),
                                                        (string)dataRow["Resolution"]);
             connectionInfo.AutomaticResize = (bool)dataRow["AutomaticResize"];
             connectionInfo.DisplayWallpaper = (bool)dataRow["DisplayWallpaper"];
@@ -122,8 +124,8 @@ namespace mRemoteNG.Config.Serializers.MsSql
             connectionInfo.RedirectClipboard = (bool)dataRow["RedirectClipboard"];
             connectionInfo.RedirectSmartCards = (bool)dataRow["RedirectSmartCards"];
             connectionInfo.RedirectSound =
-                (RdpProtocol.RDPSounds)Enum.Parse(typeof(RdpProtocol.RDPSounds), (string)dataRow["RedirectSound"]);
-            connectionInfo.SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality),
+                (RDPSounds)Enum.Parse(typeof(RDPSounds), (string)dataRow["RedirectSound"]);
+            connectionInfo.SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality),
                                                                                   (string)dataRow["SoundQuality"]);
             connectionInfo.RedirectAudioCapture = (bool)dataRow["RedirectAudioCapture"];
 
@@ -152,19 +154,20 @@ namespace mRemoteNG.Config.Serializers.MsSql
                                                                                         ["VNCSmartSizeMode"]);
             connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"];
             connectionInfo.RDGatewayUsageMethod =
-                (RdpProtocol.RDGatewayUsageMethod)Enum.Parse(typeof(RdpProtocol.RDGatewayUsageMethod),
+                (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod),
                                                              (string)dataRow["RDGatewayUsageMethod"]);
             connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"];
             connectionInfo.RDGatewayUseConnectionCredentials =
-                (RdpProtocol.RDGatewayUseConnectionCredentials)Enum.Parse(
-                                                                          typeof(RdpProtocol.
-                                                                              RDGatewayUseConnectionCredentials),
-                                                                          (string)dataRow
-                                                                              ["RDGatewayUseConnectionCredentials"]);
+                (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials),
+                                                            (string)dataRow["RDGatewayUseConnectionCredentials"]);
             connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"];
             connectionInfo.RDGatewayPassword = DecryptValue((string)dataRow["RDGatewayPassword"]);
             connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"];
 
+            if (!dataRow.IsNull("RdpVersion")) // table allows null values which must be handled
+                if (Enum.TryParse((string)dataRow["RdpVersion"], true, out RdpVersion rdpVersion))
+                    connectionInfo.RdpVersion = rdpVersion;
+
             connectionInfo.Inheritance.CacheBitmaps = (bool)dataRow["InheritCacheBitmaps"];
             connectionInfo.Inheritance.Colors = (bool)dataRow["InheritColors"];
             connectionInfo.Inheritance.Description = (bool)dataRow["InheritDescription"];
@@ -192,6 +195,8 @@ namespace mRemoteNG.Config.Serializers.MsSql
             connectionInfo.Inheritance.AutomaticResize = (bool)dataRow["InheritAutomaticResize"];
             connectionInfo.Inheritance.UseConsoleSession = (bool)dataRow["InheritUseConsoleSession"];
             connectionInfo.Inheritance.UseCredSsp = (bool)dataRow["InheritUseCredSsp"];
+            connectionInfo.Inheritance.UseVmId = (bool)dataRow["InheritUseVmId"];
+            connectionInfo.Inheritance.VmId = (bool)dataRow["InheritVmId"];
             connectionInfo.Inheritance.RenderingEngine = (bool)dataRow["InheritRenderingEngine"];
             connectionInfo.Inheritance.Username = (bool)dataRow["InheritUsername"];
             connectionInfo.Inheritance.ICAEncryptionStrength = (bool)dataRow["InheritICAEncryptionStrength"];
@@ -222,6 +227,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
             connectionInfo.Inheritance.RDGatewayUsername = (bool)dataRow["InheritRDGatewayUsername"];
             connectionInfo.Inheritance.RDGatewayPassword = (bool)dataRow["InheritRDGatewayPassword"];
             connectionInfo.Inheritance.RDGatewayDomain = (bool)dataRow["InheritRDGatewayDomain"];
+            connectionInfo.Inheritance.RdpVersion = (bool)dataRow["InheritRdpVersion"];
         }
 
         private string DecryptValue(string cipherText)

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs

@@ -189,6 +189,12 @@ namespace mRemoteNG.Config.Serializers.MsSql
             dataTable.Columns.Add("InheritRDPMinutesToIdleTimeout", typeof(bool));
             dataTable.Columns.Add("InheritRDPAlertIdleTimeout", typeof(bool));
             dataTable.Columns.Add("InheritSoundQuality", typeof(bool));
+            dataTable.Columns.Add("VmId", typeof(string));
+            dataTable.Columns.Add("UseVmId", typeof(bool));
+            dataTable.Columns.Add("InheritVmId", typeof(bool));
+            dataTable.Columns.Add("InheritUseVmId", typeof(bool));
+            dataTable.Columns.Add("RdpVersion", typeof(string));
+            dataTable.Columns.Add("InheritRdpVersion", typeof(bool));
         }
 
         private void SetPrimaryKey(DataTable dataTable)
@@ -228,11 +234,13 @@ namespace mRemoteNG.Config.Serializers.MsSql
                 ? _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey)
                 : "";
             dataRow["Hostname"] = connectionInfo.Hostname;
+            dataRow["VmId"] = connectionInfo.VmId;
             dataRow["Protocol"] = connectionInfo.Protocol;
             dataRow["PuttySession"] = connectionInfo.PuttySession;
             dataRow["Port"] = connectionInfo.Port;
             dataRow["ConnectToConsole"] = connectionInfo.UseConsoleSession;
             dataRow["UseCredSsp"] = connectionInfo.UseCredSsp;
+            dataRow["UseVmId"] = connectionInfo.UseVmId;
             dataRow["RenderingEngine"] = connectionInfo.RenderingEngine;
             dataRow["ICAEncryptionStrength"] = connectionInfo.ICAEncryptionStrength;
             dataRow["RDPAuthenticationLevel"] = connectionInfo.RDPAuthenticationLevel;
@@ -256,8 +264,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
             dataRow["SoundQuality"] = connectionInfo.SoundQuality;
             dataRow["RedirectAudioCapture"] = connectionInfo.RedirectAudioCapture;
             dataRow["RedirectKeys"] = connectionInfo.RedirectKeys;
-            dataRow["Connected"] =
-                false; // TODO: this column can eventually be removed. we now save this property locally
+            dataRow["Connected"] = false; // TODO: this column can eventually be removed. we now save this property locally
             dataRow["PreExtApp"] = connectionInfo.PreExtApp;
             dataRow["PostExtApp"] = connectionInfo.PostExtApp;
             dataRow["MacAddress"] = connectionInfo.MacAddress;
@@ -281,6 +288,9 @@ namespace mRemoteNG.Config.Serializers.MsSql
             dataRow["RDGatewayUsername"] = connectionInfo.RDGatewayUsername;
             dataRow["RDGatewayPassword"] = _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey);
             dataRow["RDGatewayDomain"] = connectionInfo.RDGatewayDomain;
+            dataRow["RdpVersion"] = connectionInfo.RdpVersion;
+
+
             if (_saveFilter.SaveInheritance)
             {
                 dataRow["InheritCacheBitmaps"] = connectionInfo.Inheritance.CacheBitmaps;
@@ -312,6 +322,8 @@ namespace mRemoteNG.Config.Serializers.MsSql
                 dataRow["InheritUseCredSsp"] = connectionInfo.Inheritance.UseCredSsp;
                 dataRow["InheritRenderingEngine"] = connectionInfo.Inheritance.RenderingEngine;
                 dataRow["InheritUsername"] = connectionInfo.Inheritance.Username;
+                dataRow["InheritVmId"] = connectionInfo.Inheritance.VmId;
+                dataRow["InheritUseVmId"] = connectionInfo.Inheritance.UseVmId;
                 dataRow["InheritICAEncryptionStrength"] = connectionInfo.Inheritance.ICAEncryptionStrength;
                 dataRow["InheritRDPAuthenticationLevel"] = connectionInfo.Inheritance.RDPAuthenticationLevel;
                 dataRow["InheritRDPMinutesToIdleTimeout"] = connectionInfo.Inheritance.RDPMinutesToIdleTimeout;
@@ -335,11 +347,11 @@ namespace mRemoteNG.Config.Serializers.MsSql
                 dataRow["InheritVNCViewOnly"] = connectionInfo.Inheritance.VNCViewOnly;
                 dataRow["InheritRDGatewayUsageMethod"] = connectionInfo.Inheritance.RDGatewayUsageMethod;
                 dataRow["InheritRDGatewayHostname"] = connectionInfo.Inheritance.RDGatewayHostname;
-                dataRow["InheritRDGatewayUseConnectionCredentials"] =
-                    connectionInfo.Inheritance.RDGatewayUseConnectionCredentials;
+                dataRow["InheritRDGatewayUseConnectionCredentials"] = connectionInfo.Inheritance.RDGatewayUseConnectionCredentials;
                 dataRow["InheritRDGatewayUsername"] = connectionInfo.Inheritance.RDGatewayUsername;
                 dataRow["InheritRDGatewayPassword"] = connectionInfo.Inheritance.RDGatewayPassword;
                 dataRow["InheritRDGatewayDomain"] = connectionInfo.Inheritance.RDGatewayDomain;
+                dataRow["InheritRdpVersion"] = connectionInfo.Inheritance.RdpVersion;
             }
             else
             {
@@ -399,6 +411,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
                 dataRow["InheritRDGatewayUsername"] = false;
                 dataRow["InheritRDGatewayPassword"] = false;
                 dataRow["InheritRDGatewayDomain"] = false;
+                dataRow["InheritRdpVersion"] = false;
             }
 
             _dataTable.Rows.Add(dataRow);

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs

@@ -20,7 +20,8 @@ namespace mRemoteNG.Config.Serializers.MsSql
                 .Select(m => new XElement("Node",
                                           new XAttribute("ConnectionId", m.ConnectionId),
                                           new XAttribute("Connected", m.Connected),
-                                          new XAttribute("Expanded", m.Expanded)));
+                                          new XAttribute("Expanded", m.Expanded),
+                                          new XAttribute("Favorite", m.Favorite)));
 
             var root = new XElement("LocalConnections", localConnections);
             var xdoc = new XDocument(new XDeclaration("1.0", "utf-8", null), root);
@@ -40,7 +41,8 @@ namespace mRemoteNG.Config.Serializers.MsSql
                    {
                        ConnectionId = e.Attribute("ConnectionId")?.Value,
                        Connected = bool.Parse(e.Attribute("Connected")?.Value ?? "False"),
-                       Expanded = bool.Parse(e.Attribute("Expanded")?.Value ?? "False")
+                       Expanded = bool.Parse(e.Attribute("Expanded")?.Value ?? "False"),
+                       Favorite = bool.Parse(e.Attribute("Favorite")?.Value ?? "False")
                    });
         }
 

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs

@@ -45,6 +45,8 @@ namespace mRemoteNG.Config.Serializers.Xml
         {
             var nodeAsContainer = connectionInfo as ContainerInfo;
             element.Add(new XAttribute("Name", connectionInfo.Name));
+            element.Add(new XAttribute("VmId", connectionInfo.VmId));
+            element.Add(new XAttribute("UseVmId", connectionInfo.UseVmId));
             element.Add(new XAttribute("Type", connectionInfo.GetTreeNodeType().ToString()));
             if (nodeAsContainer != null)
                 element.Add(new XAttribute("Expanded", nodeAsContainer.IsExpanded.ToString().ToLowerInvariant()));
@@ -72,6 +74,7 @@ namespace mRemoteNG.Config.Serializers.Xml
 
             element.Add(new XAttribute("Hostname", connectionInfo.Hostname));
             element.Add(new XAttribute("Protocol", connectionInfo.Protocol));
+            element.Add(new XAttribute("RdpVersion", connectionInfo.RdpVersion.ToString().ToLowerInvariant()));
             element.Add(new XAttribute("PuttySession", connectionInfo.PuttySession));
             element.Add(new XAttribute("Port", connectionInfo.Port));
             element.Add(new XAttribute("ConnectToConsole",
@@ -191,6 +194,8 @@ namespace mRemoteNG.Config.Serializers.Xml
                                            connectionInfo.Inheritance.Port.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritProtocol",
                                            connectionInfo.Inheritance.Protocol.ToString().ToLowerInvariant()));
+                element.Add(new XAttribute("InheritRdpVersion",
+                    connectionInfo.Inheritance.RdpVersion.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritPuttySession",
                                            connectionInfo.Inheritance.PuttySession.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritRedirectDiskDrives",
@@ -205,8 +210,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 element.Add(new XAttribute("InheritRedirectClipboard",
                                            connectionInfo.Inheritance.RedirectClipboard.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritRedirectSmartCards",
-                                           connectionInfo
-                                               .Inheritance.RedirectSmartCards.ToString().ToLowerInvariant()));
+                                           connectionInfo.Inheritance.RedirectSmartCards.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritRedirectSound",
                                            connectionInfo.Inheritance.RedirectSound.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritSoundQuality",
@@ -287,7 +291,11 @@ namespace mRemoteNG.Config.Serializers.Xml
                 element.Add(new XAttribute("InheritRDGatewayPassword",
                                            connectionInfo.Inheritance.RDGatewayPassword.ToString().ToLowerInvariant()));
                 element.Add(new XAttribute("InheritRDGatewayDomain",
-                                           connectionInfo.Inheritance.RDGatewayDomain.ToString().ToLowerInvariant()));
+                    connectionInfo.Inheritance.RDGatewayDomain.ToString().ToLowerInvariant()));
+                element.Add(new XAttribute("InheritVmId",
+                    connectionInfo.Inheritance.VmId.ToString().ToLowerInvariant()));
+                element.Add(new XAttribute("InheritUseVmId",
+                    connectionInfo.Inheritance.UseVmId.ToString().ToLowerInvariant()));
             }
             else
             {

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionSerializerFactory.cs

@@ -0,0 +1,33 @@
+using System.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+
+namespace mRemoteNG.Config.Serializers.Xml
+{
+    public class XmlConnectionSerializerFactory
+    {
+        public ISerializer<ConnectionInfo, string> Build(
+            ICryptographyProvider cryptographyProvider,
+            ConnectionTreeModel connectionTreeModel,
+            SaveFilter saveFilter = null,
+            bool useFullEncryption = false)
+        {
+            var encryptionKey = connectionTreeModel
+                .RootNodes.OfType<RootNodeInfo>()
+                .First().PasswordString
+                .ConvertToSecureString();
+
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                cryptographyProvider,
+                encryptionKey,
+                saveFilter ?? new SaveFilter());
+
+            return new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer)
+            {
+                UseFullEncryption = useFullEncryption
+            };
+        }
+    }
+}

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs

@@ -226,8 +226,8 @@ namespace mRemoteNG.Config.Serializers.Xml
                     if (_confVersion < 1.1) //1.0 - 0.1
                     {
                         connectionInfo.Resolution = xmlnode.GetAttributeAsBool("Fullscreen")
-                            ? RdpProtocol.RDPResolutions.Fullscreen
-                            : RdpProtocol.RDPResolutions.FitToWindow;
+                            ? RDPResolutions.Fullscreen
+                            : RDPResolutions.FitToWindow;
                     }
 
                     if (!Runtime.UseCredentialManager || _confVersion <= 2.6) // 0.2 - 2.6
@@ -257,7 +257,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 }
                 else
                 {
-                    connectionInfo.Port = (int)RdpProtocol.Defaults.Port;
+                    connectionInfo.Port = (int)RdpProtocol6.Defaults.Port;
                     connectionInfo.Protocol = ProtocolType.RDP;
                 }
 
@@ -279,7 +279,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                         if (xmlnode.GetAttributeAsBool("UseVNC"))
                             connectionInfo.Port = (int)ProtocolVNC.Defaults.Port;
                         else
-                            connectionInfo.Port = (int)RdpProtocol.Defaults.Port;
+                            connectionInfo.Port = (int)RdpProtocol6.Defaults.Port;
                     }
 
                     connectionInfo.UseConsoleSession = false;
@@ -318,9 +318,9 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 1.3)
                 {
-                    connectionInfo.Colors = xmlnode.GetAttributeAsEnum<RdpProtocol.RDPColors>("Colors");
-                    connectionInfo.Resolution = xmlnode.GetAttributeAsEnum<RdpProtocol.RDPResolutions>("Resolution");
-                    connectionInfo.RedirectSound = xmlnode.GetAttributeAsEnum<RdpProtocol.RDPSounds>("RedirectSound");
+                    connectionInfo.Colors = xmlnode.GetAttributeAsEnum<RDPColors>("Colors");
+                    connectionInfo.Resolution = xmlnode.GetAttributeAsEnum<RDPResolutions>("Resolution");
+                    connectionInfo.RedirectSound = xmlnode.GetAttributeAsEnum<RDPSounds>("RedirectSound");
                     connectionInfo.RedirectAudioCapture = xmlnode.GetAttributeAsBool("RedirectAudioCapture");
                 }
                 else
@@ -328,25 +328,25 @@ namespace mRemoteNG.Config.Serializers.Xml
                     switch (xmlnode.GetAttributeAsInt("Colors"))
                     {
                         case 0:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors256;
+                            connectionInfo.Colors = RDPColors.Colors256;
                             break;
                         case 1:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors16Bit;
+                            connectionInfo.Colors = RDPColors.Colors16Bit;
                             break;
                         case 2:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors24Bit;
+                            connectionInfo.Colors = RDPColors.Colors24Bit;
                             break;
                         case 3:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors32Bit;
+                            connectionInfo.Colors = RDPColors.Colors32Bit;
                             break;
                         // ReSharper disable once RedundantCaseLabel
                         case 4:
                         default:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors15Bit;
+                            connectionInfo.Colors = RDPColors.Colors15Bit;
                             break;
                     }
 
-                    connectionInfo.RedirectSound = xmlnode.GetAttributeAsEnum<RdpProtocol.RDPSounds>("RedirectSound");
+                    connectionInfo.RedirectSound = xmlnode.GetAttributeAsEnum<RDPSounds>("RedirectSound");
                     connectionInfo.RedirectAudioCapture = xmlnode.GetAttributeAsBool("RedirectAudioCapture");
                 }
 
@@ -442,7 +442,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 if (_confVersion >= 1.8)
                 {
                     connectionInfo.RDPAuthenticationLevel =
-                        xmlnode.GetAttributeAsEnum<RdpProtocol.AuthenticationLevel>("RDPAuthenticationLevel");
+                        xmlnode.GetAttributeAsEnum<AuthenticationLevel>("RDPAuthenticationLevel");
                     connectionInfo.Inheritance.RDPAuthenticationLevel =
                         xmlnode.GetAttributeAsBool("InheritRDPAuthenticationLevel");
                 }
@@ -472,10 +472,10 @@ namespace mRemoteNG.Config.Serializers.Xml
                 {
                     // Get settings
                     connectionInfo.RDGatewayUsageMethod =
-                        xmlnode.GetAttributeAsEnum<RdpProtocol.RDGatewayUsageMethod>("RDGatewayUsageMethod");
+                        xmlnode.GetAttributeAsEnum<RDGatewayUsageMethod>("RDGatewayUsageMethod");
                     connectionInfo.RDGatewayHostname = xmlnode.GetAttributeAsString("RDGatewayHostname");
                     connectionInfo.RDGatewayUseConnectionCredentials =
-                        xmlnode.GetAttributeAsEnum<RdpProtocol.RDGatewayUseConnectionCredentials>(
+                        xmlnode.GetAttributeAsEnum<RDGatewayUseConnectionCredentials>(
                                                                                                   "RDGatewayUseConnectionCredentials");
                     connectionInfo.RDGatewayUsername = xmlnode.GetAttributeAsString("RDGatewayUsername");
                     connectionInfo.RDGatewayPassword =
@@ -526,7 +526,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 if (_confVersion >= 2.6)
                 {
                     connectionInfo.SoundQuality =
-                        xmlnode.GetAttributeAsEnum<RdpProtocol.RDPSoundQuality>("SoundQuality");
+                        xmlnode.GetAttributeAsEnum<RDPSoundQuality>("SoundQuality");
                     connectionInfo.Inheritance.SoundQuality = xmlnode.GetAttributeAsBool("InheritSoundQuality");
                     connectionInfo.RDPMinutesToIdleTimeout = xmlnode.GetAttributeAsInt("RDPMinutesToIdleTimeout");
                     connectionInfo.Inheritance.RDPMinutesToIdleTimeout =
@@ -539,17 +539,22 @@ namespace mRemoteNG.Config.Serializers.Xml
                 if (_confVersion >= 2.7)
                 {
                     connectionInfo.RedirectClipboard = xmlnode.GetAttributeAsBool("RedirectClipboard");
-                    connectionInfo.Inheritance.RedirectClipboard = xmlnode.GetAttributeAsBool("InheritRedirectClipboard");
                     connectionInfo.Favorite = xmlnode.GetAttributeAsBool("Favorite");
+                    connectionInfo.UseVmId = xmlnode.GetAttributeAsBool("UseVmId");
+                    connectionInfo.VmId = xmlnode.GetAttributeAsString("VmId");
+                    connectionInfo.Inheritance.RedirectClipboard = xmlnode.GetAttributeAsBool("InheritRedirectClipboard");
                     connectionInfo.Inheritance.Favorite = xmlnode.GetAttributeAsBool("InheritFavorite");
+                    connectionInfo.RdpVersion = xmlnode.GetAttributeAsEnum("RdpVersion", RdpVersion.Highest);
+                    connectionInfo.Inheritance.RdpVersion = xmlnode.GetAttributeAsBool("InheritRdpVersion");
+                    connectionInfo.Inheritance.UseVmId = xmlnode.GetAttributeAsBool("InheritUseVmId");
+                    connectionInfo.Inheritance.VmId = xmlnode.GetAttributeAsBool("InheritVmId");
                 }
             }
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    string.Format(Language.strGetConnectionInfoFromXmlFailed,
-                                                                  connectionInfo.Name, ConnectionFileName,
-                                                                  ex.Message));
+                    string.Format(Language.strGetConnectionInfoFromXmlFailed,
+                        connectionInfo.Name, ConnectionFileName, ex.Message));
             }
 
             return connectionInfo;

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompiler.cs

@@ -61,7 +61,7 @@ namespace mRemoteNG.Config.Serializers.Xml
 
             var serializationTargetAsContainer = serializationTarget as ContainerInfo;
             if (serializationTargetAsContainer == null) return;
-            foreach (var child in serializationTargetAsContainer.Children)
+            foreach (var child in serializationTargetAsContainer.Children.ToArray())
                 CompileRecursive(child, newElement);
         }
 

mRemoteV1/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs

@@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
 using mRemoteNG.App;
 using mRemoteNG.Config.Import;
 using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
@@ -79,8 +80,7 @@ namespace mRemoteNG.Config.Serializers
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage("Config.Import.ActiveDirectory.ImportComputers() failed.",
-                                                             ex);
+                Runtime.MessageCollector.AddExceptionMessage("Config.Import.ActiveDirectory.ImportComputers() failed.", ex);
             }
         }
 
@@ -94,10 +94,9 @@ namespace mRemoteNG.Config.Serializers
             {
                 Name = displayName,
                 Hostname = hostName,
-                Description = description
+                Description = description,
+                Protocol = ProtocolType.RDP
             };
-            newConnectionInfo.Inheritance.TurnOnInheritanceCompletely();
-            newConnectionInfo.Inheritance.Description = false;
 
             parentContainer.AddChild(newConnectionInfo);
         }

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs

@@ -60,19 +60,19 @@ namespace mRemoteNG.Config.Serializers
                     switch (value)
                     {
                         case "8":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors256;
+                            connectionInfo.Colors = RDPColors.Colors256;
                             break;
                         case "15":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors15Bit;
+                            connectionInfo.Colors = RDPColors.Colors15Bit;
                             break;
                         case "16":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors16Bit;
+                            connectionInfo.Colors = RDPColors.Colors16Bit;
                             break;
                         case "24":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors24Bit;
+                            connectionInfo.Colors = RDPColors.Colors24Bit;
                             break;
                         case "32":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors32Bit;
+                            connectionInfo.Colors = RDPColors.Colors32Bit;
                             break;
                     }
                     break;
@@ -81,8 +81,8 @@ namespace mRemoteNG.Config.Serializers
                     break;
                 case "screen mode id":
                     connectionInfo.Resolution = value == "2"
-                        ? RdpProtocol.RDPResolutions.Fullscreen
-                        : RdpProtocol.RDPResolutions.FitToWindow;
+                        ? RDPResolutions.Fullscreen
+                        : RDPResolutions.FitToWindow;
                     break;
                 case "connect to console":
                     connectionInfo.UseConsoleSession = value == "1";
@@ -118,13 +118,13 @@ namespace mRemoteNG.Config.Serializers
                     switch (value)
                     {
                         case "0":
-                            connectionInfo.RedirectSound = RdpProtocol.RDPSounds.BringToThisComputer;
+                            connectionInfo.RedirectSound = RDPSounds.BringToThisComputer;
                             break;
                         case "1":
-                            connectionInfo.RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer;
+                            connectionInfo.RedirectSound = RDPSounds.LeaveAtRemoteComputer;
                             break;
                         case "2":
-                            connectionInfo.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+                            connectionInfo.RedirectSound = RDPSounds.DoNotPlay;
                             break;
                     }
                     break;
@@ -138,13 +138,13 @@ namespace mRemoteNG.Config.Serializers
                     switch (value)
                     {
                         case "0":
-                            connectionInfo.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Never;
+                            connectionInfo.RDGatewayUsageMethod = RDGatewayUsageMethod.Never;
                             break;
                         case "1":
-                            connectionInfo.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+                            connectionInfo.RDGatewayUsageMethod = RDGatewayUsageMethod.Always;
                             break;
                         case "2":
-                            connectionInfo.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Detect;
+                            connectionInfo.RDGatewayUsageMethod = RDGatewayUsageMethod.Detect;
                             break;
                     }
                     break;

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -139,6 +139,8 @@ namespace mRemoteNG.Config.Serializers
             if (_schemaVersion == 1)
 	            propertiesNode = xmlNode;  // Version 2.2 defines the container name at the root instead
 
+            connectionInfo.VmId = propertiesNode?.SelectSingleNode("./vmid")?.InnerText ?? "";
+
             connectionInfo.Hostname = propertiesNode?.SelectSingleNode("./name")?.InnerText ?? "";
 
             var connectionDisplayName = propertiesNode?.SelectSingleNode("./displayName")?.InnerText;
@@ -197,8 +199,8 @@ namespace mRemoteNG.Config.Serializers
             {
                 connectionInfo.RDGatewayUsageMethod =
                     gatewaySettingsNode.SelectSingleNode("./enabled")?.InnerText == "True"
-                        ? RdpProtocol.RDGatewayUsageMethod.Always
-                        : RdpProtocol.RDGatewayUsageMethod.Never;
+                        ? RDGatewayUsageMethod.Always
+                        : RDGatewayUsageMethod.Never;
                 connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName")?.InnerText ?? string.Empty;
                 connectionInfo.RDGatewayUsername = gatewaySettingsNode.SelectSingleNode("./userName")?.InnerText ?? string.Empty;
 
@@ -225,21 +227,21 @@ namespace mRemoteNG.Config.Serializers
             if (remoteDesktopNode?.Attributes?["inherit"]?.Value == "None")
             {
                 connectionInfo.Resolution = 
-	                Enum.TryParse<RdpProtocol.RDPResolutions>(remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", ""), true, out var rdpResolution)
+	                Enum.TryParse<RDPResolutions>(remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", ""), true, out var rdpResolution)
 	                ? rdpResolution
-                    : RdpProtocol.RDPResolutions.FitToWindow;
+                    : RDPResolutions.FitToWindow;
 
                 if (remoteDesktopNode.SelectSingleNode("./sameSizeAsClientArea")?.InnerText == "True")
                 {
-                    connectionInfo.Resolution = RdpProtocol.RDPResolutions.FitToWindow;
+                    connectionInfo.Resolution = RDPResolutions.FitToWindow;
                 }
 
                 if (remoteDesktopNode.SelectSingleNode("./fullScreen")?.InnerText == "True")
                 {
-                    connectionInfo.Resolution = RdpProtocol.RDPResolutions.Fullscreen;
+                    connectionInfo.Resolution = RDPResolutions.Fullscreen;
                 }
 
-                if (Enum.TryParse<RdpProtocol.RDPColors>(remoteDesktopNode.SelectSingleNode("./colorDepth")?.InnerText, true, out var rdpColors))
+                if (Enum.TryParse<RDPColors>(remoteDesktopNode.SelectSingleNode("./colorDepth")?.InnerText, true, out var rdpColors))
 	                connectionInfo.Colors = rdpColors;
             }
             else
@@ -256,15 +258,15 @@ namespace mRemoteNG.Config.Serializers
                 {
                     case "0": // Bring to this computer
                     case "Client":
-                        connectionInfo.RedirectSound = RdpProtocol.RDPSounds.BringToThisComputer;
+                        connectionInfo.RedirectSound = RDPSounds.BringToThisComputer;
                         break;
                     case "1": // Leave at remote computer
                     case "Remote":
-                        connectionInfo.RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer;
+                        connectionInfo.RedirectSound = RDPSounds.LeaveAtRemoteComputer;
                         break;
                     case "2": // Do not play
                     case "NoSound":
-                        connectionInfo.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+                        connectionInfo.RedirectSound = RDPSounds.DoNotPlay;
                         break;
                 }
 
@@ -323,15 +325,15 @@ namespace mRemoteNG.Config.Serializers
                 {
                     case "0": // No authentication
                     case "None":
-                        connectionInfo.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.NoAuth;
+                        connectionInfo.RDPAuthenticationLevel = AuthenticationLevel.NoAuth;
                         break;
                     case "1": // Do not connect if authentication fails
                     case "Required":
-                        connectionInfo.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+                        connectionInfo.RDPAuthenticationLevel = AuthenticationLevel.AuthRequired;
                         break;
                     case "2": // Warn if authentication fails
                     case "Warn":
-                        connectionInfo.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth;
+                        connectionInfo.RDPAuthenticationLevel = AuthenticationLevel.WarnOnFailedAuth;
                         break;
                 }
             }

mRemoteV1/Config/Serializers/Versioning/SqlVersion26To27Upgrader.cs

@@ -11,10 +11,7 @@ namespace mRemoteNG.Config.Serializers.Versioning
 
         public SqlVersion26To27Upgrader(IDatabaseConnector databaseConnector)
         {
-            if (databaseConnector == null)
-                throw new ArgumentNullException(nameof(databaseConnector));
-
-            _databaseConnector = databaseConnector;
+            _databaseConnector = databaseConnector ?? throw new ArgumentNullException(nameof(databaseConnector));
         }
 
         public bool CanUpgrade(Version currentVersion)
@@ -29,7 +26,11 @@ namespace mRemoteNG.Config.Serializers.Versioning
             const string sqlText = @"
 ALTER TABLE tblCons
 ADD RedirectClipboard bit NOT NULL DEFAULT 0,
-	InheritRedirectClipboard bit NOT NULL DEFAULT 0;
+	InheritRedirectClipboard bit NOT NULL DEFAULT 0,
+    VmId varchar NOT NULL DEFAULT 0,
+    UseVmId bit NOT NULL DEFAULT 0,
+    InheritVmId bit NOT NULL DEFAULT 0,
+    InheritUseVmId bit NOT NULL DEFAULT 0;
 UPDATE tblRoot
     SET ConfVersion='2.7'";
             var dbCommand = _databaseConnector.DbCommand(sqlText);

mRemoteV1/Config/Settings/ExternalAppsLoader.cs

@@ -4,6 +4,7 @@ using mRemoteNG.App.Info;
 using mRemoteNG.UI.Forms;
 using System.IO;
 using System.Xml;
+using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Controls;
@@ -13,12 +14,14 @@ namespace mRemoteNG.Config.Settings
     public class ExternalAppsLoader
     {
         private readonly FrmMain _mainForm;
+        private readonly IConnectionInitiator _connectionInitiator;
         private readonly MessageCollector _messageCollector;
         private readonly ExternalToolsToolStrip _externalToolsToolStrip;
 
         public ExternalAppsLoader(FrmMain mainForm,
                                   MessageCollector messageCollector,
-                                  ExternalToolsToolStrip externalToolsToolStrip)
+                                  ExternalToolsToolStrip externalToolsToolStrip,
+                                  IConnectionInitiator connectionInitiator)
         {
             if (mainForm == null)
                 throw new ArgumentNullException(nameof(mainForm));
@@ -30,6 +33,7 @@ namespace mRemoteNG.Config.Settings
             _mainForm = mainForm;
             _messageCollector = messageCollector;
             _externalToolsToolStrip = externalToolsToolStrip;
+            _connectionInitiator = connectionInitiator;
         }
 
 
@@ -71,7 +75,7 @@ namespace mRemoteNG.Config.Settings
 
             foreach (XmlElement xEl in xDom.DocumentElement.ChildNodes)
             {
-                var extA = new ExternalTool
+                var extA = new ExternalTool(_connectionInitiator)
                 {
                     DisplayName = xEl.Attributes["DisplayName"].Value,
                     FileName = xEl.Attributes["FileName"].Value,

mRemoteV1/Config/Settings/SettingsLoader.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 using WeifenLuo.WinFormsUI.Docking;
@@ -7,6 +7,7 @@ using System.Threading;
 using System.Globalization;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.App.Info;
+using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Controls;
@@ -23,16 +24,19 @@ namespace mRemoteNG.Config.Settings
         private readonly QuickConnectToolStrip _quickConnectToolStrip;
         private readonly ExternalToolsToolStrip _externalToolsToolStrip;
         private readonly MultiSshToolStrip _multiSshToolStrip;
+        private readonly IConnectionInitiator _connectionInitiator;
 
         private FrmMain MainForm { get; }
 
 
-        public SettingsLoader(FrmMain mainForm,
-                              MessageCollector messageCollector,
-                              QuickConnectToolStrip quickConnectToolStrip,
-                              ExternalToolsToolStrip externalToolsToolStrip,
-                              MultiSshToolStrip multiSshToolStrip,
-                              MenuStrip mainMenu)
+        public SettingsLoader(
+            FrmMain mainForm,
+            IConnectionInitiator connectionInitiator,
+            MessageCollector messageCollector,
+            QuickConnectToolStrip quickConnectToolStrip,
+            ExternalToolsToolStrip externalToolsToolStrip,
+            MultiSshToolStrip multiSshToolStrip,
+            MenuStrip mainMenu)
         {
             if (mainForm == null)
                 throw new ArgumentNullException(nameof(mainForm));
@@ -53,7 +57,8 @@ namespace mRemoteNG.Config.Settings
             _externalToolsToolStrip = externalToolsToolStrip;
             _multiSshToolStrip = multiSshToolStrip;
             _mainMenu = mainMenu;
-            _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip);
+            _connectionInitiator = connectionInitiator;
+            _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip, _connectionInitiator);
         }
 
         #region Public Methods
@@ -156,10 +161,10 @@ namespace mRemoteNG.Config.Settings
             MainForm.Fullscreen.Value = true;
         }
 
-        private static void SetShowSystemTrayIcon()
+        private void SetShowSystemTrayIcon()
         {
             if (mRemoteNG.Settings.Default.ShowSystemTrayIcon)
-                Runtime.NotificationAreaIcon = new NotificationAreaIcon();
+                Runtime.NotificationAreaIcon = new NotificationAreaIcon(_connectionInitiator);
         }
 
         private static void SetPuttyPath()

mRemoteV1/Connection/AbstractConnectionRecord.cs

@@ -24,30 +24,33 @@ namespace mRemoteNG.Connection
         private string _username = "";
         private string _password = "";
         private string _domain = "";
+        private string _vmId = "";
 
         private ProtocolType _protocol;
+        private RdpVersion _rdpProtocolVersion;
         private string _extApp;
         private int _port;
         private string _puttySession;
         private IcaProtocol.EncryptionStrength _icaEncryption;
         private bool _useConsoleSession;
-        private RdpProtocol.AuthenticationLevel _rdpAuthenticationLevel;
+        private AuthenticationLevel _rdpAuthenticationLevel;
         private int _rdpMinutesToIdleTimeout;
         private bool _rdpAlertIdleTimeout;
         private string _loadBalanceInfo;
         private HTTPBase.RenderingEngine _renderingEngine;
         private bool _useCredSsp;
+        private bool _useVmId;
 
-        private RdpProtocol.RDGatewayUsageMethod _rdGatewayUsageMethod;
+        private RDGatewayUsageMethod _rdGatewayUsageMethod;
         private string _rdGatewayHostname;
-        private RdpProtocol.RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
+        private RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
         private string _rdGatewayUsername;
         private string _rdGatewayPassword;
         private string _rdGatewayDomain;
 
-        private RdpProtocol.RDPResolutions _resolution;
+        private RDPResolutions _resolution;
         private bool _automaticResize;
-        private RdpProtocol.RDPColors _colors;
+        private RDPColors _colors;
         private bool _cacheBitmaps;
         private bool _displayWallpaper;
         private bool _displayThemes;
@@ -60,8 +63,8 @@ namespace mRemoteNG.Connection
         private bool _redirectClipboard;
         private bool _redirectPorts;
         private bool _redirectSmartCards;
-        private RdpProtocol.RDPSounds _redirectSound;
-        private RdpProtocol.RDPSoundQuality _soundQuality;
+        private RDPSounds _redirectSound;
+        private RDPSoundQuality _soundQuality;
         private bool _redirectAudioCapture;
 
         private string _preExtApp;
@@ -139,6 +142,16 @@ namespace mRemoteNG.Connection
             set => SetField(ref _hostname, value?.Trim(), "Hostname");
         }
 
+        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
+         LocalizedAttributes.LocalizedDisplayName("strPropertyNamePort"),
+         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPort"),
+         UsedInAllProtocolsExcept(ProtocolType.ICA)]
+        public virtual int Port
+        {
+            get => GetPropertyValue("Port", _port);
+            set => SetField(ref _port, value, "Port");
+        }
+
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
          LocalizedAttributes.LocalizedDisplayName("strPropertyNameUsername"),
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUsername"),
@@ -170,6 +183,16 @@ namespace mRemoteNG.Connection
             set => SetField(ref _domain, value?.Trim(), "Domain");
         }
 
+        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
+         LocalizedAttributes.LocalizedDisplayName("strPropertyNameVmId"),
+         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVmId"),
+         UsedInProtocol(ProtocolType.RDP)]
+        public string VmId
+        {
+            get => GetPropertyValue("VmId", _vmId).Trim();
+            set => SetField(ref _vmId, value?.Trim(), "VmId");
+        }
+
         #endregion
 
         #region Protocol
@@ -184,6 +207,17 @@ namespace mRemoteNG.Connection
             set => SetField(ref _protocol, value, "Protocol");
         }
 
+        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
+         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRdpVersion"),
+         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRdpVersion"),
+         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
+         UsedInProtocol(ProtocolType.RDP)]
+        public virtual RdpVersion RdpVersion
+        {
+            get => GetPropertyValue(nameof(RdpVersion), _rdpProtocolVersion);
+            set => SetField(ref _rdpProtocolVersion, value, nameof(RdpVersion));
+        }
+
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
          LocalizedAttributes.LocalizedDisplayName("strPropertyNameExternalTool"),
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionExternalTool"),
@@ -195,16 +229,6 @@ namespace mRemoteNG.Connection
             set => SetField(ref _extApp, value, "ExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNamePort"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPort"),
-         UsedInAllProtocolsExcept(ProtocolType.ICA)]
-        public virtual int Port
-        {
-            get => GetPropertyValue("Port", _port);
-            set => SetField(ref _port, value, "Port");
-        }
-
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
          LocalizedAttributes.LocalizedDisplayName("strPropertyNamePuttySession"),
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPuttySession"),
@@ -244,7 +268,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAuthenticationLevel"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
-        public RdpProtocol.AuthenticationLevel RDPAuthenticationLevel
+        public AuthenticationLevel RDPAuthenticationLevel
         {
             get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel);
             set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel");
@@ -309,6 +333,17 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useCredSsp, value, "UseCredSsp");
         }
 
+        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
+         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUseVmId"),
+         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUseVmId"),
+         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
+         UsedInProtocol(ProtocolType.RDP)]
+        public bool UseVmId
+        {
+            get => GetPropertyValue("UseVmId", _useVmId);
+            set => SetField(ref _useVmId, value, "UseVmId");
+        }
+
         #endregion
 
         #region RD Gateway
@@ -318,7 +353,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsageMethod"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
-        public RdpProtocol.RDGatewayUsageMethod RDGatewayUsageMethod
+        public RDGatewayUsageMethod RDGatewayUsageMethod
         {
             get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod);
             set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod");
@@ -339,7 +374,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUseConnectionCredentials"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
-        public RdpProtocol.RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
+        public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
         {
             get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials);
             set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials");
@@ -385,7 +420,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionResolution"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
-        public RdpProtocol.RDPResolutions Resolution
+        public RDPResolutions Resolution
         {
             get => GetPropertyValue("Resolution", _resolution);
             set => SetField(ref _resolution, value, "Resolution");
@@ -407,7 +442,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionColors"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
-        public RdpProtocol.RDPColors Colors
+        public RDPColors Colors
         {
             get => GetPropertyValue("Colors", _colors);
             set => SetField(ref _colors, value, "Colors");
@@ -544,7 +579,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectSounds"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
-        public RdpProtocol.RDPSounds RedirectSound
+        public RDPSounds RedirectSound
         {
             get => GetPropertyValue("RedirectSound", _redirectSound);
             set => SetField(ref _redirectSound, value, "RedirectSound");
@@ -555,7 +590,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionSoundQuality"),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
-        public RdpProtocol.RDPSoundQuality SoundQuality
+        public RDPSoundQuality SoundQuality
         {
             get => GetPropertyValue("SoundQuality", _soundQuality);
             set => SetField(ref _soundQuality, value, "SoundQuality");

mRemoteV1/Connection/ConnectionInfo.cs

@@ -246,7 +246,7 @@ namespace mRemoteNG.Connection
                 switch (protocol)
                 {
                     case ProtocolType.RDP:
-                        return (int)RdpProtocol.Defaults.Port;
+                        return (int)RdpProtocol6.Defaults.Port;
                     case ProtocolType.VNC:
                         return (int)ProtocolVNC.Defaults.Port;
                     case ProtocolType.SSH1:
@@ -297,42 +297,27 @@ namespace mRemoteNG.Connection
             ExtApp = Settings.Default.ConDefaultExtApp;
             Port = 0;
             PuttySession = Settings.Default.ConDefaultPuttySession;
-            ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse(typeof(IcaProtocol.EncryptionStrength),
-                                                                               Settings
-                                                                                   .Default
-                                                                                   .ConDefaultICAEncryptionStrength);
+            ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse(
+                typeof(IcaProtocol.EncryptionStrength), Settings.Default.ConDefaultICAEncryptionStrength);
             UseConsoleSession = Settings.Default.ConDefaultUseConsoleSession;
-            RDPAuthenticationLevel = (RdpProtocol.AuthenticationLevel)Enum.Parse(
-                                                                                 typeof(RdpProtocol.AuthenticationLevel
-                                                                                 ),
-                                                                                 Settings
-                                                                                     .Default
-                                                                                     .ConDefaultRDPAuthenticationLevel);
+            RDPAuthenticationLevel = (AuthenticationLevel)Enum.Parse(
+                typeof(AuthenticationLevel), Settings.Default.ConDefaultRDPAuthenticationLevel);
             RDPMinutesToIdleTimeout = Settings.Default.ConDefaultRDPMinutesToIdleTimeout;
             RDPAlertIdleTimeout = Settings.Default.ConDefaultRDPAlertIdleTimeout;
             LoadBalanceInfo = Settings.Default.ConDefaultLoadBalanceInfo;
             RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine),
                                                                    Settings.Default.ConDefaultRenderingEngine);
             UseCredSsp = Settings.Default.ConDefaultUseCredSsp;
+            UseVmId = Settings.Default.ConDefaultUseVmId;
         }
 
         private void SetRdGatewayDefaults()
         {
-            RDGatewayUsageMethod = (RdpProtocol.RDGatewayUsageMethod)Enum.Parse(
-                                                                                typeof(RdpProtocol.RDGatewayUsageMethod
-                                                                                ),
-                                                                                Settings
-                                                                                    .Default
-                                                                                    .ConDefaultRDGatewayUsageMethod);
+            RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse(
+                typeof(RDGatewayUsageMethod), Settings.Default.ConDefaultRDGatewayUsageMethod);
             RDGatewayHostname = Settings.Default.ConDefaultRDGatewayHostname;
-            RDGatewayUseConnectionCredentials = (RdpProtocol.RDGatewayUseConnectionCredentials)Enum.Parse(
-                                                                                                          typeof(
-                                                                                                              RdpProtocol
-                                                                                                              .RDGatewayUseConnectionCredentials
-                                                                                                          ),
-                                                                                                          Settings
-                                                                                                              .Default
-                                                                                                              .ConDefaultRDGatewayUseConnectionCredentials);
+            RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)Enum.Parse(
+                typeof(RDGatewayUseConnectionCredentials), Settings.Default.ConDefaultRDGatewayUseConnectionCredentials);
             RDGatewayUsername = Settings.Default.ConDefaultRDGatewayUsername;
             RDGatewayPassword = Settings.Default.ConDefaultRDGatewayPassword;
             RDGatewayDomain = Settings.Default.ConDefaultRDGatewayDomain;
@@ -340,11 +325,10 @@ namespace mRemoteNG.Connection
 
         private void SetAppearanceDefaults()
         {
-            Resolution = (RdpProtocol.RDPResolutions)Enum.Parse(typeof(RdpProtocol.RDPResolutions),
-                                                                Settings.Default.ConDefaultResolution);
+            Resolution = (RDPResolutions)Enum.Parse(
+                typeof(RDPResolutions), Settings.Default.ConDefaultResolution);
             AutomaticResize = Settings.Default.ConDefaultAutomaticResize;
-            Colors = (RdpProtocol.RDPColors)Enum.Parse(typeof(RdpProtocol.RDPColors),
-                                                       Settings.Default.ConDefaultColors);
+            Colors = (RDPColors)Enum.Parse(typeof(RDPColors), Settings.Default.ConDefaultColors);
             CacheBitmaps = Settings.Default.ConDefaultCacheBitmaps;
             DisplayWallpaper = Settings.Default.ConDefaultDisplayWallpaper;
             DisplayThemes = Settings.Default.ConDefaultDisplayThemes;
@@ -360,9 +344,9 @@ namespace mRemoteNG.Connection
             RedirectClipboard = Settings.Default.ConDefaultRedirectClipboard;
             RedirectPorts = Settings.Default.ConDefaultRedirectPorts;
             RedirectSmartCards = Settings.Default.ConDefaultRedirectSmartCards;
-            RedirectSound = (RdpProtocol.RDPSounds)Enum.Parse(typeof(RdpProtocol.RDPSounds),
+            RedirectSound = (RDPSounds)Enum.Parse(typeof(RDPSounds),
                                                               Settings.Default.ConDefaultRedirectSound);
-            SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality),
+            SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality),
                                                                    Settings.Default.ConDefaultSoundQuality);
             RedirectAudioCapture = Settings.Default.ConDefaultRedirectAudioCapture;
         }
@@ -380,10 +364,8 @@ namespace mRemoteNG.Connection
         {
             VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression),
                                                                  Settings.Default.ConDefaultVNCCompression);
-            VNCEncoding =
-                (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), Settings.Default.ConDefaultVNCEncoding);
-            VNCAuthMode =
-                (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), Settings.Default.ConDefaultVNCAuthMode);
+            VNCEncoding = (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), Settings.Default.ConDefaultVNCEncoding);
+            VNCAuthMode = (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), Settings.Default.ConDefaultVNCAuthMode);
             VNCProxyType = (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType),
                                                              Settings.Default.ConDefaultVNCProxyType);
             VNCProxyIP = Settings.Default.ConDefaultVNCProxyIP;
@@ -401,7 +383,6 @@ namespace mRemoteNG.Connection
         {
             _inheritance = new ConnectionInfoInheritance(this);
             SetNewOpenConnectionList();
-            //PositionID = 0;
         }
 
         private void SetNewOpenConnectionList()

mRemoteV1/Connection/ConnectionInfoInheritance.cs

@@ -15,13 +15,13 @@ namespace mRemoteNG.Connection
         #region General
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGeneral"),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameAll"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionAll"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAll"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAll"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EverythingInherited
         {
-            get { return EverythingIsInherited(); }
-            set { SetAllValues(value); }
+            get => EverythingIsInherited();
+            set => SetAllValues(value);
         }
 
         #endregion
@@ -29,20 +29,20 @@ namespace mRemoteNG.Connection
         #region Display
 
         [LocalizedAttributes.LocalizedCategory("strCategoryDisplay", 2),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameDescription"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionDescription"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDescription"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDescription"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Description { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryDisplay", 2),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameIcon"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionIcon"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameIcon"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionIcon"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Icon { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryDisplay", 2),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNamePanel"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionPanel"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePanel"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPanel"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Panel { get; set; }
 
@@ -51,140 +51,159 @@ namespace mRemoteNG.Connection
         #region Connection
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameUsername"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionUsername"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUsername"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUsername"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Username { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNamePassword"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionPassword"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVmId"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVmId"),
+         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
+        [Browsable(true)]
+        public bool VmId { get; set; }
+
+        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePassword"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPassword"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Password { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameDomain"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionDomain"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDomain"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDomain"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Domain { get; set; }
 
+        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePort"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPort"),
+         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
+        public bool Port { get; set; }
+
         #endregion
 
         #region Protocol
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameProtocol"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionProtocol"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameProtocol"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionProtocol"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Protocol { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameExternalTool"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalTool"),
+         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRdpVersion"),
+         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRdpVersion"),
+         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
+        public bool RdpVersion { get; set; }
+
+        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameExternalTool"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionExternalTool"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool ExtApp { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNamePort"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionPort"),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Port { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNamePuttySession"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionPuttySession"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePuttySession"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPuttySession"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PuttySession { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameEncryptionStrength"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionEncryptionStrength"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEncryptionStrength"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionEncryptionStrength"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool ICAEncryptionStrength { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameAuthenticationLevel"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationLevel"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAuthenticationLevel"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAuthenticationLevel"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPAuthenticationLevel { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDPMinutesToIdleTimeout"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDPMinutesToIdleTimeout"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDPMinutesToIdleTimeout"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDPMinutesToIdleTimeout"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPMinutesToIdleTimeout { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDPAlertIdleTimeout"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDPAlertIdleTimeout"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDPAlertIdleTimeout"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDPAlertIdleTimeout"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPAlertIdleTimeout { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameLoadBalanceInfo"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionLoadBalanceInfo"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameLoadBalanceInfo"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionLoadBalanceInfo"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool LoadBalanceInfo { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRenderingEngine"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRenderingEngine"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRenderingEngine"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRenderingEngine"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RenderingEngine { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameUseConsoleSession"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionUseConsoleSession"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseConsoleSession"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseConsoleSession"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseConsoleSession { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameUseCredSsp"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionUseCredSsp"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseCredSsp"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseCredSsp"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseCredSsp { get; set; }
 
+        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseVmId"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseVmId"),
+         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
+        public bool UseVmId { get; set; }
+
         #endregion
 
         #region RD Gateway
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUsageMethod"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUsageMethod"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayUsageMethod"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayUsageMethod"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUsageMethod { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayHostname"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayHostname"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayHostname"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayHostname"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayHostname { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUseConnectionCredentials"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute(
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayUseConnectionCredentials"),
+         LocalizedAttributes.LocalizedDescriptionInherit(
              "strPropertyDescriptionRDGatewayUseConnectionCredentials"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUseConnectionCredentials { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayUsername"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayUsername"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayUsername"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayUsername"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUsername { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayPassword"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayPassword"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayPassword"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayPassword"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayPassword { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRDGatewayDomain"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRDGatewayDomain"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayDomain"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayDomain"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayDomain { get; set; }
 
@@ -193,50 +212,50 @@ namespace mRemoteNG.Connection
         #region Appearance
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameResolution"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionResolution"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameResolution"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionResolution"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Resolution { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameAutomaticResize"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionAutomaticResize"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAutomaticResize"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAutomaticResize"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool AutomaticResize { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameColors"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionColors"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameColors"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionColors"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Colors { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameCacheBitmaps"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionCacheBitmaps"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameCacheBitmaps"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionCacheBitmaps"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool CacheBitmaps { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameDisplayWallpaper"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionDisplayWallpaper"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDisplayWallpaper"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDisplayWallpaper"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayWallpaper { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameDisplayThemes"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionDisplayThemes"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDisplayThemes"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDisplayThemes"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayThemes { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameEnableFontSmoothing"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionEnableFontSmoothing"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEnableFontSmoothing"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionEnableFontSmoothing"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableFontSmoothing { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameEnableDesktopComposition"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute(
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEnableDesktopComposition"),
+         LocalizedAttributes.LocalizedDescriptionInherit(
              "strPropertyDescriptionEnableEnableDesktopComposition"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableDesktopComposition { get; set; }
@@ -246,56 +265,56 @@ namespace mRemoteNG.Connection
         #region Redirect
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectKeys"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectKeys"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectKeys"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectKeys"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectKeys { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectDrives"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectDrives"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectDrives"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectDrives"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectDiskDrives { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPrinters"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPrinters"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectPrinters"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectPrinters"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPrinters { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectClipboard"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectClipboard"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectClipboard"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectClipboard"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectClipboard { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPorts"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPorts"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectPorts"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectPorts"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPorts { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectSmartCards"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectSmartCards"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectSmartCards"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectSmartCards"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSmartCards { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectSounds"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectSounds"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectSounds"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectSounds"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSound { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameSoundQuality"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionSoundQuality"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameSoundQuality"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionSoundQuality"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool SoundQuality { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectAudioCapture"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectAudioCapture"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectAudioCapture"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectAudioCapture"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectAudioCapture { get; set; }
 
@@ -304,90 +323,90 @@ namespace mRemoteNG.Connection
         #region Misc
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameExternalToolBefore"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalToolBefore"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameExternalToolBefore"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionExternalToolBefore"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PreExtApp { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameExternalToolAfter"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionExternalToolAfter"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameExternalToolAfter"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionExternalToolAfter"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PostExtApp { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameMACAddress"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionMACAddress"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameMACAddress"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionMACAddress"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool MacAddress { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameUser1"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionUser1"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUser1"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUser1"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UserField { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-        LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameFavorite"),
-        LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionFavorite"),
+        LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameFavorite"),
+        LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionFavorite"),
         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Favorite { get; set; }
         #endregion
 
         #region VNC
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameCompression"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionCompression"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameCompression"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionCompression"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCCompression {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameEncoding"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionEncoding"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEncoding"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionEncoding"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCEncoding {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryConnection", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameAuthenticationMode"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationMode"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAuthenticationMode"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAuthenticationMode"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCAuthMode {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyType"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyType"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyType"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyType"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyType {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyAddress"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyAddress"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyAddress"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyAddress"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyIP {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPort"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPort"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyPort"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyPort"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPort {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyUsername"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyUsername"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyUsername"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyUsername"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyUsername {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPassword"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPassword"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyPassword"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyPassword"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPassword {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameColors"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionColors"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameColors"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionColors"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCColors {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameSmartSizeMode"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionSmartSizeMode"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameSmartSizeMode"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionSmartSizeMode"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCSmartSizeMode {get; set;}
 				
 		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameViewOnly"), 
-		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionViewOnly"), 
+		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameViewOnly"), 
+		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionViewOnly"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCViewOnly {get; set;}
         #endregion
 

mRemoteV1/Connection/ConnectionInitiator.cs

@@ -1,14 +1,14 @@
-using mRemoteNG.App;
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Panels;
-using mRemoteNG.UI.Window;
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
 using mRemoteNG.UI.Tabs;
+using mRemoteNG.UI.Window;
 using WeifenLuo.WinFormsUI.Docking;
 
 
@@ -16,38 +16,14 @@ namespace mRemoteNG.Connection
 {
     public class ConnectionInitiator : IConnectionInitiator
     {
-        private readonly PanelAdder _panelAdder = new PanelAdder();
-        private readonly List<string> _activeConnections = new List<string>();
+        private readonly ProtocolFactory _protocolFactory;
+        private readonly List<ProtocolBase> _activeConnections = new List<ProtocolBase>();
 
-        public IEnumerable<string> ActiveConnections => _activeConnections;
+        public IEnumerable<ProtocolBase> ActiveConnections => _activeConnections;
 
-        public void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None)
+        public ConnectionInitiator(ProtocolFactory protocolFactory)
         {
-            OpenConnection(containerInfo, force, null);
-        }
-
-        public void OpenConnection(ConnectionInfo connectionInfo)
-        {
-            try
-            {
-                OpenConnection(connectionInfo, ConnectionInfo.Force.None);
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnectionOpenFailed, ex);
-            }
-        }
-
-        public void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force)
-        {
-            try
-            {
-                OpenConnection(connectionInfo, force, null);
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnectionOpenFailed, ex);
-            }
+            _protocolFactory = protocolFactory;
         }
 
         public bool SwitchToOpenConnection(ConnectionInfo connectionInfo)
@@ -61,13 +37,17 @@ namespace mRemoteNG.Connection
             return true;
         }
 
-        #region Private
+        
 
-        private void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force, Form conForm)
+        public void OpenConnection(
+            ContainerInfo containerInfo,
+            ConnectionInfo.Force force = ConnectionInfo.Force.None,
+            ConnectionWindow conForm = null)
         {
-            var children = containerInfo.Children;
-            if (children.Count == 0) return;
-            foreach (var child in children)
+            if (containerInfo == null || containerInfo.Children.Count == 0)
+                return;
+
+            foreach (var child in containerInfo.Children)
             {
                 if (child is ContainerInfo childAsContainer)
                     OpenConnection(childAsContainer, force, conForm);
@@ -76,8 +56,14 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force, Form conForm)
+        public void OpenConnection(
+            ConnectionInfo connectionInfo,
+            ConnectionInfo.Force force = ConnectionInfo.Force.None,
+            ConnectionWindow conForm = null)
         {
+            if (connectionInfo == null)
+                return;
+
             try
             {
                 if (connectionInfo.Hostname == "" && connectionInfo.Protocol != ProtocolType.IntApp)
@@ -95,8 +81,7 @@ namespace mRemoteNG.Connection
                         return;
                 }
 
-                var protocolFactory = new ProtocolFactory();
-                var newProtocol = protocolFactory.CreateProtocol(connectionInfo);
+                var newProtocol = _protocolFactory.CreateProtocol(connectionInfo);
 
                 var connectionPanel = SetConnectionPanel(connectionInfo, force);
                 if (string.IsNullOrEmpty(connectionPanel)) return;
@@ -114,6 +99,7 @@ namespace mRemoteNG.Connection
                     return;
                 }
 
+                OnConnectionStarting(newProtocol.InterfaceControl.Info, newProtocol);
                 if (newProtocol.Connect() == false)
                 {
                     newProtocol.Close();
@@ -121,7 +107,7 @@ namespace mRemoteNG.Connection
                 }
 
                 connectionInfo.OpenConnections.Add(newProtocol);
-                _activeConnections.Add(connectionInfo.ConstantID);
+                _activeConnections.Add(newProtocol);
                 FrmMain.Default.SelectedConnection = connectionInfo;
             }
             catch (Exception ex)
@@ -130,6 +116,7 @@ namespace mRemoteNG.Connection
             }
         }
 
+        #region Private
         private static void StartPreConnectionExternalApp(ConnectionInfo connectionInfo)
         {
             if (connectionInfo.PreExtApp == "") return;
@@ -160,54 +147,35 @@ namespace mRemoteNG.Connection
             return null;
         }
 
-        private static string SetConnectionPanel(ConnectionInfo connectionInfo, ConnectionInfo.Force force)
+        private string SetConnectionPanel(ConnectionInfo connectionInfo, ConnectionInfo.Force force)
         {
-            string connectionPanel;
-            if (connectionInfo.Panel == "" || force.HasFlag(ConnectionInfo.Force.OverridePanel) ||
-                Settings.Default.AlwaysShowPanelSelectionDlg)
-            {
-                var frmPnl = new FrmChoosePanel();
-                if (frmPnl.ShowDialog() == DialogResult.OK)
-                {
-                    connectionPanel = frmPnl.Panel;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else
-            {
-                //Return the current panel if exist, if not return default panel
-                if (TabHelper.Instance.CurrentPanel != null)
-                {
-                    connectionPanel = TabHelper.Instance.CurrentPanel.TabText;
-                }
-                else
-                {
-                    connectionPanel = connectionInfo.Panel;
-                }
-            }
+            if (connectionInfo.Panel != "" &&
+                !force.HasFlag(ConnectionInfo.Force.OverridePanel) &&
+                !Settings.Default.AlwaysShowPanelSelectionDlg)
+                return connectionInfo.Panel;
 
-            return connectionPanel;
+            var frmPnl = new FrmChoosePanel(this);
+            return frmPnl.ShowDialog() == DialogResult.OK
+                ? frmPnl.Panel
+                : null;
         }
 
-        private Form SetConnectionForm(Form conForm, string connectionPanel)
+        private ConnectionWindow SetConnectionForm(ConnectionWindow conForm, string connectionPanel)
         {
-            var connectionForm = conForm ?? Runtime.WindowList.FromString(connectionPanel);
+            var connectionForm = conForm ?? Runtime.WindowList.FromString(connectionPanel) as ConnectionWindow;
 
             if (connectionForm == null)
-                connectionForm = _panelAdder.AddPanel(connectionPanel);
+                connectionForm = new PanelAdder(this).AddPanel(connectionPanel);
             else
-                ((ConnectionWindow)connectionForm).Show(FrmMain.Default.pnlDock);
+                connectionForm.Show(FrmMain.Default.pnlDock);
 
             connectionForm.Focus();
             return connectionForm;
         }
 
-        private static Control SetConnectionContainer(ConnectionInfo connectionInfo, Form connectionForm)
+        private static Control SetConnectionContainer(ConnectionInfo connectionInfo, ConnectionWindow connectionForm)
         {
-            Control connectionContainer = ((ConnectionWindow)connectionForm).AddConnectionTab(connectionInfo);
+            Control connectionContainer = connectionForm.AddConnectionTab(connectionInfo);
 
             if (connectionInfo.Protocol != ProtocolType.IntApp) return connectionContainer;
 
@@ -261,11 +229,11 @@ namespace mRemoteNG.Connection
                 }
 
                 Runtime.MessageCollector.AddMessage(msgClass,
-                                                    string.Format(
-                                                                  Language.strProtocolEventDisconnected,
-                                                                  disconnectedMessage,
-                                                                  prot.InterfaceControl.Info.Hostname,
-                                                                  prot.InterfaceControl.Info.Protocol.ToString()));
+                    string.Format(
+                        Language.strProtocolEventDisconnected,
+                        disconnectedMessage,
+                        prot.InterfaceControl.Info.Hostname,
+                        prot.InterfaceControl.Info.Protocol.ToString()));
             }
             catch (Exception ex)
             {
@@ -294,8 +262,8 @@ namespace mRemoteNG.Connection
                                                                   prot.InterfaceControl.Info.Protocol,
                                                                   Environment.UserName));
                 prot.InterfaceControl.Info.OpenConnections.Remove(prot);
-                if (_activeConnections.Contains(prot.InterfaceControl.Info.ConstantID))
-                    _activeConnections.Remove(prot.InterfaceControl.Info.ConstantID);
+                if (_activeConnections.Contains(prot))
+                    _activeConnections.Remove(prot);
 
                 if (prot.InterfaceControl.Info.PostExtApp == "") return;
                 var extA = Runtime.ExternalToolsService.GetExtAppByName(prot.InterfaceControl.Info.PostExtApp);
@@ -307,7 +275,7 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private static void Prot_Event_Connected(object sender)
+        private void Prot_Event_Connected(object sender)
         {
             var prot = (ProtocolBase)sender;
             Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventConnected,
@@ -340,5 +308,11 @@ namespace mRemoteNG.Connection
         }
 
         #endregion
+
+        public event EventHandler<ConnectionStartingEvent> ConnectionStarting;
+        protected virtual void OnConnectionStarting(ConnectionInfo connectionInfo, ProtocolBase protocolBase)
+        {
+            ConnectionStarting?.Invoke(this, new ConnectionStartingEvent(connectionInfo, protocolBase));
+        }
     }
 }

mRemoteV1/Connection/ConnectionStartingEvent.cs

@@ -0,0 +1,18 @@
+using System;
+using mRemoteNG.Connection.Protocol;
+
+namespace mRemoteNG.Connection
+{
+    [Serializable]
+    public class ConnectionStartingEvent : EventArgs
+    {
+        public ConnectionInfo ConnectionInfo { get; }
+        public ProtocolBase Protocol { get; }
+
+        public ConnectionStartingEvent(ConnectionInfo connectionInfo, ProtocolBase protocol)
+        {
+            ConnectionInfo = connectionInfo;
+            Protocol = protocol;
+        }
+    }
+}

mRemoteV1/Connection/DefaultConnectionInfo.cs

@@ -30,15 +30,13 @@ namespace mRemoteNG.Connection
                     var expectedPropertyName = propertyNameMutator(property.Name);
                     var propertyFromSource = typeof(TSource).GetProperty(expectedPropertyName);
                     if (propertyFromSource == null)
-                        throw new SettingsPropertyNotFoundException(
-                                                                    $"No property with name '{expectedPropertyName}' found.");
+                        throw new SettingsPropertyNotFoundException($"No property with name '{expectedPropertyName}' found.");
 
                     var valueFromSource = propertyFromSource.GetValue(sourceInstance, null);
 
                     if (property.PropertyType.IsEnum)
                     {
-                        property.SetValue(Instance, Enum.Parse(property.PropertyType, valueFromSource.ToString()),
-                                          null);
+                        property.SetValue(Instance, Enum.Parse(property.PropertyType, valueFromSource.ToString()), null);
                         continue;
                     }
 
@@ -46,15 +44,12 @@ namespace mRemoteNG.Connection
                 }
                 catch (Exception ex)
                 {
-                    Runtime.MessageCollector?.AddExceptionStackTrace(
-                                                                     $"Error loading default connectioninfo property {property.Name}",
-                                                                     ex);
+                    Runtime.MessageCollector?.AddExceptionStackTrace($"Error loading default connectioninfo property {property.Name}", ex);
                 }
             }
         }
 
-        public void SaveTo<TDestination>(TDestination destinationInstance,
-                                         Func<string, string> propertyNameMutator = null)
+        public void SaveTo<TDestination>(TDestination destinationInstance, Func<string, string> propertyNameMutator = null)
         {
             if (propertyNameMutator == null)
                 propertyNameMutator = (a) => a;
@@ -69,8 +64,7 @@ namespace mRemoteNG.Connection
                     var propertyFromDestination = typeof(TDestination).GetProperty(expectedPropertyName);
 
                     if (propertyFromDestination == null)
-                        throw new SettingsPropertyNotFoundException(
-                                                                    $"No property with name '{expectedPropertyName}' found.");
+                        throw new SettingsPropertyNotFoundException($"No property with name '{expectedPropertyName}' found.");
 
                     // ensure value is of correct type
                     var value = Convert.ChangeType(property.GetValue(Instance, null),
@@ -80,9 +74,7 @@ namespace mRemoteNG.Connection
                 }
                 catch (Exception ex)
                 {
-                    Runtime.MessageCollector?.AddExceptionStackTrace(
-                                                                     $"Error saving default connectioninfo property {property.Name}",
-                                                                     ex);
+                    Runtime.MessageCollector?.AddExceptionStackTrace($"Error saving default connectioninfo property {property.Name}", ex);
                 }
             }
         }

mRemoteV1/Connection/IConnectionInitiator.cs

@@ -1,18 +1,27 @@
+using System;
 using System.Collections.Generic;
+using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
+using mRemoteNG.UI.Window;
 
 namespace mRemoteNG.Connection
 {
     public interface IConnectionInitiator
     {
-        IEnumerable<string> ActiveConnections { get; }
+        IEnumerable<ProtocolBase> ActiveConnections { get; }
 
-        void OpenConnection(ConnectionInfo connectionInfo);
+        void OpenConnection(
+            ContainerInfo containerInfo,
+            ConnectionInfo.Force force = ConnectionInfo.Force.None,
+            ConnectionWindow conForm = null);
 
-        void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None);
-
-        void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force);
+        void OpenConnection(
+            ConnectionInfo connectionInfo,
+            ConnectionInfo.Force force = ConnectionInfo.Force.None,
+            ConnectionWindow conForm = null);
 
         bool SwitchToOpenConnection(ConnectionInfo connectionInfo);
+
+        event EventHandler<ConnectionStartingEvent> ConnectionStarting;
     }
 }

mRemoteV1/Connection/InterfaceControl.cs

@@ -1,4 +1,4 @@
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using System;
 using System.Drawing;
@@ -25,6 +25,8 @@ namespace mRemoteNG.Connection
                 Location = new Point(0, 0);
                 Size = Parent.Size;
                 Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
+                GotFocus += OnGotFocus;
+                LostFocus += OnLostFocus;
                 InitializeComponent();
             }
             catch (Exception ex)
@@ -35,6 +37,16 @@ namespace mRemoteNG.Connection
             }
         }
 
+        private void OnLostFocus(object sender, EventArgs e)
+        {
+            Runtime.MessageCollector.AddMessage(Messages.MessageClass.DebugMsg, $"InterfaceControl lost focus '{Info.Name}'");
+        }
+
+        private void OnGotFocus(object sender, EventArgs e)
+        {
+            Runtime.MessageCollector.AddMessage(Messages.MessageClass.DebugMsg, $"InterfaceControl gained focus '{Info.Name}'");
+        }
+
         public static InterfaceControl FindInterfaceControl(DockPanel DockPnl)
         {
             if (!(DockPnl.ActiveDocument is ConnectionTab ct)) return null;

mRemoteV1/Connection/Protocol/ExternalProcessProtocolBase.cs

@@ -0,0 +1,120 @@
+using System;
+using System.Diagnostics;
+using mRemoteNG.App;
+using mRemoteNG.Messages;
+
+namespace mRemoteNG.Connection.Protocol
+{
+    public abstract class ExternalProcessProtocolBase : ProtocolBase, IFocusable
+    {
+        private IntPtr _winEventHook;
+        private NativeMethods.WinEventDelegate _setForegroundDelegate;
+        private bool _hasFocus;
+
+        public override bool IsExternalProcess { get; } = true;
+
+        protected Process ProtocolProcess { get; set; }
+
+        protected IntPtr ProcessHandle { get; set; }
+
+        public bool HasFocus
+        {
+            get => _hasFocus;
+            private set
+            {
+                if (_hasFocus == value)
+                    return;
+
+                _hasFocus = value;
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
+                    string.Format("External protocol window set to {0}. name:'{1}', protocol:'{2}', pid:{3}, hwnd:{4}",
+                        _hasFocus ? "foreground" : "background",
+                        InterfaceControl.Info.Name,
+                        InterfaceControl.Info.Protocol,
+                        ProtocolProcess.Id,
+                        ProcessHandle));
+                OnFocusChanged();
+            }
+        }
+
+        public int ThreadId => (int)NativeMethods.GetWindowThreadProcessId(ProcessHandle, IntPtr.Zero);
+
+
+        public override bool Connect()
+        {
+            _setForegroundDelegate = OnWinEventSetForeground;
+            _winEventHook = NativeMethods.SetWinEventHook(
+                NativeMethods.EVENT_SYSTEM_FOREGROUND,
+                NativeMethods.EVENT_SYSTEM_FOREGROUND,
+                IntPtr.Zero,
+                _setForegroundDelegate,
+                /*Convert.ToUInt32(ProtocolProcess.Id)*/0,
+                0,
+                NativeMethods.WINEVENT_OUTOFCONTEXT);
+
+            return base.Connect();
+        }
+
+        public override void Close()
+        {
+            if (NativeMethods.UnhookWinEvent(_winEventHook))
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Successfully unhooked WinEvent listener from '{InterfaceControl.Info.Name}'");
+            }
+            else
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Failed to unhook WinEvent listener from '{InterfaceControl.Info.Name}'");
+            }
+
+            base.Close();
+        }
+
+        public override void Focus()
+        {
+            FocusChildProcessWindow();
+        }
+
+        private void FocusChildProcessWindow()
+        {
+            if (NativeMethods.GetForegroundWindow() == ProcessHandle)
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Process already focused - do nothing");
+                return;
+            }
+
+            var setForegroundSuccessful = NativeMethods.SetForegroundWindow(ProcessHandle);
+
+            if (!setForegroundSuccessful)
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
+                    "Failed to set external protocol window to foreground. " +
+                    $"name:'{InterfaceControl.Info.Name}', " +
+                    $"protocol:'{InterfaceControl.Info.Protocol}', " +
+                    $"pid:{ProtocolProcess.Id}, " +
+                    $"hwnd:{ProcessHandle}");
+            }
+        }
+
+        /// <summary>
+        /// This callback will be called when the external process window managed by
+        /// this protocol is brought to the foreground.
+        /// </summary>
+        /// <param name="hWinEventHook"></param>
+        /// <param name="eventType"></param>
+        /// <param name="hwnd"></param>
+        /// <param name="idObject"></param>
+        /// <param name="idChild"></param>
+        /// <param name="dwEventThread"></param>
+        /// <param name="dwmsEventTime"></param>
+        void OnWinEventSetForeground(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+        {
+            HasFocus = hwnd == ProcessHandle;
+        }
+
+        public event EventHandler FocusChanged;
+        protected virtual void OnFocusChanged()
+        {
+            FocusChanged?.Invoke(this, EventArgs.Empty);
+        }
+    }
+}

mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Windows.Forms;
 using Gecko;
 using mRemoteNG.Tools;
@@ -31,6 +32,17 @@ namespace mRemoteNG.Connection.Protocol.Http
                         Xpcom.Initialize("Firefox");
 
                     Control = new GeckoWebBrowser();
+
+                    var culture = Settings.Default.OverrideUICulture;
+                    if (string.IsNullOrEmpty(culture))
+                    {
+                        GeckoPreferences.User["intl.accept_languages"] =
+                            System.Globalization.CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
+                    }
+                    else
+                    {
+                        GeckoPreferences.User["intl.accept_languages"] = culture;
+                    }
                 }
                 else
                 {
@@ -66,6 +78,7 @@ namespace mRemoteNG.Connection.Protocol.Http
                     if (GeckoBrowser != null)
                     {
                         GeckoBrowser.DocumentTitleChanged += geckoBrowser_DocumentTitleChanged;
+                        LauncherDialog.Download += geckoBrowser_LauncherDialog_Download;
                         GeckoBrowser.NSSError += CertEvent.GeckoBrowser_NSSError;
                     }
                     else
@@ -267,6 +280,40 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
         }
 
+        private void geckoBrowser_LauncherDialog_Download(object sender, Gecko.LauncherDialogEvent e)
+        {
+            var objTarget = Xpcom.CreateInstance<nsILocalFile>("@mozilla.org/file/local;1");
+            using (var tmp = new nsAString(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\mremoteng.download"))
+            {
+                objTarget.InitWithPath(tmp);
+            }
+
+            //Save file dialog
+            var saveFileDialog = new SaveFileDialog
+            {
+                Filter = "All files (*.*)|*.*",
+                FilterIndex = 2,
+                RestoreDirectory = true,
+                FileName = e.Filename
+            };
+
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                var source = IOService.CreateNsIUri(e.Url);
+                var dest = IOService.CreateNsIUri(new Uri(saveFileDialog.FileName).AbsoluteUri);
+                var t = (nsAStringBase)new nsAString(Path.GetFileName(saveFileDialog.FileName));
+                var persist = Xpcom.CreateInstance<nsIWebBrowserPersist>("@mozilla.org/embedding/browser/nsWebBrowserPersist;1");
+                var nst = Xpcom.CreateInstance<nsITransfer>("@mozilla.org/transfer;1");
+
+                nst.Init(source, dest, t, e.Mime, 0, null, persist, false);
+                persist.SetPersistFlagsAttribute(2 | 32 | 16384);
+                persist.SetProgressListenerAttribute(nst);
+                persist.SaveURI(source, null, null, (uint)Gecko.nsIHttpChannelConsts.REFERRER_POLICY_NO_REFERRER, null, null, (nsISupports)dest, null);
+            }
+
+            saveFileDialog.Dispose();
+        }
+
         #endregion
 
         #region Enums
@@ -282,4 +329,4 @@ namespace mRemoteNG.Connection.Protocol.Http
 
         #endregion
     }
-}
+}

mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs

@@ -201,17 +201,17 @@ namespace mRemoteNG.Connection.Protocol.ICA
                     return;
                 }
 
-                if (InterfaceControl.Info.Resolution == RdpProtocol.RDPResolutions.FitToWindow)
+                if (InterfaceControl.Info.Resolution == RDPResolutions.FitToWindow)
                 {
                     _icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, InterfaceControl.Size.Width,
                                              InterfaceControl.Size.Height, 0);
                 }
-                else if (InterfaceControl.Info.Resolution == RdpProtocol.RDPResolutions.SmartSize)
+                else if (InterfaceControl.Info.Resolution == RDPResolutions.SmartSize)
                 {
                     _icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, InterfaceControl.Size.Width,
                                              InterfaceControl.Size.Height, 0);
                 }
-                else if (InterfaceControl.Info.Resolution == RdpProtocol.RDPResolutions.Fullscreen)
+                else if (InterfaceControl.Info.Resolution == RDPResolutions.Fullscreen)
                 {
                     _icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient,
                                              Screen.FromControl(_frmMain).Bounds.Width,
@@ -220,7 +220,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
                 }
                 else
                 {
-                    var resolution = RdpProtocol.GetResolutionRectangle(_info.Resolution);
+                    var resolution = _info.Resolution.GetResolutionRectangle();
                     _icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, resolution.Width,
                                              resolution.Height, 0);
                 }
@@ -238,13 +238,13 @@ namespace mRemoteNG.Connection.Protocol.ICA
             // ReSharper disable once SwitchStatementMissingSomeCases
             switch (_info.Colors)
             {
-                case RdpProtocol.RDPColors.Colors256:
+                case RDPColors.Colors256:
                     _icaClient.SetProp("DesiredColor", "2");
                     break;
-                case RdpProtocol.RDPColors.Colors15Bit:
+                case RDPColors.Colors15Bit:
                     _icaClient.SetProp("DesiredColor", "4");
                     break;
-                case RdpProtocol.RDPColors.Colors16Bit:
+                case RDPColors.Colors16Bit:
                     _icaClient.SetProp("DesiredColor", "4");
                     break;
                 default:

mRemoteV1/Connection/Protocol/IFocusable.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace mRemoteNG.Connection.Protocol
+{
+    public interface IFocusable
+    {
+        bool HasFocus { get; }
+        void Focus();
+        event EventHandler FocusChanged;
+    }
+}

mRemoteV1/Connection/Protocol/IntegratedProgram.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Drawing;
 using System.Threading;
@@ -9,7 +9,7 @@ using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol
 {
-    public class IntegratedProgram : ProtocolBase
+    public class IntegratedProgram : ExternalProcessProtocolBase
     {
         #region Private Fields
 

mRemoteV1/Connection/Protocol/ProtocolBase.cs

@@ -63,6 +63,12 @@ namespace mRemoteNG.Connection.Protocol
         public readonly System.Timers.Timer tmrReconnect = new System.Timers.Timer(2000);
         protected ReconnectGroup ReconnectGroup;
 
+        /// <summary>
+        /// Whether this protocol runs as a thread within the main process or if
+        /// it is an external process that is running as a child process.
+        /// </summary>
+        public virtual bool IsExternalProcess { get; } = false;
+
         protected ProtocolBase(string name)
         {
             Name = name;
@@ -110,7 +116,9 @@ namespace mRemoteNG.Connection.Protocol
                 _interfaceControl.Parent.Tag = _interfaceControl;
                 _interfaceControl.Show();
 
-                if (Control == null) return true;
+                if (Control == null)
+                    return true;
+
                 Control.Name = Name;
                 Control.Parent = _interfaceControl;
                 Control.Location = _interfaceControl.Location;
@@ -163,8 +171,7 @@ namespace mRemoteNG.Connection.Protocol
                     catch (Exception ex)
                     {
                         Runtime.MessageCollector?.AddExceptionStackTrace(
-                                                                         "Couldn't dispose control, probably form is already closed (Connection.Protocol.Base)",
-                                                                         ex);
+                            "Couldn't dispose control, probably form is already closed (Connection.Protocol.Base)", ex);
                     }
                 }
 
@@ -184,15 +191,14 @@ namespace mRemoteNG.Connection.Protocol
                 catch (Exception ex)
                 {
                     Runtime.MessageCollector?.AddExceptionStackTrace(
-                                                                     "Couldn't set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)",
-                                                                     ex);
+                        "Couldn't set InterfaceControl.Parent.Tag or Dispose Interface, " +
+                        "probably form is already closed (Connection.Protocol.Base)", ex);
                 }
             }
             catch (Exception ex)
             {
                 Runtime.MessageCollector?.AddExceptionStackTrace(
-                                                                 "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)",
-                                                                 ex);
+                    "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)", ex);
             }
         }
 
@@ -335,8 +341,7 @@ namespace mRemoteNG.Connection.Protocol
         {
             if (!disposing) return;
 
-            if(tmrReconnect != null)
-                tmrReconnect.Dispose();
+            tmrReconnect?.Dispose();
         }
 
         public void Dispose()

mRemoteV1/Connection/Protocol/ProtocolFactory.cs

@@ -12,58 +12,46 @@ namespace mRemoteNG.Connection.Protocol
 {
     public class ProtocolFactory
     {
+        private readonly RdpProtocolFactory _rdpProtocolFactory = new RdpProtocolFactory();
+
         public ProtocolBase CreateProtocol(ConnectionInfo connectionInfo)
         {
-            var newProtocol = default(ProtocolBase);
             // ReSharper disable once SwitchStatementMissingSomeCases
             switch (connectionInfo.Protocol)
             {
                 case ProtocolType.RDP:
-                    newProtocol = new RdpProtocol
-                    {
-                        LoadBalanceInfoUseUtf8 = Settings.Default.RdpLoadBalanceInfoUseUtf8
-                    };
-                    ((RdpProtocol)newProtocol).tmrReconnect.Elapsed += ((RdpProtocol)newProtocol).tmrReconnect_Elapsed;
-                    break;
+                    var rdp = _rdpProtocolFactory.Build(connectionInfo.RdpVersion);
+                    rdp.LoadBalanceInfoUseUtf8 = Settings.Default.RdpLoadBalanceInfoUseUtf8;
+                    return rdp;
                 case ProtocolType.VNC:
-                    newProtocol = new ProtocolVNC();
-                    break;
+                    return new ProtocolVNC();
                 case ProtocolType.SSH1:
-                    newProtocol = new ProtocolSSH1();
-                    break;
+                    return new ProtocolSSH1();
                 case ProtocolType.SSH2:
-                    newProtocol = new ProtocolSSH2();
-                    break;
+                    return new ProtocolSSH2();
                 case ProtocolType.Telnet:
-                    newProtocol = new ProtocolTelnet();
-                    break;
+                    return new ProtocolTelnet();
                 case ProtocolType.Rlogin:
-                    newProtocol = new ProtocolRlogin();
-                    break;
+                    return new ProtocolRlogin();
                 case ProtocolType.RAW:
-                    newProtocol = new RawProtocol();
-                    break;
+                    return new RawProtocol();
                 case ProtocolType.HTTP:
-                    newProtocol = new ProtocolHTTP(connectionInfo.RenderingEngine);
-                    break;
+                    return new ProtocolHTTP(connectionInfo.RenderingEngine);
                 case ProtocolType.HTTPS:
-                    newProtocol = new ProtocolHTTPS(connectionInfo.RenderingEngine);
-                    break;
+                    return new ProtocolHTTPS(connectionInfo.RenderingEngine);
                 case ProtocolType.ICA:
-                    newProtocol = new IcaProtocol();
-                    ((IcaProtocol)newProtocol).tmrReconnect.Elapsed += ((IcaProtocol)newProtocol).tmrReconnect_Elapsed;
-                    break;
+                    var icaProtocol = new IcaProtocol();
+                    icaProtocol.tmrReconnect.Elapsed += icaProtocol.tmrReconnect_Elapsed;
+                    return icaProtocol;
                 case ProtocolType.IntApp:
-                    newProtocol = new IntegratedProgram();
                     if (connectionInfo.ExtApp == "")
                     {
                         throw (new Exception(Language.strNoExtAppDefined));
                     }
-
-                    break;
+                    return new IntegratedProgram();
             }
 
-            return newProtocol;
+            return default(ProtocolBase);
         }
     }
 }

mRemoteV1/Connection/Protocol/PuttyBase.cs

@@ -1,4 +1,4 @@
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Messages;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
@@ -14,27 +14,22 @@ using System.Windows.Forms;
 
 namespace mRemoteNG.Connection.Protocol
 {
-    public class PuttyBase : ProtocolBase
+    public class PuttyBase : ExternalProcessProtocolBase
     {
         private const int IDM_RECONF = 0x50; // PuTTY Settings Menu ID
         private bool _isPuttyNg;
         private readonly DisplayProperties _display = new DisplayProperties();
 
         #region Public Properties
-
         protected Putty_Protocol PuttyProtocol { private get; set; }
 
         protected Putty_SSHVersion PuttySSHVersion { private get; set; }
 
-        public IntPtr PuttyHandle { get; set; }
-
-        private Process PuttyProcess { get; set; }
-
         public static string PuttyPath { get; set; }
 
         public bool Focused
         {
-            get { return NativeMethods.GetForegroundWindow() == PuttyHandle; }
+            get { return NativeMethods.GetForegroundWindow() == ProcessHandle; }
         }
 
         #endregion
@@ -54,111 +49,40 @@ namespace mRemoteNG.Connection.Protocol
         {
             try
             {
-                _isPuttyNg = PuttyTypeDetector.GetPuttyType() == PuttyTypeDetector.PuttyType.PuttyNg;
+                base.Connect();
+                var arguments = BuildPuttyCommandLineArguments(InterfaceControl.Info);
 
-                PuttyProcess = new Process
+                ProtocolProcess = new Process
                 {
                     StartInfo =
                     {
                         UseShellExecute = false,
-                        FileName = PuttyPath
-                    }
+                        FileName = PuttyPath,
+                        Arguments = arguments.ToString()
+                    },
+                    EnableRaisingEvents = true
                 };
 
-                var arguments = new CommandLineArguments {EscapeForShell = false};
+                ProtocolProcess.Exited += ProcessExited;
 
-                arguments.Add("-load", InterfaceControl.Info.PuttySession);
-
-                if (!(InterfaceControl.Info is PuttySessionInfo))
-                {
-                    arguments.Add("-" + PuttyProtocol);
-
-                    if (PuttyProtocol == Putty_Protocol.ssh)
-                    {
-                        var username = "";
-                        var password = "";
-
-                        if (!string.IsNullOrEmpty(InterfaceControl.Info?.Username))
-                        {
-                            username = InterfaceControl.Info.Username;
-                        }
-                        else
-                        {
-                            // ReSharper disable once SwitchStatementMissingSomeCases
-                            switch (Settings.Default.EmptyCredentials)
-                            {
-                                case "windows":
-                                    username = Environment.UserName;
-                                    break;
-                                case "custom":
-                                    username = Settings.Default.DefaultUsername;
-                                    break;
-                            }
-                        }
-
-                        if (!string.IsNullOrEmpty(InterfaceControl.Info?.Password))
-                        {
-                            password = InterfaceControl.Info.Password;
-                        }
-                        else
-                        {
-                            if (Settings.Default.EmptyCredentials == "custom")
-                            {
-                                var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                                password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword,
-                                                                        Runtime.EncryptionKey);
-                            }
-                        }
-
-                        arguments.Add("-" + (int)PuttySSHVersion);
-
-                        if (!Force.HasFlag(ConnectionInfo.Force.NoCredentials))
-                        {
-                            if (!string.IsNullOrEmpty(username))
-                            {
-                                arguments.Add("-l", username);
-                            }
-
-                            if (!string.IsNullOrEmpty(password))
-                            {
-                                arguments.Add("-pw", password);
-                            }
-                        }
-                    }
-
-                    arguments.Add("-P", InterfaceControl.Info.Port.ToString());
-                    arguments.Add(InterfaceControl.Info.Hostname);
-                }
-
-                if (_isPuttyNg)
-                {
-                    arguments.Add("-hwndparent", InterfaceControl.Handle.ToString());
-                }
-
-                PuttyProcess.StartInfo.Arguments = arguments.ToString();
-
-                PuttyProcess.EnableRaisingEvents = true;
-                PuttyProcess.Exited += ProcessExited;
-
-                PuttyProcess.Start();
-                PuttyProcess.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000);
+                ProtocolProcess.Start();
+                ProtocolProcess.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000);
 
                 var startTicks = Environment.TickCount;
-                while (PuttyHandle.ToInt32() == 0 &
+                while (ProcessHandle.ToInt32() == 0 &
                        Environment.TickCount < startTicks + Settings.Default.MaxPuttyWaitTime * 1000)
                 {
                     if (_isPuttyNg)
                     {
-                        PuttyHandle = NativeMethods.FindWindowEx(
-                                                                 InterfaceControl.Handle, new IntPtr(0), null, null);
+                        ProcessHandle = NativeMethods.FindWindowEx(InterfaceControl.Handle, new IntPtr(0), null, null);
                     }
                     else
                     {
-                        PuttyProcess.Refresh();
-                        PuttyHandle = PuttyProcess.MainWindowHandle;
+                        ProtocolProcess.Refresh();
+                        ProcessHandle = ProtocolProcess.MainWindowHandle;
                     }
 
-                    if (PuttyHandle.ToInt32() == 0)
+                    if (ProcessHandle.ToInt32() == 0)
                     {
                         Thread.Sleep(0);
                     }
@@ -166,21 +90,20 @@ namespace mRemoteNG.Connection.Protocol
 
                 if (!_isPuttyNg)
                 {
-                    NativeMethods.SetParent(PuttyHandle, InterfaceControl.Handle);
+                    NativeMethods.SetParent(ProcessHandle, InterfaceControl.Handle);
                 }
 
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strPuttyStuff, true);
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    string.Format(Language.strPuttyHandle, PuttyHandle), true);
+                                                    string.Format(Language.strPuttyHandle, ProcessHandle), true);
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    string.Format(Language.strPuttyTitle, PuttyProcess.MainWindowTitle),
+                                                    string.Format(Language.strPuttyTitle, ProtocolProcess.MainWindowTitle),
                                                     true);
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
                                                     string.Format(Language.strPuttyParentHandle,
                                                                   InterfaceControl.Parent.Handle), true);
 
                 Resize(this, new EventArgs());
-                base.Connect();
                 return true;
             }
             catch (Exception ex)
@@ -192,18 +115,102 @@ namespace mRemoteNG.Connection.Protocol
             }
         }
 
+        private CommandLineArguments BuildPuttyCommandLineArguments(AbstractConnectionRecord connectionInfo)
+        {
+            var arguments = new CommandLineArguments { EscapeForShell = false };
+
+            arguments.Add("-load", connectionInfo.PuttySession);
+
+            if (!(connectionInfo is PuttySessionInfo))
+            {
+                arguments.Add("-" + PuttyProtocol);
+
+                if (PuttyProtocol == Putty_Protocol.ssh)
+                {
+                    var username = "";
+                    var password = "";
+
+                    if (!string.IsNullOrEmpty(connectionInfo.Username))
+                    {
+                        username = connectionInfo.Username;
+                    }
+                    else
+                    {
+                        // ReSharper disable once SwitchStatementMissingSomeCases
+                        switch (Settings.Default.EmptyCredentials)
+                        {
+                            case "windows":
+                                username = Environment.UserName;
+                                break;
+                            case "custom":
+                                username = Settings.Default.DefaultUsername;
+                                break;
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(connectionInfo.Password))
+                    {
+                        password = connectionInfo.Password;
+                    }
+                    else
+                    {
+                        if (Settings.Default.EmptyCredentials == "custom")
+                        {
+                            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+                            password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword,
+                                                                    Runtime.EncryptionKey);
+                        }
+                    }
+
+                    arguments.Add("-" + (int)PuttySSHVersion);
+
+                    if (!Force.HasFlag(ConnectionInfo.Force.NoCredentials))
+                    {
+                        if (!string.IsNullOrEmpty(username))
+                        {
+                            arguments.Add("-l", username);
+                        }
+
+                        if (!string.IsNullOrEmpty(password))
+                        {
+                            arguments.Add("-pw", password);
+                        }
+                    }
+                }
+
+                arguments.Add("-P", connectionInfo.Port.ToString());
+                arguments.Add(connectionInfo.Hostname);
+            }
+
+            _isPuttyNg = PuttyTypeDetector.GetPuttyType() == PuttyTypeDetector.PuttyType.PuttyNg;
+            if (_isPuttyNg)
+            {
+                arguments.Add("-hwndparent", InterfaceControl.Handle.ToString());
+            }
+
+            return arguments;
+        }
+
         public override void Focus()
         {
-            try
-            {
-                NativeMethods.SetForegroundWindow(PuttyHandle);
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strPuttyFocusFailed + Environment.NewLine + ex.Message,
-                                                    true);
-            }
+            //try
+            //{
+            //    if (NativeMethods.GetForegroundWindow() == PuttyHandle)
+            //    {
+            //        Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Putty window already focused, ignoring focus request '{InterfaceControl.Info.Name}' (pid:{PuttyProcess.Id})");
+            //        return;
+            //    }
+
+            //    NativeMethods.SetForegroundWindow(PuttyHandle);
+            //    Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Putty window focused '{InterfaceControl.Info.Name}' (pid:{PuttyProcess.Id})");
+            //}
+            //catch (Exception ex)
+            //{
+            //    Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
+            //                                        Language.strPuttyFocusFailed + Environment.NewLine + ex.Message,
+            //                                        true);
+            //}
+            base.Focus();
         }
 
         public override void Resize(object sender, EventArgs e)
@@ -216,14 +223,14 @@ namespace mRemoteNG.Connection.Protocol
                 if (_isPuttyNg)
                 {
                     // PuTTYNG 0.70.0.1 and later doesn't have any window borders
-                    NativeMethods.MoveWindow(PuttyHandle, 0, 0, InterfaceControl.Width, InterfaceControl.Height, true);
+                    NativeMethods.MoveWindow(ProcessHandle, 0, 0, InterfaceControl.Width, InterfaceControl.Height, true);
                 }
                 else
                 {
                     var scaledFrameBorderHeight = _display.ScaleHeight(SystemInformation.FrameBorderSize.Height);
                     var scaledFrameBorderWidth = _display.ScaleWidth(SystemInformation.FrameBorderSize.Width);
 
-                    NativeMethods.MoveWindow(PuttyHandle, -scaledFrameBorderWidth,
+                    NativeMethods.MoveWindow(ProcessHandle, -scaledFrameBorderWidth,
                                              -(SystemInformation.CaptionHeight + scaledFrameBorderHeight),
                                              InterfaceControl.Width + scaledFrameBorderWidth * 2,
                                              InterfaceControl.Height + SystemInformation.CaptionHeight +
@@ -243,9 +250,9 @@ namespace mRemoteNG.Connection.Protocol
         {
             try
             {
-                if (PuttyProcess.HasExited == false)
+                if (ProtocolProcess.HasExited == false)
                 {
-                    PuttyProcess.Kill();
+                    ProtocolProcess.Kill();
                 }
             }
             catch (Exception ex)
@@ -257,7 +264,7 @@ namespace mRemoteNG.Connection.Protocol
 
             try
             {
-                PuttyProcess.Dispose();
+                ProtocolProcess.Dispose();
             }
             catch (Exception ex)
             {
@@ -273,8 +280,8 @@ namespace mRemoteNG.Connection.Protocol
         {
             try
             {
-                NativeMethods.PostMessage(PuttyHandle, NativeMethods.WM_SYSCOMMAND, (IntPtr)IDM_RECONF, (IntPtr)0);
-                NativeMethods.SetForegroundWindow(PuttyHandle);
+                NativeMethods.PostMessage(ProcessHandle, NativeMethods.WM_SYSCOMMAND, (IntPtr)IDM_RECONF, IntPtr.Zero);
+                Focus();
             }
             catch (Exception ex)
             {
@@ -284,6 +291,14 @@ namespace mRemoteNG.Connection.Protocol
             }
         }
 
+        /// <summary>
+        /// Sends an individual key stroke to this PuTTY session.
+        /// </summary>
+        public void SendKeyStroke(int keyType, int keyData)
+        {
+            NativeMethods.PostMessage(ProcessHandle, keyType, new IntPtr(keyData), new IntPtr(0));
+        }
+
         #endregion
 
         #region Enums

mRemoteV1/Connection/Protocol/RDP/AuthenticationLevel.cs

@@ -0,0 +1,16 @@
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum AuthenticationLevel
+    {
+        [LocalizedAttributes.LocalizedDescription("strAlwaysConnectEvenIfAuthFails")]
+        NoAuth = 0,
+
+        [LocalizedAttributes.LocalizedDescription("strDontConnectWhenAuthFails")]
+        AuthRequired = 1,
+
+        [LocalizedAttributes.LocalizedDescription("strWarnIfAuthFails")]
+        WarnOnFailedAuth = 2
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDGatewayUsageMethod.cs

@@ -0,0 +1,16 @@
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDGatewayUsageMethod
+    {
+        [LocalizedAttributes.LocalizedDescription("strNever")]
+        Never = 0, // TSC_PROXY_MODE_NONE_DIRECT
+
+        [LocalizedAttributes.LocalizedDescription("strAlways")]
+        Always = 1, // TSC_PROXY_MODE_DIRECT
+
+        [LocalizedAttributes.LocalizedDescription("strDetect")]
+        Detect = 2 // TSC_PROXY_MODE_DETECT
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs

@@ -0,0 +1,16 @@
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDGatewayUseConnectionCredentials
+    {
+        [LocalizedAttributes.LocalizedDescription("strUseDifferentUsernameAndPassword")]
+        No = 0,
+
+        [LocalizedAttributes.LocalizedDescription("strUseSameUsernameAndPassword")]
+        Yes = 1,
+
+        [LocalizedAttributes.LocalizedDescription("strUseSmartCard")]
+        SmartCard = 2
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDPColors.cs

@@ -0,0 +1,22 @@
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDPColors
+    {
+        [LocalizedAttributes.LocalizedDescription("strRDP256Colors")]
+        Colors256 = 8,
+
+        [LocalizedAttributes.LocalizedDescription("strRDP32768Colors")]
+        Colors15Bit = 15,
+
+        [LocalizedAttributes.LocalizedDescription("strRDP65536Colors")]
+        Colors16Bit = 16,
+
+        [LocalizedAttributes.LocalizedDescription("strRDP16777216Colors")]
+        Colors24Bit = 24,
+
+        [LocalizedAttributes.LocalizedDescription("strRDP4294967296Colors")]
+        Colors32Bit = 32
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDPPerformanceFlags.cs

@@ -0,0 +1,31 @@
+using System.ComponentModel;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDPPerformanceFlags
+    {
+        [Description("strRDPDisableWallpaper")]
+        DisableWallpaper = 0x1,
+
+//		[Description("strRDPDisableFullWindowdrag")]
+//      DisableFullWindowDrag = 0x2,
+
+//		[Description("strRDPDisableMenuAnimations")]
+//      DisableMenuAnimations = 0x4,
+
+        [Description("strRDPDisableThemes")]
+        DisableThemes = 0x8,
+
+//		[Description("strRDPDisableCursorShadow")]
+//      DisableCursorShadow = 0x20,
+
+//		[Description("strRDPDisableCursorblinking")]
+//      DisableCursorBlinking = 0x40,
+
+        [Description("strRDPEnableFontSmoothing")]
+        EnableFontSmoothing = 0x80,
+
+        [Description("strRDPEnableDesktopComposition")]
+        EnableDesktopComposition = 0x100
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDPResolutions.cs

@@ -0,0 +1,34 @@
+using System.ComponentModel;
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDPResolutions
+    {
+        [LocalizedAttributes.LocalizedDescription("strRDPFitToPanel")]
+        FitToWindow,
+
+        [LocalizedAttributes.LocalizedDescription("strFullscreen")]
+        Fullscreen,
+
+        [LocalizedAttributes.LocalizedDescription("strRDPSmartSize")]
+        SmartSize,
+        [Description("800x600")] Res800x600,
+        [Description("1024x768")] Res1024x768,
+        [Description("1152x864")] Res1152x864,
+        [Description("1280x800")] Res1280x800,
+        [Description("1280x1024")] Res1280x1024,
+        [Description("1366x768")] Res1366x768,
+        [Description("1440x900")] Res1440x900,
+        [Description("1600x900")] Res1600x900,
+        [Description("1600x1200")] Res1600x1200,
+        [Description("1680x1050")] Res1680x1050,
+        [Description("1920x1080")] Res1920x1080,
+        [Description("1920x1200")] Res1920x1200,
+        [Description("2048x1536")] Res2048x1536,
+        [Description("2560x1440")] Res2560x1440,
+        [Description("2560x1600")] Res2560x1600,
+        [Description("2560x2048")] Res2560x2048,
+        [Description("3840x2160")] Res3840x2160
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDPSoundQuality.cs

@@ -0,0 +1,16 @@
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDPSoundQuality
+    {
+        [LocalizedAttributes.LocalizedDescription("strRDPSoundQualityDynamic")]
+        Dynamic = 0,
+
+        [LocalizedAttributes.LocalizedDescription("strRDPSoundQualityMedium")]
+        Medium = 1,
+
+        [LocalizedAttributes.LocalizedDescription("strRDPSoundQualityHigh")]
+        High = 2
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RDPSounds.cs

@@ -0,0 +1,16 @@
+using mRemoteNG.Tools;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RDPSounds
+    {
+        [LocalizedAttributes.LocalizedDescription("strRDPSoundBringToThisComputer")]
+        BringToThisComputer = 0,
+
+        [LocalizedAttributes.LocalizedDescription("strRDPSoundLeaveAtRemoteComputer")]
+        LeaveAtRemoteComputer = 1,
+
+        [LocalizedAttributes.LocalizedDescription("strRDPSoundDoNotPlay")]
+        DoNotPlay = 2
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpClientWrap.cs

@@ -1,24 +0,0 @@
-using mRemoteNG.App;
-using mRemoteNG.UI.Tabs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace mRemoteNG.Connection.Protocol.RDP
-{
-    class RdpClientWrap : AxMSTSCLib.AxMsRdpClient8NotSafeForScripting
-    {
-        public RdpClientWrap()
-            : base()
-        {
-            GotFocus += RdpClientWrap_GotFocus;
-        }
-
-        private void RdpClientWrap_GotFocus(object sender, EventArgs e)
-        {
-            ((ConnectionTab)Parent.Parent).Focus();
-        }
-    }
-}

mRemoteV1/Connection/Protocol/RDP/RdpExtensions.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Drawing;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public static class RdpExtensions
+    {
+        public static Rectangle GetResolutionRectangle(this RDPResolutions resolution)
+        {
+            string[] resolutionParts = null;
+            if (resolution != RDPResolutions.FitToWindow & resolution != RDPResolutions.Fullscreen &
+                resolution != RDPResolutions.SmartSize)
+            {
+                resolutionParts = resolution.ToString().Replace("Res", "").Split('x');
+            }
+
+            if (resolutionParts == null || resolutionParts.Length != 2)
+            {
+                return new Rectangle(0, 0, 0, 0);
+            }
+            else
+            {
+                return new Rectangle(0, 0, Convert.ToInt32(resolutionParts[0]), Convert.ToInt32(resolutionParts[1]));
+            }
+        }
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpNetworkConnectionType.cs

@@ -0,0 +1,46 @@
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    /// <summary>
+    /// Indicates the speed of the connection between the
+    /// client and remote machine.
+    /// </summary>
+    public enum RdpNetworkConnectionType
+    {
+        /// <summary>
+        /// Modem (56 Kbps)
+        /// </summary>
+        Modem = 1,
+
+        /// <summary>
+        /// Low-speed broadband (256 Kbps to 2 Mbps)
+        /// </summary>
+        BroadbandLow = 2,
+
+        /// <summary>
+        /// Satellite (2 Mbps to 16 Mbps, with high latency)
+        /// </summary>
+        Satellite = 3,
+
+        /// <summary>
+        /// High-speed broadband (2 Mbps to 10 Mbps)
+        /// </summary>
+        BroadbandHigh = 4,
+
+        /// <summary>
+        /// Wide area network (WAN) (10 Mbps or higher, with high latency)
+        /// </summary>
+        Wan = 5,
+
+        /// <summary>
+        /// Local area network (LAN) (10 Mbps or higher)
+        /// </summary>
+        Lan = 6,
+
+        /// <summary>
+        /// Automatically detect the connection type. Warning: setting
+        /// this will prevent the client from setting several performance
+        /// options such as displaying wallpaper and remote cursors.
+        /// </summary>
+        AutoDetect = 7
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpProtocol6.cs

@@ -1,8 +1,11 @@
 using System;
-using System.ComponentModel;
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading;
+using System.Timers;
 using System.Windows.Forms;
 using AxMSTSCLib;
 using mRemoteNG.App;
@@ -11,11 +14,12 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 using mRemoteNG.UI;
 using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Tabs;
 using MSTSCLib;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {
-    public class RdpProtocol : ProtocolBase, ISupportsViewOnly
+    public class RdpProtocol6 : ProtocolBase, ISupportsViewOnly
     {
         /* RDP v8 requires Windows 7 with:
          * https://support.microsoft.com/en-us/kb/2592687 
@@ -24,35 +28,35 @@ namespace mRemoteNG.Connection.Protocol.RDP
          * 
          * Windows 8+ support RDP v8 out of the box.
          */
-        private AxHost _axHost;
-        private MsRdpClient8NotSafeForScripting _rdpClient;
+        private MsRdpClient6NotSafeForScripting _rdpClient;
+        protected ConnectionInfo connectionInfo;
+        protected bool loginComplete;
         private Version _rdpVersion;
-        private ConnectionInfo _connectionInfo;
-        private bool _loginComplete;
         private bool _redirectKeys;
         private bool _alertOnIdleDisconnect;
         private readonly DisplayProperties _displayProperties;
         private readonly FrmMain _frmMain = FrmMain.Default;
+        protected virtual RdpVersion RdpProtocolVersion => RdpVersion.Rdc6;
+        private AxHost AxHost => (AxHost)Control;
+        private readonly NativeMethods.EnumWindowsProc _enumWindowsProc;
 
         #region Properties
 
-        public bool SmartSize
+        public virtual bool SmartSize
         {
             get => _rdpClient.AdvancedSettings2.SmartSizing;
-            private set
+            protected set
             {
                 _rdpClient.AdvancedSettings2.SmartSizing = value;
-                ReconnectForResize();
             }
         }
 
-        public bool Fullscreen
+        public virtual bool Fullscreen
         {
             get => _rdpClient.FullScreen;
-            private set
+            protected set
             {
                 _rdpClient.FullScreen = value;
-                ReconnectForResize();
             }
         }
 
@@ -89,95 +93,45 @@ namespace mRemoteNG.Connection.Protocol.RDP
 
         public bool ViewOnly
         {
-            get => !_axHost.Enabled;
-            set => _axHost.Enabled = !value;
+            get => !AxHost.Enabled;
+            set => AxHost.Enabled = !value;
         }
 
         #endregion
 
         #region Constructors
 
-        public RdpProtocol()
+        public RdpProtocol6()
         {
-            Control = new RdpClientWrap();
             _displayProperties = new DisplayProperties();
+            tmrReconnect.Elapsed += tmrReconnect_Elapsed;
+            _enumWindowsProc = LpEnumFunc;
         }
 
         #endregion
 
         #region Public Methods
+        protected virtual AxHost CreateActiveXRdpClientControl()
+        {
+            return new AxMsRdpClient6NotSafeForScripting();
+        }
+
 
         public override bool Initialize()
         {
+            connectionInfo = InterfaceControl.Info;
+            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
+                $"Requesting RDP version: {connectionInfo.RdpVersion}. Using: {RdpProtocolVersion}");
+            Control = CreateActiveXRdpClientControl();
             base.Initialize();
+
             try
             {
-                Control.CreateControl();
-                _connectionInfo = InterfaceControl.Info;
-
-                try
-                {
-                    while (!Control.Created)
-                    {
-                        Thread.Sleep(0);
-                        Application.DoEvents();
-                    }
-
-                    _axHost = (AxMsRdpClient8NotSafeForScripting)Control;
-                    _rdpClient = (MsRdpClient8NotSafeForScripting)_axHost.GetOcx();
-                }
-                catch (System.Runtime.InteropServices.COMException ex)
-                {
-                    Runtime.MessageCollector.AddExceptionMessage(Language.strRdpControlCreationFailed, ex);
-                    Control.Dispose();
+                if (!InitializeActiveXControl())
                     return false;
-                }
 
                 _rdpVersion = new Version(_rdpClient.Version);
-
-                _rdpClient.Server = _connectionInfo.Hostname;
-
-                SetCredentials();
-                SetResolution();
-                _rdpClient.FullScreenTitle = _connectionInfo.Name;
-
-                _alertOnIdleDisconnect = _connectionInfo.RDPAlertIdleTimeout;
-                _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = _connectionInfo.RDPMinutesToIdleTimeout;
-
-                //not user changeable
-                _rdpClient.AdvancedSettings2.GrabFocusOnConnect = true;
-                _rdpClient.AdvancedSettings3.EnableAutoReconnect = true;
-                _rdpClient.AdvancedSettings3.MaxReconnectAttempts = Settings.Default.RdpReconnectionCount;
-                _rdpClient.AdvancedSettings2.keepAliveInterval = 60000; //in milliseconds (10,000 = 10 seconds)
-                _rdpClient.AdvancedSettings5.AuthenticationLevel = 0;
-                _rdpClient.AdvancedSettings2.EncryptionEnabled = 1;
-                
-                _rdpClient.AdvancedSettings2.overallConnectionTimeout = Settings.Default.ConRDPOverallConnectionTimeout;
-
-                _rdpClient.AdvancedSettings2.BitmapPeristence = Convert.ToInt32(_connectionInfo.CacheBitmaps);
-                if (_rdpVersion >= Versions.RDC61)
-                {
-                    _rdpClient.AdvancedSettings7.EnableCredSspSupport = _connectionInfo.UseCredSsp;
-                    _rdpClient.AdvancedSettings8.AudioQualityMode = (uint)_connectionInfo.SoundQuality;
-                }
-
-                SetUseConsoleSession();
-                SetPort();
-                RedirectKeys = _connectionInfo.RedirectKeys;
-                SetRedirection();
-                SetAuthenticationLevel();
-                SetLoadBalanceInfo();
-                SetRdGateway();
-                ViewOnly = Force.HasFlag(ConnectionInfo.Force.ViewOnly);
-
-                _rdpClient.ColorDepth = (int)_connectionInfo.Colors;
-
-                SetPerformanceFlags();
-
-                _rdpClient.ConnectingText = Language.strConnecting;
-
-                Control.Anchor = AnchorStyles.None;
-
+                SetRdpClientProperties();
                 return true;
             }
             catch (Exception ex)
@@ -187,9 +141,41 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
         }
 
+        private bool InitializeActiveXControl()
+        {
+            try
+            {
+                Control.GotFocus += RdpClient_GotFocus;
+                Control.CreateControl();
+                while (!Control.Created)
+                {
+                    Thread.Sleep(0);
+                    Application.DoEvents();
+                }
+                Control.Anchor = AnchorStyles.None;
+
+                _rdpClient = (MsRdpClient6NotSafeForScripting)((AxHost)Control).GetOcx();
+                return true;
+            }
+            catch (COMException ex)
+            {
+                if (ex.Message.Contains("CLASS_E_CLASSNOTAVAILABLE"))
+                {
+                    Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
+                        string.Format(Language.RdpProtocolVersionNotSupported, connectionInfo.RdpVersion));
+                }
+                else
+                {
+                    Runtime.MessageCollector.AddExceptionMessage(Language.strRdpControlCreationFailed, ex);
+                }
+                Control.Dispose();
+                return false;
+            }
+        }
+
         public override bool Connect()
         {
-            _loginComplete = false;
+            loginComplete = false;
             SetEventHandlers();
 
             try
@@ -256,115 +242,155 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, $"Could not toggle view only mode for host {_connectionInfo.Hostname}");
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, $"Could not toggle view only mode for host {connectionInfo.Hostname}");
             }
         }
 
         public override void Focus()
         {
+            var result = new List<IntPtr>();
+            var listHandle = GCHandle.Alloc(result);
             try
             {
                 if (Control.ContainsFocus == false)
                 {
-                    Control.Focus();
+                    //AxHost.Focus();
+                    //AxHost.Select();
+                    //AxHost.DoVerb(-1);
+                    //AxHost.DoVerb(-4);
+                    //AxHost.DoVerb(-5);
+
+                    NativeMethods.EnumChildWindows(AxHost.Handle, _enumWindowsProc, GCHandle.ToIntPtr(listHandle));
+                    if (result.Any())
+                    {
+                        NativeMethods.SetFocus(result[0]);
+                        Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"RDP connection focused '{connectionInfo.Name}'");
+                    }
                 }
             }
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpFocusFailed, ex);
             }
-        }
-
-        private Size _controlBeginningSize;
-
-        public override void ResizeBegin(object sender, EventArgs e)
-        {
-            _controlBeginningSize = Control.Size;
-        }
-
-        public override void Resize(object sender, EventArgs e)
-        {
-            if (DoResize() && _controlBeginningSize.IsEmpty)
+            finally
             {
-                ReconnectForResize();
+                if (listHandle.IsAllocated)
+                    listHandle.Free();
+            }
+        }
+
+        private bool LpEnumFunc(IntPtr hwnd, IntPtr lparam)
+        {
+            var gch = GCHandle.FromIntPtr(lparam);
+            var list = gch.Target as List<IntPtr>;
+            if (list == null)
+                throw new InvalidCastException("GCHandle Target could not be cast as List<IntPtr>");
+
+            var sb = new StringBuilder();
+            NativeMethods.GetClassName(hwnd, sb, 64);
+
+            if (sb.ToString().Equals("IHWindowClass"))
+            {
+                list.Add(hwnd);
+                return false;
             }
 
-            base.Resize(sender, e);
+            return true;
         }
 
-        public override void ResizeEnd(object sender, EventArgs e)
+        /// <summary>
+        /// Determines if this version of the RDP client
+        /// is supported on this machine.
+        /// </summary>
+        /// <returns></returns>
+        public bool RdpVersionSupported()
         {
-            DoResize();
-            if (!(Control.Size == _controlBeginningSize))
+            try
             {
-                ReconnectForResize();
+                using (var control = CreateActiveXRdpClientControl())
+                {
+                    control.CreateControl();
+                    return true;
+                }
             }
-
-            _controlBeginningSize = Size.Empty;
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private bool DoResize()
-        {
-            Control.Location = InterfaceControl.Location;
-            if (!(Control.Size == InterfaceControl.Size) && !(InterfaceControl.Size == Size.Empty)
-            ) // kmscode - this doesn't look right to me. But I'm not aware of any functionality issues with this currently...
-            {
-                Control.Size = InterfaceControl.Size;
-                return true;
-            }
-            else
+            catch
             {
                 return false;
             }
         }
+        #endregion
 
-        private void ReconnectForResize()
+        #region Private Methods
+
+        private void SetRdpClientProperties()
         {
-            if (_rdpVersion < Versions.RDC80)
+            _rdpClient.Server = connectionInfo.Hostname;
+
+            SetCredentials();
+            SetResolution();
+            _rdpClient.FullScreenTitle = connectionInfo.Name;
+
+            _alertOnIdleDisconnect = connectionInfo.RDPAlertIdleTimeout;
+            _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = connectionInfo.RDPMinutesToIdleTimeout;
+
+            //not user changeable
+            _rdpClient.AdvancedSettings2.GrabFocusOnConnect = true;
+            _rdpClient.AdvancedSettings3.EnableAutoReconnect = true;
+            _rdpClient.AdvancedSettings3.MaxReconnectAttempts = Settings.Default.RdpReconnectionCount;
+            _rdpClient.AdvancedSettings2.keepAliveInterval = 60000; //in milliseconds (10,000 = 10 seconds)
+            _rdpClient.AdvancedSettings5.AuthenticationLevel = 0;
+            _rdpClient.AdvancedSettings2.EncryptionEnabled = 1;
+
+            _rdpClient.AdvancedSettings2.overallConnectionTimeout = Settings.Default.ConRDPOverallConnectionTimeout;
+
+            _rdpClient.AdvancedSettings2.BitmapPeristence = Convert.ToInt32(connectionInfo.CacheBitmaps);
+            if (_rdpVersion >= Versions.RDC61)
             {
-                return;
+                _rdpClient.AdvancedSettings7.EnableCredSspSupport = connectionInfo.UseCredSsp;
             }
 
-            if (!_loginComplete)
-            {
-                return;
-            }
+            SetUseConsoleSession();
+            SetPort();
+            RedirectKeys = connectionInfo.RedirectKeys;
+            SetRedirection();
+            SetAuthenticationLevel();
+            SetLoadBalanceInfo();
+            SetRdGateway();
+            ViewOnly = Force.HasFlag(ConnectionInfo.Force.ViewOnly);
 
-            if (!InterfaceControl.Info.AutomaticResize)
-            {
-                return;
-            }
+            _rdpClient.ColorDepth = (int)connectionInfo.Colors;
 
-            if (!(InterfaceControl.Info.Resolution == RDPResolutions.FitToWindow |
-                  InterfaceControl.Info.Resolution == RDPResolutions.Fullscreen))
-            {
-                return;
-            }
+            SetPerformanceFlags();
 
-            if (SmartSize)
-            {
-                return;
-            }
+            _rdpClient.ConnectingText = Language.strConnecting;
+        }
 
+        protected object GetExtendedProperty(string property)
+        {
             try
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
-                                                    $"Resizing RDP connection to host '{_connectionInfo.Hostname}'");
-                var size = !Fullscreen ? Control.Size : Screen.FromControl(Control).Bounds.Size;
-
-                IMsRdpClient8 msRdpClient8 = _rdpClient;
-                msRdpClient8.Reconnect((uint)size.Width, (uint)size.Height);
+                // ReSharper disable once UseIndexedProperty
+                return ((IMsRdpExtendedSettings)_rdpClient).get_Property(property);
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
-                Runtime.MessageCollector.AddExceptionMessage(
-                                                             string.Format(Language.ChangeConnectionResolutionError,
-                                                                           _connectionInfo.Hostname),
-                                                             ex, MessageClass.WarningMsg, false);
+                Runtime.MessageCollector.AddExceptionMessage($"Error getting extended RDP property '{property}'",
+                                                             e, MessageClass.WarningMsg, false);
+                return null;
+            }
+        }
+
+        protected void SetExtendedProperty(string property, object value)
+        {
+            try
+            {
+                // ReSharper disable once UseIndexedProperty
+                ((IMsRdpExtendedSettings)_rdpClient).set_Property(property, ref value);
+            }
+            catch (Exception e)
+            {
+                Runtime.MessageCollector.AddExceptionMessage($"Error setting extended RDP property '{property}'",
+                                                             e, MessageClass.WarningMsg, false);
             }
         }
 
@@ -382,12 +408,12 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strRdpGatewayIsSupported,
                                                     true);
 
-                if (_connectionInfo.RDGatewayUsageMethod != RDGatewayUsageMethod.Never)
+                if (connectionInfo.RDGatewayUsageMethod != RDGatewayUsageMethod.Never)
                 {
-                    _rdpClient.TransportSettings.GatewayUsageMethod = (uint)_connectionInfo.RDGatewayUsageMethod;
-                    _rdpClient.TransportSettings.GatewayHostname = _connectionInfo.RDGatewayHostname;
+                    _rdpClient.TransportSettings.GatewayUsageMethod = (uint)connectionInfo.RDGatewayUsageMethod;
+                    _rdpClient.TransportSettings.GatewayHostname = connectionInfo.RDGatewayHostname;
                     _rdpClient.TransportSettings.GatewayProfileUsageMethod = 1; // TSC_PROXY_PROFILE_MODE_EXPLICIT
-                    if (_connectionInfo.RDGatewayUseConnectionCredentials ==
+                    if (connectionInfo.RDGatewayUseConnectionCredentials ==
                         RDGatewayUseConnectionCredentials.SmartCard)
                     {
                         _rdpClient.TransportSettings.GatewayCredsSource = 1; // TSC_PROXY_CREDS_MODE_SMARTCARD
@@ -395,22 +421,22 @@ namespace mRemoteNG.Connection.Protocol.RDP
 
                     if (_rdpVersion >= Versions.RDC61 && !Force.HasFlag(ConnectionInfo.Force.NoCredentials))
                     {
-                        if (_connectionInfo.RDGatewayUseConnectionCredentials == RDGatewayUseConnectionCredentials.Yes)
+                        if (connectionInfo.RDGatewayUseConnectionCredentials == RDGatewayUseConnectionCredentials.Yes)
                         {
-                            _rdpClient.TransportSettings2.GatewayUsername = _connectionInfo.Username;
-                            _rdpClient.TransportSettings2.GatewayPassword = _connectionInfo.Password;
-                            _rdpClient.TransportSettings2.GatewayDomain = _connectionInfo?.Domain;
+                            _rdpClient.TransportSettings2.GatewayUsername = connectionInfo.Username;
+                            _rdpClient.TransportSettings2.GatewayPassword = connectionInfo.Password;
+                            _rdpClient.TransportSettings2.GatewayDomain = connectionInfo?.Domain;
                         }
-                        else if (_connectionInfo.RDGatewayUseConnectionCredentials ==
+                        else if (connectionInfo.RDGatewayUseConnectionCredentials ==
                                  RDGatewayUseConnectionCredentials.SmartCard)
                         {
                             _rdpClient.TransportSettings2.GatewayCredSharing = 0;
                         }
                         else
                         {
-                            _rdpClient.TransportSettings2.GatewayUsername = _connectionInfo.RDGatewayUsername;
-                            _rdpClient.TransportSettings2.GatewayPassword = _connectionInfo.RDGatewayPassword;
-                            _rdpClient.TransportSettings2.GatewayDomain = _connectionInfo.RDGatewayDomain;
+                            _rdpClient.TransportSettings2.GatewayUsername = connectionInfo.RDGatewayUsername;
+                            _rdpClient.TransportSettings2.GatewayPassword = connectionInfo.RDGatewayPassword;
+                            _rdpClient.TransportSettings2.GatewayDomain = connectionInfo.RDGatewayDomain;
                             _rdpClient.TransportSettings2.GatewayCredSharing = 0;
                         }
                     }
@@ -438,7 +464,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 }
                 else
                 {
-                    value = _connectionInfo.UseConsoleSession;
+                    value = connectionInfo.UseConsoleSession;
                 }
 
                 if (_rdpVersion >= Versions.RDC61)
@@ -466,35 +492,6 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
         }
 
-        private object GetExtendedProperty(string property)
-        {
-            try
-            {
-                // ReSharper disable once UseIndexedProperty
-                return ((IMsRdpExtendedSettings)_rdpClient).get_Property(property);
-            }
-            catch (Exception e)
-            {
-                Runtime.MessageCollector.AddExceptionMessage($"Error getting extended RDP property '{property}'",
-                                                             e, MessageClass.WarningMsg, false);
-                return null;
-            }
-        }
-
-        private void SetExtendedProperty(string property, object value)
-        {
-            try
-            {
-                // ReSharper disable once UseIndexedProperty
-                ((IMsRdpExtendedSettings)_rdpClient).set_Property(property, ref value);
-            }
-            catch (Exception e)
-            {
-                Runtime.MessageCollector.AddExceptionMessage($"Error setting extended RDP property '{property}'",
-                                                             e, MessageClass.WarningMsg, false);
-            }
-        }
-
         private void SetCredentials()
         {
             try
@@ -504,9 +501,9 @@ namespace mRemoteNG.Connection.Protocol.RDP
                     return;
                 }
 
-                var userName = _connectionInfo?.Username ?? "";
-                var password = _connectionInfo?.Password ?? "";
-                var domain = _connectionInfo?.Domain ?? "";
+                var userName = connectionInfo?.Username ?? "";
+                var password = connectionInfo?.Password ?? "";
+                var domain = connectionInfo?.Domain ?? "";
 
                 if (string.IsNullOrEmpty(userName))
                 {
@@ -580,8 +577,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
                     return;
                 }
 
-                if ((InterfaceControl.Info.Resolution == RDPResolutions.FitToWindow) ||
-                    (InterfaceControl.Info.Resolution == RDPResolutions.SmartSize))
+                if (InterfaceControl.Info.Resolution == RDPResolutions.FitToWindow ||
+                    InterfaceControl.Info.Resolution == RDPResolutions.SmartSize)
                 {
                     _rdpClient.DesktopWidth = InterfaceControl.Size.Width;
                     _rdpClient.DesktopHeight = InterfaceControl.Size.Height;
@@ -599,7 +596,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 }
                 else
                 {
-                    var resolution = GetResolutionRectangle(_connectionInfo.Resolution);
+                    var resolution = connectionInfo.Resolution.GetResolutionRectangle();
                     _rdpClient.DesktopWidth = resolution.Width;
                     _rdpClient.DesktopHeight = resolution.Height;
                 }
@@ -614,9 +611,9 @@ namespace mRemoteNG.Connection.Protocol.RDP
         {
             try
             {
-                if (_connectionInfo.Port != (int)Defaults.Port)
+                if (connectionInfo.Port != (int)Defaults.Port)
                 {
-                    _rdpClient.AdvancedSettings2.RDPPort = _connectionInfo.Port;
+                    _rdpClient.AdvancedSettings2.RDPPort = connectionInfo.Port;
                 }
             }
             catch (Exception ex)
@@ -629,13 +626,12 @@ namespace mRemoteNG.Connection.Protocol.RDP
         {
             try
             {
-                _rdpClient.AdvancedSettings2.RedirectDrives = _connectionInfo.RedirectDiskDrives;
-                _rdpClient.AdvancedSettings2.RedirectPorts = _connectionInfo.RedirectPorts;
-                _rdpClient.AdvancedSettings2.RedirectPrinters = _connectionInfo.RedirectPrinters;
-                _rdpClient.AdvancedSettings2.RedirectSmartCards = _connectionInfo.RedirectSmartCards;
-                _rdpClient.SecuredSettings2.AudioRedirectionMode = (int)_connectionInfo.RedirectSound;
-                _rdpClient.AdvancedSettings.DisableRdpdr = _connectionInfo.RedirectClipboard ? 0 : 1;
-                _rdpClient.AdvancedSettings8.AudioCaptureRedirectionMode = _connectionInfo.RedirectAudioCapture;
+                _rdpClient.AdvancedSettings2.RedirectDrives = connectionInfo.RedirectDiskDrives;
+                _rdpClient.AdvancedSettings2.RedirectPorts = connectionInfo.RedirectPorts;
+                _rdpClient.AdvancedSettings2.RedirectPrinters = connectionInfo.RedirectPrinters;
+                _rdpClient.AdvancedSettings2.RedirectSmartCards = connectionInfo.RedirectSmartCards;
+                _rdpClient.SecuredSettings2.AudioRedirectionMode = (int)connectionInfo.RedirectSound;
+                _rdpClient.AdvancedSettings.DisableRdpdr = connectionInfo.RedirectClipboard ? 0 : 1;
             }
             catch (Exception ex)
             {
@@ -648,24 +644,24 @@ namespace mRemoteNG.Connection.Protocol.RDP
             try
             {
                 var pFlags = 0;
-                if (_connectionInfo.DisplayThemes == false)
+                if (connectionInfo.DisplayThemes == false)
                 {
-                    pFlags += Convert.ToInt32(RDPPerformanceFlags.DisableThemes);
+                    pFlags += (int)RDPPerformanceFlags.DisableThemes;
                 }
 
-                if (_connectionInfo.DisplayWallpaper == false)
+                if (connectionInfo.DisplayWallpaper == false)
                 {
-                    pFlags += Convert.ToInt32(RDPPerformanceFlags.DisableWallpaper);
+                    pFlags += (int)RDPPerformanceFlags.DisableWallpaper;
                 }
 
-                if (_connectionInfo.EnableFontSmoothing)
+                if (connectionInfo.EnableFontSmoothing)
                 {
-                    pFlags += Convert.ToInt32(RDPPerformanceFlags.EnableFontSmoothing);
+                    pFlags += (int)RDPPerformanceFlags.EnableFontSmoothing;
                 }
 
-                if (_connectionInfo.EnableDesktopComposition)
+                if (connectionInfo.EnableDesktopComposition)
                 {
-                    pFlags += Convert.ToInt32(RDPPerformanceFlags.EnableDesktopComposition);
+                    pFlags += (int)RDPPerformanceFlags.EnableDesktopComposition;
                 }
 
                 _rdpClient.AdvancedSettings2.PerformanceFlags = pFlags;
@@ -680,7 +676,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
         {
             try
             {
-                _rdpClient.AdvancedSettings5.AuthenticationLevel = (uint)_connectionInfo.RDPAuthenticationLevel;
+                _rdpClient.AdvancedSettings5.AuthenticationLevel = (uint)connectionInfo.RDPAuthenticationLevel;
             }
             catch (Exception ex)
             {
@@ -690,7 +686,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 
         private void SetLoadBalanceInfo()
         {
-            if (string.IsNullOrEmpty(_connectionInfo.LoadBalanceInfo))
+            if (string.IsNullOrEmpty(connectionInfo.LoadBalanceInfo))
             {
                 return;
             }
@@ -698,8 +694,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
             try
             {
                 _rdpClient.AdvancedSettings2.LoadBalanceInfo = LoadBalanceInfoUseUtf8
-                    ? new AzureLoadBalanceInfoEncoder().Encode(_connectionInfo.LoadBalanceInfo)
-                    : _connectionInfo.LoadBalanceInfo;
+                    ? new AzureLoadBalanceInfoEncoder().Encode(connectionInfo.LoadBalanceInfo)
+                    : connectionInfo.LoadBalanceInfo;
             }
             catch (Exception ex)
             {
@@ -718,6 +714,9 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 _rdpClient.OnDisconnected += RDPEvent_OnDisconnected;
                 _rdpClient.OnLeaveFullScreenMode += RDPEvent_OnLeaveFullscreenMode;
                 _rdpClient.OnIdleTimeoutNotification += RDPEvent_OnIdleTimeoutNotification;
+                //_rdpClient.OnFocusReleased += direction => Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"RDP control '{connectionInfo.Name}' released focus.");
+                //AxHost.GotFocus += (sender, args) => Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"RDP control '{connectionInfo.Name}' received focus.");
+                //AxHost.LostFocus += (sender, args) => Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"RDP control '{connectionInfo.Name}' lost focus.");
             }
             catch (Exception ex)
             {
@@ -734,7 +733,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             Close(); //Simply close the RDP Session if the idle timeout has been triggered.
 
             if (!_alertOnIdleDisconnect) return;
-            MessageBox.Show($"The {_connectionInfo.Name} session was disconnected due to inactivity",
+            MessageBox.Show($"The {connectionInfo.Name} session was disconnected due to inactivity",
                             "Session Disconnected", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
@@ -783,7 +782,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 
         private void RDPEvent_OnLoginComplete()
         {
-            _loginComplete = true;
+            loginComplete = true;
         }
 
         private void RDPEvent_OnLeaveFullscreenMode()
@@ -792,6 +791,10 @@ namespace mRemoteNG.Connection.Protocol.RDP
             _leaveFullscreenEvent?.Invoke(this, new EventArgs());
         }
 
+        private void RdpClient_GotFocus(object sender, EventArgs e)
+        {
+            //((ConnectionTab)Control.Parent.Parent).Focus();
+        }
         #endregion
 
         #region Public Events & Handlers
@@ -819,154 +822,6 @@ namespace mRemoteNG.Connection.Protocol.RDP
             Port = 3389
         }
 
-        public enum RDPColors
-        {
-            [LocalizedAttributes.LocalizedDescription("strRDP256Colors")]
-            Colors256 = 8,
-
-            [LocalizedAttributes.LocalizedDescription("strRDP32768Colors")]
-            Colors15Bit = 15,
-
-            [LocalizedAttributes.LocalizedDescription("strRDP65536Colors")]
-            Colors16Bit = 16,
-
-            [LocalizedAttributes.LocalizedDescription("strRDP16777216Colors")]
-            Colors24Bit = 24,
-
-            [LocalizedAttributes.LocalizedDescription("strRDP4294967296Colors")]
-            Colors32Bit = 32
-        }
-
-        public enum RDPSounds
-        {
-            [LocalizedAttributes.LocalizedDescription("strRDPSoundBringToThisComputer")]
-            BringToThisComputer = 0,
-
-            [LocalizedAttributes.LocalizedDescription("strRDPSoundLeaveAtRemoteComputer")]
-            LeaveAtRemoteComputer = 1,
-
-            [LocalizedAttributes.LocalizedDescription("strRDPSoundDoNotPlay")]
-            DoNotPlay = 2
-        }
-
-        public enum RDPSoundQuality
-        {
-            [LocalizedAttributes.LocalizedDescription("strRDPSoundQualityDynamic")]
-            Dynamic = 0,
-
-            [LocalizedAttributes.LocalizedDescription("strRDPSoundQualityMedium")]
-            Medium = 1,
-
-            [LocalizedAttributes.LocalizedDescription("strRDPSoundQualityHigh")]
-            High = 2
-        }
-
-        private enum RDPPerformanceFlags
-        {
-            [Description("strRDPDisableWallpaper")]
-            DisableWallpaper = 0x1,
-
-//			[Description("strRDPDisableFullWindowdrag")]DisableFullWindowDrag = 0x2,
-//			[Description("strRDPDisableMenuAnimations")]DisableMenuAnimations = 0x4,
-            [Description("strRDPDisableThemes")] DisableThemes = 0x8,
-
-//			[Description("strRDPDisableCursorShadow")]DisableCursorShadow = 0x20,
-//			[Description("strRDPDisableCursorblinking")]DisableCursorBlinking = 0x40,
-            [Description("strRDPEnableFontSmoothing")]
-            EnableFontSmoothing = 0x80,
-
-            [Description("strRDPEnableDesktopComposition")]
-            EnableDesktopComposition = 0x100
-        }
-
-        public enum RDPResolutions
-        {
-            [LocalizedAttributes.LocalizedDescription("strRDPFitToPanel")]
-            FitToWindow,
-
-            [LocalizedAttributes.LocalizedDescription("strFullscreen")]
-            Fullscreen,
-
-            [LocalizedAttributes.LocalizedDescription("strRDPSmartSize")]
-            SmartSize,
-            [Description("800x600")] Res800x600,
-            [Description("1024x768")] Res1024x768,
-            [Description("1152x864")] Res1152x864,
-            [Description("1280x800")] Res1280x800,
-            [Description("1280x1024")] Res1280x1024,
-            [Description("1366x768")] Res1366x768,
-            [Description("1440x900")] Res1440x900,
-            [Description("1600x900")] Res1600x900,
-            [Description("1600x1200")] Res1600x1200,
-            [Description("1680x1050")] Res1680x1050,
-            [Description("1920x1080")] Res1920x1080,
-            [Description("1920x1200")] Res1920x1200,
-            [Description("2048x1536")] Res2048x1536,
-            [Description("2560x1440")] Res2560x1440,
-            [Description("2560x1600")] Res2560x1600,
-            [Description("2560x2048")] Res2560x2048,
-            [Description("3840x2160")] Res3840x2160
-        }
-
-        public enum AuthenticationLevel
-        {
-            [LocalizedAttributes.LocalizedDescription("strAlwaysConnectEvenIfAuthFails")]
-            NoAuth = 0,
-
-            [LocalizedAttributes.LocalizedDescription("strDontConnectWhenAuthFails")]
-            AuthRequired = 1,
-
-            [LocalizedAttributes.LocalizedDescription("strWarnIfAuthFails")]
-            WarnOnFailedAuth = 2
-        }
-
-        public enum RDGatewayUsageMethod
-        {
-            [LocalizedAttributes.LocalizedDescription("strNever")]
-            Never = 0, // TSC_PROXY_MODE_NONE_DIRECT
-
-            [LocalizedAttributes.LocalizedDescription("strAlways")]
-            Always = 1, // TSC_PROXY_MODE_DIRECT
-
-            [LocalizedAttributes.LocalizedDescription("strDetect")]
-            Detect = 2 // TSC_PROXY_MODE_DETECT
-        }
-
-        public enum RDGatewayUseConnectionCredentials
-        {
-            [LocalizedAttributes.LocalizedDescription("strUseDifferentUsernameAndPassword")]
-            No = 0,
-
-            [LocalizedAttributes.LocalizedDescription("strUseSameUsernameAndPassword")]
-            Yes = 1,
-
-            [LocalizedAttributes.LocalizedDescription("strUseSmartCard")]
-            SmartCard = 2
-        }
-
-        #endregion
-
-        #region Resolution
-
-        public static Rectangle GetResolutionRectangle(RDPResolutions resolution)
-        {
-            string[] resolutionParts = null;
-            if (resolution != RDPResolutions.FitToWindow & resolution != RDPResolutions.Fullscreen &
-                resolution != RDPResolutions.SmartSize)
-            {
-                resolutionParts = resolution.ToString().Replace("Res", "").Split('x');
-            }
-
-            if (resolutionParts == null || resolutionParts.Length != 2)
-            {
-                return new Rectangle(0, 0, 0, 0);
-            }
-            else
-            {
-                return new Rectangle(0, 0, Convert.ToInt32(resolutionParts[0]), Convert.ToInt32(resolutionParts[1]));
-            }
-        }
-
         #endregion
 
         public static class Versions
@@ -976,15 +831,16 @@ namespace mRemoteNG.Connection.Protocol.RDP
             public static readonly Version RDC70 = new Version(6, 1, 7600);
             public static readonly Version RDC80 = new Version(6, 2, 9200);
             public static readonly Version RDC81 = new Version(6, 3, 9600);
+            public static readonly Version RDC100 = new Version(10, 0, 0);
         }
 
         #region Reconnect Stuff
 
-        public void tmrReconnect_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        public void tmrReconnect_Elapsed(object sender, ElapsedEventArgs e)
         {
             try
             {
-                var srvReady = PortScanner.IsPortOpen(_connectionInfo.Hostname, Convert.ToString(_connectionInfo.Port));
+                var srvReady = PortScanner.IsPortOpen(connectionInfo.Hostname, Convert.ToString(connectionInfo.Port));
 
                 ReconnectGroup.ServerReady = srvReady;
 
@@ -997,9 +853,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddExceptionMessage(
-                                                             string.Format(Language.AutomaticReconnectError,
-                                                                           _connectionInfo.Hostname),
-                                                             ex, MessageClass.WarningMsg, false);
+                    string.Format(Language.AutomaticReconnectError, connectionInfo.Hostname),
+                    ex, MessageClass.WarningMsg, false);
             }
         }
 

mRemoteV1/Connection/Protocol/RDP/RdpProtocol7.cs

@@ -0,0 +1,48 @@
+using AxMSTSCLib;
+using mRemoteNG.App;
+using MSTSCLib;
+using System;
+using System.Windows.Forms;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public class RdpProtocol7 : RdpProtocol6
+    {
+        protected override RdpVersion RdpProtocolVersion => RdpVersion.Rdc7;
+
+        public override bool Initialize()
+        {
+            if (!base.Initialize())
+                return false;
+
+            try
+            {
+                var rdpClient7 = (MsRdpClient7NotSafeForScripting)((AxHost) Control).GetOcx();
+                rdpClient7.AdvancedSettings8.AudioQualityMode = (uint)connectionInfo.SoundQuality;
+                rdpClient7.AdvancedSettings8.AudioCaptureRedirectionMode = connectionInfo.RedirectAudioCapture;
+                rdpClient7.AdvancedSettings8.NetworkConnectionType = (int)RdpNetworkConnectionType.Modem;
+
+                if (connectionInfo.UseVmId)
+                {
+                    SetExtendedProperty("DisableCredentialsDelegation", true);
+                    rdpClient7.AdvancedSettings7.AuthenticationServiceClass = "Microsoft Virtual Console Service";
+                    rdpClient7.AdvancedSettings8.EnableCredSspSupport = true;
+                    rdpClient7.AdvancedSettings8.NegotiateSecurityLayer = false;
+                    rdpClient7.AdvancedSettings7.PCB = $"{connectionInfo.VmId};EnhancedMode=1";
+                }
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetPropsFailed, ex);
+                return false;
+            }
+
+            return true;
+        }
+
+        protected override AxHost CreateActiveXRdpClientControl()
+        {
+            return new AxMsRdpClient7NotSafeForScripting();
+        }
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpProtocol8.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using AxMSTSCLib;
+using mRemoteNG.App;
+using mRemoteNG.Messages;
+using MSTSCLib;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    /* RDP v8 requires Windows 7 with:
+		* https://support.microsoft.com/en-us/kb/2592687 
+		* OR
+		* https://support.microsoft.com/en-us/kb/2923545
+		* 
+		* Windows 8+ support RDP v8 out of the box.
+		*/
+    public class RdpProtocol8 : RdpProtocol7
+    {
+        private MsRdpClient8NotSafeForScripting RdpClient8 => (MsRdpClient8NotSafeForScripting)((AxHost)Control).GetOcx();
+        private Size _controlBeginningSize;
+
+        protected override RdpVersion RdpProtocolVersion => RdpVersion.Rdc8;
+
+        public override bool SmartSize
+        {
+            get => base.SmartSize;
+            protected set
+            {
+                base.SmartSize = value;
+                ReconnectForResize();
+            }
+        }
+
+        public override bool Fullscreen
+        {
+            get => base.Fullscreen;
+            protected set
+            {
+                base.Fullscreen = value;
+                ReconnectForResize();
+            }
+        }
+
+        public override void ResizeBegin(object sender, EventArgs e)
+        {
+            _controlBeginningSize = Control.Size;
+        }
+
+        public override void Resize(object sender, EventArgs e)
+        {
+            if (DoResize() && _controlBeginningSize.IsEmpty)
+            {
+                ReconnectForResize();
+            }
+            base.Resize(sender, e);
+        }
+
+        public override void ResizeEnd(object sender, EventArgs e)
+        {
+            DoResize();
+            if (!(Control.Size == _controlBeginningSize))
+            {
+                ReconnectForResize();
+            }
+            _controlBeginningSize = Size.Empty;
+        }
+
+        protected override AxHost CreateActiveXRdpClientControl()
+        {
+            return new AxMsRdpClient8NotSafeForScripting();
+        }
+
+        private void ReconnectForResize()
+        {
+            if (!loginComplete)
+                return;
+
+            if (!InterfaceControl.Info.AutomaticResize)
+                return;
+
+            if (!(InterfaceControl.Info.Resolution == RDPResolutions.FitToWindow ||
+                  InterfaceControl.Info.Resolution == RDPResolutions.Fullscreen))
+                return;
+
+            if (SmartSize)
+                return;
+
+            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
+                $"Resizing RDP connection to host '{connectionInfo.Hostname}'");
+
+            try
+            {
+                var size = Fullscreen
+                    ? Screen.FromControl(Control).Bounds.Size
+                    : Control.Size;
+                RdpClient8.Reconnect((uint)size.Width, (uint)size.Height);
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddExceptionMessage(
+                    string.Format(Language.ChangeConnectionResolutionError,
+                        connectionInfo.Hostname),
+                    ex, MessageClass.WarningMsg, false);
+            }
+        }
+
+        private bool DoResize()
+        {
+            Control.Location = InterfaceControl.Location;
+            // kmscode - this doesn't look right to me. But I'm not aware of any functionality issues with this currently...
+            if (!(Control.Size == InterfaceControl.Size) && !(InterfaceControl.Size == Size.Empty))
+            {
+                Control.Size = InterfaceControl.Size;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpProtocol9.cs

@@ -0,0 +1,15 @@
+using System.Windows.Forms;
+using AxMSTSCLib;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public class RdpProtocol9 : RdpProtocol8
+    {
+        protected override RdpVersion RdpProtocolVersion => RdpVersion.Rdc9;
+
+        protected override AxHost CreateActiveXRdpClientControl()
+        {
+            return new AxMsRdpClient9NotSafeForScripting();
+        }
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpProtocolFactory.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public class RdpProtocolFactory
+    {
+        public RdpProtocol6 Build(RdpVersion rdpVersion)
+        {
+            switch (rdpVersion)
+            {
+                case RdpVersion.Highest:
+                    return BuildHighestSupportedVersion();
+                case RdpVersion.Rdc6:
+                    return new RdpProtocol6();
+                case RdpVersion.Rdc7:
+                    return new RdpProtocol7();
+                case RdpVersion.Rdc8:
+                    return new RdpProtocol8();
+                case RdpVersion.Rdc9:
+                    return new RdpProtocol9();
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(rdpVersion), rdpVersion, null);
+            }
+        }
+
+        private RdpProtocol6 BuildHighestSupportedVersion()
+        {
+            var versions = Enum.GetValues(typeof(RdpVersion))
+                .OfType<RdpVersion>()
+                .Except(new[] { RdpVersion.Highest })
+                .Reverse();
+
+            foreach (var version in versions)
+            {
+                var rdp = Build(version);
+                if (rdp.RdpVersionSupported())
+                    return rdp;
+            }
+
+            throw new ArgumentOutOfRangeException();
+        }
+
+        public List<RdpVersion> GetSupportedVersions()
+        {
+            var versions = Enum.GetValues(typeof(RdpVersion))
+                .OfType<RdpVersion>()
+                .Except(new[] {RdpVersion.Highest});
+
+            var supportedVersions = new List<RdpVersion>();
+            foreach (var version in versions)
+            {
+                if (Build(version).RdpVersionSupported())
+                    supportedVersions.Add(version);
+            }
+
+            return supportedVersions;
+        }
+    }
+}

mRemoteV1/Connection/Protocol/RDP/RdpVersion.cs

@@ -0,0 +1,11 @@
+namespace mRemoteNG.Connection.Protocol.RDP
+{
+    public enum RdpVersion
+    {
+        Rdc6,
+        Rdc7,
+        Rdc8,
+        Rdc9,
+        Highest = 1000
+    }
+}

mRemoteV1/Connection/WebHelper.cs

@@ -1,23 +0,0 @@
-using mRemoteNG.Connection.Protocol;
-
-namespace mRemoteNG.Connection
-{
-    public class WebHelper
-    {
-        public static void GoToUrl(string url)
-        {
-            var connectionInfo = new ConnectionInfo();
-            connectionInfo.CopyFrom(DefaultConnectionInfo.Instance);
-
-            connectionInfo.Name = "";
-            connectionInfo.Hostname = url;
-            connectionInfo.Protocol = url.StartsWith("https:") ? ProtocolType.HTTPS : ProtocolType.HTTP;
-            connectionInfo.SetDefaultPort();
-            if (string.IsNullOrEmpty(connectionInfo.Panel))
-                connectionInfo.Panel = Language.strGeneral;
-            connectionInfo.IsQuickConnect = true;
-            var connectionInitiator = new ConnectionInitiator();
-            connectionInitiator.OpenConnection(connectionInfo, ConnectionInfo.Force.DoNotJump);
-        }
-    }
-}

mRemoteV1/Documentation/_static/theme_overrides.css

@@ -0,0 +1,13 @@
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+   .wy-table-responsive table td {
+      /* !important prevents the common CSS stylesheets from overriding
+         this as on RTD they are loaded after this stylesheet */
+      white-space: normal !important;
+   }
+
+   .wy-table-responsive {
+      overflow: visible !important;
+   }
+}

mRemoteV1/Documentation/about.rst

@@ -0,0 +1,23 @@
+###############
+About mRemoteNG
+###############
+
+mRemoteNG is an open source, multi-protocol, multi-remote connections manager
+that aims at providing you with a clutter-free,
+unstressful platform to manage all your remote connections in one place.
+The application is released under the GPLv2_ and is being managed on GitHub_.
+
+.. _GitHub: http://github.com/mRemoteNG/mRemoteNG
+.. _GPLv2: http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+
+As of now mRemoteNG supports the following protocols:
+
+RDP - SSH - VNC - ICA - Telnet - RAW - RLogin - HTTP/S
+
+.. toctree::
+   :maxdepth: 2
+
+   about/features.rst
+   about/versions.rst
+   about/release_channels.rst
+   about/license.rst

mRemoteV1/Documentation/about/features.rst

@@ -0,0 +1,22 @@
+************
+Key Features
+************
+
+- Free and Open Source, released under the GPL
+- Organizing connections into panels and tabs
+- Multiple supported protocols (RDP, VNC, ICA, SSH, Telnet, RAW, Rlogin and HTTP/S)
+- Easy to organize and maintain list of connections
+- Inheritance makes it possible to store properties on folder basis and let the underlying connections inherit this info
+- Importing connections from Active Directory
+- Creating nested folder structures to categorize connections
+- "Quick Connect" feature to quickly open a connection without creating an entry
+- "Quick Search" feature to quickly find a connection while typing
+- Support for SCP/SFTP (SSH) file transfers
+- Assign icons to connections for quick identification
+- A screenshot manager to create screenshots of running connections
+- "Auto-Update" feature
+- Minimize to system tray
+- Fullscreen (Kiosk) mode
+- Assign global credentials to use when no information is provided on connection basis
+- Host Indication on each connection to show if host responds to ping requests
+- ...