diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
index 7d810dfd79..7603ffad84 100644
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -901,21 +901,6 @@
     <ClCompile Include="..\src\water_cmd.cpp" />
     <ClCompile Include="..\src\waypoint_cmd.cpp" />
     <ClCompile Include="..\src\zoning_cmd.cpp" />
-    <ClInclude Include="..\src\citymania\base64.h" />
-    <ClCompile Include="..\src\citymania\base64.cpp" />
-    <ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
-    <ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
-    <ClInclude Include="..\src\citymania\highlight.hpp" />
-    <ClCompile Include="..\src\citymania\highlight.cpp" />
-    <ClInclude Include="..\src\citymania\locations.hpp" />
-    <ClCompile Include="..\src\citymania\locations.cpp" />
-    <ClInclude Include="..\src\citymania\minimap.hpp" />
-    <ClCompile Include="..\src\citymania\minimap.cpp" />
-    <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
-    <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
-    <ClInclude Include="..\src\citymania\station_ui.hpp" />
-    <ClCompile Include="..\src\citymania\station_ui.cpp" />
-    <ClInclude Include="..\src\newgrf_revisions.hpp" />
     <ClCompile Include="..\src\saveload\afterload.cpp" />
     <ClCompile Include="..\src\saveload\ai_sl.cpp" />
     <ClCompile Include="..\src\saveload\airport_sl.cpp" />
@@ -1384,12 +1369,25 @@
     <ClCompile Include="..\src\citymania\cm_game.cpp" />
     <ClInclude Include="..\src\citymania\cm_main.hpp" />
     <ClCompile Include="..\src\citymania\cm_main.cpp" />
+    <ClInclude Include="..\src\citymania\cm_tooltips.hpp" />
+    <ClCompile Include="..\src\citymania\cm_tooltips.cpp" />
     <ClInclude Include="..\src\citymania\cm_type.hpp" />
     <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
     <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
     <ClInclude Include="..\src\citymania\cm_settings.hpp" />
     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
+    <ClInclude Include="..\src\citymania\base64.h" />
+    <ClCompile Include="..\src\citymania\base64.cpp" />
+    <ClInclude Include="..\src\citymania\highlight.hpp" />
+    <ClCompile Include="..\src\citymania\highlight.cpp" />
+    <ClInclude Include="..\src\citymania\locations.hpp" />
+    <ClCompile Include="..\src\citymania\locations.cpp" />
+    <ClInclude Include="..\src\citymania\minimap.hpp" />
+    <ClCompile Include="..\src\citymania\minimap.cpp" />
+    <ClInclude Include="..\src\citymania\station_ui.hpp" />
+    <ClCompile Include="..\src\citymania\station_ui.cpp" />
+    <ClInclude Include="..\src\newgrf_revisions.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters
index 49a4c403c1..0ef9710acf 100644
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -19,91 +19,91 @@
     <Filter Include="Command handlers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000005}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CityMania files">
+    <Filter Include="Save/Load handlers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000006}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Save/Load handlers">
+    <Filter Include="Tables">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000007}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tables">
+    <Filter Include="MD5">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000008}</UniqueIdentifier>
     </Filter>
-    <Filter Include="MD5">
+    <Filter Include="Script">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000009}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script">
+    <Filter Include="Squirrel">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000010}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Squirrel">
+    <Filter Include="Squirrel headers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000011}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Squirrel headers">
+    <Filter Include="AI Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000012}</UniqueIdentifier>
     </Filter>
-    <Filter Include="AI Core">
+    <Filter Include="AI API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000013}</UniqueIdentifier>
     </Filter>
-    <Filter Include="AI API">
+    <Filter Include="Game API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000014}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Game API">
+    <Filter Include="Game Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000015}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Game Core">
+    <Filter Include="Script API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000016}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script API">
+    <Filter Include="Script API Implementation">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000017}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script API Implementation">
+    <Filter Include="Blitters">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000018}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Blitters">
+    <Filter Include="Drivers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000019}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Drivers">
+    <Filter Include="Sprite loaders">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000020}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Sprite loaders">
+    <Filter Include="NewGRF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000021}</UniqueIdentifier>
     </Filter>
-    <Filter Include="NewGRF">
+    <Filter Include="Map Accessors">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000022}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Map Accessors">
+    <Filter Include="Misc">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000023}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Misc">
+    <Filter Include="Network Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000024}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Network Core">
+    <Filter Include="Pathfinder">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000025}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Pathfinder">
+    <Filter Include="NPF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000026}</UniqueIdentifier>
     </Filter>
-    <Filter Include="NPF">
+    <Filter Include="YAPF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000027}</UniqueIdentifier>
     </Filter>
-    <Filter Include="YAPF">
+    <Filter Include="Video">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000028}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Video">
+    <Filter Include="Music">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000029}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Music">
+    <Filter Include="Sound">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000030}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Sound">
+    <Filter Include="Windows files">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000031}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows files">
+    <Filter Include="Threading">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Threading">
+    <Filter Include="CityMania">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CityMania">
+    <Filter Include="CityMania client">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000034}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -1797,51 +1797,6 @@
     <ClCompile Include="..\src\zoning_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\base64.h">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\base64.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\cm_bitstream.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\cm_bitstream.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\highlight.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\highlight.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\locations.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\locations.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\minimap.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\minimap.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\cm_saveload.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\cm_saveload.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\station_ui.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\station_ui.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\newgrf_revisions.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\saveload\afterload.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -3246,6 +3201,12 @@
     <ClCompile Include="..\src\citymania\cm_main.cpp">
       <Filter>CityMania</Filter>
     </ClCompile>
+    <ClInclude Include="..\src\citymania\cm_tooltips.hpp">
+      <Filter>CityMania</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\cm_tooltips.cpp">
+      <Filter>CityMania</Filter>
+    </ClCompile>
     <ClInclude Include="..\src\citymania\cm_type.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
@@ -3264,6 +3225,39 @@
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\citymania\base64.h">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\base64.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\highlight.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\highlight.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\locations.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\locations.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\minimap.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\minimap.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\station_ui.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\station_ui.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\newgrf_revisions.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index 6ebe91a13d..a3484139f0 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -901,21 +901,6 @@
     <ClCompile Include="..\src\water_cmd.cpp" />
     <ClCompile Include="..\src\waypoint_cmd.cpp" />
     <ClCompile Include="..\src\zoning_cmd.cpp" />
-    <ClInclude Include="..\src\citymania\base64.h" />
-    <ClCompile Include="..\src\citymania\base64.cpp" />
-    <ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
-    <ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
-    <ClInclude Include="..\src\citymania\highlight.hpp" />
-    <ClCompile Include="..\src\citymania\highlight.cpp" />
-    <ClInclude Include="..\src\citymania\locations.hpp" />
-    <ClCompile Include="..\src\citymania\locations.cpp" />
-    <ClInclude Include="..\src\citymania\minimap.hpp" />
-    <ClCompile Include="..\src\citymania\minimap.cpp" />
-    <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
-    <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
-    <ClInclude Include="..\src\citymania\station_ui.hpp" />
-    <ClCompile Include="..\src\citymania\station_ui.cpp" />
-    <ClInclude Include="..\src\newgrf_revisions.hpp" />
     <ClCompile Include="..\src\saveload\afterload.cpp" />
     <ClCompile Include="..\src\saveload\ai_sl.cpp" />
     <ClCompile Include="..\src\saveload\airport_sl.cpp" />
@@ -1384,12 +1369,25 @@
     <ClCompile Include="..\src\citymania\cm_game.cpp" />
     <ClInclude Include="..\src\citymania\cm_main.hpp" />
     <ClCompile Include="..\src\citymania\cm_main.cpp" />
+    <ClInclude Include="..\src\citymania\cm_tooltips.hpp" />
+    <ClCompile Include="..\src\citymania\cm_tooltips.cpp" />
     <ClInclude Include="..\src\citymania\cm_type.hpp" />
     <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
     <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
     <ClInclude Include="..\src\citymania\cm_settings.hpp" />
     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
+    <ClInclude Include="..\src\citymania\base64.h" />
+    <ClCompile Include="..\src\citymania\base64.cpp" />
+    <ClInclude Include="..\src\citymania\highlight.hpp" />
+    <ClCompile Include="..\src\citymania\highlight.cpp" />
+    <ClInclude Include="..\src\citymania\locations.hpp" />
+    <ClCompile Include="..\src\citymania\locations.cpp" />
+    <ClInclude Include="..\src\citymania\minimap.hpp" />
+    <ClCompile Include="..\src\citymania\minimap.cpp" />
+    <ClInclude Include="..\src\citymania\station_ui.hpp" />
+    <ClCompile Include="..\src\citymania\station_ui.cpp" />
+    <ClInclude Include="..\src\newgrf_revisions.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs141.vcxproj.filters b/projects/openttd_vs141.vcxproj.filters
index 49a4c403c1..0ef9710acf 100644
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -19,91 +19,91 @@
     <Filter Include="Command handlers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000005}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CityMania files">
+    <Filter Include="Save/Load handlers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000006}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Save/Load handlers">
+    <Filter Include="Tables">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000007}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tables">
+    <Filter Include="MD5">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000008}</UniqueIdentifier>
     </Filter>
-    <Filter Include="MD5">
+    <Filter Include="Script">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000009}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script">
+    <Filter Include="Squirrel">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000010}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Squirrel">
+    <Filter Include="Squirrel headers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000011}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Squirrel headers">
+    <Filter Include="AI Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000012}</UniqueIdentifier>
     </Filter>
-    <Filter Include="AI Core">
+    <Filter Include="AI API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000013}</UniqueIdentifier>
     </Filter>
-    <Filter Include="AI API">
+    <Filter Include="Game API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000014}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Game API">
+    <Filter Include="Game Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000015}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Game Core">
+    <Filter Include="Script API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000016}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script API">
+    <Filter Include="Script API Implementation">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000017}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script API Implementation">
+    <Filter Include="Blitters">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000018}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Blitters">
+    <Filter Include="Drivers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000019}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Drivers">
+    <Filter Include="Sprite loaders">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000020}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Sprite loaders">
+    <Filter Include="NewGRF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000021}</UniqueIdentifier>
     </Filter>
-    <Filter Include="NewGRF">
+    <Filter Include="Map Accessors">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000022}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Map Accessors">
+    <Filter Include="Misc">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000023}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Misc">
+    <Filter Include="Network Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000024}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Network Core">
+    <Filter Include="Pathfinder">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000025}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Pathfinder">
+    <Filter Include="NPF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000026}</UniqueIdentifier>
     </Filter>
-    <Filter Include="NPF">
+    <Filter Include="YAPF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000027}</UniqueIdentifier>
     </Filter>
-    <Filter Include="YAPF">
+    <Filter Include="Video">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000028}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Video">
+    <Filter Include="Music">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000029}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Music">
+    <Filter Include="Sound">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000030}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Sound">
+    <Filter Include="Windows files">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000031}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows files">
+    <Filter Include="Threading">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Threading">
+    <Filter Include="CityMania">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CityMania">
+    <Filter Include="CityMania client">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000034}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -1797,51 +1797,6 @@
     <ClCompile Include="..\src\zoning_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\base64.h">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\base64.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\cm_bitstream.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\cm_bitstream.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\highlight.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\highlight.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\locations.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\locations.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\minimap.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\minimap.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\cm_saveload.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\cm_saveload.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\station_ui.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\station_ui.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\newgrf_revisions.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\saveload\afterload.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -3246,6 +3201,12 @@
     <ClCompile Include="..\src\citymania\cm_main.cpp">
       <Filter>CityMania</Filter>
     </ClCompile>
+    <ClInclude Include="..\src\citymania\cm_tooltips.hpp">
+      <Filter>CityMania</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\cm_tooltips.cpp">
+      <Filter>CityMania</Filter>
+    </ClCompile>
     <ClInclude Include="..\src\citymania\cm_type.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
@@ -3264,6 +3225,39 @@
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\citymania\base64.h">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\base64.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\highlight.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\highlight.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\locations.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\locations.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\minimap.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\minimap.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\station_ui.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\station_ui.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\newgrf_revisions.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs142.vcxproj b/projects/openttd_vs142.vcxproj
index aae18b0d1f..659f7ae872 100644
--- a/projects/openttd_vs142.vcxproj
+++ b/projects/openttd_vs142.vcxproj
@@ -901,21 +901,6 @@
     <ClCompile Include="..\src\water_cmd.cpp" />
     <ClCompile Include="..\src\waypoint_cmd.cpp" />
     <ClCompile Include="..\src\zoning_cmd.cpp" />
-    <ClInclude Include="..\src\citymania\base64.h" />
-    <ClCompile Include="..\src\citymania\base64.cpp" />
-    <ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
-    <ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
-    <ClInclude Include="..\src\citymania\highlight.hpp" />
-    <ClCompile Include="..\src\citymania\highlight.cpp" />
-    <ClInclude Include="..\src\citymania\locations.hpp" />
-    <ClCompile Include="..\src\citymania\locations.cpp" />
-    <ClInclude Include="..\src\citymania\minimap.hpp" />
-    <ClCompile Include="..\src\citymania\minimap.cpp" />
-    <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
-    <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
-    <ClInclude Include="..\src\citymania\station_ui.hpp" />
-    <ClCompile Include="..\src\citymania\station_ui.cpp" />
-    <ClInclude Include="..\src\newgrf_revisions.hpp" />
     <ClCompile Include="..\src\saveload\afterload.cpp" />
     <ClCompile Include="..\src\saveload\ai_sl.cpp" />
     <ClCompile Include="..\src\saveload\airport_sl.cpp" />
@@ -1384,12 +1369,25 @@
     <ClCompile Include="..\src\citymania\cm_game.cpp" />
     <ClInclude Include="..\src\citymania\cm_main.hpp" />
     <ClCompile Include="..\src\citymania\cm_main.cpp" />
+    <ClInclude Include="..\src\citymania\cm_tooltips.hpp" />
+    <ClCompile Include="..\src\citymania\cm_tooltips.cpp" />
     <ClInclude Include="..\src\citymania\cm_type.hpp" />
     <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
     <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
     <ClInclude Include="..\src\citymania\cm_settings.hpp" />
     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
+    <ClInclude Include="..\src\citymania\base64.h" />
+    <ClCompile Include="..\src\citymania\base64.cpp" />
+    <ClInclude Include="..\src\citymania\highlight.hpp" />
+    <ClCompile Include="..\src\citymania\highlight.cpp" />
+    <ClInclude Include="..\src\citymania\locations.hpp" />
+    <ClCompile Include="..\src\citymania\locations.cpp" />
+    <ClInclude Include="..\src\citymania\minimap.hpp" />
+    <ClCompile Include="..\src\citymania\minimap.cpp" />
+    <ClInclude Include="..\src\citymania\station_ui.hpp" />
+    <ClCompile Include="..\src\citymania\station_ui.cpp" />
+    <ClInclude Include="..\src\newgrf_revisions.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs142.vcxproj.filters b/projects/openttd_vs142.vcxproj.filters
index 49a4c403c1..0ef9710acf 100644
--- a/projects/openttd_vs142.vcxproj.filters
+++ b/projects/openttd_vs142.vcxproj.filters
@@ -19,91 +19,91 @@
     <Filter Include="Command handlers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000005}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CityMania files">
+    <Filter Include="Save/Load handlers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000006}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Save/Load handlers">
+    <Filter Include="Tables">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000007}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tables">
+    <Filter Include="MD5">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000008}</UniqueIdentifier>
     </Filter>
-    <Filter Include="MD5">
+    <Filter Include="Script">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000009}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script">
+    <Filter Include="Squirrel">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000010}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Squirrel">
+    <Filter Include="Squirrel headers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000011}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Squirrel headers">
+    <Filter Include="AI Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000012}</UniqueIdentifier>
     </Filter>
-    <Filter Include="AI Core">
+    <Filter Include="AI API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000013}</UniqueIdentifier>
     </Filter>
-    <Filter Include="AI API">
+    <Filter Include="Game API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000014}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Game API">
+    <Filter Include="Game Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000015}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Game Core">
+    <Filter Include="Script API">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000016}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script API">
+    <Filter Include="Script API Implementation">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000017}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Script API Implementation">
+    <Filter Include="Blitters">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000018}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Blitters">
+    <Filter Include="Drivers">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000019}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Drivers">
+    <Filter Include="Sprite loaders">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000020}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Sprite loaders">
+    <Filter Include="NewGRF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000021}</UniqueIdentifier>
     </Filter>
-    <Filter Include="NewGRF">
+    <Filter Include="Map Accessors">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000022}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Map Accessors">
+    <Filter Include="Misc">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000023}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Misc">
+    <Filter Include="Network Core">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000024}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Network Core">
+    <Filter Include="Pathfinder">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000025}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Pathfinder">
+    <Filter Include="NPF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000026}</UniqueIdentifier>
     </Filter>
-    <Filter Include="NPF">
+    <Filter Include="YAPF">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000027}</UniqueIdentifier>
     </Filter>
-    <Filter Include="YAPF">
+    <Filter Include="Video">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000028}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Video">
+    <Filter Include="Music">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000029}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Music">
+    <Filter Include="Sound">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000030}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Sound">
+    <Filter Include="Windows files">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000031}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows files">
+    <Filter Include="Threading">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Threading">
+    <Filter Include="CityMania">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CityMania">
+    <Filter Include="CityMania client">
       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000034}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -1797,51 +1797,6 @@
     <ClCompile Include="..\src\zoning_cmd.cpp">
       <Filter>Command handlers</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\base64.h">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\base64.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\cm_bitstream.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\cm_bitstream.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\highlight.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\highlight.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\locations.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\locations.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\minimap.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\minimap.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\cm_saveload.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\cm_saveload.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\citymania\station_ui.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
-    <ClCompile Include="..\src\citymania\station_ui.cpp">
-      <Filter>CityMania files</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\newgrf_revisions.hpp">
-      <Filter>CityMania files</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\saveload\afterload.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -3246,6 +3201,12 @@
     <ClCompile Include="..\src\citymania\cm_main.cpp">
       <Filter>CityMania</Filter>
     </ClCompile>
+    <ClInclude Include="..\src\citymania\cm_tooltips.hpp">
+      <Filter>CityMania</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\cm_tooltips.cpp">
+      <Filter>CityMania</Filter>
+    </ClCompile>
     <ClInclude Include="..\src\citymania\cm_type.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
@@ -3264,6 +3225,39 @@
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\citymania\base64.h">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\base64.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\highlight.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\highlight.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\locations.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\locations.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\minimap.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\minimap.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\citymania\station_ui.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\station_ui.cpp">
+      <Filter>CityMania client</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\newgrf_revisions.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />