diff --git a/.gitmodules b/.gitmodules
index e0d4812f099..2c926403cd0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,10 @@
 [submodule "main/external/debugger-libs"]
 	path = main/external/debugger-libs
-	url = https://github.com/dotdevelop/debugger-libs.git
+	url = https://github.com/easysimplified/debugger-libs.git
 	branch = master
 [submodule "main/external/guiunit"]
 	path = main/external/guiunit
-	url = https://github.com/dotdevelop/guiunit.git
+	url = https://github.com/easysimplified/guiunit.git
 [submodule "main/external/macdoc"]
 	path = main/external/macdoc
 	url = https://github.com/dotdevelop/macdoc
@@ -20,13 +20,13 @@
 	url = https://github.com/dotdevelop/mono-tools.git
 [submodule "main/external/nrefactory"]
 	path = main/external/nrefactory
-	url = https://github.com/dotdevelop/NRefactory.git
+	url = https://github.com/easysimplified/NRefactory.git
 [submodule "main/external/sharpsvn-binary"]
 	path = main/external/sharpsvn-binary
 	url = https://github.com/dotdevelop/sharpsvn-binary.git
 [submodule "main/external/xwt"]
 	path = main/external/xwt
-	url = https://github.com/dotdevelop/xwt
+	url = https://github.com/easysimplified/xwt
 	branch = dotdevelop
 [submodule "main/external/Xamarin.PropertyEditing"]
 	path = main/external/Xamarin.PropertyEditing
@@ -34,7 +34,7 @@
 	branch = master
 [submodule "main/external/vs-editor-api"]
 	path = main/external/vs-editor-api
-	url = https://github.com/dotdevelop/vs-editor-api.git
+	url = https://github.com/easysimplified/vs-editor-api.git
     branch = dotdevelop_oe_8.1.5
 [submodule "main/external/Monodevelop.Netcoredbg"]
 	path = main/external/Monodevelop.Netcoredbg
diff --git a/main/Directory.Build.props b/main/Directory.Build.props
index f501d998f17..6d81338775c 100644
--- a/main/Directory.Build.props
+++ b/main/Directory.Build.props
@@ -7,7 +7,7 @@
     <MdAddinsDirectory>$(MSBuildThisFileDirectory)..\..\md-addins\</MdAddinsDirectory>
     <!--<VSEditorCoreDirectory Condition="'$(VSEditorCoreDirectory)' == ''">$(MdAddinsDirectory)external\vs-editor-core\</VSEditorCoreDirectory>-->
     <VSEditorApiDirectory Condition="'$(VSEditorApiDirectory)' == ''">$(MSBuildThisFileDirectory)external\vs-editor-api\</VSEditorApiDirectory>
-    <ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Windows.props</ReferencesVSEditor>
+    <ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
     <ReferencesVSEditor Condition=" '$(OS)' == 'MAC' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props</ReferencesVSEditor>
     <ReferencesVSEditor Condition=" '$(OS)' == 'UNIX' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
     <ReferencesGtk>$(RootDirectory)\msbuild\ReferencesGtk.props</ReferencesGtk>
diff --git a/main/Main.sln b/main/Main.sln
index e6d3b9db6f9..5b1f3b70f7b 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34525.116
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9D360D43-0C05-49D6-84DB-4E7AB2F38F82}"
 	ProjectSection(MonoDevelopProperties) = preProject
@@ -40,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.Win32", "src\addins\VersionControl\Subversion.Win32\VersionControl.Subversion.Win32.csproj", "{1038FBD8-750E-4081-BC65-D89FFED3C881}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.Win32.Tests", "src\addins\VersionControl\Subversion.Win32.Tests\VersionControl.Subversion.Win32.Tests.csproj", "{E17829B5-8EAC-4714-8798-EB8ED3540191}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.GtkCore", "MonoDevelop.GtkCore", "{02280E65-C507-4931-AE68-AA2E89E15EEF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkCore", "src\addins\MonoDevelop.GtkCore\MonoDevelop.GtkCore.csproj", "{7FCDB0D9-AA7D-44E4-BE74-55312B432389}"
@@ -83,7 +81,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Gettext", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.RegexToolkit", "src\addins\MonoDevelop.RegexToolkit\MonoDevelop.RegexToolkit.csproj", "{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GnomePlatform", "src\addins\GnomePlatform\GnomePlatform.csproj", "{AE84B4A7-E6B1-4565-8904-16284DCE41B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GnomePlatform", "src\addins\GnomePlatform\GnomePlatform.csproj", "{AE84B4A7-E6B1-4565-8904-16284DCE41B6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.SourceEditor", "src\addins\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj", "{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}"
 EndProject
@@ -185,9 +183,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "exter
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xwt", "Xwt", "{67A32B53-F719-4ECB-B5E1-FD0B04FEE258}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.WPF", "external\xwt\Xwt.WPF\Xwt.WPF.csproj", "{C93D746E-1586-4D4F-B411-BF5A966E6A08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt.WPF", "external\xwt\Xwt.WPF\Xwt.WPF.csproj", "{C93D746E-1586-4D4F-B411-BF5A966E6A08}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "external\xwt\Xwt.Gtk.Mac\Xwt.Gtk.Mac.csproj", "{E95833C9-90AA-4366-9262-0A1BED148249}"
 EndProject
@@ -197,21 +195,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.XamMac", "external\xwt\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Addins", "Mono.Addins", "{B8897B76-1A12-4DFA-8B60-7944CC4C9654}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins", "external\mono-addins\Mono.Addins\Mono.Addins.csproj", "{91DD5A2D-9FE3-4C3C-9253-876141874DAD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins", "external\mono-addins\Mono.Addins\Mono.Addins.csproj", "{91DD5A2D-9FE3-4C3C-9253-876141874DAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.CecilReflector", "external\mono-addins\Mono.Addins.CecilReflector\Mono.Addins.CecilReflector.csproj", "{42D1CE65-A14B-4218-B787-58AD7AA68513}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins.CecilReflector", "external\mono-addins\Mono.Addins.CecilReflector\Mono.Addins.CecilReflector.csproj", "{42D1CE65-A14B-4218-B787-58AD7AA68513}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Gui", "external\mono-addins\Mono.Addins.Gui\Mono.Addins.Gui.csproj", "{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Setup", "external\mono-addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins.Setup", "external\mono-addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{2D711139-8765-4929-BC7A-AA2DEE6F615D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory", "external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory.CSharp", "external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "external\nrefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory.Cecil", "external\nrefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit_NET_4_5", "external\guiunit\src\framework\GuiUnit_NET_4_5.csproj", "{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}"
 EndProject
@@ -306,8 +304,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNetCore", "s
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Core.Tests", "tests\MonoDevelop.Core.Tests\MonoDevelop.Core.Tests.csproj", "{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport.Tests", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.Tests\MonoDevelop.DesignerSupport.Tests.csproj", "{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Refactoring.Tests", "tests\MonoDevelop.Refactoring.Tests\MonoDevelop.Refactoring.Tests.csproj", "{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}"
 EndProject
 Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"
@@ -346,71 +342,71 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Text", "Text", "{697A93E1-E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impl", "Impl", "{32539734-6484-4451-9EF3-61610CA25BBF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BraceCompletionImpl", "external\vs-editor-api\src\Editor\Text\Impl\BraceCompletion\BraceCompletionImpl.csproj", "{2471CB49-9952-43D4-A7AD-7C01BCEDC461}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BraceCompletionImpl", "external\vs-editor-api\src\Editor\Text\Impl\BraceCompletion\BraceCompletionImpl.csproj", "{2471CB49-9952-43D4-A7AD-7C01BCEDC461}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextData", "external\vs-editor-api\src\Editor\Text\Def\TextData\TextData.csproj", "{44A7579B-2E53-451E-8F6B-946AD04DED3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextData", "external\vs-editor-api\src\Editor\Text\Def\TextData\TextData.csproj", "{44A7579B-2E53-451E-8F6B-946AD04DED3F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIWpf", "external\vs-editor-api\src\Editor\Text\Def\TextUIWpf\TextUIWpf.csproj", "{AB85D313-77D7-4F3D-B3F3-56864A1253DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUIWpf", "external\vs-editor-api\src\Editor\Text\Def\TextUIWpf\TextUIWpf.csproj", "{AB85D313-77D7-4F3D-B3F3-56864A1253DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUI", "external\vs-editor-api\src\Editor\Text\Def\TextUI\TextUI.csproj", "{C0943335-A94F-4DF4-91D0-2129D45C666C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUI", "external\vs-editor-api\src\Editor\Text\Def\TextUI\TextUI.csproj", "{C0943335-A94F-4DF4-91D0-2129D45C666C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogic", "external\vs-editor-api\src\Editor\Text\Def\TextLogic\TextLogic.csproj", "{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextLogic", "external\vs-editor-api\src\Editor\Text\Def\TextLogic\TextLogic.csproj", "{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Internal", "external\vs-editor-api\src\Editor\Text\Def\Internal\Internal.csproj", "{D53A102A-8B6B-4838-BC65-FE36527E7018}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Internal", "external\vs-editor-api\src\Editor\Text\Def\Internal\Internal.csproj", "{D53A102A-8B6B-4838-BC65-FE36527E7018}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationAggregatorImpl", "external\vs-editor-api\src\Editor\Text\Impl\ClassificationAggregator\ClassificationAggregatorImpl.csproj", "{33DAC448-FBCB-4030-9939-01FA4B3EAE76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassificationAggregatorImpl", "external\vs-editor-api\src\Editor\Text\Impl\ClassificationAggregator\ClassificationAggregatorImpl.csproj", "{33DAC448-FBCB-4030-9939-01FA4B3EAE76}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassificationTypeImpl", "external\vs-editor-api\src\Editor\Text\Impl\ClassificationType\ClassificationTypeImpl.csproj", "{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassificationTypeImpl", "external\vs-editor-api\src\Editor\Text\Impl\ClassificationType\ClassificationTypeImpl.csproj", "{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandingImpl", "external\vs-editor-api\src\Editor\Text\Impl\Commanding\CommandingImpl.csproj", "{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandingImpl", "external\vs-editor-api\src\Editor\Text\Impl\Commanding\CommandingImpl.csproj", "{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DifferenceAlgorithmImpl", "external\vs-editor-api\src\Editor\Text\Impl\DifferenceAlgorithm\DifferenceAlgorithmImpl.csproj", "{6154E851-B914-47D5-9CC0-3E7433047574}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DifferenceAlgorithmImpl", "external\vs-editor-api\src\Editor\Text\Impl\DifferenceAlgorithm\DifferenceAlgorithmImpl.csproj", "{6154E851-B914-47D5-9CC0-3E7433047574}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorOperationsImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorOperations\EditorOperationsImpl.csproj", "{E0561832-1C54-41A8-A30A-97E8E81DBCA7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EditorOperationsImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorOperations\EditorOperationsImpl.csproj", "{E0561832-1C54-41A8-A30A-97E8E81DBCA7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorOptionsImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorOptions\EditorOptionsImpl.csproj", "{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EditorOptionsImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorOptions\EditorOptionsImpl.csproj", "{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorPrimitivesImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorPrimitives\EditorPrimitivesImpl.csproj", "{9B8B470A-5455-45B5-A5D1-8619ED174257}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EditorPrimitivesImpl", "external\vs-editor-api\src\Editor\Text\Impl\EditorPrimitives\EditorPrimitivesImpl.csproj", "{9B8B470A-5455-45B5-A5D1-8619ED174257}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavigationImpl", "external\vs-editor-api\src\Editor\Text\Impl\Navigation\NavigationImpl.csproj", "{726E446E-2E8D-4B48-A47B-923C6CEC4556}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NavigationImpl", "external\vs-editor-api\src\Editor\Text\Impl\Navigation\NavigationImpl.csproj", "{726E446E-2E8D-4B48-A47B-923C6CEC4556}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextSearchImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextSearch\TextSearchImpl.csproj", "{F713D37D-70A4-49BB-ADAE-B7007C880E57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextSearchImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextSearch\TextSearchImpl.csproj", "{F713D37D-70A4-49BB-ADAE-B7007C880E57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextModelImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextModel\TextModelImpl.csproj", "{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextModelImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextModel\TextModelImpl.csproj", "{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextBufferUndoManagerImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextBufferUndoManager\TextBufferUndoManagerImpl.csproj", "{72987C64-502B-4BBB-B9C9-B09F54C7B552}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextBufferUndoManagerImpl", "external\vs-editor-api\src\Editor\Text\Impl\TextBufferUndoManager\TextBufferUndoManagerImpl.csproj", "{72987C64-502B-4BBB-B9C9-B09F54C7B552}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagAggregatorImpl", "external\vs-editor-api\src\Editor\Text\Impl\TagAggregator\TagAggregatorImpl.csproj", "{3C354DFC-8768-4023-9977-B9C3B9FF81ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TagAggregatorImpl", "external\vs-editor-api\src\Editor\Text\Impl\TagAggregator\TagAggregatorImpl.csproj", "{3C354DFC-8768-4023-9977-B9C3B9FF81ED}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneUndoImpl", "external\vs-editor-api\src\Editor\Text\Impl\StandaloneUndo\StandaloneUndoImpl.csproj", "{29E74860-17B2-47D3-B3D4-7BC7E77900CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneUndoImpl", "external\vs-editor-api\src\Editor\Text\Impl\StandaloneUndo\StandaloneUndoImpl.csproj", "{29E74860-17B2-47D3-B3D4-7BC7E77900CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Outlining", "external\vs-editor-api\src\Editor\Text\Impl\Outlining\Outlining.csproj", "{135FD888-1648-4721-A861-4F7503C44A3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Outlining", "external\vs-editor-api\src\Editor\Text\Impl\Outlining\Outlining.csproj", "{135FD888-1648-4721-A861-4F7503C44A3D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XPlat", "XPlat", "{0CEAC5F6-B155-404B-B81A-76F6EFF3AD5F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiCaretImpl", "external\vs-editor-api\src\Editor\Text\Impl\XPlat\MultiCaretImpl\MultiCaretImpl.csproj", "{547C3D7B-7DFF-4169-88A7-56245170FDB3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiCaretImpl", "external\vs-editor-api\src\Editor\Text\Impl\XPlat\MultiCaretImpl\MultiCaretImpl.csproj", "{547C3D7B-7DFF-4169-88A7-56245170FDB3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Util", "Util", "{745BF6CA-BC7C-4863-B1B4-C423A828820A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextDataUtil", "external\vs-editor-api\src\Editor\Text\Util\TextDataUtil\TextDataUtil.csproj", "{1206D585-670F-4951-A6BF-493C79C950E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextDataUtil", "external\vs-editor-api\src\Editor\Text\Util\TextDataUtil\TextDataUtil.csproj", "{1206D585-670F-4951-A6BF-493C79C950E4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogicUtil", "external\vs-editor-api\src\Editor\Text\Util\TextLogicUtil\TextLogicUtil.csproj", "{69F195E1-A8C9-43B3-AE91-A8FC79393163}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextLogicUtil", "external\vs-editor-api\src\Editor\Text\Util\TextLogicUtil\TextLogicUtil.csproj", "{69F195E1-A8C9-43B3-AE91-A8FC79393163}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\TextUIUtil.csproj", "{B2B41590-92EF-4120-B9B8-E861F3903FDD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUIUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\TextUIUtil.csproj", "{B2B41590-92EF-4120-B9B8-E861F3903FDD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoaUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUICocoaUtil\TextUICocoaUtil.csproj", "{B2B41590-670F-4169-B3D4-7BC7E77900CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUICocoaUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUICocoaUtil\TextUICocoaUtil.csproj", "{B2B41590-670F-4169-B3D4-7BC7E77900CE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{10D43FCD-8287-47D2-A8DD-7BDC77CFBDE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{1EA941BE-66DE-4D0E-B840-FC556F5BA803}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtility", "external\vs-editor-api\src\Editor\Core\Def\CoreUtility.csproj", "{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreUtility", "external\vs-editor-api\src\Editor\Core\Def\CoreUtility.csproj", "{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impl", "Impl", "{AE6FAE39-A6DE-4809-85CB-16321D9A708C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUtilityImpl", "external\vs-editor-api\src\Editor\Core\Impl\CoreUtilityImpl.csproj", "{063241E2-CBDA-4A95-9B8E-914AD6D6D242}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreUtilityImpl", "external\vs-editor-api\src\Editor\Core\Impl\CoreUtilityImpl.csproj", "{063241E2-CBDA-4A95-9B8E-914AD6D6D242}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language", "Language", "{9507EE28-0855-4790-88A7-A5D9FA58AB6D}"
 EndProject
@@ -420,39 +416,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{0E8F5B35-CB3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impl", "Impl", "{8CE76FA8-18EA-4016-8E1F-3D31650BC223}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntellisenseDef", "external\vs-editor-api\src\Editor\Language\Def\Intellisense\IntellisenseDef.csproj", "{C00336B8-0DC9-4F05-A030-C6BD2A018746}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntellisenseDef", "external\vs-editor-api\src\Editor\Language\Def\Intellisense\IntellisenseDef.csproj", "{C00336B8-0DC9-4F05-A030-C6BD2A018746}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageDef", "external\vs-editor-api\src\Editor\Language\Def\Language\LanguageDef.csproj", "{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LanguageDef", "external\vs-editor-api\src\Editor\Language\Def\Language\LanguageDef.csproj", "{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageImpl", "external\vs-editor-api\src\Editor\Language\Impl\Language\LanguageImpl.csproj", "{C90CEE76-1A52-43EC-A28D-ABD25F95646B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LanguageImpl", "external\vs-editor-api\src\Editor\Language\Impl\Language\LanguageImpl.csproj", "{C90CEE76-1A52-43EC-A28D-ABD25F95646B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageUtil", "external\vs-editor-api\src\Editor\Language\Util\LanguageUtil\LanguageUtil.csproj", "{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LanguageUtil", "external\vs-editor-api\src\Editor\Language\Util\LanguageUtil\LanguageUtil.csproj", "{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsBase", "external\vs-editor-api\src\Editor\FPF\WindowsBase\WindowsBase.csproj", "{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase", "external\vs-editor-api\src\Editor\FPF\WindowsBase\WindowsBase.csproj", "{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationCore", "external\vs-editor-api\src\Editor\FPF\PresentationCore\PresentationCore.csproj", "{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore", "external\vs-editor-api\src\Editor\FPF\PresentationCore\PresentationCore.csproj", "{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationFramework", "external\vs-editor-api\src\Editor\FPF\PresentationFramework\PresentationFramework.csproj", "{FDE5334A-70B5-41AE-9445-A0C77725A63D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework", "external\vs-editor-api\src\Editor\FPF\PresentationFramework\PresentationFramework.csproj", "{FDE5334A-70B5-41AE-9445-A0C77725A63D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationClient", "external\vs-editor-api\src\Editor\FPF\UIAutomationClient\UIAutomationClient.csproj", "{8858E6B0-8398-46A9-9022-358D10E5E394}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationClient", "external\vs-editor-api\src\Editor\FPF\UIAutomationClient\UIAutomationClient.csproj", "{8858E6B0-8398-46A9-9022-358D10E5E394}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationProvider", "external\vs-editor-api\src\Editor\FPF\UIAutomationProvider\UIAutomationProvider.csproj", "{8EC74798-FED7-4F3C-A01B-25013317A90B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationProvider", "external\vs-editor-api\src\Editor\FPF\UIAutomationProvider\UIAutomationProvider.csproj", "{8EC74798-FED7-4F3C-A01B-25013317A90B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIAutomationTypes", "external\vs-editor-api\src\Editor\FPF\UIAutomationTypes\UIAutomationTypes.csproj", "{52BF10FD-66DF-430F-8A30-E5E63A93AE91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationTypes", "external\vs-editor-api\src\Editor\FPF\UIAutomationTypes\UIAutomationTypes.csproj", "{52BF10FD-66DF-430F-8A30-E5E63A93AE91}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PatternMatchingImpl", "external\vs-editor-api\src\Editor\Text\Impl\PatternMatching\PatternMatchingImpl.csproj", "{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PatternMatchingImpl", "external\vs-editor-api\src\Editor\Text\Impl\PatternMatching\PatternMatchingImpl.csproj", "{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionTools", "src\tools\ExtensionTools\ExtensionTools.csproj", "{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing", "external\Xamarin.PropertyEditing\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj", "{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.PropertyEditing", "external\Xamarin.PropertyEditing\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj", "{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.PropertyEditing", "Xamarin.PropertyEditing", "{48087117-8851-402C-B8EA-38681EEF48ED}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Mac", "external\Xamarin.PropertyEditing\Xamarin.PropertyEditing.Mac\Xamarin.PropertyEditing.Mac.csproj", "{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MDBuildTasks", "msbuild\MDBuildTasks\MDBuildTasks.csproj", "{37E01D0B-8C44-441F-9F5D-56C36AB0B918}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MDBuildTasks", "msbuild\MDBuildTasks\MDBuildTasks.csproj", "{37E01D0B-8C44-441F-9F5D-56C36AB0B918}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardClassification", "external\vs-editor-api\src\Editor\Language\Def\StandardClassification\StandardClassification.csproj", "{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandardClassification", "external\vs-editor-api\src\Editor\Language\Def\StandardClassification\StandardClassification.csproj", "{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.PerfTests", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.PerfTests\MonoDevelop.Debugger.PerfTests.csproj", "{785F775C-9CA0-4411-86E6-B89D89F3E2ED}"
 EndProject
@@ -462,2471 +456,5026 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{F16C4445-227
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.DesignerSupport", "MonoDevelop.DesignerSupport", "{56499B8C-4935-4D00-9192-4F2033142975}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIGtk", "external\vs-editor-api\src\Editor\Text\Def\TextUIGtk\TextUIGtk.csproj", "{E5EA3C1D-431E-46FD-B879-492725B1CDBE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Mac", "src\addins\MonoDevelop.Debugger.Mac\MonoDevelop.Debugger.Mac.csproj", "{573D31CF-B22B-4693-820D-BA143266F4D8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport.Mac", "src\addins\MonoDevelop.DesignerSupport.Mac\MonoDevelop.DesignerSupport.Mac.csproj", "{364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUIGtk", "external\vs-editor-api\src\Editor\Text\Def\TextUIGtk\TextUIGtk.csproj", "{E5EA3C1D-431E-46FD-B879-492725B1CDBE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICommon", "external\vs-editor-api\src\Editor\Text\Def\TextUICommon\TextUICommon.csproj", "{11239964-1C07-4A3D-B129-E4AFFFE8A840}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoa", "external\vs-editor-api\src\Editor\Text\Def\TextUICocoa\TextUICocoa.csproj", "{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUICommon", "external\vs-editor-api\src\Editor\Text\Def\TextUICommon\TextUICommon.csproj", "{11239964-1C07-4A3D-B129-E4AFFFE8A840}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj", "{2C24D515-4A2C-445C-8419-C09231913CFA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIGtkUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIGtkUtil\TextUIGtkUtil.csproj", "{209B27AE-712E-4B87-8846-BB149874D44E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUIGtkUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIGtkUtil\TextUIGtkUtil.csproj", "{209B27AE-712E-4B87-8846-BB149874D44E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.DotNetCore", "external\Monodevelop.Netcoredbg\MonoDevelop.Debugger.DotNetCore\MonoDevelop.Debugger.DotNetCore.csproj", "{F71A259D-C08F-48D9-93B7-EE51497EB390}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.Debugger.DotNetCore", "external\Monodevelop.Netcoredbg\MonoDevelop.Debugger.DotNetCore\MonoDevelop.Debugger.DotNetCore.csproj", "{F71A259D-C08F-48D9-93B7-EE51497EB390}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk2", "external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj", "{FED3E127-B64A-4E57-8D2A-C8817C5D593A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt.Gtk2", "external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj", "{FED3E127-B64A-4E57-8D2A-C8817C5D593A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.GtkSharp", "external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj", "{8F0B736F-8353-4A6C-B471-192D826BDD81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt.GtkSharp", "external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj", "{8F0B736F-8353-4A6C-B471-192D826BDD81}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.GuiGtk3", "external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins.GuiGtk3", "external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkExtensions", "src\core\MonoDevelop.GtkExtensions\MonoDevelop.GtkExtensions.csproj", "{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.GtkExtensions", "src\core\MonoDevelop.GtkExtensions\MonoDevelop.GtkExtensions.csproj", "{288994D1-C7E1-4740-99AB-A52B572EBA8A}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{f8f92aa4-a376-4679-a9d4-60e7b7fbf477}*SharedItemsImports = 4
-		src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{fbaad910-f29b-4ac5-9fc0-27f6eb36c495}*SharedItemsImports = 13
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		DebugGnome|Any CPU = DebugGnome|Any CPU
+		DebugGnome|x86 = DebugGnome|x86
 		DebugMac|Any CPU = DebugMac|Any CPU
+		DebugMac|x86 = DebugMac|x86
 		DebugWin32|Any CPU = DebugWin32|Any CPU
+		DebugWin32|x86 = DebugWin32|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 		ReleaseGnome|Any CPU = ReleaseGnome|Any CPU
+		ReleaseGnome|x86 = ReleaseGnome|x86
 		ReleaseMac|Any CPU = ReleaseMac|Any CPU
+		ReleaseMac|x86 = ReleaseMac|x86
 		ReleaseWin32|Any CPU = ReleaseWin32|Any CPU
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
+		ReleaseWin32|x86 = ReleaseWin32|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|x86.Build.0 = Debug|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|x86.ActiveCfg = DebugWin32|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|x86.Build.0 = DebugWin32|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|x86.ActiveCfg = DebugWin32|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|x86.Build.0 = DebugWin32|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|x86.ActiveCfg = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|x86.Build.0 = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|x86.Build.0 = Debug|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|x86.ActiveCfg = Release|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|x86.Build.0 = Release|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|x86.Build.0 = ReleaseWin32|Any CPU
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|x86.ActiveCfg = Debug|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|x86.Build.0 = Debug|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.Build.0 = Debug|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|x86.ActiveCfg = Debug|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|x86.Build.0 = Debug|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.ActiveCfg = Debug|x64
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.Build.0 = Debug|x64
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|x86.ActiveCfg = Debug|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|x86.Build.0 = Debug|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|Any CPU.Build.0 = Debug|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|x86.ActiveCfg = Debug|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugWin32|x86.Build.0 = Debug|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|x86.ActiveCfg = Release|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Release|x86.Build.0 = Release|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|Any CPU.Build.0 = Release|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|x86.ActiveCfg = Release|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseGnome|x86.Build.0 = Release|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.ActiveCfg = Release|x64
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|Any CPU.Build.0 = Release|x64
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|x86.ActiveCfg = Release|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseMac|x86.Build.0 = Release|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|Any CPU.Build.0 = Release|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|x86.ActiveCfg = Release|x86
+		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.ReleaseWin32|x86.Build.0 = Release|x86
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|x86.Build.0 = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|x86.ActiveCfg = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|x86.Build.0 = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Debug|x86.Build.0 = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|Any CPU.Build.0 = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|x86.ActiveCfg = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.Release|x86.Build.0 = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{961B9266-C44A-42B6-BA3D-3FB229C9C417}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Debug|x86.Build.0 = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|x86.ActiveCfg = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.Release|x86.Build.0 = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{19DE0F35-D204-4FD8-A553-A19ECE05E24D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|x86.Build.0 = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|x86.ActiveCfg = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Release|x86.Build.0 = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|x86.Build.0 = Debug|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|x86.ActiveCfg = Release|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|x86.Build.0 = Release|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|x86.Build.0 = ReleaseWin32|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|x86.ActiveCfg = DebugMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|x86.Build.0 = DebugMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|x86.ActiveCfg = DebugMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|x86.Build.0 = DebugMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|x86.Build.0 = Release|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|x86.ActiveCfg = ReleaseMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|x86.Build.0 = ReleaseMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseWin32|x86.ActiveCfg = ReleaseMac|Any CPU
+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseWin32|x86.Build.0 = ReleaseMac|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|x86.Build.0 = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Release|x86.Build.0 = Release|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|x86.Build.0 = Debug|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|x86.ActiveCfg = Release|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|x86.Build.0 = Release|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|x86.Build.0 = ReleaseWin32|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|x86.Build.0 = Debug|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Release|x86.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Release|x86.Build.0 = Release|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{1038FBD8-750E-4081-BC65-D89FFED3C881}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|x86.Build.0 = Debug|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|x86.ActiveCfg = DebugGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|x86.Build.0 = DebugGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|x86.ActiveCfg = DebugGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|x86.Build.0 = DebugGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|x86.ActiveCfg = Release|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|x86.Build.0 = Release|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|x86.Build.0 = ReleaseGnome|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|x86.Build.0 = ReleaseGnome|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|x86.Build.0 = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|x86.ActiveCfg = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|x86.Build.0 = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|x86.Build.0 = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|x86.ActiveCfg = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|x86.Build.0 = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|x86.Build.0 = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Release|x86.Build.0 = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Debug|x86.Build.0 = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|x86.ActiveCfg = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.Release|x86.Build.0 = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{75B9F2DF-4DEA-4007-965D-339563735EBE}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Debug|x86.Build.0 = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|x86.Build.0 = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{9A415695-CF80-4845-AA80-0DA26CF1E256}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|x86.Build.0 = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|x86.ActiveCfg = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|x86.Build.0 = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|x86.Build.0 = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|x86.ActiveCfg = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Release|x86.Build.0 = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Debug|x86.Build.0 = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.Release|x86.Build.0 = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{2A00A871-C641-4116-ADFD-29B7799952B4}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|x86.Build.0 = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|x86.ActiveCfg = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|x86.Build.0 = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Debug|x86.Build.0 = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.Release|x86.Build.0 = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F79A67A1-4BA2-48F8-A7DD-A72E316EF6CD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Debug|x86.Build.0 = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.Release|x86.Build.0 = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F426CBB2-77FC-4E14-9E28-E667C2D1299A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Debug|x86.Build.0 = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|x86.ActiveCfg = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|x86.Build.0 = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{875D389F-48D1-4D46-BFC6-998837DD6AE0}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|x86.Build.0 = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|x86.ActiveCfg = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Release|x86.Build.0 = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Debug|x86.Build.0 = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.Release|x86.Build.0 = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{1F29B0A7-458F-4093-85DE-52E36EA2FC0E}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Debug|x86.Build.0 = Debug|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.Release|x86.Build.0 = Release|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{AE84B4A7-E6B1-4565-8904-16284DCE41B6}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|x86.Build.0 = Debug|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|x86.ActiveCfg = DebugMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|x86.Build.0 = DebugMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|x86.ActiveCfg = DebugMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|x86.Build.0 = DebugMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|x86.Build.0 = Release|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|x86.ActiveCfg = ReleaseMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|x86.Build.0 = ReleaseMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|x86.ActiveCfg = ReleaseMac|Any CPU
+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|x86.Build.0 = ReleaseMac|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|x86.Build.0 = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|x86.ActiveCfg = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|x86.Build.0 = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|x86.Build.0 = Debug|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|x86.ActiveCfg = DebugWin32|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|x86.Build.0 = DebugWin32|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|x86.ActiveCfg = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|x86.Build.0 = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|x86.Build.0 = ReleaseGnome|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
 		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|x86.Build.0 = ReleaseWin32|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|x86.Build.0 = Debug|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|x86.ActiveCfg = DebugGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|x86.Build.0 = DebugGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|x86.ActiveCfg = DebugGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|x86.Build.0 = DebugGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|x86.ActiveCfg = Release|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|x86.Build.0 = Release|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|x86.Build.0 = ReleaseGnome|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|x86.Build.0 = ReleaseGnome|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Debug|x86.Build.0 = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.Release|x86.Build.0 = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{8E47B77A-A649-494C-9BF2-B845E39CADE9}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Debug|x86.Build.0 = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.Release|x86.Build.0 = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Debug|x86.Build.0 = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|x86.ActiveCfg = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|x86.Build.0 = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Debug|x86.Build.0 = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|x86.ActiveCfg = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|x86.Build.0 = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{0AF16AF1-0876-413E-9803-08BD33C19E00}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Debug|x86.Build.0 = Debug|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Release|x86.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.Release|x86.Build.0 = Release|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{50D6768C-C072-4E79-AFC5-C1C40767EF45}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|x86.Build.0 = Debug|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|x86.ActiveCfg = DebugMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|x86.Build.0 = DebugMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|x86.ActiveCfg = DebugMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|x86.Build.0 = DebugMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|x86.ActiveCfg = Release|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|x86.Build.0 = Release|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|x86.ActiveCfg = ReleaseMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|x86.Build.0 = ReleaseMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|x86.ActiveCfg = ReleaseMac|Any CPU
+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|x86.Build.0 = ReleaseMac|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|x86.Build.0 = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|x86.ActiveCfg = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Release|x86.Build.0 = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Debug|x86.Build.0 = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|x86.ActiveCfg = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.Release|x86.Build.0 = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{BEFADF93-EE92-4806-9C0B-937B25311C95}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|x86.Build.0 = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|x86.ActiveCfg = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Release|x86.Build.0 = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Debug|x86.Build.0 = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.Release|x86.Build.0 = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{3D363F0C-5731-42AA-9022-B7F4657F298A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Debug|x86.Build.0 = Debug|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.Release|x86.Build.0 = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F5390DA4-08B7-47E3-B6F3-D50683316AB4}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|x86.Build.0 = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|x86.Build.0 = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Debug|x86.Build.0 = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.Release|x86.Build.0 = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|x86.Build.0 = Debug|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|x86.ActiveCfg = DebugMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|x86.Build.0 = DebugMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|x86.ActiveCfg = DebugMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|x86.Build.0 = DebugMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|x86.ActiveCfg = Release|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|x86.Build.0 = Release|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|x86.ActiveCfg = ReleaseMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|x86.Build.0 = ReleaseMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|x86.ActiveCfg = ReleaseMac|Any CPU
+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|x86.Build.0 = ReleaseMac|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|x86.Build.0 = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|x86.ActiveCfg = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|x86.Build.0 = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Debug|x86.Build.0 = Debug|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.Release|x86.Build.0 = Release|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Debug|x86.Build.0 = Debug|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Release|x86.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Release|x86.Build.0 = Release|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Debug|x86.Build.0 = Debug|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Release|x86.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.Release|x86.Build.0 = Release|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|x86.Build.0 = Debug|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Release|x86.Build.0 = Release|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|x86.Build.0 = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|x86.ActiveCfg = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Release|x86.Build.0 = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.Debug|x86.Build.0 = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.Release|x86.Build.0 = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F218643D-2E74-4309-820E-206A54B7133F}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Debug|x86.Build.0 = Debug|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.Release|x86.Build.0 = Release|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{2E1FB0DF-F9BB-4909-9F32-2D9D022A8E57}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Debug|x86.Build.0 = Debug|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Release|x86.Build.0 = Release|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Debug|x86.Build.0 = Debug|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|x86.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|x86.Build.0 = Release|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{459868D2-54DC-415B-B1AB-BE39BDBD352F}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|x86.Build.0 = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|x86.ActiveCfg = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|x86.Build.0 = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Debug|x86.Build.0 = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|x86.Build.0 = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|x86.Build.0 = Debug|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|x86.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|x86.Build.0 = Release|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.Debug|x86.Build.0 = Debug|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.Release|x86.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.Release|x86.Build.0 = Release|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{E95833C9-90AA-4366-9262-0A1BED148249}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|x86.Build.0 = Debug|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|x86.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|x86.Build.0 = Release|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Debug|x86.Build.0 = Debug|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|x86.Build.0 = Release|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|x86.Build.0 = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|x86.ActiveCfg = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|x86.Build.0 = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|x86.Build.0 = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|x86.ActiveCfg = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|x86.Build.0 = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{42D1CE65-A14B-4218-B787-58AD7AA68513}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|x86.Build.0 = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|x86.ActiveCfg = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|x86.Build.0 = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|x86.Build.0 = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|x86.ActiveCfg = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|x86.Build.0 = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.Build.0 = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{53DCA265-3C3C-42F9-B647-F72BA678122B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|x86.Build.0 = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|x86.Build.0 = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|x86.Build.0 = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.Build.0 = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|x86.ActiveCfg = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|x86.Build.0 = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.Build.0 = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|x86.ActiveCfg = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|x86.Build.0 = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|Any CPU.ActiveCfg = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|Any CPU.Build.0 = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|x86.ActiveCfg = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugMac|x86.Build.0 = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|Any CPU.Build.0 = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|x86.ActiveCfg = Debug|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.DebugWin32|x86.Build.0 = Debug|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|Any CPU.ActiveCfg = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|Any CPU.Build.0 = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|x86.ActiveCfg = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.Release|x86.Build.0 = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|Any CPU.Build.0 = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|x86.ActiveCfg = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseGnome|x86.Build.0 = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|Any CPU.ActiveCfg = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|Any CPU.Build.0 = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|x86.ActiveCfg = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseMac|x86.Build.0 = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
 		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|Any CPU.Build.0 = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|x86.ActiveCfg = Release|x86
+		{BFE8691A-D323-4622-9021-7B8B27F81599}.ReleaseWin32|x86.Build.0 = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|x86.ActiveCfg = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|x86.Build.0 = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|Any CPU.ActiveCfg = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|Any CPU.Build.0 = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|x86.ActiveCfg = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugGnome|x86.Build.0 = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.ActiveCfg = Debug|x64
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.Build.0 = Debug|x64
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|x86.ActiveCfg = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|x86.Build.0 = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|Any CPU.Build.0 = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.ActiveCfg = Debug|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.Build.0 = Debug|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.ActiveCfg = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.Build.0 = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|x86.ActiveCfg = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|x86.Build.0 = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|Any CPU.ActiveCfg = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|Any CPU.Build.0 = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|x86.ActiveCfg = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseGnome|x86.Build.0 = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|Any CPU.ActiveCfg = Release|x64
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|Any CPU.Build.0 = Release|x64
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|x86.ActiveCfg = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseMac|x86.Build.0 = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|Any CPU.ActiveCfg = Release|x86
 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|Any CPU.Build.0 = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|x86.ActiveCfg = Release|x86
+		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.ReleaseWin32|x86.Build.0 = Release|x86
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Debug|x86.Build.0 = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|x86.ActiveCfg = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.Release|x86.Build.0 = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Debug|x86.Build.0 = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|x86.ActiveCfg = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|x86.Build.0 = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|x86.Build.0 = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|x86.ActiveCfg = DebugMac|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugGnome|x86.Build.0 = DebugMac|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|x86.ActiveCfg = DebugMac|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|x86.Build.0 = DebugMac|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.Release|x86.ActiveCfg = Release|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.Release|x86.Build.0 = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|x86.ActiveCfg = ReleaseMac|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseGnome|x86.Build.0 = ReleaseMac|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|x86.ActiveCfg = ReleaseMac|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.ReleaseWin32|x86.Build.0 = ReleaseMac|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Debug|x86.Build.0 = Debug|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Release|x86.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.Release|x86.Build.0 = Release|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{C05AAB7A-523F-4109-966B-6675BE0975BA}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Debug|x86.Build.0 = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|x86.ActiveCfg = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.Release|x86.Build.0 = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{EBFC7F90-C2E5-4A4C-A327-E35021BEC181}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Debug|x86.Build.0 = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|x86.ActiveCfg = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.Release|x86.Build.0 = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{9E4BA410-8338-42EC-AF9C-422C35ECED81}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Debug|x86.Build.0 = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|x86.ActiveCfg = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.Release|x86.Build.0 = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{73D4CC8B-BAB9-4A29-841B-F25C6311F067}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.Debug|x86.Build.0 = Debug|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.Release|x86.Build.0 = Release|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Debug|x86.Build.0 = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.Release|x86.Build.0 = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Debug|x86.Build.0 = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.Release|x86.Build.0 = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{6224D87E-2AC1-4D9F-91ED-714F797297BF}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Debug|x86.Build.0 = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.Release|x86.Build.0 = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|x86.Build.0 = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|x86.Build.0 = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Debug|x86.Build.0 = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Release|x86.ActiveCfg = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Release|x86.Build.0 = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|x86.Build.0 = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|x86.Build.0 = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Debug|x86.Build.0 = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Release|x86.ActiveCfg = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Release|x86.Build.0 = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Debug|x86.Build.0 = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Release|x86.Build.0 = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Debug|x86.Build.0 = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Release|x86.ActiveCfg = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.Release|x86.Build.0 = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{443311BF-766D-4863-B5A1-AFAA7F41DBDA}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Debug|x86.Build.0 = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Release|x86.ActiveCfg = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.Release|x86.Build.0 = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{25FBDD35-1CA0-4BED-93F6-927FAF33F96B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Debug|x86.ActiveCfg = Debug|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Debug|x86.Build.0 = Debug|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugGnome|x86.ActiveCfg = DebugWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugGnome|x86.Build.0 = DebugWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|x86.ActiveCfg = DebugWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|x86.Build.0 = DebugWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.Build.0 = DebugWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|x86.ActiveCfg = DebugWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|x86.Build.0 = DebugWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|x86.ActiveCfg = Release|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|x86.Build.0 = Release|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|x86.ActiveCfg = ReleaseWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|x86.Build.0 = ReleaseWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|x86.ActiveCfg = ReleaseWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|x86.Build.0 = ReleaseWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|x86
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|x86.ActiveCfg = ReleaseWin32|x86
+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|x86.Build.0 = ReleaseWin32|x86
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Debug|x86.Build.0 = Debug|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Release|x86.Build.0 = Release|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.Debug|x86.Build.0 = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.Release|x86.Build.0 = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{3FDB97B5-916E-4817-8098-41659687A8FF}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.Release|x86.Build.0 = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.Debug|x86.Build.0 = Debug|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.Release|x86.Build.0 = Release|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{74704C00-5861-4F86-920C-865148A175C5}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Debug|x86.Build.0 = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Release|x86.ActiveCfg = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.Release|x86.Build.0 = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{6868153E-41EA-43A4-A81A-C1E7256373F7}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Debug|x86.Build.0 = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.Release|x86.Build.0 = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Debug|x86.Build.0 = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.Release|x86.Build.0 = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{10F5BBD5-8A1D-4563-BCE4-DE681DFD82FD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Debug|x86.Build.0 = Debug|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|x86.ActiveCfg = DebugWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|x86.Build.0 = DebugWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|x86.ActiveCfg = DebugWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|x86.Build.0 = DebugWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|x86.Build.0 = Release|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|x86.Build.0 = ReleaseWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|x86.Build.0 = ReleaseWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|x86.ActiveCfg = ReleaseWin32|Any CPU
+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|x86.Build.0 = ReleaseWin32|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|x86.Build.0 = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Release|x86.Build.0 = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Debug|x86.Build.0 = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.Release|x86.Build.0 = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Debug|x86.Build.0 = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Release|x86.ActiveCfg = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.Release|x86.Build.0 = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|x86.ActiveCfg = Debug|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{AC7D119C-980B-4712-8811-5368C14412D7}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Debug|x86.Build.0 = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.Release|x86.Build.0 = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{CF789E43-7AAF-4690-BA32-ABD75DEEB087}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.Debug|x86.Build.0 = Debug|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.Release|x86.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.Release|x86.Build.0 = Release|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Debug|x86.Build.0 = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.Release|x86.Build.0 = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Debug|x86.Build.0 = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Release|x86.ActiveCfg = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.Release|x86.Build.0 = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{58A31F94-E76F-4921-9D82-D6F7C9F12518}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Debug|x86.Build.0 = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.Release|x86.Build.0 = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{5DC29B94-D9AF-4795-AFDD-A468ECA21A10}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Debug|x86.Build.0 = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Release|x86.ActiveCfg = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.Release|x86.Build.0 = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{82B9A5C5-5713-49B5-93D1-BE29B00FF35A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.Build.0 = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.Build.0 = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Debug|x86.Build.0 = Debug|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Release|x86.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Release|x86.Build.0 = Release|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.Build.0 = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Debug|x86.Build.0 = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.Release|x86.Build.0 = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Debug|x86.Build.0 = Debug|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Release|x86.ActiveCfg = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.Release|x86.Build.0 = Release|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.Debug|x86.Build.0 = Debug|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.Release|x86.Build.0 = Release|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Debug|x86.Build.0 = Debug|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Release|x86.Build.0 = Release|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.Debug|x86.Build.0 = Debug|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.Release|x86.ActiveCfg = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.Release|x86.Build.0 = Release|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Debug|x86.Build.0 = Debug|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Release|x86.ActiveCfg = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Release|x86.Build.0 = Release|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.Debug|x86.Build.0 = Debug|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.Release|x86.ActiveCfg = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.Release|x86.Build.0 = Release|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Debug|x86.Build.0 = Debug|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Release|x86.ActiveCfg = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Release|x86.Build.0 = Release|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Debug|x86.Build.0 = Debug|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Release|x86.Build.0 = Release|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Debug|x86.Build.0 = Debug|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Release|x86.Build.0 = Release|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.Debug|x86.Build.0 = Debug|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.Release|x86.ActiveCfg = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.Release|x86.Build.0 = Release|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Debug|x86.Build.0 = Debug|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Release|x86.Build.0 = Release|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Debug|x86.Build.0 = Debug|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Release|x86.Build.0 = Release|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.Debug|x86.Build.0 = Debug|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.Release|x86.Build.0 = Release|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Debug|x86.Build.0 = Debug|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Release|x86.ActiveCfg = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.Release|x86.Build.0 = Release|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.Debug|x86.Build.0 = Debug|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.Release|x86.ActiveCfg = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.Release|x86.Build.0 = Release|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Debug|x86.Build.0 = Debug|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Release|x86.Build.0 = Release|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.Debug|x86.Build.0 = Debug|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.Release|x86.ActiveCfg = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.Release|x86.Build.0 = Release|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Debug|x86.Build.0 = Debug|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Release|x86.Build.0 = Release|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Release|x86.Build.0 = Release|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.Debug|x86.Build.0 = Debug|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.Release|x86.ActiveCfg = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.Release|x86.Build.0 = Release|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.Debug|x86.Build.0 = Debug|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.Release|x86.ActiveCfg = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.Release|x86.Build.0 = Release|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.Debug|x86.Build.0 = Debug|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.Release|x86.ActiveCfg = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.Release|x86.Build.0 = Release|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.Debug|x86.Build.0 = Debug|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.Release|x86.ActiveCfg = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.Release|x86.Build.0 = Release|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.Debug|x86.Build.0 = Debug|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.Release|x86.Build.0 = Release|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.Release|x86.Build.0 = Release|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Debug|x86.Build.0 = Debug|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Release|x86.ActiveCfg = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Release|x86.Build.0 = Release|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Debug|x86.Build.0 = Debug|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Release|x86.ActiveCfg = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Release|x86.Build.0 = Release|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.Debug|x86.Build.0 = Debug|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.Release|x86.ActiveCfg = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.Release|x86.Build.0 = Release|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Debug|x86.Build.0 = Debug|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Release|x86.ActiveCfg = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Release|x86.Build.0 = Release|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Debug|x86.Build.0 = Debug|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Release|x86.ActiveCfg = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Release|x86.Build.0 = Release|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Debug|x86.Build.0 = Debug|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Release|x86.Build.0 = Release|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Debug|x86.Build.0 = Debug|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|x86.ActiveCfg = Gnome|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|x86.Build.0 = Gnome|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Release|x86.Build.0 = Release|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Debug|x86.Build.0 = Debug|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|x86.ActiveCfg = Gnome|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|x86.Build.0 = Gnome|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Release|x86.Build.0 = Release|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.Debug|x86.Build.0 = Debug|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|x86.ActiveCfg = Gnome|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|x86.Build.0 = Gnome|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.Release|x86.Build.0 = Release|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.Debug|x86.Build.0 = Debug|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.Release|x86.ActiveCfg = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.Release|x86.Build.0 = Release|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.Debug|x86.Build.0 = Debug|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.Release|x86.Build.0 = Release|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Debug|x86.Build.0 = Debug|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Release|x86.ActiveCfg = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Release|x86.Build.0 = Release|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|x86.Build.0 = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Release|x86.Build.0 = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU
-		{44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.Build.0 = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|x86.Build.0 = Debug|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugGnome|x86.ActiveCfg = DebugMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugGnome|x86.Build.0 = DebugMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugWin32|x86.ActiveCfg = DebugMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugWin32|x86.Build.0 = DebugMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|x86.Build.0 = Release|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseGnome|x86.ActiveCfg = ReleaseMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseGnome|x86.Build.0 = ReleaseMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|x86.Build.0 = Debug|Any CPU
-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|x86.ActiveCfg = Release|Any CPU
-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|x86.Build.0 = Release|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseWin32|x86.ActiveCfg = ReleaseMac|Any CPU
+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseWin32|x86.Build.0 = ReleaseMac|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugMac|x86.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugWin32|x86.Build.0 = Debug|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.Release|x86.Build.0 = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseMac|x86.Build.0 = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Debug|x86.Build.0 = Debug|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugGnome|x86.ActiveCfg = DebugWin32|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugGnome|x86.Build.0 = DebugWin32|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugMac|x86.ActiveCfg = DebugWin32|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugMac|x86.Build.0 = DebugWin32|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugWin32|x86.ActiveCfg = DebugWin32|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.DebugWin32|x86.Build.0 = DebugWin32|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Release|x86.ActiveCfg = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.Release|x86.Build.0 = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{37E01D0B-8C44-441F-9F5D-56C36AB0B918}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.Build.0 = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.ActiveCfg = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.Build.0 = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.Build.0 = Debug|Any CPU
-		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.ActiveCfg = Release|Any CPU
-		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.Build.0 = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Debug|x86.Build.0 = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Release|x86.Build.0 = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|x86.Build.0 = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|x86.Build.0 = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|x86.Build.0 = Debug|Any CPU
-		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|x86.ActiveCfg = Release|Any CPU
-		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|x86.Build.0 = Release|Any CPU
-
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|x86.Build.0 = Debug|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|x86.ActiveCfg = Release|Any CPU
-		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|x86.Build.0 = Release|Any CPU
-
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{573D31CF-B22B-4693-820D-BA143266F4D8}.Release|x86.Build.0 = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|x86.Build.0 = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|x86.ActiveCfg = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|x86.Build.0 = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
-		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|x86.Build.0 = Debug|Any CPU
-		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|x86.ActiveCfg = Release|Any CPU
-		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|x86.Build.0 = Release|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|x86.Build.0 = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|x86.Build.0 = Debug|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|x86.ActiveCfg = DebugGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|x86.Build.0 = DebugGnome|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|x86.ActiveCfg = DebugMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|x86.Build.0 = DebugMac|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = DebugMac|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = DebugMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|x86.ActiveCfg = DebugGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|x86.Build.0 = DebugGnome|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = DebugMac|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = DebugMac|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|x86.Build.0 = Debug|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|x86.ActiveCfg = Release|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|x86.Build.0 = Release|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|x86.Build.0 = ReleaseGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|x86.ActiveCfg = ReleaseMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|x86.Build.0 = ReleaseMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = DebugMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = DebugMac|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|x86.ActiveCfg = ReleaseGnome|Any CPU
+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|x86.Build.0 = ReleaseGnome|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Debug|x86.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|x86.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|x86.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|x86.Build.0 = Debug|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|x86.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.Release|x86.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|x86.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|x86.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|x86.Build.0 = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|x86.ActiveCfg = Release|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|x86.Build.0 = Release|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
-		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|x86.Build.0 = Debug|Any CPU
-		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|x86.ActiveCfg = Release|Any CPU
-		{F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|x86.Build.0 = Release|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.Build.0 = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.ActiveCfg = Release|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.Build.0 = Release|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
-		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.Build.0 = Debug|Any CPU
-		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.ActiveCfg = Release|Any CPU
-		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.Build.0 = Release|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.Build.0 = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.Build.0 = Release|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
-		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.Build.0 = Debug|Any CPU
-		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.ActiveCfg = Release|Any CPU
-		{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.Build.0 = Release|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.Build.0 = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|x86.Build.0 = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|x86.Build.0 = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|x86.ActiveCfg = Release|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|x86.Build.0 = Release|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|x86.Build.0 = Release|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
-		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.Build.0 = Debug|Any CPU
-		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|x86.ActiveCfg = Release|Any CPU
-		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|x86.Build.0 = Release|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|x86.Build.0 = Debug|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|x86.ActiveCfg = Release|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|x86.Build.0 = Release|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|x86.Build.0 = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Debug|x86.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugGnome|x86.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugMac|x86.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.DebugWin32|x86.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.Release|x86.Build.0 = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseMac|x86.Build.0 = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2946,7 +5495,6 @@ Global
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
 		{1038FBD8-750E-4081-BC65-D89FFED3C881} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
-		{E17829B5-8EAC-4714-8798-EB8ED3540191} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
 		{02280E65-C507-4931-AE68-AA2E89E15EEF} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
 		{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
@@ -3062,7 +5610,6 @@ Global
 		{1DEFDD53-2677-439D-906E-141ED2AEC19B} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02} = {1DEFDD53-2677-439D-906E-141ED2AEC19B}
 		{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
-		{CD31F051-9012-487B-B7E8-4CDDEA68B3AF} = {56499B8C-4935-4D00-9192-4F2033142975}
 		{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
 		{CF789E43-7AAF-4690-BA32-ABD75DEEB087} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
 		{A9D93F6C-EB26-44FF-8F2A-B3DB411FA410} = {1DEFDD53-2677-439D-906E-141ED2AEC19B}
@@ -3075,8 +5622,8 @@ Global
 		{44FFFDDA-156F-49F9-AE6A-BA640C198B33} = {1DEFDD53-2677-439D-906E-141ED2AEC19B}
 		{C14B06AC-905A-47AB-BAD9-652E3499CFE0} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
 		{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
-		{3F5B5BDA-69D5-441A-8142-AA25C998A997} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
 		{669BD438-1BDC-40C6-83CA-CEC133D036A0} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
+		{3F5B5BDA-69D5-441A-8142-AA25C998A997} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
 		{5A92B792-BF17-4748-B29E-34C99B2E8722} = {669BD438-1BDC-40C6-83CA-CEC133D036A0}
 		{378D061D-D16E-408F-8E01-68B04D77258A} = {669BD438-1BDC-40C6-83CA-CEC133D036A0}
 		{697A93E1-E591-41A6-8D95-B4B92C3DD4E5} = {5A92B792-BF17-4748-B29E-34C99B2E8722}
@@ -3132,33 +5679,33 @@ Global
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
 		{A0B6FE73-D046-4E1C-BA9D-F20683889C5A} = {48087117-8851-402C-B8EA-38681EEF48ED}
 		{48087117-8851-402C-B8EA-38681EEF48ED} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
-		{E8F4F0EB-C2B1-4116-8459-E076E0E0E485} = {48087117-8851-402C-B8EA-38681EEF48ED}
 		{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D} = {0E8F5B35-CB3C-4B83-B09C-0D5A66B38A6B}
 		{785F775C-9CA0-4411-86E6-B89D89F3E2ED} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
 		{8E19F797-D714-4C07-903F-97C76E247A03} = {5A92B792-BF17-4748-B29E-34C99B2E8722}
 		{F16C4445-2277-4A08-9511-5BE611756CDA} = {8E19F797-D714-4C07-903F-97C76E247A03}
 		{56499B8C-4935-4D00-9192-4F2033142975} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
 		{E5EA3C1D-431E-46FD-B879-492725B1CDBE} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
-		{573D31CF-B22B-4693-820D-BA143266F4D8} = {776872D9-76FA-407B-BA69-08E25A24E5CE}
-		{364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A} = {56499B8C-4935-4D00-9192-4F2033142975}
 		{11239964-1C07-4A3D-B129-E4AFFFE8A840} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
-		{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B}
 		{2C24D515-4A2C-445C-8419-C09231913CFA} = {56499B8C-4935-4D00-9192-4F2033142975}
 		{209B27AE-712E-4B87-8846-BB149874D44E} = {745BF6CA-BC7C-4863-B1B4-C423A828820A}
 		{F71A259D-C08F-48D9-93B7-EE51497EB390} = {A026D596-3C8D-4521-BB42-2C898FA3BE2D}
 		{FED3E127-B64A-4E57-8D2A-C8817C5D593A} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
 		{8F0B736F-8353-4A6C-B471-192D826BDD81} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
 		{410A7DC9-E7DA-43E6-B592-93E2A344B660} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
-		{0A8EB4EA-60B4-4708-BA45-68C5E730ED00} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
+		{288994D1-C7E1-4740-99AB-A52B572EBA8A} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{f8f92aa4-a376-4679-a9d4-60e7b7fbf477}*SharedItemsImports = 4
+		src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{fbaad910-f29b-4ac5-9fc0-27f6eb36c495}*SharedItemsImports = 13
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.StandardHeader = $1
 		$1.Text = @\n${FileName}\n \nAuthor:\n      ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.
-		$0.TextStylePolicy = $2
+		$0.TextStylePolicy = $19
 		$2.TabsToSpaces = False
 		$2.inheritsSet = null
 		$2.inheritsScope = text/plain
@@ -3171,7 +5718,6 @@ Global
 		$5.UpdateMode = None
 		$5.VcsIntegration = None
 		$5.inheritsSet = Mono
-		$0.TextStylePolicy = $6
 		$6.scope = text/x-csharp
 		$6.FileWidth = 80
 		$0.CSharpFormattingPolicy = $7
@@ -3193,40 +5739,29 @@ Global
 		$7.SpacingAfterMethodDeclarationName = True
 		$7.SpaceAfterMethodCallName = True
 		$7.SpaceBeforeOpenSquareBracket = True
-		$0.TextStylePolicy = $8
 		$8.inheritsSet = null
 		$8.scope = text/x-makefile
-		$0.TextStylePolicy = $9
 		$9.inheritsSet = null
 		$9.scope = application/x-addin+xml
-		$0.TextStylePolicy = $10
 		$10.inheritsSet = null
 		$10.scope = text/x-changelog
-		$0.TextStylePolicy = $11
 		$11.inheritsSet = null
 		$11.scope = text/html
-		$0.TextStylePolicy = $12
 		$12.inheritsSet = null
 		$12.scope = image/svg+xml
-		$0.XmlFormattingPolicy = $13
+		$0.XmlFormattingPolicy = $18
 		$13.inheritsSet = null
 		$13.scope = application/config+xml
 		$13.inheritsScope = application/xml
-		$0.TextStylePolicy = $14
 		$14.scope = text/plain
 		$14.FileWidth = 80
-		$0.TextStylePolicy = $15
 		$15.inheritsSet = null
 		$15.scope = application/xml
-		$0.XmlFormattingPolicy = $16
 		$16.scope = application/xml
-		$0.TextStylePolicy = $17
 		$17.inheritsSet = null
 		$17.scope = application/config+xml
-		$0.XmlFormattingPolicy = $18
 		$18.inheritsSet = null
 		$18.scope = application/config+xml
-		$0.TextStylePolicy = $19
 		$19.inheritsSet = null
 		$19.scope = application/json
 		outputpath = build\bin\
diff --git a/main/external/debugger-libs b/main/external/debugger-libs
index aae0e23e345..e01783f649f 160000
--- a/main/external/debugger-libs
+++ b/main/external/debugger-libs
@@ -1 +1 @@
-Subproject commit aae0e23e345caa1f3652b0e6b7d9e5bf49037ef3
+Subproject commit e01783f649f4beb21074c1111929c90bb7b9c326
diff --git a/main/external/guiunit b/main/external/guiunit
index 9affe481398..ceeb09c8f25 160000
--- a/main/external/guiunit
+++ b/main/external/guiunit
@@ -1 +1 @@
-Subproject commit 9affe4813987b009022ab7b10e55f81f4a37344c
+Subproject commit ceeb09c8f253edfd3bed78f1fc3f14c68d9f8fb5
diff --git a/main/external/nrefactory b/main/external/nrefactory
index 60ac8e99c51..074fabe9ba5 160000
--- a/main/external/nrefactory
+++ b/main/external/nrefactory
@@ -1 +1 @@
-Subproject commit 60ac8e99c51e43a58a4dc124b9680fb73c2f974b
+Subproject commit 074fabe9ba5dee3e02421538f596151344528f6a
diff --git a/main/external/vs-editor-api b/main/external/vs-editor-api
index 71b2d6b03cc..a86e95634d6 160000
--- a/main/external/vs-editor-api
+++ b/main/external/vs-editor-api
@@ -1 +1 @@
-Subproject commit 71b2d6b03ccaf515f5ccfeea85999b65bd9b22b4
+Subproject commit a86e95634d6deccb5726ccc22fe3aaba6224954e
diff --git a/main/external/xwt b/main/external/xwt
index b191f50b079..1d04d027d1d 160000
--- a/main/external/xwt
+++ b/main/external/xwt
@@ -1 +1 @@
-Subproject commit b191f50b079c49df4426302fe84c53baeec6c721
+Subproject commit 1d04d027d1d03aa0dba58c254380f7a97be3a01b
diff --git a/main/msbuild/MDBuildTasks.targets b/main/msbuild/MDBuildTasks.targets
index cf3615b0ece..1a13f3a307d 100644
--- a/main/msbuild/MDBuildTasks.targets
+++ b/main/msbuild/MDBuildTasks.targets
@@ -176,24 +176,6 @@
 	=================================================================
 	-->
 
-	<Target Name="_NuGetPrivateAssetsWorkaround_FilterLocalCopyReferences" BeforeTargets="_CopyFilesMarkedCopyLocal">
-		<FilterLocalCopyReferences
-			ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
-			IncludeList="@(IncludeCopyLocal)"
-			SuppressList="@(SuppressCopyLocal)"
-			ReferencedProjects="@(_MSBuildProjectReferenceExistent)"
-			Configuration="$(Configuration)"
-			Platform="$(Platform)"
-			ProjectDir="$(MSBuildProjectDirectory)"
-			ProjectName="$(MSBuildProjectName)"
-			DebugCopies="$(DebugFilterCopyReferences)">
-			<Output TaskParameter="ItemsToRemove" ItemName="_ReferenceCopyLocalPathsRemove" />
-		</FilterLocalCopyReferences>
-		<ItemGroup>
-		  <ReferenceCopyLocalPaths Remove="@(_ReferenceCopyLocalPathsRemove)" />
-			<_ReferenceCopyLocalPathsRemove Remove="@(_ReferenceCopyLocalPathsRemove)" />
-		</ItemGroup>
-	</Target>
 
 	<!--
 	HACK: Another workaround for broken PrivateAssets.
diff --git a/main/msbuild/ReferencesGtk.props b/main/msbuild/ReferencesGtk.props
index 480551d1975..139c48f1345 100644
--- a/main/msbuild/ReferencesGtk.props
+++ b/main/msbuild/ReferencesGtk.props
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="$(HaveGtkSharp)">
-    <PackageReference Include="GtkSharp" Version="3.22.25.98" />
+    
   </ItemGroup>
   <ItemGroup Condition="!$(HaveGtkSharp)">
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
@@ -31,6 +31,7 @@
       <Private>$(ReferencesGtkCopyToOutput)</Private>
     </Reference>
     <Reference Include="Mono.Cairo" />
+     <PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" Version="2.8.0" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
   </ItemGroup>
   <ItemGroup>
     <!--   this should not be here: -->
diff --git a/main/src/addins/MonoDevelop.DesignerSupport.Mac/MonoDevelop.DesignerSupport.Mac.csproj b/main/src/addins/MonoDevelop.DesignerSupport.Mac/MonoDevelop.DesignerSupport.Mac.csproj
index 45989912d13..2ddb2295143 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport.Mac/MonoDevelop.DesignerSupport.Mac.csproj
+++ b/main/src/addins/MonoDevelop.DesignerSupport.Mac/MonoDevelop.DesignerSupport.Mac.csproj
@@ -1,11 +1,11 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <Import Project="..\..\..\MonoDevelop.props" />
   <Import Project="$(ReferencesVSEditor)" />
   <Import Project="$(ReferencesGtk)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{364e4fee-0f78-4aec-a170-bb6ac93e8f9a}</ProjectGuid>
+    <ProjectGuid>{364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A}</ProjectGuid>
     <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
     <OutputPath>..\..\..\build\AddIns\MonoDevelop.DesignerSupport</OutputPath>
   </PropertyGroup>
@@ -14,31 +14,27 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup Condition=" '$(Configuration)' == 'ReleaseMac' OR '$(Configuration)' == 'DebugMac' ">
-      <Reference Include="Xamarin.Mac">
-        <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
-        <Private>False</Private>
-      </Reference>
-      <ProjectReference Include="..\..\..\external\xwt\Xwt.XamMac\Xwt.XamMac.csproj">
-        <Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
-        <Name>Xwt.XamMac</Name>
-        <Private>False</Private>
-        </ProjectReference>
-      <ProjectReference Include="..\..\..\external\Xamarin.PropertyEditing\Xamarin.PropertyEditing.Mac\Xamarin.PropertyEditing.Mac.csproj">
-        <Project>{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}</Project>
-        <Name>Xamarin.PropertyEditing.Mac</Name>
-      </ProjectReference>
-      <ProjectReference Include="..\..\..\external\Xamarin.PropertyEditing\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
-        <Project>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</Project>
-        <Name>Xamarin.PropertyEditing</Name>
-      </ProjectReference>
-      <IncludeCopyLocal Include="Xamarin.PropertyEditing.Mac.dll" />
-      <IncludeCopyLocal Include="Xamarin.PropertyEditing.dll" />
-      <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
-        <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
-        <Name>MonoDevelop.DesignerSupport</Name>
-      </ProjectReference>
+    <Reference Include="Xamarin.Mac">
+      <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <ProjectReference Include="..\..\..\external\xwt\Xwt.XamMac\Xwt.XamMac.csproj">
+      <Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
+      <Name>Xwt.XamMac</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Xamarin.PropertyEditing\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
+      <Project>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</Project>
+      <Name>Xamarin.PropertyEditing</Name>
+    </ProjectReference>
+    <IncludeCopyLocal Include="Xamarin.PropertyEditing.Mac.dll" />
+    <IncludeCopyLocal Include="Xamarin.PropertyEditing.dll" />
+    <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
+      <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
+      <Name>MonoDevelop.DesignerSupport</Name>
+    </ProjectReference>
   </ItemGroup>
-   <ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Design" />
@@ -87,9 +83,6 @@
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\MacToolboxWidgetDataSource.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\MacToolboxWidgetFlowLayoutDelegate.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="MonoDevelop.DesignerSupport\" />
-    <Folder Include="MonoDevelop.DesignerSupport.Toolbox\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/AddinInfo.cs b/main/src/addins/MonoDevelop.DesignerSupport/AddinInfo.cs
index 60adee7d2d9..3fa48ba6ac9 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/AddinInfo.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/AddinInfo.cs
@@ -14,8 +14,3 @@
 
 [assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
-
-#if MAC
-[assembly: ImportAddinAssembly ("Xamarin.PropertyEditing.dll")]
-[assembly: ImportAddinAssembly ("Xamarin.PropertyEditing.Mac.dll")]
-#endif
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Styles.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Styles.cs
index 2f745c851ff..b8a43df89e6 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Styles.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Styles.cs
@@ -1,80 +1,80 @@
-#if MAC
-using AppKit;
-using MonoDevelop.Core.FeatureConfiguration;
-using MonoDevelop.Ide;
-using Xamarin.PropertyEditing.Mac;
+// #if MAC
+// using AppKit;
+// using MonoDevelop.Core.FeatureConfiguration;
+// using MonoDevelop.Ide;
+// using Xamarin.PropertyEditing.Mac;
 
-namespace MonoDevelop.DesignerSupport
-{
-	static class Styles
-	{
-		public static NSColor SectionForegroundColor { get; internal set; } = NSColor.Text;
-		public static NSColor SectionBackgroundColor { get; private set; } = NSColor.ControlLightHighlight;
+// namespace MonoDevelop.DesignerSupport
+// {
+// 	static class Styles
+// 	{
+// 		public static NSColor SectionForegroundColor { get; internal set; } = NSColor.Text;
+// 		public static NSColor SectionBackgroundColor { get; private set; } = NSColor.ControlLightHighlight;
 
-		public static NSColor CellBackgroundSelectedColor { get; private set; } 
-		public static NSColor CellBackgroundUnfocusedSelectedColor { get; private set; } = NSColor.FromRgb (0.64f, 0.64f, 0.64f);
-		public static NSColor CellBackgroundColor { get; private set; } = NSColor.ControlBackground;
-		public static NSColor LabelSelectedForegroundColor { get; private set; }
+// 		public static NSColor CellBackgroundSelectedColor { get; private set; } 
+// 		public static NSColor CellBackgroundUnfocusedSelectedColor { get; private set; } = NSColor.FromRgb (0.64f, 0.64f, 0.64f);
+// 		public static NSColor CellBackgroundColor { get; private set; } = NSColor.ControlBackground;
+// 		public static NSColor LabelSelectedForegroundColor { get; private set; }
 
-		public static NSColor HeaderBackgroundColor { get; private set; }
-		public static NSColor HeaderBorderBackgroundColor { get; private set; }
-
-		public static NSColor ToolbarBackgroundColor { get; private set; }
-
-		public static PropertyPadStyle PropertyPad { get; private set; }
-
-		// Used for the property panel in Xamarin.PropertyEditing
-		public class PropertyPadStyle
-		{
-			public NSColor Checkerboard0 { get; internal set; }
-			public NSColor Checkerboard1 { get; internal set; }
-			public NSColor ValueBlockBackgroundColor { get; internal set; }
-			public NSColor FrameBoxButtonBackgroundColor { get; internal set; }
-			public NSColor TabBorderColor { get; internal set; }
-			public NSColor PanelTabBackground { get; internal set; }
-		}
+// 		public static NSColor HeaderBackgroundColor { get; private set; }
+// 		public static NSColor HeaderBorderBackgroundColor { get; private set; }
 
-		static Styles ()
-		{
-			LoadStyles ();
-			Ide.Gui.Styles.Changed += (o, e) => LoadStyles ();
-		}
+// 		public static NSColor ToolbarBackgroundColor { get; private set; }
 
-		public static void LoadStyles ()
-		{
-			if (IdeApp.Preferences.UserInterfaceTheme == Theme.Light) {
-				HeaderBackgroundColor = NSColor.FromRgb (0.98f, 0.98f, 0.98f);
-				HeaderBorderBackgroundColor = NSColor.FromRgb (0.96f, 0.96f, 0.96f);
-				LabelSelectedForegroundColor = NSColor.Highlight;
-				ToolbarBackgroundColor = NSColor.White;
-				CellBackgroundSelectedColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f);
-
-
-				PropertyPad = new PropertyPadStyle {
-					Checkerboard0 = NSColor.FromRgb (255, 255, 255),
-					Checkerboard1 = NSColor.FromRgb (217, 217, 217),
-					PanelTabBackground = NSColor.FromRgb (248, 247, 248),
-					TabBorderColor = NSColor.FromRgba (0, 0, 0, 25),
-					ValueBlockBackgroundColor = NSColor.FromRgba (0, 0, 0, 20),
-					FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f)
-			};
-			} else {
-				CellBackgroundSelectedColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f);
-				HeaderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
-				HeaderBorderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
-				LabelSelectedForegroundColor = NSColor.SelectedText;
-				ToolbarBackgroundColor = NSColor.FromRgb (0.25f, 0.25f, 0.25f);
+// 		public static PropertyPadStyle PropertyPad { get; private set; }
 
-				PropertyPad = new PropertyPadStyle {
-					Checkerboard0 = NSColor.FromRgb (38, 38, 38),
-					Checkerboard1 = NSColor.FromRgb (0, 0, 0),
-					PanelTabBackground = NSColor.FromRgb (85, 85, 85),
-					TabBorderColor = NSColor.FromRgba (255, 255, 255, 0),
-					ValueBlockBackgroundColor = NSColor.FromRgba (255, 255, 255, 25),
-					FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f)
-			};
-			}
-		}
-	}
-}
-#endif
+// 		// Used for the property panel in Xamarin.PropertyEditing
+// 		public class PropertyPadStyle
+// 		{
+// 			public NSColor Checkerboard0 { get; internal set; }
+// 			public NSColor Checkerboard1 { get; internal set; }
+// 			public NSColor ValueBlockBackgroundColor { get; internal set; }
+// 			public NSColor FrameBoxButtonBackgroundColor { get; internal set; }
+// 			public NSColor TabBorderColor { get; internal set; }
+// 			public NSColor PanelTabBackground { get; internal set; }
+// 		}
+
+// 		static Styles ()
+// 		{
+// 			LoadStyles ();
+// 			Ide.Gui.Styles.Changed += (o, e) => LoadStyles ();
+// 		}
+
+// 		public static void LoadStyles ()
+// 		{
+// 			if (IdeApp.Preferences.UserInterfaceTheme == Theme.Light) {
+// 				HeaderBackgroundColor = NSColor.FromRgb (0.98f, 0.98f, 0.98f);
+// 				HeaderBorderBackgroundColor = NSColor.FromRgb (0.96f, 0.96f, 0.96f);
+// 				LabelSelectedForegroundColor = NSColor.Highlight;
+// 				ToolbarBackgroundColor = NSColor.White;
+// 				CellBackgroundSelectedColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f);
+
+
+// 				PropertyPad = new PropertyPadStyle {
+// 					Checkerboard0 = NSColor.FromRgb (255, 255, 255),
+// 					Checkerboard1 = NSColor.FromRgb (217, 217, 217),
+// 					PanelTabBackground = NSColor.FromRgb (248, 247, 248),
+// 					TabBorderColor = NSColor.FromRgba (0, 0, 0, 25),
+// 					ValueBlockBackgroundColor = NSColor.FromRgba (0, 0, 0, 20),
+// 					FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f)
+// 			};
+// 			} else {
+// 				CellBackgroundSelectedColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f);
+// 				HeaderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
+// 				HeaderBorderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
+// 				LabelSelectedForegroundColor = NSColor.SelectedText;
+// 				ToolbarBackgroundColor = NSColor.FromRgb (0.25f, 0.25f, 0.25f);
+
+// 				PropertyPad = new PropertyPadStyle {
+// 					Checkerboard0 = NSColor.FromRgb (38, 38, 38),
+// 					Checkerboard1 = NSColor.FromRgb (0, 0, 0),
+// 					PanelTabBackground = NSColor.FromRgb (85, 85, 85),
+// 					TabBorderColor = NSColor.FromRgba (255, 255, 255, 0),
+// 					ValueBlockBackgroundColor = NSColor.FromRgba (255, 255, 255, 25),
+// 					FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f)
+// 			};
+// 			}
+// 		}
+// 	}
+// }
+// #endif
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MonoDevelopHostResourceProvider.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MonoDevelopHostResourceProvider.cs
index 0e67f77c01f..3e3fe66db61 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MonoDevelopHostResourceProvider.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MonoDevelopHostResourceProvider.cs
@@ -25,46 +25,46 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if MAC
-using AppKit;
-using MonoDevelop.Components;
-using MonoDevelop.Ide;
-using Xamarin.PropertyEditing.Mac;
-using static Xamarin.PropertyEditing.Mac.NamedResources;
+// #if MAC
+// using AppKit;
+// using MonoDevelop.Components;
+// using MonoDevelop.Ide;
+// using Xamarin.PropertyEditing.Mac;
+// using static Xamarin.PropertyEditing.Mac.NamedResources;
 
-namespace MonoDevelop.DesignerSupport
-{
-	internal class MonoDevelopHostResourceProvider : HostResourceProvider
-	{
-		public MonoDevelopHostResourceProvider ()
-		{
-			CurrentAppearance = NSAppearance.GetAppearance (IdeApp.Preferences.UserInterfaceTheme == Theme.Dark ? NSAppearance.NameDarkAqua : NSAppearance.NameAqua);
-		}
+// namespace MonoDevelop.DesignerSupport
+// {
+// 	internal class MonoDevelopHostResourceProvider : HostResourceProvider
+// 	{
+// 		public MonoDevelopHostResourceProvider ()
+// 		{
+// 			CurrentAppearance = NSAppearance.GetAppearance (IdeApp.Preferences.UserInterfaceTheme == Theme.Dark ? NSAppearance.NameDarkAqua : NSAppearance.NameAqua);
+// 		}
 
-		public override NSColor GetNamedColor (string name)
-		{
-			switch (name) {
-			case Checkerboard0Color:
-				return Styles.PropertyPad.Checkerboard0;
-			case Checkerboard1Color:
-				return Styles.PropertyPad.Checkerboard1;
-			case DescriptionLabelColor:
-				return NSColor.SecondaryLabelColor;
-			case ForegroundColor:
-				return (HslColor)Ide.Gui.Styles.BaseForegroundColor;
-			case PadBackgroundColor:
-				return (HslColor)Ide.Gui.Styles.PadBackground;
-			case PanelTabBackground:
-				return Styles.PropertyPad.PanelTabBackground;
-			case TabBorderColor:
-				return Styles.PropertyPad.TabBorderColor;
-			case ValueBlockBackgroundColor:
-				return Styles.PropertyPad.ValueBlockBackgroundColor;
-			case FrameBoxButtonBackgroundColor:
-				return Styles.PropertyPad.FrameBoxButtonBackgroundColor;
-			}
-			return NSColor.FromName (name);
-		}
-	}
-}
-#endif
\ No newline at end of file
+// 		public override NSColor GetNamedColor (string name)
+// 		{
+// 			switch (name) {
+// 			case Checkerboard0Color:
+// 				return Styles.PropertyPad.Checkerboard0;
+// 			case Checkerboard1Color:
+// 				return Styles.PropertyPad.Checkerboard1;
+// 			case DescriptionLabelColor:
+// 				return NSColor.SecondaryLabelColor;
+// 			case ForegroundColor:
+// 				return (HslColor)Ide.Gui.Styles.BaseForegroundColor;
+// 			case PadBackgroundColor:
+// 				return (HslColor)Ide.Gui.Styles.PadBackground;
+// 			case PanelTabBackground:
+// 				return Styles.PropertyPad.PanelTabBackground;
+// 			case TabBorderColor:
+// 				return Styles.PropertyPad.TabBorderColor;
+// 			case ValueBlockBackgroundColor:
+// 				return Styles.PropertyPad.ValueBlockBackgroundColor;
+// 			case FrameBoxButtonBackgroundColor:
+// 				return Styles.PropertyPad.FrameBoxButtonBackgroundColor;
+// 			}
+// 			return NSColor.FromName (name);
+// 		}
+// 	}
+// }
+//#endif
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs
index 3d8560b3966..b1fca16994c 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs
@@ -105,11 +105,11 @@ public object CurrentObject {
 
 		public PropertyGridWrapper ()
 		{
-#if MAC
-			nativeWidget = new PropertyMacHostWidget ();
-#else
+// #if MAC
+// 			nativeWidget = new PropertyMacHostWidget ();
+// #else
 			nativeWidget = new PropertyXwtHostWidget ();
-#endif
+//#endif
 			nativeWidget.PropertyGridChanged += NativeWidget_PropertyGridChanged;
 		}
 
@@ -190,13 +190,13 @@ protected override void Initialize (IPadWindow container)
 
 			propertyGridWrapper.SetToolbarProvider (toolbarProvider);
 
-#if MAC
-			//native cocoa needs content shown to initialize stuff
-			if (isNative) {
-				container.PadContentShown += Window_PadContentShown;
-				container.PadContentHidden += Window_PadContentHidden;
-			}
-#endif
+// #if MAC
+// 			//native cocoa needs content shown to initialize stuff
+// 			if (isNative) {
+// 				container.PadContentShown += Window_PadContentShown;
+// 				container.PadContentHidden += Window_PadContentHidden;
+// 			}
+// #endif
 
 			this.container = container;
 			DesignerSupport.Service.SetPad (this);
@@ -214,12 +214,12 @@ public override Control Control {
 
 		public override void Dispose()
 		{
-#if MAC
-			if (isNative) {
-				container.PadContentShown -= Window_PadContentShown;
-				container.PadContentHidden -= Window_PadContentHidden;
-			}
-#endif
+// #if MAC
+// 			if (isNative) {
+// 				container.PadContentShown -= Window_PadContentShown;
+// 				container.PadContentHidden -= Window_PadContentHidden;
+// 			}
+// #endif
 
 			propertyGridWrapper.PropertyGridChanged -= Grid_Changed;
 			propertyGridWrapper.Dispose ();
@@ -269,23 +269,23 @@ public void BlankPad ()
 			CommandRouteOrigin = null;
 		}
 
-#if MAC
-		void Window_PadContentShown (object sender, EventArgs e)
-		{
-			propertyGridWrapper.OnPadContentShown ();
+// #if MAC
+// 		void Window_PadContentShown (object sender, EventArgs e)
+// 		{
+// 			propertyGridWrapper.OnPadContentShown ();
 
-			if (customWidget && frame.Child is GtkNSViewHost viewHost) {
-				viewHost.Visible = true;
-			}
-		}
+// 			if (customWidget && frame.Child is GtkNSViewHost viewHost) {
+// 				viewHost.Visible = true;
+// 			}
+// 		}
 
-		void Window_PadContentHidden (object sender, EventArgs e)
-		{
-			if (customWidget && frame.Child is GtkNSViewHost viewHost) {
-				viewHost.Visible = false;
-			}
-		}
-#endif
+// 		void Window_PadContentHidden (object sender, EventArgs e)
+// 		{
+// 			if (customWidget && frame.Child is GtkNSViewHost viewHost) {
+// 				viewHost.Visible = false;
+// 			}
+// 		}
+// #endif
 
 		void AttachToolbarIfCustomWidget ()
 		{
@@ -293,15 +293,15 @@ void AttachToolbarIfCustomWidget ()
 				customWidget = false;
 				frame.Remove (frame.Child);
 
-#if MAC
-				if (isNative) {
-					frame.Add (propertyGridWrapper.Widget);
-				} else {
-#endif
+// #if MAC
+// 				if (isNative) {
+// 					frame.Add (propertyGridWrapper.Widget);
+// 				} else {
+// #endif
 					frame.Add (propertyGridWrapper.Widget);
-#if MAC
-				}
-#endif
+// #if MAC
+// 				}
+// #endif
 				toolbarProvider.Attach (container.GetToolbar (DockPositionType.Top));
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs
index 3f066010b58..5679609f51e 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs
@@ -35,7 +35,7 @@
 using Gtk;
 using MonoDevelop.DesignerSupport.Toolbox;
 #if MAC
-using MonoDevelop.Components.Mac;
+//using MonoDevelop.Components.Mac;
 #endif
 
 namespace MonoDevelop.DesignerSupport
@@ -45,130 +45,130 @@ public class ToolboxPad : PadContent
 		public const string ToolBoxDragDropFormat = "MonoDevelopToolBox";
 		Gtk.Widget widget;
 
-#if MAC
-		Toolbox.MacToolbox toolbox;
-		IPadWindow window;
-#endif
+//#if MAC
+		//Toolbox.MacToolbox toolbox;
+		//IPadWindow window;
+//#endif
 		protected override void Initialize (IPadWindow window)
 		{
 			base.Initialize (window);
-#if MAC
-			this.window = window;
-			toolbox = new Toolbox.MacToolbox (DesignerSupport.Service.ToolboxService, window);
-			widget = new GtkNSViewHost (toolbox);
+//#if MAC
+			// this.window = window;
+			// toolbox = new Toolbox.MacToolbox (DesignerSupport.Service.ToolboxService, window);
+			// widget = new GtkNSViewHost (toolbox);
 
-			widget.DragDataGet += Widget_DragDataGet;
-			widget.DragBegin += Widget_DragBegin;
-			widget.DragEnd += Widget_DragEnd;
+			// widget.DragDataGet += Widget_DragDataGet;
+			// widget.DragBegin += Widget_DragBegin;
+			// widget.DragEnd += Widget_DragEnd;
 
-			this.window.PadContentShown += Container_PadContentShown;
-			this.window.PadContentHidden += Container_PadContentHidden;
+			// this.window.PadContentShown += Container_PadContentShown;
+			// this.window.PadContentHidden += Container_PadContentHidden;
 
-			toolbox.DragSourceSet += Toolbox_DragSourceSet;
-			toolbox.DragBegin += Toolbox_DragBegin;
+			// toolbox.DragSourceSet += Toolbox_DragSourceSet;
+			// toolbox.DragBegin += Toolbox_DragBegin;
 		
-			widget.ShowAll ();
+			// widget.ShowAll ();
 
-			toolbox.Refresh ();
+			// toolbox.Refresh ();
 
-#else
+//#else
 			widget = new Toolbox.Toolbox (DesignerSupport.Service.ToolboxService, window);
-#endif
-		}
-
-#if MAC
-
-		void Container_PadContentShown (object sender, EventArgs args)
-		{
-			//sanity check
-			isDragging = false;
-			toolbox.Hidden = false;
-		}
-		void Container_PadContentHidden (object sender, EventArgs args) => toolbox.Hidden = true;
-
-		private void Widget_DragEnd (object o, DragEndArgs args)
-		{
-			isDragging = false;
-		}
-
-		void Widget_DragBegin (object sender, DragBeginArgs args)
-		{
-			if (!isDragging) {
-				DesignerSupport.Service.ToolboxService.DragSelectedItem (widget, args.Context);
-				isDragging = true;
-			}
+//#endif
 		}
 
-		void Toolbox_DragSourceSet (object sender, Gtk.TargetEntry [] e)
-		{
-			targets = CreateDefaultTargeList ();
-			targets.AddTable (e);
-		}
-
-		void Widget_DragDataGet (object o, DragDataGetArgs args)
-		{
-			if (toolbox.SelectedNode is IDragDataToolboxNode node) {
-				foreach (var format in node.Formats) {
-					args.SelectionData.Set (Gdk.Atom.Intern (format, false), 8, node.GetData (format));
-				}
-			}
-		}
-
-		void Toolbox_DragBegin (object sender, EventArgs args)
-		{
-			var selectedNode = toolbox.SelectedNode;
-			if (!isDragging && selectedNode != null) {
-
-				DesignerSupport.Service.ToolboxService.SelectItem (selectedNode);
-
-				Gtk.Drag.SourceUnset (widget);
-				if (selectedNode is IDragDataToolboxNode node) {
-					foreach (var format in node.Formats) {
-						targets.Add (format, 0, 0);
-					}
-				}
-				// Gtk.Application.CurrentEvent and other copied gdk_events seem to have a problem
-				// when used as they use gdk_event_copy which seems to crash on de-allocating the private slice.
-				IntPtr currentEvent = GtkWorkarounds.GetCurrentEventHandle ();
-				Gtk.Drag.Begin (widget, targets, Gdk.DragAction.Copy | Gdk.DragAction.Move, 1, new Gdk.Event (currentEvent, false));
-
-				// gtk_drag_begin does not store the event, so we're okay
-				GtkWorkarounds.FreeEvent (currentEvent);
-			}
-		}
-
-		Gtk.TargetList targets = CreateDefaultTargeList ();
-
-		private static TargetList CreateDefaultTargeList () =>
-			new Gtk.TargetList (new TargetEntry [] { new TargetEntry (ToolBoxDragDropFormat, TargetFlags.OtherWidget, 0) });
-
-		bool isDragging;
-
-		public override void Dispose ()
-		{
-			if (window != null) {
-				window.PadContentShown -= Container_PadContentShown;
-				window.PadContentHidden -= Container_PadContentHidden;
-				window = null;
-			}
-
-			if (widget != null) {
-				widget.DragDataGet -= Widget_DragDataGet;
-				widget.DragBegin -= Widget_DragBegin;
-				widget.DragEnd -= Widget_DragEnd;
-				widget.Destroy ();
-				widget.Dispose ();
-				widget = null;
-			}
-			if (toolbox != null) {
-				toolbox.DragBegin -= Toolbox_DragBegin;
-				toolbox.DragSourceSet -= Toolbox_DragSourceSet;
-				toolbox.Dispose ();
-				toolbox = null;
-			}
-			base.Dispose ();
-		}
-#endif
+// #if MAC
+
+// 		void Container_PadContentShown (object sender, EventArgs args)
+// 		{
+// 			//sanity check
+// 			isDragging = false;
+// 			toolbox.Hidden = false;
+// 		}
+// 		void Container_PadContentHidden (object sender, EventArgs args) => toolbox.Hidden = true;
+
+// 		private void Widget_DragEnd (object o, DragEndArgs args)
+// 		{
+// 			isDragging = false;
+// 		}
+
+// 		void Widget_DragBegin (object sender, DragBeginArgs args)
+// 		{
+// 			if (!isDragging) {
+// 				DesignerSupport.Service.ToolboxService.DragSelectedItem (widget, args.Context);
+// 				isDragging = true;
+// 			}
+// 		}
+
+// 		void Toolbox_DragSourceSet (object sender, Gtk.TargetEntry [] e)
+// 		{
+// 			targets = CreateDefaultTargeList ();
+// 			targets.AddTable (e);
+// 		}
+
+// 		void Widget_DragDataGet (object o, DragDataGetArgs args)
+// 		{
+// 			if (toolbox.SelectedNode is IDragDataToolboxNode node) {
+// 				foreach (var format in node.Formats) {
+// 					args.SelectionData.Set (Gdk.Atom.Intern (format, false), 8, node.GetData (format));
+// 				}
+// 			}
+// 		}
+
+// 		void Toolbox_DragBegin (object sender, EventArgs args)
+// 		{
+// 			var selectedNode = toolbox.SelectedNode;
+// 			if (!isDragging && selectedNode != null) {
+
+// 				DesignerSupport.Service.ToolboxService.SelectItem (selectedNode);
+
+// 				Gtk.Drag.SourceUnset (widget);
+// 				if (selectedNode is IDragDataToolboxNode node) {
+// 					foreach (var format in node.Formats) {
+// 						targets.Add (format, 0, 0);
+// 					}
+// 				}
+// 				// Gtk.Application.CurrentEvent and other copied gdk_events seem to have a problem
+// 				// when used as they use gdk_event_copy which seems to crash on de-allocating the private slice.
+// 				IntPtr currentEvent = GtkWorkarounds.GetCurrentEventHandle ();
+// 				Gtk.Drag.Begin (widget, targets, Gdk.DragAction.Copy | Gdk.DragAction.Move, 1, new Gdk.Event (currentEvent, false));
+
+// 				// gtk_drag_begin does not store the event, so we're okay
+// 				GtkWorkarounds.FreeEvent (currentEvent);
+// 			}
+// 		}
+
+// 		Gtk.TargetList targets = CreateDefaultTargeList ();
+
+// 		private static TargetList CreateDefaultTargeList () =>
+// 			new Gtk.TargetList (new TargetEntry [] { new TargetEntry (ToolBoxDragDropFormat, TargetFlags.OtherWidget, 0) });
+
+// 		bool isDragging;
+
+// 		public override void Dispose ()
+// 		{
+// 			if (window != null) {
+// 				window.PadContentShown -= Container_PadContentShown;
+// 				window.PadContentHidden -= Container_PadContentHidden;
+// 				window = null;
+// 			}
+
+// 			if (widget != null) {
+// 				widget.DragDataGet -= Widget_DragDataGet;
+// 				widget.DragBegin -= Widget_DragBegin;
+// 				widget.DragEnd -= Widget_DragEnd;
+// 				widget.Destroy ();
+// 				widget.Dispose ();
+// 				widget = null;
+// 			}
+// 			if (toolbox != null) {
+// 				toolbox.DragBegin -= Toolbox_DragBegin;
+// 				toolbox.DragSourceSet -= Toolbox_DragSourceSet;
+// 				toolbox.Dispose ();
+// 				toolbox = null;
+// 			}
+// 			base.Dispose ();
+// 		}
+// #endif
 
 #region AbstractPadContent implementations
 		
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index 51f6b3c711f..6afb0e8dbca 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -1,7 +1,7 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\..\..\MonoDevelop.props"/>
-  <Import Project="$(ReferencesVSEditor)"/>
-  <Import Project="$(ReferencesGtk)"/>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="..\..\..\MonoDevelop.props" />
+  <Import Project="$(ReferencesVSEditor)" />
+  <Import Project="$(ReferencesGtk)" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,10 +16,10 @@
     -->
     <NoWarn>$(NoWarn);618;612</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' "/>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' "/>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <StartAction>Program</StartAction>
     <StartProgram>mono</StartProgram>
@@ -63,30 +63,24 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition="$(HaveGtkSharp)">
-    <ProjectReference Include="..\..\..\external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj">
-      <Project>{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}</Project>
-      <Name>Xwt.GtkSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup Condition="!$(HaveGtkSharp)">
-    <ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj">
+   <ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj">
       <Project>{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}</Project>
       <Name>Xwt.Gtk2</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Xml"/>
-    <Reference Include="System.ComponentModel.Composition"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Xml.Linq"/>
-    <Reference Include="System.Runtime.Serialization"/>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <Reference Include="PresentationCore"/>
-    <Reference Include="PresentationFramework" Condition=" '$(OS)' == 'Windows_NT' "/>
-    <Reference Include="WindowsBase"/>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" Condition=" '$(OS)' == 'Windows_NT' " />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
     <Reference Include="Xamarin.Mac">
@@ -95,218 +89,218 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs"/>
-    <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs"/>
-    <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\UIExtensionSelector.cs" Link="Util\UIExtensionSelector.cs"/>
+    <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" />
+    <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" />
+    <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\UIExtensionSelector.cs" Link="Util\UIExtensionSelector.cs" />
     <None Include="MonoDevelop.SourceEditor.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Compile Include="AssemblyInfo.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MdTextViewLineCollection.MdTextViewLine.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MdTextViewLineCollection.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.IViewScroller.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.ITextView.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.ITextView.MouseHover.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\EditActions.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\ExtensibleTextEditor.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\LanguageItemWindow.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorWidget.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\BehaviorPanel.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\GeneralOptionsPanel.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\HighlightingPanel.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\MarkerPanel.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorCommands.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\MarkerOperationsHandler.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SearchAndReplaceWidget.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\GotoLineNumberWidget.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\CompileErrorTooltipProvider.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\DebugValueTooltipProvider.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\Counters.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\PinnedWatchWidget.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorPrintOperation.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\PrintSettingsWidget.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\MessageBubbleTextMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\MessageBubbleCache.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\NewColorShemeDialog.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskStrip.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollbarCommand.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollBarMode.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskMiniMapMode.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\FileRegistry.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SearchAndReplaceOptions.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\ErrorText.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionOptionsPanel.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionAppearancePanel.cs"/>
-    <Compile Include="AddinInfo.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionCharactersPanel.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\OverlayMessageWindow.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\HoverCloseButton.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UsageSegmentMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\DebugTextMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\EditorFactory.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\WavedLineMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\GrayOutMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UrlTextLineMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\AsmLineMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\LinkMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\ListDataProviderWrapper.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TooltipProviderWrapper.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UnitTestMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\StyledSourceEditorOptions.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Wrappers\SemanticHighlightingSyntaxMode.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\ErrorMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SearchInSelectionMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\DefaultAutoInsertBracketHandler.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\ActionMargin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\CodeSegmentEditorWindow.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\CodeSegmentPreviewWindow.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\DashedLineMargin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\FoldingScreenbackgroundRenderer.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\GutterMargin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\IAnimationDrawer.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\IBackgroundRenderer.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\IconMargin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\LayoutCache.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\Margin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MarginDrawer.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\TextArea.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\TextEditorAccessibility.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\TextViewMargin.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\TooltipProvider.cs"/>
-    <Compile Include="Mono.TextEditor.PopupWindow\IListDataProvider.cs"/>
-    <Compile Include="Mono.TextEditor.PopupWindow\ListWidget.cs"/>
-    <Compile Include="Mono.TextEditor.PopupWindow\ListWindow.cs"/>
-    <Compile Include="Mono.TextEditor.PopupWindow\ModeHelpWindow.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\Actor.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\AnimatedBox.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\AnimatedVBox.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\AnimatedWidget.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\Animation.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\BounceFadePopupWindow.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\Choreographer.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\Pulsator.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\SingleActorStage.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\SmartScrolledWindow.cs"/>
-    <Compile Include="Mono.TextEditor.Theatrics\Stage.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\LineSeparatorMarker.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IndicatorDrawingCache.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IdleUpdater.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.IMonoDevelopEditorOperations.cs"/>
-    <Compile Include="VSEditor\ConnectionManager.cs"/>
-    <Compile Include="VSEditor\IMdTextView.cs"/>
-    <Compile Include="VSEditor\ITagBasedSyntaxHighlightingFactory.cs"/>
-    <Compile Include="VSEditor\MDUtils.cs"/>
-    <Compile Include="VSEditor\SmartIndentationService.cs"/>
-    <Compile Include="VSEditor\TagBasedSyntaxHighlighting.cs"/>
-    <Compile Include="VSEditor\TextEditorFactoryService.cs"/>
-    <Compile Include="VSEditor\TextSelection.cs"/>
-    <Compile Include="VSEditor\TextViewRoleSet.cs"/>
-    <Compile Include="VSEditor\FakeWpf\SimulatingExtensions.cs"/>
-    <Compile Include="VSEditor\Language\Def\Intellisense\IPopupIntellisensePresenter.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Helpers.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\BaseIntellisenseSession.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\CurrentLineSpaceReservationAgent.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\IMultiSessionIntellisensePresenter.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSession.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSessionStack.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSessionStackMapService.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSpaceReservationManagers.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\MultiSessionIntellisensePresenterProvider.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\DefaultSignatureHelpPresenter.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\DefaultSignatureHelpPresenterProvider.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\DefaultSignatureHelpPresenterSurfaceElement.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpBroker.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpParameterBoldingClassfier.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpSession.cs"/>
-    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpSessionView.cs"/>
-    <Compile Include="VSEditor\Language\Util\LanguageUtil\IntellisenseSourceCache.cs"/>
-    <Compile Include="VSEditor\Language\Util\LanguageUtil\IntellisenseUtilities.cs"/>
-    <Compile Include="VSEditor\Text\Def\TextUIWpf\Adornments\ToolTipPresenterStyle.cs"/>
-    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\ISpaceReservationAgent.cs"/>
-    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\ISpaceReservationManager.cs"/>
-    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\SpaceReservationAgentChangedEventArgs.cs"/>
-    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\SpaceReservationManagerDefinition.cs"/>
-    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\GuardedToolTipPresenter.cs"/>
-    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\IViewElementFactoryMetadata.cs"/>
-    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\ToolTipService.cs"/>
-    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\ViewElementFactoryService.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\BaseWpfToolTipPresenter.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\DefaultToolTipPresenterStyle.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\MouseTrackingWpfToolTipPresenter.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\SpanTrackingWpfToolTipPresenter.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ToolTipStyleFactory.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\WpfToolTipPresenterProvider.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\Legacy\ToolTipProvider.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\Legacy\ToolTipProviderFactory.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfClassifiedTextElementViewElementFactory.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfContainerElementViewElementFactory.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfImageElementViewElementFactory.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfView\PopupAgent.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfView\SpaceReservationManager.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfView\SpaceReservationStack.cs"/>
-    <Compile Include="VSEditor\Text\Util\TextDataUtil\MappingHelper.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.GotoLineNumberWidget.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.PrintSettingsWidget.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs"/>
-    <Compile Include="Gui\MonoDevelop.SourceEditor.SearchWidget.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\BackgroundTextMarker.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.FoldMarkerMarginDrawer.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.VSNetFoldMarkerMarginDrawer.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.VSCodeFoldMarkerMarginDrawer.cs"/>
-    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfObjectViewElementFactory.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\TextEditorKeyPressTimings.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAdornmentService.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAdornmentServiceFactory.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAggregator.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAggregatorFactory.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionDefaultSession.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionEditorExtension.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionManager.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionManagerFactory.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionStack.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAdornmentService.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAdornmentServiceFactory.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAggregator.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAggregatorFactory.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionMetadata.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionStack.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\ClipboardRingService.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\CodePreviewWindow.cs"/>
-    <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarginMarker.cs"/>
-    <Compile Include="Mono.TextEditor\Gui\QuickFixMargin.cs"/>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MdTextViewLineCollection.MdTextViewLine.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MdTextViewLineCollection.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.IViewScroller.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.ITextView.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.ITextView.MouseHover.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\EditActions.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\ExtensibleTextEditor.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\LanguageItemWindow.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SourceEditorWidget.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\BehaviorPanel.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\GeneralOptionsPanel.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\HighlightingPanel.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\MarkerPanel.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SourceEditorCommands.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\MarkerOperationsHandler.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SearchAndReplaceWidget.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\GotoLineNumberWidget.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\CompileErrorTooltipProvider.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\DebugValueTooltipProvider.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\Counters.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\PinnedWatchWidget.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SourceEditorPrintOperation.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\PrintSettingsWidget.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\MessageBubbleTextMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\MessageBubbleCache.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\NewColorShemeDialog.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskStrip.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollbarCommand.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollBarMode.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskMiniMapMode.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\FileRegistry.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SearchAndReplaceOptions.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\ErrorText.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionOptionsPanel.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionAppearancePanel.cs" />
+    <Compile Include="AddinInfo.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionCharactersPanel.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\OverlayMessageWindow.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\HoverCloseButton.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UsageSegmentMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\DebugTextMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\EditorFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\WavedLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\GrayOutMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UrlTextLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\AsmLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\LinkMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\ListDataProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TooltipProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UnitTestMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\StyledSourceEditorOptions.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\SemanticHighlightingSyntaxMode.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\ErrorMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SearchInSelectionMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\DefaultAutoInsertBracketHandler.cs" />
+    <Compile Include="Mono.TextEditor\Gui\ActionMargin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\CodeSegmentEditorWindow.cs" />
+    <Compile Include="Mono.TextEditor\Gui\CodeSegmentPreviewWindow.cs" />
+    <Compile Include="Mono.TextEditor\Gui\DashedLineMargin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\FoldingScreenbackgroundRenderer.cs" />
+    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\GutterMargin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\IAnimationDrawer.cs" />
+    <Compile Include="Mono.TextEditor\Gui\IBackgroundRenderer.cs" />
+    <Compile Include="Mono.TextEditor\Gui\IconMargin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\LayoutCache.cs" />
+    <Compile Include="Mono.TextEditor\Gui\Margin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MarginDrawer.cs" />
+    <Compile Include="Mono.TextEditor\Gui\MonoTextEditor.cs" />
+    <Compile Include="Mono.TextEditor\Gui\TextArea.cs" />
+    <Compile Include="Mono.TextEditor\Gui\TextEditorAccessibility.cs" />
+    <Compile Include="Mono.TextEditor\Gui\TextViewMargin.cs" />
+    <Compile Include="Mono.TextEditor\Gui\TooltipProvider.cs" />
+    <Compile Include="Mono.TextEditor.PopupWindow\IListDataProvider.cs" />
+    <Compile Include="Mono.TextEditor.PopupWindow\ListWidget.cs" />
+    <Compile Include="Mono.TextEditor.PopupWindow\ListWindow.cs" />
+    <Compile Include="Mono.TextEditor.PopupWindow\ModeHelpWindow.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\Actor.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\AnimatedBox.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\AnimatedVBox.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\AnimatedWidget.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\Animation.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\BounceFadePopupWindow.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\Choreographer.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\Pulsator.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\SingleActorStage.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\SmartScrolledWindow.cs" />
+    <Compile Include="Mono.TextEditor.Theatrics\Stage.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\LineSeparatorMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IndicatorDrawingCache.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.IdleUpdater.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.IMonoDevelopEditorOperations.cs" />
+    <Compile Include="VSEditor\ConnectionManager.cs" />
+    <Compile Include="VSEditor\IMdTextView.cs" />
+    <Compile Include="VSEditor\ITagBasedSyntaxHighlightingFactory.cs" />
+    <Compile Include="VSEditor\MDUtils.cs" />
+    <Compile Include="VSEditor\SmartIndentationService.cs" />
+    <Compile Include="VSEditor\TagBasedSyntaxHighlighting.cs" />
+    <Compile Include="VSEditor\TextEditorFactoryService.cs" />
+    <Compile Include="VSEditor\TextSelection.cs" />
+    <Compile Include="VSEditor\TextViewRoleSet.cs" />
+    <Compile Include="VSEditor\FakeWpf\SimulatingExtensions.cs" />
+    <Compile Include="VSEditor\Language\Def\Intellisense\IPopupIntellisensePresenter.cs" />
+    <Compile Include="VSEditor\Language\Impl\Helpers.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\BaseIntellisenseSession.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\CurrentLineSpaceReservationAgent.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\IMultiSessionIntellisensePresenter.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSession.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSessionStack.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSessionStackMapService.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\IntellisenseSpaceReservationManagers.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\MultiSessionIntellisensePresenterProvider.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\DefaultSignatureHelpPresenter.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\DefaultSignatureHelpPresenterProvider.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\DefaultSignatureHelpPresenterSurfaceElement.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpBroker.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpParameterBoldingClassfier.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpSession.cs" />
+    <Compile Include="VSEditor\Language\Impl\Intellisense\SignatureHelp\SignatureHelpSessionView.cs" />
+    <Compile Include="VSEditor\Language\Util\LanguageUtil\IntellisenseSourceCache.cs" />
+    <Compile Include="VSEditor\Language\Util\LanguageUtil\IntellisenseUtilities.cs" />
+    <Compile Include="VSEditor\Text\Def\TextUIWpf\Adornments\ToolTipPresenterStyle.cs" />
+    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\ISpaceReservationAgent.cs" />
+    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\ISpaceReservationManager.cs" />
+    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\SpaceReservationAgentChangedEventArgs.cs" />
+    <Compile Include="VSEditor\Text\Def\TextUIWpf\Editor\SpaceReservationManagerDefinition.cs" />
+    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\GuardedToolTipPresenter.cs" />
+    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\IViewElementFactoryMetadata.cs" />
+    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\ToolTipService.cs" />
+    <Compile Include="VSEditor\Text\Impl\ToolTipAdornment\ViewElementFactoryService.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\BaseWpfToolTipPresenter.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\DefaultToolTipPresenterStyle.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\MouseTrackingWpfToolTipPresenter.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\SpanTrackingWpfToolTipPresenter.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ToolTipStyleFactory.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\WpfToolTipPresenterProvider.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\Legacy\ToolTipProvider.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\Legacy\ToolTipProviderFactory.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfClassifiedTextElementViewElementFactory.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfContainerElementViewElementFactory.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfImageElementViewElementFactory.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfView\PopupAgent.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfView\SpaceReservationManager.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfView\SpaceReservationStack.cs" />
+    <Compile Include="VSEditor\Text\Util\TextDataUtil\MappingHelper.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.GotoLineNumberWidget.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.PrintSettingsWidget.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs" />
+    <Compile Include="Gui\MonoDevelop.SourceEditor.SearchWidget.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\BackgroundTextMarker.cs" />
+    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.FoldMarkerMarginDrawer.cs" />
+    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.VSNetFoldMarkerMarginDrawer.cs" />
+    <Compile Include="Mono.TextEditor\Gui\FoldMarkerMargin.VSCodeFoldMarkerMarginDrawer.cs" />
+    <Compile Include="VSEditor\Text\Impl\WpfToolTipAdornment\ViewElementFactories\WpfObjectViewElementFactory.cs" />
+    <Compile Include="Mono.TextEditor\Gui\TextEditorKeyPressTimings.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAdornmentService.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAdornmentServiceFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAggregator.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionAggregatorFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionDefaultSession.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionEditorExtension.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionManager.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionManagerFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\BraceCompletionStack.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAdornmentService.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAdornmentServiceFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAggregator.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionAggregatorFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionMetadata.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Braces\IBraceCompletionStack.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\ClipboardRingService.cs" />
+    <Compile Include="Mono.TextEditor\Gui\CodePreviewWindow.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarginMarker.cs" />
+    <Compile Include="Mono.TextEditor\Gui\QuickFixMargin.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MonoDevelop.SourceEditor.addin.xml"/>
-    <EmbeddedResource Include="icons\**\*.png" LinkBase="icons"/>
+    <EmbeddedResource Include="MonoDevelop.SourceEditor.addin.xml" />
+    <EmbeddedResource Include="icons\**\*.png" LinkBase="icons" />
   </ItemGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="UnitTests"/>
-    <InternalsVisibleTo Include="MonoDevelop.VersionControl"/>
-    <InternalsVisibleTo Include="MonoDevelop.VersionControl.Subversion"/>
-    <InternalsVisibleTo Include="MonoDevelop.VersionControl.Git"/>
-    <InternalsVisibleTo Include="MonoDevelop.Refactoring"/>
-    <InternalsVisibleTo Include="MonoDevelop.TextEditor.Tests"/>
-    <InternalsVisibleTo Include="MonoDevelop.AspNet"/>
-    <InternalsVisibleTo Include="MonoDevelop.AspNet.Tests"/>
-    <InternalsVisibleTo Include="FSharpBinding"/>
-    <InternalsVisibleTo Include="MonoDevelop.FSharp.Tests"/>
-    <InternalsVisibleTo Include="MonoDevelop.CSharpBinding"/>
-    <InternalsVisibleTo Include="MonoDevelop.CSharpBinding.Tests"/>
-    <InternalsVisibleTo Include="MonoDevelop.Ide.Tests"/>
-    <InternalsVisibleTo Include="MonoDevelop.VBNetBinding"/>
+    <InternalsVisibleTo Include="UnitTests" />
+    <InternalsVisibleTo Include="MonoDevelop.VersionControl" />
+    <InternalsVisibleTo Include="MonoDevelop.VersionControl.Subversion" />
+    <InternalsVisibleTo Include="MonoDevelop.VersionControl.Git" />
+    <InternalsVisibleTo Include="MonoDevelop.Refactoring" />
+    <InternalsVisibleTo Include="MonoDevelop.TextEditor.Tests" />
+    <InternalsVisibleTo Include="MonoDevelop.AspNet" />
+    <InternalsVisibleTo Include="MonoDevelop.AspNet.Tests" />
+    <InternalsVisibleTo Include="FSharpBinding" />
+    <InternalsVisibleTo Include="MonoDevelop.FSharp.Tests" />
+    <InternalsVisibleTo Include="MonoDevelop.CSharpBinding" />
+    <InternalsVisibleTo Include="MonoDevelop.CSharpBinding.Tests" />
+    <InternalsVisibleTo Include="MonoDevelop.Ide.Tests" />
+    <InternalsVisibleTo Include="MonoDevelop.VBNetBinding" />
   </ItemGroup>
-  <Import Project="..\..\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems" Label="Shared" Condition="Exists('..\..\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems')"/>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>
-</Project>
+  <Import Project="..\..\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems" Label="Shared" Condition="Exists('..\..\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems')" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/CodeLensPresenterStyle.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/CodeLensPresenterStyle.cs
index 4dc1d0d31c5..0e5d5ff00ac 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/CodeLensPresenterStyle.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/CodeLensPresenterStyle.cs
@@ -1,24 +1,24 @@
-//
-// Copyright (c) Microsoft Corp. (https://www.microsoft.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
+//
+// Copyright (c) Microsoft Corp. (https://www.microsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System.ComponentModel.Composition;
 using System.Windows.Media;
 using Microsoft.VisualStudio.Language.Intellisense;
@@ -27,36 +27,36 @@
 
 namespace MonoDevelop.TextEditor.Wpf
 {
-    [Export(typeof(CodeLensPresenterStyle))]
-    [Name("MonoDevelopCodeLensPresenterStyle")]
-    [Order(Before = "default")]
-    class MonoDevelopCodeLensPresenterStyle : CodeLensPresenterStyle
-    {
-        public MonoDevelopCodeLensPresenterStyle()
-        {
-            var blackBrush = new SolidColorBrush(Colors.Black);
-            var whiteBrush = new SolidColorBrush(Colors.White);
+    //[Export(typeof(CodeLensPresenterStyle))]
+    //[Name("MonoDevelopCodeLensPresenterStyle")]
+    //[Order(Before = "default")]
+    // class MonoDevelopCodeLensPresenterStyle : CodeLensPresenterStyle
+    // {
+    //     public MonoDevelopCodeLensPresenterStyle()
+    //     {
+    //         var blackBrush = new SolidColorBrush(Colors.Black);
+    //         var whiteBrush = new SolidColorBrush(Colors.White);
 
-            var typeface = new Typeface("Calibri");
-            var size = 8.0 * 96.0 / 72.0;
+    //         var typeface = new Typeface("Calibri");
+    //         var size = 8.0 * 96.0 / 72.0;
 
-            var textRunProperties = TextFormattingRunProperties.CreateTextFormattingRunProperties(
-                foreground: blackBrush,
-                background: null,
-                typeface: typeface,
-                size: size,
-                textDecorations: null,
-                textEffects: null,
-                hintingSize: null,
-                cultureInfo: null);
+    //         var textRunProperties = TextFormattingRunProperties.CreateTextFormattingRunProperties(
+    //             foreground: blackBrush,
+    //             background: null,
+    //             typeface: typeface,
+    //             size: size,
+    //             textDecorations: null,
+    //             textEffects: null,
+    //             hintingSize: null,
+    //             cultureInfo: null);
 
-            this.IndicatorTextRunProperties = textRunProperties;
-            this.IndicatorHoveredTextRunProperties = textRunProperties;
-            this.IndicatorDisabledTextRunProperties = textRunProperties;
-            this.IndicatorSeparatorBrush = blackBrush;
-            this.PopupBackgroundBrush = whiteBrush;
-            this.PopupTextBrush = blackBrush;
-            this.PopupBorderBrush = blackBrush;
-        }
-    }
+    //         this.IndicatorTextRunProperties = textRunProperties;
+    //         this.IndicatorHoveredTextRunProperties = textRunProperties;
+    //         this.IndicatorDisabledTextRunProperties = textRunProperties;
+    //         this.IndicatorSeparatorBrush = blackBrush;
+    //         this.PopupBackgroundBrush = whiteBrush;
+    //         this.PopupTextBrush = blackBrush;
+    //         this.PopupBorderBrush = blackBrush;
+    //     }
+    // }
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Find/FindUI.xaml.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Find/FindUI.xaml.cs
index a3b4988a0ca..9a7aa2ce5b6 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Find/FindUI.xaml.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Find/FindUI.xaml.cs
@@ -31,7 +31,7 @@ namespace MonoDevelop.TextEditor.Wpf.Find
 {
 	public partial class FindUI : UserControl
 	{
-		private IWpfTextView currentTextView; // The text view on which the UI is being displayed at any given time
+		//private IWpfTextView currentTextView; // The text view on which the UI is being displayed at any given time
 
 		/// <summary>
 		/// Used for resizing of the control
@@ -71,45 +71,45 @@ public FindUI ()
 			UpdateReplaceVisibility (false);
 		}
 
-		public void ShowAdornment (IWpfTextView view)
-		{
-			IAdornmentLayer adornmentLayer = view.GetAdornmentLayer (FindUIAdornmentLayer);
+		// public void ShowAdornment (IWpfTextView view)
+		// {
+		// 	IAdornmentLayer adornmentLayer = view.GetAdornmentLayer (FindUIAdornmentLayer);
 
-			// Make sure anti-aliasing doesn't cause trouble
-			((UIElement)adornmentLayer).SnapsToDevicePixels = true;
+		// 	// Make sure anti-aliasing doesn't cause trouble
+		// 	((UIElement)adornmentLayer).SnapsToDevicePixels = true;
 
-			currentTextView = view;
+		// 	currentTextView = view;
 
-			if (adornmentLayer.Elements.Count == 0) {
-				adornmentLayer.AddAdornment (AdornmentPositioningBehavior.OwnerControlled, null, this, this, null);
-			}
+		// 	if (adornmentLayer.Elements.Count == 0) {
+		// 		adornmentLayer.AddAdornment (AdornmentPositioningBehavior.OwnerControlled, null, this, this, null);
+		// 	}
 
-			Position ();
+		// 	Position ();
 
-			Visibility = Visibility.Visible;
+		// 	Visibility = Visibility.Visible;
 
-			view.VisualElement.SizeChanged += OnViewSizeChanged;
-			view.Closed += OnViewClosed;
+		// 	view.VisualElement.SizeChanged += OnViewSizeChanged;
+		// 	view.Closed += OnViewClosed;
 
-			FocusFindBox ();
-		}
+		// 	FocusFindBox ();
+		// }
 
 		public void HideAdornment ()
 		{
-			IWpfTextView textView = currentTextView;
+			//IWpfTextView textView = currentTextView;
 
 			// Send the focus back to the editor.
-			if (textView != null && !textView.IsClosed) {
-				textView.VisualElement.Focus ();
-			}
+			//if (textView != null && !textView.IsClosed) {
+			//	textView.VisualElement.Focus ();
+			//}
 
 			// Hide the adornment (Note that this calls DetachFromView on us)
 			// This has to be done after the focus transfer because the FindAdornmentManager
 			// needs to respond to the focus transfer before it disconnects itself from the view.
 			Visibility = Visibility.Collapsed;
 
-			if (textView != null) {
-				if (this.IsKeyboardFocusWithin) {
+			//if (textView != null) {
+				//if (this.IsKeyboardFocusWithin) {
 					// This method will remove the Find UI adornment from the visual tree but that on its own
 					// won't move the focus from the Find UI. WPF would later get around to restoring a valid focus.
 					// There is a problematic case when the adornment is being hidden while doing a FindNext to
@@ -117,16 +117,16 @@ public void HideAdornment ()
 					// the other top-level window frame, WPF will detect that focus is still "disconnected"
 					// and will restore focus to this editor instead of moving it as we request.
 					// By manually moving focus here, it will not get into this "disconnected" state.
-					textView.VisualElement.Focus ();
-				}
+					//textView.VisualElement.Focus ();
+				//}
 
-				currentTextView = null;
+				//currentTextView = null;
 
-				textView.GetAdornmentLayer (FindUIAdornmentLayer).RemoveAllAdornments ();
-				textView.VisualElement.SizeChanged -= OnViewSizeChanged;
-				textView.Closed -= OnViewClosed;
-				textView = null;
-			}
+				//textView.GetAdornmentLayer (FindUIAdornmentLayer).RemoveAllAdornments ();
+				//textView.VisualElement.SizeChanged -= OnViewSizeChanged;
+				//textView.Closed -= OnViewClosed;
+				//textView = null;
+			//}
 		}
 
 		private void RaiseFindOptionsChanged (object sender, EventArgs args)
@@ -273,7 +273,7 @@ private void OnResizerMouseMove (object sender, MouseEventArgs e)
 				this.Width = Math.Min (Math.Max (this.MinWidth, _resizingBaselineWidth + delta), this.MaxWidth);
 
 				Canvas.SetTop (this, 0.0);
-				Canvas.SetLeft (this, currentTextView.ViewportWidth - this.Width);
+				//Canvas.SetLeft (this, currentTextView.ViewportWidth - this.Width);
 
 				e.Handled = true;
 			}
@@ -299,13 +299,13 @@ private void OnViewSizeChanged (object sender, SizeChangedEventArgs e)
 
 		public void Position ()
 		{
-			if (currentTextView != null) {
-				this.MaxWidth = currentTextView.ViewportWidth;
+			//if (currentTextView != null) {
+				//this.MaxWidth = currentTextView.ViewportWidth;
 				this.Width = Math.Min (Math.Max (this.Width, this.MinWidth), this.MaxWidth);
 
 				Canvas.SetTop (this, 0.0);
-				Canvas.SetLeft (this, currentTextView.ViewportWidth - this.Width);
-			}
+				//Canvas.SetLeft (this, currentTextView.ViewportWidth - this.Width);
+			//}
 		}
 
 		protected override void OnPreviewKeyDown (KeyEventArgs e)
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessor.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessor.cs
index daea6c8986a..e71b5b75c66 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessor.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessor.cs
@@ -31,385 +31,385 @@
 
 namespace MonoDevelop.Ide.Text
 {
-	sealed class DefaultKeyProcessor : KeyProcessor
-	{
-		readonly IWpfTextView _textView;
-		readonly IEditorOperations _editorOperations;
-		readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
-		readonly IEditorCommandHandlerService _editorCommandHandlerService;
+	// sealed class DefaultKeyProcessor : KeyProcessor
+	// {
+	// 	//readonly IWpfTextView _textView;
+	// 	readonly IEditorOperations _editorOperations;
+	// 	readonly ITextUndoHistoryRegistry _undoHistoryRegistry;
+	// 	readonly IEditorCommandHandlerService _editorCommandHandlerService;
 
-		static Func<CommandState> Unspecified { get; } = () => CommandState.Unspecified;
-		static Action Noop { get; } = () => { };
+	// 	static Func<CommandState> Unspecified { get; } = () => CommandState.Unspecified;
+	// 	static Action Noop { get; } = () => { };
 
-		internal DefaultKeyProcessor (
-			IWpfTextView textView,
-			IEditorOperations editorOperations,
-			ITextUndoHistoryRegistry undoHistoryRegistry,
-			IEditorCommandHandlerService editorCommandHandlerService)
-		{
-			this._textView = textView;
-			this._editorOperations = editorOperations;
-			this._undoHistoryRegistry = undoHistoryRegistry;
-			this._editorCommandHandlerService = editorCommandHandlerService;
-		}
+	// 	internal DefaultKeyProcessor (
+	// 		//IWpfTextView textView,
+	// 		IEditorOperations editorOperations,
+	// 		ITextUndoHistoryRegistry undoHistoryRegistry,
+	// 		IEditorCommandHandlerService editorCommandHandlerService)
+	// 	{
+	// 		//this._textView = textView;
+	// 		this._editorOperations = editorOperations;
+	// 		this._undoHistoryRegistry = undoHistoryRegistry;
+	// 		this._editorCommandHandlerService = editorCommandHandlerService;
+	// 	}
 
-		public void QueryAndExecute<T> (Func<ITextView, ITextBuffer, T> argsFactory) where T : EditorCommandArgs
-		{
-			var state = _editorCommandHandlerService.GetCommandState (argsFactory, Unspecified);
-			if (state.IsAvailable)
-				_editorCommandHandlerService.Execute (argsFactory, Noop);
-		}
+	// 	public void QueryAndExecute<T> (Func<ITextView, ITextBuffer, T> argsFactory) where T : EditorCommandArgs
+	// 	{
+	// 		var state = _editorCommandHandlerService.GetCommandState (argsFactory, Unspecified);
+	// 		if (state.IsAvailable)
+	// 			_editorCommandHandlerService.Execute (argsFactory, Noop);
+	// 	}
 
-		public override void KeyDown (KeyEventArgs args)
-		{
-			if (args.Handled) {
-				return;
-			}
+	// 	public override void KeyDown (KeyEventArgs args)
+	// 	{
+	// 		if (args.Handled) {
+	// 			return;
+	// 		}
 
-			args.Handled = true;
-			switch (args.KeyboardDevice.Modifiers) {
-			case ModifierKeys.None:
-				HandleKey (args);
-				break;
-			case ModifierKeys.Control:
-				HandleControlKey (args);
-				break;
-			case ModifierKeys.Alt:
-				HandleAltKey (args);
-				break;
-			case ModifierKeys.Shift | ModifierKeys.Alt:
-				HandleAltShiftKey (args);
-				break;
-			case ModifierKeys.Control | ModifierKeys.Shift:
-				HandleControlShiftKey (args);
-				break;
-			case ModifierKeys.Shift:
-				HandleShiftKey (args);
-				break;
-			case ModifierKeys.Control | ModifierKeys.Alt:
-				HandleAltControlKey (args);
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 		args.Handled = true;
+	// 		switch (args.KeyboardDevice.Modifiers) {
+	// 		case ModifierKeys.None:
+	// 			HandleKey (args);
+	// 			break;
+	// 		case ModifierKeys.Control:
+	// 			HandleControlKey (args);
+	// 			break;
+	// 		case ModifierKeys.Alt:
+	// 			HandleAltKey (args);
+	// 			break;
+	// 		case ModifierKeys.Shift | ModifierKeys.Alt:
+	// 			HandleAltShiftKey (args);
+	// 			break;
+	// 		case ModifierKeys.Control | ModifierKeys.Shift:
+	// 			HandleControlShiftKey (args);
+	// 			break;
+	// 		case ModifierKeys.Shift:
+	// 			HandleShiftKey (args);
+	// 			break;
+	// 		case ModifierKeys.Control | ModifierKeys.Alt:
+	// 			HandleAltControlKey (args);
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		private void HandleAltControlKey (KeyEventArgs args)
-		{
-			switch (args.Key) {
-			case Key.Home:
-				_editorOperations.MoveCurrentLineToTop ();
-				break;
-			case Key.End:
-				_editorOperations.MoveCurrentLineToBottom ();
-				break;
-			case Key.Space:
-				QueryAndExecute ((v, b) => new ToggleCompletionModeCommandArgs (v, b));
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 	private void HandleAltControlKey (KeyEventArgs args)
+	// 	{
+	// 		switch (args.Key) {
+	// 		case Key.Home:
+	// 			_editorOperations.MoveCurrentLineToTop ();
+	// 			break;
+	// 		case Key.End:
+	// 			_editorOperations.MoveCurrentLineToBottom ();
+	// 			break;
+	// 		case Key.Space:
+	// 			QueryAndExecute ((v, b) => new ToggleCompletionModeCommandArgs (v, b));
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		private void HandleShiftKey (KeyEventArgs args)
-		{
-			switch (args.Key) {
-			case Key.Back:
-				QueryAndExecute ((v, b) => new BackspaceKeyCommandArgs (v, b));
-				break;
-			case Key.Right:
-				_editorOperations.MoveToNextCharacter (extendSelection: true);
-				break;
-			case Key.Left:
-				_editorOperations.MoveToPreviousCharacter (extendSelection: true);
-				break;
-			case Key.Up:
-				_editorOperations.MoveLineUp (extendSelection: true);
-				break;
-			case Key.Down:
-				_editorOperations.MoveLineDown (extendSelection: true);
-				break;
-			case Key.Home:
-				QueryAndExecute ((v, b) => new LineStartExtendCommandArgs (v, b));
-				break;
-			case Key.End:
-				QueryAndExecute ((v, b) => new LineEndExtendCommandArgs (v, b));
-				break;
-			case Key.PageUp:
-				_editorOperations.PageUp (extendSelection: true);
-				break;
-			case Key.PageDown:
-				_editorOperations.PageDown (extendSelection: true);
-				break;
-			case Key.Tab:
-				QueryAndExecute ((v, b) => new BackTabKeyCommandArgs (v, b));
-				break;
-			case Key.Enter:
-				QueryAndExecute ((v, b) => new ReturnKeyCommandArgs (v, b));
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 	private void HandleShiftKey (KeyEventArgs args)
+	// 	{
+	// 		switch (args.Key) {
+	// 		case Key.Back:
+	// 			QueryAndExecute ((v, b) => new BackspaceKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Right:
+	// 			_editorOperations.MoveToNextCharacter (extendSelection: true);
+	// 			break;
+	// 		case Key.Left:
+	// 			_editorOperations.MoveToPreviousCharacter (extendSelection: true);
+	// 			break;
+	// 		case Key.Up:
+	// 			_editorOperations.MoveLineUp (extendSelection: true);
+	// 			break;
+	// 		case Key.Down:
+	// 			_editorOperations.MoveLineDown (extendSelection: true);
+	// 			break;
+	// 		case Key.Home:
+	// 			QueryAndExecute ((v, b) => new LineStartExtendCommandArgs (v, b));
+	// 			break;
+	// 		case Key.End:
+	// 			QueryAndExecute ((v, b) => new LineEndExtendCommandArgs (v, b));
+	// 			break;
+	// 		case Key.PageUp:
+	// 			_editorOperations.PageUp (extendSelection: true);
+	// 			break;
+	// 		case Key.PageDown:
+	// 			_editorOperations.PageDown (extendSelection: true);
+	// 			break;
+	// 		case Key.Tab:
+	// 			QueryAndExecute ((v, b) => new BackTabKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Enter:
+	// 			QueryAndExecute ((v, b) => new ReturnKeyCommandArgs (v, b));
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		private void HandleControlShiftKey (KeyEventArgs args)
-		{
-			switch (args.Key) {
-			case Key.Right:
-				_editorOperations.MoveToNextWord (extendSelection: true);
-				break;
-			case Key.Left:
-				_editorOperations.MoveToPreviousWord (extendSelection: true);
-				break;
-			case Key.Home:
-				_editorOperations.MoveToStartOfDocument (extendSelection: true);
-				break;
-			case Key.End:
-				_editorOperations.MoveToEndOfDocument (extendSelection: true);
-				break;
-			case Key.U:
-				args.Handled = this.PerformEditAction (() => _editorOperations.MakeUppercase ());
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 	private void HandleControlShiftKey (KeyEventArgs args)
+	// 	{
+	// 		switch (args.Key) {
+	// 		case Key.Right:
+	// 			_editorOperations.MoveToNextWord (extendSelection: true);
+	// 			break;
+	// 		case Key.Left:
+	// 			_editorOperations.MoveToPreviousWord (extendSelection: true);
+	// 			break;
+	// 		case Key.Home:
+	// 			_editorOperations.MoveToStartOfDocument (extendSelection: true);
+	// 			break;
+	// 		case Key.End:
+	// 			_editorOperations.MoveToEndOfDocument (extendSelection: true);
+	// 			break;
+	// 		case Key.U:
+	// 			args.Handled = this.PerformEditAction (() => _editorOperations.MakeUppercase ());
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		private void HandleAltShiftKey (KeyEventArgs args)
-		{
-			if (args.Key == Key.T) {
-				args.Handled = this.PerformEditAction (() => _editorOperations.TransposeLine ());
-				return;
-			}
+	// 	private void HandleAltShiftKey (KeyEventArgs args)
+	// 	{
+	// 		if (args.Key == Key.T) {
+	// 			args.Handled = this.PerformEditAction (() => _editorOperations.TransposeLine ());
+	// 			return;
+	// 		}
 
-			// If this is starting a new selection, put the selection in
-			// box selection mode.
-			if ((args.Key == Key.Down ||
-				args.Key == Key.Up ||
-				args.Key == Key.Left ||
-				args.Key == Key.Right) &&
-				_textView.Selection.IsEmpty) {
-				_textView.Selection.Mode = TextSelectionMode.Box;
-			}
+	// 		// If this is starting a new selection, put the selection in
+	// 		// box selection mode.
+	// 		if ((args.Key == Key.Down ||
+	// 			args.Key == Key.Up ||
+	// 			args.Key == Key.Left ||
+	// 			args.Key == Key.Right) &&
+	// 			_textView.Selection.IsEmpty) {
+	// 			_textView.Selection.Mode = TextSelectionMode.Box;
+	// 		}
 
-			// Treat it as a regular Shift + keypress
-			HandleShiftKey (args);
-		}
+	// 		// Treat it as a regular Shift + keypress
+	// 		HandleShiftKey (args);
+	// 	}
 
-		private void HandleAltKey (KeyEventArgs args)
-		{
-			switch (args.Key) {
-			case Key.Left:
-				_editorOperations.SelectEnclosing ();
-				break;
-			case Key.Right:
-				_editorOperations.SelectFirstChild ();
-				break;
-			case Key.Down:
-				_editorOperations.SelectNextSibling (extendSelection: false);
-				break;
-			case Key.Up:
-				_editorOperations.SelectPreviousSibling (extendSelection: false);
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 	private void HandleAltKey (KeyEventArgs args)
+	// 	{
+	// 		switch (args.Key) {
+	// 		case Key.Left:
+	// 			_editorOperations.SelectEnclosing ();
+	// 			break;
+	// 		case Key.Right:
+	// 			_editorOperations.SelectFirstChild ();
+	// 			break;
+	// 		case Key.Down:
+	// 			_editorOperations.SelectNextSibling (extendSelection: false);
+	// 			break;
+	// 		case Key.Up:
+	// 			_editorOperations.SelectPreviousSibling (extendSelection: false);
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		private void HandleControlKey (KeyEventArgs args)
-		{
-			switch (args.Key) {
-			case Key.Space:
-				QueryAndExecute ((v, b) => new CommitUniqueCompletionListItemCommandArgs (v, b));
-				break;
-			case Key.Back:
-				QueryAndExecute ((v, b) => new WordDeleteToStartCommandArgs (v, b));
-				break;
-			case Key.Delete:
-				QueryAndExecute ((v, b) => new WordDeleteToEndCommandArgs (v, b));
-				break;
-			case Key.A:
-				QueryAndExecute ((v, b) => new SelectAllCommandArgs (v, b));
-				break;
-			case Key.F:
-				QueryAndExecute ((v, b) => new FindCommandArgs (v, b));
-				break;
-			case Key.H:
-				QueryAndExecute ((v, b) => new ReplaceCommandArgs (v, b));
-				break;
-			case Key.W:
-				_editorOperations.SelectCurrentWord ();
-				break;
-			case Key.Right:
-				_editorOperations.MoveToNextWord (extendSelection: false);
-				break;
-			case Key.Left:
-				_editorOperations.MoveToPreviousWord (extendSelection: false);
-				break;
-			case Key.Home:
-				QueryAndExecute ((v, b) => new DocumentStartCommandArgs (v, b));
-				break;
-			case Key.End:
-				QueryAndExecute ((v, b) => new DocumentEndCommandArgs (v, b));
-				break;
-			case Key.Up:
-				_editorOperations.ScrollUpAndMoveCaretIfNecessary ();
-				break;
-			case Key.Down:
-				_editorOperations.ScrollDownAndMoveCaretIfNecessary ();
-				break;
-			case Key.T:
-				args.Handled = this.PerformEditAction (() => _editorOperations.TransposeCharacter ());
-				break;
-			case Key.U:
-				args.Handled = this.PerformEditAction (() => _editorOperations.MakeLowercase ());
-				break;
-			case Key.C:
-				QueryAndExecute ((v, b) => new CopyCommandArgs (v, b));
-				break;
-			case Key.X:
-				QueryAndExecute ((v, b) => new CutCommandArgs (v, b));
-				break;
-			case Key.V:
-				QueryAndExecute ((v, b) => new PasteCommandArgs (v, b));
-				break;
-			case Key.Z:
-				if (UndoHistory.CanUndo)
-					QueryAndExecute ((v, b) => new UndoCommandArgs (v, b));
-				else
-					args.Handled = false;
-				break;
-			case Key.Y:
-				if (UndoHistory.CanRedo)
-					QueryAndExecute ((v, b) => new RedoCommandArgs (v, b));
-				else
-					args.Handled = false;
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 	private void HandleControlKey (KeyEventArgs args)
+	// 	{
+	// 		switch (args.Key) {
+	// 		case Key.Space:
+	// 			QueryAndExecute ((v, b) => new CommitUniqueCompletionListItemCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Back:
+	// 			QueryAndExecute ((v, b) => new WordDeleteToStartCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Delete:
+	// 			QueryAndExecute ((v, b) => new WordDeleteToEndCommandArgs (v, b));
+	// 			break;
+	// 		case Key.A:
+	// 			QueryAndExecute ((v, b) => new SelectAllCommandArgs (v, b));
+	// 			break;
+	// 		case Key.F:
+	// 			QueryAndExecute ((v, b) => new FindCommandArgs (v, b));
+	// 			break;
+	// 		case Key.H:
+	// 			QueryAndExecute ((v, b) => new ReplaceCommandArgs (v, b));
+	// 			break;
+	// 		case Key.W:
+	// 			_editorOperations.SelectCurrentWord ();
+	// 			break;
+	// 		case Key.Right:
+	// 			_editorOperations.MoveToNextWord (extendSelection: false);
+	// 			break;
+	// 		case Key.Left:
+	// 			_editorOperations.MoveToPreviousWord (extendSelection: false);
+	// 			break;
+	// 		case Key.Home:
+	// 			QueryAndExecute ((v, b) => new DocumentStartCommandArgs (v, b));
+	// 			break;
+	// 		case Key.End:
+	// 			QueryAndExecute ((v, b) => new DocumentEndCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Up:
+	// 			_editorOperations.ScrollUpAndMoveCaretIfNecessary ();
+	// 			break;
+	// 		case Key.Down:
+	// 			_editorOperations.ScrollDownAndMoveCaretIfNecessary ();
+	// 			break;
+	// 		case Key.T:
+	// 			args.Handled = this.PerformEditAction (() => _editorOperations.TransposeCharacter ());
+	// 			break;
+	// 		case Key.U:
+	// 			args.Handled = this.PerformEditAction (() => _editorOperations.MakeLowercase ());
+	// 			break;
+	// 		case Key.C:
+	// 			QueryAndExecute ((v, b) => new CopyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.X:
+	// 			QueryAndExecute ((v, b) => new CutCommandArgs (v, b));
+	// 			break;
+	// 		case Key.V:
+	// 			QueryAndExecute ((v, b) => new PasteCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Z:
+	// 			if (UndoHistory.CanUndo)
+	// 				QueryAndExecute ((v, b) => new UndoCommandArgs (v, b));
+	// 			else
+	// 				args.Handled = false;
+	// 			break;
+	// 		case Key.Y:
+	// 			if (UndoHistory.CanRedo)
+	// 				QueryAndExecute ((v, b) => new RedoCommandArgs (v, b));
+	// 			else
+	// 				args.Handled = false;
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		private void HandleKey (KeyEventArgs args)
-		{
-			switch (args.Key) {
-			case Key.Right:
-				QueryAndExecute ((v, b) => new RightKeyCommandArgs (v, b));
-				break;
-			case Key.Left:
-				QueryAndExecute ((v, b) => new LeftKeyCommandArgs (v, b));
-				break;
-			case Key.Up:
-				QueryAndExecute ((v, b) => new UpKeyCommandArgs (v, b));
-				break;
-			case Key.Down:
-				QueryAndExecute ((v, b) => new DownKeyCommandArgs (v, b));
-				break;
-			case Key.PageUp:
-				QueryAndExecute ((v, b) => new PageUpKeyCommandArgs (v, b));
-				break;
-			case Key.PageDown:
-				QueryAndExecute ((v, b) => new PageDownKeyCommandArgs (v, b));
-				break;
-			case Key.Home:
-				QueryAndExecute ((v, b) => new LineStartCommandArgs (v, b));
-				break;
-			case Key.End:
-				QueryAndExecute ((v, b) => new LineEndCommandArgs (v, b));
-				break;
-			case Key.Escape:
-				QueryAndExecute ((v, b) => new EscapeKeyCommandArgs (v, b));
-				break;
-			case Key.Delete:
-				QueryAndExecute ((v, b) => new DeleteKeyCommandArgs (v, b));
-				break;
-			case Key.Back:
-				QueryAndExecute ((v, b) => new BackspaceKeyCommandArgs (v, b));
-				break;
-			case Key.Insert:
-				_editorOperations.Options.SetOptionValue (DefaultTextViewOptions.OverwriteModeId,
-					!_editorOperations.Options.IsOverwriteModeEnabled ());
-				break;
-			case Key.Enter:
-				QueryAndExecute ((v, b) => new ReturnKeyCommandArgs (v, b));
-				break;
-			case Key.Tab:
-				QueryAndExecute ((v, b) => new TabKeyCommandArgs (v, b));
-				break;
-			case Key.F2:
-				QueryAndExecute ((v, b) => new RenameCommandArgs (v, b));
-				break;
-			default:
-				args.Handled = false;
-				break;
-			}
-		}
+	// 	private void HandleKey (KeyEventArgs args)
+	// 	{
+	// 		switch (args.Key) {
+	// 		case Key.Right:
+	// 			QueryAndExecute ((v, b) => new RightKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Left:
+	// 			QueryAndExecute ((v, b) => new LeftKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Up:
+	// 			QueryAndExecute ((v, b) => new UpKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Down:
+	// 			QueryAndExecute ((v, b) => new DownKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.PageUp:
+	// 			QueryAndExecute ((v, b) => new PageUpKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.PageDown:
+	// 			QueryAndExecute ((v, b) => new PageDownKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Home:
+	// 			QueryAndExecute ((v, b) => new LineStartCommandArgs (v, b));
+	// 			break;
+	// 		case Key.End:
+	// 			QueryAndExecute ((v, b) => new LineEndCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Escape:
+	// 			QueryAndExecute ((v, b) => new EscapeKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Delete:
+	// 			QueryAndExecute ((v, b) => new DeleteKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Back:
+	// 			QueryAndExecute ((v, b) => new BackspaceKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Insert:
+	// 			_editorOperations.Options.SetOptionValue (DefaultTextViewOptions.OverwriteModeId,
+	// 				!_editorOperations.Options.IsOverwriteModeEnabled ());
+	// 			break;
+	// 		case Key.Enter:
+	// 			QueryAndExecute ((v, b) => new ReturnKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.Tab:
+	// 			QueryAndExecute ((v, b) => new TabKeyCommandArgs (v, b));
+	// 			break;
+	// 		case Key.F2:
+	// 			QueryAndExecute ((v, b) => new RenameCommandArgs (v, b));
+	// 			break;
+	// 		default:
+	// 			args.Handled = false;
+	// 			break;
+	// 		}
+	// 	}
 
-		public override void TextInput (TextCompositionEventArgs args)
-		{
-			if (args.Text.Length == 1) {
-				QueryAndExecute ((v, b) => new TypeCharCommandArgs (v, b, args.Text[0]));
-				args.Handled = true;
-			}
-		}
+	// 	public override void TextInput (TextCompositionEventArgs args)
+	// 	{
+	// 		if (args.Text.Length == 1) {
+	// 			QueryAndExecute ((v, b) => new TypeCharCommandArgs (v, b, args.Text[0]));
+	// 			args.Handled = true;
+	// 		}
+	// 	}
 
-		public override void TextInputStart (TextCompositionEventArgs args)
-		{
-			if (args.TextComposition is ImeTextComposition) {
-				// This TextInputStart message is part of an IME event and needs to be treated like
-				// provisional text input (if the cast failed, then an IME is not the source of the
-				// text input and we can rely on getting an identical TextInput event as soon as we
-				// exit).
-				this.HandleProvisionalImeInput (args);
-			}
-		}
+	// 	public override void TextInputStart (TextCompositionEventArgs args)
+	// 	{
+	// 		if (args.TextComposition is ImeTextComposition) {
+	// 			// This TextInputStart message is part of an IME event and needs to be treated like
+	// 			// provisional text input (if the cast failed, then an IME is not the source of the
+	// 			// text input and we can rely on getting an identical TextInput event as soon as we
+	// 			// exit).
+	// 			this.HandleProvisionalImeInput (args);
+	// 		}
+	// 	}
 
-		public override void TextInputUpdate (TextCompositionEventArgs args)
-		{
-			if (args.TextComposition is ImeTextComposition) {
-				this.HandleProvisionalImeInput (args);
-			} else {
-				args.Handled = false;
-			}
-		}
+	// 	public override void TextInputUpdate (TextCompositionEventArgs args)
+	// 	{
+	// 		if (args.TextComposition is ImeTextComposition) {
+	// 			this.HandleProvisionalImeInput (args);
+	// 		} else {
+	// 			args.Handled = false;
+	// 		}
+	// 	}
 
-		private void HandleProvisionalImeInput (TextCompositionEventArgs args)
-		{
-			if (args.Text.Length > 0) {
-				args.Handled = this.PerformEditAction (() => _editorOperations.InsertProvisionalText (args.Text));
+	// 	private void HandleProvisionalImeInput (TextCompositionEventArgs args)
+	// 	{
+	// 		if (args.Text.Length > 0) {
+	// 			args.Handled = this.PerformEditAction (() => _editorOperations.InsertProvisionalText (args.Text));
 
-				if (args.Handled) {
-					_textView.Caret.EnsureVisible ();
-				}
-			}
-		}
+	// 			if (args.Handled) {
+	// 				_textView.Caret.EnsureVisible ();
+	// 			}
+	// 		}
+	// 	}
 
-		/// <summary>
-		/// Performs the passed editAction if the view does not prohibit user input.
-		/// </summary>
-		/// <returns>True if the editAction was performed.</returns>
-		private bool PerformEditAction (Action editAction)
-		{
-			if (!_textView.Options.GetOptionValue<bool> (DefaultTextViewOptions.ViewProhibitUserInputId)) {
-				editAction.Invoke ();
-				return true;
-			}
+	// 	/// <summary>
+	// 	/// Performs the passed editAction if the view does not prohibit user input.
+	// 	/// </summary>
+	// 	/// <returns>True if the editAction was performed.</returns>
+	// 	private bool PerformEditAction (Action editAction)
+	// 	{
+	// 		if (!_textView.Options.GetOptionValue<bool> (DefaultTextViewOptions.ViewProhibitUserInputId)) {
+	// 			editAction.Invoke ();
+	// 			return true;
+	// 		}
 
-			return false;
-		}
+	// 		return false;
+	// 	}
 
-		private ITextUndoHistory UndoHistory {
-			get {
-				return _undoHistoryRegistry.GetHistory (_textView.TextBuffer);
-			}
-		}
-	}
+	// 	private ITextUndoHistory UndoHistory {
+	// 		get {
+	// 			return _undoHistoryRegistry.GetHistory (_textView.TextBuffer);
+	// 		}
+	// 	}
+	// }
 }
 
 // TODO:
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessorProvider.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessorProvider.cs
index ac9ff751214..21f9ebea0d1 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessorProvider.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/KeyProcessor/DefaultKeyProcessorProvider.cs
@@ -1,24 +1,24 @@
-//
-// Copyright (c) Microsoft Corp. (https://www.microsoft.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
+//
+// Copyright (c) Microsoft Corp. (https://www.microsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.Text.Editor;
@@ -28,38 +28,38 @@
 
 namespace MonoDevelop.Ide.Text
 {
-    [Export(typeof(IKeyProcessorProvider))]
-    [Name("DefaultKeyProcessor")]
-    [ContentType("text")]
-    [TextViewRole(PredefinedTextViewRoles.Interactive)]
-    internal sealed class DefaultKeyProcessorProvider : IKeyProcessorProvider
-    {
-        [Import]
-        private IEditorOperationsFactoryService editorOperationsProvider = null;
+   // [Export(typeof(IKeyProcessorProvider))]
+   // [Name("DefaultKeyProcessor")]
+   // [ContentType("text")]
+    //[TextViewRole(PredefinedTextViewRoles.Interactive)]
+    // internal sealed class DefaultKeyProcessorProvider : IKeyProcessorProvider
+    // {
+    //     [Import]
+    //     private IEditorOperationsFactoryService editorOperationsProvider = null;
 
-		[Import]
-		private IEditorCommandHandlerServiceFactory editorCommandHandlerServiceFactory = null;
+	// 	[Import]
+	// 	private IEditorCommandHandlerServiceFactory editorCommandHandlerServiceFactory = null;
 
-		[Import]
-		private ITextUndoHistoryRegistry textUndoHistoryRegistry = null;
+	// 	[Import]
+	// 	private ITextUndoHistoryRegistry textUndoHistoryRegistry = null;
 
-        /// <summary>
-        /// Creates a new key processor provider for the given WPF text view host
-        /// </summary>
-        /// <param name="wpfTextView">WPF-based text view to create key processor for</param>
-        /// <returns>A valid key processor</returns>
-        public KeyProcessor GetAssociatedProcessor(IWpfTextView wpfTextView)
-        {
-            if (wpfTextView == null)
-            {
-                throw new ArgumentNullException(nameof(wpfTextView));
-            }
+    //     /// <summary>
+    //     /// Creates a new key processor provider for the given WPF text view host
+    //     /// </summary>
+    //     /// <param name="wpfTextView">WPF-based text view to create key processor for</param>
+    //     /// <returns>A valid key processor</returns>
+    //     public KeyProcessor GetAssociatedProcessor(IWpfTextView wpfTextView)
+    //     {
+    //         if (wpfTextView == null)
+    //         {
+    //             throw new ArgumentNullException("wpfTextView");
+    //         }
 
-            return new DefaultKeyProcessor(
-                wpfTextView,
-                editorOperationsProvider.GetEditorOperations(wpfTextView),
-                textUndoHistoryRegistry,
-                editorCommandHandlerServiceFactory.GetService(wpfTextView));
-        }
-    }
+    //         return new DefaultKeyProcessor(
+    //             wpfTextView,
+    //             editorOperationsProvider.GetEditorOperations(wpfTextView),
+    //             textUndoHistoryRegistry,
+    //             editorCommandHandlerServiceFactory.GetService(wpfTextView));
+    //     }
+    // }
 }
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml
index 1c3c298df37..ca72bc2d967 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml
@@ -2,7 +2,7 @@
 	<Runtime>
 		<Import assembly="MonoDevelop.TextEditor.Wpf.dll"/>
 		<Import assembly="../../../bin/Microsoft.VisualStudio.InteractiveWindow.dll" />
-		<Import assembly="../../../bin/Microsoft.VisualStudio.Language.NavigateTo.Interfaces.dll" />
+		
 		<Import assembly="../../../bin/Microsoft.VisualStudio.Text.Internal.dll" />
 	</Runtime>
 	<Extension path="/MonoDevelop/Ide/Composition">
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Undo/UndoHistoryRegistry.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Undo/UndoHistoryRegistry.cs
index 221626e3bc9..7a00a6dfd3d 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Undo/UndoHistoryRegistry.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Undo/UndoHistoryRegistry.cs
@@ -30,6 +30,7 @@ namespace MonoDevelop.Ide.Text
     /// This class is intended to be a very simple ITextUndoHistoryRegistry implementation for hosts that
     /// don't have a built-in undo mechanism
     /// </summary>
+     [Export(typeof(ITextUndoHistoryRegistry))]
 //oe    [Export(typeof(ITextUndoHistoryRegistry))]	oe NOTICE prevent multiple export of this type; WHICH ONE SHOULD BE USED???
     internal sealed class TextUndoHistoryRegistry : ITextUndoHistoryRegistry
     {
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfMouseProcessor.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfMouseProcessor.cs
index d374baae474..8c04f5bc281 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfMouseProcessor.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfMouseProcessor.cs
@@ -32,44 +32,44 @@
 
 namespace MonoDevelop.TextEditor.Wpf
 {
-	[Export (typeof (IMouseProcessorProvider))]
-	[Name (nameof (WpfMouseProcessorProvider))]
-	[Order (Before = "WordSelection")]
-	[ContentType ("Text")]
-	[TextViewRole (PredefinedTextViewRoles.Interactive)]
-	class WpfMouseProcessorProvider : IMouseProcessorProvider
-	{
-		[Import]
-		public ITextDocumentFactoryService TextDocumentFactory { get; private set; }
+	// [Export (typeof (IMouseProcessorProvider))]
+	// [Name (nameof (WpfMouseProcessorProvider))]
+	// [Order (Before = "WordSelection")]
+	// [ContentType ("Text")]
+	// [TextViewRole (PredefinedTextViewRoles.Interactive)]
+	// class WpfMouseProcessorProvider : IMouseProcessorProvider
+	// {
+	// 	[Import]
+	// 	public ITextDocumentFactoryService TextDocumentFactory { get; private set; }
 
-		[Import]
-		public IEditorCommandHandlerServiceFactory CommandServiceFactory { get; private set; }
+	// 	[Import]
+	// 	public IEditorCommandHandlerServiceFactory CommandServiceFactory { get; private set; }
 
-		public IMouseProcessor GetAssociatedProcessor (IWpfTextView textView)
-		{
-			return new WfpMouseProcessor (CommandServiceFactory.GetService (textView), textView);
-		}
-	}
+	// 	// public IMouseProcessor GetAssociatedProcessor (IWpfTextView textView)
+	// 	// {
+	// 	// 	return new WfpMouseProcessor (CommandServiceFactory.GetService (textView), textView);
+	// 	// }
+	// }
 
-	class WfpMouseProcessor : MouseProcessorBase
-	{
-		IWpfTextView textView;
-		private readonly IEditorCommandHandlerService commandServiceFactory;
-		readonly string menuPath = "/MonoDevelop/TextEditor/ContextMenu/Editor";
+	// class WfpMouseProcessor : MouseProcessorBase
+	// {
+	// 	IWpfTextView textView;
+	// 	private readonly IEditorCommandHandlerService commandServiceFactory;
+	// 	readonly string menuPath = "/MonoDevelop/TextEditor/ContextMenu/Editor";
 
-		public WfpMouseProcessor (IEditorCommandHandlerService commandServiceFactory, IWpfTextView textView)
-		{
-			this.textView = textView;
-			this.commandServiceFactory = commandServiceFactory;
-		}
+	// 	public WfpMouseProcessor (IEditorCommandHandlerService commandServiceFactory, IWpfTextView textView)
+	// 	{
+	// 		this.textView = textView;
+	// 		this.commandServiceFactory = commandServiceFactory;
+	// 	}
 
-		public override void PreprocessMouseRightButtonUp (MouseButtonEventArgs e)
-		{
-			var controller = (WpfTextViewContent)textView.Properties[typeof (DocumentController)];
-			var ctx = controller.ExtensionContext ?? Mono.Addins.AddinManager.AddinEngine;
-			var cset = IdeApp.CommandService.CreateCommandEntrySet (ctx, menuPath);
-			var pt = e.GetPosition (controller.HostControl);
-			IdeApp.CommandService.ShowContextMenu (controller.XwtControl, (int)pt.X, (int)pt.Y, cset, controller);
-		}
-	}
+	// 	public override void PreprocessMouseRightButtonUp (MouseButtonEventArgs e)
+	// 	{
+	// 		var controller = (WpfTextViewContent)textView.Properties[typeof (DocumentController)];
+	// 		var ctx = controller.ExtensionContext ?? Mono.Addins.AddinManager.AddinEngine;
+	// 		var cset = IdeApp.CommandService.CreateCommandEntrySet (ctx, menuPath);
+	// 		var pt = e.GetPosition (controller.HostControl);
+	// 		IdeApp.CommandService.ShowContextMenu (controller.XwtControl, (int)pt.X, (int)pt.Y, cset, controller);
+	// 	}
+	// }
 }
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfObscuringTipManager.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfObscuringTipManager.cs
index ffad8c6f540..88ac701ed71 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfObscuringTipManager.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfObscuringTipManager.cs
@@ -22,11 +22,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Editor;
 
-namespace MonoDevelop.TextEditor
-{
-	[Export (typeof (IObscuringTipManager))]
+namespace MonoDevelop.TextEditor
+{
+	[Export (typeof (IObscuringTipManager))]
 	class WpfObscuringTipManager : IObscuringTipManager
 	{
 		readonly Dictionary<ITextView, List<IObscuringTip>> tipStacks
@@ -34,9 +34,9 @@ readonly Dictionary<ITextView, List<IObscuringTip>> tipStacks
 
 		public void PushTip (ITextView view, IObscuringTip tip)
 		{
-			if (!(view is IWpfTextView)) {
-				return;
-			}
+			//if (!(view is IWpfTextView)) {
+			//	return;
+			//}
 
 			if (!tipStacks.TryGetValue (view, out var stack)) {
 				view.Closed += OnTextViewClosed;
@@ -48,9 +48,9 @@ public void PushTip (ITextView view, IObscuringTip tip)
 
 		public void RemoveTip (ITextView view, IObscuringTip tip)
 		{
-			if (!(view is IWpfTextView)) {
-				return;
-			}
+			//if (!(view is IWpfTextView)) {
+			//	return;
+			//}
 
 			if (tipStacks.TryGetValue (view, out var stack)) {
 				stack.Remove (tip);
@@ -79,5 +79,5 @@ void OnTextViewClosed (object sender, EventArgs e)
 			tipStacks.Remove (textView);
 			textView.Closed -= OnTextViewClosed;
 		}
-	}
+	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewContent.cs
index 1bd8236757d..a0458d11ac0 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewContent.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewContent.cs
@@ -19,95 +19,95 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System.Windows.Input;
+using System.Windows.Input;
 using Microsoft.VisualStudio.Text.Editor;
-using MonoDevelop.Components;
-
+using MonoDevelop.Components;
+
 namespace MonoDevelop.TextEditor
 {
-	class WpfTextViewContent : TextViewContent<IWpfTextView, WpfTextViewImports>, Ide.Gui.Content.IZoomable
-	{
-		IWpfTextViewHost wpfTextViewHost;
-
-		public WpfTextViewContent (WpfTextViewImports imports)
-			: base (imports)
-		{
-		}
-
-		protected override IWpfTextView CreateTextView (ITextViewModel viewModel, ITextViewRoleSet roles)
-			=> Imports.TextEditorFactoryService.CreateTextView (viewModel, roles, Imports.EditorOptionsFactoryService.GlobalOptions);
-
-		public System.Windows.Controls.Control HostControl => wpfTextViewHost.HostControl;
-
-		public XwtControl XwtControl { get; private set; }
-
-		protected override Control CreateControl ()
-		{
-			wpfTextViewHost = Imports.TextEditorFactoryService.CreateTextViewHost (TextView, setFocus: true);
-			var wpfControl = wpfTextViewHost.HostControl;
-
-			Gtk.Widget widget = new RootWpfWidget (wpfControl) {
-				HeightRequest = 50,
-				WidthRequest = 100
-			};
-
-			TextView.VisualElement.Tag = widget;
-
-			var xwtWidget = Xwt.Toolkit.CurrentEngine.WrapWidget (widget, Xwt.NativeWidgetSizing.External);
-			xwtWidget.Show ();
-
-			XwtControl = new XwtControl (xwtWidget);
-			return XwtControl;
-		}
-
-		protected override ITextViewRoleSet GetAllPredefinedRoles () => Imports.TextEditorFactoryService.AllPredefinedRoles;
-
-		protected override void SubscribeToEvents ()
-		{
-			base.SubscribeToEvents ();
-			TextView.VisualElement.LostKeyboardFocus += HandleWpfLostKeyboardFocus;
-		}
-
-		protected override void UnsubscribeFromEvents ()
-		{
-			base.UnsubscribeFromEvents ();
-			TextView.VisualElement.LostKeyboardFocus -= HandleWpfLostKeyboardFocus;
-		}
-
-		void HandleWpfLostKeyboardFocus (object sender, KeyboardFocusChangedEventArgs e)
-			=> Components.Commands.CommandManager.LastFocusedWpfElement = TextView.VisualElement;
-
-		protected override void OnDispose ()
-		{
-			base.OnDispose ();
-			if (wpfTextViewHost != null) {
-				wpfTextViewHost.Close ();
-				wpfTextViewHost = null;
-			}
-		}
-
-		#region IZoomable
-
-		// the base TextViewContent impl of IZoomable doesn't work on Windows as it requires IEditorOperations4
-
-		const double MAX_ZOOM = 400.0;
-		const double MIN_ZOOM = 20.0;
-		const double DEFAULT_ZOOM = 100.0;
-
-		bool IsZoomable => TextView.Roles.Contains (PredefinedTextViewRoles.Zoomable);
-
-		public bool EnableZoomIn => IsZoomable && TextView.ZoomLevel < MAX_ZOOM;
-
-		public bool EnableZoomOut => IsZoomable && TextView.ZoomLevel < MIN_ZOOM;
-
-		public bool EnableZoomReset => IsZoomable && TextView.ZoomLevel != DEFAULT_ZOOM;
-
-		public void ZoomIn () => EditorOperations.ZoomIn ();
-
-		public void ZoomOut () => EditorOperations.ZoomOut ();
-
-		public void ZoomReset () => EditorOperations.ZoomTo (DEFAULT_ZOOM);
-
-		#endregion
-	}
+	// class WpfTextViewContent : TextViewContent<IWpfTextView, WpfTextViewImports>, Ide.Gui.Content.IZoomable
+	// {
+	// 	//IWpfTextViewHost wpfTextViewHost;
+
+	// 	public WpfTextViewContent (WpfTextViewImports imports)
+	// 		: base (imports)
+	// 	{
+	// 	}
+
+	// 	protected override IWpfTextView CreateTextView (ITextViewModel viewModel, ITextViewRoleSet roles)
+	// 		=> Imports.TextEditorFactoryService.CreateTextView (viewModel, roles, Imports.EditorOptionsFactoryService.GlobalOptions);
+
+	// 	public System.Windows.Controls.Control HostControl => wpfTextViewHost.HostControl;
+
+	// 	public XwtControl XwtControl { get; private set; }
+
+	// 	protected override Control CreateControl ()
+	// 	{
+	// 		//wpfTextViewHost = Imports.TextEditorFactoryService.CreateTextViewHost (TextView, setFocus: true);
+	// 		//var wpfControl = wpfTextViewHost.HostControl;
+
+	// 		//Gtk.Widget widget = new RootWpfWidget (wpfControl) {
+	// 		//	HeightRequest = 50,
+	// 		//	WidthRequest = 100
+	// 		//};
+
+	// 		TextView.VisualElement.Tag = widget;
+
+	// 		var xwtWidget = Xwt.Toolkit.CurrentEngine.WrapWidget (widget, Xwt.NativeWidgetSizing.External);
+	// 		xwtWidget.Show ();
+
+	// 		XwtControl = new XwtControl (xwtWidget);
+	// 		return XwtControl;
+	// 	}
+
+	// 	protected override ITextViewRoleSet GetAllPredefinedRoles () => Imports.TextEditorFactoryService.AllPredefinedRoles;
+
+	// 	protected override void SubscribeToEvents ()
+	// 	{
+	// 		base.SubscribeToEvents ();
+	// 		TextView.VisualElement.LostKeyboardFocus += HandleWpfLostKeyboardFocus;
+	// 	}
+
+	// 	protected override void UnsubscribeFromEvents ()
+	// 	{
+	// 		base.UnsubscribeFromEvents ();
+	// 		TextView.VisualElement.LostKeyboardFocus -= HandleWpfLostKeyboardFocus;
+	// 	}
+
+	// 	void HandleWpfLostKeyboardFocus (object sender, KeyboardFocusChangedEventArgs e)
+	// 		=> Components.Commands.CommandManager.LastFocusedWpfElement = TextView.VisualElement;
+
+	// 	protected override void OnDispose ()
+	// 	{
+	// 		base.OnDispose ();
+	// 		if (wpfTextViewHost != null) {
+	// 			wpfTextViewHost.Close ();
+	// 			wpfTextViewHost = null;
+	// 		}
+	// 	}
+
+	// 	#region IZoomable
+
+	// 	// the base TextViewContent impl of IZoomable doesn't work on Windows as it requires IEditorOperations4
+
+	// 	const double MAX_ZOOM = 400.0;
+	// 	const double MIN_ZOOM = 20.0;
+	// 	const double DEFAULT_ZOOM = 100.0;
+
+	// 	bool IsZoomable => TextView.Roles.Contains (PredefinedTextViewRoles.Zoomable);
+
+	// 	public bool EnableZoomIn => IsZoomable && TextView.ZoomLevel < MAX_ZOOM;
+
+	// 	public bool EnableZoomOut => IsZoomable && TextView.ZoomLevel < MIN_ZOOM;
+
+	// 	public bool EnableZoomReset => IsZoomable && TextView.ZoomLevel != DEFAULT_ZOOM;
+
+	// 	public void ZoomIn () => EditorOperations.ZoomIn ();
+
+	// 	public void ZoomOut () => EditorOperations.ZoomOut ();
+
+	// 	public void ZoomReset () => EditorOperations.ZoomTo (DEFAULT_ZOOM);
+
+	// 	#endregion
+	// }
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewDisplayBinding.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewDisplayBinding.cs
index 9791ceb6767..9da68542d3b 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/WpfTextViewDisplayBinding.cs
@@ -26,47 +26,47 @@
 
 using Microsoft.VisualStudio.Text.Classification;
 
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Documents;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.TextEditor
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Documents;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.TextEditor
 {
-	[ExportDocumentControllerFactory (FileExtension = "*", InsertBefore = "TextEditor")]
-	class WpfTextViewDisplayBinding : TextViewDisplayBinding<WpfTextViewImports>
-	{
-		static WpfTextViewDisplayBinding ()
-		{
-			AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
-		}
+	//[ExportDocumentControllerFactory (FileExtension = "*", InsertBefore = "TextEditor")]
+	// class WpfTextViewDisplayBinding : TextViewDisplayBinding<WpfTextViewImports>
+	// {
+	// 	static WpfTextViewDisplayBinding ()
+	// 	{
+	// 		AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
+	// 	}
+
+	// 	private static Assembly OnAssemblyResolve (object sender, ResolveEventArgs args)
+	// 	{
+	// 		if (args.Name == "MonoDevelop.TextEditor.Wpf, Version=2.6.0, Culture=neutral") {
+	// 			return typeof (WpfTextViewDisplayBinding).Assembly;
+	// 		}
 
-		private static Assembly OnAssemblyResolve (object sender, ResolveEventArgs args)
-		{
-			if (args.Name == "MonoDevelop.TextEditor.Wpf, Version=2.6.0, Culture=neutral") {
-				return typeof (WpfTextViewDisplayBinding).Assembly;
-			}
+	// 		return null;
+	// 	}
 
-			return null;
-		}
+	// 	//protected override DocumentController CreateContent (WpfTextViewImports imports)
+	// 	//{
+	// 	//	return new WpfTextViewContent (imports);
+	// 	//}
 
-		protected override DocumentController CreateContent (WpfTextViewImports imports)
-		{
-			return new WpfTextViewContent (imports);
-		}
+	// 	protected override ThemeToClassification CreateThemeToClassification (IEditorFormatMapService editorFormatMapService)
+	// 		=> new WpfThemeToClassification (editorFormatMapService);
+	// }
 
-		protected override ThemeToClassification CreateThemeToClassification (IEditorFormatMapService editorFormatMapService)
-			=> new WpfThemeToClassification (editorFormatMapService);
-	}
-
-	class WpfThemeToClassification : ThemeToClassification
-	{
-		public WpfThemeToClassification (IEditorFormatMapService editorFormatMapService) : base (editorFormatMapService) { }
+	// class WpfThemeToClassification : ThemeToClassification
+	// {
+	// 	public WpfThemeToClassification (IEditorFormatMapService editorFormatMapService) : base (editorFormatMapService) { }
 
-		protected override void AddFontToDictionary (ResourceDictionary resourceDictionary, string appearanceCategory, string fontName, double fontSize)
-		{
-			resourceDictionary[ClassificationFormatDefinition.TypefaceId] = new Typeface (fontName);
-			resourceDictionary[ClassificationFormatDefinition.FontRenderingSizeId] = fontSize * 96 / 72;
-		}
-	}
+	// 	protected override void AddFontToDictionary (ResourceDictionary resourceDictionary, string appearanceCategory, string fontName, double fontSize)
+	// 	{
+	// 		resourceDictionary[ClassificationFormatDefinition.TypefaceId] = new Typeface (fontName);
+	// 		resourceDictionary[ClassificationFormatDefinition.FontRenderingSizeId] = fontSize * 96 / 72;
+	// 	}
+	// }
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/EditorCommandHandlers.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/EditorCommandHandlers.cs
index 6b735fe27ee..a77cef386b2 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/EditorCommandHandlers.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/EditorCommandHandlers.cs
@@ -1 +1,497 @@
-//REMOVED
+//
+// Copyright (c) Microsoft Corp. (https://www.microsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Commanding;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
+using Microsoft.VisualStudio.Text.Operations;
+using Microsoft.VisualStudio.Utilities;
+using MonoDevelop.Components.Extensions;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Desktop;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.TextEditor.Cocoa
+{
+    [Name("Standalone Editor command handlers")]
+    [ContentType("any")]
+    [Order(After = DefaultOrderings.Lowest)]
+    [Export(typeof(ICommandHandler))]
+    class EditorCommandHandlers :
+        ICommandHandler<BackspaceKeyCommandArgs>,
+        ICommandHandler<BackTabKeyCommandArgs>,
+        ICommandHandler<CutCommandArgs>,
+        ICommandHandler<CopyCommandArgs>,
+        ICommandHandler<DeleteKeyCommandArgs>,
+        ICommandHandler<DownKeyCommandArgs>,
+        ICommandHandler<EscapeKeyCommandArgs>,
+        ICommandHandler<InsertSnippetCommandArgs>,
+        ICommandHandler<LeftKeyCommandArgs>,
+        ICommandHandler<LineEndCommandArgs>,
+        ICommandHandler<LineEndExtendCommandArgs>,
+        ICommandHandler<LineStartCommandArgs>,
+        ICommandHandler<LineStartExtendCommandArgs>,
+        ICommandHandler<MoveSelectedLinesDownCommandArgs>,
+        ICommandHandler<MoveSelectedLinesUpCommandArgs>,
+        ICommandHandler<PageDownKeyCommandArgs>,
+        ICommandHandler<PageUpKeyCommandArgs>,
+        ICommandHandler<PasteCommandArgs>,
+        ICommandHandler<RedoCommandArgs>,
+        ICommandHandler<RenameCommandArgs>,
+        ICommandHandler<ReturnKeyCommandArgs>,
+        ICommandHandler<RightKeyCommandArgs>,
+        ICommandHandler<SaveCommandArgs>,
+        ICommandHandler<SelectAllCommandArgs>,
+        ICommandHandler<SurroundWithCommandArgs>,
+        ICommandHandler<TabKeyCommandArgs>,
+        ICommandHandler<ToggleCompletionModeCommandArgs>,
+        ICommandHandler<TypeCharCommandArgs>,
+        ICommandHandler<UndoCommandArgs>,
+        ICommandHandler<UpKeyCommandArgs>,
+        ICommandHandler<WordDeleteToEndCommandArgs>,
+        ICommandHandler<WordDeleteToStartCommandArgs>,
+        ICommandHandler<FindReferencesCommandArgs>,
+        ICommandHandler<OpenLineAboveCommandArgs>,
+        ICommandHandler<OpenLineBelowCommandArgs>
+    {
+        [Import]
+        private IEditorOperationsFactoryService OperationsService { get; set; }
+
+        [Import]
+        private ITextUndoHistoryRegistry _undoHistoryRegistry { get; set; }
+
+        string INamed.DisplayName => "Standalone Editor command handlers";
+
+        public IEditorOperations3 GetOperations (ITextView textView)
+        {
+            return (IEditorOperations3)OperationsService.GetEditorOperations(textView);
+        }
+
+        /// <summary>
+        /// Returns<see cref="CommandState.Available"/> if <paramref name = "textView" /> has <see cref="PredefinedTextViewRoles.Editable"/>
+        /// among <see cref="ITextView.Roles"/>, or <see cref="CommandState.Unavailable"/> otherwise.
+        /// </summary>
+        private static CommandState AvailableInEditableView(ITextView textView)
+        {
+            return textView.Roles.Contains(PredefinedTextViewRoles.Editable) ? CommandState.Available : CommandState.Unavailable;
+        }
+
+        bool ICommandHandler<ReturnKeyCommandArgs>.ExecuteCommand(ReturnKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).InsertNewLine();
+            return true;
+        }
+
+        CommandState ICommandHandler<ReturnKeyCommandArgs>.GetCommandState(ReturnKeyCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<TypeCharCommandArgs>.ExecuteCommand(TypeCharCommandArgs args, CommandExecutionContext executionContext)
+        {
+            if (args.TypedChar == '\0')
+                return false;
+
+            GetOperations(args.TextView).InsertText(args.TypedChar.ToString());
+            return true;
+        }
+
+        CommandState ICommandHandler<TypeCharCommandArgs>.GetCommandState(TypeCharCommandArgs args)
+        {
+            return args.TypedChar == '\0' ? CommandState.Unavailable : AvailableInEditableView(args.TextView);
+        }
+
+        CommandState ICommandHandler<BackspaceKeyCommandArgs>.GetCommandState(BackspaceKeyCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<BackspaceKeyCommandArgs>.ExecuteCommand(BackspaceKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).Backspace();
+            return true;
+        }
+
+        CommandState ICommandHandler<BackTabKeyCommandArgs>.GetCommandState(BackTabKeyCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<BackTabKeyCommandArgs>.ExecuteCommand(BackTabKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).Unindent();
+            return true;
+        }
+
+        CommandState ICommandHandler<CutCommandArgs>.GetCommandState(CutCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<CutCommandArgs>.ExecuteCommand(CutCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).CutSelection();
+            return true;
+        }
+
+        CommandState ICommandHandler<CopyCommandArgs>.GetCommandState(CopyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<CopyCommandArgs>.ExecuteCommand(CopyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).CopySelection();
+            return true;
+        }
+
+        CommandState ICommandHandler<DeleteKeyCommandArgs>.GetCommandState(DeleteKeyCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<DeleteKeyCommandArgs>.ExecuteCommand(DeleteKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).Delete();
+            return true;
+        }
+
+        CommandState ICommandHandler<DownKeyCommandArgs>.GetCommandState(DownKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<DownKeyCommandArgs>.ExecuteCommand(DownKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveLineDown(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<EscapeKeyCommandArgs>.GetCommandState(EscapeKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<EscapeKeyCommandArgs>.ExecuteCommand(EscapeKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).ResetSelection();
+            return true;
+        }
+
+        CommandState ICommandHandler<InsertSnippetCommandArgs>.GetCommandState(InsertSnippetCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<InsertSnippetCommandArgs>.ExecuteCommand(InsertSnippetCommandArgs args, CommandExecutionContext executionContext)
+        {
+            // Do nothing. We merely enable others to call this command
+            return true;
+        }
+
+        CommandState ICommandHandler<LeftKeyCommandArgs>.GetCommandState(LeftKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<LeftKeyCommandArgs>.ExecuteCommand(LeftKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveToPreviousCharacter(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<LineEndCommandArgs>.GetCommandState(LineEndCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<LineEndCommandArgs>.ExecuteCommand(LineEndCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveToEndOfLine(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<LineEndExtendCommandArgs>.GetCommandState(LineEndExtendCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<LineEndExtendCommandArgs>.ExecuteCommand(LineEndExtendCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveToEndOfLine(extendSelection: true);
+            return true;
+        }
+
+        CommandState ICommandHandler<LineStartCommandArgs>.GetCommandState(LineStartCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<LineStartCommandArgs>.ExecuteCommand(LineStartCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveToHome(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<LineStartExtendCommandArgs>.GetCommandState(LineStartExtendCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<LineStartExtendCommandArgs>.ExecuteCommand(LineStartExtendCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveToStartOfLine(extendSelection: true);
+            return true;
+        }
+
+        CommandState ICommandHandler<MoveSelectedLinesDownCommandArgs>.GetCommandState(MoveSelectedLinesDownCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<MoveSelectedLinesDownCommandArgs>.ExecuteCommand(MoveSelectedLinesDownCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations (args.TextView).MoveSelectedLinesDown ();
+            return true;
+        }
+
+        CommandState ICommandHandler<MoveSelectedLinesUpCommandArgs>.GetCommandState(MoveSelectedLinesUpCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<MoveSelectedLinesUpCommandArgs>.ExecuteCommand(MoveSelectedLinesUpCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations (args.TextView).MoveSelectedLinesUp ();
+            return true;
+        }
+
+        CommandState ICommandHandler<PageDownKeyCommandArgs>.GetCommandState(PageDownKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<PageDownKeyCommandArgs>.ExecuteCommand(PageDownKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).PageDown(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<PageUpKeyCommandArgs>.GetCommandState(PageUpKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<PageUpKeyCommandArgs>.ExecuteCommand(PageUpKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).PageUp(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<PasteCommandArgs>.GetCommandState(PasteCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<PasteCommandArgs>.ExecuteCommand(PasteCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).Paste();
+            return true;
+        }
+
+        CommandState ICommandHandler<RedoCommandArgs>.GetCommandState(RedoCommandArgs args)
+        {
+            return GetUndoHistory(args.TextView).CanRedo ? CommandState.Available : CommandState.Unavailable;
+        }
+
+        bool ICommandHandler<RedoCommandArgs>.ExecuteCommand(RedoCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetUndoHistory(args.TextView).Redo(args.Count);
+            return true;
+        }
+
+        CommandState ICommandHandler<RenameCommandArgs>.GetCommandState(RenameCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<RenameCommandArgs>.ExecuteCommand(RenameCommandArgs args, CommandExecutionContext executionContext)
+        {
+            // Do nothing. We merely enable others to call this command
+            return true;
+        }
+
+        CommandState ICommandHandler<FindReferencesCommandArgs>.GetCommandState (FindReferencesCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<FindReferencesCommandArgs>.ExecuteCommand (FindReferencesCommandArgs args, CommandExecutionContext executionContext)
+        {
+            // Do nothing. We merely enable others to call this command
+            return true;
+        }
+
+        CommandState ICommandHandler<RightKeyCommandArgs>.GetCommandState(RightKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<RightKeyCommandArgs>.ExecuteCommand(RightKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveToNextCharacter(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<SaveCommandArgs>.GetCommandState(SaveCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<SaveCommandArgs>.ExecuteCommand(SaveCommandArgs args, CommandExecutionContext executionContext)
+        {
+            // Do nothing. We merely enable others to call this command
+            return true;
+        }
+
+        CommandState ICommandHandler<SelectAllCommandArgs>.GetCommandState(SelectAllCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<SelectAllCommandArgs>.ExecuteCommand(SelectAllCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).SelectAll();
+            return true;
+        }
+
+        CommandState ICommandHandler<SurroundWithCommandArgs>.GetCommandState(SurroundWithCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<SurroundWithCommandArgs>.ExecuteCommand(SurroundWithCommandArgs args, CommandExecutionContext executionContext)
+        {
+            // Do nothing. We merely enable others to call this command
+            return true;
+        }
+
+        CommandState ICommandHandler<TabKeyCommandArgs>.GetCommandState(TabKeyCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<TabKeyCommandArgs>.ExecuteCommand(TabKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).Indent();
+            return true;
+        }
+
+        CommandState ICommandHandler<ToggleCompletionModeCommandArgs>.GetCommandState(ToggleCompletionModeCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<ToggleCompletionModeCommandArgs>.ExecuteCommand(ToggleCompletionModeCommandArgs args, CommandExecutionContext executionContext)
+        {
+            // Do nothing. We merely enable others to call this command
+            return true;
+        }
+
+        private ITextUndoHistory GetUndoHistory(ITextView textView)
+        {
+            return _undoHistoryRegistry.GetHistory(textView.TextBuffer);
+        }
+
+        CommandState ICommandHandler<UndoCommandArgs>.GetCommandState(UndoCommandArgs args)
+        {
+            return GetUndoHistory(args.TextView).CanUndo ? CommandState.Available : CommandState.Unavailable;
+        }
+
+        bool ICommandHandler<UndoCommandArgs>.ExecuteCommand(UndoCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetUndoHistory(args.TextView).Undo(args.Count);
+            return true;
+        }
+
+        CommandState ICommandHandler<UpKeyCommandArgs>.GetCommandState(UpKeyCommandArgs args)
+        {
+            return CommandState.Available;
+        }
+
+        bool ICommandHandler<UpKeyCommandArgs>.ExecuteCommand(UpKeyCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).MoveLineUp(extendSelection: false);
+            return true;
+        }
+
+        CommandState ICommandHandler<WordDeleteToEndCommandArgs>.GetCommandState(WordDeleteToEndCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<WordDeleteToEndCommandArgs>.ExecuteCommand(WordDeleteToEndCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).DeleteToEndOfLine();
+            return true;
+        }
+
+        CommandState ICommandHandler<WordDeleteToStartCommandArgs>.GetCommandState(WordDeleteToStartCommandArgs args)
+        {
+            return AvailableInEditableView(args.TextView);
+        }
+
+        bool ICommandHandler<WordDeleteToStartCommandArgs>.ExecuteCommand(WordDeleteToStartCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations(args.TextView).DeleteToBeginningOfLine();
+            return true;
+        }
+
+        CommandState ICommandHandler<OpenLineAboveCommandArgs>.GetCommandState (OpenLineAboveCommandArgs args)
+        {
+            return AvailableInEditableView (args.TextView);
+        }
+
+        bool ICommandHandler<OpenLineAboveCommandArgs>.ExecuteCommand (OpenLineAboveCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations (args.TextView).OpenLineAbove ();
+            return true;
+        }
+
+        CommandState ICommandHandler<OpenLineBelowCommandArgs>.GetCommandState (OpenLineBelowCommandArgs args)
+        {
+            return AvailableInEditableView (args.TextView);
+        }
+
+        bool ICommandHandler<OpenLineBelowCommandArgs>.ExecuteCommand (OpenLineBelowCommandArgs args, CommandExecutionContext executionContext)
+        {
+            GetOperations (args.TextView).OpenLineBelow ();
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj
index 5ac943485bc..9c02643182f 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/MonoDevelop.TextEditor.csproj
@@ -12,10 +12,8 @@
   <ItemGroup>
     <!-- Add PublicKey to "InternalsVisibleTo" assemblies below in order to build with msbuild versions >= 16.9.0 -->
     <!-- This Key is extracted from main/external/mono-addins/mono-addins.snk (within the MonoDevelop solution) -->
-    <InternalsVisibleTo Include="MonoDevelop.TextEditor.Cocoa,
- PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
-    <InternalsVisibleTo Include="MonoDevelop.TextEditor.Wpf,
-	PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+    <InternalsVisibleTo Include="MonoDevelop.TextEditor.Cocoa" />
+    <InternalsVisibleTo Include="MonoDevelop.TextEditor.Wpf" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationCore" />
     <ProjectReference Include="..\..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj" Private="false" />
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs
index dd0b9f3d60f..e69de29bb2d 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs
@@ -1 +0,0 @@
-//REMOVED
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
index 7096621deca..507e63a831e 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
@@ -82,7 +82,9 @@
     <Compile Include="Gui\MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs" />
     <Compile Include="Gui\MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs" />
     <Compile Include="MonoDevelop.WebReferences\WebReferencesProjectExtension.cs" />
-    <Compile Include="MonoDevelop.WebReferences\MonoDevelopDiscoveryClientProtocol.cs" />
+    <Compile Include="MonoDevelop.WebReferences\MonoDevelopDiscoveryClientProtocol.cs">
+      <SubType>Component</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.WebReferences.addin.xml" />
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj
index 29ce33dd4dc..5871a2a298a 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.csproj
+++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj
@@ -55,7 +55,9 @@
     <Compile Include="Gui\ImportsOptionsPanel.cs" />
     <Compile Include="AddinInfo.cs" />
     <Compile Include="Project\VBProjectExtension.cs" />
-    <Compile Include="Project\ImprovedCodeDomProvider.cs" />
+    <Compile Include="Project\ImprovedCodeDomProvider.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="MonoDevelop.VBNet\VBNetTextEditorExtension.cs" />
     <Compile Include="Gui\MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs" />
     <Compile Include="Gui\MonoDevelop.VBNetBinding.ImportsOptionsPanelWidget.cs" />
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index 4ed1e937e1a..ef745b5c7be 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -56,6 +56,10 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+      <HintPath Condition="'$(OS)' == 'Windows_NT'">$(MSBuildProgramFiles32)\Mono\lib\mono\monodoc\monodoc.dll</HintPath>
+      <Private Condition="'$(OS)' == 'Windows_NT'">True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
     <Reference Include="System.ServiceModel" />
@@ -76,7 +80,6 @@
       <HintPath>$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <Reference Include="System" />
     <Reference Include="System.IO.FileSystem" />
     <Reference Include="System.IO.FileSystem.Primitives" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
index 959db38cb8b..906ca8e67db 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
@@ -23,1206 +23,1206 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Gtk;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Gtk;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
-using Mono.Addins;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Components.Commands.ExtensionNodes;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide;
+using Mono.Addins;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Components.Commands.ExtensionNodes;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Ide;
 using MonoDevelop.Ide.Commands;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.Components.MainToolbar
-{
-	[Serializable]
-	class MainToolbarController : ICommandBar
-	{
-		const string ToolbarExtensionPath = "/MonoDevelop/Ide/CommandBar";
-		const string TargetsMenuPath = "/MonoDevelop/Ide/TargetSelectorCommands";
-
-		internal IMainToolbarView ToolbarView {
-			get;
-			private set;
-		}
-
-		internal StatusBar StatusBar {
-			get { return ToolbarView.StatusBar; }
-		}
-
-		readonly ConfigurationProperty<bool> searchForMembers = ConfigurationProperty.Create ("MainToolbar.Search.IncludeMembers", true);
-		bool SearchForMembers {
-			get { return searchForMembers; }
-			set { searchForMembers.Value = value; }
-		}
-
-		Dictionary<SolutionItem, ConfigurationMerger> configurationMergers = new Dictionary<SolutionItem, ConfigurationMerger> ();
-		int ignoreConfigurationChangedCount, ignoreRuntimeChangedCount;
-		Solution currentSolution;
-		bool settingGlobalConfig;
-		Tuple<SolutionItem, SolutionItemRunConfiguration> [] startupProjects = new Tuple<SolutionItem, SolutionItemRunConfiguration> [0];
-		EventHandler executionTargetsChanged;
-
-		public MainToolbarController (IMainToolbarView toolbarView)
-		{
-			ToolbarView = toolbarView;
-			// Attach run button click handler.
-			toolbarView.RunButtonClicked += HandleStartButtonClicked;
-
-			// Register Search Entry handlers.
-			ToolbarView.SearchEntryChanged += HandleSearchEntryChanged;
-			ToolbarView.SearchEntryActivated += HandleSearchEntryActivated;
-			ToolbarView.SearchEntryKeyPressed += HandleSearchEntryKeyPressed;
-			ToolbarView.PerformCommand += HandleSearchEntryCommand;
-			ToolbarView.SearchEntryResized += (o, e) => PositionPopup ();
-			ToolbarView.SearchEntryLostFocus += (o, e) => {
-				ToolbarView.SearchText = "";
-				DestroyPopup ();
-			};
-
-			toolbarView.ConfigurationChanged += HandleConfigurationChanged;
-			toolbarView.RunConfigurationChanged += HandleRunConfigurationChanged;
-			toolbarView.RuntimeChanged += HandleRuntimeChanged;
-
-			IdeApp.Workbench.RootWindow.WidgetEvent += delegate(object o, WidgetEventArgs args) {
-				if (args.Event is Gdk.EventConfigure)
-					PositionPopup ();
-			};
-
-			// Update Search Entry on keybinding change.
-			var cmd = IdeApp.CommandService.GetCommand (Commands.NavigateTo);
-			cmd.KeyBindingChanged += delegate {
-				UpdateSearchEntryLabel ();
-			};
-
-			executionTargetsChanged = (sender, e) => UpdateCombos ();
-
-			IdeApp.ProjectOperations.CurrentSelectedSolutionChanged += HandleCurrentSelectedSolutionChanged;
-
-			IdeApp.Workspace.FirstWorkspaceItemRestored += (sender, e) => {
-				IdeApp.Workspace.ConfigurationsChanged += HandleUpdateCombos;
-				IdeApp.Workspace.ActiveConfigurationChanged += HandleUpdateCombos;
-
-				IdeApp.Workspace.SolutionLoaded += HandleSolutionLoaded;
-				IdeApp.Workspace.SolutionUnloaded += HandleUpdateCombos;
-				IdeApp.ProjectOperations.CurrentSelectedSolutionChanged += HandleUpdateCombos;
-
-				UpdateCombos ();
-			};
-
-			IdeApp.Workspace.LastWorkspaceItemClosed += (sender, e) => {
-				IdeApp.Workspace.ConfigurationsChanged -= HandleUpdateCombos;
-				IdeApp.Workspace.ActiveConfigurationChanged -= HandleUpdateCombos;
-
-				IdeApp.Workspace.SolutionLoaded -= HandleSolutionLoaded;
-				IdeApp.Workspace.SolutionUnloaded -= HandleUpdateCombos;
-
-				IdeApp.ProjectOperations.CurrentSelectedSolutionChanged -= HandleUpdateCombos;
-
-				StatusBar.ShowReady ();
-			};
-
-			AddinManager.ExtensionChanged += OnExtensionChanged;
-		}
-
-		public void Initialize ()
-		{
-			var items = new[] {
-				new SearchMenuModel (GettextCatalog.GetString ("Search Files"), "file"),
-				new SearchMenuModel (GettextCatalog.GetString ("Search Types"), "type"),
-				new SearchMenuModel (GettextCatalog.GetString ("Search Members"), "member"),
-				new SearchMenuModel (GettextCatalog.GetString ("Search Commands"), "command"),
-			};
-
-			// Attach menu category handlers.
-			foreach (var item in items)
-				item.Activated += (o, e) => SetSearchCategory (item.Category);
-			ToolbarView.SearchMenuItems = items;
-
-			// Update Search Entry label initially.
-			UpdateSearchEntryLabel ();
-
-			// Rebuild the button bars.
-			RebuildToolbar ();
-
-			UpdateCombos ();
-
-			// Register this controller as a commandbar.
-			IdeApp.CommandService.RegisterCommandBar (this);
-		}
-
-		void UpdateCombos ()
-		{
-			if (settingGlobalConfig)
-				return;
-
-			ignoreConfigurationChangedCount++;
-			try {
-				if (!IdeApp.Workspace.IsOpen) {
-					configurationMergers.Clear ();
-					ToolbarView.ConfigurationModel = Enumerable.Empty<IConfigurationModel> ();
-					ToolbarView.RuntimeModel = Enumerable.Empty<IRuntimeModel> ();
-					ToolbarView.RunConfigurationModel = Enumerable.Empty<IRunConfigurationModel> ();
-					ToolbarView.RunConfigurationVisible = false;
-					return;
-				}
-				if (currentSolution != null)
-					ToolbarView.RunConfigurationModel = currentSolution.GetRunConfigurations ().Select (rc => new RunConfigurationModel (rc)).ToArray ();
-				else
-					ToolbarView.RunConfigurationModel = Enumerable.Empty<IRunConfigurationModel> ();
-				SelectActiveRunConfiguration ();
-				TrackStartupProject ();
-				configurationMergers = new Dictionary<SolutionItem, ConfigurationMerger> ();
-				foreach (var project in startupProjects) {
-					var configurationMerger = new ConfigurationMerger ();
-					configurationMerger.Load (currentSolution, project.Item1, project.Item2);
-					configurationMergers [project.Item1] = configurationMerger;
-				}
-				if (configurationMergers.Count == 1)
-					ToolbarView.ConfigurationModel = configurationMergers.First ().Value.SolutionConfigurations
-						.Distinct ()
-						.Select (conf => new ConfigurationModel (conf));
-				else
-					ToolbarView.ConfigurationModel = currentSolution?.Configurations.OfType<SolutionConfiguration> ()
-						.Select (conf => new ConfigurationModel (conf.Id)) ?? new ConfigurationModel [0];
-				
-			} finally {
-				ignoreConfigurationChangedCount--;
-			}
-
-			ToolbarView.RunConfigurationVisible = ToolbarView.RunConfigurationModel.Count () > 1;
-
-			FillRuntimes ();
-			SelectActiveConfiguration ();
-		}
-
-		void FillRuntimes ()
-		{
-			ignoreRuntimeChangedCount++;
-			try {
-				ToolbarView.RuntimeModel = Enumerable.Empty<IRuntimeModel> ();
-				if (!IdeApp.Workspace.IsOpen || currentSolution == null)
-					return;
-				var list = new List<RuntimeModel> ();
-				int runtimes = 0;
-				if (currentSolution.StartupConfiguration is MultiItemSolutionRunConfiguration) {
-					bool anyValid = false;
-					foreach (var startConf in ((MultiItemSolutionRunConfiguration)currentSolution.StartupConfiguration).Items) {
-						if (startConf?.SolutionItem == null)
-							continue;
-
-						// Check that the current startup project is enabled for the current configuration
-						var solConf = currentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-						if (solConf == null || !solConf.BuildEnabledForItem (startConf.SolutionItem))
-							continue;
-						anyValid = true;
-						var projectList = new List<RuntimeModel> ();
-						FillRuntimesForProject (projectList, startConf.SolutionItem, ref runtimes);
-						var parent = new RuntimeModel (this, startConf.SolutionItem.Name);
-						parent.HasChildren = true;
-						list.Add (parent);
-						foreach (var p in projectList) {
-							parent.AddChild (p);
-						}
-					}
-					if (!anyValid)
-						return;
-				} else {
-					var startConf = currentSolution.StartupConfiguration as SingleItemSolutionRunConfiguration;
-					if (startConf == null || startConf.Item == null)
-						return;
-
-					// Check that the current startup project is enabled for the current configuration
-					var solConf = currentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-					if (solConf == null || !solConf.BuildEnabledForItem (startConf.Item))
-						return;
-					FillRuntimesForProject (list, startConf.Item, ref runtimes);
-				}
-
-
-				var cmds = IdeApp.CommandService.CreateCommandEntrySet (TargetsMenuPath);
-				if (cmds.Count > 0) {
-					bool needsSeparator = runtimes > 0;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.Components.MainToolbar
+{
+	[Serializable]
+	class MainToolbarController : ICommandBar
+	{
+		const string ToolbarExtensionPath = "/MonoDevelop/Ide/CommandBar";
+		const string TargetsMenuPath = "/MonoDevelop/Ide/TargetSelectorCommands";
+
+		internal IMainToolbarView ToolbarView {
+			get;
+			private set;
+		}
+
+		internal StatusBar StatusBar {
+			get { return ToolbarView.StatusBar; }
+		}
+
+		readonly ConfigurationProperty<bool> searchForMembers = ConfigurationProperty.Create ("MainToolbar.Search.IncludeMembers", true);
+		bool SearchForMembers {
+			get { return searchForMembers; }
+			set { searchForMembers.Value = value; }
+		}
+
+		Dictionary<SolutionItem, ConfigurationMerger> configurationMergers = new Dictionary<SolutionItem, ConfigurationMerger> ();
+		int ignoreConfigurationChangedCount, ignoreRuntimeChangedCount;
+		Solution currentSolution;
+		bool settingGlobalConfig;
+		Tuple<SolutionItem, SolutionItemRunConfiguration> [] startupProjects = new Tuple<SolutionItem, SolutionItemRunConfiguration> [0];
+		EventHandler executionTargetsChanged;
+
+		public MainToolbarController (IMainToolbarView toolbarView)
+		{
+			ToolbarView = toolbarView;
+			// Attach run button click handler.
+			toolbarView.RunButtonClicked += HandleStartButtonClicked;
+
+			// Register Search Entry handlers.
+			ToolbarView.SearchEntryChanged += HandleSearchEntryChanged;
+			ToolbarView.SearchEntryActivated += HandleSearchEntryActivated;
+			ToolbarView.SearchEntryKeyPressed += HandleSearchEntryKeyPressed;
+			ToolbarView.PerformCommand += HandleSearchEntryCommand;
+			ToolbarView.SearchEntryResized += (o, e) => PositionPopup ();
+			ToolbarView.SearchEntryLostFocus += (o, e) => {
+				ToolbarView.SearchText = "";
+				DestroyPopup ();
+			};
+
+			toolbarView.ConfigurationChanged += HandleConfigurationChanged;
+			toolbarView.RunConfigurationChanged += HandleRunConfigurationChanged;
+			toolbarView.RuntimeChanged += HandleRuntimeChanged;
+
+			IdeApp.Workbench.RootWindow.WidgetEvent += delegate(object o, WidgetEventArgs args) {
+				if (args.Event is Gdk.EventConfigure)
+					PositionPopup ();
+			};
+
+			// Update Search Entry on keybinding change.
+			var cmd = IdeApp.CommandService.GetCommand (Commands.NavigateTo);
+			cmd.KeyBindingChanged += delegate {
+				UpdateSearchEntryLabel ();
+			};
+
+			executionTargetsChanged = (sender, e) => UpdateCombos ();
+
+			IdeApp.ProjectOperations.CurrentSelectedSolutionChanged += HandleCurrentSelectedSolutionChanged;
+
+			IdeApp.Workspace.FirstWorkspaceItemRestored += (sender, e) => {
+				IdeApp.Workspace.ConfigurationsChanged += HandleUpdateCombos;
+				IdeApp.Workspace.ActiveConfigurationChanged += HandleUpdateCombos;
+
+				IdeApp.Workspace.SolutionLoaded += HandleSolutionLoaded;
+				IdeApp.Workspace.SolutionUnloaded += HandleUpdateCombos;
+				IdeApp.ProjectOperations.CurrentSelectedSolutionChanged += HandleUpdateCombos;
+
+				UpdateCombos ();
+			};
+
+			IdeApp.Workspace.LastWorkspaceItemClosed += (sender, e) => {
+				IdeApp.Workspace.ConfigurationsChanged -= HandleUpdateCombos;
+				IdeApp.Workspace.ActiveConfigurationChanged -= HandleUpdateCombos;
+
+				IdeApp.Workspace.SolutionLoaded -= HandleSolutionLoaded;
+				IdeApp.Workspace.SolutionUnloaded -= HandleUpdateCombos;
+
+				IdeApp.ProjectOperations.CurrentSelectedSolutionChanged -= HandleUpdateCombos;
+
+				StatusBar.ShowReady ();
+			};
+
+			AddinManager.ExtensionChanged += OnExtensionChanged;
+		}
+
+		public void Initialize ()
+		{
+			var items = new[] {
+				new SearchMenuModel (GettextCatalog.GetString ("Search Files"), "file"),
+				new SearchMenuModel (GettextCatalog.GetString ("Search Types"), "type"),
+				new SearchMenuModel (GettextCatalog.GetString ("Search Members"), "member"),
+				new SearchMenuModel (GettextCatalog.GetString ("Search Commands"), "command"),
+			};
+
+			// Attach menu category handlers.
+			foreach (var item in items)
+				item.Activated += (o, e) => SetSearchCategory (item.Category);
+			ToolbarView.SearchMenuItems = items;
+
+			// Update Search Entry label initially.
+			UpdateSearchEntryLabel ();
+
+			// Rebuild the button bars.
+			RebuildToolbar ();
+
+			UpdateCombos ();
+
+			// Register this controller as a commandbar.
+			IdeApp.CommandService.RegisterCommandBar (this);
+		}
+
+		void UpdateCombos ()
+		{
+			if (settingGlobalConfig)
+				return;
+
+			ignoreConfigurationChangedCount++;
+			try {
+				if (!IdeApp.Workspace.IsOpen) {
+					configurationMergers.Clear ();
+					ToolbarView.ConfigurationModel = Enumerable.Empty<IConfigurationModel> ();
+					ToolbarView.RuntimeModel = Enumerable.Empty<IRuntimeModel> ();
+					ToolbarView.RunConfigurationModel = Enumerable.Empty<IRunConfigurationModel> ();
+					ToolbarView.RunConfigurationVisible = false;
+					return;
+				}
+				if (currentSolution != null)
+					ToolbarView.RunConfigurationModel = currentSolution.GetRunConfigurations ().Select (rc => new RunConfigurationModel (rc)).ToArray ();
+				else
+					ToolbarView.RunConfigurationModel = Enumerable.Empty<IRunConfigurationModel> ();
+				SelectActiveRunConfiguration ();
+				TrackStartupProject ();
+				configurationMergers = new Dictionary<SolutionItem, ConfigurationMerger> ();
+				foreach (var project in startupProjects) {
+					var configurationMerger = new ConfigurationMerger ();
+					configurationMerger.Load (currentSolution, project.Item1, project.Item2);
+					configurationMergers [project.Item1] = configurationMerger;
+				}
+				if (configurationMergers.Count == 1)
+					ToolbarView.ConfigurationModel = configurationMergers.First ().Value.SolutionConfigurations
+						.Distinct ()
+						.Select (conf => new ConfigurationModel (conf));
+				else
+					ToolbarView.ConfigurationModel = currentSolution?.Configurations.OfType<SolutionConfiguration> ()
+						.Select (conf => new ConfigurationModel (conf.Id)) ?? new ConfigurationModel [0];
+				
+			} finally {
+				ignoreConfigurationChangedCount--;
+			}
+
+			ToolbarView.RunConfigurationVisible = ToolbarView.RunConfigurationModel.Count () > 1;
+
+			FillRuntimes ();
+			SelectActiveConfiguration ();
+		}
+
+		void FillRuntimes ()
+		{
+			ignoreRuntimeChangedCount++;
+			try {
+				ToolbarView.RuntimeModel = Enumerable.Empty<IRuntimeModel> ();
+				if (!IdeApp.Workspace.IsOpen || currentSolution == null)
+					return;
+				var list = new List<RuntimeModel> ();
+				int runtimes = 0;
+				if (currentSolution.StartupConfiguration is MultiItemSolutionRunConfiguration) {
+					bool anyValid = false;
+					foreach (var startConf in ((MultiItemSolutionRunConfiguration)currentSolution.StartupConfiguration).Items) {
+						if (startConf?.SolutionItem == null)
+							continue;
+
+						// Check that the current startup project is enabled for the current configuration
+						var solConf = currentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
+						if (solConf == null || !solConf.BuildEnabledForItem (startConf.SolutionItem))
+							continue;
+						anyValid = true;
+						var projectList = new List<RuntimeModel> ();
+						FillRuntimesForProject (projectList, startConf.SolutionItem, ref runtimes);
+						var parent = new RuntimeModel (this, startConf.SolutionItem.Name);
+						parent.HasChildren = true;
+						list.Add (parent);
+						foreach (var p in projectList) {
+							parent.AddChild (p);
+						}
+					}
+					if (!anyValid)
+						return;
+				} else {
+					var startConf = currentSolution.StartupConfiguration as SingleItemSolutionRunConfiguration;
+					if (startConf == null || startConf.Item == null)
+						return;
+
+					// Check that the current startup project is enabled for the current configuration
+					var solConf = currentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
+					if (solConf == null || !solConf.BuildEnabledForItem (startConf.Item))
+						return;
+					FillRuntimesForProject (list, startConf.Item, ref runtimes);
+				}
+
+
+				var cmds = IdeApp.CommandService.CreateCommandEntrySet (TargetsMenuPath);
+				if (cmds.Count > 0) {
+					bool needsSeparator = runtimes > 0;
 					var an = DockNotebook.DockNotebook.ActiveNotebook;
-					foreach (CommandEntry ce in cmds) {
-						if (ce.CommandId == Command.Separator) {
-							needsSeparator = true;
-							continue;
-						}
-						var cmd = ce.GetCommand (IdeApp.CommandService) as ActionCommand;
-						if (cmd != null) {
+					foreach (CommandEntry ce in cmds) {
+						if (ce.CommandId == Command.Separator) {
+							needsSeparator = true;
+							continue;
+						}
+						var cmd = ce.GetCommand (IdeApp.CommandService) as ActionCommand;
+						if (cmd != null) {
 							var ci = IdeApp.CommandService.GetCommandInfo (cmd.Id, new CommandTargetRoute (lastCommandTarget));
-							if (ci.Visible) {
-								if (needsSeparator) {
-									list.Add (new RuntimeModel (this, displayText: null));
-									needsSeparator = false;
-								}
-								list.Add (new RuntimeModel (this, cmd));
-								runtimes++;
-							}
-						}
+							if (ci.Visible) {
+								if (needsSeparator) {
+									list.Add (new RuntimeModel (this, displayText: null));
+									needsSeparator = false;
+								}
+								list.Add (new RuntimeModel (this, cmd));
+								runtimes++;
+							}
+						}
+					}
+					DockNotebook.DockNotebook.ActiveNotebook = an;
+				}
+
+				ToolbarView.PlatformSensitivity = runtimes > 1;
+				ToolbarView.RuntimeModel = list;
+			} finally {
+				ignoreRuntimeChangedCount--;
+			}
+		}
+
+		void FillRuntimesForProject (List<RuntimeModel> list, SolutionItem project, ref int runtimes)
+		{
+			ExecutionTarget previous = null;
+
+			foreach (var target in configurationMergers [project].GetTargetsForConfiguration (IdeApp.Workspace.ActiveConfigurationId, configurationMergers.Count < 2)) {
+				if (target is ExecutionTargetGroup) {
+					var devices = (ExecutionTargetGroup)target;
+
+					if (previous != null)
+						list.Add (new RuntimeModel (this, displayText: null));//Seperator
+
+					list.Add (new RuntimeModel (this, target, true, project));
+					foreach (var device in devices) {
+						if (device is ExecutionTargetGroup) {
+							var versions = (ExecutionTargetGroup)device;
+
+							if (versions.Count > 1) {
+								var parent = new RuntimeModel (this, device, true, project) {
+									IsIndented = true,
+								};
+								list.Add (parent);
+
+								foreach (var version in versions) {
+									parent.AddChild (new RuntimeModel (this, version, false, project));
+									runtimes++;
+								}
+							} else {
+								list.Add (new RuntimeModel (this, versions [0], true, project) {
+									IsIndented = true,
+								});
+								runtimes++;
+							}
+						} else {
+							list.Add (new RuntimeModel (this, device, true, project) {
+								IsIndented = true,
+							});
+							runtimes++;
+						}
 					}
-					DockNotebook.DockNotebook.ActiveNotebook = an;
-				}
-
-				ToolbarView.PlatformSensitivity = runtimes > 1;
-				ToolbarView.RuntimeModel = list;
-			} finally {
-				ignoreRuntimeChangedCount--;
-			}
-		}
-
-		void FillRuntimesForProject (List<RuntimeModel> list, SolutionItem project, ref int runtimes)
-		{
-			ExecutionTarget previous = null;
-
-			foreach (var target in configurationMergers [project].GetTargetsForConfiguration (IdeApp.Workspace.ActiveConfigurationId, configurationMergers.Count < 2)) {
-				if (target is ExecutionTargetGroup) {
-					var devices = (ExecutionTargetGroup)target;
-
-					if (previous != null)
-						list.Add (new RuntimeModel (this, displayText: null));//Seperator
-
-					list.Add (new RuntimeModel (this, target, true, project));
-					foreach (var device in devices) {
-						if (device is ExecutionTargetGroup) {
-							var versions = (ExecutionTargetGroup)device;
-
-							if (versions.Count > 1) {
-								var parent = new RuntimeModel (this, device, true, project) {
-									IsIndented = true,
-								};
-								list.Add (parent);
-
-								foreach (var version in versions) {
-									parent.AddChild (new RuntimeModel (this, version, false, project));
-									runtimes++;
-								}
-							} else {
-								list.Add (new RuntimeModel (this, versions [0], true, project) {
-									IsIndented = true,
-								});
-								runtimes++;
-							}
-						} else {
-							list.Add (new RuntimeModel (this, device, true, project) {
-								IsIndented = true,
-							});
-							runtimes++;
-						}
-					}
-				} else {
-					if (previous is ExecutionTargetGroup) {
-						list.Add (new RuntimeModel (this, displayText: null));//Seperator
-					}
-
-					list.Add (new RuntimeModel (this, target, true, project));
-					runtimes++;
-				}
-
-				previous = target;
-			}
-		}
-
-		void HandleRuntimeChanged (object sender, HandledEventArgs e)
-		{
-			if (ignoreRuntimeChangedCount == 0) {
-				var runtime = (RuntimeModel)ToolbarView.ActiveRuntime;
-				if (runtime != null && runtime.Command != null) {
-					e.Handled = runtime.NotifyActivated ();
-					return;
-				}
-
-				NotifyConfigurationChange ();
-				SelectActiveRuntime (runtime);
-			}
-		}
-
-		void HandleConfigurationChanged (object sender, EventArgs e)
-		{
-			if (ignoreConfigurationChangedCount == 0)
-				NotifyConfigurationChange ();
-		}
-
-		void HandleRunConfigurationChanged (object sender, EventArgs e)
-		{
-			if (ignoreConfigurationChangedCount == 0)
-				NotifyRunConfigurationChange ();
-		}
-
-		void UpdateBuildConfiguration ()
-		{
-			var config = ToolbarView.ActiveConfiguration;
-			if (config == null)
-				return;
-			if (configurationMergers.Count > 1 || configurationMergers.Count == 0) {
-				settingGlobalConfig = true;
-				try {
-					IdeApp.Workspace.ActiveConfigurationId = config.OriginalId;
-				} finally {
-					settingGlobalConfig = false;
-				}
-				return;
-			}
-
-			ExecutionTarget newTarget;
-			string fullConfig;
-
-			var runtime = (RuntimeModel)ToolbarView.ActiveRuntime;
-			configurationMergers.Values.First ().ResolveConfiguration (config.OriginalId, runtime != null ? runtime.ExecutionTarget : null, out fullConfig, out newTarget);
-			settingGlobalConfig = true;
-			try {
-				IdeApp.Workspace.ActiveExecutionTarget = newTarget;
-				IdeApp.Workspace.ActiveConfigurationId = fullConfig;
-			} finally {
-				settingGlobalConfig = false;
-			}
-		}
-
-		void NotifyConfigurationChange ()
-		{
-			if (ToolbarView.ActiveConfiguration == null)
-				return;
-
-			UpdateBuildConfiguration ();
-
-			FillRuntimes ();
-			SelectActiveRuntime (ToolbarView.ActiveRuntime as RuntimeModel);
-		}
-
-		void NotifyRunConfigurationChange ()
-		{
-			if (ToolbarView.ActiveRunConfiguration == null)
-				return;
-
-			var model = (RunConfigurationModel)ToolbarView.ActiveRunConfiguration;
-			currentSolution.StartupConfiguration = model.RunConfiguration;
-		}
-
-		void SelectActiveRunConfiguration ()
-		{
-			var sconf = currentSolution?.StartupConfiguration;
-			var confs = ToolbarView.RunConfigurationModel.Cast<RunConfigurationModel> ().ToList ();
-			if (confs.Count > 0) {
-				bool selected = false;
-
-				foreach (var item in confs) {
-					if (item.RunConfiguration.Id == sconf?.Id) {
-						ToolbarView.ActiveRunConfiguration = item;
-						selected = true;
-						break;
-					}
-				}
-
-				if (!selected) {
-					var defaultConfig = confs.First ();
-					ToolbarView.ActiveRunConfiguration = defaultConfig;
-					if (currentSolution != null)
-						currentSolution.StartupConfiguration = defaultConfig.RunConfiguration;
-				}
-			}
-		}
-
-		void SelectActiveConfiguration ()
-		{
-			var allNames = configurationMergers.Values.Select (cm => cm.GetUnresolvedConfiguration (IdeApp.Workspace.ActiveConfigurationId)).Distinct ();
-			string name;
-			if (allNames.Count () == 1)
-				name = allNames.First ();
-			else
-				name = IdeApp.Workspace.ActiveConfigurationId;
-
-			ignoreConfigurationChangedCount++;
-			try {
-				var confs = ToolbarView.ConfigurationModel.ToList ();
-				if (confs.Count > 0) {
-					string defaultConfig = ToolbarView.ActiveConfiguration != null ? ToolbarView.ActiveConfiguration.OriginalId : confs[0].OriginalId;
-					bool selected = false;
-
-					foreach (var item in confs) {
-						string config = item.OriginalId;
-						if (config == name) {
-							ToolbarView.ActiveConfiguration = item;
-							UpdateBuildConfiguration ();
-							selected = true;
-							break;
-						}
-					}
-
-					if (!selected) {
-						ToolbarView.ActiveConfiguration = ToolbarView.ConfigurationModel.First ();
-						UpdateBuildConfiguration ();
-					}
-				}
-			} finally {
-				ignoreConfigurationChangedCount--;
-			}
-
-			SelectActiveRuntime (ToolbarView.ActiveRuntime as RuntimeModel);
-		}
-
-		IEnumerable<IRuntimeModel> AllRuntimes (IEnumerable<IRuntimeModel> runtimes)
-		{
-			foreach (var runtime in runtimes) {
-				yield return runtime;
-				foreach (var childRuntime in AllRuntimes (runtime.Children))
-					yield return childRuntime;
-			}
-		}
-
-		RuntimeModel SelectActiveRuntime (SolutionItem project, RuntimeModel preferedRuntimeModel)
-		{
-			var runtimes = AllRuntimes (ToolbarView.RuntimeModel).Cast<RuntimeModel> ().ToList ();
+				} else {
+					if (previous is ExecutionTargetGroup) {
+						list.Add (new RuntimeModel (this, displayText: null));//Seperator
+					}
+
+					list.Add (new RuntimeModel (this, target, true, project));
+					runtimes++;
+				}
+
+				previous = target;
+			}
+		}
+
+		void HandleRuntimeChanged (object sender, HandledEventArgs e)
+		{
+			if (ignoreRuntimeChangedCount == 0) {
+				var runtime = (RuntimeModel)ToolbarView.ActiveRuntime;
+				if (runtime != null && runtime.Command != null) {
+					e.Handled = runtime.NotifyActivated ();
+					return;
+				}
+
+				NotifyConfigurationChange ();
+				SelectActiveRuntime (runtime);
+			}
+		}
+
+		void HandleConfigurationChanged (object sender, EventArgs e)
+		{
+			if (ignoreConfigurationChangedCount == 0)
+				NotifyConfigurationChange ();
+		}
+
+		void HandleRunConfigurationChanged (object sender, EventArgs e)
+		{
+			if (ignoreConfigurationChangedCount == 0)
+				NotifyRunConfigurationChange ();
+		}
+
+		void UpdateBuildConfiguration ()
+		{
+			var config = ToolbarView.ActiveConfiguration;
+			if (config == null)
+				return;
+			if (configurationMergers.Count > 1 || configurationMergers.Count == 0) {
+				settingGlobalConfig = true;
+				try {
+					IdeApp.Workspace.ActiveConfigurationId = config.OriginalId;
+				} finally {
+					settingGlobalConfig = false;
+				}
+				return;
+			}
+
+			ExecutionTarget newTarget;
+			string fullConfig;
+
+			var runtime = (RuntimeModel)ToolbarView.ActiveRuntime;
+			configurationMergers.Values.First ().ResolveConfiguration (config.OriginalId, runtime != null ? runtime.ExecutionTarget : null, out fullConfig, out newTarget);
+			settingGlobalConfig = true;
+			try {
+				IdeApp.Workspace.ActiveExecutionTarget = newTarget;
+				IdeApp.Workspace.ActiveConfigurationId = fullConfig;
+			} finally {
+				settingGlobalConfig = false;
+			}
+		}
+
+		void NotifyConfigurationChange ()
+		{
+			if (ToolbarView.ActiveConfiguration == null)
+				return;
+
+			UpdateBuildConfiguration ();
+
+			FillRuntimes ();
+			SelectActiveRuntime (ToolbarView.ActiveRuntime as RuntimeModel);
+		}
+
+		void NotifyRunConfigurationChange ()
+		{
+			if (ToolbarView.ActiveRunConfiguration == null)
+				return;
+
+			var model = (RunConfigurationModel)ToolbarView.ActiveRunConfiguration;
+			currentSolution.StartupConfiguration = model.RunConfiguration;
+		}
+
+		void SelectActiveRunConfiguration ()
+		{
+			var sconf = currentSolution?.StartupConfiguration;
+			var confs = ToolbarView.RunConfigurationModel.Cast<RunConfigurationModel> ().ToList ();
+			if (confs.Count > 0) {
+				bool selected = false;
+
+				foreach (var item in confs) {
+					if (item.RunConfiguration.Id == sconf?.Id) {
+						ToolbarView.ActiveRunConfiguration = item;
+						selected = true;
+						break;
+					}
+				}
+
+				if (!selected) {
+					var defaultConfig = confs.First ();
+					ToolbarView.ActiveRunConfiguration = defaultConfig;
+					if (currentSolution != null)
+						currentSolution.StartupConfiguration = defaultConfig.RunConfiguration;
+				}
+			}
+		}
+
+		void SelectActiveConfiguration ()
+		{
+			var allNames = configurationMergers.Values.Select (cm => cm.GetUnresolvedConfiguration (IdeApp.Workspace.ActiveConfigurationId)).Distinct ();
+			string name;
+			if (allNames.Count () == 1)
+				name = allNames.First ();
+			else
+				name = IdeApp.Workspace.ActiveConfigurationId;
+
+			ignoreConfigurationChangedCount++;
+			try {
+				var confs = ToolbarView.ConfigurationModel.ToList ();
+				if (confs.Count > 0) {
+					string defaultConfig = ToolbarView.ActiveConfiguration != null ? ToolbarView.ActiveConfiguration.OriginalId : confs[0].OriginalId;
+					bool selected = false;
+
+					foreach (var item in confs) {
+						string config = item.OriginalId;
+						if (config == name) {
+							ToolbarView.ActiveConfiguration = item;
+							UpdateBuildConfiguration ();
+							selected = true;
+							break;
+						}
+					}
+
+					if (!selected) {
+						ToolbarView.ActiveConfiguration = ToolbarView.ConfigurationModel.First ();
+						UpdateBuildConfiguration ();
+					}
+				}
+			} finally {
+				ignoreConfigurationChangedCount--;
+			}
+
+			SelectActiveRuntime (ToolbarView.ActiveRuntime as RuntimeModel);
+		}
+
+		IEnumerable<IRuntimeModel> AllRuntimes (IEnumerable<IRuntimeModel> runtimes)
+		{
+			foreach (var runtime in runtimes) {
+				yield return runtime;
+				foreach (var childRuntime in AllRuntimes (runtime.Children))
+					yield return childRuntime;
+			}
+		}
+
+		RuntimeModel SelectActiveRuntime (SolutionItem project, RuntimeModel preferedRuntimeModel)
+		{
+			var runtimes = AllRuntimes (ToolbarView.RuntimeModel).Cast<RuntimeModel> ().ToList ();
 			string lastRuntimeForProject = project.UserProperties.GetValue<string> ("PreferredExecutionTarget", defaultValue: null);
-			var activeTarget = preferedRuntimeModel?.Project == project ? preferedRuntimeModel.ExecutionTarget : null;
-			var multiProjectExecutionTarget = activeTarget as MultiProjectExecutionTarget;
-			if (multiProjectExecutionTarget != null) {
-				activeTarget = multiProjectExecutionTarget.GetTarget (project);
-			}
-			var activeTargetId = activeTarget?.Id;
-			RuntimeModel defaultRuntime = null;
-
-			foreach (var item in runtimes) {
-				using (var model = item.GetMutableModel ()) {
-					if (!model.Enabled)
-						continue;
-				}
-
-				var target = item.ExecutionTarget;
-				if (target == null || item.Project != project)
-					continue;
-
-				if (target is ExecutionTargetGroup)
-					if (item.HasChildren)
-						continue;
-
-				if (defaultRuntime == null || lastRuntimeForProject == target.Id) {
-					defaultRuntime = item;
-				}
-
-				if (target.Id == activeTargetId) {
-					project.UserProperties.SetValue ("PreferredExecutionTarget", target.Id);
-					return item;
-				}
-
-				if (target.Equals (activeTarget)) {
-					defaultRuntime = item;
-				}
-			}
+			var activeTarget = preferedRuntimeModel?.Project == project ? preferedRuntimeModel.ExecutionTarget : null;
+			var multiProjectExecutionTarget = activeTarget as MultiProjectExecutionTarget;
+			if (multiProjectExecutionTarget != null) {
+				activeTarget = multiProjectExecutionTarget.GetTarget (project);
+			}
+			var activeTargetId = activeTarget?.Id;
+			RuntimeModel defaultRuntime = null;
+
+			foreach (var item in runtimes) {
+				using (var model = item.GetMutableModel ()) {
+					if (!model.Enabled)
+						continue;
+				}
+
+				var target = item.ExecutionTarget;
+				if (target == null || item.Project != project)
+					continue;
+
+				if (target is ExecutionTargetGroup)
+					if (item.HasChildren)
+						continue;
+
+				if (defaultRuntime == null || lastRuntimeForProject == target.Id) {
+					defaultRuntime = item;
+				}
+
+				if (target.Id == activeTargetId) {
+					project.UserProperties.SetValue ("PreferredExecutionTarget", target.Id);
+					return item;
+				}
+
+				if (target.Equals (activeTarget)) {
+					defaultRuntime = item;
+				}
+			}
             if (defaultRuntime?.ExecutionTarget?.Id != null)
-                project.UserProperties.SetValue("PreferredExecutionTarget", defaultRuntime.ExecutionTarget.Id);
-			return defaultRuntime;
-		}
-
-		void SelectActiveRuntime (RuntimeModel preferedRuntimeModel)
-		{
-			ignoreRuntimeChangedCount++;
-
-			try {
-				if (ToolbarView.RuntimeModel.Any ()) {
-					if (startupProjects.Length > 1) {
-						var multiProjectTarget = new MultiProjectExecutionTarget ();
-						var multipleRuntime = new RuntimeModel (this, multiProjectTarget, false, null);
-						foreach (var startupProject in startupProjects) {
-							var runtimeModel = SelectActiveRuntime (startupProject.Item1, preferedRuntimeModel);
-							if (runtimeModel == null) {
-								LoggingService.LogError ($"No runtimeModel for {startupProject.Item1.Name}");
-								continue;
-							}
-							multiProjectTarget.SetExecutionTarget (startupProject.Item1, runtimeModel.ExecutionTarget);
-							multipleRuntime.AddChild (runtimeModel);
-						}
-						ToolbarView.ActiveRuntime = multipleRuntime;
-						IdeApp.Workspace.ActiveExecutionTarget = multipleRuntime.ExecutionTarget;
-					} else if (startupProjects.Length == 1) {
-						var runtimeModel = SelectActiveRuntime (startupProjects.First ().Item1, preferedRuntimeModel);
-						ToolbarView.ActiveRuntime = runtimeModel;
-						IdeApp.Workspace.ActiveExecutionTarget = runtimeModel?.ExecutionTarget;
-						UpdateBuildConfiguration ();
-					} else {
-						ToolbarView.ActiveRuntime = null;
-						IdeApp.Workspace.ActiveExecutionTarget = null;
-					}
-				}
-			} finally {
-				ignoreRuntimeChangedCount--;
-			}
-		}
-
-		void HandleSolutionLoaded (object sender, EventArgs e)
-		{
-			if (currentSolution != null)
-				return;
-
-			UpdateCombos ();
-		}
-
-		void HandleUpdateCombos (object sender, EventArgs e)
-		{
-
-			UpdateCombos ();
-		}
-
-		void HandleCurrentSelectedSolutionChanged (object sender, SolutionEventArgs e)
-		{
-			if (currentSolution != null) {
-				currentSolution.StartupConfigurationChanged -= HandleStartupItemChanged;
-				currentSolution.Saved -= HandleSolutionSaved;
-				currentSolution.EntrySaved -= HandleSolutionEntrySaved;
-				currentSolution.SolutionItemAdded -= HandleSolutionItemAdded;
-			}
-
-			currentSolution = e.Solution;
-
-			if (currentSolution != null) {
-				currentSolution.StartupConfigurationChanged += HandleStartupItemChanged;
-				currentSolution.Saved += HandleSolutionSaved;
-				currentSolution.EntrySaved += HandleSolutionEntrySaved;
-				currentSolution.SolutionItemAdded += HandleSolutionItemAdded;
-			}
-
-			TrackStartupProject ();
-		}
-
-		void TrackStartupProject ()
-		{
-			Tuple<SolutionItem, SolutionItemRunConfiguration> [] projects;
-			if (currentSolution?.StartupConfiguration is MultiItemSolutionRunConfiguration) {
-				var multiRunConfigs = (MultiItemSolutionRunConfiguration)currentSolution.StartupConfiguration;
-				projects = multiRunConfigs.Items.Select (rc => new Tuple<SolutionItem, SolutionItemRunConfiguration> (
-					  rc.SolutionItem,
-					  rc.RunConfiguration
-				)).ToArray ();
-			} else if (currentSolution?.StartupConfiguration is SingleItemSolutionRunConfiguration) {
-				var singleRunConfig = (SingleItemSolutionRunConfiguration)currentSolution.StartupConfiguration;
-				projects = new Tuple<SolutionItem, SolutionItemRunConfiguration> []{ new Tuple<SolutionItem, SolutionItemRunConfiguration> (
-					singleRunConfig.Item, singleRunConfig.RunConfiguration)};
-			} else {
-				projects = new Tuple<SolutionItem, SolutionItemRunConfiguration> [0];
-			}
-			if (!startupProjects.SequenceEqual (projects)) {
-				foreach (var item in startupProjects)
-					item.Item1.ExecutionTargetsChanged -= executionTargetsChanged;
-				foreach (var item in projects)
-					item.Item1.ExecutionTargetsChanged += executionTargetsChanged;
-				startupProjects = projects;
-			}
-		}
-
-		void HandleSolutionSaved (object sender, EventArgs e)
-		{
-			UpdateCombos ();
-		}
-
-		void HandleSolutionEntrySaved (object sender, SolutionItemSavedEventArgs e)
-		{
-			// Skip the per-project update when a solution is being saved. The solution Saved callback will do the final update.
-			if (!e.SavingSolution)
-				HandleSolutionSaved (sender, e);
-		}
-
-		void HandleSolutionItemAdded (object sender, SolutionItemChangeEventArgs e)
-		{
-			// When a solution item is added due to a reload we need to ensure the configurationMergers dictionary is
-			// using the new project and not the old disposed project.
-			if (e.Reloading)
-				UpdateCombos ();
-		}
-
-		void HandleStartupItemChanged (object sender, EventArgs e)
-		{
-			TrackStartupProject ();
-			if (ignoreConfigurationChangedCount == 0)
-				UpdateCombos ();
-		}
-
-		void OnExtensionChanged (object sender, ExtensionEventArgs args)
-		{
-			if (args.PathChanged (ToolbarExtensionPath))
-				RebuildToolbar ();
-		}
-
-		void UpdateSearchEntryLabel ()
-		{
-			var info = IdeApp.CommandService.GetCommand (Commands.NavigateTo);
-			ToolbarView.SearchPlaceholderMessage = !string.IsNullOrEmpty (info.AccelKey) ?
-				GettextCatalog.GetString ("Press \u2018{0}\u2019 to search", KeyBindingManager.BindingToDisplayLabel (info.AccelKey, false)) :
-				GettextCatalog.GetString ("Search solution");
-		}
-
-		SearchPopupWindow popup = null;
-		static readonly SearchPopupSearchPattern emptyColonPattern = SearchPopupSearchPattern.ParsePattern (":");
-		void PositionPopup ()
-		{
-			if (popup == null)
-				return;
-
-			popup.IgnoreRepositionWindow = false;
-
-			var anchor = ToolbarView.PopupAnchor;
-			if (IdeApp.Workbench.RootWindow.Visible)
-				popup.ShowPopup (anchor, PopupPosition.TopRight);
-
-			if (anchor.GdkWindow == null) {
-				var location = new Xwt.Point (anchor.Allocation.X + anchor.Allocation.Width - popup.Size.Width, anchor.Allocation.Y);
-
-				// Need to hard lock the location because Xwt doesn't know that the allocation might be coming from a
-				// Cocoa control and thus has been changed to take macOS monitor layout into consideration
-				popup.IgnoreRepositionWindow = true;
-				popup.Location = location;
-			}
-		}
-
-		void DestroyPopup ()
-		{
-			if (popup != null) {
-				popup.Close ();
-				popup.Destroy ();
-				popup = null;
-			}
-		}
-
-		void HandleSearchEntryChanged (object sender, EventArgs e)
-		{
-			if (!string.IsNullOrEmpty (ToolbarView.SearchText))
-				lastSearchText = ToolbarView.SearchText;
-			
-			if (string.IsNullOrEmpty (ToolbarView.SearchText)){
-				DestroyPopup ();
-				return;
-			}
-			var pattern = SearchPopupSearchPattern.ParsePattern (ToolbarView.SearchText);
-			if (pattern.Pattern == null && pattern.LineNumber > 0 || pattern == emptyColonPattern) {
-				if (popup != null) {
-					popup.Hide ();
-				}
-				return;
-			} else {
-				if (popup != null && !popup.Visible)
-					popup.Show ();
-			}
-
-			if (popup == null) {
-				popup = new SearchPopupWindow ();
-				popup.SearchForMembers = SearchForMembers;
-				popup.Disposed += delegate {
-					popup = null;
-					ToolbarView.SearchText = "";
-				};
-				popup.SelectedItemChanged += delegate {
-					var si = popup?.Content?.SelectedItem;
-					if (si == null || !si.IsValid)
-						return;
-					var text = si.DataSource [si.Item].AccessibilityMessage;
-					if (string.IsNullOrEmpty (text))
-						return;
-
-					ToolbarView.ShowAccessibilityAnnouncement (text);
-				};
-				PositionPopup ();
-				popup.Show ();
-			}
-			// popup.Update () is thread safe, so run it on a bg thread for faster results
-			Task.Run (() => popup.Update (pattern)).Ignore ();
-		}
-
-		void HandleSearchEntryActivated (object sender, EventArgs e)
-		{
-			var pattern = SearchPopupSearchPattern.ParsePattern (ToolbarView.SearchText);
-			if (pattern.Pattern == null && pattern.LineNumber > 0) {
-				DestroyPopup ();
-				var doc = IdeApp.Workbench.ActiveDocument;
-				if (doc?.GetContent<ITextView> (true) is ITextView view) {
-					doc.Select ();
+                project.UserProperties.SetValue("PreferredExecutionTarget", defaultRuntime.ExecutionTarget.Id);
+			return defaultRuntime;
+		}
+
+		void SelectActiveRuntime (RuntimeModel preferedRuntimeModel)
+		{
+			ignoreRuntimeChangedCount++;
+
+			try {
+				if (ToolbarView.RuntimeModel.Any ()) {
+					if (startupProjects.Length > 1) {
+						var multiProjectTarget = new MultiProjectExecutionTarget ();
+						var multipleRuntime = new RuntimeModel (this, multiProjectTarget, false, null);
+						foreach (var startupProject in startupProjects) {
+							var runtimeModel = SelectActiveRuntime (startupProject.Item1, preferedRuntimeModel);
+							if (runtimeModel == null) {
+								LoggingService.LogError ($"No runtimeModel for {startupProject.Item1.Name}");
+								continue;
+							}
+							multiProjectTarget.SetExecutionTarget (startupProject.Item1, runtimeModel.ExecutionTarget);
+							multipleRuntime.AddChild (runtimeModel);
+						}
+						ToolbarView.ActiveRuntime = multipleRuntime;
+						IdeApp.Workspace.ActiveExecutionTarget = multipleRuntime.ExecutionTarget;
+					} else if (startupProjects.Length == 1) {
+						var runtimeModel = SelectActiveRuntime (startupProjects.First ().Item1, preferedRuntimeModel);
+						ToolbarView.ActiveRuntime = runtimeModel;
+						IdeApp.Workspace.ActiveExecutionTarget = runtimeModel?.ExecutionTarget;
+						UpdateBuildConfiguration ();
+					} else {
+						ToolbarView.ActiveRuntime = null;
+						IdeApp.Workspace.ActiveExecutionTarget = null;
+					}
+				}
+			} finally {
+				ignoreRuntimeChangedCount--;
+			}
+		}
+
+		void HandleSolutionLoaded (object sender, EventArgs e)
+		{
+			if (currentSolution != null)
+				return;
+
+			UpdateCombos ();
+		}
+
+		void HandleUpdateCombos (object sender, EventArgs e)
+		{
+
+			UpdateCombos ();
+		}
+
+		void HandleCurrentSelectedSolutionChanged (object sender, SolutionEventArgs e)
+		{
+			if (currentSolution != null) {
+				currentSolution.StartupConfigurationChanged -= HandleStartupItemChanged;
+				currentSolution.Saved -= HandleSolutionSaved;
+				currentSolution.EntrySaved -= HandleSolutionEntrySaved;
+				currentSolution.SolutionItemAdded -= HandleSolutionItemAdded;
+			}
+
+			currentSolution = e.Solution;
+
+			if (currentSolution != null) {
+				currentSolution.StartupConfigurationChanged += HandleStartupItemChanged;
+				currentSolution.Saved += HandleSolutionSaved;
+				currentSolution.EntrySaved += HandleSolutionEntrySaved;
+				currentSolution.SolutionItemAdded += HandleSolutionItemAdded;
+			}
+
+			TrackStartupProject ();
+		}
+
+		void TrackStartupProject ()
+		{
+			Tuple<SolutionItem, SolutionItemRunConfiguration> [] projects;
+			if (currentSolution?.StartupConfiguration is MultiItemSolutionRunConfiguration) {
+				var multiRunConfigs = (MultiItemSolutionRunConfiguration)currentSolution.StartupConfiguration;
+				projects = multiRunConfigs.Items.Select (rc => new Tuple<SolutionItem, SolutionItemRunConfiguration> (
+					  rc.SolutionItem,
+					  rc.RunConfiguration
+				)).ToArray ();
+			} else if (currentSolution?.StartupConfiguration is SingleItemSolutionRunConfiguration) {
+				var singleRunConfig = (SingleItemSolutionRunConfiguration)currentSolution.StartupConfiguration;
+				projects = new Tuple<SolutionItem, SolutionItemRunConfiguration> []{ new Tuple<SolutionItem, SolutionItemRunConfiguration> (
+					singleRunConfig.Item, singleRunConfig.RunConfiguration)};
+			} else {
+				projects = new Tuple<SolutionItem, SolutionItemRunConfiguration> [0];
+			}
+			if (!startupProjects.SequenceEqual (projects)) {
+				foreach (var item in startupProjects)
+					item.Item1.ExecutionTargetsChanged -= executionTargetsChanged;
+				foreach (var item in projects)
+					item.Item1.ExecutionTargetsChanged += executionTargetsChanged;
+				startupProjects = projects;
+			}
+		}
+
+		void HandleSolutionSaved (object sender, EventArgs e)
+		{
+			UpdateCombos ();
+		}
+
+		void HandleSolutionEntrySaved (object sender, SolutionItemSavedEventArgs e)
+		{
+			// Skip the per-project update when a solution is being saved. The solution Saved callback will do the final update.
+			if (!e.SavingSolution)
+				HandleSolutionSaved (sender, e);
+		}
+
+		void HandleSolutionItemAdded (object sender, SolutionItemChangeEventArgs e)
+		{
+			// When a solution item is added due to a reload we need to ensure the configurationMergers dictionary is
+			// using the new project and not the old disposed project.
+			if (e.Reloading)
+				UpdateCombos ();
+		}
+
+		void HandleStartupItemChanged (object sender, EventArgs e)
+		{
+			TrackStartupProject ();
+			if (ignoreConfigurationChangedCount == 0)
+				UpdateCombos ();
+		}
+
+		void OnExtensionChanged (object sender, ExtensionEventArgs args)
+		{
+			if (args.PathChanged (ToolbarExtensionPath))
+				RebuildToolbar ();
+		}
+
+		void UpdateSearchEntryLabel ()
+		{
+			var info = IdeApp.CommandService.GetCommand (Commands.NavigateTo);
+			ToolbarView.SearchPlaceholderMessage = !string.IsNullOrEmpty (info.AccelKey) ?
+				GettextCatalog.GetString ("Press \u2018{0}\u2019 to search", KeyBindingManager.BindingToDisplayLabel (info.AccelKey, false)) :
+				GettextCatalog.GetString ("Search solution");
+		}
+
+		SearchPopupWindow popup = null;
+		static readonly SearchPopupSearchPattern emptyColonPattern = SearchPopupSearchPattern.ParsePattern (":");
+		void PositionPopup ()
+		{
+			if (popup == null)
+				return;
+
+			popup.IgnoreRepositionWindow = false;
+
+			var anchor = ToolbarView.PopupAnchor;
+			if (IdeApp.Workbench.RootWindow.Visible)
+				popup.ShowPopup (anchor, PopupPosition.TopRight);
+
+			if (anchor.GdkWindow == null) {
+				var location = new Xwt.Point (anchor.Allocation.X + anchor.Allocation.Width - popup.Size.Width, anchor.Allocation.Y);
+
+				// Need to hard lock the location because Xwt doesn't know that the allocation might be coming from a
+				// Cocoa control and thus has been changed to take macOS monitor layout into consideration
+				popup.IgnoreRepositionWindow = true;
+				popup.Location = location;
+			}
+		}
+
+		void DestroyPopup ()
+		{
+			if (popup != null) {
+				popup.Close ();
+				popup.Destroy ();
+				popup = null;
+			}
+		}
+
+		void HandleSearchEntryChanged (object sender, EventArgs e)
+		{
+			if (!string.IsNullOrEmpty (ToolbarView.SearchText))
+				lastSearchText = ToolbarView.SearchText;
+			
+			if (string.IsNullOrEmpty (ToolbarView.SearchText)){
+				DestroyPopup ();
+				return;
+			}
+			var pattern = SearchPopupSearchPattern.ParsePattern (ToolbarView.SearchText);
+			if (pattern.Pattern == null && pattern.LineNumber > 0 || pattern == emptyColonPattern) {
+				if (popup != null) {
+					popup.Hide ();
+				}
+				return;
+			} else {
+				if (popup != null && !popup.Visible)
+					popup.Show ();
+			}
+
+			if (popup == null) {
+				popup = new SearchPopupWindow ();
+				popup.SearchForMembers = SearchForMembers;
+				popup.Disposed += delegate {
+					popup = null;
+					ToolbarView.SearchText = "";
+				};
+				popup.SelectedItemChanged += delegate {
+					var si = popup?.Content?.SelectedItem;
+					if (si == null || !si.IsValid)
+						return;
+					var text = si.DataSource [si.Item].AccessibilityMessage;
+					if (string.IsNullOrEmpty (text))
+						return;
+
+					ToolbarView.ShowAccessibilityAnnouncement (text);
+				};
+				PositionPopup ();
+				popup.Show ();
+			}
+			// popup.Update () is thread safe, so run it on a bg thread for faster results
+			Task.Run (() => popup.Update (pattern)).Ignore ();
+		}
+
+		void HandleSearchEntryActivated (object sender, EventArgs e)
+		{
+			var pattern = SearchPopupSearchPattern.ParsePattern (ToolbarView.SearchText);
+			if (pattern.Pattern == null && pattern.LineNumber > 0) {
+				DestroyPopup ();
+				var doc = IdeApp.Workbench.ActiveDocument;
+				if (doc?.GetContent<ITextView> (true) is ITextView view) {
+					doc.Select ();
 					var snapshot = view.TextBuffer.CurrentSnapshot;
 					int lineNumber = Math.Min (Math.Max (1, pattern.LineNumber), snapshot.LineCount);
-					var line = snapshot.GetLineFromLineNumber (lineNumber - 1);
+					var line = snapshot.GetLineFromLineNumber (lineNumber - 1);
 					if (line != null) {
-						view.Caret.MoveTo (new SnapshotPoint (snapshot, line.Start + Math.Max (0, Math.Min (pattern.Column - 1, line.Length))));
+						view.Caret.MoveTo (new SnapshotPoint (snapshot, line.Start + Math.Max (0, Math.Min (pattern.Column - 1, line.Length))));
 						IdeApp.CommandService.DispatchCommand (ViewCommands.CenterAndFocusCurrentDocument);
 						ToolbarView.SearchText = "";
-					}
-				}
-				return;
-			}
-			if (popup != null)
-				popup.OpenFile ();
-		}
-
-		void HandleSearchEntryCommand (object sender, SearchEntryCommandArgs args)
-		{
-			if (args.Command == SearchPopupCommand.Cancel) {
-				DestroyPopup ();
-				var doc = IdeApp.Workbench.ActiveDocument;
-				if (doc != null)
-					doc.Select ();
-				return;
-			}
-
-			if (popup != null) {
-				args.Handled = popup.ProcessCommand (args.Command);
-			}
-		}
-
-		void HandleSearchEntryKeyPressed (object sender, Xwt.KeyEventArgs e)
-		{
+					}
+				}
+				return;
+			}
+			if (popup != null)
+				popup.OpenFile ();
+		}
+
+		void HandleSearchEntryCommand (object sender, SearchEntryCommandArgs args)
+		{
+			if (args.Command == SearchPopupCommand.Cancel) {
+				DestroyPopup ();
+				var doc = IdeApp.Workbench.ActiveDocument;
+				if (doc != null)
+					doc.Select ();
+				return;
+			}
+
+			if (popup != null) {
+				args.Handled = popup.ProcessCommand (args.Command);
+			}
+		}
+
+		void HandleSearchEntryKeyPressed (object sender, Xwt.KeyEventArgs e)
+		{
 			if (e.Key == Xwt.Key.Escape) {
-				DestroyPopup();
-				var doc = IdeApp.Workbench.ActiveDocument;
-				if (doc != null) 
-					doc.Select ();
-				return;
-			}
-			if (popup != null) 
-				e.Handled = popup.ProcessKey (e.Key, e.Modifiers);
-		}
-
-		string lastSearchText = string.Empty;
-		public void FocusSearchBar ()
-		{
-			IdeApp.Workbench.Present ();
-			var text = lastSearchText;
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc?.GetContent<ITextView> () is ITextView view && !view.Selection.IsEmpty) {
-				string selected = view.Selection.SelectedSpans[0].GetText ();
-				int whitespaceIndex = selected.TakeWhile (c => !char.IsWhiteSpace (c)).Count ();
-				text = selected.Substring (0, whitespaceIndex);
-			}
-
-			ToolbarView.FocusSearchBar ();
-			ToolbarView.SearchText = text;
-		}
-
-		public void SetSearchCategory (string category)
-		{
-			IdeApp.Workbench.Present ();
-			ToolbarView.SearchCategory = category + ":";
-		}
-
-		HashSet<string> visibleBars = new HashSet<string> ();
-		public void ShowCommandBar (string barId)
-		{
-			visibleBars.Add (barId);
-			RebuildToolbar ();
-		}
-
-		public void HideCommandBar (string barId)
-		{
-			visibleBars.Remove (barId);
-			RebuildToolbar ();
-		}
-
-		List<ButtonBarButton> buttonBarButtons = new List<ButtonBarButton> ();
-		void RebuildToolbar ()
-		{
-			var bars = AddinManager.GetExtensionNodes<ItemSetCodon> (ToolbarExtensionPath)
-				.Where (n => visibleBars.Contains (n.Id))
-                .Select (b => new { Label = b.Label, Buttons = b.ChildNodes.OfType<CommandItemCodon> ().Select (n => n.Id) });
-
-			var buttonGroups = new List<ButtonBarGroup> ();
-			buttonBarButtons.Clear ();
-			foreach (var bar in bars) {
-				var group = new ButtonBarGroup (bar.Label);
-
-				buttonGroups.Add (group);
-				foreach (string commandId in bar.Buttons) {
-					var button = new ButtonBarButton (this, commandId);
-					group.Buttons.Add (button);
-					buttonBarButtons.Add (button);
-				}
-			}
-
-			ToolbarView.RebuildToolbar (buttonGroups);
-		}
-
-		static void HandleStartButtonClicked (object sender, EventArgs e)
-		{
-			OperationIcon operation;
-			var ci = GetStartButtonCommandInfo (out operation);
-			if (ci.Enabled)
-				IdeApp.CommandService.DispatchCommand (ci.Command.Id, CommandSource.MainToolbar);
-		}
-
-		static CommandInfo GetStartButtonCommandInfo (out OperationIcon operation)
-		{
-			if (!IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted || !IdeApp.ProjectOperations.CurrentBuildOperation.IsCompleted) {
-				operation = OperationIcon.Stop;
-				return IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.ProjectCommands.Stop);
-			}
-			else {
-				operation = OperationIcon.Run;
-				var ci = IdeApp.CommandService.GetCommandInfo ("MonoDevelop.Debugger.DebugCommands.Debug");
-				if (!ci.Enabled || !ci.Visible) {
-					// If debug is not enabled, try Run
-					ci = IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.ProjectCommands.Run);
-					if (!ci.Enabled || !ci.Visible) {
-						// Running is not possible, then allow building
-						var bci = IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.ProjectCommands.BuildSolution);
-						if (bci.Enabled && bci.Visible) {
-							operation = OperationIcon.Build;
-							ci = bci;
-						}
-					}
-				}
-				return ci;
-			}
-		}
-
-		#region ICommandBar implementation
-		bool toolbarEnabled = true;
-		object lastCommandTarget;
-
-		void ICommandBar.Update (object activeTarget)
-		{
-			lastCommandTarget = activeTarget;
-			if (!toolbarEnabled)
-				return;
-			OperationIcon operation;
-			var ci = GetStartButtonCommandInfo (out operation);
-			if (ci.Enabled != ToolbarView.RunButtonSensitivity)
-				ToolbarView.RunButtonSensitivity = ci.Enabled;
-
-			ToolbarView.RunButtonIcon = operation;
-			var stopped = operation != OperationIcon.Stop;
-			if (ToolbarView.ConfigurationPlatformSensitivity != stopped)
-				ToolbarView.ConfigurationPlatformSensitivity = stopped;
-
-			foreach (var item in buttonBarButtons)
-				item.Update ();
-		}
-
-		void ICommandBar.SetEnabled (bool enabled)
-		{
-			toolbarEnabled = enabled;
-			ToolbarView.RunButtonSensitivity = enabled;
-			ToolbarView.SearchSensivitity = enabled;
-			ToolbarView.ButtonBarSensitivity = enabled;
-		}
-		#endregion
-
-		class ButtonBarButton : IButtonBarButton
-		{
-			CommandInfo lastCmdInfo;
-			MainToolbarController Controller { get; set; }
-			string CommandId { get; set; }
-
-			public ButtonBarButton (MainToolbarController controller, string commandId) : this (controller)
-			{
-				CommandId = commandId;
-			}
-
-			public ButtonBarButton (MainToolbarController controller)
-			{
-				Controller = controller;
-			}
-
-			public IconId Image { get; set; }
-			public bool Enabled { get; set; }
-			public bool Visible { get; set; }
-			public string Tooltip { get; set; }
-			public string Title { get; set; }
-			public bool IsSeparator {
-				get { return CommandId == null; }
-			}
-
-			public void NotifyPushed ()
-			{
-				IdeApp.CommandService.DispatchCommand (CommandId, null, Controller.lastCommandTarget, CommandSource.MainToolbar, lastCmdInfo);
-			}
-
-			public void Update ()
-			{
-				if (IsSeparator)
-					return;
-
-				if (lastCmdInfo != null) {
-					lastCmdInfo.CancelAsyncUpdate ();
-					lastCmdInfo.Changed -= LastCmdInfoChanged;
-				}
-				
-				lastCmdInfo = IdeApp.CommandService.GetCommandInfo (CommandId, new CommandTargetRoute (Controller.lastCommandTarget));
-
-				if (lastCmdInfo != null) {
-					lastCmdInfo.Changed += LastCmdInfoChanged;
-					Update (lastCmdInfo);
-				}
-			}
-
-			void Update (CommandInfo ci)
-			{
-				if (ci.Icon != Image) {
-					Image = ci.Icon;
-					if (ImageChanged != null)
-						ImageChanged (this, null);
-				}
-				if (ci.Enabled != Enabled) {
-					Enabled = ci.Enabled;
-					if (EnabledChanged != null)
-						EnabledChanged (this, null);
-				}
-				if (ci.Description != Tooltip) {
-					Tooltip = ci.Description;
-					if (TooltipChanged != null)
-						TooltipChanged (this, null);
-				}
-				if (ci.Visible != Visible) {
-					Visible = ci.Visible;
-					if (VisibleChanged != null)
-						VisibleChanged (this, null);
-				}
-				if (ci.Text != Title) {
-					Title = ci.Text;
-					TitleChanged?.Invoke (this, null);
-				}
-			}
-
-			void LastCmdInfoChanged (object sender, EventArgs e)
-			{
-				Update (lastCmdInfo); 
-			}
-
-			public event EventHandler EnabledChanged;
-			public event EventHandler ImageChanged;
-			public event EventHandler VisibleChanged;
-			public event EventHandler TooltipChanged;
-			public event EventHandler TitleChanged;
-		}
-
-		[Serializable]
-		class RuntimeModel : IRuntimeModel
-		{
-			MainToolbarController Controller { get; set; }
-			List<IRuntimeModel> children = new List<IRuntimeModel> ();
-			public object Command { get; private set; }
-			public ExecutionTarget ExecutionTarget { get; private set; }
-			string DisplayText = null;
-			string image, tooltip;
-			bool fullText;
-
-			RuntimeModel (MainToolbarController controller)
-			{
-				Controller = controller;
-			}
-
-			public RuntimeModel (MainToolbarController controller, string displayText) : this (controller)
-			{
-				DisplayText = displayText;
-			}
-
-			public RuntimeModel (MainToolbarController controller, ActionCommand command) : this (controller)
-			{
-				Command = command.Id;
-				image = command.Icon;
-				tooltip = command.Description;
-			}
-
-			public RuntimeModel (MainToolbarController controller, ExecutionTarget target, bool fullText, SolutionItem project) : this (controller)
-			{
-				if (target == null)
-					throw new ArgumentNullException (nameof (target));
-				
-				ExecutionTarget = target;
-				image = target.Image;
-				tooltip = target.Tooltip;
-
-				this.fullText = fullText;
-				Project = project;
-			}
-
-			public void AddChild (IRuntimeModel child)
-			{
-				children.Add (child);
-			}
-
-			public IEnumerable<IRuntimeModel> Children {
-				get { return children; }
-			}
-
-			public bool Notable {
-				get { return ExecutionTarget != null && ExecutionTarget.Notable; }
-			}
-
-			public bool HasChildren {
-				get;
-				set;
-			}
-
-			public bool IsSeparator {
-				get { return Command == null && ExecutionTarget == null && DisplayText == null; }
-			}
-
-			public bool IsIndented {
-				get;
-				set;
-			}
-
-			public bool NotifyActivated ()
-			{
-				if (Command != null && IdeApp.CommandService.DispatchCommand (Command, CommandSource.ContextMenu))
-					return true;
-				return false;
-			}
-
-			internal string TargetId {
-				get {
-					if (ExecutionTarget == null)
-						return "";
-					return ExecutionTarget.Id;
-				}
-			}
-
-			public SolutionItem Project { get; }
-
-			public string Image => image;
-
-			public string Tooltip => tooltip;
-
-			public IRuntimeMutableModel GetMutableModel ()
-			{
-				if (Command != null)
-					return new RuntimeMutableModel (Controller, Command);
-				else if (ExecutionTarget != null)
-					return new RuntimeMutableModel (ExecutionTarget, fullText);
-				else
-					return new RuntimeMutableModel (DisplayText);
-			}
-		}
-
-		[Serializable]
-		class RuntimeMutableModel : IRuntimeMutableModel
-		{
-			public RuntimeMutableModel(string text)
-			{
-				Enabled = Visible = true;
-				DisplayString = FullDisplayString = text;
-			}
-
-			public RuntimeMutableModel (MainToolbarController controller, object command)
-			{
-				var ci = IdeApp.CommandService.GetCommandInfo (command, new CommandTargetRoute (controller.lastCommandTarget));
-				Visible = ci.Visible;
-				Enabled = ci.Enabled;
-				DisplayString = FullDisplayString = RemoveUnderline (ci.Text);
-			}
-
-			public RuntimeMutableModel (ExecutionTarget target, bool fullName)
-			{
-				Enabled = !(target is ExecutionTargetGroup) && target.Enabled;
-				Visible = true;
-				if (target == null)
-					DisplayString = FullDisplayString = string.Empty;
-				else {
-					FullDisplayString = target.FullName;
-					DisplayString = fullName ? target.FullName : target.Name;
-				}
-			}
-
-			// Marker so it won't be reused.
-			public void Dispose ()
-			{
-			}
-
-			public bool Visible {
-				get;
-				private set;
-			}
-
-			public bool Enabled {
-				get;
-				private set;
-			}
-
-			public string DisplayString {
-				get;
-				private set;
-			}
-
-			public string FullDisplayString {
-				get;
-				private set;
-			}
-
-			static string RemoveUnderline (string s)
-			{
-				int i = s.IndexOf ('_');
-				if (i == -1)
-					return s;
-				var sb = StringBuilderCache.Allocate ();
-				sb.Append (s, 0, i);
-				for (; i < s.Length; i++) {
-					if (s [i] == '_') {
-						i++;
-						if (i >= s.Length)
-							break;
-					}
-					sb.Append (s [i]);
-				}
-				return StringBuilderCache.ReturnAndFree (sb);
-			}
-		}
-
-		[Serializable]
-		class ConfigurationModel : IConfigurationModel
-		{
-			public ConfigurationModel (string originalId)
-			{
-				OriginalId = originalId;
-				DisplayString = originalId.Replace ("|", " | ");
-			}
-
-			public string OriginalId { get; private set; }
-			public string DisplayString { get; private set; }
-		}
-
-		[Serializable]
-		class RunConfigurationModel : IRunConfigurationModel
-		{
-			public RunConfigurationModel (SolutionRunConfiguration config)
-			{
-				RunConfiguration = config;
-				OriginalId = config.Id;
-				DisplayString = config.Name;
-			}
-
-			public SolutionRunConfiguration RunConfiguration { get; set; }
-			public string OriginalId { get; private set; }
-			public string DisplayString { get; private set; }
-		}
-
-		class SearchMenuModel : ISearchMenuModel
-		{
-			public SearchMenuModel (string displayString, string category)
-			{
-				DisplayString = displayString;
-				Category = category;
-			}
-
-			public void NotifyActivated ()
-			{
-				if (Activated != null)
-					Activated (null, null);
-			}
-
-			public string DisplayString { get; private set; }
-			public string Category { get; set; }
-			public event EventHandler Activated;
-		}
-	}
-
-	public class SearchEntryCommandArgs : HandledEventArgs
-	{
-		public SearchPopupCommand Command { get; private set; }
-
-		public SearchEntryCommandArgs (SearchPopupCommand command)
-		{
-			Command = command;
-		}
-	}
-}
-
+				DestroyPopup();
+				var doc = IdeApp.Workbench.ActiveDocument;
+				if (doc != null) 
+					doc.Select ();
+				return;
+			}
+			if (popup != null) 
+				e.Handled = popup.ProcessKey (e.Key, e.Modifiers);
+		}
+
+		string lastSearchText = string.Empty;
+		public void FocusSearchBar ()
+		{
+			IdeApp.Workbench.Present ();
+			var text = lastSearchText;
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc?.GetContent<ITextView> () is ITextView view && !view.Selection.IsEmpty) {
+				string selected = view.Selection.SelectedSpans[0].GetText ();
+				int whitespaceIndex = selected.TakeWhile (c => !char.IsWhiteSpace (c)).Count ();
+				text = selected.Substring (0, whitespaceIndex);
+			}
+
+			ToolbarView.FocusSearchBar ();
+			ToolbarView.SearchText = text;
+		}
+
+		public void SetSearchCategory (string category)
+		{
+			IdeApp.Workbench.Present ();
+			ToolbarView.SearchCategory = category + ":";
+		}
+
+		HashSet<string> visibleBars = new HashSet<string> ();
+		public void ShowCommandBar (string barId)
+		{
+			visibleBars.Add (barId);
+			RebuildToolbar ();
+		}
+
+		public void HideCommandBar (string barId)
+		{
+			visibleBars.Remove (barId);
+			RebuildToolbar ();
+		}
+
+		List<ButtonBarButton> buttonBarButtons = new List<ButtonBarButton> ();
+		void RebuildToolbar ()
+		{
+			var bars = AddinManager.GetExtensionNodes<ItemSetCodon> (ToolbarExtensionPath)
+				.Where (n => visibleBars.Contains (n.Id))
+                .Select (b => new { Label = b.Label, Buttons = b.ChildNodes.OfType<CommandItemCodon> ().Select (n => n.Id) });
+
+			var buttonGroups = new List<ButtonBarGroup> ();
+			buttonBarButtons.Clear ();
+			foreach (var bar in bars) {
+				var group = new ButtonBarGroup (bar.Label);
+
+				buttonGroups.Add (group);
+				foreach (string commandId in bar.Buttons) {
+					var button = new ButtonBarButton (this, commandId);
+					group.Buttons.Add (button);
+					buttonBarButtons.Add (button);
+				}
+			}
+
+			ToolbarView.RebuildToolbar (buttonGroups);
+		}
+
+		static void HandleStartButtonClicked (object sender, EventArgs e)
+		{
+			OperationIcon operation;
+			var ci = GetStartButtonCommandInfo (out operation);
+			if (ci.Enabled)
+				IdeApp.CommandService.DispatchCommand (ci.Command.Id, CommandSource.MainToolbar);
+		}
+
+		static CommandInfo GetStartButtonCommandInfo (out OperationIcon operation)
+		{
+			//if (!IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted || !IdeApp.ProjectOperations.CurrentBuildOperation.IsCompleted) {
+				operation = OperationIcon.Stop;
+				return IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.ProjectCommands.Stop);
+			//}
+			//else {
+			//	operation = OperationIcon.Run;
+			//	var ci = IdeApp.CommandService.GetCommandInfo ("MonoDevelop.Debugger.DebugCommands.Debug");
+			//	if (!ci.Enabled || !ci.Visible) {
+			//		// If debug is not enabled, try Run
+			//		ci = IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.ProjectCommands.Run);
+			//		if (!ci.Enabled || !ci.Visible) {
+			//			// Running is not possible, then allow building
+			//			var bci = IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.ProjectCommands.BuildSolution);
+			//			if (bci.Enabled && bci.Visible) {
+			//				operation = OperationIcon.Build;
+			//				ci = bci;
+			//			}
+			//		}
+			//	}
+			//	return ci;
+			//}
+		}
+
+		#region ICommandBar implementation
+		bool toolbarEnabled = true;
+		object lastCommandTarget;
+
+		void ICommandBar.Update (object activeTarget)
+		{
+			lastCommandTarget = activeTarget;
+			if (!toolbarEnabled)
+				return;
+			OperationIcon operation;
+			var ci = GetStartButtonCommandInfo (out operation);
+			if (ci.Enabled != ToolbarView.RunButtonSensitivity)
+				ToolbarView.RunButtonSensitivity = ci.Enabled;
+
+			ToolbarView.RunButtonIcon = operation;
+			var stopped = operation != OperationIcon.Stop;
+			if (ToolbarView.ConfigurationPlatformSensitivity != stopped)
+				ToolbarView.ConfigurationPlatformSensitivity = stopped;
+
+			foreach (var item in buttonBarButtons)
+				item.Update ();
+		}
+
+		void ICommandBar.SetEnabled (bool enabled)
+		{
+			toolbarEnabled = enabled;
+			ToolbarView.RunButtonSensitivity = enabled;
+			ToolbarView.SearchSensivitity = enabled;
+			ToolbarView.ButtonBarSensitivity = enabled;
+		}
+		#endregion
+
+		class ButtonBarButton : IButtonBarButton
+		{
+			CommandInfo lastCmdInfo;
+			MainToolbarController Controller { get; set; }
+			string CommandId { get; set; }
+
+			public ButtonBarButton (MainToolbarController controller, string commandId) : this (controller)
+			{
+				CommandId = commandId;
+			}
+
+			public ButtonBarButton (MainToolbarController controller)
+			{
+				Controller = controller;
+			}
+
+			public IconId Image { get; set; }
+			public bool Enabled { get; set; }
+			public bool Visible { get; set; }
+			public string Tooltip { get; set; }
+			public string Title { get; set; }
+			public bool IsSeparator {
+				get { return CommandId == null; }
+			}
+
+			public void NotifyPushed ()
+			{
+				IdeApp.CommandService.DispatchCommand (CommandId, null, Controller.lastCommandTarget, CommandSource.MainToolbar, lastCmdInfo);
+			}
+
+			public void Update ()
+			{
+				if (IsSeparator)
+					return;
+
+				if (lastCmdInfo != null) {
+					lastCmdInfo.CancelAsyncUpdate ();
+					lastCmdInfo.Changed -= LastCmdInfoChanged;
+				}
+				
+				lastCmdInfo = IdeApp.CommandService.GetCommandInfo (CommandId, new CommandTargetRoute (Controller.lastCommandTarget));
+
+				if (lastCmdInfo != null) {
+					lastCmdInfo.Changed += LastCmdInfoChanged;
+					Update (lastCmdInfo);
+				}
+			}
+
+			void Update (CommandInfo ci)
+			{
+				if (ci.Icon != Image) {
+					Image = ci.Icon;
+					if (ImageChanged != null)
+						ImageChanged (this, null);
+				}
+				if (ci.Enabled != Enabled) {
+					Enabled = ci.Enabled;
+					if (EnabledChanged != null)
+						EnabledChanged (this, null);
+				}
+				if (ci.Description != Tooltip) {
+					Tooltip = ci.Description;
+					if (TooltipChanged != null)
+						TooltipChanged (this, null);
+				}
+				if (ci.Visible != Visible) {
+					Visible = ci.Visible;
+					if (VisibleChanged != null)
+						VisibleChanged (this, null);
+				}
+				if (ci.Text != Title) {
+					Title = ci.Text;
+					TitleChanged?.Invoke (this, null);
+				}
+			}
+
+			void LastCmdInfoChanged (object sender, EventArgs e)
+			{
+				Update (lastCmdInfo); 
+			}
+
+			public event EventHandler EnabledChanged;
+			public event EventHandler ImageChanged;
+			public event EventHandler VisibleChanged;
+			public event EventHandler TooltipChanged;
+			public event EventHandler TitleChanged;
+		}
+
+		[Serializable]
+		class RuntimeModel : IRuntimeModel
+		{
+			MainToolbarController Controller { get; set; }
+			List<IRuntimeModel> children = new List<IRuntimeModel> ();
+			public object Command { get; private set; }
+			public ExecutionTarget ExecutionTarget { get; private set; }
+			string DisplayText = null;
+			string image, tooltip;
+			bool fullText;
+
+			RuntimeModel (MainToolbarController controller)
+			{
+				Controller = controller;
+			}
+
+			public RuntimeModel (MainToolbarController controller, string displayText) : this (controller)
+			{
+				DisplayText = displayText;
+			}
+
+			public RuntimeModel (MainToolbarController controller, ActionCommand command) : this (controller)
+			{
+				Command = command.Id;
+				image = command.Icon;
+				tooltip = command.Description;
+			}
+
+			public RuntimeModel (MainToolbarController controller, ExecutionTarget target, bool fullText, SolutionItem project) : this (controller)
+			{
+				if (target == null)
+					throw new ArgumentNullException (nameof (target));
+				
+				ExecutionTarget = target;
+				image = target.Image;
+				tooltip = target.Tooltip;
+
+				this.fullText = fullText;
+				Project = project;
+			}
+
+			public void AddChild (IRuntimeModel child)
+			{
+				children.Add (child);
+			}
+
+			public IEnumerable<IRuntimeModel> Children {
+				get { return children; }
+			}
+
+			public bool Notable {
+				get { return ExecutionTarget != null && ExecutionTarget.Notable; }
+			}
+
+			public bool HasChildren {
+				get;
+				set;
+			}
+
+			public bool IsSeparator {
+				get { return Command == null && ExecutionTarget == null && DisplayText == null; }
+			}
+
+			public bool IsIndented {
+				get;
+				set;
+			}
+
+			public bool NotifyActivated ()
+			{
+				if (Command != null && IdeApp.CommandService.DispatchCommand (Command, CommandSource.ContextMenu))
+					return true;
+				return false;
+			}
+
+			internal string TargetId {
+				get {
+					if (ExecutionTarget == null)
+						return "";
+					return ExecutionTarget.Id;
+				}
+			}
+
+			public SolutionItem Project { get; }
+
+			public string Image => image;
+
+			public string Tooltip => tooltip;
+
+			public IRuntimeMutableModel GetMutableModel ()
+			{
+				if (Command != null)
+					return new RuntimeMutableModel (Controller, Command);
+				else if (ExecutionTarget != null)
+					return new RuntimeMutableModel (ExecutionTarget, fullText);
+				else
+					return new RuntimeMutableModel (DisplayText);
+			}
+		}
+
+		[Serializable]
+		class RuntimeMutableModel : IRuntimeMutableModel
+		{
+			public RuntimeMutableModel(string text)
+			{
+				Enabled = Visible = true;
+				DisplayString = FullDisplayString = text;
+			}
+
+			public RuntimeMutableModel (MainToolbarController controller, object command)
+			{
+				var ci = IdeApp.CommandService.GetCommandInfo (command, new CommandTargetRoute (controller.lastCommandTarget));
+				Visible = ci.Visible;
+				Enabled = ci.Enabled;
+				DisplayString = FullDisplayString = RemoveUnderline (ci.Text);
+			}
+
+			public RuntimeMutableModel (ExecutionTarget target, bool fullName)
+			{
+				Enabled = !(target is ExecutionTargetGroup) && target.Enabled;
+				Visible = true;
+				if (target == null)
+					DisplayString = FullDisplayString = string.Empty;
+				else {
+					FullDisplayString = target.FullName;
+					DisplayString = fullName ? target.FullName : target.Name;
+				}
+			}
+
+			// Marker so it won't be reused.
+			public void Dispose ()
+			{
+			}
+
+			public bool Visible {
+				get;
+				private set;
+			}
+
+			public bool Enabled {
+				get;
+				private set;
+			}
+
+			public string DisplayString {
+				get;
+				private set;
+			}
+
+			public string FullDisplayString {
+				get;
+				private set;
+			}
+
+			static string RemoveUnderline (string s)
+			{
+				int i = s.IndexOf ('_');
+				if (i == -1)
+					return s;
+				var sb = StringBuilderCache.Allocate ();
+				sb.Append (s, 0, i);
+				for (; i < s.Length; i++) {
+					if (s [i] == '_') {
+						i++;
+						if (i >= s.Length)
+							break;
+					}
+					sb.Append (s [i]);
+				}
+				return StringBuilderCache.ReturnAndFree (sb);
+			}
+		}
+
+		[Serializable]
+		class ConfigurationModel : IConfigurationModel
+		{
+			public ConfigurationModel (string originalId)
+			{
+				OriginalId = originalId;
+				DisplayString = originalId.Replace ("|", " | ");
+			}
+
+			public string OriginalId { get; private set; }
+			public string DisplayString { get; private set; }
+		}
+
+		[Serializable]
+		class RunConfigurationModel : IRunConfigurationModel
+		{
+			public RunConfigurationModel (SolutionRunConfiguration config)
+			{
+				RunConfiguration = config;
+				OriginalId = config.Id;
+				DisplayString = config.Name;
+			}
+
+			public SolutionRunConfiguration RunConfiguration { get; set; }
+			public string OriginalId { get; private set; }
+			public string DisplayString { get; private set; }
+		}
+
+		class SearchMenuModel : ISearchMenuModel
+		{
+			public SearchMenuModel (string displayString, string category)
+			{
+				DisplayString = displayString;
+				Category = category;
+			}
+
+			public void NotifyActivated ()
+			{
+				if (Activated != null)
+					Activated (null, null);
+			}
+
+			public string DisplayString { get; private set; }
+			public string Category { get; set; }
+			public event EventHandler Activated;
+		}
+	}
+
+	public class SearchEntryCommandArgs : HandledEventArgs
+	{
+		public SearchPopupCommand Command { get; private set; }
+
+		public SearchEntryCommandArgs (SearchPopupCommand command)
+		{
+			Command = command;
+		}
+	}
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
index 8e8de3984e2..d79ba003f57 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
@@ -1,4 +1,4 @@
-//
+//
 // GtkWorkarounds.cs
 //
 // Authors: Jeffrey Stedfast <jeff@xamarin.com>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index 9329838e2c6..f1e5f911430 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <Import Project="..\..\..\MonoDevelop.props" />
   <Import Project="$(ReferencesGtk)" />
   <Import Project="$(ReferencesVSEditor)" />
@@ -17,7 +17,10 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
   <ItemGroup>
-    <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+      <HintPath Condition="'$(OS)' == 'Windows_NT'">$(MSBuildProgramFiles32)\Mono\lib\mono\monodoc\monodoc.dll</HintPath>
+      <Private Condition="'$(OS)' == 'Windows_NT'">True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -133,14 +136,6 @@
       <Project>{288994D1-C7E1-4740-99AB-A52B572EBA8A}</Project>
       <Name>MonoDevelop.GtkExtensions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj">
-      <Project>{8F0B736F-8353-4A6C-B471-192D826BDD81}</Project>
-      <Name>Xwt.GtkSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj">
-      <Project>{410A7DC9-E7DA-43E6-B592-93E2A344B660}</Project>
-      <Name>Mono.Addins.GuiGtk3</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="!$(HaveGtkSharp)">
     <ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj">
@@ -158,7 +153,6 @@
     <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\**\*.png" LinkBase="MonoDevelop.Components.Docking\icons" />
     <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\assets\**\*.png" LinkBase="MonoDevelop.Components.MainToolbar\assets" />
     <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\icons\**\*.png" LinkBase="MonoDevelop.Components.MainToolbar\icons" />
-
     <EmbeddedResource Include="templates\images\**\*.png" LinkBase="templates\images" />
     <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\**\*.png" LinkBase="MonoDevelop.Ide.WelcomePage\icons\" />
     <EmbeddedResource Include="resources\**\*.png" LinkBase="resources" />
@@ -166,7 +160,6 @@
   <ItemGroup>
     <EmbeddedResource Include="templates\**\*.xml" LinkBase="templates" />
     <EmbeddedResource Include="options\**\KeyBinding*.xml" LinkBase="options" />
-
     <EmbeddedResource Include="ExtensionModel\Commands.addin.xml" />
     <EmbeddedResource Include="ExtensionModel\DefaultPolicyPanels.addin.xml" />
     <EmbeddedResource Include="ExtensionModel\GlobalOptionsDialog.addin.xml" />
@@ -179,13 +172,11 @@
     <EmbeddedResource Include="ExtensionModel\Policies.addin.xml" />
     <EmbeddedResource Include="ExtensionModel\StockIcons.addin.xml" />
     <EmbeddedResource Include="ExtensionModel\Templates.addin.xml" />
-
     <EmbeddedResource Include="MonoDevelop.Components.Commands\CommandsExtensionModel.addin.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.BuildOutputView\BuildOutputExtension.addin.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.Gui.Pads.ClassPad\ClassPadContextMenu.addin.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\ProjectPadContextMenu.addin.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.Projects.FileNesting\FileNestingExtensionModel.addin.xml" />
-
     <EmbeddedResource Include="MonoDevelop.Ide.CodeFormatting\InvariantTextStylePolicy.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.CodeFormatting\MonoTextStylePolicy.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.CodeFormatting\VisualStudioTextStylePolicy.xml" />
@@ -197,7 +188,6 @@
     <EmbeddedResource Include="MonoDevelop.Ide.StandardHeader\LGPL3LicencePolicy.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.StandardHeader\MITX11LicencePolicy.xml" />
     <EmbeddedResource Include="MonoDevelop.Ide.StandardHeader\NewBSDLicencePolicy.xml" />
-
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\Ashx.sublime-syntax" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\AspNet.sublime-syntax" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\ASP\Razor.sublime-syntax" />
@@ -212,7 +202,6 @@
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\Markdown\Markdown.sublime-syntax" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\T4\T4.sublime-syntax" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\Yaml\Yaml.sublime-syntax" />
-
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\DarkStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\FallbackStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\GruvboxStyle.json" />
@@ -226,7 +215,6 @@
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\SolarizedLightStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\TangoStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\VisualStudioStyle.json" />
-
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\bat\syntaxes\BatchFile.tmLanguage" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\syntaxes\c.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\cpp\syntaxes\c++.json" />
@@ -248,8 +236,6 @@
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\xml\syntaxes\xaml.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\xml\syntaxes\xml.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\xml\syntaxes\xsl.json" />
-
-
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MonoDevelop.Components.Commands\ICustomCommandTarget.cs" />
@@ -1602,13 +1588,14 @@
     <InternalsVisibleTo Include="Xamarin.OSXEditor" />
     <InternalsVisibleTo Include="Xamarin.Sketches" />
   </ItemGroup>
-  <ItemGroup>
+    <ItemGroup>
     <Folder Include="MonoDevelop.Components\Shared\" />
     <Folder Include="MonoDevelop.Ide.Projects.FileNesting\" />
     <Folder Include="MonoDevelop.Components\Cairo\" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
     <Copy SourceFiles="@(Data)" DestinationFolder="..\..\..\build\data\%(Data.RelativeDir)" SkipUnchangedFiles="true" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
index 389cdd31e81..bbf2bd58a1c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
@@ -1,4 +1,4 @@
-//
+//
 // IdeStartup.cs
 //
 // Author: