diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index cfff536145..2c84e7df26 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -404,6 +404,7 @@
     <ClInclude Include="..\src\base_station_base.h" />
     <ClInclude Include="..\src\bmp.h" />
     <ClInclude Include="..\src\bridge.h" />
+    <ClInclude Include="..\src\cargo_table_gui.h" />
     <ClInclude Include="..\src\cargo_type.h" />
     <ClInclude Include="..\src\cargoaction.h" />
     <ClInclude Include="..\src\cargomonitor.h" />
@@ -647,6 +648,7 @@
     <ClInclude Include="..\src\viewport_func.h" />
     <ClInclude Include="..\src\viewport_sprite_sorter.h" />
     <ClInclude Include="..\src\viewport_type.h" />
+    <ClInclude Include="..\src\watch_gui.h" />
     <ClInclude Include="..\src\water.h" />
     <ClInclude Include="..\src\waypoint_base.h" />
     <ClInclude Include="..\src\waypoint_func.h" />
@@ -658,6 +660,7 @@
     <ClInclude Include="..\src\window_func.h" />
     <ClInclude Include="..\src\window_gui.h" />
     <ClInclude Include="..\src\window_type.h" />
+    <ClInclude Include="..\src\zoning.h" />
     <ClInclude Include="..\src\zoom_func.h" />
     <ClInclude Include="..\src\zoom_type.h" />
     <ClCompile Include="..\src\core\alloc_func.cpp" />
@@ -694,7 +697,9 @@
     <ClCompile Include="..\src\bootstrap_gui.cpp" />
     <ClCompile Include="..\src\bridge_gui.cpp" />
     <ClCompile Include="..\src\build_vehicle_gui.cpp" />
+    <ClCompile Include="..\src\cargo_table_gui.cpp" />
     <ClCompile Include="..\src\cheat_gui.cpp" />
+    <ClCompile Include="..\src\commands_gui.cpp" />
     <ClCompile Include="..\src\company_gui.cpp" />
     <ClCompile Include="..\src\console_gui.cpp" />
     <ClCompile Include="..\src\date_gui.cpp" />
@@ -743,14 +748,17 @@
     <ClCompile Include="..\src\transparency_gui.cpp" />
     <ClCompile Include="..\src\tree_gui.cpp" />
     <ClCompile Include="..\src\vehicle_gui.cpp" />
+    <ClCompile Include="..\src\watch_gui.cpp" />
     <ClCompile Include="..\src\viewport_gui.cpp" />
     <ClCompile Include="..\src\waypoint_gui.cpp" />
+    <ClCompile Include="..\src\zoning_gui.cpp" />
     <ClInclude Include="..\src\widgets\airport_widget.h" />
     <ClInclude Include="..\src\widgets\ai_widget.h" />
     <ClInclude Include="..\src\widgets\autoreplace_widget.h" />
     <ClInclude Include="..\src\widgets\bootstrap_widget.h" />
     <ClInclude Include="..\src\widgets\bridge_widget.h" />
     <ClInclude Include="..\src\widgets\build_vehicle_widget.h" />
+    <ClInclude Include="..\src\widgets\cargo_table_widget.h" />
     <ClInclude Include="..\src\widgets\cheat_widget.h" />
     <ClInclude Include="..\src\widgets\company_widget.h" />
     <ClInclude Include="..\src\widgets\console_widget.h" />
@@ -828,6 +836,7 @@
     <ClCompile Include="..\src\void_cmd.cpp" />
     <ClCompile Include="..\src\water_cmd.cpp" />
     <ClCompile Include="..\src\waypoint_cmd.cpp" />
+    <ClCompile Include="..\src\zoning_cmd.cpp" />
     <ClCompile Include="..\src\saveload\afterload.cpp" />
     <ClCompile Include="..\src\saveload\ai_sl.cpp" />
     <ClCompile Include="..\src\saveload\airport_sl.cpp" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index b5dcdfc5a5..e0f052e4bf 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -441,6 +441,9 @@
     <ClInclude Include="..\src\bridge.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\cargo_table_gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\cargo_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1170,6 +1173,9 @@
     <ClInclude Include="..\src\viewport_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\watch_gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\water.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1203,6 +1209,9 @@
     <ClInclude Include="..\src\window_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\zoning.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\zoom_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1311,9 +1320,15 @@
     <ClCompile Include="..\src\build_vehicle_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cargo_table_gui.cpp">
+      <Filter>GUI Source Code</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\cheat_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\commands_gui.cpp">
+      <Filter>GUI Source Code</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\company_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
@@ -1458,12 +1473,18 @@
     <ClCompile Include="..\src\vehicle_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\watch_gui.cpp">
+      <Filter>GUI Source Code</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\viewport_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
     <ClCompile Include="..\src\waypoint_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\zoning_gui.cpp">
+      <Filter>GUI Source Code</Filter>
+    </ClCompile>
     <ClInclude Include="..\src\widgets\airport_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -1482,6 +1503,9 @@
     <ClInclude Include="..\src\widgets\build_vehicle_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\widgets\cargo_table_widget.h">
+      <Filter>Widgets</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\widgets\cheat_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -1713,6 +1737,9 @@
     <ClCompile Include="..\src\waypoint_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\zoning_cmd.cpp">
+      <Filter>Command handlers</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\saveload\afterload.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 17c2d8d4f1..61ac6094bc 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -890,6 +890,10 @@
 				RelativePath=".\..\src\bridge.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cargo_table_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargo_type.h"
 				>
@@ -1862,6 +1866,10 @@
 				RelativePath=".\..\src\viewport_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\watch_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\water.h"
 				>
@@ -1906,6 +1914,10 @@
 				RelativePath=".\..\src\window_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoning.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\zoom_func.h"
 				>
@@ -2058,10 +2070,18 @@
 				RelativePath=".\..\src\build_vehicle_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cargo_table_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cheat_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\commands_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\company_gui.cpp"
 				>
@@ -2254,6 +2274,10 @@
 				RelativePath=".\..\src\vehicle_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\watch_gui.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\viewport_gui.cpp"
 				>
@@ -2262,6 +2286,10 @@
 				RelativePath=".\..\src\waypoint_gui.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoning_gui.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Widgets"
@@ -2290,6 +2318,10 @@
 				RelativePath=".\..\src\widgets\build_vehicle_widget.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\widgets\cargo_table_widget.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\widgets\cheat_widget.h"
 				>
@@ -2602,6 +2634,10 @@
 				RelativePath=".\..\src\waypoint_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoning_cmd.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Save/Load handlers"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 38bf0cccbd..5b5bf99337 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="openttd"
 	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	RootNamespace="openttd"
@@ -15,8 +15,6 @@
 			Name="x64"
 		/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
@@ -55,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -90,8 +88,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/IGNORE:4099"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -126,6 +123,100 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
@@ -164,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -199,8 +290,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/IGNORE:4099"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
@@ -230,98 +320,7 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
-			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/openttd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
-				WarningLevel="3"
-				WarnAsError="false"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CallingConvention="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCWebDeploymentTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -360,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -390,7 +389,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
@@ -418,6 +417,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -445,10 +447,6 @@
 				RelativePath=".\..\src\autoreplace.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\base_consist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
@@ -509,10 +507,6 @@
 				RelativePath=".\..\src\dedicated.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\depot.cpp"
 				>
@@ -549,10 +543,6 @@
 				RelativePath=".\..\src\fios.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\fontcache.cpp"
 				>
@@ -561,6 +551,10 @@
 				RelativePath=".\..\src\fontdetection.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\base_consist.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\gamelog.cpp"
 				>
@@ -574,11 +568,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\gfx_layout.cpp"
+				RelativePath=".\..\src\gfxinit.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\gfxinit.cpp"
+				RelativePath=".\..\src\gfx_layout.cpp"
 				>
 			</File>
 			<File
@@ -613,6 +607,14 @@
 				RelativePath=".\..\src\landscape.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\demands.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\flowmapper.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\linkgraph\linkgraph.cpp"
 				>
@@ -626,11 +628,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\map.cpp"
+				RelativePath=".\..\src\linkgraph\mcf.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\linkgraph\mcf.cpp"
+				RelativePath=".\..\src\linkgraph\refresh.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map.cpp"
 				>
 			</File>
 			<File
@@ -697,10 +703,6 @@
 				RelativePath=".\..\src\rail.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\rev.cpp"
 				>
@@ -749,10 +751,6 @@
 				RelativePath=".\..\src\station.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\story.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\strgen\strgen_base.cpp"
 				>
@@ -769,6 +767,10 @@
 				RelativePath=".\..\src\strings.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\story.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\subsidy.cpp"
 				>
@@ -865,10 +867,6 @@
 				RelativePath=".\..\src\autoslope.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\base_consist.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\base_media_base.h"
 				>
@@ -890,7 +888,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\cargo_table_gui.h"
+				RelativePath=".\..\src\cargo_table_gui.h"
 				>
 			</File>
 			<File
@@ -1005,10 +1003,6 @@
 				RelativePath=".\..\src\video\dedicated_v.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\demands.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\depot_base.h"
 				>
@@ -1101,10 +1095,6 @@
 				RelativePath=".\..\src\fios.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\flowmapper.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\fontcache.h"
 				>
@@ -1113,6 +1103,10 @@
 				RelativePath=".\..\src\fontdetection.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\base_consist.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
@@ -1209,10 +1203,6 @@
 				RelativePath=".\..\src\ini_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\init.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\landscape.h"
 				>
@@ -1225,6 +1215,18 @@
 				RelativePath=".\..\src\language.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\demands.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\flowmapper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\init.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\linkgraph\linkgraph.h"
 				>
@@ -1253,6 +1255,14 @@
 				RelativePath=".\..\src\linkgraph\linkgraphschedule.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\mcf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\linkgraph\refresh.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\livery.h"
 				>
@@ -1265,10 +1275,6 @@
 				RelativePath=".\..\src\map_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\mcf.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\mixer.h"
 				>
@@ -1517,10 +1523,6 @@
 				RelativePath=".\..\src\rail_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\linkgraph\refresh.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\rev.h"
 				>
@@ -1862,7 +1864,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\watch_gui.h"
+				RelativePath=".\..\src\watch_gui.h"
 				>
 			</File>
 			<File
@@ -1910,7 +1912,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\zoning.h"
+				RelativePath=".\..\src\zoning.h"
 				>
 			</File>
 			<File
@@ -2066,7 +2068,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\cargo_table_gui.cpp"
+				RelativePath=".\..\src\cargo_table_gui.cpp"
 				>
 			</File>
 			<File
@@ -2074,7 +2076,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\commands_gui.cpp"
+				RelativePath=".\..\src\commands_gui.cpp"
 				>
 			</File>
 			<File
@@ -2270,11 +2272,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\viewport_gui.cpp"
+				RelativePath=".\..\src\watch_gui.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\watch_gui.cpp"
+				RelativePath=".\..\src\viewport_gui.cpp"
 				>
 			</File>
 			<File
@@ -2282,7 +2284,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\zoning_gui.cpp"
+				RelativePath=".\..\src\zoning_gui.cpp"
 				>
 			</File>
 		</Filter>
@@ -2290,11 +2292,11 @@
 			Name="Widgets"
 			>
 			<File
-				RelativePath=".\..\src\widgets\ai_widget.h"
+				RelativePath=".\..\src\widgets\airport_widget.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\widgets\airport_widget.h"
+				RelativePath=".\..\src\widgets\ai_widget.h"
 				>
 			</File>
 			<File
@@ -2314,7 +2316,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\widgets\cargo_table_widget.h"
+				RelativePath=".\..\src\widgets\cargo_table_widget.h"
 				>
 			</File>
 			<File
@@ -2630,7 +2632,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\zoning_cmd.cpp"
+				RelativePath=".\..\src\zoning_cmd.cpp"
 				>
 			</File>
 		</Filter>
@@ -2778,11 +2780,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\saveload\story_sl.cpp"
+				RelativePath=".\..\src\saveload\strings_sl.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\saveload\strings_sl.cpp"
+				RelativePath=".\..\src\saveload\story_sl.cpp"
 				>
 			</File>
 			<File
@@ -3502,11 +3504,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.hpp"
+				RelativePath=".\..\src\script\api\script_storypagelist.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.hpp"
+				RelativePath=".\..\src\script\api\script_storypageelementlist.hpp"
 				>
 			</File>
 			<File
@@ -3762,11 +3764,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\script\api\script_storypageelementlist.cpp"
+				RelativePath=".\..\src\script\api\script_storypagelist.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\script\api\script_storypagelist.cpp"
+				RelativePath=".\..\src\script\api\script_storypageelementlist.cpp"
 				>
 			</File>
 			<File
@@ -3873,6 +3875,14 @@
 				RelativePath=".\..\src\blitter\32bpp_simple.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_sse_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_sse_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_sse2.cpp"
 				>
@@ -3889,14 +3899,6 @@
 				RelativePath=".\..\src\blitter\32bpp_sse4.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\blitter\32bpp_sse_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_ssse3.cpp"
 				>