Hide unimplemented File->Import/Export Folder menu item.

Updated BUILD.CMD and CHANGELOG.TXT for 1.67 RC5.
Changed header, removed footer, and added command line to the log file.
2026-02-18 06:21:41 +08:00 · 2011-06-05 12:40:20 -05:00 · 2011-06-05 12:14:18 -05:00 · 2011-06-05 12:06:36 -05:00 · 2011-06-05 12:06:07 -05:00 · 2011-06-05 12:04:53 -05:00
15 changed files with 385 additions and 271 deletions
--- a/BUILD.CMD
+++ b/BUILD.CMD
@@ -1,6 +1,6 @@
@echo off

-SET VERSIONTAG=RC4
+SET VERSIONTAG=RC5

 SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 SET DEVENV="devenv.exe"
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -4,6 +4,7 @@ Imports Crownwood
 Imports System.Threading
 Imports System.Xml
 Imports System.Environment
+Imports System.Management

 Namespace App
    Public Class Runtime
@@ -148,7 +149,7 @@ Namespace App

            Public Shared Sub ShowUpdatesTab()
                Windows.optionsForm = New frmOptions(Windows.optionsPanel)
-                Windows.optionsForm.Show(frmMain.pnlDock, 4)
+                Windows.optionsForm.Show(frmMain.pnlDock, 5)
            End Sub
        End Class

@@ -247,8 +248,29 @@ Namespace App

            Public Shared Sub CreateLogger()
                log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemoteNG.exe.config"))
-
                log = log4net.LogManager.GetLogger("mRemoteNG.Log")
+                log.InfoFormat("{0} started.", My.Application.Info.ProductName)
+                log.InfoFormat("Command Line: {0}", Environment.GetCommandLineArgs)
+                Try
+                    Dim servicePack As Integer
+                    For Each managementObject As ManagementObject In New ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem").Get()
+                        servicePack = managementObject.GetPropertyValue("ServicePackMajorVersion")
+                        If servicePack = 0 Then
+                            log.InfoFormat("{0} {1}", managementObject.GetPropertyValue("Caption").Trim, managementObject.GetPropertyValue("OSArchitecture"))
+                        Else
+                            log.InfoFormat("{0} Service Pack {1} {2}", managementObject.GetPropertyValue("Caption").Trim, servicePack.ToString, managementObject.GetPropertyValue("OSArchitecture"))
+                        End If
+                    Next
+                Catch ex As Exception
+                    log.WarnFormat("Error retrieving operating system information from WMI. {0}", ex.Message)
+                End Try
+                log.InfoFormat("Microsoft .NET Framework {0}", System.Environment.Version.ToString)
+#If Not PORTABLE Then
+                log.InfoFormat("{0} {1}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString)
+#Else
+                log.InfoFormat("{0} {1} {2}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString, My.Resources.strLabelPortableEdition)
+#End If
+                log.InfoFormat("System Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName)
            End Sub

            Public Shared Sub UpdateCheck()
--- a/mRemoteV1/CHANGELOG.TXT
+++ b/mRemoteV1/CHANGELOG.TXT
@@ -1,4 +1,4 @@
-1.67 (2011-06-01):
+1.67 (2011-06-05):
  Fixed migration of external tools configuration and panel layout from Local to Roaming folder.
  Disable ICA Hotkeys for Citrix connections.  Fixes issue with international users.
  Added a language selection option so users can override the language if they don't want it automatically detected.
@@ -26,6 +26,8 @@
  Improved Reset Layout function.
  Changed to use full four part version numbers with major, minor, build, and revision.
  Changed hard coded SQL database name into a user configurable setting.
+  Fixed tab order of controls in Options dialog.
+  Fixed bug 45 - Changing some settings in the config file may not save.

 1.66 (2011-05-02):
  Fixed connections not working
--- a/mRemoteV1/Config/Config.Connections.Load.vb
+++ b/mRemoteV1/Config/Config.Connections.Load.vb
@@ -434,8 +434,6 @@ Namespace Config
                        conI.Domain = .Item("DomainName")
                        conI.DisplayWallpaper = .Item("DisplayWallpaper")
                        conI.DisplayThemes = .Item("DisplayThemes")
-                        conI.EnableFontSmoothing = .Item("EnableFontSmoothing")
-                        conI.EnableDesktopComposition = .Item("EnableDesktopComposition")
                        conI.CacheBitmaps = .Item("CacheBitmaps")
                        conI.UseConsoleSession = .Item("ConnectToConsole")

@@ -459,8 +457,6 @@ Namespace Config
                        conI.Inherit.Description = .Item("InheritDescription")
                        conI.Inherit.DisplayThemes = .Item("InheritDisplayThemes")
                        conI.Inherit.DisplayWallpaper = .Item("InheritDisplayWallpaper")
-                        conI.Inherit.EnableFontSmoothing = .Item("InheritEnableFontSmoothing")
-                        conI.Inherit.EnableDesktopComposition = .Item("InheritEnableDesktopComposition")
                        conI.Inherit.Domain = .Item("InheritDomain")
                        conI.Inherit.Icon = .Item("InheritIcon")
                        conI.Inherit.Panel = .Item("InheritPanel")
@@ -557,6 +553,13 @@ Namespace Config
                            conI.Inherit.RDGatewayDomain = .Item("InheritRDGatewayDomain")
                        End If

+                        If Me.confVersion >= 2.3 Then
+                            conI.EnableFontSmoothing = .Item("EnableFontSmoothing")
+                            conI.EnableDesktopComposition = .Item("EnableDesktopComposition")
+                            conI.Inherit.EnableFontSmoothing = .Item("InheritEnableFontSmoothing")
+                            conI.Inherit.EnableDesktopComposition = .Item("InheritEnableDesktopComposition")
+                        End If
+
                        If SQLUpdate = True Then
                            conI.PleaseConnect = .Item("Connected")
                        End If
--- a/mRemoteV1/Config/Config.Connections.Save.vb
+++ b/mRemoteV1/Config/Config.Connections.Save.vb
@@ -5,6 +5,7 @@ Imports System.Globalization
 Imports mRemoteNG.App.Runtime
 Imports System.Data.SqlClient
 Imports mRemoteNG.Tools.Misc
+Imports mRemoteNG.My.Resources

 Namespace Config
    Namespace Connections
@@ -173,6 +174,44 @@ Namespace Config
 #End Region

 #Region "SQL"
+            Private Function VerifyDatabaseVersion(ByVal sqlConnection As SqlConnection) As Boolean
+                Dim isVerified As Boolean = False
+                Dim sqlDataReader As SqlDataReader = Nothing
+                Dim databaseVersion As System.Version = Nothing
+                Try
+                    Dim sqlCommand As New SqlCommand("SELECT * FROM tblRoot", sqlConnection)
+                    sqlDataReader = sqlCommand.ExecuteReader()
+                    sqlDataReader.Read()
+
+                    Dim enCulture As CultureInfo = New CultureInfo("en-US")
+                    databaseVersion = New System.Version(Convert.ToDouble(sqlDataReader.Item("confVersion"), enCulture))
+
+                    sqlDataReader.Close()
+
+                    If databaseVersion.CompareTo(New System.Version(2, 2)) = 0 Then ' 2.2
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format("Upgrading database from version {0} to version {1}.", databaseVersion.ToString, "2.3"))
+                        sqlCommand = New SqlCommand("ALTER TABLE tblCons ADD EnableFontSmoothing bit NOT NULL DEFAULT 0, EnableDesktopComposition bit NOT NULL DEFAULT 0, InheritEnableFontSmoothing bit NOT NULL DEFAULT 0, InheritEnableDesktopComposition bit NOT NULL DEFAULT 0;", sqlConnection)
+                        sqlCommand.ExecuteNonQuery()
+                        databaseVersion = New System.Version(2, 3)
+                    End If
+
+                    If databaseVersion.CompareTo(New System.Version(2, 3)) = 0 Then ' 2.3
+                        isVerified = True
+                    End If
+
+                    If isVerified = False Then
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(strErrorBadDatabaseVersion, databaseVersion.ToString, My.Application.Info.ProductName))
+                    End If
+                Catch ex As Exception
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(strErrorVerifyDatabaseVersionFailed, ex.Message))
+                Finally
+                    If sqlDataReader IsNot Nothing Then
+                        If Not sqlDataReader.IsClosed Then sqlDataReader.Close()
+                    End If
+                End Try
+                Return isVerified
+            End Function
+
            Private Sub SaveToSQL()
                If _SQLUsername <> "" Then
                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
@@ -182,6 +221,11 @@ Namespace Config

                sqlCon.Open()

+                If Not VerifyDatabaseVersion(sqlCon) Then
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, strErrorConnectionListSaveFailed)
+                    Return
+                End If
+
                Dim tN As TreeNode
                tN = RootTreeNode.Clone

--- a/mRemoteV1/Config/Config.Settings.Load.vb
+++ b/mRemoteV1/Config/Config.Settings.Load.vb
@@ -41,6 +41,7 @@ Namespace Config
                        App.SupportedCultures.InstantiateSingleton()
                        If Not My.Settings.OverrideUICulture = "" And App.SupportedCultures.IsNameSupported(My.Settings.OverrideUICulture) Then
                            Threading.Thread.CurrentThread.CurrentUICulture = New Globalization.CultureInfo(My.Settings.OverrideUICulture)
+                            log.InfoFormat("Override Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName)
                        End If

                        .WindowState = FormWindowState.Normal
--- a/mRemoteV1/Connection/Connection.Info.vb
+++ b/mRemoteV1/Connection/Connection.Info.vb
@@ -1532,6 +1532,8 @@ Namespace Connection
                Me._Description = val
                Me._DisplayThemes = val
                Me._DisplayWallpaper = val
+                Me._EnableFontSmoothing = val
+                Me._EnableDesktopComposition = val
                Me._Domain = val
                Me._Icon = val
                Me._Password = val
@@ -1612,6 +1614,7 @@ Namespace Connection
                'LocalizedDisplayName("strPropertyNameInheritAll"), _
                Get
                    If Me._CacheBitmaps And Me._Colors And Me._Description And Me._DisplayThemes And Me._DisplayWallpaper _
+                    And Me._EnableFontSmoothing And Me._EnableDesktopComposition _
                    And Me._Domain And Me._Icon And Me._Password And Me._Port And Me._Protocol And Me._PuttySession _
                    And Me._RedirectDiskDrives And Me._RedirectKeys And Me._RedirectPorts And Me._RedirectPrinters _
                    And Me._RedirectSmartCards And Me._RedirectSound And Me._Resolution And Me._UseConsoleSession _
--- a/mRemoteV1/Forms/frmMain.Designer.vb
+++ b/mRemoteV1/Forms/frmMain.Designer.vb
@@ -274,6 +274,7 @@ Partial Class frmMain
        Me.mMenFileImportExport.Name = "mMenFileImportExport"
        Me.mMenFileImportExport.Size = New System.Drawing.Size(334, 22)
        Me.mMenFileImportExport.Text = "Import/Export Folder"
+        Me.mMenFileImportExport.Visible = False
        '
        'ImportFromXMLFileToolStripMenuItem
        '
@@ -314,6 +315,7 @@ Partial Class frmMain
        '
        Me.mMenFileSep3.Name = "mMenFileSep3"
        Me.mMenFileSep3.Size = New System.Drawing.Size(331, 6)
+        Me.mMenFileSep3.Visible = False
        '
        'mMenFileDelete
        '
--- a/mRemoteV1/Forms/frmOptions.resx
+++ b/mRemoteV1/Forms/frmOptions.resx
@@ -124,155 +124,154 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
-        IgAAAk1TRnQBSQFMAgEBBwEAAcgBAAHIAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wF4AaQBtgH/AVsBhgGcAf8BRgFtAYoB/wFB
-        AWgBhwH/AUEBcgGVAf8BVAGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
-        A40B/wOJAf8DhAH/A4AB/wNjAf8DXwH/A1sB/wNYAf8DVAH/A1EB/wNXAbcYAAMNARIDVgG2A1YBtgMN
-        ARFgAAGtAc8B3wH/AVMBkQGtAf8BWAGjAb8B/wF0AcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFMAcYB7AH/
-        ASABqgHdAf8BEgGSAccB/wEeAYABrAH/ATUBbQGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
-        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A1EB/xgAA14B2QPkAf8D4wH/
-        A1gBwWAAAVYBhAGbAf8BQAG9AecB/wFjAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHw
-        Af8BGgG2Ae0B/wEAAacB6AH/AQABoQHhAf8BBQGWAdIB/wE5AVoBdgH/CAADrQH/A9YB/wO6Af8DuAH/
-        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DVQH/CAADCwEPA1QBrQM6
-        AWEDPwFuA3wB+AHiAeEB3wH/AeEB4AHfAf8DbAHzAzwBZwM8AWYDUwGtAwsBD1AAAVkBhwGeAf8BPwHE
-        AfAB/wFlAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGgG2Ae0B/wEAAagB6AH/
-        AQABoQHhAf8BAAGcAdoB/wE6AVsBeAH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
-        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DWQH/CAADWgHFBP8CtwG2Af4CtgG1Af4C5wHmAf8B1gHV
-        AdMB/wHXAdYB1AH/AeMB4gHgAf8BqwGqAagB/gKyAbEB/QHpAegB5gH/A1gBwVAAAVsBiQGgAf8BPwHE
-        Ae8B/wFkAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AU0BygHwAf8BGgG2Ae0B/wEAAagB6AH/
-        AQABoQHhAf8BAAGcAdoB/wE8AV4BegH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
-        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DXQH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
-        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFdAYwBogH/
-        AUEBxgHwAf8BZgHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFNAcoB8AH/ARoBtgHtAf8BAAGo
-        AegB/wEAAaIB4gH/AQABmwHbAf8BPgFhAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu
+        IgAAAk1TRnQBSQFMAgEBBwEAAdABAAHQAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wF3AaQBtgH/AVoBhgGcAf8BRQFsAYoB/wFA
+        AWcBhwH/AUABcQGVAf8BUwGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
+        A40B/wOJAf8DhAH/A4AB/wNiAf8DXgH/A1oB/wNXAf8DUwH/A1AB/wNXAbcYAAMNARIDVgG2A1YBtgMN
+        ARFgAAGtAc8B3wH/AVIBkQGtAf8BVwGjAb8B/wFzAcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFLAcYB7AH/
+        AR8BqgHdAf8BEQGSAccB/wEdAYABrAH/ATQBbAGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
+        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A1AB/xgAA14B2QPkAf8D4wH/
+        A1gBwWAAAVUBhAGbAf8BPwG9AecB/wFiAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHw
+        Af8BGQG2Ae0B/wEAAacB6AH/AQABoQHhAf8BBAGWAdIB/wE4AVkBdQH/CAADrQH/A9YB/wO6Af8DuAH/
+        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DVAH/CAADCwEPA1QBrQM6
+        AWEDPwFuA3sB+AHiAeEB3wH/AeEB4AHfAf8DawHzAzwBZwM8AWYDUwGtAwsBD1AAAVgBhwGeAf8BPgHE
+        AfAB/wFkAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGQG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE5AVoBdwH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
+        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DWAH/CAADWgHFBP8CtAGzAf4CswGyAf4C5wHmAf8B1gHV
+        AdMB/wHXAdYB1AH/AeMB4gHgAf8BqAGnAaUB/gKxAbAB/QHpAegB5gH/A1gBwVAAAVoBiQGgAf8BPgHE
+        Ae8B/wFjAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AUwBygHwAf8BGQG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE7AV0BeQH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
+        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DXAH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
+        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFcAYwBogH/
+        AUABxgHwAf8BZQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFMAcoB8AH/ARkBtgHtAf8BAAGo
+        AegB/wEAAaIB4gH/AQABmwHbAf8BPQFgAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
        Af8DtwH/A7UB/wOzAf8DsAH/A68B/wOzAf8DwgH/A1oBvQgAA04BlQH2AfUB9AH/AeYB5QHkAf8BvwG+
        Ab0B/wLrAeoB/wHUAdMB0gH/AdYB1QHUAf8B4gLhAf8CtAGzAf8B1wHWAdQB/wHiAeEB3wH/A0oBjVAA
-        AWABjwGlAf8BQgHGAfAB/wFmAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGgG2
-        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wFAAWQBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
+        AV8BjwGlAf8BQQHGAfAB/wFlAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGQG2
+        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wE/AWMBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
        Af8D3wH/A98B/wPeAf8D3QH/A90B/wPcAf8D2wH/A+AB/wPQAf8DWgG9AwsBDwNVAbUDZAHnAeQB4wHi
        Af8B0QHQAc8B/wLwAe8B/wOuAf8DZAHxA2cB8gKsAasB/wLoAecB/wLLAcoB/wHgAd8B3QH/A2EB5ANV
-        AbUDCwEPSAABYQGSAagB/wFCAcUB8AH/AWcB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BTAHK
-        AfAB/wEaAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/AUIBZwGGAf8IAAMpAT8DzgH/A+wB/wPe
+        AbUDCwEPSAABYAGSAagB/wFBAcUB8AH/AWYB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BSwHK
+        AfAB/wEZAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/AUEBZgGGAf8IAAMpAT8DzgH/A+wB/wPe
        Af8D2AH/A9IB/wPMAf8DyAH/A8cB/wPIAf8DywH/A9AB/wPdAf8D6AH/A6QB/wMrAUIDPwFtAuQB4wH/
        AdgB1gHVAf8B0gHRAdAB/wHFAcQBwwH/Ae0B7AHrAf8DVwG6CAADXAHNAegB5wHmAf8BtgG1AbQB/wHW
-        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABZAGVAasB/wFCAcUB8AH/AWcB1AHyAf8BjQHjAfQB/wGi
-        AesB9gH/AYMB3wH0Af8BTQHLAfAB/wEaAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/AUUBagGI
-        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFLAa0BTwH/AV0BqgFLAf8BVwGvAU8B/wE9AaUBSQH/
+        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABYwGVAasB/wFBAcUB8AH/AWYB1AHyAf8BjQHjAfQB/wGi
+        AesB9gH/AYMB3wH0Af8BTAHLAfAB/wEZAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/AUQBaQGI
+        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFKAa0BTgH/AVwBqgFKAf8BVgGvAU4B/wE8AaUBSAH/
        AawBxQGsAf8DwgH/A9EB/wPTAf8DWgG9BAADQgF2AewB6wHoAf8B2gHZAdcB/wHUAdMB0QH/AcYBxQHE
        Af8B3gLcAf8DRgF+CAADUAGaAd0B3AHbAf8ByAHGAcUB/wLiAeEB/wLhAd8B/wHuAe0B7AH/Az8Bb0gA
-        AWYBmAGuAf8BQgHFAfAB/wFnAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AU0BygHwAf8BGgG2
-        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wFHAWwBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFL
-        AckBhQH/AbMB3AGkAf8B5wHHAWMB/wHcAb8BWgH/AV0BzAGPAf8BNgGtAU8B/wG4AdABuAH/A/EB/wOv
-        Af8DKwFCBAADLwFKA2AB6wORAfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
-        Af8BzALLAf8B5wHmAeUB/wKSAZEB/ANgAesDLAFDSAABaQGbAbAB/wFBAcYB8AH/AWcB1AHyAf8BjQHj
-        AfQB/wGiAesB9gH/AYMB3wH0Af8BTQHKAfAB/wEaAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/
-        AUoBcAGOAf8QAANaAb0DxAH/AV0BzgGLAf8BmQHkAasB/wGwAcUBRAH/AeoBtQEvAf8B4QGiASAB/wGl
-        AZ0BJwH/AYIBxQGPAf8BMAGaAT0B/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4ArcB/wHh
-        AeAB3wH/A60B/QOyAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAclQAAFsAZ8BswH/AUEBxgHw
-        Af8BZQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wFNAcoB8AH/ARoBtgHtAf8BAAGnAegB/wEA
-        AaEB4QH/AQABmwHaAf8BTAFzAZAB/xgAAWkBmQF0AfwBogHpAZUB/wHWAc8BUAH/AeIBswEuAf8B0QG7
-        ATYB/wHCAa4BKQH/AYIBvQFTAf8BMwF6AV8B/BgAA0wBkQHjAeIB4AH/At4B3AH/AeEB4AHfAf8BzALL
-        Af8BxAHDAcIB/wLPAc4B/wLeAd0B/wLwAe8B/wLwAe8B/wL2AfUB/wNIAYdQAAFtAaEBtQH/AWcB1QH0
-        Af8BmgHoAfcB/wG1AfMB+gH/AcIB+AH8Af8BwwH4Af0B/wHBAfcB/QH/Aa8B8AH7Af8BjwHiAfcB/wFm
-        AdAB8AH/AToBuAHlAf8BTwF2AZMB/xgAAWsBmQF1AfwBogHwAZ8B/wHYAe0BrwH/Ad4BxQFPAf8BtAHi
-        AUwB/wFHAecBIAH/AVIB1wFSAf8BQwF8AWYB/BQAAwEBAgNfAeMB5QHkAeEB/wLuAe0B/wLuAe0B/wLr
-        AeoB/wHjAeIB4QH/AugB5wH/AuoB6QH/AvMB8gH/AvUB9AH/AfoB+QH4Af8DXAHfUAABcAGjAbgB/wHF
+        AWUBmAGuAf8BQQHFAfAB/wFmAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGQG2
+        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wFGAWsBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFK
+        AckBhQH/AbMB3AGkAf8B5wHHAWIB/wHcAb8BWQH/AVwBzAGPAf8BNQGtAU4B/wG4AdABuAH/A/EB/wOv
+        Af8DKwFCBAADLwFKA2AB6wONAfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
+        Af8BzALLAf8B5wHmAeUB/wKOAY0B/ANgAesDLAFDSAABaAGbAbAB/wFAAcYB8AH/AWYB1AHyAf8BjQHj
+        AfQB/wGiAesB9gH/AYMB3wH0Af8BTAHKAfAB/wEZAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/
+        AUkBbwGOAf8QAANaAb0DxAH/AVwBzgGLAf8BmQHkAasB/wGwAcUBQwH/AeoBtQEuAf8B4QGiAR8B/wGl
+        AZ0BJgH/AYIBxQGPAf8BLwGaATwB/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4ArcB/wHh
+        AeAB3wH/A6wB/QOxAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAclQAAFrAZ8BswH/AUABxgHw
+        Af8BZAHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wFMAcoB8AH/ARkBtgHtAf8BAAGnAegB/wEA
+        AaEB4QH/AQABmwHaAf8BSwFyAZAB/xgAAWgBlQFzAfwBogHpAZUB/wHWAc8BTwH/AeIBswEtAf8B0QG7
+        ATUB/wHCAa4BKAH/AYIBvQFSAf8BMQF5AV4B/BgAA0wBkQHjAeIB4AH/At4B3AH/AeEB4AHfAf8BzALL
+        Af8BxAHDAcIB/wLPAc4B/wLeAd0B/wLwAe8B/wLwAe8B/wL2AfUB/wNIAYdQAAFsAaEBtQH/AWYB1QH0
+        Af8BmgHoAfcB/wG1AfMB+gH/AcIB+AH8Af8BwwH4Af0B/wHBAfcB/QH/Aa8B8AH7Af8BjwHiAfcB/wFl
+        AdAB8AH/ATkBuAHlAf8BTgF1AZMB/xgAAWoBlQF0AfwBogHwAZ8B/wHYAe0BrwH/Ad4BxQFOAf8BtAHi
+        AUsB/wFGAecBHwH/AVEB1wFRAf8BQAF7AWUB/BQAAwEBAgNfAeMB5QHkAeEB/wLuAe0B/wLuAe0B/wLr
+        AeoB/wHjAeIB4QH/AugB5wH/AuoB6QH/AvMB8gH/AvUB9AH/AfoB+QH4Af8DXAHfUAABbwGjAbgB/wHF
        AfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9
-        Af8BxQH5Af0B/wHFAfkB/QH/AVEBeQGVAf8YAANhAdwByAH3AdQB/wHYAfYBygH/AecB4wGpAf8B2wHP
-        AVMB/wGvAdwBTwH/AZ0B6gGrAf8DXwHgGAADQAFvA38B/gNkAecDYQHzAegB5wHmAf8B5wHmAeUB/wLt
-        AewB/wL7AfoB/wNnAfIDZAHnA4cB/gM9AWhQAAG3AdcB4QH/AYwBvQHMAf8BnQHPAdsB/wGtAd8B6AH/
-        AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/AXcBqAG4Af8BqQHF
-        AdEB/xgAAy0BRQFsAYkBeAH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGmAf8BXwGQAWAB+wMy
+        Af8BxQH5Af0B/wHFAfkB/QH/AVABeAGVAf8YAANhAdwByAH3AdQB/wHYAfYBygH/AecB4wGpAf8B2wHP
+        AVIB/wGvAdwBTgH/AZ0B6gGrAf8DXwHgGAADQAFvA38B/gNkAecDXwHzAegB5wHmAf8B5wHmAeUB/wLt
+        AewB/wL7AfoB/wNnAfIDZAHnA4QB/gM9AWhQAAG3AdcB4QH/AYwBvQHMAf8BnQHPAdsB/wGtAd8B6AH/
+        AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/AXYBqAG4Af8BqQHF
+        AdEB/xgAAy0BRQFrAYUBdwH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGmAf8BXwGPAV8B+wMy
        AVAgAAMPARQDCgEOA1MBqgHvAe4B7QH/AvQB8wH/A1IBpAMIAQsDEQEXWAAC/gL/AeMB8QH0Af8BuQHX
-        AeEB/wGVAb4BzAH/AXcBqAG7Af8BagGbAbAB/wFmAZgBrQH/AW8BoQGzAf8BjAGyAcIB/wGxAc0B1wH/
-        Ad8B6wHvAf8D/gH/HAADLgFHA14B2QFvAZkBcwH8AW8BlQFvAfwDXgHdAzIBUCwAAy8BSgNdAfADYgHv
+        AeEB/wGVAb4BzAH/AXYBqAG7Af8BaQGbAbAB/wFlAZgBrQH/AW4BoQGzAf8BjAGyAcIB/wGxAc0B1wH/
+        Ad8B6wHvAf8D/gH/HAADLgFHA14B2QFuAZUBcgH8AW4BkQFuAfwDXgHdAzIBUCwAAy8BSgNdAfADYgHv
        AywBQ2QAAxEBFwNWAbMBUwFUAVMBrLQAAwQBBQMQARUDHwEtAykBPwMvAUkDLgFIAygBPQMeASsDDwEU
-        AwMBBBAAA7cB/wGcAagBngH/AQABXgE5Af8BIwGSAVsB/wEAAWIBOQH/AQsBTwGgAf8BCAFNAZ4B/wEE
-        AUoBmwH/AQEBSAGZAf8BAAFGAZcB/wEAAUMBlAH/AQABQgGTAf8DUwH/A1MB/xwAA0EBcgFMAl8B8wFZ
+        AwMBBBAAA7cB/wGcAagBngH/AQABXQE4Af8BIgGSAVoB/wEAAWEBOAH/AQoBTgGgAf8BBwFMAZ4B/wED
+        AUkBmwH/AQABRwGZAf8BAAFFAZcB/wEAAUIBlAH/AQABQQGTAf8DUgH/A1IB/xwAA0EBcgFMAl8B8wFZ
        AlwBzwFLAkwBkAMjATNcAAMFAQcDHwEsAj4BPQFqAlIBUAGjAVsCWQHEAV0CWgHTAV0CWgHTAVsCWQHD
-        AVICUQGhAzwBZgMcASgDBAEGDAADFQEdA1EBogEoAZUBXwH/AYIBvgGqAf8BNwGlAYIB/wEYAZcBUQH/
-        ARsBmQFWAf8BHwGZAVoB/wEjAZ0BXwH/AV0BqgHSAf8BWwGoAdEB/wEAAUQBlQH/IAADIQEwASsBSQFz
-        AfwBhgGtAeEB/wFlAagB3AH/AUYBkgHJAf8BFwFZAasB/wFVAlYBsQMfAS1TAAEBAxIBGAM+AWsBXQJZ
-        AdcBYQErASgB/AGsATQBCwH/AeEBVAEoAf8B5AFmATwB/wHTAVIBIAH/AaMBQAEvAf0BYQJeAdoCPgE9
-        AWoDDwEUCAADGAEiAVABUgFQAaQDVgGzAVQBrAGfAf8BWwG3AZ4B/wFlAbsBrAH/AWUBuwGuAf8BZgG7
-        AbAB/wGAAbwBswH/AR4BmgFiAf8BOwGVAccB/wFeAasB0wH/AQABRwGYAf8gAAFUAlYBqwFUAZ0B0QH/
-        AZkBvAHrAf8BWAGgAeMB/wGWAbkB6gH/AZQBuAHqAf8BRwGTAcoB/wErATYBbwH8A0MBeFAAAxsBJgNZ
-        AdIBJAEOAQAB/wGKAUMBKwH/AcoBhgFNAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFfAf8BsQFeAUQB/wFg
-        AToBGwH/AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswFDAaQBkQH/AVYBtgGbAf8BTwGyAZsB/wFR
-        AbIBngH/AVMBswGhAf8BhQG/AbYB/wElAZ4BggH/AUABmQHJAf8BYgGtAdQB/wEFAUsBnAH/HAADHwEt
-        ASsBWgF3AfwBnQG/AewB/wFQAZwB4gH/AUIBkwHfAf8BPwGRAd8B/wFGAZQB4AH/AZUBuAHqAf8BhgGt
-        AeEB/wEwAYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
-        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBOwEgAQgB/wFgAUsBNgH/AY8BXQFIAf8BrAGI
-        AVIB/wHCAaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAV0BRwH/AVsBQgEtAf8BSgEjAQAB/wFWAlUBsQgA
-        AwgBCwNVAbIDVgGzAV0BsgGoAf8BZAG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/
-        ASsBogGIAf8BRQGcAcsB/wFmAbAB1QH/AQoBTgGfAf8QAAMrAUIDSAGEAVUCVwG3AUwBXwFkAfMBXQGk
-        AdcB/wGhAcIB7QH/AZ8BwAHtAf8BnQG/Ae0B/wFbAaMB5AH/AUEBkgHfAf8BPwGQAd4B/wFiAacB5gH/
-        AZIBtgHoAf8BKgFmAbcB/wM3AVoDnQH/AboCvQH/AeYC7AH/AeYC7QH/AecC7QH/AegC7gH/AekC7wH/
-        AekC7wH/AeoC7wH/AeoC8AH/AesC8AH/AesC8QH/AewC8QH/AewC8QH/Ab0CvwH/A50B/wQAAzkBXwFc
-        ATwBIQH/AcMBsQGiAf8BtgGcAYMB/wGmAWABMwH/AagBXgEwAf8BwwGkAYcB/wHYAcYBsAH/Ab0BqQGL
-        Af8BZgFGASYB/wFDASMBBAH/ATkBFQEAAf8BQAEZAQAB/wMzAVMIAAMGAQgDVQGyATYBoAGKAf8BkwHJ
-        AboB/wFGAa8BlwH/ASsBogGDAf8BLAGjAYcB/wEuAaQBiwH/AS0BqgGSAf8BOwHCAe0B/wGBAbQB1wH/
-        AQ8BUgGjAf8MAANMAZMBSwGXAc8B/wFiAagB2QH/AY0BtAHiAf8BowHEAe0B/wGnAccB7gH/AUsBlwHN
-        Af8BGwFcAbIB/wFGAZMByQH/AZ8BwAHtAf8BXwGWAaMB/wGeAZYBLwH/AWMBlAGRAf8BjQGzAekB/wFg
+        AVICUQGhAzwBZgMcASgDBAEGDAADFQEdA1EBogEnAZUBXgH/AYIBvgGqAf8BNgGlAYIB/wEXAZcBUAH/
+        ARoBmQFVAf8BHgGZAVkB/wEiAZ0BXgH/AVwBqgHSAf8BWgGoAdEB/wEAAUMBlQH/IAADIQEwASsBRgFy
+        AfwBhgGtAeEB/wFkAagB3AH/AUUBkgHJAf8BFgFYAasB/wFVAlYBsQMfAS1TAAEBAxIBGAM+AWsBXQJZ
+        AdcBYAErASkB/AGsATMBCgH/AeEBUwEnAf8B5AFlATsB/wHTAVEBHwH/AaMBQAEwAf0BYQJeAdoCPgE9
+        AWoDDwEUCAADGAEiAVABUgFQAaQDVgGzAVMBrAGfAf8BWgG3AZ4B/wFkAbsBrAH/AWQBuwGuAf8BZQG7
+        AbAB/wGAAbwBswH/AR0BmgFhAf8BOgGVAccB/wFdAasB0wH/AQABRgGYAf8gAAFUAlYBqwFTAZ0B0QH/
+        AZkBvAHrAf8BVwGgAeMB/wGWAbkB6gH/AZQBuAHqAf8BRgGTAcoB/wErATQBbgH8A0MBeFAAAxsBJgNZ
+        AdIBIwENAQAB/wGKAUIBKgH/AcoBhgFMAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFeAf8BsQFdAUMB/wFf
+        ATkBGgH/AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswFCAaQBkQH/AVUBtgGbAf8BTgGyAZsB/wFQ
+        AbIBngH/AVIBswGhAf8BhQG/AbYB/wEkAZ4BggH/AT8BmQHJAf8BYQGtAdQB/wEEAUoBnAH/HAADHwEt
+        ASsBWQF2AfwBnQG/AewB/wFPAZwB4gH/AUEBkwHfAf8BPgGRAd8B/wFFAZQB4AH/AZUBuAHqAf8BhgGt
+        AeEB/wEvAYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBOgEfAQcB/wFfAUoBNQH/AY8BXAFHAf8BrAGI
+        AVEB/wHCAaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAVwBRgH/AVoBQQEsAf8BSQEiAQAB/wFWAlUBsQgA
+        AwgBCwNVAbIDVgGzAVwBsgGoAf8BYwG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/
+        ASoBogGIAf8BRAGcAcsB/wFlAbAB1QH/AQkBTQGfAf8QAAMrAUIDSAGEAVUCVwG3AUwBXwFhAfMBXAGk
+        AdcB/wGhAcIB7QH/AZ8BwAHtAf8BnQG/Ae0B/wFaAaMB5AH/AUABkgHfAf8BPgGQAd4B/wFhAacB5gH/
+        AZIBtgHoAf8BKQFlAbcB/wM3AVoDnQH/AboCvQH/AeYC7AH/AeYC7QH/AecC7QH/AegC7gH/AekC7wH/
+        AekC7wH/AeoC7wH/AeoC8AH/AesC8AH/AesC8QH/AewC8QH/AewC8QH/Ab0CvwH/A50B/wQAAzkBXwFb
+        ATsBIAH/AcMBsQGiAf8BtgGcAYMB/wGmAV8BMgH/AagBXQEvAf8BwwGkAYcB/wHYAcYBsAH/Ab0BqQGL
+        Af8BZQFFASUB/wFCASIBAwH/ATgBFAEAAf8BPwEYAQAB/wMzAVMIAAMGAQgDVQGyATUBoAGKAf8BkwHJ
+        AboB/wFFAa8BlwH/ASoBogGDAf8BKwGjAYcB/wEtAaQBiwH/ASwBqgGSAf8BOgHCAe0B/wGBAbQB1wH/
+        AQ4BUQGjAf8MAANMAZMBSgGXAc8B/wFhAagB2QH/AY0BtAHiAf8BowHEAe0B/wGnAccB7gH/AUoBlwHN
+        Af8BGgFbAbIB/wFFAZMByQH/AZ8BwAHtAf8BXgGWAaMB/wGeAZYBLgH/AWIBlAGRAf8BjQGzAekB/wFf
        AaUB2AH/AVoCXgHYBAADXAHqAdsC4gH/Ac0CzwH/A8sB/wPMAf8DzgH/A88B/wPQAf8D0gH/A9MB/wPV
-        Af8B1wLYAf8B5wLsAf8DbQH3BAADIgExAVYCVQGxAU4BIgEAAf8BqgGFAUYB/wGyAVkBFwH/Aa0BNgEA
-        Af8BugFTAQsB/wHqAdUBvwH/Af0B/AH6Af8B1gG+AaYB/wGQAUYBEwH/AUkBFwEAAf8BSgEnAQYB/wFD
-        ASMBBQH/A1cBxQMcAScIAAMEAQYBHAGUAV4B/wFVAbkBngH/ATABpgGJAf8BYAGxAdUB/wFcAa0B1AH/
-        AVgBqwHSAf8BRgG6AeQB/wEAAZkBUAH/AQ4BjgE/Af8BEQFXAZoB/wwAAUgCYgH2Aa4BzQHwAf8BsAHP
-        AfAB/wGYAb8B7AH/AWUBrgHnAf8BqgHKAe8B/wEkAWIBuAH/BAABHAFdAbMB/wGiAcMB7QH/AagBlwEY
-        Af8BxAG1AUEB/wGsAZcBDQH/AUIBkwHfAf8BmAG7AesB/wEDAUsBnwH/BAADXAHqAdkC4QH/AcsCzAH/
-        A8cB/wPIAf8DygH/A8sB/wPNAf8DzgH/A9AB/wPRAf8B0wLUAf8B5QLrAf8DbQH3BAADLgFHA1kB7AFJ
-        ARcBAAH/AZkBNgEAAf8BuAFOAQAB/wHCAUoBAAH/AckBXAEKAf8B5gG/AZQB/wHsAdQBtgH/Ac0BnAFJ
-        Af8BqAFTARMB/wGZAVQBKAH/AaMBjAFZAf8BZgFNATYB/wJRAT8B9wE1AjQBVQwAAT8BjgHEAf8BOQGs
-        AYsB/wE2AaoBjwH/AWUBtQHYAf8BYQGyAdYB/wFeAa8B1QH/AVoBrAHTAf8BCwGQAUkB/wFAAagBhAH/
-        AQABXwE6Af8DFAEbCAABWgJgAd4BqAHJAe0B/wGEAacB7QH/AT8BUQHtAf8BUQGOAekB/wGtAc0B8AH/
-        AVQBnQHSAf8BJQFjAbkB/wFOAZkBzgH/AaUBxQHuAf8BlQGaAVAB/wGtAZcBDQH/AZ0BlwE0Af8BTQGb
+        Af8B1wLYAf8B5wLsAf8DbQH3BAADIgExAVYCVQGxAU0BIQEAAf8BqgGFAUUB/wGyAVgBFgH/Aa0BNQEA
+        Af8BugFSAQoB/wHqAdUBvwH/Af0B/AH6Af8B1gG+AaYB/wGQAUUBEgH/AUgBFgEAAf8BSQEmAQUB/wFC
+        ASIBBAH/A1cBxQMcAScIAAMEAQYBGwGUAV0B/wFUAbkBngH/AS8BpgGJAf8BXwGxAdUB/wFbAa0B1AH/
+        AVcBqwHSAf8BRQG6AeQB/wEAAZkBTwH/AQ0BjgE+Af8BEAFWAZoB/wwAAUgCYgH2Aa4BzQHwAf8BsAHP
+        AfAB/wGYAb8B7AH/AWQBrgHnAf8BqgHKAe8B/wEjAWEBuAH/BAABGwFcAbMB/wGiAcMB7QH/AagBlwEX
+        Af8BxAG1AUAB/wGsAZcBDAH/AUEBkwHfAf8BmAG7AesB/wECAUoBnwH/BAADXAHqAdkC4QH/AcsCzAH/
+        A8cB/wPIAf8DygH/A8sB/wPNAf8DzgH/A9AB/wPRAf8B0wLUAf8B5QLrAf8DbQH3BAADLgFHA1kB7AFI
+        ARYBAAH/AZkBNQEAAf8BuAFNAQAB/wHCAUkBAAH/AckBWwEJAf8B5gG/AZQB/wHsAdQBtgH/Ac0BnAFI
+        Af8BqAFSARIB/wGZAVMBJwH/AaMBjAFYAf8BZQFMATUB/wJRAT8B9wE1AjQBVQwAAT4BjgHEAf8BOAGs
+        AYsB/wE1AaoBjwH/AWQBtQHYAf8BYAGyAdYB/wFdAa8B1QH/AVkBrAHTAf8BCgGQAUgB/wE/AagBhAH/
+        AQABXgE5Af8DFAEbCAABWgJgAd4BqAHJAe0B/wGEAacB7QH/AT4BUAHtAf8BUAGOAekB/wGtAc0B8AH/
+        AVMBnQHSAf8BJAFiAbkB/wFNAZkBzgH/AaUBxQHuAf8BlQGaAU8B/wGtAZcBDAH/AZ0BlwEzAf8BTAGb
        AeIB/wGYAbsB6gH/AUgCYgH2BAADXAHqAdcC3wH/AccCyQH/A8IB/wPEAf8DxQH/A8gB/wPJAf8DygH/
-        A8wB/wPNAf8B0ALRAf8B4wLqAf8DbQH3BAADOQFfAUEBQAEcAf0BWwEiAQAB/wGuAUABAAH/AcABSAEA
-        Af8B5wGWAS0B/wHoAbIBYQH/AeQBsQFhAf8B0gGJASAB/wG9AU0BAAH/AagBOwEAAf8BuAGNAUQB/wHU
-        AcMBsgH/AZgBhAFVAf8BQgEkAQYB/wE+Aj0BagwAAUUBkQHJAf8BpAHMAeQB/wGHAbsB2wH/ASYBoQFh
-        Af8BIAGcAVsB/wEbAZoBVwH/ARYBlgFRAf8BMgGjAYEB/wGEAcABqwH/ASkBlgFgAf8DUQGiAxUBHQQA
-        A1EBnAGSAbkB5QH/AVUBWwH2Af8BgQGEAfUB/wInAfAB/wGQAbsB6wH/Aa4BzQHwAf8BrAHMAfAB/wGq
-        AcoB8AH/AYUBsgHpAf8BRQGpAcEB/wErAbMBjQH/AT0BqAG2Af8BVwGhAeQB/wGXAboB6AH/A10B7QQA
-        A1wB6gHWAt8B/wHDAsUB/wPAAf8DwAH/A8IB/wPDAf8DxAH/A8UB/wPIAf8DyQH/A80B/wHgAugB/wNt
-        AfcEAAM3AVoBYAFNASgB+gGDAS0BAAH/AcsBVwECAf8B5QGLASQB/wH+AbYBWQL/AeMBwgH/AfQBvAGF
-        Af8B1gFeARAB/wHFAVUBAAH/AboBSgEAAf8BrwFeASAB/wGuAYgBRAH/AZQBXQFEAf8BQwElAQkB/wM8
-        AWYMAAFKAZUBzQH/AagBzwHlAf8BjAG/Ad0B/wEsAaUBgQH/AY0BxQG4Af8BiQHDAbQB/wGGAcEBsQH/
-        AYQBvwGvAf8BXgG5AZ8B/wFVAa0BoAH/A1YBswFQAVIBUAGkAxgBIgMjATMBMgFsAYsB/AGSAaQB9QH/
-        AUABQQH2Af8BOAGGAfQB/wEiAaYB+wH/AUMBqwHyAf8BZQGvAecB/wFiAa0B5wH/AV8BqgHmAf8BJgG2
-        AYAB/wFHAcgBlwH/ASIBtwFhAf8BZAGsAecB/wGPAbUB4wH/AVoCXgHVBAADYAHWAccCzQH/AdsC5AH/
-        AdsC5AH/AdsC5QH/AdwC5QH/AdwC5QH/Ad0C5gH/Ad0C5gH/Ad4C5wH/Ad8C6AH/AeAC6AH/Ac0C0wH/
-        A18B4wQAAyYBOQFgAloB3gGOATUBAAH/AewBngE6Af8B/gG/AYUC/wHMAaEC/wHfAbsB/wH+AcIBZgH/
-        AeIBjgEwAf8B0wGEASEB/wHKAWABEwH/AbUBVwERAf8BlwFIAQ4B/wGBAUUBIAH/A1kB7AMuAUgMAAFO
-        AZgB0AH/AasB0QHnAf8BkAHCAd8B/wEzAakBiAH/AZEByQG7Af8BXQG6AaUB/wFZAbgBoQH/AVUBtgGe
-        Af8BWQG4AZ0B/wFEAaUBkgH/A1YBswNWAbMBVQFWAVUBsQQAA0kBhwGGAa8B4QH/AbkB1wHzAf8BGQGm
-        Af4B/wFTAb8C/wESAaMC/wFNAb4B8AH/ASEBzgH7Af8BQQG+AfEB/wE5AbMBoAH/ASIBtwFgAf8BLgGz
-        AZAB/wGnAcgB7gH/AV4BpQHWAf8BTwJRAZwEAAMsAUMDWwHIA50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
-        A50B/wOdAf8DnQH/A50B/wNeAd0DMQFOBAADCQEMA0sBjgHAAVUBFAL/AbwBZgH/AfoBzgGnAf8B+AHb
-        Ab4C/wHiAcYC/wG+AYYB/wH0AawBXAH/AewBwgGaAf8B4gG1AYsB/wG4AVwBGgH/AZ0BSwETAf8BiAFL
-        AScB/wNPAaUDEAEVDAABUgGbAdMB/wGuAdQB6AH/AasB0wHoAf8BQAGxAZAB/wGbAc4BwAH/AZkBzQG9
-        Af8BlgHLAbsB/wGVAcoBuQH/AYABvwGoAf8BXgGzAakB/wNWAbMDVQGyAwgBCwQAAwQBBgNRAZ8BhQGu
-        AeEB/wFBAbIB+QH/ARIBowL/AScBqQH7Af8BFwHTAf4B/wFTAeIC/wESAdUC/wFmAbAB6AH/AWMBrQHn
-        Af8BqQHKAe8B/wGlAcUB7QH/ASsBXgF5AfwDIQEwRAADEwEaAWcBZAFTAfEB2AGeAVkB/wHnAdMBwAH/
-        AfwB9QHuAv8B+AHrAv8B5QHCAf8B9gG5AYIB/wHyAdIBuAH/Ae4B0gG2Af8BwgGGATUB/wGnAV0BLgH/
-        Ak0BKQH6Ax0BKRAAAVUBnQHVAf8BUwGbAdMB/wFQAZoB0gH/ATABoQGMAf8BKwGfAYoB/wEoAZ0BhQH/
-        ASQBmQGAAf8BPQGlAZIB/wFmAbgBsQH/ATcBoQGLAf8DVQGyAwYBCBAAA0IBdQFfAWIBZQH2AY4BtgHj
-        Af8BuQHXAfMB/wFEAdUB+wH/AREB1QL/ASgB0QH7Af8BswHSAfIB/wGxAdAB8QH/AZIBuAHiAf8BSQGV
-        AcwB/wNKAYpMAAM1AVcBqQFJARsB/wHKAbgBqAb/Af4B/AL/AfYB4gH/AfsBxQGgAf8B5AG5AZUB/wHb
-        AawBZAH/AcMBjgFDAf8BkwFLAR8B/wE+Aj0BajAAAVMCVAGsA1YBswNWAbMDBAEGGAADFgEeA1QBrgFd
-        AaMB3AH/AZEBuAHkAf8BqAHKAewB/wGlAccB7AH/AY0BtQHiAf8BTwGaAdIB/wFaAl8B2wMxAU5UAAMy
-        AVECZAFZAewB0AGyAZUB/wHsAeAB2QH/AeYB1QHEAf8B0wGwAZQB/wHTAaYBXgH/AcsBjwE8Af8BZwFl
-        AVkB8gE6AjkBYDQAAVMCVAGsA1YBswMEAQYkAAMrAUIDTAGQAVsCXQHSAVkCXAHPA04BmQMtAUVgAAMR
-        ARcDRAF6AloBVwHFAmUBXgHlAmEBWAHmAlwBWQHJAkgBRwGDAxUBHRAAAUIBTQE+BwABPgMAASgDAAFA
-        AwABIAMAAQEBAAEBBgABARYAA/8BAAHgAQcCAAH8AT8CAAHAAQMCAAH8AT8CAAHAAQMCAAHAAQMCAAHA
-        AQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMGAAHAAQMCAAEBAYACAAHAAQMBgAIB
-        AYACAAHAAQMBgAEBBAABwAEDAcABAwHAAQMCAAHAAQMB8AEPAcABAwIAAcABAwHwAQ8BgAEDAgABwAED
-        AfABDwHAAQMCAAHAAQMB8AEPAfABDwIAAcABAwH4AR8B/AE/AgAB4wX/AeABBwGAAQEB/AEfAv8BwAED
-        AYABBwH4AQcC/wGAAQMBAAEHAfgBAwL/AcABAwEAAQcB8AEBAgABwAEDAQABBwGAAwABgAEBAYABBwIA
-        AYABAQIAAcABBwEBAQABgAEBAgAB4AEDAgABgAEBAgAB4AEBAgABgAEBAgAB4AMAAYABAQIAAeABAAGA
-        AQABgAEBAgAB4AEAAYABAAL/AYABAQHgAQEB4AEBAv8BwAEDAf8BwwHwAQMC/wHgAQcB/wHHAfwBDwL/
-        AfABDws=
+        A8wB/wPNAf8B0ALRAf8B4wLqAf8DbQH3BAADOQFfAkABHQH9AVoBIQEAAf8BrgE/AQAB/wHAAUcBAAH/
+        AecBlgEsAf8B6AGyAWAB/wHkAbEBYAH/AdIBiQEfAf8BvQFMAQAB/wGoAToBAAH/AbgBjQFDAf8B1AHD
+        AbIB/wGYAYQBVAH/AUEBIwEFAf8BPgI9AWoMAAFEAZEByQH/AaQBzAHkAf8BhwG7AdsB/wElAaEBYAH/
+        AR8BnAFaAf8BGgGaAVYB/wEVAZYBUAH/ATEBowGBAf8BhAHAAasB/wEoAZYBXwH/A1EBogMVAR0EAANR
+        AZwBkgG5AeUB/wFUAVoB9gH/AYEBhAH1Af8CJgHwAf8BkAG7AesB/wGuAc0B8AH/AawBzAHwAf8BqgHK
+        AfAB/wGFAbIB6QH/AUQBqQHBAf8BKgGzAY0B/wE8AagBtgH/AVYBoQHkAf8BlwG6AegB/wNdAe0EAANc
+        AeoB1gLfAf8BwwLFAf8DwAH/A8AB/wPCAf8DwwH/A8QB/wPFAf8DyAH/A8kB/wPNAf8B4ALoAf8DbQH3
+        BAADNwFaAV0BTQEoAfoBgwEsAQAB/wHLAVYBAQH/AeUBiwEjAf8B/gG2AVgC/wHjAcIB/wH0AbwBhQH/
+        AdYBXQEPAf8BxQFUAQAB/wG6AUkBAAH/Aa8BXQEfAf8BrgGIAUMB/wGUAVwBQwH/AUIBJAEIAf8DPAFm
+        DAABSQGVAc0B/wGoAc8B5QH/AYwBvwHdAf8BKwGlAYEB/wGNAcUBuAH/AYkBwwG0Af8BhgHBAbEB/wGE
+        Ab8BrwH/AV0BuQGfAf8BVAGtAaAB/wNWAbMBUAFSAVABpAMYASIDIwEzATABawGHAfwBkgGkAfUB/wE/
+        AUAB9gH/ATcBhgH0Af8BIQGmAfsB/wFCAasB8gH/AWQBrwHnAf8BYQGtAecB/wFeAaoB5gH/ASUBtgGA
+        Af8BRgHIAZcB/wEhAbcBYAH/AWMBrAHnAf8BjwG1AeMB/wFaAl4B1QQAA2AB1gHHAs0B/wHbAuQB/wHb
+        AuQB/wHbAuUB/wHcAuUB/wHcAuUB/wHdAuYB/wHdAuYB/wHeAucB/wHfAugB/wHgAugB/wHNAtMB/wNf
+        AeMEAAMmATkBYAJaAd4BjgE0AQAB/wHsAZ4BOQH/Af4BvwGFAv8BzAGhAv8B3wG7Af8B/gHCAWUB/wHi
+        AY4BLwH/AdMBhAEgAf8BygFfARIB/wG1AVYBEAH/AZcBRwENAf8BgQFEAR8B/wNZAewDLgFIDAABTQGY
+        AdAB/wGrAdEB5wH/AZABwgHfAf8BMgGpAYgB/wGRAckBuwH/AVwBugGlAf8BWAG4AaEB/wFUAbYBngH/
+        AVgBuAGdAf8BQwGlAZIB/wNWAbMDVgGzAVUBVgFVAbEEAANJAYcBhgGvAeEB/wG5AdcB8wH/ARgBpgH+
+        Af8BUgG/Av8BEQGjAv8BTAG+AfAB/wEgAc4B+wH/AUABvgHxAf8BOAGzAaAB/wEhAbcBXwH/AS0BswGQ
+        Af8BpwHIAe4B/wFdAaUB1gH/AU8CUQGcBAADLAFDA1sByAOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOd
+        Af8DnQH/A50B/wOdAf8DXgHdAzEBTgQAAwkBDANLAY4BwAFUARMC/wG8AWUB/wH6Ac4BpwH/AfgB2wG+
+        Av8B4gHGAv8BvgGGAf8B9AGsAVsB/wHsAcIBmgH/AeIBtQGLAf8BuAFbARkB/wGdAUoBEgH/AYgBSgEm
+        Af8DTwGlAxABFQwAAVEBmwHTAf8BrgHUAegB/wGrAdMB6AH/AT8BsQGQAf8BmwHOAcAB/wGZAc0BvQH/
+        AZYBywG7Af8BlQHKAbkB/wGAAb8BqAH/AV0BswGpAf8DVgGzA1UBsgMIAQsEAAMEAQYDUQGfAYUBrgHh
+        Af8BQAGyAfkB/wERAaMC/wEmAakB+wH/ARYB0wH+Af8BUgHiAv8BEQHVAv8BZQGwAegB/wFiAa0B5wH/
+        AakBygHvAf8BpQHFAe0B/wErAV0BeAH8AyEBMEQAAxMBGgJkAVMB8QHYAZ4BWAH/AecB0wHAAf8B/AH1
+        Ae4C/wH4AesC/wHlAcIB/wH2AbkBggH/AfIB0gG4Af8B7gHSAbYB/wHCAYYBNAH/AacBXAEtAf8CTQEp
+        AfoDHQEpEAABVAGdAdUB/wFSAZsB0wH/AU8BmgHSAf8BLwGhAYwB/wEqAZ8BigH/AScBnQGFAf8BIwGZ
+        AYAB/wE8AaUBkgH/AWUBuAGxAf8BNgGhAYsB/wNVAbIDBgEIEAADQgF1AV8CYgH2AY4BtgHjAf8BuQHX
+        AfMB/wFDAdUB+wH/ARAB1QL/AScB0QH7Af8BswHSAfIB/wGxAdAB8QH/AZIBuAHiAf8BSAGVAcwB/wNK
+        AYpMAAM1AVcBqQFIARoB/wHKAbgBqAb/Af4B/AL/AfYB4gH/AfsBxQGgAf8B5AG5AZUB/wHbAawBYwH/
+        AcMBjgFCAf8BkwFKAR4B/wE+Aj0BajAAAVMCVAGsA1YBswNWAbMDBAEGGAADFgEeA1QBrgFcAaMB3AH/
+        AZEBuAHkAf8BqAHKAewB/wGlAccB7AH/AY0BtQHiAf8BTgGaAdIB/wFaAl8B2wMxAU5UAAMyAVECZAFZ
+        AewB0AGyAZUB/wHsAeAB2QH/AeYB1QHEAf8B0wGwAZQB/wHTAaYBXQH/AcsBjwE7Af8BZwFlAVkB8gE6
+        AjkBYDQAAVMCVAGsA1YBswMEAQYkAAMrAUIDTAGQAVsCXQHSAVkCXAHPA04BmQMtAUVgAAMRARcDRAF6
+        AloBVwHFAmUBXgHlAmEBWAHmAlwBWQHJAkgBRwGDAxUBHRAAAUIBTQE+BwABPgMAASgDAAFAAwABIAMA
+        AQEBAAEBBgABARYAA/8BAAHgAQcCAAH8AT8CAAHAAQMCAAH8AT8CAAHAAQMCAAHAAQMCAAHAAQMCAAHA
+        AQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMGAAHAAQMCAAEBAYACAAHAAQMBgAIBAYACAAHA
+        AQMBgAEBBAABwAEDAcABAwHAAQMCAAHAAQMB8AEPAcABAwIAAcABAwHwAQ8BgAEDAgABwAEDAfABDwHA
+        AQMCAAHAAQMB8AEPAfABDwIAAcABAwH4AR8B/AE/AgAB4wX/AeABBwGAAQEB/AEfAv8BwAEDAYABBwH4
+        AQcC/wGAAQMBAAEHAfgBAwL/AcABAwEAAQcB8AEBAgABwAEDAQABBwGAAwABgAEBAYABBwIAAYABAQIA
+        AcABBwEBAQABgAEBAgAB4AEDAgABgAEBAgAB4AEBAgABgAEBAgAB4AMAAYABAQIAAeABAAGAAQABgAEB
+        AgAB4AEAAYABAAL/AYABAQHgAQEB4AEBAv8BwAEDAf8BwwHwAQMC/wHgAQcB/wHHAfwBDwL/AfABDws=
 </value>
  </data>
 </root>
--- a/mRemoteV1/Forms/frmOptions.vb
+++ b/mRemoteV1/Forms/frmOptions.vb
@@ -112,13 +112,13 @@ Public Class frmOptions

    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container
-        Dim ListViewItem1 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Startup/Exit", 0)
-        Dim ListViewItem2 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Appearance", 1)
-        Dim ListViewItem3 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Tabs & Panels", 2)
-        Dim ListViewItem4 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Connections", 3)
-        Dim ListViewItem5 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("SQL Server", 4)
-        Dim ListViewItem6 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Updates", 5)
-        Dim ListViewItem7 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Advanced", 6)
+        Dim ListViewItem8 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Startup/Exit", 0)
+        Dim ListViewItem9 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Appearance", 1)
+        Dim ListViewItem10 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Tabs & Panels", 2)
+        Dim ListViewItem11 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Connections", 3)
+        Dim ListViewItem12 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("SQL Server", 4)
+        Dim ListViewItem13 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Updates", 5)
+        Dim ListViewItem14 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("Advanced", 6)
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmOptions))
        Me.btnOK = New System.Windows.Forms.Button
        Me.btnCancel = New System.Windows.Forms.Button
@@ -210,6 +210,8 @@ Public Class frmOptions
        Me.txtCredentialsUsername = New System.Windows.Forms.TextBox
        Me.lblCredentialsDomain = New System.Windows.Forms.Label
        Me.tabSQLServer = New System.Windows.Forms.TabPage
+        Me.lblSQLDatabaseName = New System.Windows.Forms.Label
+        Me.txtSQLDatabaseName = New System.Windows.Forms.TextBox
        Me.lblExperimental = New System.Windows.Forms.Label
        Me.chkUseSQLServer = New System.Windows.Forms.CheckBox
        Me.lblSQLUsername = New System.Windows.Forms.Label
@@ -221,8 +223,6 @@ Public Class frmOptions
        Me.lblSQLPassword = New System.Windows.Forms.Label
        Me.tabUpdates = New System.Windows.Forms.TabPage
        Me.tabAdvanced = New System.Windows.Forms.TabPage
-        Me.lblSQLDatabaseName = New System.Windows.Forms.Label
-        Me.txtSQLDatabaseName = New System.Windows.Forms.TextBox
        CType(Me.numPuttyWaitTime, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.numUVNCSCPort, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlProxy.SuspendLayout()
@@ -251,7 +251,7 @@ Public Class frmOptions
        Me.btnOK.Location = New System.Drawing.Point(626, 507)
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Size = New System.Drawing.Size(75, 23)
-        Me.btnOK.TabIndex = 10000
+        Me.btnOK.TabIndex = 2
        Me.btnOK.Text = "&OK"
        Me.btnOK.UseVisualStyleBackColor = True
        '
@@ -262,7 +262,7 @@ Public Class frmOptions
        Me.btnCancel.Location = New System.Drawing.Point(707, 507)
        Me.btnCancel.Name = "btnCancel"
        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-        Me.btnCancel.TabIndex = 11000
+        Me.btnCancel.TabIndex = 3
        Me.btnCancel.Text = "&Cancel"
        Me.btnCancel.UseVisualStyleBackColor = True
        '
@@ -272,7 +272,7 @@ Public Class frmOptions
                    Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.lvPages.FullRowSelect = True
        Me.lvPages.HideSelection = False
-        Me.lvPages.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem1, ListViewItem2, ListViewItem3, ListViewItem4, ListViewItem5, ListViewItem6, ListViewItem7})
+        Me.lvPages.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem8, ListViewItem9, ListViewItem10, ListViewItem11, ListViewItem12, ListViewItem13, ListViewItem14})
        Me.lvPages.LabelWrap = False
        Me.lvPages.LargeImageList = Me.imgListPages
        Me.lvPages.Location = New System.Drawing.Point(12, 12)
@@ -280,7 +280,7 @@ Public Class frmOptions
        Me.lvPages.Name = "lvPages"
        Me.lvPages.Scrollable = False
        Me.lvPages.Size = New System.Drawing.Size(154, 489)
-        Me.lvPages.TabIndex = 11001
+        Me.lvPages.TabIndex = 0
        Me.lvPages.TileSize = New System.Drawing.Size(154, 30)
        Me.lvPages.UseCompatibleStateImageBehavior = False
        Me.lvPages.View = System.Windows.Forms.View.Tile
@@ -303,7 +303,7 @@ Public Class frmOptions
        Me.lblMaximumPuttyWaitTime.Location = New System.Drawing.Point(3, 188)
        Me.lblMaximumPuttyWaitTime.Name = "lblMaximumPuttyWaitTime"
        Me.lblMaximumPuttyWaitTime.Size = New System.Drawing.Size(135, 13)
-        Me.lblMaximumPuttyWaitTime.TabIndex = 75
+        Me.lblMaximumPuttyWaitTime.TabIndex = 9
        Me.lblMaximumPuttyWaitTime.Text = "Maximum PuTTY wait time:"
        '
        'chkAutomaticReconnect
@@ -312,7 +312,7 @@ Public Class frmOptions
        Me.chkAutomaticReconnect.Location = New System.Drawing.Point(3, 72)
        Me.chkAutomaticReconnect.Name = "chkAutomaticReconnect"
        Me.chkAutomaticReconnect.Size = New System.Drawing.Size(399, 17)
-        Me.chkAutomaticReconnect.TabIndex = 25
+        Me.chkAutomaticReconnect.TabIndex = 3
        Me.chkAutomaticReconnect.Text = "Automatically try to reconnect when disconnected from server (RDP && ICA only)"
        Me.chkAutomaticReconnect.UseVisualStyleBackColor = True
        '
@@ -323,7 +323,7 @@ Public Class frmOptions
        Me.numPuttyWaitTime.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
        Me.numPuttyWaitTime.Name = "numPuttyWaitTime"
        Me.numPuttyWaitTime.Size = New System.Drawing.Size(49, 20)
-        Me.numPuttyWaitTime.TabIndex = 76
+        Me.numPuttyWaitTime.TabIndex = 10
        Me.numPuttyWaitTime.Value = New Decimal(New Integer() {5, 0, 0, 0})
        '
        'lblConfigurePuttySessions
@@ -332,7 +332,7 @@ Public Class frmOptions
        Me.lblConfigurePuttySessions.Location = New System.Drawing.Point(3, 157)
        Me.lblConfigurePuttySessions.Name = "lblConfigurePuttySessions"
        Me.lblConfigurePuttySessions.Size = New System.Drawing.Size(227, 13)
-        Me.lblConfigurePuttySessions.TabIndex = 60
+        Me.lblConfigurePuttySessions.TabIndex = 7
        Me.lblConfigurePuttySessions.Text = "To configure PuTTY sessions click this button:"
        '
        'numUVNCSCPort
@@ -342,7 +342,7 @@ Public Class frmOptions
        Me.numUVNCSCPort.Maximum = New Decimal(New Integer() {65535, 0, 0, 0})
        Me.numUVNCSCPort.Name = "numUVNCSCPort"
        Me.numUVNCSCPort.Size = New System.Drawing.Size(72, 20)
-        Me.numUVNCSCPort.TabIndex = 130
+        Me.numUVNCSCPort.TabIndex = 16
        Me.numUVNCSCPort.Value = New Decimal(New Integer() {5500, 0, 0, 0})
        '
        'btnLaunchPutty
@@ -352,7 +352,7 @@ Public Class frmOptions
        Me.btnLaunchPutty.Location = New System.Drawing.Point(291, 153)
        Me.btnLaunchPutty.Name = "btnLaunchPutty"
        Me.btnLaunchPutty.Size = New System.Drawing.Size(110, 23)
-        Me.btnLaunchPutty.TabIndex = 70
+        Me.btnLaunchPutty.TabIndex = 8
        Me.btnLaunchPutty.Text = "Launch PuTTY"
        Me.btnLaunchPutty.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnLaunchPutty.UseVisualStyleBackColor = True
@@ -363,7 +363,7 @@ Public Class frmOptions
        Me.lblSeconds.Location = New System.Drawing.Point(428, 189)
        Me.lblSeconds.Name = "lblSeconds"
        Me.lblSeconds.Size = New System.Drawing.Size(47, 13)
-        Me.lblSeconds.TabIndex = 77
+        Me.lblSeconds.TabIndex = 11
        Me.lblSeconds.Text = "seconds"
        '
        'btnBrowseCustomPuttyPath
@@ -372,7 +372,7 @@ Public Class frmOptions
        Me.btnBrowseCustomPuttyPath.Location = New System.Drawing.Point(291, 116)
        Me.btnBrowseCustomPuttyPath.Name = "btnBrowseCustomPuttyPath"
        Me.btnBrowseCustomPuttyPath.Size = New System.Drawing.Size(75, 23)
-        Me.btnBrowseCustomPuttyPath.TabIndex = 50
+        Me.btnBrowseCustomPuttyPath.TabIndex = 6
        Me.btnBrowseCustomPuttyPath.Text = "Browse..."
        Me.btnBrowseCustomPuttyPath.UseVisualStyleBackColor = True
        '
@@ -382,7 +382,7 @@ Public Class frmOptions
        Me.lblUVNCSCPort.Location = New System.Drawing.Point(3, 281)
        Me.lblUVNCSCPort.Name = "lblUVNCSCPort"
        Me.lblUVNCSCPort.Size = New System.Drawing.Size(176, 13)
-        Me.lblUVNCSCPort.TabIndex = 120
+        Me.lblUVNCSCPort.TabIndex = 15
        Me.lblUVNCSCPort.Text = "UltraVNC SingleClick Listening Port:"
        '
        'txtCustomPuttyPath
@@ -392,7 +392,7 @@ Public Class frmOptions
        Me.txtCustomPuttyPath.Location = New System.Drawing.Point(21, 118)
        Me.txtCustomPuttyPath.Name = "txtCustomPuttyPath"
        Me.txtCustomPuttyPath.Size = New System.Drawing.Size(264, 20)
-        Me.txtCustomPuttyPath.TabIndex = 40
+        Me.txtCustomPuttyPath.TabIndex = 5
        '
        'txtXULrunnerPath
        '
@@ -400,7 +400,7 @@ Public Class frmOptions
        Me.txtXULrunnerPath.Location = New System.Drawing.Point(21, 238)
        Me.txtXULrunnerPath.Name = "txtXULrunnerPath"
        Me.txtXULrunnerPath.Size = New System.Drawing.Size(264, 20)
-        Me.txtXULrunnerPath.TabIndex = 131
+        Me.txtXULrunnerPath.TabIndex = 13
        '
        'chkUseCustomPuttyPath
        '
@@ -408,7 +408,7 @@ Public Class frmOptions
        Me.chkUseCustomPuttyPath.Location = New System.Drawing.Point(3, 95)
        Me.chkUseCustomPuttyPath.Name = "chkUseCustomPuttyPath"
        Me.chkUseCustomPuttyPath.Size = New System.Drawing.Size(146, 17)
-        Me.chkUseCustomPuttyPath.TabIndex = 30
+        Me.chkUseCustomPuttyPath.TabIndex = 4
        Me.chkUseCustomPuttyPath.Text = "Use custom PuTTY path:"
        Me.chkUseCustomPuttyPath.UseVisualStyleBackColor = True
        '
@@ -417,7 +417,7 @@ Public Class frmOptions
        Me.btnBrowseXulRunnerPath.Location = New System.Drawing.Point(291, 236)
        Me.btnBrowseXulRunnerPath.Name = "btnBrowseXulRunnerPath"
        Me.btnBrowseXulRunnerPath.Size = New System.Drawing.Size(75, 23)
-        Me.btnBrowseXulRunnerPath.TabIndex = 132
+        Me.btnBrowseXulRunnerPath.TabIndex = 14
        Me.btnBrowseXulRunnerPath.Text = "Browse..."
        Me.btnBrowseXulRunnerPath.UseVisualStyleBackColor = True
        '
@@ -427,7 +427,7 @@ Public Class frmOptions
        Me.chkEncryptCompleteFile.Location = New System.Drawing.Point(2, 26)
        Me.chkEncryptCompleteFile.Name = "chkEncryptCompleteFile"
        Me.chkEncryptCompleteFile.Size = New System.Drawing.Size(180, 17)
-        Me.chkEncryptCompleteFile.TabIndex = 20
+        Me.chkEncryptCompleteFile.TabIndex = 1
        Me.chkEncryptCompleteFile.Text = "Encrypt complete connection file"
        Me.chkEncryptCompleteFile.UseVisualStyleBackColor = True
        '
@@ -437,7 +437,7 @@ Public Class frmOptions
        Me.lblXulRunnerPath.Location = New System.Drawing.Point(3, 220)
        Me.lblXulRunnerPath.Name = "lblXulRunnerPath"
        Me.lblXulRunnerPath.Size = New System.Drawing.Size(85, 13)
-        Me.lblXulRunnerPath.TabIndex = 133
+        Me.lblXulRunnerPath.TabIndex = 12
        Me.lblXulRunnerPath.Text = "XULrunner path:"
        '
        'chkAutomaticallyGetSessionInfo
@@ -446,7 +446,7 @@ Public Class frmOptions
        Me.chkAutomaticallyGetSessionInfo.Location = New System.Drawing.Point(3, 49)
        Me.chkAutomaticallyGetSessionInfo.Name = "chkAutomaticallyGetSessionInfo"
        Me.chkAutomaticallyGetSessionInfo.Size = New System.Drawing.Size(198, 17)
-        Me.chkAutomaticallyGetSessionInfo.TabIndex = 20
+        Me.chkAutomaticallyGetSessionInfo.TabIndex = 2
        Me.chkAutomaticallyGetSessionInfo.Text = "Automatically get session information"
        Me.chkAutomaticallyGetSessionInfo.UseVisualStyleBackColor = True
        '
@@ -456,7 +456,7 @@ Public Class frmOptions
        Me.chkWriteLogFile.Location = New System.Drawing.Point(3, 3)
        Me.chkWriteLogFile.Name = "chkWriteLogFile"
        Me.chkWriteLogFile.Size = New System.Drawing.Size(171, 17)
-        Me.chkWriteLogFile.TabIndex = 10
+        Me.chkWriteLogFile.TabIndex = 0
        Me.chkWriteLogFile.Text = "Write log file (mRemoteNG.log)"
        Me.chkWriteLogFile.UseVisualStyleBackColor = True
        '
@@ -470,7 +470,7 @@ Public Class frmOptions
        Me.pnlProxy.Location = New System.Drawing.Point(3, 200)
        Me.pnlProxy.Name = "pnlProxy"
        Me.pnlProxy.Size = New System.Drawing.Size(536, 224)
-        Me.pnlProxy.TabIndex = 134
+        Me.pnlProxy.TabIndex = 2
        '
        'pnlProxyBasic
        '
@@ -482,14 +482,14 @@ Public Class frmOptions
        Me.pnlProxyBasic.Location = New System.Drawing.Point(8, 32)
        Me.pnlProxyBasic.Name = "pnlProxyBasic"
        Me.pnlProxyBasic.Size = New System.Drawing.Size(512, 40)
-        Me.pnlProxyBasic.TabIndex = 90
+        Me.pnlProxyBasic.TabIndex = 1
        '
        'lblProxyAddress
        '
        Me.lblProxyAddress.Location = New System.Drawing.Point(8, 8)
        Me.lblProxyAddress.Name = "lblProxyAddress"
        Me.lblProxyAddress.Size = New System.Drawing.Size(96, 24)
-        Me.lblProxyAddress.TabIndex = 1
+        Me.lblProxyAddress.TabIndex = 0
        Me.lblProxyAddress.Text = "Address:"
        Me.lblProxyAddress.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        '
@@ -499,14 +499,14 @@ Public Class frmOptions
        Me.txtProxyAddress.Location = New System.Drawing.Point(104, 8)
        Me.txtProxyAddress.Name = "txtProxyAddress"
        Me.txtProxyAddress.Size = New System.Drawing.Size(240, 20)
-        Me.txtProxyAddress.TabIndex = 2
+        Me.txtProxyAddress.TabIndex = 1
        '
        'lblProxyPort
        '
        Me.lblProxyPort.Location = New System.Drawing.Point(320, 8)
        Me.lblProxyPort.Name = "lblProxyPort"
        Me.lblProxyPort.Size = New System.Drawing.Size(64, 23)
-        Me.lblProxyPort.TabIndex = 3
+        Me.lblProxyPort.TabIndex = 2
        Me.lblProxyPort.Text = "Port:"
        Me.lblProxyPort.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        '
@@ -518,7 +518,7 @@ Public Class frmOptions
        Me.numProxyPort.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
        Me.numProxyPort.Name = "numProxyPort"
        Me.numProxyPort.Size = New System.Drawing.Size(64, 20)
-        Me.numProxyPort.TabIndex = 5001
+        Me.numProxyPort.TabIndex = 3
        Me.numProxyPort.Value = New Decimal(New Integer() {80, 0, 0, 0})
        '
        'chkUseProxyForAutomaticUpdates
@@ -527,7 +527,7 @@ Public Class frmOptions
        Me.chkUseProxyForAutomaticUpdates.Location = New System.Drawing.Point(8, 8)
        Me.chkUseProxyForAutomaticUpdates.Name = "chkUseProxyForAutomaticUpdates"
        Me.chkUseProxyForAutomaticUpdates.Size = New System.Drawing.Size(168, 17)
-        Me.chkUseProxyForAutomaticUpdates.TabIndex = 80
+        Me.chkUseProxyForAutomaticUpdates.TabIndex = 0
        Me.chkUseProxyForAutomaticUpdates.Text = "Use a proxy server to connect"
        Me.chkUseProxyForAutomaticUpdates.UseVisualStyleBackColor = True
        '
@@ -538,7 +538,7 @@ Public Class frmOptions
        Me.chkUseProxyAuthentication.Location = New System.Drawing.Point(32, 80)
        Me.chkUseProxyAuthentication.Name = "chkUseProxyAuthentication"
        Me.chkUseProxyAuthentication.Size = New System.Drawing.Size(216, 17)
-        Me.chkUseProxyAuthentication.TabIndex = 100
+        Me.chkUseProxyAuthentication.TabIndex = 2
        Me.chkUseProxyAuthentication.Text = "This proxy server requires authentication"
        Me.chkUseProxyAuthentication.UseVisualStyleBackColor = True
        '
@@ -552,14 +552,14 @@ Public Class frmOptions
        Me.pnlProxyAuthentication.Location = New System.Drawing.Point(8, 104)
        Me.pnlProxyAuthentication.Name = "pnlProxyAuthentication"
        Me.pnlProxyAuthentication.Size = New System.Drawing.Size(512, 72)
-        Me.pnlProxyAuthentication.TabIndex = 110
+        Me.pnlProxyAuthentication.TabIndex = 3
        '
        'lblProxyUsername
        '
        Me.lblProxyUsername.Location = New System.Drawing.Point(8, 8)
        Me.lblProxyUsername.Name = "lblProxyUsername"
        Me.lblProxyUsername.Size = New System.Drawing.Size(96, 24)
-        Me.lblProxyUsername.TabIndex = 1
+        Me.lblProxyUsername.TabIndex = 0
        Me.lblProxyUsername.Text = "Username:"
        Me.lblProxyUsername.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        '
@@ -569,14 +569,14 @@ Public Class frmOptions
        Me.txtProxyUsername.Location = New System.Drawing.Point(104, 8)
        Me.txtProxyUsername.Name = "txtProxyUsername"
        Me.txtProxyUsername.Size = New System.Drawing.Size(240, 20)
-        Me.txtProxyUsername.TabIndex = 2
+        Me.txtProxyUsername.TabIndex = 1
        '
        'lblProxyPassword
        '
        Me.lblProxyPassword.Location = New System.Drawing.Point(8, 40)
        Me.lblProxyPassword.Name = "lblProxyPassword"
        Me.lblProxyPassword.Size = New System.Drawing.Size(96, 24)
-        Me.lblProxyPassword.TabIndex = 3
+        Me.lblProxyPassword.TabIndex = 2
        Me.lblProxyPassword.Text = "Password:"
        Me.lblProxyPassword.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        '
@@ -586,7 +586,7 @@ Public Class frmOptions
        Me.txtProxyPassword.Location = New System.Drawing.Point(104, 40)
        Me.txtProxyPassword.Name = "txtProxyPassword"
        Me.txtProxyPassword.Size = New System.Drawing.Size(240, 20)
-        Me.txtProxyPassword.TabIndex = 4
+        Me.txtProxyPassword.TabIndex = 3
        Me.txtProxyPassword.UseSystemPasswordChar = True
        '
        'btnTestProxy
@@ -594,7 +594,7 @@ Public Class frmOptions
        Me.btnTestProxy.Location = New System.Drawing.Point(8, 184)
        Me.btnTestProxy.Name = "btnTestProxy"
        Me.btnTestProxy.Size = New System.Drawing.Size(100, 32)
-        Me.btnTestProxy.TabIndex = 111
+        Me.btnTestProxy.TabIndex = 4
        Me.btnTestProxy.Text = "Test Proxy"
        Me.btnTestProxy.UseVisualStyleBackColor = True
        '
@@ -606,14 +606,14 @@ Public Class frmOptions
        Me.pnlUpdateCheck.Location = New System.Drawing.Point(3, 48)
        Me.pnlUpdateCheck.Name = "pnlUpdateCheck"
        Me.pnlUpdateCheck.Size = New System.Drawing.Size(536, 120)
-        Me.pnlUpdateCheck.TabIndex = 137
+        Me.pnlUpdateCheck.TabIndex = 1
        '
        'btnUpdateCheckNow
        '
        Me.btnUpdateCheckNow.Location = New System.Drawing.Point(8, 80)
        Me.btnUpdateCheckNow.Name = "btnUpdateCheckNow"
        Me.btnUpdateCheckNow.Size = New System.Drawing.Size(100, 32)
-        Me.btnUpdateCheckNow.TabIndex = 136
+        Me.btnUpdateCheckNow.TabIndex = 2
        Me.btnUpdateCheckNow.Text = "Check Now"
        Me.btnUpdateCheckNow.UseVisualStyleBackColor = True
        '
@@ -623,7 +623,7 @@ Public Class frmOptions
        Me.chkCheckForUpdatesOnStartup.Location = New System.Drawing.Point(8, 8)
        Me.chkCheckForUpdatesOnStartup.Name = "chkCheckForUpdatesOnStartup"
        Me.chkCheckForUpdatesOnStartup.Size = New System.Drawing.Size(213, 17)
-        Me.chkCheckForUpdatesOnStartup.TabIndex = 31
+        Me.chkCheckForUpdatesOnStartup.TabIndex = 0
        Me.chkCheckForUpdatesOnStartup.Text = "Check for updates and announcements"
        Me.chkCheckForUpdatesOnStartup.UseVisualStyleBackColor = True
        '
@@ -634,14 +634,14 @@ Public Class frmOptions
        Me.cboUpdateCheckFrequency.Location = New System.Drawing.Point(48, 40)
        Me.cboUpdateCheckFrequency.Name = "cboUpdateCheckFrequency"
        Me.cboUpdateCheckFrequency.Size = New System.Drawing.Size(128, 21)
-        Me.cboUpdateCheckFrequency.TabIndex = 135
+        Me.cboUpdateCheckFrequency.TabIndex = 1
        '
        'lblUpdatesExplanation
        '
        Me.lblUpdatesExplanation.Location = New System.Drawing.Point(3, 0)
        Me.lblUpdatesExplanation.Name = "lblUpdatesExplanation"
        Me.lblUpdatesExplanation.Size = New System.Drawing.Size(536, 40)
-        Me.lblUpdatesExplanation.TabIndex = 136
+        Me.lblUpdatesExplanation.TabIndex = 0
        Me.lblUpdatesExplanation.Text = "mRemoteNG can periodically connect to the mRemoteNG website to check for updates " & _
            "and product announcements."
        '
@@ -651,7 +651,7 @@ Public Class frmOptions
        Me.chkHostnameLikeDisplayName.Location = New System.Drawing.Point(3, 49)
        Me.chkHostnameLikeDisplayName.Name = "chkHostnameLikeDisplayName"
        Me.chkHostnameLikeDisplayName.Size = New System.Drawing.Size(328, 17)
-        Me.chkHostnameLikeDisplayName.TabIndex = 30
+        Me.chkHostnameLikeDisplayName.TabIndex = 2
        Me.chkHostnameLikeDisplayName.Text = "Set hostname like display name when creating new connections"
        Me.chkHostnameLikeDisplayName.UseVisualStyleBackColor = True
        '
@@ -663,7 +663,7 @@ Public Class frmOptions
        Me.pnlAutoSave.Location = New System.Drawing.Point(3, 107)
        Me.pnlAutoSave.Name = "pnlAutoSave"
        Me.pnlAutoSave.Size = New System.Drawing.Size(500, 29)
-        Me.pnlAutoSave.TabIndex = 50
+        Me.pnlAutoSave.TabIndex = 4
        '
        'lblAutoSave1
        '
@@ -671,7 +671,7 @@ Public Class frmOptions
        Me.lblAutoSave1.Location = New System.Drawing.Point(3, 9)
        Me.lblAutoSave1.Name = "lblAutoSave1"
        Me.lblAutoSave1.Size = New System.Drawing.Size(89, 13)
-        Me.lblAutoSave1.TabIndex = 40
+        Me.lblAutoSave1.TabIndex = 0
        Me.lblAutoSave1.Text = "Auto Save every:"
        '
        'numAutoSave
@@ -681,7 +681,7 @@ Public Class frmOptions
        Me.numAutoSave.Maximum = New Decimal(New Integer() {9999, 0, 0, 0})
        Me.numAutoSave.Name = "numAutoSave"
        Me.numAutoSave.Size = New System.Drawing.Size(53, 20)
-        Me.numAutoSave.TabIndex = 51
+        Me.numAutoSave.TabIndex = 1
        '
        'lblAutoSave2
        '
@@ -689,7 +689,7 @@ Public Class frmOptions
        Me.lblAutoSave2.Location = New System.Drawing.Point(233, 9)
        Me.lblAutoSave2.Name = "lblAutoSave2"
        Me.lblAutoSave2.Size = New System.Drawing.Size(135, 13)
-        Me.lblAutoSave2.TabIndex = 60
+        Me.lblAutoSave2.TabIndex = 2
        Me.lblAutoSave2.Text = "Minutes (0 means disabled)"
        '
        'chkSingleClickOnOpenedConnectionSwitchesToIt
@@ -698,7 +698,7 @@ Public Class frmOptions
        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.Location = New System.Drawing.Point(3, 26)
        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.Name = "chkSingleClickOnOpenedConnectionSwitchesToIt"
        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.Size = New System.Drawing.Size(254, 17)
-        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.TabIndex = 20
+        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.TabIndex = 1
        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.Text = "Single click on opened connection switches to it"
        Me.chkSingleClickOnOpenedConnectionSwitchesToIt.UseVisualStyleBackColor = True
        '
@@ -708,7 +708,7 @@ Public Class frmOptions
        Me.chkSingleClickOnConnectionOpensIt.Location = New System.Drawing.Point(3, 3)
        Me.chkSingleClickOnConnectionOpensIt.Name = "chkSingleClickOnConnectionOpensIt"
        Me.chkSingleClickOnConnectionOpensIt.Size = New System.Drawing.Size(191, 17)
-        Me.chkSingleClickOnConnectionOpensIt.TabIndex = 10
+        Me.chkSingleClickOnConnectionOpensIt.TabIndex = 0
        Me.chkSingleClickOnConnectionOpensIt.Text = "Single click on connection opens it"
        Me.chkSingleClickOnConnectionOpensIt.UseVisualStyleBackColor = True
        '
@@ -719,7 +719,7 @@ Public Class frmOptions
        Me.pnlRdpReconnectionCount.Location = New System.Drawing.Point(3, 72)
        Me.pnlRdpReconnectionCount.Name = "pnlRdpReconnectionCount"
        Me.pnlRdpReconnectionCount.Size = New System.Drawing.Size(500, 29)
-        Me.pnlRdpReconnectionCount.TabIndex = 40
+        Me.pnlRdpReconnectionCount.TabIndex = 3
        '
        'lblRdpReconnectionCount
        '
@@ -727,7 +727,7 @@ Public Class frmOptions
        Me.lblRdpReconnectionCount.Location = New System.Drawing.Point(3, 9)
        Me.lblRdpReconnectionCount.Name = "lblRdpReconnectionCount"
        Me.lblRdpReconnectionCount.Size = New System.Drawing.Size(131, 13)
-        Me.lblRdpReconnectionCount.TabIndex = 40
+        Me.lblRdpReconnectionCount.TabIndex = 0
        Me.lblRdpReconnectionCount.Text = "RDP Reconnection Count"
        '
        'numRdpReconnectionCount
@@ -737,7 +737,7 @@ Public Class frmOptions
        Me.numRdpReconnectionCount.Maximum = New Decimal(New Integer() {20, 0, 0, 0})
        Me.numRdpReconnectionCount.Name = "numRdpReconnectionCount"
        Me.numRdpReconnectionCount.Size = New System.Drawing.Size(53, 20)
-        Me.numRdpReconnectionCount.TabIndex = 41
+        Me.numRdpReconnectionCount.TabIndex = 1
        Me.numRdpReconnectionCount.Value = New Decimal(New Integer() {5, 0, 0, 0})
        '
        'chkAlwaysShowPanelSelectionDlg
@@ -746,7 +746,7 @@ Public Class frmOptions
        Me.chkAlwaysShowPanelSelectionDlg.Location = New System.Drawing.Point(3, 95)
        Me.chkAlwaysShowPanelSelectionDlg.Name = "chkAlwaysShowPanelSelectionDlg"
        Me.chkAlwaysShowPanelSelectionDlg.Size = New System.Drawing.Size(317, 17)
-        Me.chkAlwaysShowPanelSelectionDlg.TabIndex = 50
+        Me.chkAlwaysShowPanelSelectionDlg.TabIndex = 4
        Me.chkAlwaysShowPanelSelectionDlg.Text = "Always show panel selection dialog when opening connectins"
        Me.chkAlwaysShowPanelSelectionDlg.UseVisualStyleBackColor = True
        '
@@ -756,7 +756,7 @@ Public Class frmOptions
        Me.chkShowLogonInfoOnTabs.Location = New System.Drawing.Point(3, 26)
        Me.chkShowLogonInfoOnTabs.Name = "chkShowLogonInfoOnTabs"
        Me.chkShowLogonInfoOnTabs.Size = New System.Drawing.Size(203, 17)
-        Me.chkShowLogonInfoOnTabs.TabIndex = 20
+        Me.chkShowLogonInfoOnTabs.TabIndex = 1
        Me.chkShowLogonInfoOnTabs.Text = "Show logon information on tab names"
        Me.chkShowLogonInfoOnTabs.UseVisualStyleBackColor = True
        '
@@ -766,7 +766,7 @@ Public Class frmOptions
        Me.chkDoubleClickClosesTab.Location = New System.Drawing.Point(3, 72)
        Me.chkDoubleClickClosesTab.Name = "chkDoubleClickClosesTab"
        Me.chkDoubleClickClosesTab.Size = New System.Drawing.Size(159, 17)
-        Me.chkDoubleClickClosesTab.TabIndex = 40
+        Me.chkDoubleClickClosesTab.TabIndex = 3
        Me.chkDoubleClickClosesTab.Text = "Double click on tab closes it"
        Me.chkDoubleClickClosesTab.UseVisualStyleBackColor = True
        '
@@ -776,7 +776,7 @@ Public Class frmOptions
        Me.chkShowProtocolOnTabs.Location = New System.Drawing.Point(3, 49)
        Me.chkShowProtocolOnTabs.Name = "chkShowProtocolOnTabs"
        Me.chkShowProtocolOnTabs.Size = New System.Drawing.Size(166, 17)
-        Me.chkShowProtocolOnTabs.TabIndex = 30
+        Me.chkShowProtocolOnTabs.TabIndex = 2
        Me.chkShowProtocolOnTabs.Text = "Show protocols on tab names"
        Me.chkShowProtocolOnTabs.UseVisualStyleBackColor = True
        '
@@ -786,7 +786,7 @@ Public Class frmOptions
        Me.chkOpenNewTabRightOfSelected.Location = New System.Drawing.Point(3, 3)
        Me.chkOpenNewTabRightOfSelected.Name = "chkOpenNewTabRightOfSelected"
        Me.chkOpenNewTabRightOfSelected.Size = New System.Drawing.Size(280, 17)
-        Me.chkOpenNewTabRightOfSelected.TabIndex = 10
+        Me.chkOpenNewTabRightOfSelected.TabIndex = 0
        Me.chkOpenNewTabRightOfSelected.Text = "Open new tab to the right of the currently selected tab"
        Me.chkOpenNewTabRightOfSelected.UseVisualStyleBackColor = True
        '
@@ -797,7 +797,7 @@ Public Class frmOptions
        Me.chkMCWarnings.Location = New System.Drawing.Point(126, 191)
        Me.chkMCWarnings.Name = "chkMCWarnings"
        Me.chkMCWarnings.Size = New System.Drawing.Size(71, 17)
-        Me.chkMCWarnings.TabIndex = 54
+        Me.chkMCWarnings.TabIndex = 8
        Me.chkMCWarnings.Text = "Warnings"
        Me.chkMCWarnings.UseVisualStyleBackColor = True
        '
@@ -808,7 +808,7 @@ Public Class frmOptions
        Me.chkMCErrors.Location = New System.Drawing.Point(217, 191)
        Me.chkMCErrors.Name = "chkMCErrors"
        Me.chkMCErrors.Size = New System.Drawing.Size(53, 17)
-        Me.chkMCErrors.TabIndex = 55
+        Me.chkMCErrors.TabIndex = 9
        Me.chkMCErrors.Text = "Errors"
        Me.chkMCErrors.UseVisualStyleBackColor = True
        '
@@ -819,7 +819,7 @@ Public Class frmOptions
        Me.chkMCInformation.Location = New System.Drawing.Point(19, 191)
        Me.chkMCInformation.Name = "chkMCInformation"
        Me.chkMCInformation.Size = New System.Drawing.Size(83, 17)
-        Me.chkMCInformation.TabIndex = 53
+        Me.chkMCInformation.TabIndex = 7
        Me.chkMCInformation.Text = "Informations"
        Me.chkMCInformation.UseVisualStyleBackColor = True
        '
@@ -829,7 +829,7 @@ Public Class frmOptions
        Me.lblSwitchToErrorsAndInfos.Location = New System.Drawing.Point(3, 171)
        Me.lblSwitchToErrorsAndInfos.Name = "lblSwitchToErrorsAndInfos"
        Me.lblSwitchToErrorsAndInfos.Size = New System.Drawing.Size(159, 13)
-        Me.lblSwitchToErrorsAndInfos.TabIndex = 52
+        Me.lblSwitchToErrorsAndInfos.TabIndex = 6
        Me.lblSwitchToErrorsAndInfos.Text = "Switch to Notifications panel on:"
        '
        'chkUseOnlyErrorsAndInfosPanel
@@ -838,7 +838,7 @@ Public Class frmOptions
        Me.chkUseOnlyErrorsAndInfosPanel.Location = New System.Drawing.Point(3, 146)
        Me.chkUseOnlyErrorsAndInfosPanel.Name = "chkUseOnlyErrorsAndInfosPanel"
        Me.chkUseOnlyErrorsAndInfosPanel.Size = New System.Drawing.Size(278, 17)
-        Me.chkUseOnlyErrorsAndInfosPanel.TabIndex = 51
+        Me.chkUseOnlyErrorsAndInfosPanel.TabIndex = 5
        Me.chkUseOnlyErrorsAndInfosPanel.Text = "Use only Notifications panel (no messagebox popups)"
        Me.chkUseOnlyErrorsAndInfosPanel.UseVisualStyleBackColor = True
        '
@@ -848,7 +848,7 @@ Public Class frmOptions
        Me.chkShowFullConnectionsFilePathInTitle.Location = New System.Drawing.Point(3, 128)
        Me.chkShowFullConnectionsFilePathInTitle.Name = "chkShowFullConnectionsFilePathInTitle"
        Me.chkShowFullConnectionsFilePathInTitle.Size = New System.Drawing.Size(239, 17)
-        Me.chkShowFullConnectionsFilePathInTitle.TabIndex = 20
+        Me.chkShowFullConnectionsFilePathInTitle.TabIndex = 4
        Me.chkShowFullConnectionsFilePathInTitle.Text = "Show full connections file path in window title"
        Me.chkShowFullConnectionsFilePathInTitle.UseVisualStyleBackColor = True
        '
@@ -858,7 +858,7 @@ Public Class frmOptions
        Me.chkShowSystemTrayIcon.Location = New System.Drawing.Point(3, 176)
        Me.chkShowSystemTrayIcon.Name = "chkShowSystemTrayIcon"
        Me.chkShowSystemTrayIcon.Size = New System.Drawing.Size(172, 17)
-        Me.chkShowSystemTrayIcon.TabIndex = 30
+        Me.chkShowSystemTrayIcon.TabIndex = 5
        Me.chkShowSystemTrayIcon.Text = "Always show System Tray Icon"
        Me.chkShowSystemTrayIcon.UseVisualStyleBackColor = True
        '
@@ -868,7 +868,7 @@ Public Class frmOptions
        Me.chkMinimizeToSystemTray.Location = New System.Drawing.Point(3, 200)
        Me.chkMinimizeToSystemTray.Name = "chkMinimizeToSystemTray"
        Me.chkMinimizeToSystemTray.Size = New System.Drawing.Size(139, 17)
-        Me.chkMinimizeToSystemTray.TabIndex = 40
+        Me.chkMinimizeToSystemTray.TabIndex = 6
        Me.chkMinimizeToSystemTray.Text = "Minimize to System Tray"
        Me.chkMinimizeToSystemTray.UseVisualStyleBackColor = True
        '
@@ -878,7 +878,7 @@ Public Class frmOptions
        Me.chkShowDescriptionTooltipsInTree.Location = New System.Drawing.Point(3, 104)
        Me.chkShowDescriptionTooltipsInTree.Name = "chkShowDescriptionTooltipsInTree"
        Me.chkShowDescriptionTooltipsInTree.Size = New System.Drawing.Size(231, 17)
-        Me.chkShowDescriptionTooltipsInTree.TabIndex = 10
+        Me.chkShowDescriptionTooltipsInTree.TabIndex = 3
        Me.chkShowDescriptionTooltipsInTree.Text = "Show description tooltips in connection tree"
        Me.chkShowDescriptionTooltipsInTree.UseVisualStyleBackColor = True
        '
@@ -888,7 +888,7 @@ Public Class frmOptions
        Me.lblLanguage.Location = New System.Drawing.Point(3, 0)
        Me.lblLanguage.Name = "lblLanguage"
        Me.lblLanguage.Size = New System.Drawing.Size(55, 13)
-        Me.lblLanguage.TabIndex = 41
+        Me.lblLanguage.TabIndex = 0
        Me.lblLanguage.Text = "Language"
        '
        'cboLanguage
@@ -899,7 +899,7 @@ Public Class frmOptions
        Me.cboLanguage.Name = "cboLanguage"
        Me.cboLanguage.Size = New System.Drawing.Size(304, 21)
        Me.cboLanguage.Sorted = True
-        Me.cboLanguage.TabIndex = 42
+        Me.cboLanguage.TabIndex = 1
        '
        'lblLanguageRestartRequired
        '
@@ -907,7 +907,7 @@ Public Class frmOptions
        Me.lblLanguageRestartRequired.Location = New System.Drawing.Point(3, 56)
        Me.lblLanguageRestartRequired.Name = "lblLanguageRestartRequired"
        Me.lblLanguageRestartRequired.Size = New System.Drawing.Size(380, 13)
-        Me.lblLanguageRestartRequired.TabIndex = 43
+        Me.lblLanguageRestartRequired.TabIndex = 2
        Me.lblLanguageRestartRequired.Text = "mRemoteNG must be restarted before changes to the language will take effect."
        '
        'chkReconnectOnStart
@@ -916,7 +916,7 @@ Public Class frmOptions
        Me.chkReconnectOnStart.Location = New System.Drawing.Point(3, 75)
        Me.chkReconnectOnStart.Name = "chkReconnectOnStart"
        Me.chkReconnectOnStart.Size = New System.Drawing.Size(273, 17)
-        Me.chkReconnectOnStart.TabIndex = 40
+        Me.chkReconnectOnStart.TabIndex = 3
        Me.chkReconnectOnStart.Text = "Reconnect to previously opened sessions on startup"
        Me.chkReconnectOnStart.UseVisualStyleBackColor = True
        '
@@ -926,7 +926,7 @@ Public Class frmOptions
        Me.chkSingleInstance.Location = New System.Drawing.Point(3, 99)
        Me.chkSingleInstance.Name = "chkSingleInstance"
        Me.chkSingleInstance.Size = New System.Drawing.Size(366, 17)
-        Me.chkSingleInstance.TabIndex = 50
+        Me.chkSingleInstance.TabIndex = 4
        Me.chkSingleInstance.Text = "Allow only a single instance of the application (mRemote restart required)"
        Me.chkSingleInstance.UseVisualStyleBackColor = True
        '
@@ -936,7 +936,7 @@ Public Class frmOptions
        Me.chkConfirmExit.Location = New System.Drawing.Point(3, 27)
        Me.chkConfirmExit.Name = "chkConfirmExit"
        Me.chkConfirmExit.Size = New System.Drawing.Size(221, 17)
-        Me.chkConfirmExit.TabIndex = 20
+        Me.chkConfirmExit.TabIndex = 1
        Me.chkConfirmExit.Text = "Confirm exit if there are open connections"
        Me.chkConfirmExit.UseVisualStyleBackColor = True
        '
@@ -946,7 +946,7 @@ Public Class frmOptions
        Me.chkProperInstallationOfComponentsAtStartup.Location = New System.Drawing.Point(3, 123)
        Me.chkProperInstallationOfComponentsAtStartup.Name = "chkProperInstallationOfComponentsAtStartup"
        Me.chkProperInstallationOfComponentsAtStartup.Size = New System.Drawing.Size(262, 17)
-        Me.chkProperInstallationOfComponentsAtStartup.TabIndex = 50
+        Me.chkProperInstallationOfComponentsAtStartup.TabIndex = 5
        Me.chkProperInstallationOfComponentsAtStartup.Text = "Check proper installation of components at startup"
        Me.chkProperInstallationOfComponentsAtStartup.UseVisualStyleBackColor = True
        '
@@ -956,7 +956,7 @@ Public Class frmOptions
        Me.chkSaveConsOnExit.Location = New System.Drawing.Point(3, 51)
        Me.chkSaveConsOnExit.Name = "chkSaveConsOnExit"
        Me.chkSaveConsOnExit.Size = New System.Drawing.Size(146, 17)
-        Me.chkSaveConsOnExit.TabIndex = 10
+        Me.chkSaveConsOnExit.TabIndex = 2
        Me.chkSaveConsOnExit.Text = "Save connections on exit"
        Me.chkSaveConsOnExit.UseVisualStyleBackColor = True
        '
@@ -966,7 +966,7 @@ Public Class frmOptions
        Me.chkConfirmCloseConnection.Location = New System.Drawing.Point(3, 3)
        Me.chkConfirmCloseConnection.Name = "chkConfirmCloseConnection"
        Me.chkConfirmCloseConnection.Size = New System.Drawing.Size(176, 17)
-        Me.chkConfirmCloseConnection.TabIndex = 51
+        Me.chkConfirmCloseConnection.TabIndex = 0
        Me.chkConfirmCloseConnection.Text = "Confirm closing connection tabs"
        Me.chkConfirmCloseConnection.UseVisualStyleBackColor = True
        '
@@ -984,7 +984,8 @@ Public Class frmOptions
        Me.tcTabControl.SelectedIndex = 0
        Me.tcTabControl.Size = New System.Drawing.Size(610, 489)
        Me.tcTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
-        Me.tcTabControl.TabIndex = 5001
+        Me.tcTabControl.TabIndex = 1
+        Me.tcTabControl.TabStop = False
        '
        'tabStartupExit
        '
@@ -1066,7 +1067,7 @@ Public Class frmOptions
        Me.pnlDefaultCredentials.Location = New System.Drawing.Point(3, 142)
        Me.pnlDefaultCredentials.Name = "pnlDefaultCredentials"
        Me.pnlDefaultCredentials.Size = New System.Drawing.Size(596, 175)
-        Me.pnlDefaultCredentials.TabIndex = 72
+        Me.pnlDefaultCredentials.TabIndex = 5
        '
        'radCredentialsCustom
        '
@@ -1074,7 +1075,7 @@ Public Class frmOptions
        Me.radCredentialsCustom.Location = New System.Drawing.Point(16, 69)
        Me.radCredentialsCustom.Name = "radCredentialsCustom"
        Me.radCredentialsCustom.Size = New System.Drawing.Size(87, 17)
-        Me.radCredentialsCustom.TabIndex = 73
+        Me.radCredentialsCustom.TabIndex = 3
        Me.radCredentialsCustom.Text = "the following:"
        Me.radCredentialsCustom.UseVisualStyleBackColor = True
        '
@@ -1084,7 +1085,7 @@ Public Class frmOptions
        Me.lblDefaultCredentials.Location = New System.Drawing.Point(3, 9)
        Me.lblDefaultCredentials.Name = "lblDefaultCredentials"
        Me.lblDefaultCredentials.Size = New System.Drawing.Size(257, 13)
-        Me.lblDefaultCredentials.TabIndex = 80
+        Me.lblDefaultCredentials.TabIndex = 0
        Me.lblDefaultCredentials.Text = "For empty Username, Password or Domain fields use:"
        '
        'radCredentialsNoInfo
@@ -1094,7 +1095,7 @@ Public Class frmOptions
        Me.radCredentialsNoInfo.Location = New System.Drawing.Point(16, 31)
        Me.radCredentialsNoInfo.Name = "radCredentialsNoInfo"
        Me.radCredentialsNoInfo.Size = New System.Drawing.Size(91, 17)
-        Me.radCredentialsNoInfo.TabIndex = 71
+        Me.radCredentialsNoInfo.TabIndex = 1
        Me.radCredentialsNoInfo.TabStop = True
        Me.radCredentialsNoInfo.Text = "no information"
        Me.radCredentialsNoInfo.UseVisualStyleBackColor = True
@@ -1105,7 +1106,7 @@ Public Class frmOptions
        Me.radCredentialsWindows.Location = New System.Drawing.Point(16, 50)
        Me.radCredentialsWindows.Name = "radCredentialsWindows"
        Me.radCredentialsWindows.Size = New System.Drawing.Size(227, 17)
-        Me.radCredentialsWindows.TabIndex = 72
+        Me.radCredentialsWindows.TabIndex = 2
        Me.radCredentialsWindows.Text = "my current credentials (windows logon info)"
        Me.radCredentialsWindows.UseVisualStyleBackColor = True
        '
@@ -1116,7 +1117,7 @@ Public Class frmOptions
        Me.txtCredentialsDomain.Location = New System.Drawing.Point(125, 147)
        Me.txtCredentialsDomain.Name = "txtCredentialsDomain"
        Me.txtCredentialsDomain.Size = New System.Drawing.Size(150, 20)
-        Me.txtCredentialsDomain.TabIndex = 76
+        Me.txtCredentialsDomain.TabIndex = 9
        '
        'lblCredentialsUsername
        '
@@ -1125,7 +1126,7 @@ Public Class frmOptions
        Me.lblCredentialsUsername.Location = New System.Drawing.Point(34, 95)
        Me.lblCredentialsUsername.Name = "lblCredentialsUsername"
        Me.lblCredentialsUsername.Size = New System.Drawing.Size(58, 13)
-        Me.lblCredentialsUsername.TabIndex = 120
+        Me.lblCredentialsUsername.TabIndex = 4
        Me.lblCredentialsUsername.Text = "Username:"
        '
        'txtCredentialsPassword
@@ -1135,7 +1136,7 @@ Public Class frmOptions
        Me.txtCredentialsPassword.Location = New System.Drawing.Point(125, 120)
        Me.txtCredentialsPassword.Name = "txtCredentialsPassword"
        Me.txtCredentialsPassword.Size = New System.Drawing.Size(150, 20)
-        Me.txtCredentialsPassword.TabIndex = 75
+        Me.txtCredentialsPassword.TabIndex = 7
        Me.txtCredentialsPassword.UseSystemPasswordChar = True
        '
        'lblCredentialsPassword
@@ -1145,7 +1146,7 @@ Public Class frmOptions
        Me.lblCredentialsPassword.Location = New System.Drawing.Point(34, 123)
        Me.lblCredentialsPassword.Name = "lblCredentialsPassword"
        Me.lblCredentialsPassword.Size = New System.Drawing.Size(56, 13)
-        Me.lblCredentialsPassword.TabIndex = 140
+        Me.lblCredentialsPassword.TabIndex = 6
        Me.lblCredentialsPassword.Text = "Password:"
        '
        'txtCredentialsUsername
@@ -1155,7 +1156,7 @@ Public Class frmOptions
        Me.txtCredentialsUsername.Location = New System.Drawing.Point(125, 93)
        Me.txtCredentialsUsername.Name = "txtCredentialsUsername"
        Me.txtCredentialsUsername.Size = New System.Drawing.Size(150, 20)
-        Me.txtCredentialsUsername.TabIndex = 74
+        Me.txtCredentialsUsername.TabIndex = 5
        '
        'lblCredentialsDomain
        '
@@ -1164,7 +1165,7 @@ Public Class frmOptions
        Me.lblCredentialsDomain.Location = New System.Drawing.Point(34, 150)
        Me.lblCredentialsDomain.Name = "lblCredentialsDomain"
        Me.lblCredentialsDomain.Size = New System.Drawing.Size(46, 13)
-        Me.lblCredentialsDomain.TabIndex = 160
+        Me.lblCredentialsDomain.TabIndex = 8
        Me.lblCredentialsDomain.Text = "Domain:"
        '
        'tabSQLServer
@@ -1187,6 +1188,25 @@ Public Class frmOptions
        Me.tabSQLServer.Text = "SQL Server"
        Me.tabSQLServer.UseVisualStyleBackColor = True
        '
+        'lblSQLDatabaseName
+        '
+        Me.lblSQLDatabaseName.AutoSize = True
+        Me.lblSQLDatabaseName.Enabled = False
+        Me.lblSQLDatabaseName.Location = New System.Drawing.Point(23, 132)
+        Me.lblSQLDatabaseName.Name = "lblSQLDatabaseName"
+        Me.lblSQLDatabaseName.Size = New System.Drawing.Size(56, 13)
+        Me.lblSQLDatabaseName.TabIndex = 5
+        Me.lblSQLDatabaseName.Text = "Database:"
+        '
+        'txtSQLDatabaseName
+        '
+        Me.txtSQLDatabaseName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.txtSQLDatabaseName.Enabled = False
+        Me.txtSQLDatabaseName.Location = New System.Drawing.Point(113, 129)
+        Me.txtSQLDatabaseName.Name = "txtSQLDatabaseName"
+        Me.txtSQLDatabaseName.Size = New System.Drawing.Size(153, 20)
+        Me.txtSQLDatabaseName.TabIndex = 6
+        '
        'lblExperimental
        '
        Me.lblExperimental.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -1197,7 +1217,7 @@ Public Class frmOptions
        Me.lblExperimental.Location = New System.Drawing.Point(3, 0)
        Me.lblExperimental.Name = "lblExperimental"
        Me.lblExperimental.Size = New System.Drawing.Size(596, 25)
-        Me.lblExperimental.TabIndex = 121
+        Me.lblExperimental.TabIndex = 0
        Me.lblExperimental.Text = "EXPERIMENTAL"
        Me.lblExperimental.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
        '
@@ -1207,7 +1227,7 @@ Public Class frmOptions
        Me.chkUseSQLServer.Location = New System.Drawing.Point(3, 76)
        Me.chkUseSQLServer.Name = "chkUseSQLServer"
        Me.chkUseSQLServer.Size = New System.Drawing.Size(234, 17)
-        Me.chkUseSQLServer.TabIndex = 61
+        Me.chkUseSQLServer.TabIndex = 2
        Me.chkUseSQLServer.Text = "Use SQL Server to load && save connections"
        Me.chkUseSQLServer.UseVisualStyleBackColor = True
        '
@@ -1218,7 +1238,7 @@ Public Class frmOptions
        Me.lblSQLUsername.Location = New System.Drawing.Point(23, 158)
        Me.lblSQLUsername.Name = "lblSQLUsername"
        Me.lblSQLUsername.Size = New System.Drawing.Size(58, 13)
-        Me.lblSQLUsername.TabIndex = 80
+        Me.lblSQLUsername.TabIndex = 7
        Me.lblSQLUsername.Text = "Username:"
        '
        'txtSQLPassword
@@ -1228,7 +1248,7 @@ Public Class frmOptions
        Me.txtSQLPassword.Location = New System.Drawing.Point(113, 182)
        Me.txtSQLPassword.Name = "txtSQLPassword"
        Me.txtSQLPassword.Size = New System.Drawing.Size(153, 20)
-        Me.txtSQLPassword.TabIndex = 64
+        Me.txtSQLPassword.TabIndex = 10
        Me.txtSQLPassword.UseSystemPasswordChar = True
        '
        'lblSQLInfo
@@ -1241,7 +1261,7 @@ Public Class frmOptions
        Me.lblSQLInfo.Location = New System.Drawing.Point(3, 25)
        Me.lblSQLInfo.Name = "lblSQLInfo"
        Me.lblSQLInfo.Size = New System.Drawing.Size(596, 25)
-        Me.lblSQLInfo.TabIndex = 120
+        Me.lblSQLInfo.TabIndex = 1
        Me.lblSQLInfo.Text = "Please see Help - Getting started - SQL Configuration for more Info!"
        Me.lblSQLInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
        '
@@ -1252,7 +1272,7 @@ Public Class frmOptions
        Me.lblSQLServer.Location = New System.Drawing.Point(23, 106)
        Me.lblSQLServer.Name = "lblSQLServer"
        Me.lblSQLServer.Size = New System.Drawing.Size(65, 13)
-        Me.lblSQLServer.TabIndex = 60
+        Me.lblSQLServer.TabIndex = 3
        Me.lblSQLServer.Text = "SQL Server:"
        '
        'txtSQLUsername
@@ -1262,7 +1282,7 @@ Public Class frmOptions
        Me.txtSQLUsername.Location = New System.Drawing.Point(113, 155)
        Me.txtSQLUsername.Name = "txtSQLUsername"
        Me.txtSQLUsername.Size = New System.Drawing.Size(153, 20)
-        Me.txtSQLUsername.TabIndex = 63
+        Me.txtSQLUsername.TabIndex = 8
        '
        'txtSQLServer
        '
@@ -1271,7 +1291,7 @@ Public Class frmOptions
        Me.txtSQLServer.Location = New System.Drawing.Point(113, 103)
        Me.txtSQLServer.Name = "txtSQLServer"
        Me.txtSQLServer.Size = New System.Drawing.Size(153, 20)
-        Me.txtSQLServer.TabIndex = 62
+        Me.txtSQLServer.TabIndex = 4
        '
        'lblSQLPassword
        '
@@ -1280,7 +1300,7 @@ Public Class frmOptions
        Me.lblSQLPassword.Location = New System.Drawing.Point(23, 185)
        Me.lblSQLPassword.Name = "lblSQLPassword"
        Me.lblSQLPassword.Size = New System.Drawing.Size(56, 13)
-        Me.lblSQLPassword.TabIndex = 100
+        Me.lblSQLPassword.TabIndex = 9
        Me.lblSQLPassword.Text = "Password:"
        '
        'tabUpdates
@@ -1321,25 +1341,6 @@ Public Class frmOptions
        Me.tabAdvanced.Text = "Advanced"
        Me.tabAdvanced.UseVisualStyleBackColor = True
        '
-        'lblSQLDatabaseName
-        '
-        Me.lblSQLDatabaseName.AutoSize = True
-        Me.lblSQLDatabaseName.Enabled = False
-        Me.lblSQLDatabaseName.Location = New System.Drawing.Point(23, 132)
-        Me.lblSQLDatabaseName.Name = "lblSQLDatabaseName"
-        Me.lblSQLDatabaseName.Size = New System.Drawing.Size(56, 13)
-        Me.lblSQLDatabaseName.TabIndex = 122
-        Me.lblSQLDatabaseName.Text = "Database:"
-        '
-        'txtSQLDatabaseName
-        '
-        Me.txtSQLDatabaseName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.txtSQLDatabaseName.Enabled = False
-        Me.txtSQLDatabaseName.Location = New System.Drawing.Point(113, 129)
-        Me.txtSQLDatabaseName.Name = "txtSQLDatabaseName"
-        Me.txtSQLDatabaseName.Size = New System.Drawing.Size(153, 20)
-        Me.txtSQLDatabaseName.TabIndex = 123
-        '
        'frmOptions
        '
        Me.CancelButton = Me.btnCancel
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -2150,6 +2150,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to The database version {0} is not compatible with this version of {1}..
+        '''</summary>
+        Friend ReadOnly Property strErrorBadDatabaseVersion() As String
+            Get
+                Return ResourceManager.GetString("strErrorBadDatabaseVersion", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Error code {0}..
        '''</summary>
@@ -2159,6 +2168,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to The connection list could not be saved..
+        '''</summary>
+        Friend ReadOnly Property strErrorConnectionListSaveFailed() As String
+            Get
+                Return ResourceManager.GetString("strErrorConnectionListSaveFailed", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Errors.
        '''</summary>
@@ -2168,6 +2186,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to VerifyDatabaseVersion (Config.Connections.Save) failed. {0}.
+        '''</summary>
+        Friend ReadOnly Property strErrorVerifyDatabaseVersionFailed() As String
+            Get
+                Return ResourceManager.GetString("strErrorVerifyDatabaseVersionFailed", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Expand all folders.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@@ -2337,4 +2337,13 @@ Error Description: {1}</value>
  <data name="strLabelSQLServerDatabaseName" xml:space="preserve">
    <value>Database:</value>
  </data>
+	<data name="strErrorVerifyDatabaseVersionFailed">
+		<value xml:space="preserve">VerifyDatabaseVersion (Config.Connections.Save) failed. {0}</value>
+	</data>
+	<data name="strErrorConnectionListSaveFailed">
+		<value xml:space="preserve">The connection list could not be saved.</value>
+	</data>
+	<data name="strErrorBadDatabaseVersion">
+		<value xml:space="preserve">The database version {0} is not compatible with this version of {1}.</value>
+	</data>
 </root>
--- a/mRemoteV1/Tree/Tree.Node.vb
+++ b/mRemoteV1/Tree/Tree.Node.vb
@@ -303,6 +303,7 @@ Namespace Tree

                    Dim nConI As Connection.Info = conI.Copy
                    Dim nInh As Connection.Info.Inheritance = conI.Inherit.Copy()
+                    nInh.Parent = nConI
                    nConI.Inherit = nInh

                    cL.Add(nConI)
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -27,8 +27,6 @@
 				<!-- An alternate output encoding can be specified -->
 				<!-- <encoding value="unicodeFFFE" /> -->
 				<layout type="log4net.Layout.PatternLayout">
-					<header value="[mRemoteNG Start]&#xD;&#xA;" />
-					<footer value="[mRemoteNG Exit]&#xD;&#xA;" />
 					<conversionPattern value="%date [%thread] %-5level- %message%newline" />
 				</layout>
 				<!-- Alternate layout using XML			
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/mRemoteV1/mRemoteV1.vbproj
@@ -55,7 +55,7 @@
    <PlatformTarget>x86</PlatformTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
@@ -65,7 +65,7 @@
    <NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
    <WarningsAsErrors>
    </WarningsAsErrors>
-    <DebugSymbols>false</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
    <PlatformTarget>x86</PlatformTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|AnyCPU' ">
@@ -73,9 +73,10 @@
    <OutputPath>bin\Release Portable\</OutputPath>
    <Optimize>true</Optimize>
    <NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
-    <DebugType>None</DebugType>
+    <DebugType>pdbonly</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <DefineConstants>PORTABLE</DefineConstants>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -138,6 +139,7 @@
    <Reference Include="System.Data" />
    <Reference Include="System.DirectoryServices" />
    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
    <Reference Include="System.Web" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
Author	SHA1	Message	Date
Riley McArdle	fb826c7fac	Hide unimplemented File->Import/Export Folder menu item.	2011-06-05 12:40:20 -05:00
Riley McArdle	d5822094c1	Updated BUILD.CMD and CHANGELOG.TXT for 1.67 RC5.	2011-06-05 12:14:18 -05:00
Riley McArdle	87f7fbdf45	Changed header, removed footer, and added command line to the log file.	2011-06-05 12:06:36 -05:00
Riley McArdle	0bed923a4d	Added code to verify database version and upgrade database from 2.2 (mRemoteNG 1.66 or earlier) to 2.3 (mRemoteNG 1.67).	2011-06-05 12:06:07 -05:00
Riley McArdle	69ab11eb5f	Enable creation of PDB debug symbol files for release builds.	2011-06-05 12:04:53 -05:00
Riley McArdle	217a03b191	Fixed bug 45 - Changing some settings in the config file may not save.	2011-06-05 12:04:44 -05:00
Riley McArdle	cab2163d01	Fixed Inherit All not affecting Enable Font Smoothing and Enable Desktop Composition.	2011-06-05 12:00:56 -05:00
Riley McArdle	2346aaa1c3	Only try to load 2.3 settings from SQL if the database is version 2.3.	2011-06-05 12:00:45 -05:00
Riley McArdle	7e45928297	Fixed ShowUpdatesTab to show the correct tab.	2011-06-05 12:00:29 -05:00
Riley McArdle	76543a440b	Added version and culture information to log on startup.	2011-06-05 12:00:10 -05:00
Riley McArdle	5cb98e0543	Fixed tab order of controls in Options dialog.	2011-06-05 11:59:51 -05:00