From 8992ca57baa85fa41bb6566422fa53da156ed1a7 Mon Sep 17 00:00:00 2001
From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
Date: Sat, 2 Jun 2012 17:50:50 +0000
Subject: msvc project update : some modifications to ease transition to msvc
 2010/msvc 2012

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17536 11d20701-8431-0410-a711-e3c959e3b870
---
 BUILDING_win32_msvc.txt                            |    2 +-
 win32/vc9/Scribus-build-props.vsprops              |   55 +
 win32/vc9/Scribus-build-rules.rules                |   56 +
 win32/vc9/Scribus-build.rules                      |   56 -
 win32/vc9/Scribus-build.vsprops                    |   55 -
 win32/vc9/aiimport/aiimport.vcproj                 |   58 +-
 win32/vc9/barcodegenerator/barcodegenerator.vcproj |   58 +-
 win32/vc9/colorwheel/colorwheel.vcproj             |   66 +-
 win32/vc9/cvgimport/cvgimport.vcproj               |   58 +-
 win32/vc9/fontpreview/fontpreview.vcproj           |   58 +-
 win32/vc9/gettext-csvim/gettext-csvim.vcproj       |   50 +-
 win32/vc9/gettext-docim/gettext-docim.vcproj       |   50 +-
 win32/vc9/gettext-htmlim/gettext-htmlim.vcproj     |   42 +-
 win32/vc9/gettext-odtim/gettext-odtim.vcproj       |   50 +-
 win32/vc9/gettext-pdbim/gettext-pdbim.vcproj       |   42 +-
 win32/vc9/gettext-sxwim/gettext-sxwim.vcproj       |   50 +-
 .../gettext-textfilter/gettext-textfilter.vcproj   |   58 +-
 win32/vc9/gettext-txtim/gettext-txtim.vcproj       |   42 +-
 win32/vc9/hunspellcheck/hunspellcheck.vcproj       |   66 +-
 win32/vc9/lenseffects/lenseffects.vcproj           |   50 +-
 win32/vc9/meshdistortion/meshdistortion.vcproj     |   58 +-
 win32/vc9/oodrawimport/oodrawimport.vcproj         |   50 +-
 win32/vc9/pathalongpath/pathalongpath.vcproj       |   58 +-
 win32/vc9/pathconnect/pathconnect.vcproj           |   58 +-
 win32/vc9/pathcut/pathcut.vcproj                   |   50 +-
 win32/vc9/pathfinder/pathfinder.vcproj             |   58 +-
 win32/vc9/pathstroker/pathstroker.vcproj           |   50 +-
 win32/vc9/pctimport/pctimport.vcproj               |   58 +-
 win32/vc9/pixmapexport/pixmapexport.vcproj         |   58 +-
 win32/vc9/psimport/psimport.vcproj                 |   58 +-
 win32/vc9/saveastemplate/saveastemplate.vcproj     |   58 +-
 win32/vc9/scribus-desaxe/scribus-desaxe.vcproj     |    8 +-
 win32/vc9/scribus-exe/scribus.vcproj               | 1818 ++++++++++----------
 win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj |    8 +-
 win32/vc9/scribus12format/scribus12format.vcproj   |   58 +-
 win32/vc9/scribus134format/scribus134format.vcproj |   58 +-
 win32/vc9/scribus13format/scribus13format.vcproj   |   58 +-
 win32/vc9/scriptplugin/scriptplugin.vcproj         |   82 +-
 win32/vc9/shortwords/shortwords.vcproj             |   82 +-
 win32/vc9/subdivide/subdivide.vcproj               |   50 +-
 win32/vc9/svgexport/svgexport.vcproj               |   50 +-
 win32/vc9/svgimport/svgimport.vcproj               |   50 +-
 win32/vc9/transform/transform.vcproj               |   58 +-
 win32/vc9/wmfimport/wmfimport.vcproj               |   58 +-
 win32/vc9/xfigimport/xfigimport.vcproj             |   58 +-
 45 files changed, 2066 insertions(+), 2066 deletions(-)
 create mode 100644 win32/vc9/Scribus-build-props.vsprops
 create mode 100644 win32/vc9/Scribus-build-rules.rules
 delete mode 100644 win32/vc9/Scribus-build.rules
 delete mode 100644 win32/vc9/Scribus-build.vsprops

diff --git a/BUILDING_win32_msvc.txt b/BUILDING_win32_msvc.txt
index 072f764..77b1e27 100644
--- a/BUILDING_win32_msvc.txt
+++ b/BUILDING_win32_msvc.txt
@@ -27,7 +27,7 @@ You will need:
 
 Some more details can be found below in the section entitled GETTING DEPENDENCIES.
 
-After having installed all dependencies, open Scribus-build.vsprops files located 
+After having installed all dependencies, open Scribus-build-props.vsprops files located 
 in Scribus\win32\vc9 and update the dependency paths to match your system.
 
 Open the Visual Studio solution located in Scribus\win32\vc9 and start building. The *-cairo 
diff --git a/win32/vc9/Scribus-build-props.vsprops b/win32/vc9/Scribus-build-props.vsprops
new file mode 100644
index 0000000..c70f9d2
--- /dev/null
+++ b/win32/vc9/Scribus-build-props.vsprops
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Scribus-build-props"
+	>
+	<UserMacro
+		Name="QT4_DIR"
+		Value="F:\Libraries-vc9\qt-4.7.3"
+	/>
+	<UserMacro
+		Name="BOOST_DIR"
+		Value="F:\Libraries-vc9\boost-1.35.0"
+	/>
+	<UserMacro
+		Name="CAIRO_DIR"
+		Value="F:\Libraries-vc9\cairo-1.8.6"
+	/>
+	<UserMacro
+		Name="FREETYPE_DIR"
+		Value="F:\Libraries-vc9\freetype-2.4.6"
+	/>
+	<UserMacro
+		Name="HUNSPELL_DIR"
+		Value="F:\Libraries-vc9\hunspell-1.3.2"
+	/>
+	<UserMacro
+		Name="ICONV_DIR"
+		Value="F:\Libraries-vc9\iconv-1.9.2"
+	/>
+	<UserMacro
+		Name="LCMS_DIR"
+		Value="F:\Libraries-vc9\lcms2-2.3"
+	/>
+	<UserMacro
+		Name="LIBJPEG_DIR"
+		Value="F:\Libraries-vc9\libjpeg-6b-3"
+	/>
+	<UserMacro
+		Name="LIBTIFF_DIR"
+		Value="F:\Libraries-vc9\libtiff-3.8.2"
+	/>
+	<UserMacro
+		Name="PODOFO_DIR"
+		Value="F:\Libraries-vc9\podofo-0.8.4"
+	/>
+	<UserMacro
+		Name="LIBXML2_DIR"
+		Value="F:\Libraries-vc9\libxml2-2.6.32+"
+	/>
+	<UserMacro
+		Name="PYTHON_DIR"
+		Value="F:\Libraries-vc9\Python-2.7.1"
+	/>
+</VisualStudioPropertySheet>
diff --git a/win32/vc9/Scribus-build-rules.rules b/win32/vc9/Scribus-build-rules.rules
new file mode 100644
index 0000000..47a2906
--- /dev/null
+++ b/win32/vc9/Scribus-build-rules.rules
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+	Name="Qt Build Rules"
+	Version="8,00"
+	>
+	<Rules>
+		<CustomBuildRule
+			Name="uic"
+			DisplayName="Qt UI Compiler"
+			CommandLine="$(QT4_DIR)\bin\uic.exe [inputs] -o &quot;$(InputDir)\ui_$(InputName).h&quot;"
+			Outputs="$(InputDir)\ui_$(InputName).h"
+			AdditionalDependencies="$(QT4_DIR)\bin\uic.exe"
+			FileExtensions="*.ui"
+			ExecutionDescription="Uic&apos;ing $(InputFileName)"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+		<CustomBuildRule
+			Name="moc"
+			DisplayName="Qt MetaObject Compiler"
+			CommandLine="$(QT4_DIR)\bin\moc.exe [inputs] -o &quot;$(InputDir)\moc_$(InputName).cpp&quot;"
+			Outputs="$(InputDir)\moc_$(InputName).cpp"
+			AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
+			FileExtensions="*.moc"
+			ExecutionDescription="Moc&apos;ing $(InputFileName)"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+		<CustomBuildRule
+			Name="rcc"
+			DisplayName="Qt Resource Compiler"
+			CommandLine="$(QT4_DIR)\bin\rcc.exe [inputs] -o &quot;$(InputDir)\rcc_$(InputName).cpp&quot;"
+			Outputs="$(InputDir)\rcc_$(InputName).cpp"
+			AdditionalDependencies="$(QT4_DIR)\bin\rcc.exe"
+			FileExtensions="*.qrc"
+			ExecutionDescription="$(InputName).qrc"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+		<CustomBuildRule
+			Name="lrelease"
+			DisplayName="Qt Translation Compiler"
+			CommandLine="$(QT4_DIR)\bin\lrelease.exe [inputs] -qm &quot;$(OutDir)\share\translations\$(InputName).qm&quot;"
+			Outputs="$(OutDir)\share\translations\$(InputName).qm"
+			AdditionalDependencies="$(QT4_DIR)\bin\lrelease.exe"
+			FileExtensions="*.ts"
+			ExecutionDescription="Lreleasing $(InputFileName)"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+	</Rules>
+</VisualStudioToolFile>
diff --git a/win32/vc9/Scribus-build.rules b/win32/vc9/Scribus-build.rules
deleted file mode 100644
index f23da06..0000000
--- a/win32/vc9/Scribus-build.rules
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="Qt Build Rules"
-	Version="8,00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="uic.exe"
-			DisplayName="Qt UI Compiler"
-			CommandLine="$(QT4_DIR)\bin\uic.exe [inputs] -o &quot;$(InputDir)\ui_$(InputName).h&quot;"
-			Outputs="$(InputDir)\ui_$(InputName).h"
-			AdditionalDependencies="$(QT4_DIR)\bin\uic.exe"
-			FileExtensions="*.ui"
-			ExecutionDescription="Uic&apos;ing $(InputFileName)"
-			>
-			<Properties>
-			</Properties>
-		</CustomBuildRule>
-		<CustomBuildRule
-			Name="moc.exe"
-			DisplayName="Qt MetaObject Compiler"
-			CommandLine="$(QT4_DIR)\bin\moc.exe [inputs] -o &quot;$(InputDir)\moc_$(InputName).cpp&quot;"
-			Outputs="$(InputDir)\moc_$(InputName).cpp"
-			AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
-			FileExtensions="*.moc"
-			ExecutionDescription="Moc&apos;ing $(InputFileName)"
-			>
-			<Properties>
-			</Properties>
-		</CustomBuildRule>
-		<CustomBuildRule
-			Name="rcc.exe"
-			DisplayName="Qt Resource Compiler"
-			CommandLine="$(QT4_DIR)\bin\rcc.exe [inputs] -o &quot;$(InputDir)\rcc_$(InputName).cpp&quot;"
-			Outputs="$(InputDir)\rcc_$(InputName).cpp"
-			AdditionalDependencies="$(QT4_DIR)\bin\rcc.exe"
-			FileExtensions="*.qrc"
-			ExecutionDescription="$(InputName).qrc"
-			>
-			<Properties>
-			</Properties>
-		</CustomBuildRule>
-		<CustomBuildRule
-			Name="lrelease.exe"
-			DisplayName="Qt Translation Compiler"
-			CommandLine="$(QT4_DIR)\bin\lrelease.exe [inputs] -qm &quot;$(OutDir)\share\translations\$(InputName).qm&quot;"
-			Outputs="$(OutDir)\share\translations\$(InputName).qm"
-			AdditionalDependencies="$(QT4_DIR)\bin\lrelease.exe"
-			FileExtensions="*.ts"
-			ExecutionDescription="Lreleasing $(InputFileName)"
-			>
-			<Properties>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/win32/vc9/Scribus-build.vsprops b/win32/vc9/Scribus-build.vsprops
deleted file mode 100644
index dce85ed..0000000
--- a/win32/vc9/Scribus-build.vsprops
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="Scribus-build"
-	>
-	<UserMacro
-		Name="QT4_DIR"
-		Value="F:\Libraries-vc9\qt-4.7.3"
-	/>
-	<UserMacro
-		Name="BOOST_DIR"
-		Value="F:\Libraries-vc9\boost-1.35.0"
-	/>
-	<UserMacro
-		Name="CAIRO_DIR"
-		Value="F:\Libraries-vc9\cairo-1.8.6"
-	/>
-	<UserMacro
-		Name="FREETYPE_DIR"
-		Value="F:\Libraries-vc9\freetype-2.4.6"
-	/>
-	<UserMacro
-		Name="HUNSPELL_DIR"
-		Value="F:\Libraries-vc9\hunspell-1.3.2"
-	/>
-	<UserMacro
-		Name="ICONV_DIR"
-		Value="F:\Libraries-vc9\iconv-1.9.2"
-	/>
-	<UserMacro
-		Name="LCMS_DIR"
-		Value="F:\Libraries-vc9\lcms2-2.3"
-	/>
-	<UserMacro
-		Name="LIBJPEG_DIR"
-		Value="F:\Libraries-vc9\libjpeg-6b-3"
-	/>
-	<UserMacro
-		Name="LIBTIFF_DIR"
-		Value="F:\Libraries-vc9\libtiff-3.8.2"
-	/>
-	<UserMacro
-		Name="PODOFO_DIR"
-		Value="F:\Libraries-vc9\podofo-0.8.4"
-	/>
-	<UserMacro
-		Name="LIBXML2_DIR"
-		Value="F:\Libraries-vc9\libxml2-2.6.32+"
-	/>
-	<UserMacro
-		Name="PYTHON_DIR"
-		Value="F:\Libraries-vc9\Python-2.7.1"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vc9/aiimport/aiimport.vcproj b/win32/vc9/aiimport/aiimport.vcproj
index 103e6a1..7397a93 100644
--- a/win32/vc9/aiimport/aiimport.vcproj
+++ b/win32/vc9/aiimport/aiimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/barcodegenerator/barcodegenerator.vcproj b/win32/vc9/barcodegenerator/barcodegenerator.vcproj
index 9d33a72..74747ad 100644
--- a/win32/vc9/barcodegenerator/barcodegenerator.vcproj
+++ b/win32/vc9/barcodegenerator/barcodegenerator.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -471,28 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/colorwheel/colorwheel.vcproj b/win32/vc9/colorwheel/colorwheel.vcproj
index 83ceacd..7a39838 100644
--- a/win32/vc9/colorwheel/colorwheel.vcproj
+++ b/win32/vc9/colorwheel/colorwheel.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -442,28 +442,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -474,28 +474,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -506,28 +506,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/cvgimport/cvgimport.vcproj b/win32/vc9/cvgimport/cvgimport.vcproj
index 4dba4a0..4da7a2d 100644
--- a/win32/vc9/cvgimport/cvgimport.vcproj
+++ b/win32/vc9/cvgimport/cvgimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/fontpreview/fontpreview.vcproj b/win32/vc9/fontpreview/fontpreview.vcproj
index 8575678..894fbe5 100644
--- a/win32/vc9/fontpreview/fontpreview.vcproj
+++ b/win32/vc9/fontpreview/fontpreview.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/gettext-csvim/gettext-csvim.vcproj b/win32/vc9/gettext-csvim/gettext-csvim.vcproj
index 6ae63f0..22726f5 100644
--- a/win32/vc9/gettext-csvim/gettext-csvim.vcproj
+++ b/win32/vc9/gettext-csvim/gettext-csvim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/gettext-docim/gettext-docim.vcproj b/win32/vc9/gettext-docim/gettext-docim.vcproj
index 90b1f4f..93ecc4d 100644
--- a/win32/vc9/gettext-docim/gettext-docim.vcproj
+++ b/win32/vc9/gettext-docim/gettext-docim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -434,28 +434,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj b/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
index 3c0dd9a..99c2e08 100644
--- a/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
+++ b/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
diff --git a/win32/vc9/gettext-odtim/gettext-odtim.vcproj b/win32/vc9/gettext-odtim/gettext-odtim.vcproj
index aea957e..2af6473 100644
--- a/win32/vc9/gettext-odtim/gettext-odtim.vcproj
+++ b/win32/vc9/gettext-odtim/gettext-odtim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -450,28 +450,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj b/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
index 5f28cdf..5f56941 100644
--- a/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
+++ b/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
diff --git a/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj b/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
index b53e637..f886006 100644
--- a/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
+++ b/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -454,28 +454,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj b/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
index 78c7a4b..add3321 100644
--- a/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
+++ b/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -446,28 +446,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -478,28 +478,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/gettext-txtim/gettext-txtim.vcproj b/win32/vc9/gettext-txtim/gettext-txtim.vcproj
index 4110ca6..0b98699 100644
--- a/win32/vc9/gettext-txtim/gettext-txtim.vcproj
+++ b/win32/vc9/gettext-txtim/gettext-txtim.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
diff --git a/win32/vc9/hunspellcheck/hunspellcheck.vcproj b/win32/vc9/hunspellcheck/hunspellcheck.vcproj
index 1c9c6e5..e552cd9 100644
--- a/win32/vc9/hunspellcheck/hunspellcheck.vcproj
+++ b/win32/vc9/hunspellcheck/hunspellcheck.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -443,28 +443,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -475,28 +475,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -507,28 +507,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/lenseffects/lenseffects.vcproj b/win32/vc9/lenseffects/lenseffects.vcproj
index abb2552..6904e11 100644
--- a/win32/vc9/lenseffects/lenseffects.vcproj
+++ b/win32/vc9/lenseffects/lenseffects.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/meshdistortion/meshdistortion.vcproj b/win32/vc9/meshdistortion/meshdistortion.vcproj
index cef052e..edb544b 100644
--- a/win32/vc9/meshdistortion/meshdistortion.vcproj
+++ b/win32/vc9/meshdistortion/meshdistortion.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -471,28 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/oodrawimport/oodrawimport.vcproj b/win32/vc9/oodrawimport/oodrawimport.vcproj
index b63022c..99c3e35 100644
--- a/win32/vc9/oodrawimport/oodrawimport.vcproj
+++ b/win32/vc9/oodrawimport/oodrawimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pathalongpath/pathalongpath.vcproj b/win32/vc9/pathalongpath/pathalongpath.vcproj
index d915712..cd30967 100644
--- a/win32/vc9/pathalongpath/pathalongpath.vcproj
+++ b/win32/vc9/pathalongpath/pathalongpath.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -471,28 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pathconnect/pathconnect.vcproj b/win32/vc9/pathconnect/pathconnect.vcproj
index b6eb658..b3dc86c 100644
--- a/win32/vc9/pathconnect/pathconnect.vcproj
+++ b/win32/vc9/pathconnect/pathconnect.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -471,28 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pathcut/pathcut.vcproj b/win32/vc9/pathcut/pathcut.vcproj
index 477cf6b..9b9675e 100644
--- a/win32/vc9/pathcut/pathcut.vcproj
+++ b/win32/vc9/pathcut/pathcut.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -435,28 +435,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pathfinder/pathfinder.vcproj b/win32/vc9/pathfinder/pathfinder.vcproj
index 02d30cf..9e21e3d 100644
--- a/win32/vc9/pathfinder/pathfinder.vcproj
+++ b/win32/vc9/pathfinder/pathfinder.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -471,28 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pathstroker/pathstroker.vcproj b/win32/vc9/pathstroker/pathstroker.vcproj
index d6608d8..8e7eace 100644
--- a/win32/vc9/pathstroker/pathstroker.vcproj
+++ b/win32/vc9/pathstroker/pathstroker.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -435,28 +435,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pctimport/pctimport.vcproj b/win32/vc9/pctimport/pctimport.vcproj
index c19acb4..ea17be4 100644
--- a/win32/vc9/pctimport/pctimport.vcproj
+++ b/win32/vc9/pctimport/pctimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/pixmapexport/pixmapexport.vcproj b/win32/vc9/pixmapexport/pixmapexport.vcproj
index 7a208f5..f7255a1 100644
--- a/win32/vc9/pixmapexport/pixmapexport.vcproj
+++ b/win32/vc9/pixmapexport/pixmapexport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/psimport/psimport.vcproj b/win32/vc9/psimport/psimport.vcproj
index c4b259d..5428ec8 100644
--- a/win32/vc9/psimport/psimport.vcproj
+++ b/win32/vc9/psimport/psimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/saveastemplate/saveastemplate.vcproj b/win32/vc9/saveastemplate/saveastemplate.vcproj
index df4e3aa..8ec8e43 100644
--- a/win32/vc9/saveastemplate/saveastemplate.vcproj
+++ b/win32/vc9/saveastemplate/saveastemplate.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj b/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj
index 52438f3..8ef8db4 100644
--- a/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj
+++ b/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -87,7 +87,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
@@ -154,7 +154,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -220,7 +220,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
diff --git a/win32/vc9/scribus-exe/scribus.vcproj b/win32/vc9/scribus-exe/scribus.vcproj
index 57ab4a7..4876eee 100644
--- a/win32/vc9/scribus-exe/scribus.vcproj
+++ b/win32/vc9/scribus-exe/scribus.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -129,7 +129,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -137,19 +137,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -235,26 +235,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -340,7 +340,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -348,19 +348,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -2221,28 +2221,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2253,28 +2253,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2285,28 +2285,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2317,28 +2317,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2349,28 +2349,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2381,28 +2381,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2413,28 +2413,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2445,28 +2445,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2481,28 +2481,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2513,28 +2513,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2545,28 +2545,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2577,28 +2577,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2609,28 +2609,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2641,28 +2641,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2673,28 +2673,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2705,28 +2705,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2737,28 +2737,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2789,28 +2789,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2821,28 +2821,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2869,28 +2869,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2913,28 +2913,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2949,28 +2949,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2985,28 +2985,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3029,28 +3029,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3061,28 +3061,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3097,28 +3097,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3129,28 +3129,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3161,28 +3161,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3193,28 +3193,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3233,28 +3233,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3265,28 +3265,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3297,28 +3297,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3365,28 +3365,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3397,28 +3397,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3429,28 +3429,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3461,28 +3461,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3493,28 +3493,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3529,28 +3529,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3561,28 +3561,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3593,28 +3593,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3625,28 +3625,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3657,28 +3657,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3725,28 +3725,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3757,28 +3757,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3789,28 +3789,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3821,28 +3821,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3853,28 +3853,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3885,28 +3885,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3917,28 +3917,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3949,28 +3949,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3981,28 +3981,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4013,28 +4013,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4053,28 +4053,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4085,28 +4085,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4117,28 +4117,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4153,28 +4153,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4185,28 +4185,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4217,28 +4217,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4249,28 +4249,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4285,28 +4285,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4317,28 +4317,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4349,28 +4349,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4381,28 +4381,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4413,28 +4413,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4445,28 +4445,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4509,28 +4509,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4545,28 +4545,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4577,28 +4577,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4637,28 +4637,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4673,28 +4673,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4705,28 +4705,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4737,28 +4737,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4773,28 +4773,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4805,28 +4805,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4841,28 +4841,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4873,28 +4873,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4909,28 +4909,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4941,28 +4941,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4973,28 +4973,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5005,28 +5005,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5041,28 +5041,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5077,28 +5077,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5109,28 +5109,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5141,28 +5141,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5185,28 +5185,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5217,28 +5217,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5249,28 +5249,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5281,28 +5281,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5313,28 +5313,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5345,28 +5345,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5377,28 +5377,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5409,28 +5409,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5441,28 +5441,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5473,28 +5473,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5505,28 +5505,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5537,28 +5537,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5569,28 +5569,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5601,28 +5601,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5633,28 +5633,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5665,28 +5665,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5697,28 +5697,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5741,28 +5741,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5773,28 +5773,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5805,28 +5805,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5837,28 +5837,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5869,28 +5869,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5905,28 +5905,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5937,28 +5937,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5969,28 +5969,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6001,28 +6001,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6033,28 +6033,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6065,28 +6065,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6097,28 +6097,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6129,28 +6129,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6161,28 +6161,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6193,28 +6193,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6225,28 +6225,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6257,28 +6257,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6289,28 +6289,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6333,28 +6333,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6365,28 +6365,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6397,28 +6397,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6437,28 +6437,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6469,28 +6469,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6501,28 +6501,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6533,28 +6533,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6565,28 +6565,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6597,28 +6597,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6629,28 +6629,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6661,28 +6661,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6693,28 +6693,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6725,28 +6725,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6761,28 +6761,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6797,28 +6797,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6829,28 +6829,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6873,28 +6873,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6905,28 +6905,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6937,28 +6937,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6969,28 +6969,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7001,28 +7001,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7041,28 +7041,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7073,28 +7073,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7105,28 +7105,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7145,28 +7145,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7177,28 +7177,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7297,28 +7297,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7337,28 +7337,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7377,28 +7377,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7449,28 +7449,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7537,28 +7537,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7569,28 +7569,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7641,28 +7641,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7677,28 +7677,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7717,28 +7717,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7749,28 +7749,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7785,28 +7785,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7821,28 +7821,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7853,28 +7853,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7885,28 +7885,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7925,28 +7925,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7957,28 +7957,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8037,28 +8037,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8069,28 +8069,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8121,28 +8121,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8157,28 +8157,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8197,28 +8197,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8229,28 +8229,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8265,28 +8265,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8297,28 +8297,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8329,28 +8329,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8361,28 +8361,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8397,28 +8397,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8429,28 +8429,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8461,28 +8461,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8493,28 +8493,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8525,28 +8525,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8557,28 +8557,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8589,28 +8589,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8621,28 +8621,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8653,28 +8653,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8685,28 +8685,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8721,28 +8721,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8753,28 +8753,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8785,28 +8785,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8817,28 +8817,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8849,28 +8849,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8881,28 +8881,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8913,28 +8913,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8945,28 +8945,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8977,28 +8977,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9009,28 +9009,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9053,28 +9053,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9085,28 +9085,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9129,28 +9129,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9161,28 +9161,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9193,28 +9193,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9229,28 +9229,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9261,28 +9261,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9293,28 +9293,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9325,28 +9325,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9357,28 +9357,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9389,28 +9389,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9421,28 +9421,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9453,28 +9453,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9485,28 +9485,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9517,28 +9517,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9549,28 +9549,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9581,28 +9581,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9613,28 +9613,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9645,28 +9645,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9677,28 +9677,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9709,28 +9709,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9741,28 +9741,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9773,28 +9773,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9857,28 +9857,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9889,28 +9889,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9921,28 +9921,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -9965,28 +9965,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -10009,28 +10009,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -10041,28 +10041,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -10073,28 +10073,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -10153,28 +10153,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj b/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj
index 788379c..18358c4 100644
--- a/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj
+++ b/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -87,7 +87,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
@@ -154,7 +154,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -220,7 +220,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
diff --git a/win32/vc9/scribus12format/scribus12format.vcproj b/win32/vc9/scribus12format/scribus12format.vcproj
index 7afd152..b4c365f 100644
--- a/win32/vc9/scribus12format/scribus12format.vcproj
+++ b/win32/vc9/scribus12format/scribus12format.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/scribus134format/scribus134format.vcproj b/win32/vc9/scribus134format/scribus134format.vcproj
index 53c29f8..ca682a3 100644
--- a/win32/vc9/scribus134format/scribus134format.vcproj
+++ b/win32/vc9/scribus134format/scribus134format.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -442,28 +442,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -474,28 +474,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/scribus13format/scribus13format.vcproj b/win32/vc9/scribus13format/scribus13format.vcproj
index e9954be..b4b0e2a 100644
--- a/win32/vc9/scribus13format/scribus13format.vcproj
+++ b/win32/vc9/scribus13format/scribus13format.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/scriptplugin/scriptplugin.vcproj b/win32/vc9/scriptplugin/scriptplugin.vcproj
index a70e85b..fc9e54f 100644
--- a/win32/vc9/scriptplugin/scriptplugin.vcproj
+++ b/win32/vc9/scriptplugin/scriptplugin.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -594,28 +594,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -626,28 +626,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -658,28 +658,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -690,28 +690,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -722,28 +722,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/shortwords/shortwords.vcproj b/win32/vc9/shortwords/shortwords.vcproj
index 608ae81..2cac990 100644
--- a/win32/vc9/shortwords/shortwords.vcproj
+++ b/win32/vc9/shortwords/shortwords.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -451,28 +451,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -483,28 +483,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -515,28 +515,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -547,28 +547,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -583,28 +583,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/subdivide/subdivide.vcproj b/win32/vc9/subdivide/subdivide.vcproj
index 85a8c57..d321fcc 100644
--- a/win32/vc9/subdivide/subdivide.vcproj
+++ b/win32/vc9/subdivide/subdivide.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -435,28 +435,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/svgexport/svgexport.vcproj b/win32/vc9/svgexport/svgexport.vcproj
index 9e59fb3..7bc07e8 100644
--- a/win32/vc9/svgexport/svgexport.vcproj
+++ b/win32/vc9/svgexport/svgexport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -434,28 +434,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/svgimport/svgimport.vcproj b/win32/vc9/svgimport/svgimport.vcproj
index f7e984b..a308756 100644
--- a/win32/vc9/svgimport/svgimport.vcproj
+++ b/win32/vc9/svgimport/svgimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -434,28 +434,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/transform/transform.vcproj b/win32/vc9/transform/transform.vcproj
index 33dc08b..623d3b8 100644
--- a/win32/vc9/transform/transform.vcproj
+++ b/win32/vc9/transform/transform.vcproj
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -218,26 +218,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -313,26 +313,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -439,28 +439,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -471,28 +471,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/wmfimport/wmfimport.vcproj b/win32/vc9/wmfimport/wmfimport.vcproj
index 3a90a51..ca8a893 100644
--- a/win32/vc9/wmfimport/wmfimport.vcproj
+++ b/win32/vc9/wmfimport/wmfimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -458,28 +458,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -490,28 +490,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/win32/vc9/xfigimport/xfigimport.vcproj b/win32/vc9/xfigimport/xfigimport.vcproj
index 391e819..ec485ee 100644
--- a/win32/vc9/xfigimport/xfigimport.vcproj
+++ b/win32/vc9/xfigimport/xfigimport.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,26 +23,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -118,26 +118,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -217,26 +217,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -312,26 +312,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -438,28 +438,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -470,28 +470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
-- 
cgit