diff --git a/cm_changelog.txt b/cm_changelog.txt
index 0887e7fdc8..9a813b7fca 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -75,27 +75,27 @@ This is usable for any OpenTTD servers
 == CHANGELOG ==
 
 *** 1.10.3 (10 Aug 2020) ***
+- Show preview when building a rail depot.
+- Add an option to enable shading trees on slopes for better looks.
+- Add an option to show APM counter on the status bar.
 - Fix order hotkeys adding extra no load/unload orders.
 - Allow to use TAB as a hotkey.
 - Add hotkey to toggle minimap.
-- Make hotkey to close news and errors configurable (still defaults to SPACE).
+- Make a usinghotkey to close news and errors configurable (still defaults to SPACE).
 - Remove custom hotkey keycodes that were added to vanilla.
-- Make land info tool work with right click tooltip setting and/or disabled extra tooltip settings.
-- Make station rating tooltips work with right click tooltip setting
-- Splilt extra (land) tooltips setting in config into 3 for industries, stations and houses separately.
 - Make modifier key (ctrl/alt/shift) functions configurable.
-- Allow to toggle removal mode with modifier key on station and signal building tools if it's different from fn modifier (otherwise fn takes priority).
-- Add a setting to pause games after loading.
-- Add "cmstep" console command to advance the game for n ticks (singleplayer only).
-- Add "cmexport" console command to export various in-game data in json format (for developers).
+- Allow toggling removal mode with modifier key on station and signal building tools if it's different from the Fn modifier (otherwise fn takes priority).
 - Add "cmtreemap" console command to plant trees according to a heightmap image (scenario editor only).
-- Add option to enable shading trees on slopes for better looks.
-- Add APM counter to the status bar.
-- Fix town HR couter.
-- Allow spectators to open industry funding window from the menu.
-- Fix graphical glitches after switching to location with hotkey.
+- Add "cmexport" console command to export various in-game data in JSON format (for developers).
+- Add "cmstep" console command to advance the game for n ticks (singleplayer only).
+- Make land info tool work with right-click tooltip setting and/or disabled extra tooltip settings.
+- Make station rating tooltips work with right-click tooltip setting
+- Split extra (land) tooltips setting in config into 3 for industries, stations, and houses separately.
+- Add an option to pause games after loading.
+- Fix town HR counter.
+- Allow spectators to open the industry funding window from the menu.
+- Fix graphical glitches after switching location with a hotkey.
 - Make new tint highlights work with 32bpp sprites.
-- Show preview when building a rail depot.
 - Fix: sprite preview in sprite aligner is too small with scaled UI.
 - Slightly improve funding highlight update.
 - Remove cargo color icons from income and delivered cargo graphs to avoid confusion with company colors.
diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
index 73bb2b745f..f0b280a796 100644
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -1379,16 +1379,17 @@
     <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\citymania\cm_base64.hpp" />
+    <ClCompile Include="..\src\citymania\cm_base64.cpp" />
+    <ClInclude Include="..\src\citymania\cm_highlight.hpp" />
+    <ClCompile Include="..\src\citymania\cm_highlight.cpp" />
+    <ClInclude Include="..\src\citymania\cm_highlight_type.hpp" />
+    <ClInclude Include="..\src\citymania\cm_locations.hpp" />
+    <ClCompile Include="..\src\citymania\cm_locations.cpp" />
+    <ClInclude Include="..\src\citymania\cm_minimap.hpp" />
+    <ClCompile Include="..\src\citymania\cm_minimap.cpp" />
+    <ClInclude Include="..\src\citymania\cm_station_gui.hpp" />
+    <ClCompile Include="..\src\citymania\cm_station_gui.cpp" />
     <ClInclude Include="..\src\newgrf_revisions.hpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters
index 712aaa8ac7..fa4858fb1a 100644
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -3231,34 +3231,37 @@
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\citymania\base64.h">
+    <ClInclude Include="..\src\citymania\cm_base64.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\base64.cpp">
+    <ClCompile Include="..\src\citymania\cm_base64.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\highlight.hpp">
+    <ClInclude Include="..\src\citymania\cm_highlight.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\highlight.cpp">
+    <ClCompile Include="..\src\citymania\cm_highlight.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\locations.hpp">
+    <ClInclude Include="..\src\citymania\cm_highlight_type.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\locations.cpp">
+    <ClInclude Include="..\src\citymania\cm_locations.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\cm_locations.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\minimap.hpp">
+    <ClInclude Include="..\src\citymania\cm_minimap.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\minimap.cpp">
+    <ClCompile Include="..\src\citymania\cm_minimap.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\station_ui.hpp">
+    <ClInclude Include="..\src\citymania\cm_station_gui.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\station_ui.cpp">
+    <ClCompile Include="..\src\citymania\cm_station_gui.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
     <ClInclude Include="..\src\newgrf_revisions.hpp">
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index 7137146c5b..592bec219f 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -1379,16 +1379,17 @@
     <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\citymania\cm_base64.hpp" />
+    <ClCompile Include="..\src\citymania\cm_base64.cpp" />
+    <ClInclude Include="..\src\citymania\cm_highlight.hpp" />
+    <ClCompile Include="..\src\citymania\cm_highlight.cpp" />
+    <ClInclude Include="..\src\citymania\cm_highlight_type.hpp" />
+    <ClInclude Include="..\src\citymania\cm_locations.hpp" />
+    <ClCompile Include="..\src\citymania\cm_locations.cpp" />
+    <ClInclude Include="..\src\citymania\cm_minimap.hpp" />
+    <ClCompile Include="..\src\citymania\cm_minimap.cpp" />
+    <ClInclude Include="..\src\citymania\cm_station_gui.hpp" />
+    <ClCompile Include="..\src\citymania\cm_station_gui.cpp" />
     <ClInclude Include="..\src\newgrf_revisions.hpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/openttd_vs141.vcxproj.filters b/projects/openttd_vs141.vcxproj.filters
index 712aaa8ac7..fa4858fb1a 100644
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -3231,34 +3231,37 @@
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\citymania\base64.h">
+    <ClInclude Include="..\src\citymania\cm_base64.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\base64.cpp">
+    <ClCompile Include="..\src\citymania\cm_base64.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\highlight.hpp">
+    <ClInclude Include="..\src\citymania\cm_highlight.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\highlight.cpp">
+    <ClCompile Include="..\src\citymania\cm_highlight.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\locations.hpp">
+    <ClInclude Include="..\src\citymania\cm_highlight_type.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\locations.cpp">
+    <ClInclude Include="..\src\citymania\cm_locations.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\cm_locations.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\minimap.hpp">
+    <ClInclude Include="..\src\citymania\cm_minimap.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\minimap.cpp">
+    <ClCompile Include="..\src\citymania\cm_minimap.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\station_ui.hpp">
+    <ClInclude Include="..\src\citymania\cm_station_gui.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\station_ui.cpp">
+    <ClCompile Include="..\src\citymania\cm_station_gui.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
     <ClInclude Include="..\src\newgrf_revisions.hpp">
diff --git a/projects/openttd_vs142.vcxproj b/projects/openttd_vs142.vcxproj
index af577959fa..4f1b08cfaa 100644
--- a/projects/openttd_vs142.vcxproj
+++ b/projects/openttd_vs142.vcxproj
@@ -1379,16 +1379,17 @@
     <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\citymania\cm_base64.hpp" />
+    <ClCompile Include="..\src\citymania\cm_base64.cpp" />
+    <ClInclude Include="..\src\citymania\cm_highlight.hpp" />
+    <ClCompile Include="..\src\citymania\cm_highlight.cpp" />
+    <ClInclude Include="..\src\citymania\cm_highlight_type.hpp" />
+    <ClInclude Include="..\src\citymania\cm_locations.hpp" />
+    <ClCompile Include="..\src\citymania\cm_locations.cpp" />
+    <ClInclude Include="..\src\citymania\cm_minimap.hpp" />
+    <ClCompile Include="..\src\citymania\cm_minimap.cpp" />
+    <ClInclude Include="..\src\citymania\cm_station_gui.hpp" />
+    <ClCompile Include="..\src\citymania\cm_station_gui.cpp" />
     <ClInclude Include="..\src\newgrf_revisions.hpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/openttd_vs142.vcxproj.filters b/projects/openttd_vs142.vcxproj.filters
index 712aaa8ac7..fa4858fb1a 100644
--- a/projects/openttd_vs142.vcxproj.filters
+++ b/projects/openttd_vs142.vcxproj.filters
@@ -3231,34 +3231,37 @@
     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
       <Filter>CityMania</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\citymania\base64.h">
+    <ClInclude Include="..\src\citymania\cm_base64.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\base64.cpp">
+    <ClCompile Include="..\src\citymania\cm_base64.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\highlight.hpp">
+    <ClInclude Include="..\src\citymania\cm_highlight.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\highlight.cpp">
+    <ClCompile Include="..\src\citymania\cm_highlight.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\locations.hpp">
+    <ClInclude Include="..\src\citymania\cm_highlight_type.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\locations.cpp">
+    <ClInclude Include="..\src\citymania\cm_locations.hpp">
+      <Filter>CityMania client</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\citymania\cm_locations.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\minimap.hpp">
+    <ClInclude Include="..\src\citymania\cm_minimap.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\minimap.cpp">
+    <ClCompile Include="..\src\citymania\cm_minimap.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
-    <ClInclude Include="..\src\citymania\station_ui.hpp">
+    <ClInclude Include="..\src\citymania\cm_station_gui.hpp">
       <Filter>CityMania client</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\citymania\station_ui.cpp">
+    <ClCompile Include="..\src\citymania\cm_station_gui.cpp">
       <Filter>CityMania client</Filter>
     </ClCompile>
     <ClInclude Include="..\src\newgrf_revisions.hpp">