Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Commit [ce939e] Maximize Restore History

Reorg of old Visual Studio solution and project files

ronys ronys 2014-02-15

<< < 1 2 3 4 5 > >> (Page 4 of 5)
added old-sln
added old-sln/MSVS10
added old-sln/MSVS8
added old-sln/MSVS8/pwsafe_wx.vcproj
added old-sln/README.txt
removed src/ui/wxWidgets/pwsafe_wx11.vcxproj
changed README.WINDOWS.DEVELOPERS.html
changed pwsafe.sln
changed pwsafe_wx.sln
changed src
changed src/Tools
changed src/Tools/Windows
changed src/Tools/Windows/I18N
changed src/Tools/Windows/I18N/ResPWSL
changed src/Tools/Windows/I18N/ResText
changed src/Tools/Windows/VK_Data_Generator
changed src/core
changed src/core/core.vcxproj
changed src/core/core.vcxproj.filters
changed src/os
changed src/os/windows
changed src/os/windows/os.vcxproj
changed src/os/windows/pws_autotype
changed src/os/windows/pws_autotype/pws_autotype.vcxproj
changed src/os/windows/pws_osk
changed src/os/windows/pws_osk/pws_osk.vcxproj
changed src/os/windows/yubi
changed src/os/windows/yubi/YkLib22.vcxproj
changed src/os/windows/yubi/YkLib22.vcxproj.filters
changed src/test
changed src/test/coretest.vcxproj
changed src/ui
changed src/ui/Windows
changed src/ui/Windows/language
changed src/ui/Windows/language/languageDLL.vcxproj
changed src/ui/Windows/pwsafe.vcxproj
changed src/ui/Windows/pwsafe.vcxproj.filters
changed src/ui/wxWidgets
changed src/ui/wxWidgets/pwsafe_wx.vcproj
copied src/test/coretest11.vcxproj.filters -> old-sln/MSVS10/coretest.vcxproj.filters
copied src/ui/Windows/language/languageDLL11.vcxproj.filters -> old-sln/MSVS10/languageDLL.vcxproj.filters
copied src/os/windows/os11.vcxproj.filters -> old-sln/MSVS10/os.vcxproj.filters
copied src/os/windows/pws_autotype/pws_autotype11.vcxproj.filters -> old-sln/MSVS10/pws_autotype.vcxproj.filters
copied src/os/windows/pws_osk/pws_osk11.vcxproj.filters -> old-sln/MSVS10/pws_osk.vcxproj.filters
copied src/ui/wxWidgets/pwsafe_wx.vcxproj -> old-sln/MSVS10/pwsafe_wx.vcxproj
copied src/ui/wxWidgets/pwsafe_wx.vcxproj.filters -> old-sln/MSVS10/pwsafe_wx.vcxproj.filters
copied src/Tools/Windows/I18N/ResPWSL/ResPWSL8.sln -> old-sln/MSVS8/ResPWSL.sln
copied src/Tools/Windows/I18N/ResPWSL/ResPWSL.vcproj -> old-sln/MSVS8/ResPWSL.vcproj
copied src/Tools/Windows/I18N/ResText/ResText8.sln -> old-sln/MSVS8/ResText.sln
copied src/Tools/Windows/I18N/ResText/ResText.vcproj -> old-sln/MSVS8/ResText.vcproj
copied src/Tools/Windows/VK_Data_Generator/VK_DataGen8.sln -> old-sln/MSVS8/VK_DataGen.sln
copied src/os/windows/yubi/YkLib22.vcproj -> old-sln/MSVS8/YkLib22.vcproj
copied src/core/core.vcproj -> old-sln/MSVS8/core.vcproj
copied src/test/coretest.vcproj -> old-sln/MSVS8/coretest.vcproj
copied src/ui/Windows/language/languageDLL.vcproj -> old-sln/MSVS8/languageDLL.vcproj
copied src/os/windows/os.vcproj -> old-sln/MSVS8/os.vcproj
copied src/os/windows/pws_autotype/pws_autotype.vcproj -> old-sln/MSVS8/pws_autotype.vcproj
copied src/os/windows/pws_osk/pws_osk.vcproj -> old-sln/MSVS8/pws_osk.vcproj
copied pwsafe8.sln -> old-sln/MSVS8/pwsafe.sln
copied src/ui/Windows/pwsafe.vcproj -> old-sln/MSVS8/pwsafe.vcproj
copied pwsafe_wx8.sln -> old-sln/MSVS8/pwsafe_wx.sln
copied src/ui/wxWidgets/pwsafe_wx11.vcxproj.filters -> src/ui/wxWidgets/pwsafe_wx.vcproj.filters
copied pwsafe11.sln -> old-sln/MSVS10/pwsafe.sln
copied pwsafe_wx11.sln -> old-sln/MSVS10/pwsafe_wx.sln
copied src/core/core11.vcxproj -> old-sln/MSVS10/core.vcxproj
copied src/core/core11.vcxproj.filters -> old-sln/MSVS10/core.vcxproj.filters
copied src/os/windows/os11.vcxproj -> old-sln/MSVS10/os.vcxproj
copied src/os/windows/pws_autotype/pws_autotype11.vcxproj -> old-sln/MSVS10/pws_autotype.vcxproj
copied src/os/windows/pws_osk/pws_osk11.vcxproj -> old-sln/MSVS10/pws_osk.vcxproj
copied src/os/windows/yubi/YkLib2211.vcxproj -> old-sln/MSVS10/YKLib22.vcxproj
copied src/os/windows/yubi/YkLib2211.vcxproj.filters -> old-sln/MSVS10/YKLib22.vcxproj.filters
copied src/test/coretest11.vcxproj -> old-sln/MSVS10/coretest.vcxproj
copied src/ui/Windows/language/languageDLL11.vcxproj -> old-sln/MSVS10/languageDLL.vcxproj
copied src/ui/Windows/pwsafe11.vcxproj -> old-sln/MSVS10/pwsafe.vcxproj
copied src/ui/Windows/pwsafe11.vcxproj.filters -> old-sln/MSVS10/pwsafe.vcxproj.filters
old-sln
Directory.
old-sln/MSVS10
Directory.
old-sln/MSVS8
Directory.
old-sln/MSVS8/pwsafe_wx.vcproj Diff Switch to side-by-side view
Loading...
old-sln/README.txt Diff Switch to side-by-side view
Loading...
README.WINDOWS.DEVELOPERS.html Diff Switch to side-by-side view
Loading...
pwsafe.sln Diff Switch to side-by-side view
Loading...
pwsafe_wx.sln Diff Switch to side-by-side view
Loading...
src
Directory.
src/Tools
Directory.
src/Tools/Windows
Directory.
src/core
Directory.
src/core/core.vcxproj Diff Switch to side-by-side view
Loading...
src/core/core.vcxproj.filters Diff Switch to side-by-side view
Loading...
src/os
Directory.
src/os/windows
Directory.
src/os/windows/os.vcxproj Diff Switch to side-by-side view
Loading...
src/os/windows/pws_autotype/pws_autotype.vcxproj Diff Switch to side-by-side view
Loading...
src/os/windows/pws_osk/pws_osk.vcxproj Diff Switch to side-by-side view
Loading...
src/os/windows/yubi
Directory.
src/os/windows/yubi/YkLib22.vcxproj Diff Switch to side-by-side view
Loading...
src/os/windows/yubi/YkLib22.vcxproj.filters Diff Switch to side-by-side view
Loading...
src/test
Directory.
src/test/coretest.vcxproj Diff Switch to side-by-side view
Loading...
src/ui
Directory.
src/ui/Windows
Directory.
src/ui/Windows/language/languageDLL.vcxproj Diff Switch to side-by-side view
Loading...
src/ui/Windows/pwsafe.vcxproj Diff Switch to side-by-side view
Loading...
src/ui/Windows/pwsafe.vcxproj.filters Diff Switch to side-by-side view
Loading...
src/ui/wxWidgets
Directory.
src/ui/wxWidgets/pwsafe_wx.vcproj Diff Switch to side-by-side view
Loading...
src/core/core.vcproj to old-sln/MSVS8/core.vcproj
File was copied or renamed.
src/os/windows/os.vcproj to old-sln/MSVS8/os.vcproj
File was copied or renamed.
pwsafe8.sln to old-sln/MSVS8/pwsafe.sln
File was copied or renamed.
pwsafe_wx8.sln to old-sln/MSVS8/pwsafe_wx.sln
File was copied or renamed.
pwsafe11.sln to old-sln/MSVS10/pwsafe.sln
--- a/pwsafe11.sln
+++ b/old-sln/MSVS10/pwsafe.sln
@@ -1,21 +1,21 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core11", "src\core\core11.vcxproj", "{261882E8-80AF-4373-A8CC-A8D52E24BF27}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coretest11", "src\test\coretest11.vcxproj", "{0FF1232A-8377-4271-BC22-04E57A39FFB6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pwsafe11", "src\ui\Windows\pwsafe11.vcxproj", "{A3313FA9-CB57-48C2-B660-EE4BF94714D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "languageDLL11", "src\ui\Windows\language\languageDLL11.vcxproj", "{FC821168-0D64-45EA-881D-4842A3A670CC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "os11", "src\os\windows\os11.vcxproj", "{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pws_autotype11", "src\os\windows\pws_autotype\pws_autotype11.vcxproj", "{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pws_osk11", "src\os\windows\pws_osk\pws_osk11.vcxproj", "{5F619D4F-185A-4B4B-8E77-02698EAEB962}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YkLib2211", "src\os\windows\yubi\YkLib2211.vcxproj", "{326058EE-494B-4E51-BB34-1F4505E368B7}"
-EndProject
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{261882E8-80AF-4373-A8CC-A8D52E24BF27}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coretest", "src\test\coretest.vcxproj", "{0FF1232A-8377-4271-BC22-04E57A39FFB6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pwsafe", "src\ui\Windows\pwsafe.vcxproj", "{A3313FA9-CB57-48C2-B660-EE4BF94714D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "languageDLL", "src\ui\Windows\language\languageDLL.vcxproj", "{FC821168-0D64-45EA-881D-4842A3A670CC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "os", "src\os\windows\os.vcxproj", "{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pws_autotype", "src\os\windows\pws_autotype\pws_autotype.vcxproj", "{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pws_osk", "src\os\windows\pws_osk\pws_osk.vcxproj", "{5F619D4F-185A-4B4B-8E77-02698EAEB962}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YkLib22", "src\os\windows\yubi\YkLib22.vcxproj", "{326058EE-494B-4E51-BB34-1F4505E368B7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -122,7 +122,6 @@
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugM|Win32.Build.0 = DebugM|Win32
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugM|x64.ActiveCfg = DebugM|x64
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugM64|Win32.ActiveCfg = DebugM64|x64
-		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugM64|Win32.Build.0 = DebugM64|x64
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugM64|x64.ActiveCfg = DebugM64|x64
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugM64|x64.Build.0 = DebugM64|x64
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.DebugX|Win32.ActiveCfg = DebugX|Win32
@@ -153,35 +152,25 @@
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.ReleaseX64|Win32.ActiveCfg = ReleaseX64|x64
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.ReleaseX64|x64.ActiveCfg = ReleaseX64|x64
 		{A3313FA9-CB57-48C2-B660-EE4BF94714D2}.ReleaseX64|x64.Build.0 = ReleaseX64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|Win32.Build.0 = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|x64.Build.0 = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug64|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug64|Win32.Build.0 = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug64|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug64|x64.Build.0 = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|Win32.Build.0 = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|x64.Build.0 = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM64|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM64|Win32.Build.0 = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM64|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM64|x64.Build.0 = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|Win32.Build.0 = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|x64.Build.0 = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX64|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX64|Win32.Build.0 = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX64|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX64|x64.Build.0 = Release64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|Win32.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|x64.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug|x64.Build.0 = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug64|Win32.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Debug64|x64.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|Win32.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|x64.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM|x64.Build.0 = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM64|Win32.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugM64|x64.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|Win32.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|x64.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX|x64.Build.0 = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX64|Win32.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.DebugX64|x64.ActiveCfg = Debug64|x64
 		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo|x64.ActiveCfg = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo|x64.Build.0 = Release64|x64
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo64|Win32.ActiveCfg = Release|Win32
-		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo64|Win32.Build.0 = Release|Win32
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo|x64.ActiveCfg = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo|x64.Build.0 = Debug64|x64
+		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo64|Win32.ActiveCfg = Debug64|x64
 		{FC821168-0D64-45EA-881D-4842A3A670CC}.Demo64|x64.ActiveCfg = Release64|x64
 		{FC821168-0D64-45EA-881D-4842A3A670CC}.Release|Win32.ActiveCfg = Release|Win32
 		{FC821168-0D64-45EA-881D-4842A3A670CC}.Release|x64.ActiveCfg = Release|Win32
@@ -240,7 +229,6 @@
 		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.Debug|Win32.Build.0 = Debug|Win32
 		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.Debug|x64.ActiveCfg = Debug|Win32
 		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.Debug64|Win32.ActiveCfg = Debug64|x64
-		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.Debug64|Win32.Build.0 = Debug64|x64
 		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.Debug64|x64.ActiveCfg = Debug64|x64
 		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.Debug64|x64.Build.0 = Debug64|x64
 		{FC3F78C0-1B04-40CF-A7B5-6F037436D9C0}.DebugM|Win32.ActiveCfg = Debug|Win32
@@ -283,7 +271,6 @@
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.Debug|Win32.Build.0 = Debug|Win32
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.Debug|x64.ActiveCfg = Debug|Win32
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.Debug64|Win32.ActiveCfg = Debug64|x64
-		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.Debug64|Win32.Build.0 = Debug64|x64
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.Debug64|x64.ActiveCfg = Debug64|x64
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.Debug64|x64.Build.0 = Debug64|x64
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.DebugM|Win32.ActiveCfg = Debug|Win32
@@ -321,59 +308,6 @@
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.ReleaseX64|Win32.ActiveCfg = Release|Win32
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.ReleaseX64|x64.ActiveCfg = Release64|x64
 		{5F619D4F-185A-4B4B-8E77-02698EAEB962}.ReleaseX64|x64.Build.0 = Release64|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debug|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debug|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debug64|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debug64|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debug64|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM64|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM64|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM64|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugM64|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX64|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX64|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX64|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugX64|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo64|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo64|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo64|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Demo64|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release64|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release64|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release64|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Release64|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM64|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM64|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM64|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseM64|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX64|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX64|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX64|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleaseX64|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
pwsafe_wx11.sln to old-sln/MSVS10/pwsafe_wx.sln
--- a/pwsafe_wx11.sln
+++ b/old-sln/MSVS10/pwsafe_wx.sln
@@ -1,16 +1,16 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core11", "src\core\core11.vcxproj", "{261882E8-80AF-4373-A8CC-A8D52E24BF27}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{261882E8-80AF-4373-A8CC-A8D52E24BF27}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pwsafe11", "src\ui\wxWidgets\pwsafe_wx11.vcxproj", "{45779F00-D0DD-477B-B1E1-F624B6C86AB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pwsafe", "src\ui\wxWidgets\pwsafe_wx.vcxproj", "{45779F00-D0DD-477B-B1E1-F624B6C86AB9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27} = {261882E8-80AF-4373-A8CC-A8D52E24BF27}
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73} = {D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "os11", "src\os\windows\os11.vcxproj", "{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "os", "src\os\windows\os.vcxproj", "{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YkLib2211", "src\os\windows\yubi\YkLib2211.vcxproj", "{326058EE-494B-4E51-BB34-1F4505E368B7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YkLib22", "src\os\windows\yubi\YkLib22.vcxproj", "{326058EE-494B-4E51-BB34-1F4505E368B7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,108 +34,75 @@
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx|Win32.ActiveCfg = Debugwx|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx|Win32.Build.0 = Debugwx|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx|x64.ActiveCfg = Debugwx|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx64|Win32.ActiveCfg = Debugwx64|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx64|Win32.ActiveCfg = Debugwx64|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx64|x64.ActiveCfg = Debugwx64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Debugwx64|x64.Build.0 = Debugwx64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX|Win32.ActiveCfg = DebugwxX|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX|Win32.Build.0 = DebugwxX|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX|x64.ActiveCfg = DebugwxX|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX64|Win32.ActiveCfg = DebugwxX64|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX|x64.ActiveCfg = DebugwxX|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX64|Win32.ActiveCfg = DebugwxX64|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX64|x64.ActiveCfg = DebugwxX64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.DebugwxX64|x64.Build.0 = DebugwxX64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx|Win32.ActiveCfg = Releasewx|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx|Win32.Build.0 = Releasewx|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx|x64.ActiveCfg = Releasewx|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx64|Win32.ActiveCfg = Releasewx64|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx|x64.ActiveCfg = Releasewx|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx64|Win32.ActiveCfg = Releasewx64|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx64|x64.ActiveCfg = Releasewx64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.Releasewx64|x64.Build.0 = Releasewx64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX|Win32.ActiveCfg = ReleasewxX|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX|Win32.Build.0 = ReleasewxX|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX|x64.ActiveCfg = ReleasewxX|Win32
-		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX64|Win32.ActiveCfg = ReleasewxX64|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX|x64.ActiveCfg = ReleasewxX|x64
+		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX64|Win32.ActiveCfg = ReleasewxX64|Win32
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX64|x64.ActiveCfg = ReleasewxX64|x64
 		{261882E8-80AF-4373-A8CC-A8D52E24BF27}.ReleasewxX64|x64.Build.0 = ReleasewxX64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx|Win32.ActiveCfg = Debugwx|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx|Win32.Build.0 = Debugwx|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx|x64.ActiveCfg = Debugwx|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx64|Win32.ActiveCfg = Debugwx64|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx|x64.ActiveCfg = Debugwx|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx64|Win32.ActiveCfg = Debugwx64|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx64|x64.ActiveCfg = Debugwx64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Debugwx64|x64.Build.0 = Debugwx64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX|Win32.ActiveCfg = DebugwxX|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX|Win32.Build.0 = DebugwxX|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX|x64.ActiveCfg = DebugwxX|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX64|Win32.ActiveCfg = DebugwxX64|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX|x64.ActiveCfg = DebugwxX|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX64|Win32.ActiveCfg = DebugwxX64|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX64|x64.ActiveCfg = DebugwxX64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.DebugwxX64|x64.Build.0 = DebugwxX64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx|Win32.ActiveCfg = Releasewx|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx|Win32.Build.0 = Releasewx|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx|x64.ActiveCfg = Releasewx|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx64|Win32.ActiveCfg = Releasewx64|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx|x64.ActiveCfg = Releasewx|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx64|Win32.ActiveCfg = Releasewx64|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx64|x64.ActiveCfg = Releasewx64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.Releasewx64|x64.Build.0 = Releasewx64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX|Win32.ActiveCfg = ReleasewxX|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX|Win32.Build.0 = ReleasewxX|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX|x64.ActiveCfg = ReleasewxX|Win32
-		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX64|Win32.ActiveCfg = ReleasewxX64|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX|x64.ActiveCfg = ReleasewxX|x64
+		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX64|Win32.ActiveCfg = ReleasewxX64|Win32
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX64|x64.ActiveCfg = ReleasewxX64|x64
 		{45779F00-D0DD-477B-B1E1-F624B6C86AB9}.ReleasewxX64|x64.Build.0 = ReleasewxX64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx|Win32.ActiveCfg = Debugwx|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx|Win32.Build.0 = Debugwx|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx|x64.ActiveCfg = Debug64|x64
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx64|Win32.ActiveCfg = Debugwx64|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx64|Win32.ActiveCfg = Debugwx64|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx64|x64.ActiveCfg = Debugwx64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Debugwx64|x64.Build.0 = Debugwx64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX|Win32.ActiveCfg = DebugwxX|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX|Win32.Build.0 = DebugwxX|Win32
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX|x64.ActiveCfg = DebugwxX|Win32
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX64|Win32.ActiveCfg = DebugwxX64|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX|x64.ActiveCfg = DebugwxX|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX64|Win32.ActiveCfg = DebugwxX64|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX64|x64.ActiveCfg = DebugwxX64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.DebugwxX64|x64.Build.0 = DebugwxX64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx|Win32.ActiveCfg = Releasewx|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx|Win32.Build.0 = Releasewx|Win32
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx|x64.ActiveCfg = Releasewx|Win32
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx64|Win32.ActiveCfg = Releasewx64|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx|x64.ActiveCfg = Releasewx|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx64|Win32.ActiveCfg = Releasewx64|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx64|x64.ActiveCfg = Releasewx64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.Releasewx64|x64.Build.0 = Releasewx64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX|Win32.ActiveCfg = ReleasewxX|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX|Win32.Build.0 = ReleasewxX|Win32
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX|x64.ActiveCfg = ReleasewxX|Win32
-		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX64|Win32.ActiveCfg = ReleasewxX64|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX|x64.ActiveCfg = ReleasewxX|x64
+		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX64|Win32.ActiveCfg = ReleasewxX64|Win32
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX64|x64.ActiveCfg = ReleasewxX64|x64
 		{D5DBD8E8-CF48-4CA3-B773-C5F3B3316C73}.ReleasewxX64|x64.Build.0 = ReleasewxX64|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx64|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx64|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx64|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Debugwx64|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX64|Win32.ActiveCfg = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX64|Win32.Build.0 = Debug|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX64|x64.ActiveCfg = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.DebugwxX64|x64.Build.0 = Debug|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx64|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx64|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx64|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.Releasewx64|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX|x64.Build.0 = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX64|Win32.ActiveCfg = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX64|Win32.Build.0 = Release|Win32
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX64|x64.ActiveCfg = Release|x64
-		{326058EE-494B-4E51-BB34-1F4505E368B7}.ReleasewxX64|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
src/core/core11.vcxproj to old-sln/MSVS10/core.vcxproj
--- a/src/core/core11.vcxproj
+++ b/old-sln/MSVS10/core.vcxproj
@@ -100,133 +100,111 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Releasewx|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Releasewx64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasewxX|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasewxX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debugwx|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debugwx64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugwxX|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugwxX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -321,6 +299,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PWSLib)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">$(PWSLib)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PWSobj)\$(ProjectName)\</IntDir>
@@ -398,7 +377,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -410,7 +389,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -430,7 +408,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -442,7 +420,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -462,7 +439,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -475,7 +452,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -495,7 +471,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -508,7 +484,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -528,7 +503,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;$(XercesDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -541,7 +516,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -561,7 +535,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;$(Xerces64Dir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WX__;__WXMSW__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -574,7 +548,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -595,7 +568,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -607,7 +580,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -628,7 +600,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -640,7 +612,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -661,7 +632,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -673,7 +644,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -694,7 +664,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -706,7 +676,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -727,7 +696,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;$(XercesDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -739,7 +708,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -760,7 +728,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;$(Xerces64Dir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -772,7 +740,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -793,7 +760,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;DEMO;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;DEMO;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -806,7 +773,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -826,7 +792,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;DEMO;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;DEMO;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -839,7 +805,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -858,7 +823,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -870,7 +835,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -889,7 +853,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -901,7 +865,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -920,7 +883,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;$(XercesDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -932,7 +895,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -952,7 +914,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;$(Xerces64Dir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -964,7 +926,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -985,7 +946,7 @@
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -999,7 +960,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1019,7 +979,7 @@
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -1033,7 +993,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1053,7 +1012,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;$(XercesDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -1066,7 +1025,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1087,7 +1045,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;$(Xerces64Dir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -1100,7 +1058,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1120,6 +1077,7 @@
     <ClCompile Include="CoreImpExp.cpp" />
     <ClCompile Include="core_st.cpp" />
     <ClCompile Include="ExpiredList.cpp" />
+    <ClCompile Include="hmac.cpp" />
     <ClCompile Include="ItemData.cpp" />
     <ClCompile Include="ItemField.cpp" />
     <ClCompile Include="Match.cpp" />
src/core/core11.vcxproj.filters to old-sln/MSVS10/core.vcxproj.filters
--- a/src/core/core11.vcxproj.filters
+++ b/old-sln/MSVS10/core.vcxproj.filters
@@ -23,6 +23,9 @@
     <ClCompile Include="CoreImpExp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="hmac.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="ItemData.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -335,4 +338,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
src/os/windows/os11.vcxproj to old-sln/MSVS10/os.vcxproj
--- a/src/os/windows/os11.vcxproj
+++ b/old-sln/MSVS10/os.vcxproj
@@ -100,130 +100,106 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Releasewx|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Releasewx64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasewxX|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasewxX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debugwx|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debugwx64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugwxX|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugwxX64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -318,6 +294,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\$(PWSLib)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\$(PWSLib)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
@@ -390,7 +367,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -402,7 +379,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -412,7 +388,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -424,7 +400,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -434,7 +409,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debugwx|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -446,7 +421,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -456,7 +430,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debugwx64|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -468,7 +442,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -478,7 +451,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugwxX|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -490,7 +463,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -500,7 +472,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugwxX64|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;__WXMSW__;__WX__;__WXDEBUG__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -512,7 +484,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -523,19 +494,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -546,19 +516,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -569,19 +538,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -592,19 +560,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -615,19 +582,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -638,19 +604,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;__WX__;__WXMSW__;wxUSE_UNICODE;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <OutputFile>..\$(PWSLib)\os.lib</OutputFile>
@@ -661,20 +626,19 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -689,20 +653,19 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -716,7 +679,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -728,7 +691,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -742,7 +704,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -754,7 +716,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -768,7 +729,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -780,7 +741,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -794,7 +754,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -806,7 +766,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -821,20 +780,19 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -849,20 +807,19 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -877,20 +834,19 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -905,20 +861,19 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_LIB;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/os.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
src/os/windows/pws_autotype/pws_autotype11.vcxproj to old-sln/MSVS10/pws_autotype.vcxproj
--- a/src/os/windows/pws_autotype/pws_autotype11.vcxproj
+++ b/old-sln/MSVS10/pws_autotype.vcxproj
@@ -1,4 +1,4 @@
-ďťż<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug64|x64">
@@ -29,26 +29,22 @@
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -71,6 +67,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PWSBin)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\..\$(PWSBin)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
@@ -91,11 +88,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -104,7 +101,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -122,11 +118,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -134,7 +130,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -153,15 +148,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -181,15 +175,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_AT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -231,4 +224,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
src/os/windows/pws_osk/pws_osk11.vcxproj to old-sln/MSVS10/pws_osk.vcxproj
--- a/src/os/windows/pws_osk/pws_osk11.vcxproj
+++ b/old-sln/MSVS10/pws_osk.vcxproj
@@ -1,4 +1,4 @@
-ďťż<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug64|x64">
@@ -29,26 +29,22 @@
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -71,6 +67,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PWSBin)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\..\$(PWSBin)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
@@ -91,15 +88,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -108,7 +105,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -128,15 +124,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -144,7 +140,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
       <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -163,7 +158,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -172,12 +167,11 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -200,21 +194,20 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
     <PreBuildEvent>
       <Message>Pre-build event command script</Message>
-      <Command>cscript "$(SolutionDir)\src\ui\Windows\pre_build.vbs"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%WINVER=0x0501;(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Command>cscript $(SolutionDir)\src\ui\Windows\pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>false</MkTypLibCompatible>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PWS_OSK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
src/os/windows/yubi/YkLib2211.vcxproj to old-sln/MSVS10/YKLib22.vcxproj
--- a/src/os/windows/yubi/YkLib2211.vcxproj
+++ b/old-sln/MSVS10/YKLib22.vcxproj
@@ -1,185 +1,175 @@
-ďťż<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{326058EE-494B-4E51-BB34-1F4505E368B7}</ProjectGuid>
-    <RootNamespace>YkLib22</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PWSLib)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PWSLib)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\$(PWSLib)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\$(PWSLib)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">YkLib22</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">YkLib22</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">YkLib22</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">YkLib22</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\common;C:\WinDDK\7600.16385.1\inc\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>hid.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\wxp\i386;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\$(PWSLib)\YkLib22.lib</OutputFile>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>MSVCRTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\common;C:\WinDDK\7600.16385.1\inc\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>hid.lib</AdditionalDependencies>
-      <OutputFile>..\..\$(PWSLib)\YkLib22.lib</OutputFile>
-      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\wxp\i386;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\common;C:\WinDDK\7600.16385.1\inc\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>hid.lib</AdditionalDependencies>
-      <OutputFile>..\..\$(PWSLib)\YkLib22.lib</OutputFile>
-      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\win7\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\common;C:\WinDDK\7600.16385.1\inc\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>hid.lib</AdditionalDependencies>
-      <OutputFile>..\..\$(PWSLib)\YkLib22.lib</OutputFile>
-      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\win7\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="YkLib.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-    <ClInclude Include="YkLib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+ďťż<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{326058EE-494B-4E51-BB34-1F4505E368B7}</ProjectGuid>
+    <RootNamespace>YkLib22</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\ui\Windows\UserVariables.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\common;C:\WinDDK\7600.16385.1\inc\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>setupapi.lib;hid.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\win7\i386;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OutputFile>..\..\$(PWSLib)\YkLib22.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>MSVCRTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\common;C:\WinDDK\7600.16385.1\inc\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>hid.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\$(PWSLib)\YkLib22.lib</OutputFile>
+      <AdditionalLibraryDirectories>\WinDDK\7600.16385.1\lib\win7\i386;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>setupapi.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>hid.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="YkLib.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="YkLib.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
src/os/windows/yubi/YkLib2211.vcxproj.filters to old-sln/MSVS10/YKLib22.vcxproj.filters
--- a/src/os/windows/yubi/YkLib2211.vcxproj.filters
+++ b/old-sln/MSVS10/YKLib22.vcxproj.filters
@@ -1,39 +1,39 @@
-ďťż<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="YkLib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="YkLib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
+ďťż<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="YkLib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="targetver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="YkLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
 </Project>
src/test/coretest11.vcxproj to old-sln/MSVS10/coretest.vcxproj
--- a/src/test/coretest11.vcxproj
+++ b/old-sln/MSVS10/coretest.vcxproj
@@ -28,25 +28,21 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -73,6 +69,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PWSBin)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">$(PWSBin)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PWSObj)\$(ProjectName)\</IntDir>
@@ -101,7 +98,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -113,7 +110,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -141,7 +137,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -153,7 +149,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -181,7 +176,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_MBCS_;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_MBCS_;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -192,7 +187,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -219,7 +213,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_MBCS_;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_MBCS_;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -230,7 +224,6 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -269,7 +262,7 @@
     <ClInclude Include="TwoFishTest.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\core\core11.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{261882e8-80af-4373-a8cc-a8d52e24bf27}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
src/ui/Windows/language/languageDLL11.vcxproj to old-sln/MSVS10/languageDLL.vcxproj
--- a/src/ui/Windows/language/languageDLL11.vcxproj
+++ b/old-sln/MSVS10/languageDLL.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+ďťż<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
@@ -20,13 +20,11 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -41,6 +39,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PWSBin)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">..\..\$(PWSBin)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PWSObj)\$(ProjectName)\</IntDir>
@@ -52,16 +51,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;languageDLL_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;languageDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;RESOURCE_DLL;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;RESOURCE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <OutputFile>..\..\$(PWSBin)\pwsafe_base.dll</OutputFile>
@@ -80,16 +78,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;languageDLL_EXPORTS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;languageDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;RESOURCE_DLL;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;RESOURCE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <OutputFile>..\..\$(PWSBin)\pwsafe_base.dll</OutputFile>
src/ui/Windows/pwsafe11.vcxproj to old-sln/MSVS10/pwsafe.vcxproj
--- a/src/ui/Windows/pwsafe11.vcxproj
+++ b/old-sln/MSVS10/pwsafe.vcxproj
@@ -1,1725 +1,1665 @@
-ďťż<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug64|x64">
-      <Configuration>Debug64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugM64|x64">
-      <Configuration>DebugM64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugM|Win32">
-      <Configuration>DebugM</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugM64|x64">
-      <Configuration>DebugM</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugX64|x64">
-      <Configuration>DebugX64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugX|Win32">
-      <Configuration>DebugX</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugX64|x64">
-      <Configuration>DebugX</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug64|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Demo64|x64">
-      <Configuration>Demo64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Demo|Win32">
-      <Configuration>Demo</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Demo64|x64">
-      <Configuration>Demo</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release64|x64">
-      <Configuration>Release64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseM64|x64">
-      <Configuration>ReleaseM64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseM|Win32">
-      <Configuration>ReleaseM</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseM64|x64">
-      <Configuration>ReleaseM</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseX64|x64">
-      <Configuration>ReleaseX64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseX|Win32">
-      <Configuration>ReleaseX</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseX64|x64">
-      <Configuration>ReleaseX</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release64|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|Win32">
-      <Configuration>Template</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template64|x64">
-      <Configuration>Template</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A3313FA9-CB57-48C2-B660-EE4BF94714D2}</ProjectGuid>
-    <RootNamespace>pwsafe</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugM|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugX|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='ReleaseX|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='ReleaseM|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Demo|x64'">
-    <PlatformToolset>v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="UserVariables.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">..\$(PWSBin)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">..\$(PWSBin)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">pwsafe</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template64|x64'">pwsafe</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;$(XercesDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;$(Xerces64Dir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;setupapi.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/$(ProjectName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3D.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);$(XercesDir)\lib;..\..\..\build\lib\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3D.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);$(Xerces64Dir)\lib;..\..\..\build\lib\pwsafe\Debug64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF /SECTION:.rsrc,rw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);$(XercesDir)\lib;..\..\..\build\lib\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">
-    <PreBuildEvent>
-      <Message>Pre-build event command script</Message>
-      <Command>cscript pre_build.vbs</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0501;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
-      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
-      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\$(PWSLib);$(Xerces64Dir)\lib;..\..\..\build\lib\pwsafe\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PostBuildEvent>
-      <Command>cscript post_build.vbs</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="AboutDlg.cpp" />
-    <ClCompile Include="AddEdit_Additional.cpp" />
-    <ClCompile Include="AddEdit_Basic.cpp" />
-    <ClCompile Include="AddEdit_DateTimes.cpp" />
-    <ClCompile Include="AddEdit_PasswordPolicy.cpp" />
-    <ClCompile Include="AddEdit_PropertyPage.cpp" />
-    <ClCompile Include="AddEdit_PropertySheet.cpp" />
-    <ClCompile Include="AdvancedDlg.cpp" />
-    <ClCompile Include="ChangeAliasPswd.cpp" />
-    <ClCompile Include="ClearQuestionDlg.cpp" />
-    <ClCompile Include="ColumnChooserDlg.cpp" />
-    <ClCompile Include="ColumnChooserLC.cpp" />
-    <ClCompile Include="CompareResultsDlg.cpp" />
-    <ClCompile Include="CompareWithSelectDlg.cpp" />
-    <ClCompile Include="ConfirmDeleteDlg.cpp" />
-    <ClCompile Include="ControlExtns.cpp" />
-    <ClCompile Include="CoolMenu.cpp" />
-    <ClCompile Include="CreateShortcutDlg.cpp" />
-    <ClCompile Include="CryptKeyEntry.cpp" />
-    <ClCompile Include="CWTreeCtrl.cpp" />
-    <ClCompile Include="DboxMain.cpp" />
-    <ClCompile Include="DboxTray.cpp" />
-    <ClCompile Include="DDStatic.cpp" />
-    <ClCompile Include="DDSupport.cpp" />
-    <ClCompile Include="DisplayFSBkupFiles.cpp" />
-    <ClCompile Include="DropSource.cpp" />
-    <ClCompile Include="DropTarget.cpp" />
-    <ClCompile Include="DumpSelect.cpp" />
-    <ClCompile Include="EBListCtrl.cpp" />
-    <ClCompile Include="EditShortcutDlg.cpp" />
-    <ClCompile Include="EntryKBHotKey.cpp" />
-    <ClCompile Include="ExpPswdLC.cpp" />
-    <ClCompile Include="ExpPWListDlg.cpp" />
-    <ClCompile Include="ExtThread.cpp" />
-    <ClCompile Include="filter\FilterBaseDlg.cpp" />
-    <ClCompile Include="filter\FilterBoolDlg.cpp" />
-    <ClCompile Include="filter\FilterDateDlg.cpp" />
-    <ClCompile Include="filter\FilterDCADlg.cpp" />
-    <ClCompile Include="filter\FilterEntrySizeDlg.cpp" />
-    <ClCompile Include="filter\FilterEntryStatusDlg.cpp" />
-    <ClCompile Include="filter\FilterEntryTypeDlg.cpp" />
-    <ClCompile Include="filter\FilterIntegerDlg.cpp" />
-    <ClCompile Include="filter\FilterPasswordDlg.cpp" />
-    <ClCompile Include="filter\FilterStringDlg.cpp" />
-    <ClCompile Include="Fonts.cpp" />
-    <ClCompile Include="FontsDialog.cpp" />
-    <ClCompile Include="GeneralMsgBox.cpp" />
-    <ClCompile Include="ImportTextDlg.cpp" />
-    <ClCompile Include="ImportXMLDlg.cpp" />
-    <ClCompile Include="InfoDisplay.cpp" />
-    <ClCompile Include="InputBox.cpp" />
-    <ClCompile Include="LVHdrCtrl.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="MainEdit.cpp" />
-    <ClCompile Include="MainFile.cpp" />
-    <ClCompile Include="MainFilters.cpp" />
-    <ClCompile Include="MainManage.cpp" />
-    <ClCompile Include="MainMenu.cpp" />
-    <ClCompile Include="MainView.cpp" />
-    <ClCompile Include="filter\ManageFiltersDlg.cpp" />
-    <ClCompile Include="ManagePSWDPols.cpp" />
-    <ClCompile Include="MenuShortcuts.cpp" />
-    <ClCompile Include="MenuTipper.cpp" />
-    <ClCompile Include="MigratePrefs.cpp" />
-    <ClCompile Include="Options_PropertyPage.cpp" />
-    <ClCompile Include="Options_PropertySheet.cpp" />
-    <ClCompile Include="OptionsBackup.cpp" />
-    <ClCompile Include="OptionsDisplay.cpp" />
-    <ClCompile Include="OptionsMisc.cpp" />
-    <ClCompile Include="OptionsPasswordHistory.cpp" />
-    <ClCompile Include="OptionsSecurity.cpp" />
-    <ClCompile Include="OptionsShortcuts.cpp" />
-    <ClCompile Include="OptionsSystem.cpp" />
-    <ClCompile Include="PasskeyChangeDlg.cpp" />
-    <ClCompile Include="PasskeyEntry.cpp" />
-    <ClCompile Include="PasskeySetup.cpp" />
-    <ClCompile Include="PasswordPolicyDlg.cpp" />
-    <ClCompile Include="PasswordSubsetDlg.cpp" />
-    <ClCompile Include="PKBaseDlg.cpp" />
-    <ClCompile Include="Properties.cpp" />
-    <ClCompile Include="PupText.cpp" />
-    <ClCompile Include="PWDialog.cpp" />
-    <ClCompile Include="PWFileDialog.cpp" />
-    <ClCompile Include="filter\PWFilterLC.cpp" />
-    <ClCompile Include="filter\PWFiltersDlg.cpp" />
-    <ClCompile Include="PWFindToolBar.cpp" />
-    <ClCompile Include="PWHdrCtrlNoChng.cpp" />
-    <ClCompile Include="PWHistListCtrl.cpp" />
-    <ClCompile Include="PWListCtrl.cpp" />
-    <ClCompile Include="PWPropertyPage.cpp" />
-    <ClCompile Include="PWPropertySheet.cpp" />
-    <ClCompile Include="PWResizeDialog.cpp" />
-    <ClCompile Include="PWSclipboard.cpp" />
-    <ClCompile Include="PWSFaultHandler.cpp" />
-    <ClCompile Include="PWSRecentFileList.cpp" />
-    <ClCompile Include="PWStatusBar.cpp" />
-    <ClCompile Include="PWSversion.cpp" />
-    <ClCompile Include="PWToolBar.cpp" />
-    <ClCompile Include="PWTreeCtrl.cpp" />
-    <ClCompile Include="QuerySetDef.cpp" />
-    <ClCompile Include="RichEditCtrlExtn.cpp" />
-    <ClCompile Include="RUEList.cpp" />
-    <ClCompile Include="SampleTextDlg.cpp" />
-    <ClCompile Include="SCWListCtrl.cpp" />
-    <ClCompile Include="SecString.cpp" />
-    <ClCompile Include="filter\SetFiltersDlg.cpp" />
-    <ClCompile Include="filter\SetHistoryFiltersDlg.cpp" />
-    <ClCompile Include="filter\SetPolicyFiltersDlg.cpp" />
-    <ClCompile Include="SHCTHotKey.cpp" />
-    <ClCompile Include="SHCTListCtrl.cpp" />
-    <ClCompile Include="Shortcut.cpp" />
-    <ClCompile Include="ShowCompareDlg.cpp" />
-    <ClCompile Include="SingleInstance.cpp" />
-    <ClCompile Include="SMemFile.cpp" />
-    <ClCompile Include="Subclass.cpp" />
-    <ClCompile Include="SysColStatic.cpp" />
-    <ClCompile Include="SystemTray.cpp" />
-    <ClCompile Include="ThisMfcApp.cpp" />
-    <ClCompile Include="TryAgainDlg.cpp" />
-    <ClCompile Include="ViewReport.cpp" />
-    <ClCompile Include="VirtualKeyboard\VKBButton.cpp" />
-    <ClCompile Include="VirtualKeyboard\VKeyBoardDlg.cpp" />
-    <ClCompile Include="WZAdvanced.cpp" />
-    <ClCompile Include="WZFinish.cpp" />
-    <ClCompile Include="WZPropertyPage.cpp" />
-    <ClCompile Include="WZPropertySheet.cpp" />
-    <ClCompile Include="WZSelectDB.cpp" />
-    <ClCompile Include="YubiCfgDlg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="AboutDlg.h" />
-    <ClInclude Include="AddEdit_Additional.h" />
-    <ClInclude Include="AddEdit_Basic.h" />
-    <ClInclude Include="AddEdit_DateTimes.h" />
-    <ClInclude Include="AddEdit_PasswordPolicy.h" />
-    <ClInclude Include="AddEdit_PropertyPage.h" />
-    <ClInclude Include="AddEdit_PropertySheet.h" />
-    <ClInclude Include="AdvancedDlg.h" />
-    <ClInclude Include="AdvancedValues.h" />
-    <ClInclude Include="ChangeAliasPswd.h" />
-    <ClInclude Include="ClearQuestionDlg.h" />
-    <ClInclude Include="ColumnChooserDlg.h" />
-    <ClInclude Include="ColumnChooserLC.h" />
-    <ClInclude Include="CompareResultsDlg.h" />
-    <ClInclude Include="CompareWithSelectDlg.h" />
-    <ClInclude Include="ConfirmDeleteDlg.h" />
-    <ClInclude Include="ControlExtns.h" />
-    <ClInclude Include="CoolMenu.h" />
-    <ClInclude Include="..\..\core\core.h" />
-    <ClInclude Include="CreateShortcutDlg.h" />
-    <ClInclude Include="CryptKeyEntry.h" />
-    <ClInclude Include="CWTreeCtrl.h" />
-    <ClInclude Include="DboxMain.h" />
-    <ClInclude Include="DDStatic.h" />
-    <ClInclude Include="DDSupport.h" />
-    <ClInclude Include="DisplayFSBkupFiles.h" />
-    <ClInclude Include="DropSource.h" />
-    <ClInclude Include="DropTarget.h" />
-    <ClInclude Include="DumpSelect.h" />
-    <ClInclude Include="EBListCtrl.h" />
-    <ClInclude Include="EditShortcutDlg.h" />
-    <ClInclude Include="EntryKBHotKey.h" />
-    <ClInclude Include="ExpPswdLC.h" />
-    <ClInclude Include="ExpPWListDlg.h" />
-    <ClInclude Include="ExtThread.h" />
-    <ClInclude Include="filter\FilterBoolDlg.h" />
-    <ClInclude Include="filter\FilterDateDlg.h" />
-    <ClInclude Include="filter\FilterDCADlg.h" />
-    <ClInclude Include="filter\FilterEntrySizeDlg.h" />
-    <ClInclude Include="filter\FilterEntryStatusDlg.h" />
-    <ClInclude Include="filter\FilterEntryTypeDlg.h" />
-    <ClInclude Include="filter\FilterIntegerDlg.h" />
-    <ClInclude Include="filter\FilterPasswordDlg.h" />
-    <ClInclude Include="filter\FilterStringDlg.h" />
-    <ClInclude Include="Fonts.h" />
-    <ClInclude Include="FontsDialog.h" />
-    <ClInclude Include="GeneralMsgBox.h" />
-    <ClInclude Include="HKModifiers.h" />
-    <ClInclude Include="ImportTextDlg.h" />
-    <ClInclude Include="ImportXMLDlg.h" />
-    <ClInclude Include="InfoDisplay.h" />
-    <ClInclude Include="InputBox.h" />
-    <ClInclude Include="jprdebug.h" />
-    <ClInclude Include="LVHdrCtrl.h" />
-    <ClInclude Include="filter\ManageFiltersDlg.h" />
-    <ClInclude Include="ManagePSWDPols.h" />
-    <ClInclude Include="MenuShortcuts.h" />
-    <ClInclude Include="MenuTipper.h" />
-    <ClInclude Include="MFCmessages.h" />
-    <ClInclude Include="Options_PropertyPage.h" />
-    <ClInclude Include="Options_PropertySheet.h" />
-    <ClInclude Include="OptionsBackup.h" />
-    <ClInclude Include="OptionsDisplay.h" />
-    <ClInclude Include="OptionsMisc.h" />
-    <ClInclude Include="OptionsPasswordHistory.h" />
-    <ClInclude Include="OptionsSecurity.h" />
-    <ClInclude Include="OptionsShortcuts.h" />
-    <ClInclude Include="OptionsSystem.h" />
-    <ClInclude Include="PasskeyChangeDlg.h" />
-    <ClInclude Include="PasskeyEntry.h" />
-    <ClInclude Include="PasskeySetup.h" />
-    <ClInclude Include="PasswordPolicyDlg.h" />
-    <ClInclude Include="PasswordSafe.h" />
-    <ClInclude Include="PasswordSubsetDlg.h" />
-    <ClInclude Include="PKBaseDlg.h" />
-    <ClInclude Include="Properties.h" />
-    <ClInclude Include="PupText.h" />
-    <ClInclude Include="PWDialog.h" />
-    <ClInclude Include="PWFileDialog.h" />
-    <ClInclude Include="filter\PWFilterLC.h" />
-    <ClInclude Include="filter\PWFiltersDlg.h" />
-    <ClInclude Include="PWFindToolBar.h" />
-    <ClInclude Include="PWHdrCtrlNoChng.h" />
-    <ClInclude Include="PWHistListCtrl.h" />
-    <ClInclude Include="PWListCtrl.h" />
-    <ClInclude Include="PWPropertyPage.h" />
-    <ClInclude Include="PWPropertySheet.h" />
-    <ClInclude Include="PWResizeDialog.h" />
-    <ClInclude Include="PWSclipboard.h" />
-    <ClInclude Include="PWSFaultHandler.h" />
-    <ClInclude Include="PWSRecentFileList.h" />
-    <ClInclude Include="PWStatusBar.h" />
-    <ClInclude Include="PWSversion.h" />
-    <ClInclude Include="PWToolBar.h" />
-    <ClInclude Include="PWTreeCtrl.h" />
-    <ClInclude Include="QuerySetDef.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="resource2.h" />
-    <ClInclude Include="resource3.h" />
-    <ClInclude Include="RichEditCtrlExtn.h" />
-    <ClInclude Include="RUEList.h" />
-    <ClInclude Include="SampleTextDlg.h" />
-    <ClInclude Include="SCWListCtrl.h" />
-    <ClInclude Include="SecString.h" />
-    <ClInclude Include="filter\SetFiltersDlg.h" />
-    <ClInclude Include="filter\SetHistoryFiltersDlg.h" />
-    <ClInclude Include="filter\SetPolicyFiltersDlg.h" />
-    <ClInclude Include="SHCTHotKey.h" />
-    <ClInclude Include="SHCTListCtrl.h" />
-    <ClInclude Include="Shortcut.h" />
-    <ClInclude Include="ShowCompareDlg.h" />
-    <ClInclude Include="SingleInstance.h" />
-    <ClInclude Include="SMemFile.h" />
-    <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="Subclass.h" />
-    <ClInclude Include="SysColStatic.h" />
-    <ClInclude Include="SystemTray.h" />
-    <ClInclude Include="ThisMfcApp.h" />
-    <ClInclude Include="TryAgainDlg.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="ViewReport.h" />
-    <ClInclude Include="VirtualKeyboard\VKBButton.h" />
-    <ClInclude Include="VirtualKeyboard\VKeyBoardDlg.h" />
-    <ClInclude Include="VirtualKeyboard\VKresource.h" />
-    <ClInclude Include="VirtualKeyboard\VKresource3.h" />
-    <ClInclude Include="VirtualKeyboard\VKShiftState.h" />
-    <ClInclude Include="WZAdvanced.h" />
-    <ClInclude Include="WZExecuteThreadParms.h" />
-    <ClInclude Include="WZFinish.h" />
-    <ClInclude Include="WZPropertyPage.h" />
-    <ClInclude Include="WZPropertySheet.h" />
-    <ClInclude Include="WZSelectDB.h" />
-    <ClInclude Include="YubiCfgDlg.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="graphics\abase.bmp" />
-    <None Include="graphics\abase.ico" />
-    <None Include="graphics\abase_exp.bmp" />
-    <None Include="graphics\abase_exp.ico" />
-    <None Include="graphics\abase_warn.bmp" />
-    <None Include="graphics\abase_warn.ico" />
-    <None Include="graphics\dragbar\classic\AutotypeX.bmp" />
-    <None Include="graphics\dragbar\new\AutotypeX.bmp" />
-    <None Include="graphics\empty_node.bmp" />
-    <None Include="graphics\findtoolbar\classic\findadvancedon.bmp" />
-    <None Include="graphics\findtoolbar\new\findadvancedon.bmp" />
-    <None Include="graphics\toolbar\classic\addgroup.bmp" />
-    <None Include="graphics\toolbar\classic\clearfilter.bmp" />
-    <None Include="graphics\toolbar\classic\copytoclipboard.bmp" />
-    <None Include="graphics\toolbar\classic\duplicategroup.bmp" />
-    <None Include="graphics\toolbar\classic\passwordpolicy.bmp" />
-    <None Include="graphics\toolbar\new\about.bmp" />
-    <None Include="graphics\toolbar\classic\about.bmp" />
-    <None Include="graphics\toolbar\new\about_disabled.bmp" />
-    <None Include="graphics\toolbar\new\add.bmp" />
-    <None Include="graphics\toolbar\classic\add.bmp" />
-    <None Include="graphics\toolbar\new\addgroup.bmp" />
-    <None Include="graphics\toolbar\new\addgroup_disabled.bmp" />
-    <None Include="graphics\toolbar\new\add_disabled.bmp" />
-    <None Include="graphics\alias.bmp" />
-    <None Include="graphics\alias.ico" />
-    <None Include="graphics\toolbar\new\applyfilter.bmp" />
-    <None Include="graphics\toolbar\classic\applyfilter.bmp" />
-    <None Include="graphics\toolbar\new\applyfilter_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\autotype.bmp" />
-    <None Include="graphics\toolbar\new\autotype.bmp" />
-    <None Include="graphics\toolbar\new\autotype_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\backup.bmp" />
-    <None Include="graphics\toolbar\new\backup.bmp" />
-    <None Include="graphics\toolbar\new\backup_disabled.bmp" />
-    <None Include="graphics\blank.bmp" />
-    <None Include="graphics\toolbar\classic\browseurl.bmp" />
-    <None Include="graphics\toolbar\new\browseurl.bmp" />
-    <None Include="graphics\toolbar\new\browseurl_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\browseurlplus.bmp" />
-    <None Include="graphics\toolbar\new\browseurlplus.bmp" />
-    <None Include="graphics\toolbar\new\browseurlplus_disabled.bmp" />
-    <None Include="graphics\toolbar\new\changecombo.bmp" />
-    <None Include="graphics\toolbar\classic\changecombo.bmp" />
-    <None Include="graphics\toolbar\new\changecombo_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\changefont.bmp" />
-    <None Include="graphics\toolbar\new\changefont.bmp" />
-    <None Include="graphics\toolbar\new\changefont_disabled.bmp" />
-    <None Include="graphics\toolbar\new\changepswdfont.bmp" />
-    <None Include="graphics\toolbar\classic\changepswdfont.bmp" />
-    <None Include="graphics\toolbar\new\changepswdfont_disabled.bmp" />
-    <None Include="graphics\toolbar\new\changevkbdfont.bmp" />
-    <None Include="graphics\toolbar\classic\changevkbdfont.bmp" />
-    <None Include="graphics\toolbar\new\changevkbdfont_disabled.bmp" />
-    <None Include="graphics\checked.bmp" />
-    <None Include="graphics\toolbar\classic\clearclipboard.bmp" />
-    <None Include="graphics\toolbar\new\clearclipboard.bmp" />
-    <None Include="graphics\toolbar\new\clearclipboard_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\close.bmp" />
-    <None Include="graphics\toolbar\new\clearfilter.bmp" />
-    <None Include="graphics\toolbar\new\clearfilter_disabled.bmp" />
-    <None Include="graphics\toolbar\new\close.bmp" />
-    <None Include="graphics\toolbar\new\close_disabled.bmp" />
-    <None Include="graphics\toolbar\new\collapseall.bmp" />
-    <None Include="graphics\toolbar\classic\collapseall.bmp" />
-    <None Include="graphics\toolbar\new\collapseall_disabled.bmp" />
-    <None Include="graphics\toolbar\new\compare.bmp" />
-    <None Include="graphics\toolbar\classic\compare.bmp" />
-    <None Include="graphics\toolbar\new\compare_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\copynotes.bmp" />
-    <None Include="graphics\toolbar\new\copynotes.bmp" />
-    <None Include="graphics\toolbar\new\copynotes_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\copypassword.bmp" />
-    <None Include="graphics\toolbar\new\copypassword.bmp" />
-    <None Include="graphics\toolbar\new\copypassword_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\copyuser.bmp" />
-    <None Include="graphics\toolbar\new\copytoclipboard.bmp" />
-    <None Include="graphics\toolbar\new\copyuser.bmp" />
-    <None Include="graphics\toolbar\new\copyuser_disabled.bmp" />
-    <None Include="..\..\core\core.rc2" />
-    <None Include="graphics\cpane.bmp" />
-    <None Include="graphics\cpane.ico" />
-    <None Include="graphics\cpane_s.bmp" />
-    <None Include="graphics\toolbar\classic\createshortcut.bmp" />
-    <None Include="graphics\toolbar\new\createshortcut.bmp" />
-    <None Include="graphics\toolbar\new\createshortcut_disabled.bmp" />
-    <None Include="graphics\toolbar\new\cutsomizetoolbar.bmp" />
-    <None Include="graphics\toolbar\classic\cutsomizetoolbar.bmp" />
-    <None Include="graphics\toolbar\classic\delete.bmp" />
-    <None Include="graphics\toolbar\new\delete.bmp" />
-    <None Include="graphics\toolbar\new\delete_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\duplicate.bmp" />
-    <None Include="graphics\toolbar\new\duplicate.bmp" />
-    <None Include="graphics\toolbar\new\duplicategroup.bmp" />
-    <None Include="graphics\toolbar\new\duplicategroup_disabled.bmp" />
-    <None Include="graphics\toolbar\new\duplicate_disabled.bmp" />
-    <None Include="graphics\dragbar\classic\email.bmp" />
-    <None Include="graphics\dragbar\new\email.bmp" />
-    <None Include="graphics\dragbar\new\emailX.bmp" />
-    <None Include="graphics\dragbar\classic\emailx.bmp" />
-    <None Include="graphics\empty.bmp" />
-    <None Include="graphics\exclamation.bmp" />
-    <None Include="graphics\toolbar\classic\exit.bmp" />
-    <None Include="graphics\toolbar\new\exit.bmp" />
-    <None Include="graphics\toolbar\new\exit_disabled.bmp" />
-    <None Include="graphics\toolbar\new\expandall.bmp" />
-    <None Include="graphics\toolbar\classic\expandall.bmp" />
-    <None Include="graphics\toolbar\new\expandall_disabled.bmp" />
-    <None Include="graphics\toolbar\new\export.bmp" />
-    <None Include="graphics\toolbar\classic\export.bmp" />
-    <None Include="graphics\toolbar\new\export_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\exporttext.bmp" />
-    <None Include="graphics\toolbar\new\exporttext.bmp" />
-    <None Include="graphics\toolbar\new\exporttext_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\exportXML.bmp" />
-    <None Include="graphics\toolbar\new\exportXML.bmp" />
-    <None Include="graphics\toolbar\new\exportXML_disabled.bmp" />
-    <None Include="graphics\filter_active.bmp" />
-    <None Include="graphics\findtoolbar\classic\find.bmp" />
-    <None Include="graphics\findtoolbar\new\find.bmp" />
-    <None Include="graphics\findtoolbar\new\find_disabled.bmp" />
-    <None Include="graphics\findtoolbar\new\findadvanced.bmp" />
-    <None Include="graphics\findtoolbar\classic\findadvanced.bmp" />
-    <None Include="graphics\findtoolbar\classic\findcase_i.bmp" />
-    <None Include="graphics\findtoolbar\new\findcase_i.bmp" />
-    <None Include="graphics\findtoolbar\classic\findcase_s.bmp" />
-    <None Include="graphics\findtoolbar\new\findcase_s.bmp" />
-    <None Include="graphics\findtoolbar\classic\findclear.bmp" />
-    <None Include="graphics\findtoolbar\new\findclear.bmp" />
-    <None Include="graphics\findtoolbar\classic\findclose.bmp" />
-    <None Include="graphics\findtoolbar\new\findclose.bmp" />
-    <None Include="graphics\findtoolbar\findctrlplaceholder.bmp" />
-    <None Include="graphics\findtoolbar\classic\findreport.bmp" />
-    <None Include="graphics\findtoolbar\new\findreport.bmp" />
-    <None Include="graphics\dragbar\new\Group.bmp" />
-    <None Include="graphics\dragbar\classic\Group.bmp" />
-    <None Include="graphics\toolbar\classic\groupenter.bmp" />
-    <None Include="graphics\toolbar\new\groupenter.bmp" />
-    <None Include="graphics\toolbar\new\groupenter_disabled.bmp" />
-    <None Include="graphics\dragbar\new\GroupX.bmp" />
-    <None Include="graphics\dragbar\classic\GroupX.bmp" />
-    <None Include="graphics\toolbar\classic\help.bmp" />
-    <None Include="graphics\toolbar\new\help.bmp" />
-    <None Include="graphics\toolbar\new\help_disabled.bmp" />
-    <None Include="graphics\toolbar\new\import.bmp" />
-    <None Include="graphics\toolbar\classic\import.bmp" />
-    <None Include="graphics\toolbar\new\import_disabled.bmp" />
-    <None Include="graphics\toolbar\new\importtext.bmp" />
-    <None Include="graphics\toolbar\classic\importtext.bmp" />
-    <None Include="graphics\toolbar\new\importtext_disabled.bmp" />
-    <None Include="graphics\toolbar\new\importXML.bmp" />
-    <None Include="graphics\toolbar\classic\importXML.bmp" />
-    <None Include="graphics\toolbar\new\importXML_disabled.bmp" />
-    <None Include="graphics\toolbar\new\listtree.bmp" />
-    <None Include="graphics\toolbar\classic\listtree.bmp" />
-    <None Include="graphics\toolbar\new\listtree_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\lock.bmp" />
-    <None Include="graphics\toolbar\new\lock.bmp" />
-    <None Include="graphics\toolbar\new\lock_disabled.bmp" />
-    <None Include="graphics\locked_tray.ico" />
-    <None Include="graphics\toolbar\classic\managefilters.bmp" />
-    <None Include="graphics\toolbar\new\managefilters.bmp" />
-    <None Include="graphics\toolbar\new\managefilters_disabled.bmp" />
-    <None Include="graphics\toolbar\new\merge.bmp" />
-    <None Include="graphics\toolbar\classic\merge.bmp" />
-    <None Include="graphics\toolbar\new\merge_disabled.bmp" />
-    <None Include="graphics\toolbar\new\new.bmp" />
-    <None Include="graphics\toolbar\classic\new.bmp" />
-    <None Include="graphics\toolbar\new\new_disabled.bmp" />
-    <None Include="graphics\node.bmp" />
-    <None Include="graphics\normal.bmp" />
-    <None Include="graphics\normal.ico" />
-    <None Include="graphics\normal_exp.bmp" />
-    <None Include="graphics\normal_exp.ico" />
-    <None Include="graphics\normal_warn.bmp" />
-    <None Include="graphics\normal_warn.ico" />
-    <None Include="graphics\dragbar\new\Notes.bmp" />
-    <None Include="graphics\dragbar\classic\Notes.bmp" />
-    <None Include="graphics\dragbar\new\NotesX.bmp" />
-    <None Include="graphics\dragbar\classic\NotesX.bmp" />
-    <None Include="graphics\toolbar\new\open.bmp" />
-    <None Include="graphics\toolbar\classic\open.bmp" />
-    <None Include="graphics\toolbar\new\open_disabled.bmp" />
-    <None Include="graphics\toolbar\new\options.bmp" />
-    <None Include="graphics\toolbar\classic\options.bmp" />
-    <None Include="graphics\toolbar\new\options_disabled.bmp" />
-    <None Include="graphics\dragbar\new\Password.bmp" />
-    <None Include="graphics\dragbar\classic\Password.bmp" />
-    <None Include="graphics\toolbar\new\passwordchars.bmp" />
-    <None Include="graphics\toolbar\classic\passwordchars.bmp" />
-    <None Include="graphics\toolbar\new\passwordchars_disabled.bmp" />
-    <None Include="graphics\toolbar\new\passwordpolicy.bmp" />
-    <None Include="graphics\toolbar\new\passwordpolicy_disabled.bmp" />
-    <None Include="res\PasswordSafe2.rc2" />
-    <None Include="res\PasswordSafe3.rc2" />
-    <None Include="graphics\dragbar\classic\PasswordX.bmp" />
-    <None Include="graphics\dragbar\new\PasswordX.bmp" />
-    <None Include="graphics\toolbar\classic\properties.bmp" />
-    <None Include="graphics\toolbar\new\properties.bmp" />
-    <None Include="graphics\toolbar\new\properties_disabled.bmp" />
-    <None Include="graphics\psafetxt.bmp" />
-    <None Include="graphics\pws_db.bmp" />
-    <None Include="graphics\toolbar\new\redo.bmp" />
-    <None Include="graphics\toolbar\classic\redo.bmp" />
-    <None Include="graphics\toolbar\new\redo_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\restore.bmp" />
-    <None Include="graphics\toolbar\new\restore.bmp" />
-    <None Include="graphics\toolbar\new\restore_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\runcmd.bmp" />
-    <None Include="graphics\toolbar\new\runcmd.bmp" />
-    <None Include="graphics\toolbar\new\runcmd_disabled.bmp" />
-    <None Include="graphics\toolbar\new\save.bmp" />
-    <None Include="graphics\toolbar\classic\save.bmp" />
-    <None Include="graphics\toolbar\new\save_disabled.bmp" />
-    <None Include="graphics\toolbar\new\saveas.bmp" />
-    <None Include="graphics\toolbar\classic\saveas.bmp" />
-    <None Include="graphics\toolbar\new\saveas_disabled.bmp" />
-    <None Include="graphics\sbase.bmp" />
-    <None Include="graphics\sbase.ico" />
-    <None Include="graphics\sbase_exp.bmp" />
-    <None Include="graphics\sbase_exp.ico" />
-    <None Include="graphics\sbase_warn.bmp" />
-    <None Include="graphics\sbase_warn.ico" />
-    <None Include="graphics\toolbar\classic\sendemail.bmp" />
-    <None Include="graphics\toolbar\new\sendemail.bmp" />
-    <None Include="graphics\toolbar\new\sendemail_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\setfilter.bmp" />
-    <None Include="graphics\toolbar\new\setfilter.bmp" />
-    <None Include="graphics\toolbar\new\setfilter_disabled.bmp" />
-    <None Include="graphics\shortcut.bmp" />
-    <None Include="graphics\shortcut.ico" />
-    <None Include="graphics\toolbar\classic\synchronize.bmp" />
-    <None Include="graphics\toolbar\new\synchronize.bmp" />
-    <None Include="graphics\toolbar\new\synchronize_disabled.bmp" />
-    <None Include="graphics\dragbar\new\Title.bmp" />
-    <None Include="graphics\dragbar\classic\Title.bmp" />
-    <None Include="graphics\dragbar\new\TitleX.bmp" />
-    <None Include="graphics\dragbar\classic\TitleX.bmp" />
-    <None Include="graphics\tray.ico" />
-    <None Include="graphics\tray_blue.ico" />
-    <None Include="graphics\tray_white.ico" />
-    <None Include="graphics\tray_yellow.ico" />
-    <None Include="graphics\unchecked.bmp" />
-    <None Include="graphics\toolbar\classic\undo.bmp" />
-    <None Include="graphics\toolbar\new\undo.bmp" />
-    <None Include="graphics\toolbar\new\undo_disabled.bmp" />
-    <None Include="graphics\toolbar\new\unlock.bmp" />
-    <None Include="graphics\toolbar\classic\unlock.bmp" />
-    <None Include="graphics\toolbar\new\unlock_disabled.bmp" />
-    <None Include="graphics\unlocked_tray.ico" />
-    <None Include="graphics\dragbar\classic\URL.bmp" />
-    <None Include="graphics\dragbar\new\URL.bmp" />
-    <None Include="graphics\dragbar\classic\URLX.bmp" />
-    <None Include="graphics\dragbar\new\URLX.bmp" />
-    <None Include="graphics\dragbar\new\User.bmp" />
-    <None Include="graphics\dragbar\classic\User.bmp" />
-    <None Include="graphics\dragbar\classic\UserX.bmp" />
-    <None Include="graphics\dragbar\new\UserX.bmp" />
-    <None Include="graphics\toolbar\classic\validate.bmp" />
-    <None Include="graphics\toolbar\new\validate.bmp" />
-    <None Include="graphics\toolbar\new\validate_disabled.bmp" />
-    <None Include="graphics\toolbar\new\viewedit.bmp" />
-    <None Include="graphics\toolbar\classic\viewedit.bmp" />
-    <None Include="graphics\toolbar\new\viewedit_disabled.bmp" />
-    <None Include="graphics\toolbar\classic\viewreports.bmp" />
-    <None Include="graphics\toolbar\new\viewreports.bmp" />
-    <None Include="graphics\toolbar\new\viewreports_disabled.bmp" />
-    <None Include="graphics\vkbd.bmp" />
-    <None Include="VirtualKeyboard\res\VKPasswordSafe3.rc2" />
-    <None Include="graphics\w95mbx01.ico" />
-    <None Include="graphics\w95mbx02.ico" />
-    <None Include="graphics\w95mbx03.ico" />
-    <None Include="graphics\w95mbx04.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="PasswordSafe.rc">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\core\core11.vcxproj">
-      <Project>{261882e8-80af-4373-a8cc-a8d52e24bf27}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\os\windows\os11.vcxproj">
-      <Project>{d5dbd8e8-cf48-4ca3-b773-c5f3b3316c73}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\os\windows\pws_autotype\pws_autotype11.vcxproj">
-      <Project>{fc3f78c0-1b04-40cf-a7b5-6f037436d9c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\os\windows\pws_osk\pws_osk11.vcxproj">
-      <Project>{5f619d4f-185a-4b4b-8e77-02698eaeb962}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="graphics\Yubikey-button-disabled.bmp" />
-    <Image Include="graphics\Yubikey-button.bmp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="PasswordSafe.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
+ďťż<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug64|x64">
+      <Configuration>Debug64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugM64|x64">
+      <Configuration>DebugM64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugM|Win32">
+      <Configuration>DebugM</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugM64|x64">
+      <Configuration>DebugM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugX64|x64">
+      <Configuration>DebugX64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugX|Win32">
+      <Configuration>DebugX</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugX64|x64">
+      <Configuration>DebugX</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug64|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Demo64|x64">
+      <Configuration>Demo64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Demo|Win32">
+      <Configuration>Demo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Demo64|x64">
+      <Configuration>Demo</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release64|x64">
+      <Configuration>Release64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseM64|x64">
+      <Configuration>ReleaseM64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseM|Win32">
+      <Configuration>ReleaseM</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseM64|x64">
+      <Configuration>ReleaseM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseX64|x64">
+      <Configuration>ReleaseX64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseX|Win32">
+      <Configuration>ReleaseX</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseX64|x64">
+      <Configuration>ReleaseX</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release64|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Template|Win32">
+      <Configuration>Template</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Template64|x64">
+      <Configuration>Template</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A3313FA9-CB57-48C2-B660-EE4BF94714D2}</ProjectGuid>
+    <RootNamespace>pwsafe</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="UserVariables.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">..\$(PWSBin)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">..\$(PWSBin)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">..\$(PWSObj)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">pwsafe</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Template64|x64'">pwsafe</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;$(XercesDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;$(Xerces64Dir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;DEMO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/$(ProjectName).pdb</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Debug;..\..\..\build\lib\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/$(ProjectName).pdb</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);$(XercesDir)\lib;..\..\..\build\bin\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;Rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);$(Xerces64Dir)\lib;..\..\..\build\bin\pwsafe\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>core.lib;os.lib;YkLib22.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\lib\pwsafe\Release;..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=MSXML;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;msxml6.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);$(XercesDir)\lib;..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">
+    <PreBuildEvent>
+      <Message>Pre-build event command script</Message>
+      <Command>cscript pre_build.vbs</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>..\$(PWSObj)\$(ProjectName)/pwsafe.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;WINVER=0x0500;USE_XML_LIBRARY=XERCES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>..\$(PWSObj)\$(ProjectName)/pwsafe.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>..\$(PWSObj)\$(ProjectName)/</AssemblerListingLocation>
+      <ObjectFileName>..\$(PWSObj)\$(ProjectName)/</ObjectFileName>
+      <ProgramDataBaseFileName>..\$(PWSObj)\$(ProjectName)/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>/OPT:REF %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>core.lib;os.lib;WS2_32.lib;rpcrt4.lib;version.lib;psapi.lib;Wtsapi32.lib;dbghelp.lib;htmlhelp.lib;UxTheme.lib;xerces-c_static_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\$(PWSBin)/pwsafe.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\$(PWSLib);$(Xerces64Dir)\lib;..\..\..\build\bin\pwsafe\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\$(PWSBin)/pwsafe.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Command>cscript post_build.vbs</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDlg.cpp" />
+    <ClCompile Include="AddEdit_Additional.cpp" />
+    <ClCompile Include="AddEdit_Basic.cpp" />
+    <ClCompile Include="AddEdit_DateTimes.cpp" />
+    <ClCompile Include="AddEdit_PasswordPolicy.cpp" />
+    <ClCompile Include="AddEdit_PropertyPage.cpp" />
+    <ClCompile Include="AddEdit_PropertySheet.cpp" />
+    <ClCompile Include="AdvancedDlg.cpp" />
+    <ClCompile Include="ChangeAliasPswd.cpp" />
+    <ClCompile Include="ClearQuestionDlg.cpp" />
+    <ClCompile Include="ColumnChooserDlg.cpp" />
+    <ClCompile Include="ColumnChooserLC.cpp" />
+    <ClCompile Include="CompareResultsDlg.cpp" />
+    <ClCompile Include="CompareWithSelectDlg.cpp" />
+    <ClCompile Include="ConfirmDeleteDlg.cpp" />
+    <ClCompile Include="ControlExtns.cpp" />
+    <ClCompile Include="CoolMenu.cpp" />
+    <ClCompile Include="CreateShortcutDlg.cpp" />
+    <ClCompile Include="CryptKeyEntry.cpp" />
+    <ClCompile Include="CWTreeCtrl.cpp" />
+    <ClCompile Include="DboxMain.cpp" />
+    <ClCompile Include="DboxTray.cpp" />
+    <ClCompile Include="DDStatic.cpp" />
+    <ClCompile Include="DDSupport.cpp" />
+    <ClCompile Include="DisplayFSBkupFiles.cpp" />
+    <ClCompile Include="DropSource.cpp" />
+    <ClCompile Include="DropTarget.cpp" />
+    <ClCompile Include="DumpSelect.cpp" />
+    <ClCompile Include="EBListCtrl.cpp" />
+    <ClCompile Include="EditShortcutDlg.cpp" />
+    <ClCompile Include="EntryKBHotKey.cpp" />
+    <ClCompile Include="ExpPswdLC.cpp" />
+    <ClCompile Include="ExpPWListDlg.cpp" />
+    <ClCompile Include="ExtThread.cpp" />
+    <ClCompile Include="filter\FilterBaseDlg.cpp" />
+    <ClCompile Include="filter\FilterBoolDlg.cpp" />
+    <ClCompile Include="filter\FilterDateDlg.cpp" />
+    <ClCompile Include="filter\FilterDCADlg.cpp" />
+    <ClCompile Include="filter\FilterEntrySizeDlg.cpp" />
+    <ClCompile Include="filter\FilterEntryStatusDlg.cpp" />
+    <ClCompile Include="filter\FilterEntryTypeDlg.cpp" />
+    <ClCompile Include="filter\FilterIntegerDlg.cpp" />
+    <ClCompile Include="filter\FilterPasswordDlg.cpp" />
+    <ClCompile Include="filter\FilterStringDlg.cpp" />
+    <ClCompile Include="Fonts.cpp" />
+    <ClCompile Include="FontsDialog.cpp" />
+    <ClCompile Include="GeneralMsgBox.cpp" />
+    <ClCompile Include="ImportTextDlg.cpp" />
+    <ClCompile Include="ImportXMLDlg.cpp" />
+    <ClCompile Include="InfoDisplay.cpp" />
+    <ClCompile Include="InputBox.cpp" />
+    <ClCompile Include="LVHdrCtrl.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="MainEdit.cpp" />
+    <ClCompile Include="MainFile.cpp" />
+    <ClCompile Include="MainFilters.cpp" />
+    <ClCompile Include="MainManage.cpp" />
+    <ClCompile Include="MainMenu.cpp" />
+    <ClCompile Include="MainView.cpp" />
+    <ClCompile Include="filter\ManageFiltersDlg.cpp" />
+    <ClCompile Include="ManagePSWDPols.cpp" />
+    <ClCompile Include="MenuShortcuts.cpp" />
+    <ClCompile Include="MenuTipper.cpp" />
+    <ClCompile Include="MigratePrefs.cpp" />
+    <ClCompile Include="Options_PropertyPage.cpp" />
+    <ClCompile Include="Options_PropertySheet.cpp" />
+    <ClCompile Include="OptionsBackup.cpp" />
+    <ClCompile Include="OptionsDisplay.cpp" />
+    <ClCompile Include="OptionsMisc.cpp" />
+    <ClCompile Include="OptionsPasswordHistory.cpp" />
+    <ClCompile Include="OptionsSecurity.cpp" />
+    <ClCompile Include="OptionsShortcuts.cpp" />
+    <ClCompile Include="OptionsSystem.cpp" />
+    <ClCompile Include="PasskeyChangeDlg.cpp" />
+    <ClCompile Include="PasskeyEntry.cpp" />
+    <ClCompile Include="PasskeySetup.cpp" />
+    <ClCompile Include="PasswordPolicyDlg.cpp" />
+    <ClCompile Include="PasswordSubsetDlg.cpp" />
+    <ClCompile Include="PKBaseDlg.cpp" />
+    <ClCompile Include="Properties.cpp" />
+    <ClCompile Include="PupText.cpp" />
+    <ClCompile Include="PWDialog.cpp" />
+    <ClCompile Include="PWFileDialog.cpp" />
+    <ClCompile Include="filter\PWFilterLC.cpp" />
+    <ClCompile Include="filter\PWFiltersDlg.cpp" />
+    <ClCompile Include="PWFindToolBar.cpp" />
+    <ClCompile Include="PWHdrCtrlNoChng.cpp" />
+    <ClCompile Include="PWHistListCtrl.cpp" />
+    <ClCompile Include="PWListCtrl.cpp" />
+    <ClCompile Include="PWPropertyPage.cpp" />
+    <ClCompile Include="PWPropertySheet.cpp" />
+    <ClCompile Include="PWResizeDialog.cpp" />
+    <ClCompile Include="PWSclipboard.cpp" />
+    <ClCompile Include="PWSFaultHandler.cpp" />
+    <ClCompile Include="PWSRecentFileList.cpp" />
+    <ClCompile Include="PWStatusBar.cpp" />
+    <ClCompile Include="PWSversion.cpp" />
+    <ClCompile Include="PWToolBar.cpp" />
+    <ClCompile Include="PWTreeCtrl.cpp" />
+    <ClCompile Include="QuerySetDef.cpp" />
+    <ClCompile Include="RichEditCtrlExtn.cpp" />
+    <ClCompile Include="RUEList.cpp" />
+    <ClCompile Include="SampleTextDlg.cpp" />
+    <ClCompile Include="SCWListCtrl.cpp" />
+    <ClCompile Include="SecString.cpp" />
+    <ClCompile Include="filter\SetFiltersDlg.cpp" />
+    <ClCompile Include="filter\SetHistoryFiltersDlg.cpp" />
+    <ClCompile Include="filter\SetPolicyFiltersDlg.cpp" />
+    <ClCompile Include="SHCTHotKey.cpp" />
+    <ClCompile Include="SHCTListCtrl.cpp" />
+    <ClCompile Include="Shortcut.cpp" />
+    <ClCompile Include="ShowCompareDlg.cpp" />
+    <ClCompile Include="SingleInstance.cpp" />
+    <ClCompile Include="SMemFile.cpp" />
+    <ClCompile Include="Subclass.cpp" />
+    <ClCompile Include="SysColStatic.cpp" />
+    <ClCompile Include="SystemTray.cpp" />
+    <ClCompile Include="ThisMfcApp.cpp" />
+    <ClCompile Include="TryAgainDlg.cpp" />
+    <ClCompile Include="ViewReport.cpp" />
+    <ClCompile Include="VirtualKeyboard\VKBButton.cpp" />
+    <ClCompile Include="VirtualKeyboard\VKeyBoardDlg.cpp" />
+    <ClCompile Include="WZAdvanced.cpp" />
+    <ClCompile Include="WZFinish.cpp" />
+    <ClCompile Include="WZPropertyPage.cpp" />
+    <ClCompile Include="WZPropertySheet.cpp" />
+    <ClCompile Include="WZSelectDB.cpp" />
+    <ClCompile Include="YubiCfgDlg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AboutDlg.h" />
+    <ClInclude Include="AddEdit_Additional.h" />
+    <ClInclude Include="AddEdit_Basic.h" />
+    <ClInclude Include="AddEdit_DateTimes.h" />
+    <ClInclude Include="AddEdit_PasswordPolicy.h" />
+    <ClInclude Include="AddEdit_PropertyPage.h" />
+    <ClInclude Include="AddEdit_PropertySheet.h" />
+    <ClInclude Include="AdvancedDlg.h" />
+    <ClInclude Include="AdvancedValues.h" />
+    <ClInclude Include="ChangeAliasPswd.h" />
+    <ClInclude Include="ClearQuestionDlg.h" />
+    <ClInclude Include="ColumnChooserDlg.h" />
+    <ClInclude Include="ColumnChooserLC.h" />
+    <ClInclude Include="CompareResultsDlg.h" />
+    <ClInclude Include="CompareWithSelectDlg.h" />
+    <ClInclude Include="ConfirmDeleteDlg.h" />
+    <ClInclude Include="ControlExtns.h" />
+    <ClInclude Include="CoolMenu.h" />
+    <ClInclude Include="..\..\core\core.h" />
+    <ClInclude Include="CreateShortcutDlg.h" />
+    <ClInclude Include="CryptKeyEntry.h" />
+    <ClInclude Include="CWTreeCtrl.h" />
+    <ClInclude Include="DboxMain.h" />
+    <ClInclude Include="DDStatic.h" />
+    <ClInclude Include="DDSupport.h" />
+    <ClInclude Include="DisplayFSBkupFiles.h" />
+    <ClInclude Include="DropSource.h" />
+    <ClInclude Include="DropTarget.h" />
+    <ClInclude Include="DumpSelect.h" />
+    <ClInclude Include="EBListCtrl.h" />
+    <ClInclude Include="EditShortcutDlg.h" />
+    <ClInclude Include="EntryKBHotKey.h" />
+    <ClInclude Include="ExpPswdLC.h" />
+    <ClInclude Include="ExpPWListDlg.h" />
+    <ClInclude Include="ExtThread.h" />
+    <ClInclude Include="filter\FilterBoolDlg.h" />
+    <ClInclude Include="filter\FilterDateDlg.h" />
+    <ClInclude Include="filter\FilterDCADlg.h" />
+    <ClInclude Include="filter\FilterEntrySizeDlg.h" />
+    <ClInclude Include="filter\FilterEntryStatusDlg.h" />
+    <ClInclude Include="filter\FilterEntryTypeDlg.h" />
+    <ClInclude Include="filter\FilterIntegerDlg.h" />
+    <ClInclude Include="filter\FilterPasswordDlg.h" />
+    <ClInclude Include="filter\FilterStringDlg.h" />
+    <ClInclude Include="Fonts.h" />
+    <ClInclude Include="FontsDialog.h" />
+    <ClInclude Include="GeneralMsgBox.h" />
+    <ClInclude Include="ImportTextDlg.h" />
+    <ClInclude Include="ImportXMLDlg.h" />
+    <ClInclude Include="InfoDisplay.h" />
+    <ClInclude Include="InputBox.h" />
+    <ClInclude Include="jprdebug.h" />
+    <ClInclude Include="LVHdrCtrl.h" />
+    <ClInclude Include="filter\ManageFiltersDlg.h" />
+    <ClInclude Include="ManagePSWDPols.h" />
+    <ClInclude Include="MenuShortcuts.h" />
+    <ClInclude Include="MenuTipper.h" />
+    <ClInclude Include="MFCmessages.h" />
+    <ClInclude Include="Options_PropertyPage.h" />
+    <ClInclude Include="Options_PropertySheet.h" />
+    <ClInclude Include="OptionsBackup.h" />
+    <ClInclude Include="OptionsDisplay.h" />
+    <ClInclude Include="OptionsMisc.h" />
+    <ClInclude Include="OptionsPasswordHistory.h" />
+    <ClInclude Include="OptionsSecurity.h" />
+    <ClInclude Include="OptionsShortcuts.h" />
+    <ClInclude Include="OptionsSystem.h" />
+    <ClInclude Include="PasskeyChangeDlg.h" />
+    <ClInclude Include="PasskeyEntry.h" />
+    <ClInclude Include="PasskeySetup.h" />
+    <ClInclude Include="PasswordPolicyDlg.h" />
+    <ClInclude Include="PasswordSafe.h" />
+    <ClInclude Include="PasswordSubsetDlg.h" />
+    <ClInclude Include="PKBaseDlg.h" />
+    <ClInclude Include="Properties.h" />
+    <ClInclude Include="PupText.h" />
+    <ClInclude Include="PWDialog.h" />
+    <ClInclude Include="PWFileDialog.h" />
+    <ClInclude Include="filter\PWFilterLC.h" />
+    <ClInclude Include="filter\PWFiltersDlg.h" />
+    <ClInclude Include="PWFindToolBar.h" />
+    <ClInclude Include="PWHdrCtrlNoChng.h" />
+    <ClInclude Include="PWHistDlg.h" />
+    <ClInclude Include="PWHistListCtrl.h" />
+    <ClInclude Include="PWListCtrl.h" />
+    <ClInclude Include="PWPropertyPage.h" />
+    <ClInclude Include="PWPropertySheet.h" />
+    <ClInclude Include="PWResizeDialog.h" />
+    <ClInclude Include="PWSclipboard.h" />
+    <ClInclude Include="PWSFaultHandler.h" />
+    <ClInclude Include="PWSRecentFileList.h" />
+    <ClInclude Include="PWStatusBar.h" />
+    <ClInclude Include="PWSversion.h" />
+    <ClInclude Include="PWToolBar.h" />
+    <ClInclude Include="PWTreeCtrl.h" />
+    <ClInclude Include="QuerySetDef.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="resource2.h" />
+    <ClInclude Include="resource3.h" />
+    <ClInclude Include="RichEditCtrlExtn.h" />
+    <ClInclude Include="RUEList.h" />
+    <ClInclude Include="SampleTextDlg.h" />
+    <ClInclude Include="SCWListCtrl.h" />
+    <ClInclude Include="SecString.h" />
+    <ClInclude Include="filter\SetFiltersDlg.h" />
+    <ClInclude Include="filter\SetHistoryFiltersDlg.h" />
+    <ClInclude Include="filter\SetPolicyFiltersDlg.h" />
+    <ClInclude Include="SHCTHotKey.h" />
+    <ClInclude Include="SHCTListCtrl.h" />
+    <ClInclude Include="Shortcut.h" />
+    <ClInclude Include="ShowCompareDlg.h" />
+    <ClInclude Include="SingleInstance.h" />
+    <ClInclude Include="SMemFile.h" />
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="Subclass.h" />
+    <ClInclude Include="SysColStatic.h" />
+    <ClInclude Include="SystemTray.h" />
+    <ClInclude Include="ThisMfcApp.h" />
+    <ClInclude Include="TryAgainDlg.h" />
+    <ClInclude Include="version.h" />
+    <ClInclude Include="ViewReport.h" />
+    <ClInclude Include="VirtualKeyboard\VKBButton.h" />
+    <ClInclude Include="VirtualKeyboard\VKeyBoardDlg.h" />
+    <ClInclude Include="VirtualKeyboard\VKresource.h" />
+    <ClInclude Include="VirtualKeyboard\VKresource3.h" />
+    <ClInclude Include="VirtualKeyboard\VKShiftState.h" />
+    <ClInclude Include="WZAdvanced.h" />
+    <ClInclude Include="WZExecuteThreadParms.h" />
+    <ClInclude Include="WZFinish.h" />
+    <ClInclude Include="WZPropertyPage.h" />
+    <ClInclude Include="WZPropertySheet.h" />
+    <ClInclude Include="WZSelectDB.h" />
+    <ClInclude Include="Yubi.h" />
+    <ClInclude Include="YubiCfgDlg.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="graphics\abase.bmp" />
+    <None Include="graphics\abase.ico" />
+    <None Include="graphics\abase_exp.bmp" />
+    <None Include="graphics\abase_exp.ico" />
+    <None Include="graphics\abase_warn.bmp" />
+    <None Include="graphics\abase_warn.ico" />
+    <None Include="graphics\dragbar\classic\AutotypeX.bmp" />
+    <None Include="graphics\dragbar\new\AutotypeX.bmp" />
+    <None Include="graphics\empty_node.bmp" />
+    <None Include="graphics\findtoolbar\classic\findadvancedon.bmp" />
+    <None Include="graphics\findtoolbar\new\findadvancedon.bmp" />
+    <None Include="graphics\toolbar\classic\addgroup.bmp" />
+    <None Include="graphics\toolbar\classic\clearfilter.bmp" />
+    <None Include="graphics\toolbar\classic\copytoclipboard.bmp" />
+    <None Include="graphics\toolbar\classic\duplicategroup.bmp" />
+    <None Include="graphics\toolbar\classic\passwordpolicy.bmp" />
+    <None Include="graphics\toolbar\new\about.bmp" />
+    <None Include="graphics\toolbar\classic\about.bmp" />
+    <None Include="graphics\toolbar\new\about_disabled.bmp" />
+    <None Include="graphics\toolbar\new\add.bmp" />
+    <None Include="graphics\toolbar\classic\add.bmp" />
+    <None Include="graphics\toolbar\new\addgroup.bmp" />
+    <None Include="graphics\toolbar\new\addgroup_disabled.bmp" />
+    <None Include="graphics\toolbar\new\add_disabled.bmp" />
+    <None Include="graphics\alias.bmp" />
+    <None Include="graphics\alias.ico" />
+    <None Include="graphics\toolbar\new\applyfilter.bmp" />
+    <None Include="graphics\toolbar\classic\applyfilter.bmp" />
+    <None Include="graphics\toolbar\new\applyfilter_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\autotype.bmp" />
+    <None Include="graphics\toolbar\new\autotype.bmp" />
+    <None Include="graphics\toolbar\new\autotype_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\backup.bmp" />
+    <None Include="graphics\toolbar\new\backup.bmp" />
+    <None Include="graphics\toolbar\new\backup_disabled.bmp" />
+    <None Include="graphics\blank.bmp" />
+    <None Include="graphics\toolbar\classic\browseurl.bmp" />
+    <None Include="graphics\toolbar\new\browseurl.bmp" />
+    <None Include="graphics\toolbar\new\browseurl_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\browseurlplus.bmp" />
+    <None Include="graphics\toolbar\new\browseurlplus.bmp" />
+    <None Include="graphics\toolbar\new\browseurlplus_disabled.bmp" />
+    <None Include="graphics\toolbar\new\changecombo.bmp" />
+    <None Include="graphics\toolbar\classic\changecombo.bmp" />
+    <None Include="graphics\toolbar\new\changecombo_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\changefont.bmp" />
+    <None Include="graphics\toolbar\new\changefont.bmp" />
+    <None Include="graphics\toolbar\new\changefont_disabled.bmp" />
+    <None Include="graphics\toolbar\new\changepswdfont.bmp" />
+    <None Include="graphics\toolbar\classic\changepswdfont.bmp" />
+    <None Include="graphics\toolbar\new\changepswdfont_disabled.bmp" />
+    <None Include="graphics\toolbar\new\changevkbdfont.bmp" />
+    <None Include="graphics\toolbar\classic\changevkbdfont.bmp" />
+    <None Include="graphics\toolbar\new\changevkbdfont_disabled.bmp" />
+    <None Include="graphics\checked.bmp" />
+    <None Include="graphics\toolbar\classic\clearclipboard.bmp" />
+    <None Include="graphics\toolbar\new\clearclipboard.bmp" />
+    <None Include="graphics\toolbar\new\clearclipboard_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\close.bmp" />
+    <None Include="graphics\toolbar\new\clearfilter.bmp" />
+    <None Include="graphics\toolbar\new\clearfilter_disabled.bmp" />
+    <None Include="graphics\toolbar\new\close.bmp" />
+    <None Include="graphics\toolbar\new\close_disabled.bmp" />
+    <None Include="graphics\toolbar\new\collapseall.bmp" />
+    <None Include="graphics\toolbar\classic\collapseall.bmp" />
+    <None Include="graphics\toolbar\new\collapseall_disabled.bmp" />
+    <None Include="graphics\toolbar\new\compare.bmp" />
+    <None Include="graphics\toolbar\classic\compare.bmp" />
+    <None Include="graphics\toolbar\new\compare_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\copynotes.bmp" />
+    <None Include="graphics\toolbar\new\copynotes.bmp" />
+    <None Include="graphics\toolbar\new\copynotes_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\copypassword.bmp" />
+    <None Include="graphics\toolbar\new\copypassword.bmp" />
+    <None Include="graphics\toolbar\new\copypassword_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\copyuser.bmp" />
+    <None Include="graphics\toolbar\new\copytoclipboard.bmp" />
+    <None Include="graphics\toolbar\new\copyuser.bmp" />
+    <None Include="graphics\toolbar\new\copyuser_disabled.bmp" />
+    <None Include="..\..\core\core.rc2" />
+    <None Include="graphics\cpane.bmp" />
+    <None Include="graphics\cpane.ico" />
+    <None Include="graphics\cpane_s.bmp" />
+    <None Include="graphics\toolbar\classic\createshortcut.bmp" />
+    <None Include="graphics\toolbar\new\createshortcut.bmp" />
+    <None Include="graphics\toolbar\new\createshortcut_disabled.bmp" />
+    <None Include="graphics\toolbar\new\cutsomizetoolbar.bmp" />
+    <None Include="graphics\toolbar\classic\cutsomizetoolbar.bmp" />
+    <None Include="graphics\toolbar\classic\delete.bmp" />
+    <None Include="graphics\toolbar\new\delete.bmp" />
+    <None Include="graphics\toolbar\new\delete_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\duplicate.bmp" />
+    <None Include="graphics\toolbar\new\duplicate.bmp" />
+    <None Include="graphics\toolbar\new\duplicategroup.bmp" />
+    <None Include="graphics\toolbar\new\duplicategroup_disabled.bmp" />
+    <None Include="graphics\toolbar\new\duplicate_disabled.bmp" />
+    <None Include="graphics\dragbar\classic\email.bmp" />
+    <None Include="graphics\dragbar\new\email.bmp" />
+    <None Include="graphics\dragbar\new\emailX.bmp" />
+    <None Include="graphics\dragbar\classic\emailx.bmp" />
+    <None Include="graphics\empty.bmp" />
+    <None Include="graphics\exclamation.bmp" />
+    <None Include="graphics\toolbar\classic\exit.bmp" />
+    <None Include="graphics\toolbar\new\exit.bmp" />
+    <None Include="graphics\toolbar\new\exit_disabled.bmp" />
+    <None Include="graphics\toolbar\new\expandall.bmp" />
+    <None Include="graphics\toolbar\classic\expandall.bmp" />
+    <None Include="graphics\toolbar\new\expandall_disabled.bmp" />
+    <None Include="graphics\toolbar\new\export.bmp" />
+    <None Include="graphics\toolbar\classic\export.bmp" />
+    <None Include="graphics\toolbar\new\export_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\exporttext.bmp" />
+    <None Include="graphics\toolbar\new\exporttext.bmp" />
+    <None Include="graphics\toolbar\new\exporttext_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\exportXML.bmp" />
+    <None Include="graphics\toolbar\new\exportXML.bmp" />
+    <None Include="graphics\toolbar\new\exportXML_disabled.bmp" />
+    <None Include="graphics\filter_active.bmp" />
+    <None Include="graphics\findtoolbar\classic\find.bmp" />
+    <None Include="graphics\findtoolbar\new\find.bmp" />
+    <None Include="graphics\findtoolbar\new\find_disabled.bmp" />
+    <None Include="graphics\findtoolbar\new\findadvanced.bmp" />
+    <None Include="graphics\findtoolbar\classic\findadvanced.bmp" />
+    <None Include="graphics\findtoolbar\classic\findcase_i.bmp" />
+    <None Include="graphics\findtoolbar\new\findcase_i.bmp" />
+    <None Include="graphics\findtoolbar\classic\findcase_s.bmp" />
+    <None Include="graphics\findtoolbar\new\findcase_s.bmp" />
+    <None Include="graphics\findtoolbar\classic\findclear.bmp" />
+    <None Include="graphics\findtoolbar\new\findclear.bmp" />
+    <None Include="graphics\findtoolbar\classic\findclose.bmp" />
+    <None Include="graphics\findtoolbar\new\findclose.bmp" />
+    <None Include="graphics\findtoolbar\findctrlplaceholder.bmp" />
+    <None Include="graphics\findtoolbar\classic\findreport.bmp" />
+    <None Include="graphics\findtoolbar\new\findreport.bmp" />
+    <None Include="graphics\dragbar\new\Group.bmp" />
+    <None Include="graphics\dragbar\classic\Group.bmp" />
+    <None Include="graphics\toolbar\classic\groupenter.bmp" />
+    <None Include="graphics\toolbar\new\groupenter.bmp" />
+    <None Include="graphics\toolbar\new\groupenter_disabled.bmp" />
+    <None Include="graphics\dragbar\new\GroupX.bmp" />
+    <None Include="graphics\dragbar\classic\GroupX.bmp" />
+    <None Include="graphics\toolbar\classic\help.bmp" />
+    <None Include="graphics\toolbar\new\help.bmp" />
+    <None Include="graphics\toolbar\new\help_disabled.bmp" />
+    <None Include="graphics\toolbar\new\import.bmp" />
+    <None Include="graphics\toolbar\classic\import.bmp" />
+    <None Include="graphics\toolbar\new\import_disabled.bmp" />
+    <None Include="graphics\toolbar\new\importtext.bmp" />
+    <None Include="graphics\toolbar\classic\importtext.bmp" />
+    <None Include="graphics\toolbar\new\importtext_disabled.bmp" />
+    <None Include="graphics\toolbar\new\importXML.bmp" />
+    <None Include="graphics\toolbar\classic\importXML.bmp" />
+    <None Include="graphics\toolbar\new\importXML_disabled.bmp" />
+    <None Include="graphics\toolbar\new\listtree.bmp" />
+    <None Include="graphics\toolbar\classic\listtree.bmp" />
+    <None Include="graphics\toolbar\new\listtree_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\lock.bmp" />
+    <None Include="graphics\toolbar\new\lock.bmp" />
+    <None Include="graphics\toolbar\new\lock_disabled.bmp" />
+    <None Include="graphics\locked_tray.ico" />
+    <None Include="graphics\toolbar\classic\managefilters.bmp" />
+    <None Include="graphics\toolbar\new\managefilters.bmp" />
+    <None Include="graphics\toolbar\new\managefilters_disabled.bmp" />
+    <None Include="graphics\toolbar\new\merge.bmp" />
+    <None Include="graphics\toolbar\classic\merge.bmp" />
+    <None Include="graphics\toolbar\new\merge_disabled.bmp" />
+    <None Include="graphics\toolbar\new\new.bmp" />
+    <None Include="graphics\toolbar\classic\new.bmp" />
+    <None Include="graphics\toolbar\new\new_disabled.bmp" />
+    <None Include="graphics\node.bmp" />
+    <None Include="graphics\normal.bmp" />
+    <None Include="graphics\normal.ico" />
+    <None Include="graphics\normal_exp.bmp" />
+    <None Include="graphics\normal_exp.ico" />
+    <None Include="graphics\normal_warn.bmp" />
+    <None Include="graphics\normal_warn.ico" />
+    <None Include="graphics\dragbar\new\Notes.bmp" />
+    <None Include="graphics\dragbar\classic\Notes.bmp" />
+    <None Include="graphics\dragbar\new\NotesX.bmp" />
+    <None Include="graphics\dragbar\classic\NotesX.bmp" />
+    <None Include="graphics\toolbar\new\open.bmp" />
+    <None Include="graphics\toolbar\classic\open.bmp" />
+    <None Include="graphics\toolbar\new\open_disabled.bmp" />
+    <None Include="graphics\toolbar\new\options.bmp" />
+    <None Include="graphics\toolbar\classic\options.bmp" />
+    <None Include="graphics\toolbar\new\options_disabled.bmp" />
+    <None Include="graphics\dragbar\new\Password.bmp" />
+    <None Include="graphics\dragbar\classic\Password.bmp" />
+    <None Include="graphics\toolbar\new\passwordchars.bmp" />
+    <None Include="graphics\toolbar\classic\passwordchars.bmp" />
+    <None Include="graphics\toolbar\new\passwordchars_disabled.bmp" />
+    <None Include="graphics\yubico-icon-small.bmp" />
+    <None Include="graphics\yubico-icon-small.ico" />
+    <None Include="graphics\Yubikey-button-disabled.bmp" />
+    <None Include="graphics\Yubikey-button.bmp" />
+    <None Include="graphics\toolbar\new\passwordpolicy.bmp" />
+    <None Include="graphics\toolbar\new\passwordpolicy_disabled.bmp" />
+    <None Include="res\PasswordSafe2.rc2" />
+    <None Include="res\PasswordSafe3.rc2" />
+    <None Include="graphics\dragbar\classic\PasswordX.bmp" />
+    <None Include="graphics\dragbar\new\PasswordX.bmp" />
+    <None Include="graphics\toolbar\classic\properties.bmp" />
+    <None Include="graphics\toolbar\new\properties.bmp" />
+    <None Include="graphics\toolbar\new\properties_disabled.bmp" />
+    <None Include="graphics\psafetxt.bmp" />
+    <None Include="graphics\pws_db.bmp" />
+    <None Include="graphics\toolbar\new\redo.bmp" />
+    <None Include="graphics\toolbar\classic\redo.bmp" />
+    <None Include="graphics\toolbar\new\redo_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\restore.bmp" />
+    <None Include="graphics\toolbar\new\restore.bmp" />
+    <None Include="graphics\toolbar\new\restore_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\runcmd.bmp" />
+    <None Include="graphics\toolbar\new\runcmd.bmp" />
+    <None Include="graphics\toolbar\new\runcmd_disabled.bmp" />
+    <None Include="graphics\toolbar\new\save.bmp" />
+    <None Include="graphics\toolbar\classic\save.bmp" />
+    <None Include="graphics\toolbar\new\save_disabled.bmp" />
+    <None Include="graphics\toolbar\new\saveas.bmp" />
+    <None Include="graphics\toolbar\classic\saveas.bmp" />
+    <None Include="graphics\toolbar\new\saveas_disabled.bmp" />
+    <None Include="graphics\sbase.bmp" />
+    <None Include="graphics\sbase.ico" />
+    <None Include="graphics\sbase_exp.bmp" />
+    <None Include="graphics\sbase_exp.ico" />
+    <None Include="graphics\sbase_warn.bmp" />
+    <None Include="graphics\sbase_warn.ico" />
+    <None Include="graphics\toolbar\classic\sendemail.bmp" />
+    <None Include="graphics\toolbar\new\sendemail.bmp" />
+    <None Include="graphics\toolbar\new\sendemail_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\setfilter.bmp" />
+    <None Include="graphics\toolbar\new\setfilter.bmp" />
+    <None Include="graphics\toolbar\new\setfilter_disabled.bmp" />
+    <None Include="graphics\shortcut.bmp" />
+    <None Include="graphics\shortcut.ico" />
+    <None Include="graphics\toolbar\classic\synchronize.bmp" />
+    <None Include="graphics\toolbar\new\synchronize.bmp" />
+    <None Include="graphics\toolbar\new\synchronize_disabled.bmp" />
+    <None Include="graphics\dragbar\new\Title.bmp" />
+    <None Include="graphics\dragbar\classic\Title.bmp" />
+    <None Include="graphics\dragbar\new\TitleX.bmp" />
+    <None Include="graphics\dragbar\classic\TitleX.bmp" />
+    <None Include="graphics\tray.ico" />
+    <None Include="graphics\tray_blue.ico" />
+    <None Include="graphics\tray_white.ico" />
+    <None Include="graphics\tray_yellow.ico" />
+    <None Include="graphics\unchecked.bmp" />
+    <None Include="graphics\toolbar\classic\undo.bmp" />
+    <None Include="graphics\toolbar\new\undo.bmp" />
+    <None Include="graphics\toolbar\new\undo_disabled.bmp" />
+    <None Include="graphics\toolbar\new\unlock.bmp" />
+    <None Include="graphics\toolbar\classic\unlock.bmp" />
+    <None Include="graphics\toolbar\new\unlock_disabled.bmp" />
+    <None Include="graphics\unlocked_tray.ico" />
+    <None Include="graphics\dragbar\classic\URL.bmp" />
+    <None Include="graphics\dragbar\new\URL.bmp" />
+    <None Include="graphics\dragbar\classic\URLX.bmp" />
+    <None Include="graphics\dragbar\new\URLX.bmp" />
+    <None Include="graphics\dragbar\new\User.bmp" />
+    <None Include="graphics\dragbar\classic\User.bmp" />
+    <None Include="graphics\dragbar\classic\UserX.bmp" />
+    <None Include="graphics\dragbar\new\UserX.bmp" />
+    <None Include="graphics\toolbar\classic\validate.bmp" />
+    <None Include="graphics\toolbar\new\validate.bmp" />
+    <None Include="graphics\toolbar\new\validate_disabled.bmp" />
+    <None Include="graphics\toolbar\new\viewedit.bmp" />
+    <None Include="graphics\toolbar\classic\viewedit.bmp" />
+    <None Include="graphics\toolbar\new\viewedit_disabled.bmp" />
+    <None Include="graphics\toolbar\classic\viewreports.bmp" />
+    <None Include="graphics\toolbar\new\viewreports.bmp" />
+    <None Include="graphics\toolbar\new\viewreports_disabled.bmp" />
+    <None Include="graphics\vkbd.bmp" />
+    <None Include="VirtualKeyboard\res\VKPasswordSafe3.rc2" />
+    <None Include="graphics\w95mbx01.ico" />
+    <None Include="graphics\w95mbx02.ico" />
+    <None Include="graphics\w95mbx03.ico" />
+    <None Include="graphics\w95mbx04.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="PasswordSafe.rc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugM|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugM64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugX|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='DebugX64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Demo|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Demo64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseM|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseM64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseX|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseX64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\core.vcxproj">
+      <Project>{261882e8-80af-4373-a8cc-a8d52e24bf27}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\os\windows\os.vcxproj">
+      <Project>{d5dbd8e8-cf48-4ca3-b773-c5f3b3316c73}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\os\windows\pws_autotype\pws_autotype.vcxproj">
+      <Project>{fc3f78c0-1b04-40cf-a7b5-6f037436d9c0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\os\windows\pws_osk\pws_osk.vcxproj">
+      <Project>{5f619d4f-185a-4b4b-8e77-02698eaeb962}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="PasswordSafe.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
src/ui/Windows/pwsafe11.vcxproj.filters to old-sln/MSVS10/pwsafe.vcxproj.filters
--- a/src/ui/Windows/pwsafe11.vcxproj.filters
+++ b/old-sln/MSVS10/pwsafe.vcxproj.filters
@@ -1,1638 +1,1645 @@
-ďťż<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{24a16c5f-8486-41e8-8e5a-eedd5657b8e2}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{41a7dbc4-006b-4e4c-b395-b47e8f669d72}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{fb7f5ca2-a85d-4fcc-a452-dfceca25531a}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AboutDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AddEdit_Additional.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AddEdit_Basic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AddEdit_DateTimes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AddEdit_PasswordPolicy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AddEdit_PropertyPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AddEdit_PropertySheet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AdvancedDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ChangeAliasPswd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ClearQuestionDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ColumnChooserDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ColumnChooserLC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareResultsDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ConfirmDeleteDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ControlExtns.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CoolMenu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CreateShortcutDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CryptKeyEntry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DboxMain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DboxTray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DDStatic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DDSupport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DisplayFSBkupFiles.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DropSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DropTarget.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DumpSelect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EBListCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EditShortcutDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ExpPWListDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ExtThread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterBaseDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterBoolDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterDateDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterDCADlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterEntrySizeDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterEntryStatusDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterEntryTypeDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterIntegerDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterPasswordDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\FilterStringDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Fonts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FontsDialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GeneralMsgBox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ImportTextDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ImportXMLDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="InfoDisplay.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LVHdrCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainEdit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainFilters.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainManage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainMenu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\ManageFiltersDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MenuShortcuts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MenuTipper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MigratePrefs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Options_PropertyPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Options_PropertySheet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsBackup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsDisplay.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsMisc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsPasswordHistory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsSecurity.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsShortcuts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="OptionsSystem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PasskeyChangeDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PasskeyEntry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PasskeySetup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PasswordSubsetDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Properties.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PupText.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWDialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWFileDialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\PWFilterLC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\PWFiltersDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWFindToolBar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWHdrCtrlNoChng.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWListCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWPropertyPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWPropertySheet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWResizeDialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWSclipboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWSFaultHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWSRecentFileList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWStatusBar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWToolBar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWTreeCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="QuerySetDef.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RichEditCtrlExtn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RUEList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SampleTextDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SecString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\SetFiltersDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\SetHistoryFiltersDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter\SetPolicyFiltersDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SHCTHotKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SHCTListCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Shortcut.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SingleInstance.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SMemFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Subclass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SysColStatic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SystemTray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ThisMfcApp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TryAgainDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ViewReport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VirtualKeyboard\VKBButton.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VirtualKeyboard\VKeyBoardDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WZPropertyPage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WZPropertySheet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WZFinish.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WZSelectDB.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WZAdvanced.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ExpPswdLC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="InputBox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ManagePSWDPols.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PasswordPolicyDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWSversion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PWHistListCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ShowCompareDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompareWithSelectDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CWTreeCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCWListCtrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="EntryKBHotKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="YubiCfgDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PKBaseDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="AboutDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AddEdit_Additional.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AddEdit_Basic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AddEdit_DateTimes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AddEdit_PasswordPolicy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AddEdit_PropertyPage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AddEdit_PropertySheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AdvancedDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ChangeAliasPswd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ClearQuestionDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ColumnChooserDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ColumnChooserLC.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareResultsDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ConfirmDeleteDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ControlExtns.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CoolMenu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\core\core.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CreateShortcutDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CryptKeyEntry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DboxMain.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DDStatic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DDSupport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DisplayFSBkupFiles.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DropSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DropTarget.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DumpSelect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EBListCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EditShortcutDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ExpPWListDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ExtThread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterBoolDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterDateDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterDCADlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterEntrySizeDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterEntryStatusDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterEntryTypeDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterIntegerDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterPasswordDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\FilterStringDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Fonts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FontsDialog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GeneralMsgBox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="HKModifiers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImportTextDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImportXMLDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="InfoDisplay.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jprdebug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LVHdrCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\ManageFiltersDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuShortcuts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuTipper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MFCmessages.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Options_PropertyPage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Options_PropertySheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsBackup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsDisplay.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsMisc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsPasswordHistory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsSecurity.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsShortcuts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="OptionsSystem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PasskeyChangeDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PasskeyEntry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PasskeySetup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PasswordSafe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PasswordSubsetDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Properties.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PupText.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWDialog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWFileDialog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\PWFilterLC.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\PWFiltersDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWFindToolBar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWHdrCtrlNoChng.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWListCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWPropertyPage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWPropertySheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWResizeDialog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWSclipboard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWSRecentFileList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWStatusBar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWToolBar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWTreeCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QuerySetDef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RichEditCtrlExtn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RUEList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SampleTextDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SecString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\SetFiltersDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\SetHistoryFiltersDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter\SetPolicyFiltersDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SHCTHotKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SHCTListCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Shortcut.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SingleInstance.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SMemFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Subclass.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SysColStatic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SystemTray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ThisMfcApp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TryAgainDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ViewReport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VirtualKeyboard\VKBButton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VirtualKeyboard\VKeyBoardDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VirtualKeyboard\VKresource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VirtualKeyboard\VKresource3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VirtualKeyboard\VKShiftState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WZPropertyPage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WZPropertySheet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AdvancedValues.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WZFinish.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WZSelectDB.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WZAdvanced.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WZExecuteThreadParms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ExpPswdLC.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWSFaultHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="InputBox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ManagePSWDPols.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PasswordPolicyDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWSversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PWHistListCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CompareWithSelectDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ShowCompareDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CWTreeCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SCWListCtrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="EntryKBHotKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="YubiCfgDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PKBaseDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\core\core.rc2">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\PasswordSafe2.rc2">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\PasswordSafe3.rc2">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="VirtualKeyboard\res\VKPasswordSafe3.rc2">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\abase.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\abase.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\abase_exp.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\abase_exp.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\abase_warn.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\abase_warn.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\addgroup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\about.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\about.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\about_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\add.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\add.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\addgroup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\addgroup_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\add_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\alias.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\alias.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\applyfilter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\applyfilter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\applyfilter_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\autotype.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\autotype.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\autotype_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\backup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\backup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\backup_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\blank.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\browseurl.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\browseurl.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\browseurl_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\browseurlplus.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\browseurlplus.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\browseurlplus_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changecombo.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\changecombo.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changecombo_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\changefont.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changefont.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changefont_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changepswdfont.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\changepswdfont.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changepswdfont_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changevkbdfont.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\changevkbdfont.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\changevkbdfont_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\checked.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\clearclipboard.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\clearclipboard.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\clearclipboard_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\close.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\close.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\close_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\collapseall.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\collapseall.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\collapseall_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\compare.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\compare.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\compare_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\copynotes.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copynotes.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copynotes_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\copypassword.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copypassword.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copypassword_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\copyuser.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copyuser.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copyuser_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\cpane.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\cpane.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\cpane_s.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\createshortcut.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\createshortcut.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\createshortcut_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\cutsomizetoolbar.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\cutsomizetoolbar.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\delete.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\delete.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\delete_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\duplicate.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\duplicate.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\duplicate_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\email.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\email.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\emailX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\emailx.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\empty.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\exclamation.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\exit.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\exit.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\exit_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\expandall.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\expandall.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\expandall_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\export.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\export.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\export_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\exporttext.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\exporttext.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\exporttext_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\exportXML.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\exportXML.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\exportXML_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\filter_active.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\find.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\find.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\find_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findadvanced.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findadvanced.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findcase_i.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findcase_i.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findcase_s.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findcase_s.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findclear.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findclear.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findclose.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findclose.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\findctrlplaceholder.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findreport.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findreport.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\Group.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\Group.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\groupenter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\groupenter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\groupenter_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\GroupX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\GroupX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\help.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\help.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\help_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\import.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\import.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\import_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\importtext.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\importtext.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\importtext_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\importXML.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\importXML.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\importXML_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\listtree.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\listtree.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\listtree_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\lock.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\lock.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\lock_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\locked_tray.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\managefilters.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\managefilters.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\managefilters_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\merge.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\merge.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\merge_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\new.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\new.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\new_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\node.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\normal.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\normal.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\normal_exp.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\normal_exp.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\normal_warn.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\normal_warn.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\Notes.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\Notes.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\NotesX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\NotesX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\open.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\open.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\open_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\options.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\options.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\options_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\Password.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\Password.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\passwordchars.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\passwordchars.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\passwordchars_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\PasswordX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\PasswordX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\properties.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\properties.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\properties_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\psafetxt.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\pws_db.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\redo.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\redo.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\redo_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\restore.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\restore.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\restore_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\runcmd.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\runcmd.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\runcmd_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\save.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\save.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\save_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\saveas.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\saveas.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\saveas_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\sbase.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\sbase.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\sbase_exp.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\sbase_exp.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\sbase_warn.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\sbase_warn.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\sendemail.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\sendemail.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\sendemail_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\setfilter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\setfilter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\setfilter_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\shortcut.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\shortcut.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\synchronize.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\synchronize.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\synchronize_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\Title.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\Title.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\TitleX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\TitleX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\tray.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\tray_blue.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\tray_white.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\tray_yellow.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\unchecked.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\undo.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\undo.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\undo_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\unlock.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\unlock.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\unlock_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\unlocked_tray.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\URL.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\URL.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\URLX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\URLX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\User.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\User.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\UserX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\UserX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\validate.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\validate.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\validate_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\viewedit.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\viewedit.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\viewedit_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\viewreports.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\viewreports.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\viewreports_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\vkbd.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\w95mbx01.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\w95mbx02.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\w95mbx03.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\w95mbx04.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\classic\findadvancedon.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\findtoolbar\new\findadvancedon.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\duplicategroup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\duplicategroup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\duplicategroup_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\classic\AutotypeX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\dragbar\new\AutotypeX.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\clearfilter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\clearfilter.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\clearfilter_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\passwordpolicy.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\passwordpolicy.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\passwordpolicy_disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\classic\copytoclipboard.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\toolbar\new\copytoclipboard.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="graphics\empty_node.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="PasswordSafe.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="graphics\Yubikey-button.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="graphics\Yubikey-button-disabled.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
+ďťż<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{24a16c5f-8486-41e8-8e5a-eedd5657b8e2}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{41a7dbc4-006b-4e4c-b395-b47e8f669d72}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{fb7f5ca2-a85d-4fcc-a452-dfceca25531a}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AddEdit_Additional.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AddEdit_Basic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AddEdit_DateTimes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AddEdit_PasswordPolicy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AddEdit_PropertyPage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AddEdit_PropertySheet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AdvancedDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ChangeAliasPswd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ClearQuestionDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ColumnChooserDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ColumnChooserLC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareResultsDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ConfirmDeleteDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ControlExtns.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CoolMenu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CreateShortcutDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CryptKeyEntry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DboxMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DboxTray.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DDStatic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DDSupport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DisplayFSBkupFiles.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DropSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DropTarget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DumpSelect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EBListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EditShortcutDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ExpPWListDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ExtThread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterBaseDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterBoolDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterDateDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterDCADlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterEntrySizeDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterEntryStatusDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterEntryTypeDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterIntegerDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterPasswordDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\FilterStringDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Fonts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FontsDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneralMsgBox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ImportTextDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ImportXMLDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InfoDisplay.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LVHdrCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainEdit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainFilters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainManage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainMenu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainView.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\ManageFiltersDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MenuShortcuts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MenuTipper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MigratePrefs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Options_PropertyPage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Options_PropertySheet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsBackup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsDisplay.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsMisc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsPasswordHistory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsSecurity.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsShortcuts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsSystem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PasskeyChangeDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PasskeyEntry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PasskeySetup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PasswordSubsetDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Properties.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PupText.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWFileDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\PWFilterLC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\PWFiltersDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWFindToolBar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWHdrCtrlNoChng.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWPropertyPage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWPropertySheet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWResizeDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWSclipboard.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWSFaultHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWSRecentFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWStatusBar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWToolBar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWTreeCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="QuerySetDef.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RichEditCtrlExtn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RUEList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SampleTextDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SecString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\SetFiltersDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\SetHistoryFiltersDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filter\SetPolicyFiltersDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SHCTHotKey.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SHCTListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Shortcut.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SingleInstance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SMemFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Subclass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SysColStatic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SystemTray.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThisMfcApp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TryAgainDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ViewReport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VirtualKeyboard\VKBButton.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VirtualKeyboard\VKeyBoardDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WZPropertyPage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WZPropertySheet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WZFinish.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WZSelectDB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WZAdvanced.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ExpPswdLC.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InputBox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PKBaseDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="YubiCfgDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ManagePSWDPols.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PasswordPolicyDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWSversion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PWHistListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ShowCompareDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CompareWithSelectDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CWTreeCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SCWListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EntryKBHotKey.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AboutDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AddEdit_Additional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AddEdit_Basic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AddEdit_DateTimes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AddEdit_PasswordPolicy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AddEdit_PropertyPage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AddEdit_PropertySheet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AdvancedDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ChangeAliasPswd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ClearQuestionDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ColumnChooserDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ColumnChooserLC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareResultsDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfirmDeleteDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ControlExtns.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CoolMenu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\core\core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CreateShortcutDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CryptKeyEntry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DboxMain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DDStatic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DDSupport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DisplayFSBkupFiles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DropSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DropTarget.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DumpSelect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EBListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditShortcutDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ExpPWListDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ExtThread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterBoolDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterDateDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterDCADlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterEntrySizeDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterEntryStatusDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterEntryTypeDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterIntegerDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterPasswordDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\FilterStringDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Fonts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FontsDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GeneralMsgBox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ImportTextDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ImportXMLDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InfoDisplay.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="jprdebug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LVHdrCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\ManageFiltersDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MenuShortcuts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MenuTipper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MFCmessages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Options_PropertyPage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Options_PropertySheet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsBackup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsDisplay.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsMisc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsPasswordHistory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsSecurity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsShortcuts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsSystem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PasskeyChangeDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PasskeyEntry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PasskeySetup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PasswordSafe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PasswordSubsetDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Properties.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PupText.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWFileDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\PWFilterLC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\PWFiltersDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWFindToolBar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWHdrCtrlNoChng.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWHistDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWPropertyPage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWPropertySheet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWResizeDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWSclipboard.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWSRecentFileList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWStatusBar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWToolBar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWTreeCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QuerySetDef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RichEditCtrlExtn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RUEList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SampleTextDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SecString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\SetFiltersDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\SetHistoryFiltersDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filter\SetPolicyFiltersDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SHCTHotKey.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SHCTListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Shortcut.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SingleInstance.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SMemFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StdAfx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Subclass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SysColStatic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SystemTray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThisMfcApp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TryAgainDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ViewReport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VirtualKeyboard\VKBButton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VirtualKeyboard\VKeyBoardDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VirtualKeyboard\VKresource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VirtualKeyboard\VKresource3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VirtualKeyboard\VKShiftState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WZPropertyPage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WZPropertySheet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AdvancedValues.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WZFinish.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WZSelectDB.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WZAdvanced.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WZExecuteThreadParms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ExpPswdLC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWSFaultHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Yubi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PKBaseDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InputBox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="YubiCfgDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ManagePSWDPols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PasswordPolicyDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWSversion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PWHistListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CompareWithSelectDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ShowCompareDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CWTreeCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SCWListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EntryKBHotKey.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\core\core.rc2">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\PasswordSafe2.rc2">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\PasswordSafe3.rc2">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="VirtualKeyboard\res\VKPasswordSafe3.rc2">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\abase.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\abase.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\abase_exp.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\abase_exp.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\abase_warn.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\abase_warn.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\addgroup.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\about.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\about.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\about_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\add.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\add.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\addgroup.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\addgroup_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\add_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\alias.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\alias.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\applyfilter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\applyfilter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\applyfilter_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\autotype.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\autotype.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\autotype_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\backup.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\backup.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\backup_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\blank.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\browseurl.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\browseurl.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\browseurl_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\browseurlplus.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\browseurlplus.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\browseurlplus_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changecombo.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\changecombo.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changecombo_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\changefont.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changefont.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changefont_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changepswdfont.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\changepswdfont.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changepswdfont_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changevkbdfont.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\changevkbdfont.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\changevkbdfont_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\checked.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\clearclipboard.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\clearclipboard.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\clearclipboard_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\close.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\close.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\close_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\collapseall.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\collapseall.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\collapseall_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\compare.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\compare.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\compare_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\copynotes.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copynotes.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copynotes_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\copypassword.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copypassword.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copypassword_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\copyuser.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copyuser.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copyuser_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\cpane.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\cpane.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\cpane_s.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\createshortcut.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\createshortcut.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\createshortcut_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\cutsomizetoolbar.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\cutsomizetoolbar.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\delete.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\delete.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\delete_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\duplicate.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\duplicate.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\duplicate_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\email.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\email.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\emailX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\emailx.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\empty.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\exclamation.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\exit.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\exit.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\exit_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\expandall.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\expandall.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\expandall_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\export.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\export.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\export_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\exporttext.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\exporttext.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\exporttext_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\exportXML.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\exportXML.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\exportXML_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\filter_active.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\find.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\find.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\find_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findadvanced.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findadvanced.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findcase_i.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findcase_i.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findcase_s.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findcase_s.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findclear.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findclear.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findclose.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findclose.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\findctrlplaceholder.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findreport.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findreport.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\Group.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\Group.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\groupenter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\groupenter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\groupenter_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\GroupX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\GroupX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\help.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\help.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\help_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\import.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\import.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\import_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\importtext.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\importtext.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\importtext_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\importXML.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\importXML.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\importXML_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\listtree.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\listtree.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\listtree_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\lock.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\lock.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\lock_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\locked_tray.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\managefilters.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\managefilters.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\managefilters_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\merge.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\merge.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\merge_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\new.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\new.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\new_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\node.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\normal.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\normal.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\normal_exp.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\normal_exp.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\normal_warn.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\normal_warn.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\Notes.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\Notes.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\NotesX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\NotesX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\open.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\open.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\open_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\options.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\options.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\options_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\Password.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\Password.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\passwordchars.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\passwordchars.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\passwordchars_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\PasswordX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\PasswordX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\properties.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\properties.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\properties_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\psafetxt.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\pws_db.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\redo.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\redo.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\redo_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\restore.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\restore.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\restore_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\runcmd.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\runcmd.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\runcmd_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\save.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\save.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\save_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\saveas.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\saveas.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\saveas_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\sbase.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\sbase.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\sbase_exp.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\sbase_exp.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\sbase_warn.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\sbase_warn.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\sendemail.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\sendemail.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\sendemail_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\setfilter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\setfilter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\setfilter_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\shortcut.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\shortcut.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\synchronize.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\synchronize.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\synchronize_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\Title.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\Title.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\TitleX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\TitleX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\tray.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\tray_blue.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\tray_white.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\tray_yellow.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\unchecked.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\undo.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\undo.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\undo_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\unlock.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\unlock.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\unlock_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\unlocked_tray.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\URL.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\URL.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\URLX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\URLX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\User.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\User.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\UserX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\UserX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\validate.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\validate.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\validate_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\viewedit.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\viewedit.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\viewedit_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\viewreports.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\viewreports.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\viewreports_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\vkbd.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\w95mbx01.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\w95mbx02.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\w95mbx03.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\w95mbx04.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\classic\findadvancedon.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\findtoolbar\new\findadvancedon.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\duplicategroup.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\duplicategroup.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\duplicategroup_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\classic\AutotypeX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\dragbar\new\AutotypeX.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\yubico-icon-small.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\yubico-icon-small.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\Yubikey-button.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\clearfilter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\clearfilter.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\clearfilter_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\passwordpolicy.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\passwordpolicy.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\passwordpolicy_disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\classic\copytoclipboard.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\toolbar\new\copytoclipboard.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\empty_node.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="graphics\Yubikey-button-disabled.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="PasswordSafe.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
<< < 1 2 3 4 5 > >> (Page 4 of 5)