also fix installer project cert password reference

get cert password from build args rather than environment
change this back once appveyor is working
2026-02-21 08:18:33 +08:00 · 2019-04-29 17:54:11 -05:00 · 2019-04-29 17:37:08 -05:00 · 2019-04-29 17:00:36 -05:00 · 2019-04-29 15:03:16 -05:00 · 2019-04-29 21:53:58 +02:00
1054 changed files with 123463 additions and 51588 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -11,7 +11,7 @@ There are many ways that you can help improve mRemoteNG, even if you don't know
 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)
+- [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)


@@ -27,7 +27,6 @@ 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.
-1. Please tag your your bug report with the [`Bug`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3ABug) label.

 ### 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:
@@ -35,7 +34,6 @@ Feature requests are great! Take some time to compose a well thought out proposa
 - 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.
- Please tag your feature request with the [`Feature Request`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3A%22Feature+Request%22) label.

 # 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/)
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,16 +1,30 @@
-<!--
-Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
+<!--- Provide a general summary of the issue in the Title above -->

-Before opening an issue, please search for a duplicate or closed issue.
-Please provide as much detail as possible for us to fix your issue.
-->
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->

-<!-- Bug -->
-|||
-|--:|---|
-|Operating system | Windows 7 x64 |
-|mRemoteNG version| 1.75 aplha 3  |
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->

+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->

-<!-- Feature Request -->
-<!-- If you file a feature request, please delete the bug section -->
+## Steps to Reproduce (for bugs)
+<!--- Provide an unambiguous set of steps to reproduce -->
+<!--- this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Operating System and version (e.g. Windows 10 1709 x64):
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,29 @@
-<!--
-Please provide as much detail as possible with what your pull request does.
-Include a reference to a filed issue if it exists.
-->
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] 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)
+
+## 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! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have read the **CONTRIBUTING** document.
--- a/.gitignore
+++ b/.gitignore
@@ -283,9 +283,6 @@ Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
 InstallerProjects/Installer/Fragments/FilesFragment.wxs
 InstallerProjects/Installer/Resources/License.rtf

-# user preference: .editorconfig - http://editorconfig.org/
-.editorconfig
-
 # gh-pages info
 runlocal.bat
 /_site
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CREDITS.TXT
+++ b/CREDITS.TXT
@@ -1,120 +0,0 @@
-Contributors
-============
-
-Current mRemoteNG dev team:
-David Sparer (github.com/sparerd)
-Sean Kaim (github.com/kmscode)
-
-Thanks for the awesome new website!
-Bennett Blodinger (github.com/benwa)
-
-Joe Cefoli (github.com/jcefoli)
-countchappy (github.com/countchappy)
-Tony Lambert
-
-
-
-Past Contributors
-=================
-
-Felix Deimel - mRemote original developer
-Riley McArdle - mRemoteNG original developer
-
-Hayato Iriumi (github.com/hiriumi)
-Jason Barbier
-Wiktor Beryt
-Lionel Caignec
-Ruben d'Arco
-Holger Henke
-Tom Hiller
-Apisitt Rattana
-Andreas Rehm
-David Vidmar
-github.com/Brandhor
-github.com/Kvarkas
-
-
-Translators
-===========
-
-Eugenio "Ryo567" Mart<72>nez
-Mathieu Pape
-Emanuel Silva
-Robert Siwiec
-Hayato Iriumi
-Sebastien Thieury (github.com/SebThieu)
-Riza Emet
-
-
-Included Source Code
-====================
-
-Command Line Arguments Parser 1.0
-Copyright <20> 2002 Richard Lopes
-MIT License
-http://www.codeproject.com/KB/recipes/command_line.aspx
-
-FilteredPropertyGrid
-Copyright <20> 2006 Azuria
-http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
-
-Hotkey Selection Control for .NET
-Copyright <20> 2006 Thomas Backman
-http://www.codeproject.com/Articles/15085/A-simple-hotkey-selection-control-for-NET
-
-InputBox
-Copyright <20> 2016 Jan Slama
-http://www.csharp-examples.net/inputbox/
-
-IP TextBox
-Copyright <20> 2005 mawnkay
-http://www.codeproject.com/Articles/11576/IP-TextBox
-
-
-Included Components
-===================
-
-ADTree 1.0
-Copyright <20> 2004 Marc Merritt
-Copyright <20> 2008 Felix Deimel
-http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
-
-DockPanel Suite 2.10.0
-Copyright <20> 2016 @roken and @lextm (formerly Weifen Luo)
-MIT License
-https://github.com/dockpanelsuite/dockpanelsuite
-
-GeckoFX 45
-Copyright <20> 2016 Tom Hindle
-Mozilla Public License
-https://bitbucket.org/geckofx/
-
-log4net 1.2.15.0
-Copyright <20> 2001-2015 The Apache Software Foundation
-Apache License Version 2.0
-http://logging.apache.org/log4net/
-
-Magic Library 1.7.4
-Copyright <20> 2002-2003 Crownwood Consulting, Ltd.
-Freely redistributable with attribution
-http://www.dotnetmagic.com/magic_download.html
-
-PuTTY 0.68
-Copyright <20> 1997-2017 Simon Tatham
-MIT License
-http://www.chiark.greenend.org.uk/~sgtatham/putty/
-
-Silk Icon Set
-Copyright <20> 2005-2008 FAMFAMFAM
-Creative Commons Attribution 2.5 License
-http://www.famfamfam.com/
-
-SSH.NET v2016.0.0
-Copyright <20> 2016
-MIT License
-https://github.com/sshnet/SSH.NET
-
-VncSharp 1.1
-Copyright <20> 2004-2009 David Humphrey
-GNU General Public License (GPL) Version 2
-https://github.com/humphd/VncSharp
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -0,0 +1,142 @@
+# Contributors
+## Current mRemoteNG dev team
+David Sparer (github.com/sparerd)  
+Sean Kaim (github.com/kmscode)  
+Faryan Rezagholi (github.com/farosch)  
+
+Thanks for the awesome new website!  
+Bennett Blodinger (github.com/benwa)
+
+Joe Cefoli (github.com/jcefoli)  
+countchappy (github.com/countchappy)  
+Tony Lambert  
+Julien Roncaglia (github.com/vbfox)  
+github.com/peterchenadded  
+Brandon Wulf (github.com/mrwulf)  
+Pedro Rodrigues (github.com/pedro2555)  
+github.com/dekelMP  
+Bruce (github.com/brucetp)  
+Camilo Alvarez (github.com/jotatsu)  
+github.com/DamianBis  
+github.com/pfjason  
+github.com/sirLoaf  
+github.com/Fyers  
+Vladimir Semenov (github.com/sli-pro)  
+Stephan (github.com/st-schuler)  
+Aleksey Reytsman (github.com/areytsman)  
+Cristian Abelleira (github.com/CrAbelleira)  
+github.com/MitchellBot  
+
+## Past Contributors
+Felix Deimel - mRemote original developer  
+Riley McArdle - mRemoteNG original developer  
+
+Hayato Iriumi (github.com/hiriumi)  
+Jason Barbier  
+Wiktor Beryt  
+Lionel Caignec  
+Ruben d'Arco  
+Holger Henke  
+Tom Hiller  
+Apisitt Rattana  
+Andreas Rehm  
+David Vidmar  
+github.com/Brandhor  
+Dimitrij (github.com/Kvarkas)  
+
+## Translators
+Eugenio "Ryo567" Martínez  
+Mathieu Pape  
+Emanuel Silva  
+Robert Siwiec  
+Hayato Iriumi  
+Sebastien Thieury (github.com/SebThieu)  
+Riza Emet  
+Lukas Plachy (github.com/rheingold)  
+Gyuha Shin  
+Stefan (github.com/polluks)  
+github.com/emazv72  
+Vladimir Semenov (github.com/sli-pro)  
+Marco Sousa (github.com/marcomsousa)  
+github.com/wwj402  
+github.com/Fyers  
+github.com/pablomh  
+
+## Included Source Code
+Command Line Arguments Parser  
+Copyright © 2002 Richard Lopes  
+MIT License  
+http://www.codeproject.com/KB/recipes/command_line.aspx
+
+FilteredPropertyGrid  
+Copyright © 2006 Azuria  
+http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
+
+InputBox  
+Copyright © 2016 Jan Slama  
+http://www.csharp-examples.net/inputbox/
+
+IP TextBox  
+Copyright © 2005 mawnkay  
+http://www.codeproject.com/Articles/11576/IP-TextBox
+
+PortableSettingsProvider   	
+Copyright © 2014 crdx  
+https://github.com/crdx/PortableSettingsProvider
+
+
+## Included Components
+ADTree  
+Copyright © 2004 Marc Merritt  
+Copyright © 2008 Felix Deimel  
+http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
+
+DockPanel Suite  
+Copyright © 2018 @roken and @lextm (formerly Weifen Luo)  
+MIT License  
+https://github.com/dockpanelsuite/dockpanelsuite
+
+GeckoFX   
+Copyright © 2016 Tom Hindle  
+Mozilla Public License  
+https://bitbucket.org/geckofx/
+
+log4net  
+Copyright © 2001-2015 The Apache Software Foundation  
+Apache License Version 2.0  
+http://logging.apache.org/log4net/
+
+Magic Library  
+Copyright © 2002-2003 Crownwood Consulting, Ltd.  
+Freely redistributable with attribution  
+http://www.dotnetmagic.com/magic_download.html
+
+PuTTY  
+Copyright © 1997-2017 Simon Tatham  
+MIT License  
+http://www.chiark.greenend.org.uk/~sgtatham/putty/
+
+Silk Icon Set  
+Copyright © 2005-2008 FAMFAMFAM  
+Creative Commons Attribution 2.5 License  
+http://www.famfamfam.com/
+
+SSH.NET  
+Copyright © 2016  
+MIT License  
+https://github.com/sshnet/SSH.NET
+
+VncSharp  
+Copyright © 2004-2009 David Humphrey  
+GNU General Public License (GPL) Version 2  
+https://github.com/humphd/VncSharp
+
+ObjectListView  
+Copyright © 2006-2016 Phillip Piper  
+GNU General Public License (GPL) Version 3  
+https://sourceforge.net/projects/objectlistview/
+
+Markdig  
+Copyright © 2016-2019 Alexandre Mutel  
+BSD 2-Clause "Simplified"  
+https://github.com/lunet-io/markdig
--- a/InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs
@@ -3,10 +3,10 @@
 	<Fragment>
    <ComponentGroup Id="CG.ProjectInfoFiles" Directory="INSTALLDIR">
      <Component Id="C.Changelog" Guid="*">
-        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.TXT" KeyPath="yes" />
+        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.md" KeyPath="yes" />
      </Component>
      <Component Id="C.Credits" Guid="*">
-        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.TXT" KeyPath="yes" />
+        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.md" KeyPath="yes" />
      </Component>
      <Component Id="C.License" Guid="*">
        <File Id="LicenseFile" Name="License.txt" Source="$(var.SolutionDir)COPYING.TXT" KeyPath="yes" />
@@ -14,6 +14,9 @@
      <Component Id="C.Readme" Guid="*">
        <File Id="ReadmeFile" Name="Readme.txt" Source="$(var.SolutionDir)README.TXT" 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" />
+      </Component>
    </ComponentGroup>
 	</Fragment>
 </Wix>
--- a/InstallerProjects/Installer/Fragments/ShortcutFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/ShortcutFragment.wxs
@@ -5,14 +5,14 @@
    
    <DirectoryRef Id="DesktopFolder">
      <Component Id="C.DesktopShortcut" Guid="F78E5A16-A2F7-4BD9-9250-CBF3016CCCDA">
-        <Shortcut Id="DesktopShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="mRemoteNG.ico" />
+        <Shortcut Id="DesktopShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="AppIcon.ico" />
        <RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="DesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
      </Component>
    </DirectoryRef>
    
    <DirectoryRef Id="ApplicationProgramsFolder">
      <Component Id="C.ApplicationStartMenuShortcut" Guid="193B9E14-F40E-44F1-8514-BED253BCBF75">
-        <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="mRemoteNG.ico" />
+        <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="AppIcon.ico" />
        <Shortcut Id="CreditsShortcut" Name="Credits" Target="[INSTALLDIR]Credits.txt" WorkingDirectory="INSTALLDIR" />
        <Shortcut Id="LicenseShortcut" Name="License" Target="[INSTALLDIR]License.txt" WorkingDirectory="INSTALLDIR" />
        <Shortcut Id="ReadmeShortcut" Name="Readme" Target="[INSTALLDIR]Readme.txt" WorkingDirectory="INSTALLDIR" />
--- a/InstallerProjects/Installer/Installer.wixproj
+++ b/InstallerProjects/Installer/Installer.wixproj
@@ -39,15 +39,12 @@
    <Compile Include="mRemoteNGV1.wxs" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="Dependencies\PuTTYNG.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
    <Content Include="Filters\Harvest_Filter.xslt" />
    <Content Include="Includes\Config.wxi" />
-    <Content Include="Resources\header.bmp" />
+    <Content Include="Resources\AppIcon.ico" />
+    <Content Include="Resources\Installer_Header.png" />
+    <Content Include="Resources\Installer_Side.png" />
    <Content Include="Resources\License.rtf" />
-    <Content Include="Resources\mRemoteNG.ico" />
-    <Content Include="Resources\welcome.bmp" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="CustomActions" />
@@ -57,17 +54,16 @@
    <Folder Include="Localizations" />
    <Folder Include="Filters" />
    <Folder Include="bin" />
-    <Folder Include="Dependencies" />
    <Folder Include="Resources" />
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="Localizations\ru-RU.wxl" />
-    <EmbeddedResource Include="Localizations\ja-JP.wxl" />
-    <EmbeddedResource Include="Localizations\cs-CZ.wxl" />
-    <EmbeddedResource Include="Localizations\de-DE.wxl" />
    <EmbeddedResource Include="Localizations\en-US.wxl" />
  </ItemGroup>
  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
    <WixExtension Include="WixUIExtension">
      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
      <Name>WixUIExtension</Name>
@@ -121,24 +117,23 @@ rmdir /S /Q "$(TargetDir)"
 echo $(ConfigurationName) &gt; buildenv.tmp

 REM Harvest bin directory of the mRemoteV1 project
-call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr INSTALLDIR -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
+"$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -nologo -dr INSTALLDIR -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt"

 REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
-call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
+"$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
    <PostBuildEvent>:: When passing paths to powershell scripts, check if the path ends with a backslash "\"
 :: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.

 powershell -noprofile -command "sleep 2"
+
 set /p buildenv=&lt;buildenv.tmp
-set solutionDir=$(SolutionDir)\
-set targetDir=%25cd%25
-set psScriptsDir=$(SolutionDir)Tools
-set certPath=$(CertPath)
-set certPassword=$(CertPassword)
+
+:: Manual builds, set the cert password and uncomment below.
+:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd=  )

 :: Call the post build powershell script
-powershell.exe -ExecutionPolicy Bypass -File "%25psScriptsDir%25\postbuild_installer.ps1" -SolutionDir "%25solutionDir%25" -TargetDir "%25targetDir%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "%25certPath%25" -CertificatePassword "%25certPassword%25"</PostBuildEvent>
+powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_installer.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe"</PostBuildEvent>
  </PropertyGroup>
 </Project>
--- a/InstallerProjects/Installer/Localizations/cs-CZ.wxl
+++ b/InstallerProjects/Installer/Localizations/cs-CZ.wxl
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="cs-CZ" Language="1029" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-  
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-  
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-  
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
-  
-</WixLocalization>
--- a/InstallerProjects/Installer/Localizations/de-DE.wxl
+++ b/InstallerProjects/Installer/Localizations/de-DE.wxl
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="de-DE" Language="1031" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">mRemoteNG jetzt Starten</String>
-  
-</WixLocalization>
--- a/InstallerProjects/Installer/Localizations/en-US.wxl
+++ b/InstallerProjects/Installer/Localizations/en-US.wxl
@@ -22,6 +22,6 @@
  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
  
  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch mRemoteNG now</String>
  
 </WixLocalization>
--- a/InstallerProjects/Installer/Localizations/ja-JP.wxl
+++ b/InstallerProjects/Installer/Localizations/ja-JP.wxl
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="ja-JP" Language="1041" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-  
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-  
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-  
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
-  
-</WixLocalization>
--- a/InstallerProjects/Installer/Localizations/ru-RU.wxl
+++ b/InstallerProjects/Installer/Localizations/ru-RU.wxl
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="ru-RU" Language="1049" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-  
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-  
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-  
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
-  
-</WixLocalization>
--- a/InstallerProjects/Installer/Resources/AppIcon.ico
+++ b/InstallerProjects/Installer/Resources/AppIcon.ico
--- a/InstallerProjects/Installer/Resources/Installer_Header.png
+++ b/InstallerProjects/Installer/Resources/Installer_Header.png
--- a/InstallerProjects/Installer/Resources/Installer_Side.png
+++ b/InstallerProjects/Installer/Resources/Installer_Side.png
--- a/InstallerProjects/Installer/Resources/License.rtf
+++ b/InstallerProjects/Installer/Resources/License.rtf
@@ -0,0 +1,329 @@
+{\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}}
--- a/InstallerProjects/Installer/Resources/header.bmp
+++ b/InstallerProjects/Installer/Resources/header.bmp
--- a/InstallerProjects/Installer/Resources/mRemoteNG.ico
+++ b/InstallerProjects/Installer/Resources/mRemoteNG.ico
--- a/InstallerProjects/Installer/Resources/welcome.bmp
+++ b/InstallerProjects/Installer/Resources/welcome.bmp
--- a/InstallerProjects/Installer/mRemoteNGV1.wxs
+++ b/InstallerProjects/Installer/mRemoteNGV1.wxs
@@ -10,7 +10,8 @@
    <MajorUpgrade DowngradeErrorMessage="!(loc.Upgrade_NewerVersionInstalled)" Schedule="afterInstallExecute" />
    <MediaTemplate EmbedCab="yes" />
    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)InstallerProjects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
-    <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
+    <Property Id="MsiLogging" Value="v" />
+    <Property Id="ARPPRODUCTICON" Value="AppIcon.ico" />
    <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize" />
    <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
@@ -26,7 +27,7 @@
    <Property Id='LEGACYVERSIONINSTALLED' Value='0' />
    <PropertyRef Id="NETFRAMEWORK40FULL" />
    <PropertyRef Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
-    <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
+    <Icon Id="AppIcon.ico" SourceFile="Resources\AppIcon.ico" />
    <CustomActionRef Id='SaveCmdlineINSTALLDIR' />


@@ -95,10 +96,22 @@
      </Feature>
    </Feature>

+    <UI>
+      <UIRef Id="WixUI_FeatureTree"/>
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Publish Dialog="ExitDialog"
+        Control="Finish"
+        Event="DoAction"
+        Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+    </UI>
    
-    <UIRef Id="WixUI_FeatureTree"/>
    <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="Resources\welcome.bmp" />
-    <WixVariable Id="WixUIBannerBmp" Value="Resources\header.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\Installer_Side.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\Installer_Header.png" />
+    
+    <!-- Provide option to run app after install -->
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.FinishPage_LaunchMremoteNow)" />
+    <Property Id="WixShellExecTarget" Value="[#MainExeFile]" />
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
  </Product>
 </Wix>
--- a/68
+++ b/68
@@ -1,23 +1,63 @@
+#!groovy
 node('windows') {
 	def jobDir = pwd()
 	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
-	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
-	def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow"
+	def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
+	def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
+	def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
+	def reportGeneratorPath = "${jobDir}\\packages\\ReportGenerator.3.0.2\\tools\\ReportGenerator.exe"
+	def testResultFilePrefix = "TestResult"
+	def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml"
+	def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml"
+	def testResultFileAcceptance = "${testResultFilePrefix}_AcceptanceTests.xml"
+	def coverageReport = "code_coverage_report.xml"
+	def codeCoverageHtml = "CodeCoverageReport.html"
 	
-	stage 'Checkout Branch'
-	checkout scm
+	stage ('Checkout Branch') {
+		checkout scm
+		bat "del /Q \"${jobDir}\\${testResultFilePrefix}*.xml\""
+	}

-	stage 'Restore NuGet Packages'
-	def nugetPath = "C:\\nuget.exe"
-	bat "${nugetPath} restore ${solutionFilePath}"
+	stage ('Restore NuGet Packages') {
+		def nugetPath = "C:\\nuget.exe"
+		bat "${nugetPath} restore ${solutionFilePath}"
+	}

-	stage 'Build mRemoteNG (Normal)'
-	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+	stage ('Build mRemoteNG (Normal)') {
+		bat "\"${msBuild}\" /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+	}

-	stage 'Build mRemoteNG (Portable)'
-	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+	stage ('Build mRemoteNG (Portable)') {
+		bat "\"${msBuild}\" /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+	}

-	stage 'Run Unit Tests'
-	def nunitTestAdapterPath = "C:\\Users\\Administrator\\AppData\\Local\\Microsoft\\VisualStudio\\14.0\\Extensions"
-	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\""
+	stage ('Run Unit Tests (Normal, w/coverage)') {
+		try {
+			bat "\"${openCoverPath}\" -register:user -target:\"${nunitConsolePath}\" -targetargs:\"\"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86\" -output:\"${coverageReport}\""
+		}
+		catch (ex) {
+			nunit testResultsPattern: "${testResultFilePrefix}*.xml"
+			throw ex
+		}
+	}
+	
+	stage ('Run Unit Tests (Portable)') {
+		try {
+			bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\debug portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86"
+		}
+		catch (ex) {
+			nunit testResultsPattern: "${testResultFilePrefix}*.xml"
+			throw ex
+		}
+	}
+	
+	stage ('Run Acceptance Tests') {
+		try {
+			bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNG.Specs\\bin\\debug\\mRemoteNG.Specs.dll\" --result=${testResultFileAcceptance} --x86"
+		}
+		catch (ex) {
+			nunit testResultsPattern: "${testResultFilePrefix}*.xml"
+			throw ex
+		}
+	}
 }
--- a/Jenkinsfile_publish.groovy
+++ b/Jenkinsfile_publish.groovy
@@ -1,9 +1,13 @@
 node('windows') {
 	def jobDir = pwd()
 	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
-	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
-	def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow"
-	def nunitTestAdapterPath = "C:\\Users\\Administrator\\AppData\\Local\\Microsoft\\VisualStudio\\14.0\\Extensions"
+    def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
+    def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
+    def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
+    def testResultFilePrefix = "TestResult"
+    def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml"
+    def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml"
+    def coverageReport = "code_coverage_report.xml"

 	
 	stage ('Clean output dir') {
@@ -32,32 +36,36 @@ node('windows') {
    withCredentials([file(credentialsId: '9b674d57-6792-48e3-984a-4d1bab2abb64', variable: 'CODE_SIGNING_CERT')]) {
        withCredentials([usernamePassword(credentialsId: '05b7449b-05c0-490f-8661-236242526e62', passwordVariable: 'MRNG_CERT_PASSWORD', usernameVariable: 'NO_USERNAME')]) {
            stage ('Build mRemoteNG (Normal - MSI)') {
-                bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Release Installer\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
+                bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Installer\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
                archiveArtifacts artifacts: "Release\\*.msi", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
            }
        
            stage ('Build mRemoteNG (Portable)') {
-                bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Release Portable\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
+                bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Portable\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
                archiveArtifacts artifacts: "Release\\*.zip", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
            }
        }
    }
 	
-	stage ('Run Unit Tests (Normal - MSI)') {
-    	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /logger:trx /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\Release\\mRemoteNGTests.dll\""
-	}
+    stage ('Run Unit Tests (Normal - MSI)') {
+        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86"
+    }
+    
+    stage ('Run Unit Tests (Portable)') {
+        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86"
+    }

-	stage ('Run Unit Tests (Portable)') {
-    	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /logger:trx /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\Release Portable\\mRemoteNGTests.dll\""
-	}
+    stage ('Generate UpdateCheck Files') {
+        bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\create_upg_chk_files.ps1\" -TagName \"${env.TagName}\" -UpdateChannel \"${env.UpdateChannel}\""
+        archiveArtifacts artifacts: "Release\\*.txt", caseSensitive: false, onlyIfSuccessful: true
+    }
 	
    stage ('Publish to GitHub') {
        withCredentials([string(credentialsId: '5443a369-dbe8-42d3-b4e8-04d0b4e9039a', variable: 'GH_AUTH_TOKEN')]) {
-            def zipPath = "${jobDir}\\Release\\*.zip"
-            def msiPath = "${jobDir}\\Release\\*.msi"
+            def releaseFolder = "${jobDir}\\Release"
            // because batch files suck at handling newline characters, we have to convert to base64 in groovy and back to text in powershell
            def base64Description = env.ReleaseDescription.bytes.encodeBase64().toString()
-            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ZipFilePath \"${zipPath}\" -MsiFilePath \"${msiPath}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
+            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ReleaseFolderPath \"${releaseFolder}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
        }
    }
 }
--- a/README.MD
+++ b/README.MD
@@ -4,44 +4,56 @@
 [![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
 [![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer)

-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
+[![Github Releases](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/total.svg?style=flat-square)](https://github.com/mRemoteNG/mRemoteNG/releases/)

-[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)

 | Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/master)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/master/) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75Hotfix7/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Hotfix7) |
-| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75Hotfix7/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Hotfix7) |
-| Development | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/develop/) | - |
-
-
+| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
+| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |

 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.
+## Features

-Currently these protocols are supported:
+mRemoteNG is a fork of mRemote: an open source, tabbed, multi-protocol, remote connections manager. mRemoteNG adds bug fixes and new features to mRemote.

- * RDP (Remote Desktop)
- * VNC (Virtual Network Computing)
- * ICA (Independent Computing Architecture)
- * SSH (Secure Shell)
- * Telnet (Teletype Network)
- * HTTP/S (Hypertext Transfer Protocol Secure)
- * Rlogin (Remote Login)
- * RAW
+It allows you to view all of your remote connections in a simple yet powerful tabbed interface.

-mRemoteNG can be installed on Windows 7 or later.
+mRemoteNG supports the following protocols:

-Windows 7 systems require RDP version 8:   
-https://support.microsoft.com/en-us/kb/2592687   
-OR   
-https://support.microsoft.com/en-us/kb/2923545   
+* RDP (Remote Desktop/Terminal Server)
+* VNC (Virtual Network Computing)
+* ICA (Citrix Independent Computing Architecture)
+* SSH (Secure Shell)
+* Telnet (TELecommunication NETwork)
+* HTTP/HTTPS (Hypertext Transfer Protocol)
+* rlogin (Remote Login)
+* Raw Socket Connections

-Windows 8+ support RDP version 8+ out of the box.
+For a detailed feature list and general usage support, refer to the [User Manual](https://github.com/mRemoteNG/mRemoteNG/wiki/User-Manual).

-RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connect successfully to a Windows 2003 host (for example).
+## Installation

+Before installing make sure you have all the required [prerequisites](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites).

+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.
+
+### 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

 [![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)
--- a/Tools/7zip/7za.dll
+++ b/Tools/7zip/7za.dll
--- a/Tools/7zip/7za.exe
+++ b/Tools/7zip/7za.exe
--- a/Tools/7zip/7zxa.dll
+++ b/Tools/7zip/7zxa.dll
--- a/Tools/7zip/License.txt
+++ b/Tools/7zip/License.txt
@@ -3,7 +3,7 @@
      License for use and distribution
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-      Copyright (C) 1999-2016 Igor Pavlov.
+      Copyright (C) 1999-2018 Igor Pavlov.

      7-Zip Extra files are under the GNU LGPL license.

--- a/Tools/7zip/history.txt
+++ b/Tools/7zip/history.txt
@@ -1,6 +1,25 @@
 7-Zip Extra history
 -------------------

+This file contains only information about changes related to that package exclusively.
+The full history of changes is listed in history.txt in main 7-Zip program.
+
+
+18.05          2018-04-30
+-------------------------
+- The speed for LZMA/LZMA2 compressing was increased 
+    by 8% for fastest/fast compression levels and 
+    by 3% for normal/maximum compression levels.
+
+
+18.03 beta     2018-03-04
+-------------------------
+- The speed for single-thread LZMA/LZMA2 decoding
+  was increased  by 30% in x64 version and by 3% in x86 version.
+- 7-Zip now can use multi-threading for 7z/LZMA2 decoding,
+  if there are multiple independent data chunks in LZMA2 stream.
+
+
 9.35 beta           2014-12-07
 ------------------------------
  - SFX modules were moved to LZMA SDK package.
--- a/Tools/7zip/readme.txt
+++ b/Tools/7zip/readme.txt
@@ -1,9 +1,9 @@
-7-Zip Extra 16.02
+7-Zip Extra 18.05
 -----------------

 7-Zip Extra is package of extra modules of 7-Zip. 

-7-Zip Copyright (C) 1999-2016 Igor Pavlov.
+7-Zip Copyright (C) 1999-2018 Igor Pavlov.

 7-Zip is free software. Read License.txt for more information about license.

--- a/Tools/CreateBulkConnections_ConfCons2_6.ps1
+++ b/Tools/CreateBulkConnections_ConfCons2_6.ps1
@@ -0,0 +1,294 @@
+#####################################
+# Authors: David Sparer & Jack Denton
+# Summary:
+#   This is intended to be a template for creating connections in bulk. This uses the serializers directly from the mRemoteNG binaries.
+#   You will still need to create the connection info objects, but the library will handle serialization. It is expected that you
+#   are familiar with PowerShell. If this is not the case, reach out to the mRemoteNG community for help.
+# Usage:
+#   Replace or modify the examples that are shown toward the end of the script to create your own connection info objects.
+#####################################
+
+foreach ($Path in 'HKLM:\SOFTWARE\WOW6432Node\mRemoteNG', 'HKLM:\SOFTWARE\mRemoteNG') {
+    Try {
+        $mRNGPath = (Get-ItemProperty -Path $Path -Name InstallDir -ErrorAction Stop).InstallDir
+        break
+    }
+    Catch {
+        continue
+    }
+}
+if (!$mRNGPath) {
+    Add-Type -AssemblyName System.Windows.Forms
+    $FolderBrowser = [System.Windows.Forms.FolderBrowserDialog]@{
+        Description         = 'Please select the folder which contains mRemoteNG.exe'
+        ShowNewFolderButton = $false
+    }
+    
+    $Response = $FolderBrowser.ShowDialog()
+    
+    if ($Response.value__ -eq 1) {
+        $mRNGPath = $FolderBrowser.SelectedPath
+    }
+    elseif ($Response.value__ -eq 2) {
+        Write-Warning 'A folder containing mRemoteNG.exe has not been selected'
+        return
+    }
+}
+$null = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $mRNGPath -ChildPath "mRemoteNG.exe"))
+Add-Type -Path (Join-Path -Path $mRNGPath -ChildPath "BouncyCastle.Crypto.dll")
+
+
+
+function ConvertTo-mRNGSerializedXml {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory)]
+        [mRemoteNG.Connection.ConnectionInfo[]]
+        $Xml
+)
+
+    function Get-ChildNodes {
+        Param ($Xml)
+
+        $Xml
+
+        if ($Xml -is [mRemoteNG.Container.ContainerInfo] -and $Xml.HasChildren()) {
+            foreach ($Node in $Xml.Children) {
+                Get-ChildNodes -Xml $Node
+            }
+        }
+    }
+
+    $AllNodes = Get-ChildNodes -Xml $Xml
+    if (
+        $AllNodes.Password -or
+        $AllNodes.RDGatewayPassword -or
+        $AllNodes.VNCProxyPassword
+    ) {
+        $Password = Read-Host -Message 'If you have password protected your ConfCons.xml please enter the password here otherwise just press enter' -AsSecureString
+    }
+    else {
+        $Password = [securestring]::new()
+    }
+    $CryptoProvider = [mRemoteNG.Security.SymmetricEncryption.AeadCryptographyProvider]::new()
+    $SaveFilter = [mRemoteNG.Security.SaveFilter]::new()
+    $ConnectionNodeSerializer = [mRemoteNG.Config.Serializers.Xml.XmlConnectionNodeSerializer26]::new($CryptoProvider, $Password, $SaveFilter)
+    $XmlSerializer = [mRemoteNG.Config.Serializers.Xml.XmlConnectionsSerializer]::new($CryptoProvider, $ConnectionNodeSerializer)
+
+    $RootNode = [mRemoteNG.Tree.Root.RootNodeInfo]::new('Connection')
+    foreach ($Node in $Xml) {
+        $RootNode.AddChild($Node)
+    }
+    $XmlSerializer.Serialize($RootNode)
+}
+
+function New-mRNGConnection {
+    [CmdletBinding(DefaultParameterSetName = 'Credential')]
+    Param (
+        [Parameter(Mandatory)]
+        [string]
+        $Name,
+
+        [Parameter(Mandatory)]
+        [string]
+        $Hostname,
+
+        [Parameter(Mandatory)]
+        [mRemoteNG.Connection.Protocol.ProtocolType]
+        $Protocol,
+
+        [Parameter(ParameterSetName = 'Credential')]
+        [pscredential]
+        $Credential,
+
+        [Parameter(ParameterSetName = 'InheritCredential')]
+        [switch]
+        $InheritCredential,
+
+        [Parameter()]
+        [mRemoteNG.Container.ContainerInfo]
+        $ParentContainer,
+
+        [Parameter()]
+        [switch]
+        $PassThru
+    )
+
+    $Connection = [mRemoteNG.Connection.ConnectionInfo]@{
+        Name     = $Name
+        Hostname = $Hostname
+        Protocol = $Protocol
+    }
+
+    if ($Credential) {
+        $Connection.Username = $Credential.GetNetworkCredential().UserName
+        $Connection.Domain = $Credential.GetNetworkCredential().Domain
+        $Connection.Password = $Credential.GetNetworkCredential().Password
+    }
+
+    if ($InheritCredential) {
+        $Connection.Inheritance.Username = $true
+        $Connection.Inheritance.Domain = $true
+        $Connection.Inheritance.Password = $true
+    }
+
+    if ($ParentContainer) {
+        $ParentContainer.AddChild($Connection)
+
+        if ($PSBoundParameters.ContainsKey('PassThru')) {
+            $Connection
+        }
+    }
+    else {
+        $Connection
+    }
+}
+
+function New-mRNGContainer {
+    [CmdletBinding(DefaultParameterSetName = 'Credential')]
+    Param (
+        [Parameter(Mandatory)]
+        [string]
+        $Name,
+
+        [Parameter(ParameterSetName = 'Credential')]
+        [pscredential]
+        $Credential,
+
+        [Parameter(ParameterSetName = 'InheritCredential')]
+        [switch]
+        $InheritCredential,
+
+        [Parameter()]
+        [mRemoteNG.Container.ContainerInfo]
+        $ParentContainer
+    )
+
+    $Container = [mRemoteNG.Container.ContainerInfo]@{
+        Name = $Name
+    }
+
+    if ($Credential) {
+        $Container.Username = $Credential.GetNetworkCredential().UserName
+        $Container.Domain = $Credential.GetNetworkCredential().Domain
+        $Container.Password = $Credential.GetNetworkCredential().Password
+    }
+
+    if ($InheritCredential) {
+        $Container.Inheritance.Username = $true
+        $Container.Inheritance.Domain = $true
+        $Container.Inheritance.Password = $true
+    }
+
+    if ($ParentContainer) {
+        $ParentContainer.AddChild($Container)
+    }
+    
+    $Container
+}
+
+function Export-mRNGXml {
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [string]
+        $Path,
+
+        [Parameter()]
+        [string]
+        $SerializedXml
+    )
+
+    $FilePathProvider = [mRemoteNG.Config.DataProviders.FileDataProvider]::new($Path)
+    $filePathProvider.Save($SerializedXml)
+}
+
+
+
+
+#----------------------------------------------------------------
+# Example 1: serialize many connections, no containers
+# Here you can define the number of connection info objects to create
+# You can also provide a list of desired hostnames and iterate over those
+
+$Connections = foreach ($i in 1..5) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'Server-{0:D2}' -f $i
+        Hostname          = 'Server-{0:D2}' -f $i
+        Protocol          = 'RDP'
+        InheritCredential = $true
+    }
+    New-mRNGConnection @Splat
+}
+
+# Serialize the connections
+$SerializedXml = ConvertTo-mRNGSerializedXml -Xml $Connections
+
+# Write the XML to a file ready to import into mRemoteNG
+Export-mRNGXml -Path "$ENV:APPDATA\mRemoteNG\PowerShellGenerated.xml" -SerializedXml $SerializedXml
+
+# Now open up mRemoteNG and press Ctrl+O and open up the exported XML file
+
+
+
+
+#----------------------------------------------------------------
+# Example 2: serialize a container which has connections
+# You can also create containers and add connections and containers to them, which will be nested correctly when serialized
+# If you specify the ParentContainer parameter for new connections then there will be no output unless the PassThru parameter is also used
+
+$ProdServerCreds = Get-Credential
+$ProdServers = New-mRNGContainer -Name 'ProdServers' -Credential $ProdServerCreds
+
+foreach ($i in 1..3) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'Server-{0:D2}' -f $i
+        Hostname          = 'Server-{0:D2}' -f $i
+        Protocol          = 'RDP'
+        InheritCredential = $true
+        ParentContainer   = $ProdServers
+    }
+    New-mRNGConnection @Splat
+}
+
+$ProdWebServers = New-mRNGContainer -Name 'WebServers' -ParentContainer $ProdServers -InheritCredential
+
+foreach ($i in 1..3) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'WebServer-{0:D2}' -f $i
+        Hostname          = 'WebServer-{0:D2}' -f $i
+        Protocol          = 'SSH1'
+        InheritCredential = $true
+        ParentContainer   = $ProdWebServers
+    }
+    New-mRNGConnection @Splat
+}
+
+$DevServers = New-mRNGContainer -Name 'DevServers'
+
+foreach ($i in 1..3) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'DevServer-{0:D2}' -f $i
+        Hostname          = 'DevServer-{0:D2}' -f $i
+        Protocol          = 'RDP'
+        InheritCredential = $true
+        ParentContainer   = $DevServers
+        PassThru          = $true
+    }
+
+    # Specified the PassThru parameter in order to catch the connection and change a property
+    $Connection = New-mRNGConnection @Splat
+    $Connection.Resolution = 'FullScreen'
+}
+
+# Serialize the container
+$SerializedXml = ConvertTo-mRNGSerializedXml -Xml $ProdServers, $DevServers
+
+# Write the XML to a file ready to import into mRemoteNG
+Export-mRNGXml -Path "$ENV:APPDATA\mRemoteNG\PowerShellGenerated.xml" -SerializedXml $SerializedXml
+
+# Now open up mRemoteNG and press Ctrl+O and open up the exported XML file
--- a/Tools/appveyor_after_build.ps1
+++ b/Tools/appveyor_after_build.ps1
@@ -0,0 +1,73 @@
+if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
+    Write-Output "NOT running via Appveyor - Exiting"
+    Exit
+}
+
+$appvDir = $Env:APPVEYOR_BUILD_FOLDER
+
+Write-Output "Appveyor Build Dir: '$($appvDir)'"
+$ConfigurationName = $Env:CONFIGURATION.Trim()
+Write-Output "Config Name (tirmmed): '$($ConfigurationName)'"
+
+
+$SIGCHECK="Tools\exes\sigcheck.exe"
+$SEVENZIP="Tools\7zip\7za.exe"
+
+if ($ConfigurationName -eq "Release Portable") {
+    Write-Output "Packaging Release Portable ZIP"
+   
+    $version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
+
+    Write-Output "Version is $($version)"
+
+    $PortableZip="Release\mRemoteNG-Portable-$($version).zip"
+
+    Remove-Item -Recurse "mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
+    New-Item "mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
+    
+    Copy-Item "mRemoteV1\Resources\PuTTYNG.exe" -Destination "mRemoteV1\bin\package"
+
+    Copy-Item "mRemoteV1\bin\$ConfigurationName\*" -Destination "mRemoteV1\bin\package" -Recurse -Force -Exclude *.pdb
+    Copy-Item "*.txt" -Destination "mRemoteV1\bin\package"
+
+    Write-Output "Creating portable ZIP file $($PortableZip)"
+    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
+    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip ".\mRemoteV1\bin\package\*.*"
+}
+else {
+    Write-Output "We will not zip anything - this isnt a portable release build."
+}
+
+Write-Output ""
+Write-Output ""
+
+if ($ConfigurationName -match "Release" -And $ConfigurationName -ne "Release Installer") {
+    Write-Output "Packaging debug symbols"
+   
+    $version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
+
+    Write-Output "Version is $($version)"
+
+    if ($ConfigurationName -match "Portable") {
+        $zipFilePrefix = "mRemoteNG-Portable-symbols"
+    } else {
+        $zipFilePrefix = "mRemoteNG-symbols"
+    }
+
+    $outputZipPath="Release\$zipFilePrefix-$($version).zip"
+
+    Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
+    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
+    $SymPath = (Join-Path -Path mRemoteV1\bin\$($ConfigurationName) -ChildPath "*.pdb")
+    if(Test-Path "$SymPath") {
+    	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
+    } else {
+    	Write-Output "No Debugging Symbols Found..."
+    }
+    	
+}
+else {
+    Write-Output "We will not package debug symbols for this configuration $($ConfigurationName)"
+}
+
+Write-Output ""
--- a/Tools/appveyor_publish_build.ps1
+++ b/Tools/appveyor_publish_build.ps1
@@ -0,0 +1,83 @@
+if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
+    Write-Output "NOT running via Appveyor - Exiting"
+    Throw "NOT running via Appveyor - Exiting"
+}
+
+$appvDir = $Env:APPVEYOR_BUILD_FOLDER
+	
+$SIGCHECK="Tools\exes\sigcheck.exe"
+$SEVENZIP="Tools\7zip\7za.exe"
+
+Write-Output "Appveyor Build Dir: '$($appvDir)'"
+
+Write-Output "Decrypt Cert"
+& appveyor-tools\secure-file -decrypt "$($Env:cert_path).enc" -secret "$Env:cert_decrypt_pwd"
+
+if(-Not (Test-Path $Env:cert_path)) {
+		Write-Output "decrypt cert does not exist..."
+		Throw "Could not decrypt cert"
+}
+
+Write-Output "Restoring NuGets"
+& nuget restore
+
+
+Write-Output "Build Release Installer"
+& msbuild "$($appvDir)\mRemoteV1.sln" /nologo /t:Clean,Build /p:Configuration="Release Installer" /p:Platform=x86 /p:CertPath="$($Env:cert_path)" /p:CertPassword="$Env:cert_pwd" /m /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+Write-Output "Packaging debug symbols"
+   
+$version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\Release\mRemoteNG.exe"
+
+Write-Output "Version is $($version)"
+
+$zipFilePrefix = "mRemoteNG-symbols"
+
+
+$outputZipPath="Release\$zipFilePrefix-$($version).zip"
+
+Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
+Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
+$SymPath = (Join-Path -Path "mRemoteV1\bin\Release" -ChildPath "*.pdb")
+if(Test-Path "$SymPath") {
+	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
+} else {
+	Write-Output "No Debugging Symbols Found..."
+}
+    
+
+Write-Output "Build Release Portable"
+& msbuild "$($appvDir)\mRemoteV1.sln" /nologo /t:Clean,Build /p:Configuration="Release Portable" /p:Platform=x86 /p:CertPath="$($Env:cert_path)" /p:CertPassword="$Env:cert_pwd" /m /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+
+Write-Output "Packaging Release Portable ZIP"
+
+$version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\Release Portable\mRemoteNG.exe"
+
+Write-Output "Version is $($version)"
+
+$zipFilePrefix = "mRemoteNG-Portable-symbols"
+$outputZipPath="Release\$zipFilePrefix-$($version).zip"
+
+Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
+Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
+$SymPath = (Join-Path -Path "mRemoteV1\bin\Release Portable" -ChildPath "*.pdb")
+if(Test-Path "$SymPath") {
+	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
+} else {
+	Write-Output "No Debugging Symbols Found..."
+}
+
+$PortableZip="Release\mRemoteNG-Portable-$($version).zip"
+
+Remove-Item -Recurse "mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
+New-Item "mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
+
+Copy-Item "mRemoteV1\Resources\PuTTYNG.exe" -Destination "mRemoteV1\bin\package"
+
+Copy-Item "mRemoteV1\bin\Release Portable\*" -Destination "mRemoteV1\bin\package" -Recurse  -Force 
+Copy-Item "*.txt" -Destination "mRemoteV1\bin\package"
+
+Write-Output "Creating portable ZIP file $($PortableZip)"
+Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
+& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip ".\mRemoteV1\bin\package\*.*"
--- a/Tools/build-relport.cmd
+++ b/Tools/build-relport.cmd
@@ -5,7 +5,7 @@ setlocal enabledelayedexpansion
 set SOLUTIONDIR=%~dp0..

 rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
-set SIGCHECK="%SOLUTIONDIR%\Tools\sigcheck.exe"
+set SIGCHECK="%SOLUTIONDIR%\Tools\exes\sigcheck.exe"
 set SEVENZIP="%SOLUTIONDIR%\Tools\7zip\7za.exe"

 set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
--- a/Tools/cert/CodeSigning_Cert_mRemoteNG_DigiCert.p12.enc
+++ b/Tools/cert/CodeSigning_Cert_mRemoteNG_DigiCert.p12.enc
--- a/Tools/copy_themes.ps1
+++ b/Tools/copy_themes.ps1
@@ -0,0 +1,19 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+Write-Output "Copying THEMES folder to output"
+
+$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteV1\Resources\Themes' ) 
+$DestinationDir = [io.path]::combine($TargetDir , 'Themes') 
+
+robocopy $sourceFiles $DestinationDir *.vstheme /s
+
+Write-Output ""
--- a/Tools/copy_tiles.ps1
+++ b/Tools/copy_tiles.ps1
@@ -0,0 +1,19 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+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 *.*
+
+Write-Output ""
--- a/Tools/create_upg_chk_files.ps1
+++ b/Tools/create_upg_chk_files.ps1
@@ -1,42 +1,109 @@
 #Requires -Version 4.0
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TagName,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    [ValidateSet("Stable","Beta","Development")]
+    $UpdateChannel
+)
+
+
+
+function New-MsiUpdateFileContent {
+    param (
+        [System.IO.FileInfo]
+        [Parameter(Mandatory=$true)]
+        $MsiFile,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        $TagName
+    )
+    
+    $version = $MsiFile.BaseName -replace "[a-zA-Z-]*"
+    $certThumbprint = (Get-AuthenticodeSignature -FilePath $MsiFile).SignerCertificate.Thumbprint
+    $hash = Get-FileHash -Algorithm SHA512 $MsiFile | % { $_.Hash }
+
+    $fileContents = `
+"Version: $version
+dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($MsiFile.Name)
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
+CertificateThumbprint: $certThumbprint
+Checksum: $hash"
+    Write-Output $fileContents
+}
+
+
+function New-ZipUpdateFileContent {
+    param (
+        [System.IO.FileInfo]
+        [Parameter(Mandatory=$true)]
+        $ZipFile,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        $TagName
+    )
+    
+    $version = $ZipFile.BaseName -replace "[a-zA-Z-]*"
+    $hash = Get-FileHash -Algorithm SHA512 $ZipFile | % { $_.Hash }
+
+    $fileContents = `
+"Version: $version
+dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($ZipFile.Name)
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
+Checksum: $hash"
+    Write-Output $fileContents
+}
+
+
+function Resolve-UpdateCheckFileName {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("Stable","Beta","Development")]
+        $UpdateChannel,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("Normal","Portable")]
+        $Type
+    )
+
+    $fileName = ""
+
+    if ($UpdateChannel -eq "Beta") { $fileName += "beta-" }
+    elseif ($UpdateChannel -eq "Development") { $fileName += "dev-" }
+
+    $fileName += "update"
+
+    if ($Type -eq "Portable") { $fileName += "-portable" }
+
+    $fileName += ".txt"
+
+    Write-Output $fileName
+}
+
+
+
+

 $releaseFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\Release" -Resolve
-$tag = Read-Host -Prompt 'Tag name'

-Write-Host
-Write-Host
-Write-Host
+# build msi update file
+$msiFile = Get-ChildItem -Path "$releaseFolder\*.msi" | sort LastWriteTime | select -last 1
+$msiUpdateContents = New-MsiUpdateFileContent -MsiFile $msiFile -TagName $TagName
+$msiUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Normal
+Write-Output "`n`nMSI Update Check File Contents ($msiUpdateFileName)`n------------------------------"
+Tee-Object -InputObject $msiUpdateContents -FilePath "$releaseFolder\$msiUpdateFileName"

-Write-Host PORTABLE
-Write-Host --------
-$file = Get-ChildItem -Path "$releaseFolder\*.zip" | sort LastWriteTime | select -last 1 | % { $_.FullName }
-$filename = $file.Split("\") | select -last 1

-$version = $file.tostring().Split("-")[2].trim(".zip")
-Write-Host Version: $version
-
-Write-Host dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$tag/$filename
-Write-Host clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$tag/CHANGELOG.TXT
-
-$hash = Get-FileHash -Algorithm SHA512 $file | % { $_.Hash }
-Write-Host Checksum: $hash
-	
-
-Write-Host
-Write-Host
-Write-Host
-
-Write-Host MSI
-Write-Host ---
-$file = Get-ChildItem -Path "$releaseFolder\*.msi" | sort LastWriteTime | select -last 1 | % { $_.FullName }
-$filename = $file.Split("\") | select -last 1
-
-$version = $file.tostring().Split("-")[2].trim(".msi")
-Write-Host Version: $version
-
-Write-Host dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$tag/$filename
-Write-Host clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$tag/CHANGELOG.TXT
-
-Write-Host CertificateThumbprint: 0CEA828E5C787EA8AA89268D83816C1EA03375BA
-$hash = Get-FileHash -Algorithm SHA512 $file | % { $_.Hash }
-Write-Host Checksum: $hash
+# build zip update file
+$zipFile = Get-ChildItem -Path "$releaseFolder\*.zip" | sort LastWriteTime | select -last 1
+$zipUpdateContents = New-ZipUpdateFileContent -ZipFile $zipFile -TagName $TagName
+$zipUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Portable
+Write-Output "`n`nZip Update Check File Contents ($zipUpdateFileName)`n------------------------------"
+Tee-Object -InputObject $zipUpdateContents -FilePath "$releaseFolder\$zipUpdateFileName"
--- a/Tools/exes/dumpbin.exe
+++ b/Tools/exes/dumpbin.exe
--- a/Tools/exes/editbin.exe
+++ b/Tools/exes/editbin.exe
--- a/Tools/exes/link.exe
+++ b/Tools/exes/link.exe
--- a/Tools/exes/mspdbcore.dll
+++ b/Tools/exes/mspdbcore.dll
--- a/Tools/exes/sigcheck.exe
+++ b/Tools/exes/sigcheck.exe
--- a/Tools/find_vstool.ps1
+++ b/Tools/find_vstool.ps1
@@ -0,0 +1,61 @@
+[CmdletBinding()]
+
+param (
+    [string]
+    # Name of the file to find
+    $FileName
+)
+
+
+
+function EditBinCertificateIsValid() {
+    param (
+        [string]
+        $Path
+    )
+
+    # Verify file certificate
+    $valid_microsoft_cert_thumbprints = @(
+        "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC",
+        "98ED99A67886D020C564923B7DF25E9AC019DF26",
+        "108E2BA23632620C427C570B6D9DB51AC31387FE",
+        "5EAD300DC7E4D637948ECB0ED829A072BD152E17"
+    )
+    $file_signature = Get-AuthenticodeSignature -FilePath $Path
+    if (($file_signature.Status -ne "Valid") -or ($valid_microsoft_cert_thumbprints -notcontains $file_signature.SignerCertificate.Thumbprint)) {
+        Write-Warning "Could not validate the signature of $Path"
+        return $false
+    } else {
+        return $true
+    }
+}
+
+
+function ToolCanBeExecuted {
+    param (
+        [string]
+        $Path
+    )
+    $null = & $Path
+    Write-Output ($LASTEXITCODE -gt 0)
+}
+
+$rootSearchPaths = @(
+    [System.IO.Directory]::EnumerateFileSystemEntries("C:\Program Files", "*Visual Studio*", [System.IO.SearchOption]::TopDirectoryOnly),
+    [System.IO.Directory]::EnumerateFileSystemEntries("C:\Program Files (x86)", "*Visual Studio*", [System.IO.SearchOption]::TopDirectoryOnly)
+)
+
+# Returns the first full path to the $FileName that our search can find
+foreach ($searchPath in $rootSearchPaths) {
+    foreach ($visualStudioFolder in $searchPath) {
+        Write-Verbose "Searching in folder '$visualStudioFolder'"
+        $matchingExes = [System.IO.Directory]::EnumerateFileSystemEntries($visualStudioFolder, $FileName, [System.IO.SearchOption]::AllDirectories)
+        foreach ($matchingExe in $matchingExes) {
+            if ((EditBinCertificateIsValid -Path $matchingExe) -and (ToolCanBeExecuted -Path $matchingExe)) {
+                return $matchingExe
+            }
+        }
+    }
+}
+
+Write-Error "Could not find any valid file by the name $FileName." -ErrorAction Stop
--- a/Tools/github_functions.ps1
+++ b/Tools/github_functions.ps1
@@ -0,0 +1,235 @@
+$githubUrl = 'https://api.github.com'
+# GitHub doesn't support the default powershell protocol (TLS 1.0)
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function Publish-GitHubRelease {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Owner,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Repository,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $ReleaseTitle,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $TagName,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # Either the SHA of the commit to target or the branch name.
+        $TargetCommitish,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Description,
+
+        [bool]
+        [Parameter(Mandatory=$true)]
+        #
+        $IsDraft,
+
+        [bool]
+        [Parameter(Mandatory=$true)]
+        #
+        $IsPrerelease,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $body = New-GitHubReleaseRequestBody -TagName $TagName -TargetCommitish $TargetCommitish -ReleaseTitle $ReleaseTitle -Description $Description -IsDraft $IsDraft -IsPrerelease $IsPrerelease
+    $req_publishRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases" -Method Post -Headers @{"Authorization"="token $AuthToken"} -Body $body -ErrorAction Stop
+    $response_publishRelease = ConvertFrom-Json -InputObject $req_publishRelease.Content
+
+    Write-Output $response_publishRelease
+}
+
+
+function Edit-GitHubRelease {
+    param (
+        [string]
+        #[Parameter(Mandatory=$true)]
+        #
+        $Owner,
+
+        [string]
+        #[Parameter(Mandatory=$true)]
+        #
+        $Repository,
+
+        [string]
+        #[Parameter(Mandatory=$true)]
+        #
+        $ReleaseId,
+
+        [string]
+        #
+        $ReleaseTitle,
+
+        [string]
+        #
+        $TagName,
+
+        [string]
+        # Either the SHA of the commit to target or the branch name.
+        $TargetCommitish,
+
+        [string]
+        #
+        $Description,
+
+        [bool]
+        #
+        $IsDraft,
+
+        [bool]
+        #
+        $IsPrerelease,
+
+        [string]
+        #[Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $body_params = @{
+        "TagName" = $TagName
+        "TargetCommitish" = $TargetCommitish
+        "ReleaseTitle" = $ReleaseTitle
+        "Description" = $Description
+    }
+    if ($PSBoundParameters.ContainsKey("IsDraft")) { $body_params.Add("IsDraft", $IsDraft) }
+    if ($PSBoundParameters.ContainsKey("IsPrerelease")) { $body_params.Add("IsPrerelease", $IsPrerelease) }
+
+    $body = New-GitHubReleaseRequestBody @body_params
+    $req_editRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases/$ReleaseId" -Method Post -Headers @{"Authorization"="token $AuthToken"} -Body $body -ErrorAction Stop
+    $response_editRelease = ConvertFrom-Json -InputObject $req_editRelease.Content
+
+    Write-Output $response_editRelease
+}
+
+
+function Get-GitHubRelease {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Owner,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Repository,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $ReleaseId,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $req_getRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases/$ReleaseId" -Method Get -Headers @{"Authorization"="token $AuthToken"} -ErrorAction Stop
+    $response_getRelease = ConvertFrom-Json -InputObject $req_getRelease.Content
+
+    Write-Output $response_getRelease
+}
+
+
+function Upload-GitHubReleaseAsset {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        $UploadUri,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # Path to the file to upload with the release
+        $FilePath,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # Content type of the file
+        $ContentType,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken,
+
+        [string]
+        # A short description label for the asset
+        $Label = ""
+    )
+
+    $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
+    $files = Get-Item -Path $FilePath
+
+    $labelParam = ""
+    if ($Label -ne "") {
+        $labelParam = "&label=$Label"
+    }
+
+    # Get-Item could produce an array of files if a wildcard is provided. (C:\*.txt)
+    # Upload each matching item individually
+    foreach ($file in $files) {
+        Write-Output "Uploading asset to GitHub release: '$($file.FullName)'"
+        $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)$labelParam" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
+    }
+}
+
+
+function New-GitHubReleaseRequestBody {
+    param (
+        [string]
+        # 
+        $TagName,
+
+        [string]
+        # Either the SHA of the commit to target or the branch name.
+        $TargetCommitish,
+
+        [string]
+        # Title of the release
+        $ReleaseTitle,
+
+        [string]
+        # Description of the release
+        $Description,
+
+        [bool]
+        # Is this a draft?
+        $IsDraft,
+
+        [bool]
+        # Is this a pre-release?
+        $IsPrerelease
+    )
+
+    $body_params = [ordered]@{}
+    if ($TagName -ne "")         { $body_params.Add("tag_name", $TagName) }
+    if ($TargetCommitish -ne "") { $body_params.Add("target_commitish", $TargetCommitish) }
+    if ($ReleaseTitle -ne "")    { $body_params.Add("name", $ReleaseTitle) }
+    if ($Description -ne "")     { $body_params.Add("body", $Description) }
+    if ($PSBoundParameters.ContainsKey("IsDraft"))         { $body_params.Add("draft", $IsDraft) }
+    if ($PSBoundParameters.ContainsKey("IsPrerelease"))    { $body_params.Add("prerelease", $IsPrerelease) }
+
+    $json_body = ConvertTo-Json -InputObject $body_params -Compress
+    Write-Output $json_body
+}
--- a/Tools/postbuild_installer.ps1
+++ b/Tools/postbuild_installer.ps1
@@ -33,11 +33,12 @@ Format-Table -AutoSize -Wrap -InputObject @{
    "TargetDir" = $TargetDir
    "TargetFileName" = $TargetFileName
    "ConfigurationName" = $ConfigurationName
+    "CertificatePath" = $CertificatePath
    "ExcludeFromSigning" = $ExcludeFromSigning
 }


-& "$PSScriptRoot\sign_binaries.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
-& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
 & "$PSScriptRoot\rename_installer_with_version.ps1" -SolutionDir $SolutionDir
 & "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")
--- a/Tools/postbuild_mremotev1.ps1
+++ b/Tools/postbuild_mremotev1.ps1
@@ -33,15 +33,20 @@ Format-Table -AutoSize -Wrap -InputObject @{
    "TargetDir" = $TargetDir
    "TargetFileName" = $TargetFileName
    "ConfigurationName" = $ConfigurationName
+    "CertificatePath" = $CertificatePath
    "ExcludeFromSigning" = $ExcludeFromSigning
 }



 & "$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\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
+& "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
-& "$PSScriptRoot\sign_binaries.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
-& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
+& "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
--- a/Tools/publish_draft_github_release.ps1
+++ b/Tools/publish_draft_github_release.ps1
@@ -0,0 +1,25 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Owner,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Repository,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $ReleaseId,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    # The OAuth2 token to use for authentication.
+    $AuthToken
+)
+
+. "$PSScriptRoot\github_functions.ps1"
+
+Edit-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $ReleaseId -AuthToken $AuthToken -IsDraft $false
--- a/Tools/publish_to_github.ps1
+++ b/Tools/publish_to_github.ps1
@@ -43,13 +43,8 @@ param (

    [string]
    [Parameter(Mandatory=$true)]
-    # Path to the zip file to upload with the release
-    $ZipFilePath,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    #Path to the msi file to upload with the release
-    $MsiFilePath,
+    # Path to the folder which contains release assets to upload
+    $ReleaseFolderPath,

    [string]
    [Parameter(Mandatory=$true)]
@@ -62,137 +57,25 @@ param (
 )


-$githubUrl = 'https://api.github.com'
 if ($DescriptionIsBase64Encoded) {
    $Description = ([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($Description)))
 }


-function Publish-Release {
-    param (
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $Owner,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $Repository,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $ReleaseTitle,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $TagName,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        # Either the SHA of the commit to target or the branch name.
-        $TargetCommitish,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $Description,
-
-        [bool]
-        [Parameter(Mandatory=$true)]
-        #
-        $IsDraft,
-
-        [bool]
-        [Parameter(Mandatory=$true)]
-        #
-        $IsPrerelease,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        # The OAuth2 token to use for authentication.
-        $AuthToken
-    )
-
-    $body_publishRelease = @{
-      "tag_name" = $TagName
-      "target_commitish" = $TargetCommitish
-      "name" = $ReleaseTitle
-      "body" = $Description
-      "draft" = $IsDraft
-      "prerelease" = $IsPrerelease
-    }
-
-    $req_publishRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases" -Method Post -Headers @{"Authorization"="token $AuthToken"} -Body (ConvertTo-Json -InputObject $body_publishRelease -Compress) -ErrorAction Stop
-    $response_publishRelease = ConvertFrom-Json -InputObject $req_publishRelease.Content
-
-    Write-Output $response_publishRelease
-}
+. "$PSScriptRoot\github_functions.ps1"


-function Get-GitHubRelease {
-    param (
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $Owner,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $Repository,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        #
-        $ReleaseId,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        # The OAuth2 token to use for authentication.
-        $AuthToken
-    )
-
-    $req_getRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases/$ReleaseId" -Method Get -Headers @{"Authorization"="token $AuthToken"} -ErrorAction Stop
-    $response_getRelease = ConvertFrom-Json -InputObject $req_getRelease.Content
-
-    Write-Output $response_getRelease
-}
+$releaseFolderItems = Get-ChildItem -Path $ReleaseFolderPath
+$mrngPortablePath = ($releaseFolderItems | ?{$_.Name -match "portable-[\d\.]+\.zip"}).FullName
+$mrngNormalPath = ($releaseFolderItems | ?{$_.Name -match "installer-[\d\.]+\.msi"}).FullName
+$mrngPortableSymbolsPath = ($releaseFolderItems | ?{$_.Name -match "mremoteng-portable-symbols-[\d\.]+\.zip"}).FullName
+$mrngNormalSymbolsPath = ($releaseFolderItems | ?{$_.Name -match "mremoteng-symbols-[\d\.]+\.zip"}).FullName


-function Upload-ReleaseAsset {
-    param (
-        [string]
-        [Parameter(Mandatory=$true)]
-        $UploadUri,
+$release = Publish-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseTitle $ReleaseTitle -TagName $TagName -TargetCommitish $TargetCommitish -Description $Description -IsDraft ([bool]::Parse($IsDraft)) -IsPrerelease ([bool]::Parse($IsPrerelease)) -AuthToken $AuthToken
+$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngPortablePath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition (zip)"
+$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngNormalPath -ContentType "application/octet-stream" -AuthToken $AuthToken -Label "Normal Edition (msi)"

-        [string]
-        [Parameter(Mandatory=$true)]
-        # Path to the file to upload with the release
-        $FilePath,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        # Content type of the file
-        $ContentType,
-
-        [string]
-        [Parameter(Mandatory=$true)]
-        # The OAuth2 token to use for authentication.
-        $AuthToken
-    )
-
-    $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
-    $file = Get-Item -Path $FilePath
-
-    $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
-}
-
-
-
-$release = Publish-Release -Owner $Owner -Repository $Repository -ReleaseTitle $ReleaseTitle -TagName $TagName -TargetCommitish $TargetCommitish -Description $Description -IsDraft ([bool]::Parse($IsDraft)) -IsPrerelease ([bool]::Parse($IsPrerelease)) -AuthToken $AuthToken
-$zipUpload = Upload-ReleaseAsset -UploadUri $release.upload_url -FilePath $ZipFilePath -ContentType "application/zip" -AuthToken $AuthToken
-$msiUpload = Upload-ReleaseAsset -UploadUri $release.upload_url -FilePath $MsiFilePath -ContentType "application/octet-stream" -AuthToken $AuthToken
+$portableEditionSymbols = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngPortableSymbolsPath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition Debug Symbols"
+$normalEditionSymbols = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngNormalSymbolsPath -ContentType "application/zip" -AuthToken $AuthToken -Label "Normal Edition Debug Symbols"
 Write-Output (Get-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $release.id -AuthToken $AuthToken)
--- a/Tools/rename_installer_with_version.ps1
+++ b/Tools/rename_installer_with_version.ps1
@@ -9,7 +9,7 @@ Write-Host $SolutionDir
 Write-Host $renameTarget

 $targetVersionedFile = "$SolutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
-$version = &"$SolutionDir\Tools\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile


 $renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue
--- a/Tools/set_LargeAddressAware.ps1
+++ b/Tools/set_LargeAddressAware.ps1
@@ -1,3 +1,5 @@
+[CmdletBinding()]
+
 param (
    [string]
    [Parameter(Mandatory=$true)]
@@ -10,21 +12,11 @@ param (

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

-# Find editbin.exe
-$path_editBin = @((Resolve-Path -Path "C:\Program Files*\Microsoft Visual Studio*\VC\bin\editbin.exe").Path)[0]
-
-# Verify editbin certificate
-$microsoft_cert_thumbprint = "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
-$editbin_signature = Get-AuthenticodeSignature -FilePath $path_editBin
-if (($editbin_signature.Status -ne "Valid") -or ($editbin_signature.SignerCertificate.Thumbprint -ne $microsoft_cert_thumbprint)) {
-    Write-Error "Could not validate the signature of editbin.exe - we can not set LargeAddressAware" -ErrorAction Stop
-}
-
-
+$path_editBin = Join-Path -Path $PSScriptRoot -ChildPath "exes\editbin.exe"
 $path_outputExe = Join-Path -Path $TargetDir -ChildPath $TargetFileName

 # Set LargeAddressAware
-Write-Output "Setting LargeAddressAware on binary file `"$path_outputExe`""
-& $path_editBin "/largeaddressaware" "$path_outputExe"
+Write-Output "Setting LargeAddressAware on binary file:`n`"$path_outputExe`" `nwith:`n`"$path_editBin`""
+& "$path_editBin" /largeaddressaware "$path_outputExe"

 Write-Output ""
--- a/Tools/sign_binaries.ps1
+++ b/Tools/sign_binaries.ps1
@@ -1,8 +1,4 @@
 param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $SolutionDir,
-
    [string]
    [Parameter(Mandatory=$true)]
    $TargetDir,
@@ -16,12 +12,16 @@ param (
    $Exclude,

    [string]
+    [AllowEmptyString()]
    # The code signing certificate to use when signing the files.
    $CertificatePath,

    [string]
    # Password to unlock the code signing certificate.
-    $CertificatePassword
+    $CertificatePassword,
+    
+    [string]
+    $SolutionDir
 )

 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
@@ -30,51 +30,59 @@ Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 $timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"


-if ($ConfigurationName -notmatch "Release") {
-    Write-Output "This is not a release build - we won't sign files."
-    return
-}
+#  validate release versions and if the certificate value was passed
+if ($ConfigurationName -match "Release" -And ($CertificatePath)) {

-if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf)) {
-    Write-Output "Certificate is not present - we won't sign files."
-    return
-}
+	if(-Not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) {
+		$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
+	}

-if ($CertificatePassword -eq "") {
-    Write-Output "No certificate password was provided - we won't sign files."
-    return
-}
+	# make sure the cert is actually available
+	if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
+	{
+	    Write-Output "Certificate is not present - we won't sign files."
+	    return
+	}

-try {
-    $certKeyStore = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeySet
-    $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword, $certKeyStore) -ErrorAction Stop
-} catch {
-    Write-Output "Error loading certificate file - we won't sign files."
-    Write-Output $Error[0]
-    return
-}
+	if ($CertificatePassword -eq "") {
+	    Write-Output "No certificate password was provided - we won't sign files."
+	    return
+	}

-# Sign MSI if we are building a release version and the certificate is available
-Write-Output "Signing Binaries"
-Write-Output "Getting files from path: $TargetDir"
-$signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}
+	try {
+	    $certKeyStore = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeySet
+	    $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword, $certKeyStore) -ErrorAction Stop
+	} catch {
+	    Write-Output "Error loading certificate file - we won't sign files."
+	    Write-Output $Error[0]
+	    return
+	}

-$excluded_files = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -contains $_.Name}
-$excluded_files | ForEach-Object `
-    -Begin { Write-Output "The following files were excluded from signing due to being on the exclusion list:" } `
-    -Process { Write-Output "-- $($_.FullName)" }
+	# Sign MSI if we are building a release version and the certificate is available
+	Write-Output "Signing Binaries"
+	Write-Output "Getting files from path: $TargetDir"
+	$signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}

-Write-Output "Signable files count: $($signableFiles.Count)"
+	$excluded_files = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -contains $_.Name}
+	$excluded_files | ForEach-Object `
+	    -Begin { Write-Output "The following files were excluded from signing due to being on the exclusion list:" } `
+	    -Process { Write-Output "-- $($_.FullName)" }
+
+	Write-Output "Signable files count: $($signableFiles.Count)"


-foreach ($file in $signableFiles) {
-    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
-}
+	foreach ($file in $signableFiles) {
+	    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
+	}


-# Release certificate
-if ($cert -ne $null) {
-    $cert.Dispose()
+	# Release certificate
+	if ($cert -ne $null) {
+	    $cert.Dispose()
+	}
+} else {
+    Write-Output "This is not a release build or CertificatePath wasn't provided - we won't sign files."
+    Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
 }

 Write-Output ""
--- a/Tools/signfiles.ps1
+++ b/Tools/signfiles.ps1
@@ -0,0 +1,31 @@
+param(
+    [string]
+    [Parameter(Mandatory=$true)]
+    # Folder path that contains the files you would like to sign. Recursive.
+    $PathToSignableFiles,
+
+    [string]
+    # The code signing certificate to use when signing the files.
+    $CertificatePath = "C:\mRemoteNG_code_signing_cert.pfx",
+
+    [SecureString]
+    # Password to unlock the code signing certificate.
+    $CertificatePassword = (Get-Credential -Message "Enter password for the mRemoteNG code signing certificate" -UserName "USERNAME NOT NEEDED").Password,
+
+    [string[]]
+    # File names to exclude from signing
+    $Exclude
+)
+
+
+$timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"
+$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword)
+
+
+Write-Output "Getting files from path: $PathToSignableFiles"
+$signableFiles = Get-ChildItem -Path $PathToSignableFiles -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}
+Write-Output "Signable files count: $($signableFiles.Count)"
+
+foreach ($file in $signableFiles) {
+    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
+}
--- a/Tools/tidy_files_for_release.ps1
+++ b/Tools/tidy_files_for_release.ps1
@@ -15,14 +15,15 @@ if ($ConfigurationName -match "Release") {
    Write-Output "Removing unnecessary files from Release versions"
    Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
    $filesToDelete = Get-ChildItem -Path $TargetDir -Recurse -Include @(
-        "*.pdb",
        "*.publish",
        "*.xml",
        "*.backup",
        "*.log",
        "*vshost*",
        "*.tmp"
-    )
+    ) -Exclude @(
+        "mRemoteNG.VisualElementsManifest.xml"
+	)
    Remove-Item -Path $filesToDelete.FullName
    Write-Output $filesToDelete.FullName
 }
--- a/Tools/validate_microsoft_tool.ps1
+++ b/Tools/validate_microsoft_tool.ps1
@@ -0,0 +1,17 @@
+# $FullPath Full path to the Microsoft executable to validate
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $FullPath
+)
+
+$validMSCertThumbprints = @("3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC", "108E2BA23632620C427C570B6D9DB51AC31387FE", "98ED99A67886D020C564923B7DF25E9AC019DF26", "5EAD300DC7E4D637948ECB0ED829A072BD152E17")
+$exeSignature = Get-AuthenticodeSignature -FilePath $FullPath
+$baseErrorMsg = "Could not validate the certificate of $FullPath. "
+
+if ($exeSignature.Status -ne "Valid") {
+    Write-Error -Message ($baseErrorMsg+"The signature was invalid.") -ErrorAction Stop
+}
+elseif ($validMSCertThumbprints -notcontains $exeSignature.SignerCertificate.Thumbprint) {
+    Write-Error -Message ($baseErrorMsg+"The certificate thumbprint ($($exeSignature.SignerCertificate.Thumbprint)) is not trusted.") -ErrorAction Stop
+}
--- a/Tools/verify_LargeAddressAware.ps1
+++ b/Tools/verify_LargeAddressAware.ps1
@@ -0,0 +1,30 @@
+[CmdletBinding()]
+
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetFileName
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+$path_dumpBin = Join-Path -Path $PSScriptRoot -ChildPath "exes\dumpbin.exe"
+$path_outputExe = Join-Path -Path $TargetDir -ChildPath $TargetFileName
+
+# Dump exe header
+$output = & "$path_dumpBin" /NOLOGO /HEADERS "$path_outputExe" | Select-String large
+
+if ($output -eq $null)
+{
+    Write-Warning "Could not validate LargeAddressAware"
+}
+else
+{
+    Write-Output $output.ToString().TrimStart(" ")
+}
+
+Write-Output ""
--- a/Tools/verify_binary_signatures.ps1
+++ b/Tools/verify_binary_signatures.ps1
@@ -5,13 +5,35 @@ param (

    [string]
    [Parameter(Mandatory=$true)]
-    $ConfigurationName
+    $ConfigurationName,
+    
+    [string]
+    [Parameter(Mandatory=$true)]
+    [AllowEmptyString()]
+    # The code signing certificate to use when signing the files.
+    $CertificatePath,
+    
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir
 )

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

-# Sign MSI if we are building a release version and the certificate is available
-if ($ConfigurationName -match "Release") {
+#  validate release versions and if the certificate value was passed
+if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
+	
+	if(-Not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) {
+		$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
+	}
+	
+	# make sure the cert is actually available
+	if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
+	{
+	    Write-Output "Certificate is not present - files likely not signed - we won't verify file signatures."
+	    return
+	}
+		
    Write-Output "Verifying signature of binaries"
    Write-Output "Getting files from path: $TargetDir"
    $signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"}
@@ -30,7 +52,8 @@ if ($ConfigurationName -match "Release") {
        Write-Output "All files have valid signatures."
    }
 } else {
-    Write-Output "This is not a release build - we won't verify file signatures."
+    Write-Output "This is not a release build or CertificatePath wasn't provided - we won't verify file signatures."
+    Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
 }

 Write-Output ""
--- a/Tools/zip_portable_files.ps1
+++ b/Tools/zip_portable_files.ps1
@@ -13,13 +13,49 @@ param (
 )

 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
-$path_packageZipScript = Join-Path -Path $SolutionDir -ChildPath "Tools\build-relport.cmd"

+if(-not [string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
+    Write-Output "Too early to run via Appveyor - artifacts don't get generated properly. Exiting"
+    Exit
+}
+
+Write-Output "Solution Dir: '$($SolutionDir)'"
+Write-Output "Target Dir: '$($TargetDir)'"
+$ConfigurationName = $ConfigurationName.Trim()
+Write-Output "Config Name (tirmmed): '$($ConfigurationName)'"
+
+
+# Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe"
+$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"

 # Package Zip
-if ($ConfigurationName -match "Release" -and $ConfigurationName -match "Portable") {
+if ($ConfigurationName -eq "Release Portable") {
    Write-Output "Packaging Release Portable ZIP"
-    & $path_packageZipScript
+   
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
+
+    Write-Output "Version is $($version)"
+
+    $PortableZip="$($SolutionDir)Release\mRemoteNG-Portable-$($version).zip"
+
+    $tempFolderPath = Join-Path -Path $SolutionDir -ChildPath "mRemoteV1\bin\package"
+    Remove-Item -Recurse $tempFolderPath -ErrorAction SilentlyContinue | Out-Null
+    New-Item $tempFolderPath -ItemType  "directory" | Out-Null
+    
+    Copy-Item "$($SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" -Destination $tempFolderPath
+
+    #Write-Output "$($SolutionDir)mRemoteV1\bin\$ConfigurationName" 
+    #Write-Output "$($SolutionDir)mRemoteV1\bin\package"
+    Copy-Item "$($SolutionDir)mRemoteV1\bin\$ConfigurationName\*" -Destination $tempFolderPath -Recurse  -Force
+    # Delete any PDB files that accidentally get copied into the temp folder
+    Get-ChildItem -Path $tempFolderPath -Filter "*.pdb" | Remove-Item
+    Copy-Item "$($SolutionDir)*.txt" -Destination $tempFolderPath
+
+    Write-Output "Creating portable ZIP file $($PortableZip)"
+    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
+    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip (Join-Path -Path $tempFolderPath -ChildPath "*.*")
+    #& $SEVENZIP a -bt -mx=9 -tzip -y $PortableZip "$($SolutionDir)*.TXT"
 }
 else {
    Write-Output "We will not zip anything - this isnt a portable release build."
--- a/Tools/zip_symbols.ps1
+++ b/Tools/zip_symbols.ps1
@@ -0,0 +1,56 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+if(-not [string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
+    Write-Output "Too early to run via Appveyor - artifacts don't get generated properly. Exiting"
+    Exit
+}
+
+Write-Output "Solution Dir: '$($SolutionDir)'"
+Write-Output "Target Dir: '$($TargetDir)'"
+$ConfigurationName = $ConfigurationName.Trim()
+Write-Output "Config Name (trimmed): '$($ConfigurationName)'"
+
+
+# Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe"
+$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
+
+# Package Zip
+if ($ConfigurationName -match "Release") {
+    Write-Output "Packaging debug symbols"
+   
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
+
+    Write-Output "Version is $($version)"
+
+    if ($ConfigurationName -match "Portable") {
+        $zipFilePrefix = "mRemoteNG-Portable-symbols"
+    } else {
+        $zipFilePrefix = "mRemoteNG-symbols"
+    }
+
+    $outputZipPath="$($SolutionDir)Release\$zipFilePrefix-$($version).zip"
+
+    Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
+    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
+    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath (Join-Path -Path $TargetDir -ChildPath "*.pdb")
+}
+else {
+    Write-Output "We will not package debug symbols - this isnt a release build."
+}
+
+Write-Output ""
--- a/UI_tests.playlist
+++ b/UI_tests.playlist
@@ -1 +0,0 @@
-<Playlist Version="1.0"><Add Test="mRemoteNGTests.UI.WindowListTests.TestMethod1" /><Add Test="mRemoteNGTests.UI.WindowListTests.AddWindowToList" /><Add Test="mRemoteNGTests.UI.WindowListTests.CountReturnsCorrectNumber" /></Playlist>
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,46 @@
+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
--- a/mRemoteNG.Specs/App.config
+++ b/mRemoteNG.Specs/App.config
@@ -0,0 +1,26 @@
+<?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>
+        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.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>
--- a/mRemoteNG.Specs/Features/CredentialRepository.feature
+++ b/mRemoteNG.Specs/Features/CredentialRepository.feature
@@ -0,0 +1,25 @@
+Feature: CredentialRepository
+	As a user with several environments
+	I would like to load multiple credential repositories
+	In order to keep credentials separate
+
+@credentials
+Scenario: Load credential repository
+	Given I have a credential repository
+	And the credential repository is unloaded
+	When I click load
+	Then the credential repository is loaded
+
+Scenario: Add credential record
+	Given I have a credential repository
+	And The credential repository is loaded
+	And The repository has 0 credentials
+	When I click add credential
+	Then the repository has 1 credentials
+
+Scenario: Unload credential repository
+	Given I have a credential repository
+	And The credential repository is loaded
+	And The repository has 1 credentials
+	When I click unload
+	Then the credentials in the repository will no longer be available
--- a/mRemoteNG.Specs/Features/CredentialRepository.feature.cs
+++ b/mRemoteNG.Specs/Features/CredentialRepository.feature.cs
@@ -0,0 +1,138 @@
+// ------------------------------------------------------------------------------
+//  <auto-generated>
+//      This code was generated by SpecFlow (http://www.specflow.org/).
+//      SpecFlow Version:2.2.0.0
+//      SpecFlow Generator Version:2.2.0.0
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if
+//      the code is regenerated.
+//  </auto-generated>
+// ------------------------------------------------------------------------------
+#region Designer generated code
+
+using NUnit.Framework;
+
+#pragma warning disable
+namespace mRemoteNG.Specs.Features
+{
+    using TechTalk.SpecFlow;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "2.2.0.0")]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [NUnit.Framework.TestFixtureAttribute()]
+    [NUnit.Framework.DescriptionAttribute("CredentialRepository")]
+    public partial class CredentialRepositoryFeature
+    {
+        
+        private TechTalk.SpecFlow.ITestRunner testRunner;
+        
+#line 1 "CredentialRepository.feature"
+#line hidden
+        
+        [NUnit.Framework.OneTimeSetUpAttribute()]
+        public virtual void FeatureSetup()
+        {
+            testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
+            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "CredentialRepository", "\tAs a user with several environments\r\n\tI would like to load multiple credential r" +
+                    "epositories\r\n\tIn order to keep credentials separate", ProgrammingLanguage.CSharp, ((string[])(null)));
+            testRunner.OnFeatureStart(featureInfo);
+        }
+        
+        [NUnit.Framework.OneTimeTearDownAttribute()]
+        public virtual void FeatureTearDown()
+        {
+            testRunner.OnFeatureEnd();
+            testRunner = null;
+        }
+        
+        [NUnit.Framework.SetUpAttribute()]
+        public virtual void TestInitialize()
+        {
+        }
+        
+        [NUnit.Framework.TearDownAttribute()]
+        public virtual void ScenarioTearDown()
+        {
+            testRunner.OnScenarioEnd();
+        }
+        
+        public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        {
+            testRunner.OnScenarioStart(scenarioInfo);
+        }
+        
+        public virtual void ScenarioCleanup()
+        {
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Load credential repository")]
+        [NUnit.Framework.CategoryAttribute("credentials")]
+        [Ignore("Cred Repo not implmented currently.")]
+        public virtual void LoadCredentialRepository()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Load credential repository", new string[] {
+                        "credentials"});
+#line 7
+this.ScenarioSetup(scenarioInfo);
+#line 8
+ testRunner.Given("I have a credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line 9
+ testRunner.And("the credential repository is unloaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 10
+ testRunner.When("I click load", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line 11
+ testRunner.Then("the credential repository is loaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Add credential record")]
+        [Ignore("Cred Repo not implmented currently.")]
+        public virtual void AddCredentialRecord()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add credential record", ((string[])(null)));
+#line 13
+this.ScenarioSetup(scenarioInfo);
+#line 14
+ testRunner.Given("I have a credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line 15
+ testRunner.And("The credential repository is loaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 16
+ testRunner.And("The repository has 0 credentials", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 17
+ testRunner.When("I click add credential", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line 18
+ testRunner.Then("the repository has 1 credentials", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Unload credential repository")]
+        [Ignore("Cred Repo not implmented currently.")]
+        public virtual void UnloadCredentialRepository()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Unload credential repository", ((string[])(null)));
+#line 20
+this.ScenarioSetup(scenarioInfo);
+#line 21
+ testRunner.Given("I have a credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line 22
+ testRunner.And("The credential repository is loaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 23
+ testRunner.And("The repository has 1 credentials", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 24
+ testRunner.When("I click unload", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line 25
+ testRunner.Then("the credentials in the repository will no longer be available", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+    }
+}
+#pragma warning restore
+#endregion
--- a/mRemoteNG.Specs/Features/CredentialRepositoryList.feature
+++ b/mRemoteNG.Specs/Features/CredentialRepositoryList.feature
@@ -0,0 +1,17 @@
+Feature: CredentialRepositoryList
+	As a user with several environments
+	I would like to load multiple credential repositories
+	In order to keep credentials separate
+
+@credentials
+Scenario: Add a new credential repository
+	Given I have a credential repository list
+	And It has 0 repositories set up
+	When I press add and complete the creation wizard
+	Then I will have 1 credential repository
+
+Scenario: Remove a credential repository
+	Given I have a credential repository list
+	And It has 2 repositories set up
+	When I remove the first repository
+	Then I will have 1 credential repository
--- a/mRemoteNG.Specs/Features/CredentialRepositoryList.feature.cs
+++ b/mRemoteNG.Specs/Features/CredentialRepositoryList.feature.cs
@@ -0,0 +1,115 @@
+// ------------------------------------------------------------------------------
+//  <auto-generated>
+//      This code was generated by SpecFlow (http://www.specflow.org/).
+//      SpecFlow Version:2.2.0.0
+//      SpecFlow Generator Version:2.2.0.0
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if
+//      the code is regenerated.
+//  </auto-generated>
+// ------------------------------------------------------------------------------
+#region Designer generated code
+
+using NUnit.Framework;
+
+#pragma warning disable
+namespace mRemoteNG.Specs.Features
+{
+    using TechTalk.SpecFlow;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "2.2.0.0")]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [NUnit.Framework.TestFixtureAttribute()]
+    [NUnit.Framework.DescriptionAttribute("CredentialRepositoryList")]
+    [Ignore("Cred Repo not implmented currently.")]
+    public partial class CredentialRepositoryListFeature
+    {
+        
+        private TechTalk.SpecFlow.ITestRunner testRunner;
+        
+#line 1 "CredentialRepositoryList.feature"
+#line hidden
+        
+        [NUnit.Framework.OneTimeSetUpAttribute()]
+        public virtual void FeatureSetup()
+        {
+            testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
+            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "CredentialRepositoryList", "\tAs a user with several environments\r\n\tI would like to load multiple credential r" +
+                    "epositories\r\n\tIn order to keep credentials separate", ProgrammingLanguage.CSharp, ((string[])(null)));
+            testRunner.OnFeatureStart(featureInfo);
+        }
+        
+        [NUnit.Framework.OneTimeTearDownAttribute()]
+        public virtual void FeatureTearDown()
+        {
+            testRunner.OnFeatureEnd();
+            testRunner = null;
+        }
+        
+        [NUnit.Framework.SetUpAttribute()]
+        public virtual void TestInitialize()
+        {
+        }
+        
+        [NUnit.Framework.TearDownAttribute()]
+        public virtual void ScenarioTearDown()
+        {
+            testRunner.OnScenarioEnd();
+        }
+        
+        public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        {
+            testRunner.OnScenarioStart(scenarioInfo);
+        }
+        
+        public virtual void ScenarioCleanup()
+        {
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Add a new credential repository")]
+        [NUnit.Framework.CategoryAttribute("credentials")]
+        [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[] {
+                        "credentials"});
+#line 7
+this.ScenarioSetup(scenarioInfo);
+#line 8
+ testRunner.Given("I have a credential repository list", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line 9
+ testRunner.And("It has 0 repositories set up", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 10
+ testRunner.When("I press add and complete the creation wizard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line 11
+ testRunner.Then("I will have 1 credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Remove a credential repository")]
+        [Ignore("Cred Repo not implmented currently.")]
+        public virtual void RemoveACredentialRepository()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Remove a credential repository", ((string[])(null)));
+#line 13
+this.ScenarioSetup(scenarioInfo);
+#line 14
+ testRunner.Given("I have a credential repository list", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line 15
+ testRunner.And("It has 2 repositories set up", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 16
+ testRunner.When("I remove the first repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line 17
+ testRunner.Then("I will have 1 credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+    }
+}
+#pragma warning restore
+#endregion
--- a/mRemoteNG.Specs/Properties/AssemblyInfo.cs
+++ b/mRemoteNG.Specs/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("mRemoteNG.Specs")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("mRemoteNG.Specs")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("16aa21e2-d6b7-427d-ab7d-aa8c611b724e")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs
+++ b/mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs
@@ -0,0 +1,48 @@
+using System.Linq;
+using mRemoteNG.Credential.Repositories;
+using mRemoteNG.Specs.Utilities;
+using NUnit.Framework;
+using TechTalk.SpecFlow;
+
+namespace mRemoteNG.Specs.StepDefinitions
+{
+    [Binding]
+    public class CredentialRepositoryListSteps
+    {
+        private CredentialRepositoryList _credentialRepositoryList;
+        private readonly XmlCredentialRepoBuilder _credentialRepoUtilities = new XmlCredentialRepoBuilder();
+
+        [Given(@"I have a credential repository list")]
+        public void GivenIHaveACredentialRepositoryList()
+        {
+            _credentialRepositoryList = new CredentialRepositoryList();
+        }
+        
+        [Given(@"It has (.*) repositories set up")]
+        public void GivenItHasRepositoriesSetUp(int numberOfCredentialRepos)
+        {
+            for (var i = 0; i < numberOfCredentialRepos; i++)
+                _credentialRepositoryList.AddProvider(_credentialRepoUtilities.BuildXmlCredentialRepo());
+        }
+
+        [When(@"I press add and complete the creation wizard")]
+        public void WhenIPressAddAndCompleteTheCreationWizard()
+        {
+            var credentialRepo = _credentialRepoUtilities.BuildXmlCredentialRepo();
+            _credentialRepositoryList.AddProvider(credentialRepo);
+        }
+
+        [When(@"I remove the first repository")]
+        public void WhenIRemoveTheFirstRepository()
+        {
+            var firstRepo = _credentialRepositoryList.CredentialProviders.First();
+            _credentialRepositoryList.RemoveProvider(firstRepo);
+        }
+
+        [Then(@"I will have (.*) credential repository")]
+        public void ThenIWillHaveCredentialRepository(int expectedCredRepoCount)
+        {
+            Assert.That(_credentialRepositoryList.CredentialProviders.Count(), Is.EqualTo(expectedCredRepoCount));
+        }
+    }
+}
--- a/mRemoteNG.Specs/StepDefinitions/CredentialRepositorySteps.cs
+++ b/mRemoteNG.Specs/StepDefinitions/CredentialRepositorySteps.cs
@@ -0,0 +1,80 @@
+using System.Security;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using mRemoteNG.Specs.Utilities;
+using NUnit.Framework;
+using TechTalk.SpecFlow;
+
+namespace mRemoteNG.Specs.StepDefinitions
+{
+    [Binding]
+    public class CredentialRepositorySteps
+    {
+        private ICredentialRepository _credentialRepository;
+        private readonly SecureString _key = "somePassword".ConvertToSecureString();
+
+        [Given(@"I have a credential repository")]
+        public void GivenIHaveACredentialRepository()
+        {
+            var utilityFactory = new XmlCredentialRepoBuilder {EncryptionKey = _key};
+            _credentialRepository = utilityFactory.BuildXmlCredentialRepo();
+        }
+
+        [Given(@"The repository has (.*) credentials")]
+        public void GivenTheRepositoryHasCredentials(int numberOfCreds)
+        {
+            for (var i = 0; i < numberOfCreds; i++)
+                _credentialRepository.CredentialRecords.Add(new CredentialRecord());
+            Assert.That(_credentialRepository.CredentialRecords.Count, Is.EqualTo(numberOfCreds));
+        }
+
+        [Given(@"The credential repository is loaded")]
+        public void GivenTheCredentialRepositoryIsLoaded()
+        {
+            _credentialRepository.LoadCredentials(_key);
+            Assert.That(_credentialRepository.IsLoaded);
+        }
+
+        [Given(@"the credential repository is unloaded")]
+        public void GivenTheCredentialRepositoryIsUnloaded()
+        {
+            Assert.That(_credentialRepository.IsLoaded, Is.False);
+        }
+
+        [When(@"I click load")]
+        public void WhenIClickLoad()
+        {
+            _credentialRepository.LoadCredentials(_key);
+        }
+
+        [Then(@"the credential repository is loaded")]
+        public void ThenTheCredentialRepositoryIsLoaded()
+        {
+            Assert.That(_credentialRepository.IsLoaded);
+        }
+
+        [When(@"I click add credential")]
+        public void WhenIClickAddCredential()
+        {
+            _credentialRepository.CredentialRecords.Add(new CredentialRecord());
+        }
+
+        [Then(@"the repository has (.*) credentials")]
+        public void ThenTheRepositoryHasCredentials(int numberOfCreds)
+        {
+            Assert.That(_credentialRepository.CredentialRecords.Count, Is.EqualTo(numberOfCreds));
+        }
+
+        [When(@"I click unload")]
+        public void WhenIClickUnload()
+        {
+            _credentialRepository.UnloadCredentials();
+        }
+        
+        [Then(@"the credentials in the repository will no longer be available")]
+        public void ThenTheCredentialsInTheRepositoryWillNoLongerBeAvailable()
+        {
+            Assert.That(_credentialRepository.CredentialRecords, Is.Empty);
+        }
+    }
+}
--- a/mRemoteNG.Specs/Utilities/CredRepoXmlFileBuilder.cs
+++ b/mRemoteNG.Specs/Utilities/CredRepoXmlFileBuilder.cs
@@ -0,0 +1,12 @@
+namespace mRemoteNG.Specs.Utilities
+{
+    public class CredRepoXmlFileBuilder
+    {
+        public string Build(string authHeader)
+        {
+            return "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                    $"<Credentials EncryptionEngine=\"AES\" BlockCipherMode=\"GCM\" KdfIterations=\"1000\" Auth=\"{authHeader}\" SchemaVersion=\"1.0\">" +
+                    "</Credentials>";
+        }
+    }
+}
--- a/mRemoteNG.Specs/Utilities/XmlCredentialRepoBuilder.cs
+++ b/mRemoteNG.Specs/Utilities/XmlCredentialRepoBuilder.cs
@@ -0,0 +1,42 @@
+using System.Security;
+using mRemoteNG.Config;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Serializers.CredentialSerializer;
+using mRemoteNG.Credential;
+using mRemoteNG.Credential.Repositories;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+
+namespace mRemoteNG.Specs.Utilities
+{
+    public class XmlCredentialRepoBuilder
+    {
+        public SecureString EncryptionKey { get; set; } = "someKey1".ConvertToSecureString();
+        public ICryptographyProvider CryptographyProvider { get; set; } = new AeadCryptographyProvider();
+
+        public ICredentialRepository BuildXmlCredentialRepo()
+        {
+            var xmlFileBuilder = new CredRepoXmlFileBuilder();
+            var xmlFileContent = xmlFileBuilder.Build(CryptographyProvider.Encrypt("someheaderdata", EncryptionKey));
+            var dataProvider = new InMemoryStringDataProvider(xmlFileContent);
+            var encryptor = new XmlCredentialPasswordEncryptorDecorator(
+                CryptographyProvider,
+                new XmlCredentialRecordSerializer()
+            );
+            var decryptor = new XmlCredentialPasswordDecryptorDecorator(
+                new XmlCredentialRecordDeserializer()
+            );
+
+            return new XmlCredentialRepository(
+                new CredentialRepositoryConfig(),
+                new CredentialRecordSaver(
+                    dataProvider,
+                    encryptor
+                ), new CredentialRecordLoader(
+                    dataProvider,
+                    decryptor
+                )
+            );
+        }
+    }
+}
--- a/mRemoteNG.Specs/mRemoteNG.Specs.csproj
+++ b/mRemoteNG.Specs/mRemoteNG.Specs.csproj
@@ -0,0 +1,108 @@
+<?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="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>mRemoteNG.Specs</RootNamespace>
+    <AssemblyName>mRemoteNG.Specs</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <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>
+    <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>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <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>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Features\CredentialRepository.feature.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>CredentialRepository.feature</DependentUpon>
+    </Compile>
+    <Compile Include="Features\CredentialRepositoryList.feature.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>CredentialRepositoryList.feature</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StepDefinitions\CredentialRepositoryListSteps.cs" />
+    <Compile Include="StepDefinitions\CredentialRepositorySteps.cs" />
+    <Compile Include="Utilities\CredRepoXmlFileBuilder.cs" />
+    <Compile Include="Utilities\XmlCredentialRepoBuilder.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Features\CredentialRepository.feature">
+      <Generator>SpecFlowSingleFileGenerator</Generator>
+      <LastGenOutput>CredentialRepository.feature.cs</LastGenOutput>
+    </None>
+    <None Include="Features\CredentialRepositoryList.feature">
+      <Generator>SpecFlowSingleFileGenerator</Generator>
+      <LastGenOutput>CredentialRepositoryList.feature.cs</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mRemoteV1\mRemoteV1.csproj">
+      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
+      <Name>mRemoteV1</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/mRemoteNG.Specs/packages.config
+++ b/mRemoteNG.Specs/packages.config
@@ -0,0 +1,16 @@
+<?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="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.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" />
+</packages>
--- a/mRemoteNGTests/App/ImportTests.cs
+++ b/mRemoteNGTests/App/ImportTests.cs
@@ -0,0 +1,47 @@
+using System.IO;
+using mRemoteNG.App;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNGTests.Properties;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.App
+{
+	public class ImportTests
+	{
+		[Test]
+		public void ErrorHandlerCalledWhenUnsupportedFileExtensionFound()
+		{
+			using (FileTestHelpers.DisposableTempFile(out var file, ".blah"))
+			{
+				var conService = new ConnectionsService(PuttySessionsManager.Instance);
+				var container = new ContainerInfo();
+				var exceptionOccurred = false;
+
+				Import.HeadlessFileImport(new []{file}, container, conService, s => exceptionOccurred = true);
+
+				Assert.That(exceptionOccurred);
+			}
+		}
+
+		[Test]
+		public void AnErrorInOneFileDoNotPreventOtherFilesFromProcessing()
+		{
+			using (FileTestHelpers.DisposableTempFile(out var badFile, ".blah"))
+			using (FileTestHelpers.DisposableTempFile(out var rdpFile, ".rdp"))
+			{
+				File.AppendAllText(rdpFile, Resources.test_remotedesktopconnection_rdp);
+				var conService = new ConnectionsService(PuttySessionsManager.Instance);
+				var container = new ContainerInfo();
+				var exceptionCount = 0;
+				
+				Import.HeadlessFileImport(new[] { badFile, rdpFile }, container, conService, s => exceptionCount++);
+
+				Assert.That(exceptionCount, Is.EqualTo(1));
+				Assert.That(container.Children, Has.One.Items);
+			}
+		}
+	}
+}
--- a/mRemoteNGTests/App/LoggerTests.cs
+++ b/mRemoteNGTests/App/LoggerTests.cs
@@ -1,25 +0,0 @@
-using System;
-using NUnit.Framework;
-using mRemoteNG.App;
-using log4net;
-
-namespace mRemoteNGTests.App
-{
-    [TestFixture]
-    public class LoggerTests
-    {
-        [Test]
-        public void GetSingletonInstanceReturnsAnILogObject()
-        {
-            Assert.That(Logger.Instance, Is.InstanceOf<ILog>());
-        }
-
-        [Test]
-        public void SingletonOnlyEverReturnsTheSameInstance()
-        {
-            ILog log1 = Logger.Instance;
-            ILog log2 = Logger.Instance;
-            Assert.That(log1, Is.EqualTo(log2));
-        }
-    }
-}
--- a/mRemoteNGTests/BinaryFileTests.cs
+++ b/mRemoteNGTests/BinaryFileTests.cs
@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using System.IO;
+using System.Runtime.CompilerServices;

 namespace mRemoteNGTests
 {
@@ -13,41 +14,42 @@ namespace mRemoteNGTests
            Assert.That(IsLargeAware(exePath), Is.True);
        }

-        static string GetTargetPath([System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "")
+        public string GetTargetPath([CallerFilePath] string sourceFilePath = "")
        {
-            string debugOrRelease = "";
-            string normalOrPortable = "";
+            const string debugOrRelease =
 #if DEBUG
-            debugOrRelease = "Debug";
+				"Debug";
 #else
-            debugOrRelease = "Release";
+				"Release";
 #endif
+
+            const string normalOrPortable =
 #if PORTABLE
-            normalOrPortable = " Portable";
+            " Portable";
 #else
-            normalOrPortable = "";
+            "";
 #endif
            var path = Path.GetDirectoryName(sourceFilePath);
-            string FilePath = $"{path}\\..\\mRemoteV1\\bin\\{debugOrRelease}{normalOrPortable}\\mRemoteNG.exe";
-            return FilePath;
+            var filePath = $"{path}\\..\\mRemoteV1\\bin\\{debugOrRelease}{normalOrPortable}\\mRemoteNG.exe";
+            return filePath;
        }

-        static bool IsLargeAware(string file)
+        private bool IsLargeAware(string file)
        {
            using (var fs = File.OpenRead(file))
            {
                return IsLargeAware(fs);
            }
        }
+
        /// <summary>
        /// Checks if the stream is a MZ header and if it is large address aware
        /// </summary>
        /// <param name="stream">Stream to check, make sure its at the start of the MZ header</param>
-        /// <exception cref=""></exception>
        /// <returns></returns>
-        static bool IsLargeAware(Stream stream)
+        private bool IsLargeAware(Stream stream)
        {
-            const int IMAGE_FILE_LARGE_ADDRESS_AWARE = 0x20;
+            const int imageFileLargeAddressAware = 0x20;

            var br = new BinaryReader(stream);

@@ -55,14 +57,14 @@ namespace mRemoteNGTests
                return false;

            br.BaseStream.Position = 0x3C;
-            var peloc = br.ReadInt32();         //Get the PE header location.
+            var peHeaderLocation = br.ReadInt32();         //Get the PE header location.

-            br.BaseStream.Position = peloc;
+            br.BaseStream.Position = peHeaderLocation;
            if (br.ReadInt32() != 0x4550)       //No PE header
                return false;

            br.BaseStream.Position += 0x12;
-            return (br.ReadInt16() & IMAGE_FILE_LARGE_ADDRESS_AWARE) == IMAGE_FILE_LARGE_ADDRESS_AWARE;
+            return (br.ReadInt16() & imageFileLargeAddressAware) == imageFileLargeAddressAware;
        }
    }
 }
--- a/mRemoteNGTests/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgsTests.cs
+++ b/mRemoteNGTests/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgsTests.cs
@@ -0,0 +1,42 @@
+using System;
+using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DatabaseConnectors;
+using NSubstitute;
+using NUnit.Framework;
+// ReSharper disable ObjectCreationAsStatement
+
+namespace mRemoteNGTests.Config.Connections.Multiuser
+{
+    public class ConnectionsUpdateAvailableEventArgsTests
+    {
+        private IDatabaseConnector _databaseConnector;
+        private DateTime _dateTime;
+
+        [SetUp]
+        public void Setup()
+        {
+            _databaseConnector = Substitute.For<IDatabaseConnector>();
+            _dateTime = DateTime.MinValue;
+        }
+
+        [Test]
+        public void CantProvideNullDatabaseConnectorToCtor()
+        {
+            Assert.Throws<ArgumentNullException>(() => new ConnectionsUpdateAvailableEventArgs(null, _dateTime));
+        }
+
+        [Test]
+        public void DatabaseConnectorPropertySet()
+        {
+            var eventArgs = new ConnectionsUpdateAvailableEventArgs(_databaseConnector, _dateTime);
+            Assert.That(eventArgs.DatabaseConnector, Is.EqualTo(_databaseConnector));
+        }
+
+        [Test]
+        public void UpdateTimePropertySet()
+        {
+            var eventArgs = new ConnectionsUpdateAvailableEventArgs(_databaseConnector, _dateTime);
+            Assert.That(eventArgs.UpdateTime, Is.EqualTo(_dateTime));
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Connections/XmlConnectionsLoaderTests.cs
+++ b/mRemoteNGTests/Config/Connections/XmlConnectionsLoaderTests.cs
@@ -0,0 +1,21 @@
+using mRemoteNG.Config.Connections;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace mRemoteNGTests.Config.Connections
+{
+    class XmlConnectionsLoaderTests
+    {
+        [Test]
+        public void ThrowsFileNotFound()
+        {
+            Assert.Throws<FileNotFoundException>(() => (new XmlConnectionsLoader(FileTestHelpers.NewTempFilePath())).Load());
+        }
+    }
+}
--- a/mRemoteNGTests/Config/CredentialHarvesterTests.cs
+++ b/mRemoteNGTests/Config/CredentialHarvesterTests.cs
@@ -0,0 +1,131 @@
+using mRemoteNG.Config;
+using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Security.Factories;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+using System;
+using System.Linq;
+using System.Security;
+using System.Xml.Linq;
+
+
+namespace mRemoteNGTests.Config
+{
+#pragma warning disable 618
+    public class CredentialHarvesterTests
+    {
+
+        private CredentialHarvester _credentialHarvester;
+        private ICryptographyProvider _cryptographyProvider;
+        private SecureString _key;
+
+        [SetUp]
+        public void Setup()
+        {
+            _credentialHarvester = new CredentialHarvester();
+            _cryptographyProvider = new CryptoProviderFactory(BlockCipherEngines.AES, BlockCipherModes.GCM).Build();
+            _key = "testKey123".ConvertToSecureString();
+        }
+
+        [Test]
+        public void HarvestsUsername()
+        {
+            var connection = new ConnectionInfo { Username = "myuser", Domain = "somedomain", Password = "mypass" };
+            var xdoc = CreateTestData(connection);
+            var credentials = _credentialHarvester.Harvest(xdoc, _key);
+            Assert.That(credentials.Single().Username, Is.EqualTo(connection.Username));
+        }
+
+        [Test]
+        public void HarvestsDomain()
+        {
+            var connection = new ConnectionInfo { Username = "myuser", Domain = "somedomain", Password = "mypass" };
+            var xdoc = CreateTestData(connection);
+            var credentials = _credentialHarvester.Harvest(xdoc, _key);
+            Assert.That(credentials.Single().Domain, Is.EqualTo(connection.Domain));
+        }
+
+        [Test]
+        public void HarvestsPassword()
+        {
+            var connection = new ConnectionInfo { Username = "myuser", Domain = "somedomain", Password = "mypass" };
+            var xdoc = CreateTestData(connection);
+            var credentials = _credentialHarvester.Harvest(xdoc, _key);
+            Assert.That(credentials.Single().Password.ConvertToUnsecureString(), Is.EqualTo(connection.Password));
+        }
+
+        [Test]
+        public void DoesNotHarvestEmptyCredentials()
+        {
+            var connection = new ConnectionInfo();
+            var xdoc = CreateTestData(connection);
+            var credentials = _credentialHarvester.Harvest(xdoc, _key);
+            Assert.That(credentials.Count(), Is.EqualTo(0));
+        }
+
+        [Test]
+        public void HarvestsAllCredentials()
+        {
+            var container = new ContainerInfo();
+            var con1 = new ConnectionInfo {Username = "blah"};
+            var con2 = new ConnectionInfo {Username = "something"};
+            container.AddChildRange(new [] {con1, con2});
+            var xdoc = CreateTestData(container);
+            var credentials = _credentialHarvester.Harvest(xdoc, _key);
+            Assert.That(credentials.Count(), Is.EqualTo(2));
+        }
+
+        [Test]
+        public void OnlyReturnsUniqueCredentials()
+        {
+            var container = new ContainerInfo();
+            var con1 = new ConnectionInfo { Username = "something" };
+            var con2 = new ConnectionInfo { Username = "something" };
+            container.AddChildRange(new[] { con1, con2 });
+            var xdoc = CreateTestData(container);
+            var credentials = _credentialHarvester.Harvest(xdoc, _key);
+            Assert.That(credentials.Count(), Is.EqualTo(1));
+        }
+
+        [Test]
+        public void CredentialMapCorrectForSingleCredential()
+        {
+            var connection = new ConnectionInfo { Username = "myuser", Domain = "somedomain", Password = "mypass" };
+            var connectionGuid = Guid.Parse(connection.ConstantID);
+            var xdoc = CreateTestData(connection);
+            _credentialHarvester.Harvest(xdoc, _key);
+            var map = _credentialHarvester.ConnectionToCredentialMap;
+            Assert.That(map[connectionGuid].Username, Is.EqualTo(connection.Username));
+        }
+
+        [Test]
+        public void CredentialMapDoesntContainDuplicateCredentialObjects()
+        {
+            var container = new ContainerInfo();
+            var con1 = new ConnectionInfo { Username = "something" };
+            var con2 = new ConnectionInfo { Username = "something" };
+            container.AddChildRange(new[] { con1, con2 });
+            var xdoc = CreateTestData(container);
+            var con1Id = Guid.Parse(con1.ConstantID);
+            var con2Id = Guid.Parse(con2.ConstantID);
+            _credentialHarvester.Harvest(xdoc, _key);
+            var map = _credentialHarvester.ConnectionToCredentialMap;
+            Assert.That(map[con1Id], Is.EqualTo(map[con2Id]));
+        }
+
+
+        private XDocument CreateTestData(ConnectionInfo connectionInfo)
+        {
+            var rootNode = new RootNodeInfo(RootNodeType.Connection) {PasswordString = _key.ConvertToUnsecureString()};
+            rootNode.AddChild(connectionInfo);
+            var nodeSerializer = new XmlConnectionNodeSerializer27(_cryptographyProvider, _key, new SaveFilter());
+            var serializer = new XmlConnectionsSerializer(_cryptographyProvider, nodeSerializer);
+            var serializedData = serializer.Serialize(rootNode);
+            return XDocument.Parse(serializedData);
+        }
+    }
+#pragma warning restore 618
+}
--- a/mRemoteNGTests/Config/CredentialRecordLoaderTests.cs
+++ b/mRemoteNGTests/Config/CredentialRecordLoaderTests.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Security;
+using mRemoteNG.Config;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Credential;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config
+{
+    public class CredentialRecordLoaderTests
+    {
+        private CredentialRecordLoader _credentialRecordLoader;
+        private IDataProvider<string> _dataProvider;
+        private ISecureDeserializer<string, IEnumerable<ICredentialRecord>> _deserializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            _dataProvider = Substitute.For<IDataProvider<string>>();
+            _deserializer = Substitute.For<ISecureDeserializer<string, IEnumerable<ICredentialRecord>>>();
+            _credentialRecordLoader = new CredentialRecordLoader(_dataProvider, _deserializer);
+        }
+
+        [Test]
+        public void LoadsFromDataProvider()
+        {
+            _credentialRecordLoader.Load(new SecureString());
+            _dataProvider.Received(1).Load();
+        }
+
+        [Test]
+        public void DeserializesDataFromDataProvider()
+        {
+            var key = new SecureString();
+            _dataProvider.Load().Returns("mydata");
+            _credentialRecordLoader.Load(key);
+            _deserializer.Received(1).Deserialize("mydata", key);
+        }
+    }
+}
--- a/mRemoteNGTests/Config/DataProviders/FileBackupCreatorTests.cs
+++ b/mRemoteNGTests/Config/DataProviders/FileBackupCreatorTests.cs
@@ -0,0 +1,50 @@
+using System.IO;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.DataProviders
+{
+	public class FileBackupCreatorTests
+    {
+        private FileBackupCreator _fileBackupCreator;
+        private string _testFilePath;
+        private string _testFilePathBackup;
+        private string _testFileDirectory;
+        private string _testFileRollingBackup;
+
+        [SetUp]
+        public void Setup()
+        {
+            _testFilePath = FileTestHelpers.NewTempFilePath();
+            _testFileDirectory = Path.GetDirectoryName(_testFilePath);
+            _testFileRollingBackup = Path.GetFileName(_testFilePath) + ".*-*.backup";
+            _testFilePathBackup = _testFilePath + ".backup";
+            _fileBackupCreator = new FileBackupCreator();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+			if (Directory.Exists(_testFileDirectory))
+				Directory.Delete(_testFileDirectory, true);
+		}
+
+        [Test]
+        public void BackupCreatedWhenFileAlreadyExists()
+        {
+            File.WriteAllText(_testFilePath, "");
+            _fileBackupCreator.CreateBackupFile(_testFilePath);
+            var rollingBackupFiles = Directory.GetFiles(_testFileDirectory, _testFileRollingBackup);
+            Assert.That(rollingBackupFiles.Length, Is.EqualTo(1));
+        }
+
+        [Test]
+        public void BackupNotCreatedIfFileDidntAlreadyExist()
+        {
+            _fileBackupCreator.CreateBackupFile(_testFilePath);
+            var backupFileExists = File.Exists(_testFilePathBackup);
+            Assert.That(backupFileExists, Is.False);
+        }
+    }
+}
--- a/mRemoteNGTests/Config/DataProviders/FileDataProviderTests.cs
+++ b/mRemoteNGTests/Config/DataProviders/FileDataProviderTests.cs
@@ -0,0 +1,60 @@
+using System;
+using System.IO;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.DataProviders
+{
+	public class FileDataProviderTests
+    {
+        private FileDataProvider _dataProvider;
+        private string _testFilePath;
+	    private string _testFileDirectory;
+
+        [SetUp]
+        public void Setup()
+        {
+            _testFilePath = FileTestHelpers.NewTempFilePath();
+	        _testFileDirectory = Path.GetDirectoryName(_testFilePath);
+            _dataProvider = new FileDataProvider(_testFilePath);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            if (Directory.Exists(_testFileDirectory))
+                Directory.Delete(_testFileDirectory, true);
+        }
+
+        [Test]
+        public void SetsFileContent()
+        {
+            Assert.That(File.Exists(_testFilePath), Is.False);
+            var expectedFileContent = Guid.NewGuid().ToString();
+            _dataProvider.Save(expectedFileContent);
+            var fileContent = File.ReadAllText(_testFilePath);
+            Assert.That(fileContent, Is.EqualTo(expectedFileContent));
+        }
+
+        [Test]
+        public void LoadingFileThatDoesntExistProvidesEmptyString()
+        {
+            var fileThatShouldntExist = Guid.NewGuid().ToString();
+            var dataProvider = new FileDataProvider(fileThatShouldntExist);
+            var loadedData = dataProvider.Load();
+            Assert.That(loadedData, Is.Empty);
+        }
+
+        [Test]
+        public void SaveCreatesDirectoriesThatDontExist()
+        {
+            var folder1 = Guid.NewGuid().ToString();
+            var folder2 = Guid.NewGuid().ToString();
+            var fileThatShouldExist = Path.Combine(_testFileDirectory, folder1, folder2, Path.GetRandomFileName());
+            _dataProvider.FilePath = fileThatShouldExist;
+            _dataProvider.Save("");
+            Assert.That(File.Exists(fileThatShouldExist), Is.True);
+        }
+    }
+}
--- a/mRemoteNGTests/Config/DataProviders/FileDataProviderWithRollingBackupTests.cs
+++ b/mRemoteNGTests/Config/DataProviders/FileDataProviderWithRollingBackupTests.cs
@@ -0,0 +1,53 @@
+using System.IO;
+using System.Threading;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.DataProviders
+{
+	public class FileDataProviderWithRollingBackupTests
+    {
+        private FileDataProviderWithRollingBackup _dataProvider;
+        private string _testFilePath;
+        private string _testFileDirectory;
+        private string _testFileRollingBackup;
+
+        [SetUp]
+        public void Setup()
+        {
+            _testFilePath = FileTestHelpers.NewTempFilePath();
+            _testFileDirectory = Path.GetDirectoryName(_testFilePath);
+            _testFileRollingBackup = Path.GetFileName(_testFilePath) + ".*-*.backup";
+            _dataProvider = new FileDataProviderWithRollingBackup(_testFilePath);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+			if (Directory.Exists(_testFileDirectory))
+				Directory.Delete(_testFileDirectory, true);
+		}
+
+        [Test]
+        public void RollingBackupCreatedIfRegularBackupExists()
+        {
+            for (var i = 0; i < 3; i++)
+            {
+                _dataProvider.Save("");
+                Thread.Sleep(100);
+            }
+                
+            var rollingBackupFiles = Directory.GetFiles(_testFileDirectory, _testFileRollingBackup);
+            Assert.That(rollingBackupFiles.Length, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void NoRollingBackupCreatedIfRegularFileDoesntExists()
+        {
+            _dataProvider.Save("");
+            var rollingBackupFiles = Directory.GetFiles(_testFileDirectory, _testFileRollingBackup);
+            Assert.That(rollingBackupFiles.Length, Is.EqualTo(0));
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/ConfConsEnsureConnectionsHaveIdsTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConfConsEnsureConnectionsHaveIdsTests.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class ConfConsEnsureConnectionsHaveIdsTests
+    {
+        private ConfConsEnsureConnectionsHaveIds _consEnsureConnectionsHaveIds;
+
+        [SetUp]
+        public void Setup()
+        {
+            _consEnsureConnectionsHaveIds = new ConfConsEnsureConnectionsHaveIds();
+        }
+
+        [Test]
+        public void IdAttributeIsAddedIfItDidntExist()
+        {
+            var xdoc = CreateTestDocument();
+            _consEnsureConnectionsHaveIds.EnsureElementsHaveIds(xdoc);
+            var attribute = xdoc.Root?.Element("Node")?.Attribute("Id");
+            Assert.That(attribute, Is.Not.Null);
+        }
+
+        [Test]
+        public void NewIdAttributeShouldNotBeAnEmptyGuid()
+        {
+            var xdoc = CreateTestDocument();
+            _consEnsureConnectionsHaveIds.EnsureElementsHaveIds(xdoc);
+            var attribute = xdoc.Root?.Element("Node")?.Attribute("Id");
+            Assert.That(attribute?.Value, Is.Not.EqualTo(Guid.Empty.ToString()));
+        }
+
+        private XDocument CreateTestDocument()
+        {
+            var xdoc = new XDocument();
+            xdoc.Add(new XElement("Root", 
+                new XElement("Node",
+                    new XAttribute("Thingy",""))));
+            return xdoc;
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs
@@ -0,0 +1,187 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.Http;
+using mRemoteNG.Connection.Protocol.ICA;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Connection.Protocol.VNC;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using mRemoteNGTests.TestHelpers;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
+{
+    public class CsvConnectionsDeserializerMremotengFormatTests
+    {
+        private CsvConnectionsDeserializerMremotengFormat _deserializer;
+        private CsvConnectionsSerializerMremotengFormat _serializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            _deserializer = new CsvConnectionsDeserializerMremotengFormat();
+            var credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
+            _serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), credentialRepositoryList);
+        }
+
+        [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.ConnectionPropertyTestCases))]
+        public object ConnectionPropertiesDeserializedCorrectly(string propertyToCheck)
+        {
+            var csv = _serializer.Serialize(GetTestConnection());
+            var deserializedConnections = _deserializer.Deserialize(csv);
+            var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
+            var propertyValue = typeof(ConnectionInfo).GetProperty(propertyToCheck)?.GetValue(connection);
+            return propertyValue;
+        }
+
+        [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.InheritanceTestCases))]
+        public object InheritancePropertiesDeserializedCorrectly(string propertyToCheck)
+        {
+            var csv = _serializer.Serialize(GetTestConnectionWithAllInherited());
+            var deserializedConnections = _deserializer.Deserialize(csv);
+            var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
+            connection?.RemoveParent();
+            var propertyValue = typeof(ConnectionInfoInheritance).GetProperty(propertyToCheck)?.GetValue(connection?.Inheritance);
+            return propertyValue;
+        }
+
+        [Test]
+        public void TreeStructureDeserializedCorrectly()
+        {
+            //Root
+            // |- folder1
+            // |   |- Con1
+            // |- Con2
+            var treeModel = new ConnectionTreeModelBuilder().Build();
+            var csv = _serializer.Serialize(treeModel);
+            var deserializedConnections = _deserializer.Deserialize(csv);
+            var con1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "Con1");
+            var folder1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "folder1");
+            Assert.That(con1.Parent, Is.EqualTo(folder1));
+        }
+
+        internal static ConnectionInfo GetTestConnection()
+        {
+            return new ConnectionInfo
+            {
+                Name = "SomeName",
+                Description = "SomeDescription",
+                Icon = "SomeIcon",
+                Panel = "SomePanel",
+                Username = "SomeUsername",
+                Password = "SomePassword",
+                Domain = "SomeDomain",
+                Hostname = "SomeHostname",
+                PuttySession = "SomePuttySession",
+                LoadBalanceInfo = "SomeLoadBalanceInfo",
+                PreExtApp = "SomePreExtApp",
+                PostExtApp = "SomePostExtApp",
+                MacAddress = "SomeMacAddress",
+                UserField = "SomeUserField",
+                Favorite = true,
+                ExtApp = "SomeExtApp",
+                VNCProxyUsername = "SomeVNCProxyUsername",
+                VNCProxyPassword = "SomeVNCProxyPassword",
+                RDGatewayUsername = "SomeRDGatewayUsername",
+                RDGatewayPassword = "SomeRDGatewayPassword",
+                RDGatewayDomain = "SomeRDGatewayDomain",
+                VNCProxyIP = "SomeVNCProxyIP",
+                RDGatewayHostname = "SomeRDGatewayHostname",
+                Protocol = ProtocolType.ICA,
+                Port = 999,
+                UseConsoleSession = true,
+                UseCredSsp = true,
+                RenderingEngine = HTTPBase.RenderingEngine.Gecko,
+                ICAEncryptionStrength = IcaProtocol.EncryptionStrength.Encr40Bit,
+                RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth,
+                Colors = RdpProtocol.RDPColors.Colors16Bit,
+                Resolution = RdpProtocol.RDPResolutions.Res1366x768,
+                AutomaticResize = true,
+                DisplayWallpaper = true,
+                DisplayThemes = true,
+                EnableFontSmoothing = true,
+                EnableDesktopComposition = true,
+                CacheBitmaps = true,
+                RedirectDiskDrives = true,
+                RedirectPorts = true,
+                RedirectPrinters = true,
+                RedirectSmartCards = true,
+                RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer,
+                RedirectAudioCapture = true,
+                RedirectKeys = true,
+                VNCCompression = ProtocolVNC.Compression.Comp4,
+                VNCEncoding = ProtocolVNC.Encoding.EncRRE,
+                VNCAuthMode = ProtocolVNC.AuthMode.AuthVNC,
+                VNCProxyType = ProtocolVNC.ProxyType.ProxySocks5,
+                VNCProxyPort = 123,
+                VNCColors = ProtocolVNC.Colors.Col8Bit,
+                VNCSmartSizeMode = ProtocolVNC.SmartSizeMode.SmartSAspect,
+                VNCViewOnly = true,
+                RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Detect,
+                RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard
+            };
+        }
+
+        internal static ConnectionInfo GetTestConnectionWithAllInherited()
+        {
+            var connectionInfo = new ConnectionInfo();
+            connectionInfo.Inheritance.TurnOnInheritanceCompletely();
+            return connectionInfo;
+        }
+
+        private class DeserializationTestSource
+        {
+            public static IEnumerable ConnectionPropertyTestCases()
+            {
+                var ignoreProperties = new[]
+                {
+                    nameof(ConnectionInfo.Inheritance),
+                    nameof(ConnectionInfo.ConstantID),
+                    nameof(ConnectionInfo.Parent)
+                };
+                var properties = typeof(ConnectionInfo)
+                    .GetProperties()
+                    .Where(property => !ignoreProperties.Contains(property.Name));
+                var testCases = new List<TestCaseData>();
+                var testConnectionInfo = GetTestConnection();
+
+                foreach (var property in properties)
+                {
+                    testCases.Add(
+                        new TestCaseData(property.Name)
+                        .Returns(property.GetValue(testConnectionInfo)));
+                }
+
+                return testCases;
+            }
+
+            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;
+
+                foreach (var property in properties)
+                {
+                    testCases.Add(
+                        new TestCaseData(property.Name)
+                            .Returns(property.GetValue(testInheritance)));
+                }
+
+                return testCases;
+            }
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNGTests.TestHelpers;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
+{
+	public class CsvConnectionsSerializerMremotengFormatTests
+    {
+        private ICredentialRepositoryList _credentialRepositoryList;
+        private const string ConnectionName = "myconnection";
+        private const string Username = "myuser";
+        private const string Domain = "mydomain";
+        private const string Password = "mypass123";
+
+        [OneTimeSetUp]
+        public void OneTimeSetup()
+        {
+            var credRecord = Substitute.For<ICredentialRecord>();
+            credRecord.Username.Returns(Username);
+            credRecord.Domain.Returns(Domain);
+            credRecord.Password.Returns(Password.ConvertToSecureString());
+            _credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
+            _credentialRepositoryList.GetCredentialRecord(new Guid()).ReturnsForAnyArgs(credRecord);
+        }
+
+        [Test]
+        public void SerializesNodeId()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var connectionInfo = BuildConnectionInfo();
+            var csv = serializer.Serialize(connectionInfo);
+            Assert.That(csv, Does.Match(connectionInfo.ConstantID));
+        }
+
+        [Test]
+        public void DoesntSerializeTheRootNode()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var treeModel = new ConnectionTreeModelBuilder().Build();
+            var csv = serializer.Serialize(treeModel);
+            Assert.That(csv, Does.Not.Match($"{treeModel.RootNodes[0].ConstantID};.*;{TreeNodeType.Root}"));
+        }
+
+        [TestCase(Username)]
+        [TestCase(Domain)]
+        [TestCase(Password)]
+        [TestCase("InheritColors")]
+        public void CreatesCsv(string valueThatShouldExist)
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var connectionInfo = BuildConnectionInfo();
+            var csv = serializer.Serialize(connectionInfo);
+            Assert.That(csv, Does.Match(valueThatShouldExist));
+        }
+
+        [TestCase(Username)]
+        [TestCase(Domain)]
+        [TestCase(Password)]
+        [TestCase("InheritColors")]
+        public void SerializerRespectsSaveFilterSettings(string valueThatShouldntExist)
+        {
+            var saveFilter = new SaveFilter(true);
+            var serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter, _credentialRepositoryList);
+            var connectionInfo = BuildConnectionInfo();
+            var csv = serializer.Serialize(connectionInfo);
+            Assert.That(csv, Does.Not.Match(valueThatShouldntExist));
+        }
+
+        [Test]
+        public void CanSerializeEmptyConnectionInfo()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var connectionInfo = new ConnectionInfo();
+            var csv = serializer.Serialize(connectionInfo);
+            Assert.That(csv, Is.Not.Empty);
+        }
+
+        [Test]
+        public void CantPassNullToConstructor()
+        {
+            Assert.Throws<ArgumentNullException>(() => new CsvConnectionsSerializerMremotengFormat(null, _credentialRepositoryList));
+        }
+
+        [Test]
+        public void CantPassNullToSerializeConnectionInfo()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            Assert.Throws<ArgumentNullException>(() => serializer.Serialize((ConnectionInfo)null));
+        }
+
+        [Test]
+        public void CantPassNullToSerializeConnectionTreeModel()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            Assert.Throws<ArgumentNullException>(() => serializer.Serialize((ConnectionTreeModel)null));
+        }
+
+        [Test]
+        public void FoldersAreSerialized()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var container = BuildContainer();
+            var csv = serializer.Serialize(container);
+            Assert.That(csv, Does.Match(container.Name));
+            Assert.That(csv, Does.Match(container.Username));
+            Assert.That(csv, Does.Match(container.Domain));
+            Assert.That(csv, Does.Match(container.Password));
+            Assert.That(csv, Does.Contain(TreeNodeType.Container.ToString()));
+        }
+
+        [Test]
+        public void SerializationIncludesRawInheritedValuesIfObjectInheritsFromParentOutsideOfSerializationScope()
+        {
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var treeModel = new ConnectionTreeModelBuilder().Build();
+            var serializationTarget = treeModel.GetRecursiveChildList().First(info => info.Name == "folder3");
+            var csv = serializer.Serialize(serializationTarget);
+            var lineWithFolder3 = csv.Split(new[] {Environment.NewLine}, StringSplitOptions.None).First(s => s.Contains(serializationTarget.Name));
+            Assert.That(lineWithFolder3, Does.Contain(serializationTarget.Username));
+            Assert.That(lineWithFolder3, Does.Contain(serializationTarget.Domain));
+            Assert.That(lineWithFolder3, Does.Contain(serializationTarget.Password));
+        }
+
+        private ConnectionInfo BuildConnectionInfo()
+        {
+            return new ConnectionInfo
+            {
+                Name = ConnectionName,
+				Username = Username,
+				Domain = Domain,
+				Password = Password,
+                Inheritance = {Colors = true}
+            };
+        }
+
+        private ContainerInfo BuildContainer()
+        {
+            return new ContainerInfo
+            {
+                Name = "MyFolder",
+                Username = "BlahBlah1",
+                Domain = "aklkskkksh8",
+                Password = "qweraslkdjf87"
+            };
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs
@@ -0,0 +1,100 @@
+using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Connection;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
+{
+    public class ValidateXmlSchemas
+    {
+        private XmlConnectionsSerializer _serializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        private ICryptographyProvider _cryptographyProvider;
+        private XmlReaderSettings _xmlReaderSettings;
+
+        [SetUp]
+        public void Setup()
+        {
+            _connectionTreeModel = new ConnectionTreeModel();
+            var root = new RootNodeInfo(RootNodeType.Connection);
+            root.AddChild(new ConnectionInfo());
+            _connectionTreeModel.AddRootNode(root);
+
+            _cryptographyProvider = new AeadCryptographyProvider();
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                _cryptographyProvider,
+                _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
+                new SaveFilter());
+            _serializer = new XmlConnectionsSerializer(_cryptographyProvider, connectionNodeSerializer);
+            _xmlReaderSettings = new XmlReaderSettings
+            {
+                ValidationType = ValidationType.Schema,
+                ValidationFlags = XmlSchemaValidationFlags.ProcessInlineSchema |
+                                  XmlSchemaValidationFlags.ProcessSchemaLocation |
+                                  XmlSchemaValidationFlags.ReportValidationWarnings
+            };
+        }
+
+        [Test]
+        public void ValidateSchema()
+        {
+            var sb = new StringBuilder();
+            var xml = _serializer.Serialize(_connectionTreeModel);
+
+            var schemaFileName = $"mremoteng_confcons_v{_serializer.Version.Major}_{_serializer.Version.Minor}.xsd";
+            var schemaFile = GetTargetPath(schemaFileName);
+            _xmlReaderSettings.Schemas.Add("http://mremoteng.org", schemaFile);
+            _xmlReaderSettings.ValidationEventHandler += (sender, args) =>
+            {
+                sb.AppendLine($"{args.Severity}: {args.Message}");
+            };
+
+            using (var stream = GenerateStreamFromString(xml))
+            {
+                var reader = XmlReader.Create(stream, _xmlReaderSettings);
+                while (reader.Read()) ;
+            }
+
+            Assert.That(sb.ToString(), Is.Empty);
+        }
+
+        public string GetTargetPath(string fileName, [CallerFilePath] string sourceFilePath = "")
+        {
+            const string debugOrRelease =
+#if DEBUG
+                "Debug";
+#else
+				"Release";
+#endif
+
+            const string normalOrPortable =
+#if PORTABLE
+                " Portable";
+#else
+            "";
+#endif
+            var path = Path.GetDirectoryName(sourceFilePath);
+            var filePath = $@"{path}\..\..\..\..\bin\{debugOrRelease}{normalOrPortable}\Schemas\{fileName}";
+            return filePath;
+        }
+
+        private Stream GenerateStreamFromString(string s)
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            writer.Write(s);
+            writer.Flush();
+            stream.Position = 0;
+            return stream;
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -9,7 +9,7 @@ using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;

-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
    public class XmlConnectionsDeserializerTests
    {
@@ -18,8 +18,8 @@ namespace mRemoteNGTests.Config.Serializers

        public void Setup(string confCons, string password)
        {
-            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(confCons, password.ConvertToSecureString);
-            _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize();
+            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(() => password.ConvertToSecureString());
+            _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize(confCons);
        }

        [TearDown]
@@ -104,6 +104,14 @@ namespace mRemoteNGTests.Config.Serializers
            Assert.That(folder22.Inheritance.Username, Is.True);
        }

+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void ExpandedPropertyGetsDeserialized(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var folder1 = GetFolderNamed("Folder1", _connectionTreeModel.GetRecursiveChildList());
+            Assert.That(folder1.IsExpanded, Is.True);
+        }
+
        private bool ContainsNodeNamed(string name, IEnumerable<ConnectionInfo> list)
        {
            return list.Any(node => node.Name == name);
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs
@@ -1,14 +1,15 @@
-using System.Xml.XPath;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
+using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
+using System.Linq;
+using System.Xml.XPath;

-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
    public class XmlConnectionsDocumentCompilerTests
    {
@@ -27,23 +28,26 @@ namespace mRemoteNGTests.Config.Serializers
        [SetUp]
        public void Setup()
        {
-            _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            var saveFilter = new SaveFilter();
-            _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, saveFilter);
            _connectionTreeModel = SetupConnectionTreeModel();
+            _cryptographyProvider = new CryptoProviderFactory(BlockCipherEngines.AES, BlockCipherModes.GCM).Build();
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                _cryptographyProvider, 
+                _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
+                new SaveFilter());
+            _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, connectionNodeSerializer);
        }

        [Test]
        public void XDocumentHasXmlDeclaration()
        {
-            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false);
            Assert.That(xdoc.Declaration, Is.Not.Null);
        }

        [Test]
        public void DocumentHasRootConnectionElement()
        {
-            var xdoc =_documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var xdoc =_documentCompiler.CompileDocument(_connectionTreeModel, false);
            var rootElementName = xdoc.Root?.Name.LocalName;
            Assert.That(rootElementName, Is.EqualTo("Connections"));
        }
@@ -51,7 +55,7 @@ namespace mRemoteNGTests.Config.Serializers
        [Test]
        public void ConnectionNodesSerializedRecursively()
        {
-            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false);
            var con4 = xdoc.Root?.XPathSelectElement("Node[@Name='folder2']/Node[@Name='folder3']/Node[@Name='con4']");
            Assert.That(con4, Is.Not.Null);
        }
@@ -59,7 +63,7 @@ namespace mRemoteNGTests.Config.Serializers
        [Test]
        public void XmlContentEncryptedWhenFullFileEncryptionTurnedOn()
        {
-            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, true, false);
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, true);
            var rootElementValue = xdoc.Root?.Value;
            Assert.That(rootElementValue, Is.Not.EqualTo(string.Empty));
        }
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs
@@ -1,14 +1,15 @@
-using System.Xml.Linq;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
+using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
+using System.Linq;
+using System.Xml.Linq;

-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
    public class XmlConnectionsDocumentEncryptorTests
    {
@@ -19,9 +20,12 @@ namespace mRemoteNGTests.Config.Serializers
        public void Setup()
        {
            var connectionTreeModel = SetupConnectionTreeModel();
-            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            var saveFilter = new SaveFilter();
-            _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider, saveFilter).CompileDocument(connectionTreeModel, false, false);
+            var cryptoProvider = new CryptoProviderFactory(BlockCipherEngines.AES, BlockCipherModes.GCM).Build();
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                cryptoProvider, 
+                connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
+                new SaveFilter());
+            _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider, connectionNodeSerializer).CompileDocument(connectionTreeModel, false);
            _documentEncryptor = new XmlConnectionsDocumentEncryptor(cryptoProvider);
        }

--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs
@@ -1,6 +1,4 @@
-using System.Xml;
-using System.Xml.Linq;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -8,22 +6,29 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;

-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
    public class XmlConnectionsSerializerTests
    {
        private XmlConnectionsSerializer _serializer;
        private ConnectionTreeModel _connectionTreeModel;
+        private ICryptographyProvider _cryptographyProvider;
        

        [SetUp]
        public void Setup()
        {
-            var encryptor = new AeadCryptographyProvider();
-            _serializer = new XmlConnectionsSerializer(encryptor);
            _connectionTreeModel = SetupConnectionTreeModel();
+            _cryptographyProvider = new AeadCryptographyProvider();
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                _cryptographyProvider, 
+                _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
+                new SaveFilter());
+            _serializer = new XmlConnectionsSerializer(_cryptographyProvider, connectionNodeSerializer);
        }

        [Test]
@@ -50,19 +55,20 @@ namespace mRemoteNGTests.Config.Serializers
        [TestCase("Username", "")]
        [TestCase("Domain", "")]
        [TestCase("Password", "")]
-        [TestCase("InheritAutomaticResize", "False")]
+        [TestCase("InheritAutomaticResize", "false")]
        public void SerializerRespectsSaveFilterSettings(string attributeName, string expectedValue)
        {
-            _serializer.SaveFilter = new SaveFilter(true);
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                _cryptographyProvider,
+                _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
+                new SaveFilter(true));
+            var serializer = new XmlConnectionsSerializer(_cryptographyProvider, connectionNodeSerializer);
            var connectionInfo = new ConnectionInfo
            {
                Name = "myConnection",
-                Username = "somefilteredstuff",
-                Domain = "somefilteredstuff",
-                Password = "somefilteredstuff",
                Inheritance = {AutomaticResize = true}
            };
-            var serializedConnections = _serializer.Serialize(connectionInfo);
+            var serializedConnections = serializer.Serialize(connectionInfo);
            var xdoc = XDocument.Parse(serializedConnections);
            var attributeValue = xdoc.Root?.Element("Node")?.Attribute(attributeName)?.Value;
            Assert.That(attributeValue, Is.EqualTo(expectedValue));
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs
@@ -1,20 +1,21 @@
 using System;
 using System.Collections;
 using System.Xml.Linq;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Security;
+using mRemoteNG.Security.Factories;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;

-
-namespace mRemoteNGTests.Config.Serializers
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
-    public class XmlRootNodeSerializerTests
+	public class XmlRootNodeSerializerTests
    {
        private XmlRootNodeSerializer _rootNodeSerializer;
        private ICryptographyProvider _cryptographyProvider;
        private RootNodeInfo _rootNodeInfo;
+        private Version _version;

        [SetUp]
        public void Setup()
@@ -22,37 +23,30 @@ namespace mRemoteNGTests.Config.Serializers
            _rootNodeSerializer = new XmlRootNodeSerializer();
            _cryptographyProvider = new AeadCryptographyProvider();
            _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
+            _version = new Version(99, 1);
        }

        [Test]
        public void RootElementNamedConnections()
        {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
            Assert.That(element.Name.LocalName, Is.EqualTo("Connections"));
        }

        [Test]
+		[SetUICulture("en-US")]
        public void RootNodeInfoNameSerialized()
        {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
            var attributeValue = element.Attribute(XName.Get("Name"))?.Value;
            Assert.That(attributeValue, Is.EqualTo("Connections"));
        }

-        [TestCase(true)]
-        [TestCase(false)]
-        public void ExportValueSerialized(bool export)
-        {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, export:export);
-            var attributeValue = element.Attribute(XName.Get("Export"))?.Value;
-            Assert.That(attributeValue, Is.EqualTo(export.ToString()));
-        }
-
        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
        public void EncryptionEngineSerialized(BlockCipherEngines engine, BlockCipherModes mode)
        {
-            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
+            var cryptoProvider = new CryptoProviderFactory(engine, mode).Build();
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider, _version);
            var attributeValue = element.Attribute(XName.Get("EncryptionEngine"))?.Value;
            Assert.That(attributeValue, Is.EqualTo(engine.ToString()));
        }
@@ -60,8 +54,8 @@ namespace mRemoteNGTests.Config.Serializers
        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
        public void EncryptionModeSerialized(BlockCipherEngines engine, BlockCipherModes mode)
        {
-            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
+            var cryptoProvider = new CryptoProviderFactory(engine, mode).Build();
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider, _version);
            var attributeValue = element.Attribute(XName.Get("BlockCipherMode"))?.Value;
            Assert.That(attributeValue, Is.EqualTo(mode.ToString()));
        }
@@ -73,7 +67,7 @@ namespace mRemoteNGTests.Config.Serializers
        public void KdfIterationsSerialized(int iterations)
        {
            _cryptographyProvider.KeyDerivationIterations = iterations;
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
            var attributeValue = element.Attribute(XName.Get("KdfIterations"))?.Value;
            Assert.That(attributeValue, Is.EqualTo(iterations.ToString()));
        }
@@ -82,9 +76,9 @@ namespace mRemoteNGTests.Config.Serializers
        [TestCase(false)]
        public void FullFileEncryptionFlagSerialized(bool fullFileEncryption)
        {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, fullFileEncryption);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version, fullFileEncryption);
            var attributeValue = element.Attribute(XName.Get("FullFileEncryption"))?.Value;
-            Assert.That(attributeValue, Is.EqualTo(fullFileEncryption.ToString()));
+            Assert.That(bool.Parse(attributeValue), Is.EqualTo(fullFileEncryption));
        }

        [TestCase("", "ThisIsNotProtected")]
@@ -94,29 +88,19 @@ namespace mRemoteNGTests.Config.Serializers
        public void ProtectedStringSerialized(string customPassword, string expectedPlainText)
        {
            _rootNodeInfo.PasswordString = customPassword;
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
            var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
            var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.PasswordString.ConvertToSecureString());
            Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
        }

-        [TestCase("", "ThisIsNotProtected")]
-        [TestCase("customPassword1", "ThisIsNotProtected")]
-        public void EncryptWithDefaultPasswordWhenExporting(string customPassword, string expectedPlainText)
-        {
-            _rootNodeInfo.PasswordString = customPassword;
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, export:true);
-            var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
-            var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.DefaultPassword.ConvertToSecureString());
-            Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
-        }
-
        [Test]
        public void ConfVersionSerialized()
        {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
-            var attributeValue = element.Attribute(XName.Get("ConfVersion"))?.Value;
-            Assert.That(attributeValue, Is.EqualTo("2.6"));
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
+            var attributeValue = element.Attribute(XName.Get("ConfVersion"))?.Value ?? "";
+            var confVersion = Version.Parse(attributeValue);
+            Assert.That(confVersion, Is.EqualTo(_version));
        }

        private class TestCaseSources
--- a/mRemoteNGTests/Config/Serializers/CredentialProviderSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/CredentialProviderSerializerTests.cs
@@ -0,0 +1,37 @@
+using System;
+using mRemoteNG.Config.Serializers.CredentialProviderSerializer;
+using mRemoteNG.Credential;
+using NSubstitute;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class CredentialProviderSerializerTests
+    {
+        private CredentialRepositoryListSerializer _credentialProviderSerializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            _credentialProviderSerializer = new CredentialRepositoryListSerializer();
+        }
+
+        private ICredentialRepository InitializeMockProvider()
+        {
+            var provider = Substitute.For<ICredentialRepository>();
+            provider.Config.TypeName.Returns("ProviderName");
+            provider.Config.Id.Returns(Guid.NewGuid());
+            return provider;
+        }
+
+        [Test]
+        public void SerializeExists()
+        {
+            var mockProvider = InitializeMockProvider();
+            var providers = new[] { mockProvider };
+            var serializedContent = _credentialProviderSerializer.Serialize(providers);
+            Assert.That(serializedContent, Is.Not.Null);
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialPasswordDecryptorDecoratorTests.cs
+++ b/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialPasswordDecryptorDecoratorTests.cs
@@ -0,0 +1,51 @@
+using System.Linq;
+using System.Security;
+using mRemoteNG.Config.Serializers.CredentialSerializer;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
+{
+    public class XmlCredentialPasswordDecryptorDecoratorTests
+    {
+        private XmlCredentialPasswordDecryptorDecorator _sut;
+        private readonly SecureString _decryptionKey = "myKey1".ConvertToSecureString();
+        private string _unencryptedPassword = "myPassword1";
+
+        [SetUp]
+        public void Setup()
+        {
+            var baseDeserializer = new XmlCredentialRecordDeserializer();
+            _sut = new XmlCredentialPasswordDecryptorDecorator(baseDeserializer);
+        }
+
+        [Test]
+        public void OutputedCredentialHasDecryptedPassword()
+        {
+            var xml = GenerateCredentialXml();
+            var output = _sut.Deserialize(xml, _decryptionKey);
+            Assert.That(output.First().Password.ConvertToUnsecureString(), Is.EqualTo(_unencryptedPassword));
+        }
+
+        [Test]
+        public void DecryptionThrowsExceptionWhenAuthHeaderNotFound()
+        {
+            var xml = GenerateCredentialXml(false);
+            Assert.Throws<EncryptionException>(() => _sut.Deserialize(xml, _decryptionKey));
+        }
+
+
+        private string GenerateCredentialXml(bool includeAuthHeader = true)
+        {
+            var cryptoProvider = new AeadCryptographyProvider();
+            var authHeader = includeAuthHeader ? $"Auth=\"{cryptoProvider.Encrypt("someheader", _decryptionKey)}\"" : "";
+            var encryptedPassword = cryptoProvider.Encrypt(_unencryptedPassword, _decryptionKey);
+            return
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                $"<Credentials EncryptionEngine=\"{cryptoProvider.CipherEngine}\" BlockCipherMode=\"{cryptoProvider.CipherMode}\" KdfIterations=\"{cryptoProvider.KeyDerivationIterations}\" {authHeader} SchemaVersion=\"1.0\">" +
+                    $"<Credential Id=\"ce6b0397-d476-4ffe-884b-dbe9347a88a8\" Title=\"New Credential\" Username=\"asdfasdf\" Domain=\"\" Password=\"{encryptedPassword}\" />" +
+                "</Credentials>";
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialPasswordEncryptorDecoratorTests.cs
+++ b/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialPasswordEncryptorDecoratorTests.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.CredentialSerializer;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
+{
+    public class XmlCredentialPasswordEncryptorDecoratorTests
+    {
+        private XmlCredentialPasswordEncryptorDecorator _sut;
+        private const BlockCipherEngines CipherEngine = BlockCipherEngines.Twofish;
+        private const BlockCipherModes CipherMode = BlockCipherModes.EAX;
+        private const int KdfIterations = 2000;
+        private SecureString _key = "myKey1".ConvertToSecureString();
+
+        [SetUp]
+        public void Setup()
+        {
+            var cryptoProvider = SetupCryptoProvider();
+            var baseSerializer = SetupBaseSerializer();
+            _sut = new XmlCredentialPasswordEncryptorDecorator(cryptoProvider, baseSerializer);
+        }
+
+
+        [Test]
+        public void CantPassNullCredentialList()
+        {
+            Assert.Throws<ArgumentNullException>(() => _sut.Serialize(null, new SecureString()));
+        }
+
+        [Test]
+        public void EncryptsPasswordAttributesInXml()
+        {
+            var credList = Substitute.For<IEnumerable<ICredentialRecord>>();
+            var output = _sut.Serialize(credList, _key);
+            var outputAsXdoc = XDocument.Parse(output);
+            var firstElementPassword = outputAsXdoc.Root?.Descendants().First().FirstAttribute.Value;
+            Assert.That(firstElementPassword, Is.EqualTo("encrypted"));
+        }
+
+        [TestCase("EncryptionEngine", CipherEngine)]
+        [TestCase("BlockCipherMode", CipherMode)]
+        [TestCase("KdfIterations", KdfIterations)]
+        [TestCase("Auth", "encrypted")]
+        public void SetsRootNodeEncryptionAttributes(string attributeName, object expectedValue)
+        {
+            var credList = Substitute.For<IEnumerable<ICredentialRecord>>();
+            var output = _sut.Serialize(credList, _key);
+            var outputAsXdoc = XDocument.Parse(output);
+            var authField = outputAsXdoc.Root?.Attribute(attributeName)?.Value;
+            Assert.That(authField, Is.EqualTo(expectedValue.ToString()));
+        }
+
+        private ISerializer<IEnumerable<ICredentialRecord>, string> SetupBaseSerializer()
+        {
+            var baseSerializer = Substitute.For<ISerializer<IEnumerable<ICredentialRecord>, string>>();
+            var randomString = Guid.NewGuid().ToString();
+            baseSerializer.Serialize(null).ReturnsForAnyArgs(
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                "<Root>" +
+                    $"<Element1 Password=\"{randomString}\" />" +
+                    $"<Element1 Password=\"{randomString}\">" +
+                        $"<Element1 Password=\"{randomString}\" />" +
+                    "</Element1>" +
+                "</Root>");
+            return baseSerializer;
+        }
+
+        private ICryptographyProvider SetupCryptoProvider()
+        {
+            var cryptoProvider = Substitute.For<ICryptographyProvider>();
+            cryptoProvider.CipherEngine.Returns(CipherEngine);
+            cryptoProvider.CipherMode.Returns(CipherMode);
+            cryptoProvider.KeyDerivationIterations.Returns(KdfIterations);
+            cryptoProvider.Encrypt(null, null).ReturnsForAnyArgs("encrypted");
+            return cryptoProvider;
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialRecordDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialRecordDeserializerTests.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Linq;
+using mRemoteNG.Config.Serializers.CredentialSerializer;
+using mRemoteNG.Security;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
+{
+    public class XmlCredentialRecordDeserializerTests
+    {
+        private XmlCredentialRecordDeserializer _deserializer;
+        private readonly Guid _id = Guid.NewGuid();
+        private const string Title = "sometitle";
+        private const string Username = "myusername";
+        private const string Domain = "mydomain";
+        private const string PlaintextPassword = "mypassword";
+
+
+        [SetUp]
+        public void Setup()
+        {
+            _deserializer = new XmlCredentialRecordDeserializer();
+        }
+
+        [Test]
+        public void HasCorrectId()
+        {
+            var xml = GenerateXml();
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.First().Id, Is.EqualTo(_id));
+        }
+
+        [Test]
+        public void HasCorrectTitle()
+        {
+            var xml = GenerateXml();
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.First().Title, Is.EqualTo(Title));
+        }
+
+        [Test]
+        public void HasCorrectUsername()
+        {
+            var xml = GenerateXml();
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.First().Username, Is.EqualTo(Username));
+        }
+
+        [Test]
+        public void HasCorrectDomain()
+        {
+            var xml = GenerateXml();
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.First().Domain, Is.EqualTo(Domain));
+        }
+
+        [Test]
+        public void HasCorrectPassword()
+        {
+            var xml = GenerateXml();
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.First().Password.ConvertToUnsecureString(), Is.EqualTo(PlaintextPassword));
+        }
+
+        [Test]
+        public void DeserializesAllCredentials()
+        {
+            var xml = GenerateXml();
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.Count(), Is.EqualTo(2));
+        }
+
+        [Test]
+        public void CanDecryptNonStandardEncryptions()
+        {
+            var xml = GenerateXml(BlockCipherEngines.Serpent, BlockCipherModes.EAX, 3000);
+            var creds = _deserializer.Deserialize(xml);
+            Assert.That(creds.First().Password.ConvertToUnsecureString(), Is.EqualTo(PlaintextPassword));
+        }
+
+
+        private string GenerateXml(BlockCipherEngines engine = BlockCipherEngines.AES, BlockCipherModes mode = BlockCipherModes.GCM, int interations = 1000)
+        {
+            return $"<Credentials EncryptionEngine=\"{engine}\" BlockCipherMode=\"{mode}\" KdfIterations=\"{interations}\" SchemaVersion=\"1.0\">" +
+                        $"<Credential Id=\"{_id}\" Title=\"{Title}\" Username=\"{Username}\" Domain=\"{Domain}\" Password=\"{PlaintextPassword}\" />" +
+                        $"<Credential Id=\"{Guid.NewGuid()}\" Title=\"{Title}\" Username=\"{Username}\" Domain=\"{Domain}\" Password=\"{PlaintextPassword}\" />" +
+                    "</Credentials>";
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialSerializerTests.cs
@@ -0,0 +1,49 @@
+using mRemoteNG.Config.Serializers.CredentialSerializer;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using NUnit.Framework;
+using System;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
+{
+    public class XmlCredentialSerializerTests
+    {
+        private XmlCredentialRecordSerializer _serializer;
+        private ICredentialRecord _cred1;
+
+        [SetUp]
+        public void Setup()
+        {
+            _serializer = new XmlCredentialRecordSerializer();
+            _cred1 = new CredentialRecord { Title = "testcred", Username = "davids", Domain = "mydomain", Password = "mypass".ConvertToSecureString() };
+        }
+
+        [Test]
+        public void ProducesValidXml()
+        {
+            var serialized = _serializer.Serialize(new[] { _cred1 });
+            // ReSharper disable once ReturnValueOfPureMethodIsNotUsed
+            Assert.DoesNotThrow(() => XDocument.Parse(serialized));
+        }
+
+        [Test]
+        public void AllCredentialsSerialized()
+        {
+            var cred2 = new CredentialRecord { Title = "testcred2", Username = "admin", Domain = "otherdomain", Password = "somepass".ConvertToSecureString() };
+            var serialized = _serializer.Serialize(new[] { _cred1, cred2 });
+            var serializedCount = XDocument.Parse(serialized).Descendants("Credential").Count();
+            Assert.That(serializedCount, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void IncludesSchemaVersionParameter()
+        {
+            var serialized = _serializer.Serialize(new[] { _cred1 });
+            var xdoc = XDocument.Parse(serialized);
+            var version = Version.Parse(xdoc.Root?.Attribute("SchemaVersion")?.Value ?? "");
+            Assert.That(version, Is.EqualTo(_serializer.Version));
+        }
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<Playlist Version="1.0"><Add Test="mRemoteNGTests.UI.WindowListTests.TestMethod1" /><Add Test="mRemoteNGTests.UI.WindowListTests.AddWindowToList" /><Add Test="mRemoteNGTests.UI.WindowListTests.CountReturnsCorrectNumber" /></Playlist>`