diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c4bf40139b..8af0245668 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -50,7 +50,6 @@ Describe here
 Some things are not automated, and forgotten often. This list is a reminder for the reviewers.
 * The bug fix is important enough to be backported? (label: 'backport requested')
 * This PR touches english.txt or translations? Check the [guidelines](https://github.com/OpenTTD/OpenTTD/blob/master/docs/eints.md)
-* This PR affects the save game format? (label 'savegame upgrade')
 * This PR affects the GS/AI API? (label 'needs review: Script API')
     * ai_changelog.hpp, game_changelog.hpp need updating.
     * The compatibility wrappers (compat_*.nut) need updating.
diff --git a/.github/unused-strings.py b/.github/unused-strings.py
index 1ebb652982..55e8ec1bfd 100644
--- a/.github/unused-strings.py
+++ b/.github/unused-strings.py
@@ -158,7 +158,7 @@ def scan_source_files(path, strings_found):
         # Most files we can just open, but some use magic, that requires the
         # G++ preprocessor before we can make sense out of it.
         if new_path == "src/table/cargo_const.h":
-            p = subprocess.run(["g++", "-E", new_path], stdout=subprocess.PIPE)
+            p = subprocess.run(["g++", "-E", "-DCHECK_UNUSED_STRINGS", new_path], stdout=subprocess.PIPE)
             output = p.stdout.decode()
         else:
             with open(new_path) as fp:
diff --git a/README.md b/README.md
index 96a3a6eb93..a0e50bdef8 100644
--- a/README.md
+++ b/README.md
@@ -37,12 +37,10 @@ Both 'stable' and 'nightly' versions are available for download:
 
 OpenTTD is also available for free on [Steam](https://store.steampowered.com/app/1536610/OpenTTD/), [GOG.com](https://www.gog.com/game/openttd), and the [Microsoft Store](https://www.microsoft.com/p/openttd-official/9ncjg5rvrr1c). On some platforms OpenTTD will be available via your OS package manager or a similar service.
 
-
 ## 1.2) OpenTTD gameplay manual
 
 OpenTTD has a [community-maintained wiki](https://wiki.openttd.org/), including a gameplay manual and tips.
 
-
 ## 1.3) Supported platforms
 
 OpenTTD has been ported to several platforms and operating systems.
@@ -56,6 +54,7 @@ The currently supported platforms are:
 Other platforms may also work (in particular various BSD systems), but we don't actively test or maintain these.
 
 ### 1.3.1) Legacy support
+
 Platforms, languages and compilers change.
 We'll keep support going on old platforms as long as someone is interested in supporting them, except where it means the project can't move forward to keep up with language and compiler features.
 
@@ -72,7 +71,6 @@ For some platforms these will be downloaded during the installation process if r
 
 For some platforms, you will need to refer to [the installation guide](https://wiki.openttd.org/en/Manual/Installation).
 
-
 ### 1.4.1) Free graphics and sound files
 
 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
@@ -85,7 +83,6 @@ OpenMSX for music can be found at:
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.
 
-
 ### 1.4.2) Original Transport Tycoon Deluxe graphics and sound files
 
 If you want to play with the original Transport Tycoon Deluxe data files you have to copy the data files from the CD-ROM into the baseset/ directory.
@@ -100,7 +97,6 @@ You need to copy the following files:
 - trgir.grf or TRGI.GRF
 - trgtr.grf or TRGT.GRF
 
-
 ### 1.4.3) Original Transport Tycoon Deluxe music
 
 If you want the Transport Tycoon Deluxe music, copy the appropriate files from the original game into the baseset folder.
@@ -108,7 +104,6 @@ If you want the Transport Tycoon Deluxe music, copy the appropriate files from t
 - TTD for DOS: The GM.CAT file
 - Transport Tycoon Original: The GM.CAT file, but rename it to GM-TTO.CAT
 
-
 ## 1.5) Add-on content / mods
 
 OpenTTD features multiple types of add-on content, which modify gameplay in different ways.
@@ -117,7 +112,6 @@ Most types of add-on content can be downloaded within OpenTTD via the 'Check Onl
 
 Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).
 
-
 ### 1.5.1) Social Integration
 
 OpenTTD has the ability to load plugins to integrate with Social Platforms like Steam, Discord, etc.
@@ -126,7 +120,6 @@ To enable such integration, the plugin for the specific platform has to be downl
 
 See [OpenTTD's website](https://www.openttd.org), under Downloads, for what plugins are available.
 
-
 ### 1.6) OpenTTD directories
 
 OpenTTD uses its own directory structure to store game data, add-on content etc.
@@ -137,7 +130,6 @@ For more information, see the [directory structure guide](./docs/directory_struc
 
 If you want to compile OpenTTD from source, instructions can be found in [COMPILING.md](./COMPILING.md).
 
-
 ## 2.0) Contact and Community
 
 'Official' channels
@@ -160,12 +152,10 @@ You can play OpenTTD with others, either cooperatively or competitively.
 
 See the [multiplayer documentation](./docs/multiplayer.md) for more details.
 
-
 ### 2.2) Contributing to OpenTTD
 
 We welcome contributors to OpenTTD.  More information for contributors can be found in [CONTRIBUTING.md](./CONTRIBUTING.md)
 
-
 ### 2.3) Reporting bugs
 
 Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRIBUTING.md#bug-reports) to help with this.
@@ -173,12 +163,10 @@ Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRI
 Desyncs in multiplayer are complex to debug and report (some software development skils are required).
 Instructions can be found in [debugging and reporting desyncs](./docs/debugging_desyncs.md).
 
-
 ### 2.4) Translating
 
 OpenTTD is translated into many languages.  Translations are added and updated via the [online translation tool](https://translator.openttd.org).
 
-
 ## 3.0) Licensing
 
 OpenTTD is licensed under the GNU General Public License version 2.0.
@@ -215,6 +203,6 @@ See `src/3rdparty/openttd_social_integration_api/LICENSE` for the complete licen
 The atomic datatype support detection in `cmake/3rdparty/llvm/CheckAtomic.cmake` is licensed under the Apache 2.0 license.
 See `cmake/3rdparty/llvm/LICENSE.txt` for the complete license text.
 
-## 4.0 Credits
+## 4.0) Credits
 
 See [CREDITS.md](./CREDITS.md)
diff --git a/bin/game/compat_14.nut b/bin/game/compat_14.nut
index 00efae0b65..757e2496f4 100644
--- a/bin/game/compat_14.nut
+++ b/bin/game/compat_14.nut
@@ -9,6 +9,9 @@
 
 GSBridge.GetBridgeID <- GSBridge.GetBridgeType;
 
+/* Emulate old GSText parameter padding behaviour */
+GSText.SCRIPT_TEXT_MAX_PARAMETERS <- 20;
+
 class GSCompat14 {
 	function Text(text)
 	{
diff --git a/changelog.md b/changelog.md
index 8ed27438a8..5dbd8bf0a4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,108 @@
 ## 15.x
 
+### 15.0-beta2 (2025-04-13)
+
+- Feature: Snow-covered rocks are now visible (#13627)
+- Feature: Generate more rocks on steep slopes during map generation or heightmap import (#13462)
+- Feature: Prevent towns from upgrading individually-placed houses (#13270)
+- Feature: [Win32] Touchpad two-finger map scrolling (#13172)
+- Feature: NewGRF Badges (#13073)
+- Add: [NewGRF] Add road-/tram-/rail-type variable 0x45 to get mutual road-/tram-/rail-type on same tile (#13934)
+- Add: [Script] Newer Cargo Classes (#13779)
+- Add: Show hyperlink destination tooltips in text window (#13742)
+- Add: [Script] Saving/loading ScriptList (#13556)
+- Add: Press Ctrl to build diagonal canals in game mode (#13432)
+- Add: Sandbox settings to Sandbox Options window (#13268)
+- Add: Setting to allow placing houses manually in-game (#13266)
+- Add: [Script] Event for when a company's president name changes (#13208)
+- Add: Ability to toggle visibility of station signs by facility (#13207)
+- Add: [Script] ScriptEventCompanyRename (#12878)
+- Add: Ukrainian Hryvnia currency (#12877)
+- Add: Convert 32bpp-only sprites to 8bpp when needed (#11602)
+- Change: [Script] Start GS (but don't run it) when generating world in scenario editor (#13961)
+- Change: [Script] Add vehicle owner to crash event (#13878)
+- Change: Make tree placement at world generation look more organic (#13515)
+- Change: [MacOS] Put the icon in a rounded rectangle (#13446)
+- Change: [Script] GetWaypointID to return the StationID of any waypoint (#13407)
+- Change: Draw company manager face jacket after collar (#13390)
+- Change: Don't distinguish between bus and truck stops when removing them (#13384)
+- Change: [Script] Rename BridgeID to BridgeType in the script API (#13352)
+- Change: Add fonts document to help window (#13305)
+- Change: Log changes to sandbox settings (#13267)
+- Change: When player joins network company, use its name instead of number in chat (#13263)
+- Change: [Win32] Draw window title bar according to current Windows light/dark theme (#13196)
+- Change: Restore wider spacers in main toolbars (#12039)
+- Fix: NewGRF Global variables 0D, 0E and 1E refer to wrong GRFFile (#13986)
+- Fix #13980: Allow diagonal selection for road convert (#13983)
+- Fix: Validate raw strings from game-scripts, and strip invalid and control characters (#13976)
+- Fix: Capitalise "Disabled" for the "maximum non-sticky open windows" setting (#13975)
+- Fix: Frame widget with label had incorrect spacing (#13967)
+- Fix: StringFilter included quotes in the search and failed (#13965)
+- Fix #13955: Make graphs respect RTL (#13957)
+- Fix: Numbers were left-aligned for RTL languages in several windows (#13959)
+- Fix: MayHaveRoad claimed rail station tiles had road, so the custom stationspec index would be read as roadtype (#13949)
+- Fix: [Script] Prevent cloning of API instances (#13947)
+- Fix: Reference to the correct section of the README, if a graphics or a sound set is incomplete (#13946)
+- Fix: Draw the bevel around the music track name as inset (#13935)
+- Fix #13923: Padding in music GUI was asymmetric, so it looked different for LTR and RTL languages (#13933)
+- Fix #13928: BuildOilRig did not properly set airport rotation (#13929)
+- Fix: SDL2 application name hint was not effective (#13926)
+- Fix #13921: [Win32] Don't try close an already closed event handle during destruction (#13924)
+- Fix #13921: Don't reject MIDI files with a valid file magic value (#13924)
+- Fix #13912: Multitile buildings break apart in house picker (#13914)
+- Fix #13908: Require double click on order to change stop location (#13913)
+- Fix #13910: Invalidate content of house picker window if language is changed (#13911)
+- Fix: [Script] Reset instance when changing running scripts in scenario editor (#13906)
+- Fix: [Script] Only run the gamescript GameLoop() in-game (#13896)
+- Fix #13893: Reversed all x-axis labels for company related and industry production graphs in wallclock mode (#13894)
+- Fix #13842: Close industry production graph if industry is removed (#13890)
+- Fix #11528: Starting autorail dragging from existing track tiles resulted in adding non-continuous tracks (#13885)
+- Fix: Autoreplace rail/road list only listed buildable types (#13887)
+- Fix: [NewGRF] Display an error, if NewGRF reference out-of-bounds string parameters in gender/plural choices (#13881)
+- Fix #13849: Settings in old saves could be overridden by defaults (#13874)
+- Fix #13562: Removed cost estimation message from money cheat (#13857)
+- Fix: [NewGRF] Plurals and genders did not work in strings with cases or substrings (#13853, #13852)
+- Fix: [NewGRF] String parameter stack and case selection were not processed for control code 0x81 (#13851)
+- Fix #13839: Incorrect colour of first company legend in smallmap window (#13841)
+- Fix: i circumflex width in TrueType small font (#13836)
+- Fix: Don't show owner of non-existent road (#13824)
+- Fix: Error message window timeout doesn't match setting (#13812)
+- Fix #13795: Crash in vehicle list of 32-bit platforms (#13796)
+- Fix: [Script] Company rename event sometimes had the wrong name (#13794)
+- Fix: Improve manager face randomisation (#13776)
+- Fix #13740: [Script] Handle implicit orders for jump orders (#13753)
+- Fix #13749: Default service intervals were not updated when changing timekeeping unit (#13751)
+- Fix #13725: Use proper query strings for changing timetable values (#13737)
+- Fix #11226: Don't draw story page elements that won't be visible (#13736)
+- Fix: More AI than max_no_competitors could start with competitors_interval=0 (#13670)
+- Fix: League table window ignored the minimal size in its widget description (#13629)
+- Fix: Incorrect snow density when making rocks snowy (#13626)
+- Fix: NewGRF vehicles display loading sprites when not actually loading or unloading (#13554)
+- Fix #12925: Prevent cost estimates for settings changes (#13550)
+- Fix: [Script] Report errors happening during 'Load()' (#13537)
+- Fix: [Script] Improve type checking of parameters (#13522)
+- Fix: [Script] Don't set CommandCallback for asynchronous commands (#13501)
+- Fix: Missing error messages with sell- and autoreplace-all commands (#13469)
+- Fix: Too many trees when generating trees at same height (#13460)
+- Fix #12912: Company inaugurated year in wallclock mode was not saved (#13448)
+- Fix: [Script] Wrong return value for failed preconditions Vehicle::CloneVehicle (#13445)
+- Fix #13140: Scale initial industry production estimate by cargo scale (#13427)
+- Fix #13384: Crash when remove bus/truck stop tool used on road waypoints (#13391)
+- Fix #12987: Historical houses now always spawn completed (#13332)
+- Fix: [Win32] Font detection didn't work for locales not supporting code pages (#13306)
+- Fix: Restore ability to disable service interval (#13281)
+- Fix: Hide company settings from console commands (#13269)
+- Fix: Disable service interval widgets for non-owned vehicles (#13260)
+- Fix #13225: Cargo payment graph key toggled wrong data sets (#13226)
+- Fix: Rail station tile flags were not set early enough (#13203)
+- Fix #13199: -f command line parameter does not need a value (#13200)
+- Fix: Missing water region invalidation after flooding a half tile with rail in the highest corner (#13047)
+- Fix: Strip control codes before sorting NewGRF names (#13034)
+- Fix #12968: Added back ability to create unremovable houses (#12989)
+- Remove: Drop support for UCS2/UTF-16 encoded scripts (#13992)
+- Remove: Support for SDL1.2 (#13298)
+
+
 ### 15.0-beta1 (2024-12-24)
 
 - Feature: Town, industry and vehicle window zoom with mouse wheel (#12810, #12809, #12797)
diff --git a/cmake/scripts/SquirrelExport.cmake b/cmake/scripts/SquirrelExport.cmake
index 6549078844..8b9ca55621 100644
--- a/cmake/scripts/SquirrelExport.cmake
+++ b/cmake/scripts/SquirrelExport.cmake
@@ -17,41 +17,48 @@ if(NOT APILC)
 endif()
 
 macro(dump_fileheader)
-    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
-    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}\"")
+    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME_WE)
+    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}.hpp\"")
     if(NOT "${APIUC}" STREQUAL "Template")
         string(REPLACE "script_" "template_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
-        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq\"")
+        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq.hpp\"")
+    endif()
+endmacro()
+
+macro(open_namespace)
+    if(NOT NAMESPACE_OPENED)
+        string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
+        set(NAMESPACE_OPENED TRUE)
     endif()
 endmacro()
 
 macro(dump_class_templates NAME)
     string(REGEX REPLACE "^Script" "" REALNAME ${NAME})
 
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
     if("${NAME}" STREQUAL "ScriptEvent")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
     elseif("${NAME}" STREQUAL "ScriptText")
         string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<Text *> {")
-        string(APPEND SQUIRREL_EXPORT "\n		static inline Text *Get(HSQUIRRELVM vm, int index) {")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_INSTANCE) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return Param<ScriptText *>::Get(vm, index);")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_STRING) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return new RawText(Param<const std::string &>::Get(vm, index));")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_NULL) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return nullptr;")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			throw sq_throwerror(vm, fmt::format(\"parameter {} has an invalid type ; expected: 'Text'\", index - 1));")
-        string(APPEND SQUIRREL_EXPORT "\n		}")
-        string(APPEND SQUIRREL_EXPORT "\n	};")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<Text *> {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\tstatic inline Text *Get(HSQUIRRELVM vm, int index) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_INSTANCE) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn Param<ScriptText *>::Get(vm, index);")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_STRING) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn new RawText(Param<const std::string &>::Get(vm, index));")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_NULL) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn nullptr;")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tthrow sq_throwerror(vm, fmt::format(\"parameter {} has an invalid type ; expected: 'Text'\", index - 1));")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t};")
     else()
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
     endif()
 endmacro()
 
@@ -66,7 +73,6 @@ macro(reset_reader)
     unset(STATIC_METHODS)
     unset(CLS)
     unset(START_SQUIRREL_DEFINE_ON_NEXT_LINE)
-    set(CLS_LEVEL 0)
     unset(CLS_IN_API)
 endmacro()
 
@@ -75,6 +81,9 @@ reset_reader()
 file(STRINGS "${SCRIPT_API_FILE}" SOURCE_LINES)
 
 set(NUM_LINE 0)
+set(CLS_LEVEL 0)
+set(BRACE_LEVEL 0)
+
 macro(doxygen_check)
     if(NOT "${DOXYGEN_SKIP}" STREQUAL "")
         message(FATAL_ERROR "${SCRIPT_API_FILE}:${NUM_LINE}: a DOXYGEN_API block was not properly closed")
@@ -110,7 +119,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
-    if("${LINE}" MATCHES "^([	 ]*)\\* @api (.*)$")
+    if("${LINE}" MATCHES "^([\t ]*)\\* @api (.*)$")
         set(LINE ${CMAKE_MATCH_2})
         # By default, classes are not selected
         if(NOT CLS_LEVEL)
@@ -148,22 +157,28 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
+    # Count braces to skip function bodies
+    string(REGEX REPLACE "[^{]" "" OPENING_BRACES "${LINE}")
+    string(LENGTH "${OPENING_BRACES}" OPENING_BRACES)
+    string(REGEX REPLACE "[^}]" "" CLOSING_BRACES "${LINE}")
+    string(LENGTH "${CLOSING_BRACES}" CLOSING_BRACES)
+    math(EXPR BRACE_LEVEL "${BRACE_LEVEL} + ${OPENING_BRACES} - ${CLOSING_BRACES}")
+
     # Ignore forward declarations of classes
-    if("${LINE}" MATCHES "^(	*)class(.*);")
+    if("${LINE}" MATCHES "^(\t*)class(.*);")
         continue()
     endif()
 
     # We only want to have public functions exported for now
-    if("${LINE}" MATCHES "^(	*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
         if(NOT CLS_LEVEL)
             if(NOT DEFINED API_SELECTED)
-                message(WARNING "Class '${CMAKE_MATCH_2}' has no @api. It won't be published to any API.")
+                message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Class '${CMAKE_MATCH_2}' has no @api. It won't be published to any API.")
                 set(API_SELECTED FALSE)
             endif()
             unset(IS_PUBLIC)
-            unset(CLS_PARAM_0)
-            set(CLS_PARAM_1 1)
-            set(CLS_PARAM_2 "x")
+            unset(CLS_PARAMS)
+            set(CLS_TYPES "x")
             set(CLS_IN_API ${API_SELECTED})
             unset(API_SELECTED)
             set(CLS "${CMAKE_MATCH_2}")
@@ -181,19 +196,19 @@ foreach(LINE IN LISTS SOURCE_LINES)
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
         continue()
     endif()
-    if("${LINE}" MATCHES "^(	*)public")
+    if("${LINE}" MATCHES "^(\t*)public")
         if(CLS_LEVEL EQUAL 1)
             set(IS_PUBLIC TRUE)
         endif()
         continue()
     endif()
-    if("${LINE}" MATCHES "^(	*)protected")
+    if("${LINE}" MATCHES "^(\t*)protected")
         if(CLS_LEVEL EQUAL 1)
             unset(IS_PUBLIC)
         endif()
         continue()
     endif()
-    if("${LINE}" MATCHES "^(	*)private")
+    if("${LINE}" MATCHES "^(\t*)private")
         if(CLS_LEVEL EQUAL 1)
             unset(IS_PUBLIC)
         endif()
@@ -221,7 +236,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # We need to make specialized conversions for structs
-    if("${LINE}" MATCHES "^(	*)struct ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)struct ([^ ]*)")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
 
         # Check if we want to publish this struct
@@ -243,7 +258,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # We need to make specialized conversions for enums
-    if("${LINE}" MATCHES "^(	*)enum ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)enum ([^ ]*)")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
 
         # Check if we want to publish this enum
@@ -266,7 +281,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # Maybe the end of the class, if so we can start with the Squirrel export pretty soon
-    if("${LINE}" MATCHES "};")
+    if(BRACE_LEVEL LESS CLS_LEVEL)
         math(EXPR CLS_LEVEL "${CLS_LEVEL} - 1")
         if(CLS_LEVEL)
             unset(IN_ENUM)
@@ -280,7 +295,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # Empty/white lines. When we may do the Squirrel export, do that export.
-    if("${LINE}" MATCHES "^([ 	]*)$")
+    if("${LINE}" MATCHES "^([ \t]*)$")
         if(NOT START_SQUIRREL_DEFINE_ON_NEXT_LINE)
             continue()
         endif()
@@ -304,33 +319,17 @@ foreach(LINE IN LISTS SOURCE_LINES)
         string(APPEND SQUIRREL_EXPORT "\n")
 
         if("${APIUC}" STREQUAL "Template")
-            # First check whether we have enums to print
-            if(DEFINED ENUMS)
-                if(NOT NAMESPACE_OPENED)
-                    string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                    set(NAMESPACE_OPENED TRUE)
-                endif()
-            endif()
-
             # Then check whether we have structs/classes to print
             if(DEFINED STRUCTS)
-                if(NOT NAMESPACE_OPENED)
-                    string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                    set(NAMESPACE_OPENED TRUE)
-                endif()
-                string(APPEND SQUIRREL_EXPORT "\n	/* Allow inner classes/structs to be used as Squirrel parameters */")
+                open_namespace()
+                string(APPEND SQUIRREL_EXPORT "\n\t/* Allow inner classes/structs to be used as Squirrel parameters */")
                 foreach(STRUCT IN LISTS STRUCTS)
                     dump_class_templates(${STRUCT})
                 endforeach()
             endif()
 
-            if(NOT NAMESPACE_OPENED)
-                string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                set(NAMESPACE_OPENED TRUE)
-            else()
-                string(APPEND SQUIRREL_EXPORT "\n")
-            endif()
-            string(APPEND SQUIRREL_EXPORT "\n	/* Allow ${CLS} to be used as Squirrel parameter */")
+            open_namespace()
+            string(APPEND SQUIRREL_EXPORT "\n\t/* Allow ${CLS} to be used as Squirrel parameter */")
             dump_class_templates(${CLS})
 
             string(APPEND SQUIRREL_EXPORT "\n} // namespace SQConvert")
@@ -340,23 +339,23 @@ foreach(LINE IN LISTS SOURCE_LINES)
         endif()
 
         string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\ntemplate <> SQInteger PushClassName<${CLS}, ScriptType::${APIUC}>(HSQUIRRELVM vm) { sq_pushstring(vm, \"${API_CLS}\", -1); return 1; }")
+        string(APPEND SQUIRREL_EXPORT "\ntemplate <> SQInteger PushClassName<${CLS}, ScriptType::${APIUC}>(HSQUIRRELVM vm) { sq_pushstring(vm, \"${API_CLS}\"); return 1; }")
         string(APPEND SQUIRREL_EXPORT "\n")
 
         # Then do the registration functions of the class.
-        string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel *engine)")
+        string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel &engine)")
         string(APPEND SQUIRREL_EXPORT "\n{")
-        string(APPEND SQUIRREL_EXPORT "\n	DefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
+        string(APPEND SQUIRREL_EXPORT "\n\tDefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
         if("${SUPER_CLS}" STREQUAL "Text")
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine);")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PreRegister(engine);")
         else()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
         endif()
-        if(NOT "${SUPER_CLS}" MATCHES "^ScriptEvent")
-            if("${CLS_PARAM_2}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddSQAdvancedConstructor(engine);")
+        if((DEFINED CLS_PARAMS OR DEFINED METHODS) AND NOT "${SUPER_CLS}" MATCHES "^ScriptEvent" AND NOT "${CLS}" STREQUAL "ScriptEvent")
+            if("${CLS_TYPES}" STREQUAL "v")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.AddSQAdvancedConstructor(engine);")
             else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAM_0}), ${CLS_PARAM_1}>(engine, \"${CLS_PARAM_2}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAMS})>(engine, \"${CLS_TYPES}\");")
             endif()
         endif()
         string(APPEND SQUIRREL_EXPORT "\n")
@@ -376,7 +375,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -397,7 +396,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -423,7 +422,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
+            string(APPEND SQUIRREL_EXPORT "\n\tScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -444,7 +443,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -463,8 +462,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         foreach(STATIC_METHOD IN LISTS STATIC_METHODS)
             string(REPLACE ":" ";" STATIC_METHOD "${STATIC_METHOD}")
             list(GET STATIC_METHOD 0 FUNCNAME)
-            list(GET STATIC_METHOD 1 ARGC)
-            list(GET STATIC_METHOD 2 TYPES)
+            list(GET STATIC_METHOD 1 TYPES)
             string(LENGTH "${FUNCNAME}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
             if("${TYPES}" STREQUAL "v")
@@ -479,9 +477,9 @@ foreach(LINE IN LISTS SOURCE_LINES)
                 string(APPEND SPACES " ")
             endforeach()
             if("${TYPES}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
             else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}${ARGC}, \"${TYPES}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
             endif()
         endforeach()
         if(MLEN)
@@ -501,8 +499,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         foreach(METHOD IN LISTS METHODS)
             string(REPLACE ":" ";" METHOD "${METHOD}")
             list(GET METHOD 0 FUNCNAME)
-            list(GET METHOD 1 ARGC)
-            list(GET METHOD 2 TYPES)
+            list(GET METHOD 1 TYPES)
             string(LENGTH "${FUNCNAME}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
             if("${TYPES}" STREQUAL "v")
@@ -517,16 +514,16 @@ foreach(LINE IN LISTS SOURCE_LINES)
                 string(APPEND SPACES " ")
             endforeach()
             if("${TYPES}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
             else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}${ARGC}, \"${TYPES}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
             endif()
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
         endif()
 
-        string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PostRegister(engine);")
+        string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PostRegister(engine);")
         string(APPEND SQUIRREL_EXPORT "\n}")
 
         reset_reader()
@@ -539,9 +536,13 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
+    if(NOT BRACE_LEVEL EQUAL CLS_LEVEL)
+        continue()
+    endif()
+
     # Add enums
     if(IN_ENUM)
-        string(REGEX MATCH "([^,	 ]+)" ENUM_VALUE "${LINE}")
+        string(REGEX MATCH "([^,\t ]+)" ENUM_VALUE "${LINE}")
         list(APPEND ENUM_VALUES "${ENUM_VALUE}")
 
         # Check if this a special error enum
@@ -549,12 +550,12 @@ foreach(LINE IN LISTS SOURCE_LINES)
         if("${ENUM}" MATCHES ".*::ErrorMessages")
             # syntax:
             # enum ErrorMessages {
-            #	ERR_SOME_ERROR,	// [STR_ITEM1, STR_ITEM2, ...]
+            #\tERR_SOME_ERROR,\t// [STR_ITEM1, STR_ITEM2, ...]
             # }
 
             # Set the mappings
             if("${LINE}" MATCHES "\\[(.*)\\]")
-                string(REGEX REPLACE "[ 	]" "" MAPPINGS "${CMAKE_MATCH_1}")
+                string(REGEX REPLACE "[ \t]" "" MAPPINGS "${CMAKE_MATCH_1}")
                 string(REPLACE "," ";" MAPPINGS "${MAPPINGS}")
 
                 foreach(MAPPING IN LISTS MAPPINGS)
@@ -568,11 +569,11 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # Add a const (non-enum) value
-    if("${LINE}" MATCHES "^[ 	]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ \t]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
         list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
         continue()
     endif()
-    if("${LINE}" MATCHES "^[ 	]*static constexpr [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ \t]*static constexpr [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
         list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
         continue()
     endif()
@@ -584,41 +585,43 @@ foreach(LINE IN LISTS SOURCE_LINES)
         endif()
         if("${LINE}" MATCHES "~")
             if(DEFINED API_SELECTED)
-                message(WARNING "Destructor for '${CLS}' has @api. Tag ignored.")
+                message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Destructor for '${CLS}' has @api. Tag ignored.")
                 unset(API_SELECTED)
             endif()
             continue()
         endif()
 
         unset(IS_STATIC)
-        if("${LINE}" MATCHES "static")
+        if("${LINE}" MATCHES "static ")
             set(IS_STATIC TRUE)
         endif()
 
-        string(REGEX REPLACE "(virtual|static|const)[ 	]+" "" LINE "${LINE}")
+        string(REGEX REPLACE "(virtual|static|const)[ \t]+" "" LINE "${LINE}")
         string(REGEX REPLACE "{.*" "" LINE "${LINE}")
         set(PARAM_S "${LINE}")
         string(REGEX REPLACE "\\*" "" LINE "${LINE}")
         string(REGEX REPLACE "\\(.*" "" LINE "${LINE}")
 
-        string(REGEX REPLACE ".*\\(" "" PARAM_S "${PARAM_S}")
+        # Parameters start at first "(". Further "(" will appear in ctor lists.
+        string(REGEX MATCH "\\(.*" PARAM_S "${PARAM_S}")
         string(REGEX REPLACE "\\).*" "" PARAM_S "${PARAM_S}")
+        string(REGEX REPLACE "^\\(" "" PARAM_S "${PARAM_S}")
 
-        string(REGEX MATCH "([^ 	]+)( ([^ ]+))?" RESULT "${LINE}")
+        string(REGEX MATCH "([^ \t]+)( ([^ ]+))?" RESULT "${LINE}")
         set(FUNCTYPE "${CMAKE_MATCH_1}")
         set(FUNCNAME "${CMAKE_MATCH_3}")
         if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
             if(DEFINED API_SELECTED)
-                message(WARNING "Constructor for '${CLS}' has @api. Tag ignored.")
+                message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Constructor for '${CLS}' has @api. Tag ignored.")
                 unset(API_SELECTED)
             endif()
-            set(CLS_PARAM_0 "${PARAM_S}")
+            set(CLS_PARAMS "${PARAM_S}")
             if(NOT PARAM_S)
                 continue()
             endif()
         elseif(NOT FUNCNAME)
             continue()
-		endif()
+        endif()
 
         string(REPLACE "," ";" PARAMS "${PARAM_S}")
         if(IS_STATIC)
@@ -627,9 +630,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             set(TYPES "x")
         endif()
 
-        set(LEN 1)
         foreach(PARAM IN LISTS PARAMS)
-            math(EXPR LEN "${LEN} + 1")
             string(STRIP "${PARAM}" PARAM)
             if("${PARAM}" MATCHES "\\*|&")
                 if("${PARAM}" MATCHES "^char")
@@ -668,13 +669,12 @@ foreach(LINE IN LISTS SOURCE_LINES)
         unset(API_SELECTED)
 
         if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
-            set(CLS_PARAM_1 ${LEN})
-            set(CLS_PARAM_2 "${TYPES}")
+            set(CLS_TYPES "${TYPES}")
         elseif("${FUNCNAME}" MATCHES "^_" AND NOT "${TYPES}" STREQUAL "v")
         elseif(IS_STATIC)
-            list(APPEND STATIC_METHODS "${FUNCNAME}:${LEN}:${TYPES}")
+            list(APPEND STATIC_METHODS "${FUNCNAME}:${TYPES}")
         else()
-            list(APPEND METHODS "${FUNCNAME}:${LEN}:${TYPES}")
+            list(APPEND METHODS "${FUNCNAME}:${TYPES}")
         endif()
         continue()
     endif()
diff --git a/cmake/scripts/SquirrelIncludes.cmake b/cmake/scripts/SquirrelIncludes.cmake
index d6022f73dd..5e1cab355b 100644
--- a/cmake/scripts/SquirrelIncludes.cmake
+++ b/cmake/scripts/SquirrelIncludes.cmake
@@ -19,7 +19,7 @@ endif()
 file(READ "${API_FILES}" SCRIPT_API_BINARY_FILES)
 
 foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
-    file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel \\*engine\\)$")
+    file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel &engine\\)$")
     if(LINES)
         string(REGEX REPLACE ".*api/${APILC}/(.*)" "#include \"\\1\"" FILE "${FILE}")
         list(APPEND SQUIRREL_INCLUDES "${FILE}")
@@ -28,7 +28,7 @@ foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
                 continue()
             endif()
             string(REGEX REPLACE "^.*void " "	" LINE "${LINE}")
-            string(REGEX REPLACE "Squirrel \\*" "" LINE "${LINE}")
+            string(REGEX REPLACE "Squirrel &" "" LINE "${LINE}")
             list(APPEND SQUIRREL_REGISTER "${LINE}")
         endforeach()
     endif()
diff --git a/docs/obg_format.txt b/docs/obg_format.txt
index f43ea7edd7..2aa9bec0d2 100644
--- a/docs/obg_format.txt
+++ b/docs/obg_format.txt
@@ -16,8 +16,11 @@
 ; - `openttd -I <name>` starts OpenTTD with the given set (case sensitive)
 ; - adding `graphicsset = <name>` to the misc section of openttd.cfg makes
 ;   OpenTTD start with that graphics set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
+; - `grfid -m` can give the GRF file MD5 checksums that you need
+; - The `--md5` output option for `nmlc` can also give the MD5 if you are
+;   encoding from an nml source
+; - Simple file MD5 checksums, eg. using `md5sum` are not correct for grf
+;   container versions other than 1
 ; - all files specified in this file are search relatively to the path where
 ;   this file is found, i.e. if the graphics files are in a subdir you have
 ;   to add that subdir to the names in this file to! It will NOT search for
@@ -44,6 +47,8 @@ description.en_US = howdie
 palette      = DOS
 ; preferred blitter, optional; either 8bpp (default) or 32bpp.
 blitter      = 8bpp
+; url, optional
+url          = https://github.com/my/baseset
 
 ; The files section lists the files that replace sprites.
 ; The file names are case sensitive.
diff --git a/known-bugs.md b/known-bugs.md
index b50fff766d..64c9628025 100644
--- a/known-bugs.md
+++ b/known-bugs.md
@@ -2,8 +2,8 @@
 
 ## Table of contents
 
-- 1.0) About
-- 2.0) Known bugs
+- 1.0) [About](#10-about)
+- 2.0) [Known bugs](#20-known-bugs)
 
 ## 1.0) About
 
@@ -12,7 +12,7 @@ that are the same as these. If you do, do not act surprised, because
 we WILL flame you!
 
 The current list of known bugs that we intend to fix can be found in our
-bug tracking system at https://github.com/OpenTTD/OpenTTD/issues
+bug tracking system at [https://github.com/OpenTTD/OpenTTD/issues](https://github.com/OpenTTD/OpenTTD/issues)
 Also check the closed bugs when searching for your bug in this system as we
 might have fixed the bug in the mean time.
 
diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf
index 540ddf3fe9..bca7c61448 100644
Binary files a/media/baseset/openttd.grf and b/media/baseset/openttd.grf differ
diff --git a/media/baseset/openttd.grf.hash b/media/baseset/openttd.grf.hash
index b0a772e8d0..90176c9546 100644
--- a/media/baseset/openttd.grf.hash
+++ b/media/baseset/openttd.grf.hash
@@ -1 +1 @@
-019dba4830a64ee4345d3d647633e1da
+a4a727b03a7cd07ee0499231f7f233f4
diff --git a/media/baseset/openttd/chars.nfo b/media/baseset/openttd/chars.nfo
index 8d1acb814f..dbacd2934c 100644
--- a/media/baseset/openttd/chars.nfo
+++ b/media/baseset/openttd/chars.nfo
@@ -840,3 +840,7 @@
    -1 sprites/chars.png 8bpp 630  400   6  21   0  -2 normal
    -1 sprites/mono.png 8bpp 325  270   7  13   0   0 normal
    -1 sprites/mono.png 8bpp 340  270   7  13   0   0 normal
+
+// U+E29D: Small left arrow
+   -1 * 6   12 01 01 01 9D E2
+   -1 sprites/chars.png 8bpp  10  430   5  5   0   1 normal
diff --git a/media/baseset/openttd/chars.png b/media/baseset/openttd/chars.png
index 34a4a67c5d..bb1484729e 100644
Binary files a/media/baseset/openttd/chars.png and b/media/baseset/openttd/chars.png differ
diff --git a/media/baseset/openttd/openttdgui.nfo b/media/baseset/openttd/openttdgui.nfo
index 2fd5a5bb4c..b6466f98b6 100644
--- a/media/baseset/openttd/openttdgui.nfo
+++ b/media/baseset/openttd/openttdgui.nfo
@@ -4,7 +4,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 191 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 \b 192 // OPENTTD_SPRITE_COUNT
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -196,3 +196,4 @@
    -1 sprites/openttdgui.png 8bpp 567  440  12  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 581  440  10  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 593  440  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 605  440   8  10   0   0 normal
diff --git a/media/baseset/openttd/openttdgui.png b/media/baseset/openttd/openttdgui.png
index 5b80c33260..e9fea8b976 100644
Binary files a/media/baseset/openttd/openttdgui.png and b/media/baseset/openttd/openttdgui.png differ
diff --git a/os/windows/sign_azure.ps1 b/os/windows/sign_azure.ps1
index e19476fa6d..a9fc93f427 100644
--- a/os/windows/sign_azure.ps1
+++ b/os/windows/sign_azure.ps1
@@ -24,7 +24,7 @@ if (!$Env:AZURE_CODESIGN_ENDPOINT -or !$Env:AZURE_CODESIGN_ACCOUNT_NAME -or !$En
 	exit
 }
 
-Install-Module -Name AzureCodeSigning -Scope CurrentUser -RequiredVersion 0.3.0 -Force -Repository PSGallery
+Install-Module -Name TrustedSigning -Scope CurrentUser -RequiredVersion 0.5.3 -Force -Repository PSGallery
 
 $params = @{}
 
@@ -37,4 +37,4 @@ $params["FileDigest"] = "SHA256"
 $params["TimestampRfc3161"] = "http://timestamp.acs.microsoft.com"
 $params["TimestampDigest"] = "SHA256"
 
-Invoke-AzureCodeSigning @params
+Invoke-TrustedSigning @params
diff --git a/regression/regression/main.nut b/regression/regression/main.nut
index c0fe80ea4b..951c9d4598 100644
--- a/regression/regression/main.nut
+++ b/regression/regression/main.nut
@@ -17,6 +17,10 @@ function Regression::TestInit()
 	print(" IsValid(vehicle.plane_speed): " + AIGameSettings.IsValid("vehicle.plane_speed"));
 	print(" vehicle.plane_speed: " + AIGameSettings.GetValue("vehicle.plane_speed"));
 	require("require.nut");
+	print(" TestEnum.value1: " + ::TestEnum.value1);
+	print(" test_constant: " + ::test_constant);
+	print(" TestEnum.value2: " + TestEnum.value2);
+	print(" test_constant: " + test_constant);
 	print(" min(6, 3): " + min(6, 3));
 	print(" min(3, 6): " + min(3, 6));
 	print(" max(6, 3): " + max(6, 3));
@@ -824,6 +828,13 @@ function Regression::List()
 	print("  []:");
 	print("    4000 => " + list[4000]);
 
+	print("  clone:");
+	local list3 = clone list;
+	print("  Clone ListDump:");
+	foreach (idx, val in list3) {
+		print("    " + idx + " => " + val);
+	}
+
 	list.Clear();
 	print("  IsEmpty():     " + list.IsEmpty());
 
@@ -856,6 +867,12 @@ function Regression::List()
 		it = list.Next();
 		print("    " + it + " => " + list.GetValue(it));
 	}
+
+	print("  Clone ListDump:");
+	foreach (idx, val in list3) {
+		print("    " + idx + " => " + val);
+	}
+
 }
 
 function Regression::Map()
@@ -1017,6 +1034,28 @@ function Regression::Order()
 	foreach (idx, val in list) {
 		print("    " + idx + " => " + val);
 	}
+	list = AIVehicleList_Station(3, AIVehicle.VT_ROAD);
+	print("  Count():             " + list.Count());
+	list.Valuate(AIVehicle.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	print("  foreach():");
+	foreach (idx, val in list) {
+		print("    " + idx + " => " + val);
+	}
+	list = AIVehicleList_Station(3, AIVehicle.VT_RAIL);
+	print("  Count():             " + list.Count());
+	list.Valuate(AIVehicle.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	print("  foreach():");
+	foreach (idx, val in list) {
+		print("    " + idx + " => " + val);
+	}
 }
 
 function Regression::RailTypeList()
@@ -1675,13 +1714,22 @@ function Regression::TownList()
 	}
 
 	print("  HasStatue():                     " + AITown.HasStatue(list.Begin()));
-	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
-	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
-	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
 	print("  IsActionAvailable(BUILD_STATUE): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  PerformTownAction(BUILD_STATUE): " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  IsActionAvailable(BUILD_STATUE): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  HasStatue():                     " + AITown.HasStatue(list.Begin()));
+	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
+	print("  IsActionAvailable(ROAD_REBUILD): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  PerformTownAction(ROAD_REBUILD): " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  IsActionAvailable(ROAD_REBUILD): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
+	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
+	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
+	print("  IsActionAvailable(BUY_RIGHTS):   " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  PerformTownAction(BUY_RIGHTS):   " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  IsActionAvailable(BUY_RIGHTS):   " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
+	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
 }
 
 function Regression::Tunnel()
@@ -1975,6 +2023,33 @@ function Regression::Math()
 	print("   13725      > -2147483648:   " + ( 13725      > -2147483648));
 }
 
+function Regression::PriorityQueue()
+{
+	print("");
+	print("--PriorityQueue--");
+	local queue = AIPriorityQueue();
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+	print("  --Insert--")
+	for (local i = 0; i < 10; i++) {
+		print("    Insert(" + i + ", " + i + "): " + queue.Insert(i, i));
+	}
+	print("  Exists(5):    " + queue.Exists(5));
+	print("  Insert(5, 5): "+ queue.Insert(5, 5));
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+	local item = queue.Peek();
+	print("  Peek():       " + item);
+	print("  Count():      " + queue.Count());
+	local item2 = queue.Pop();
+	print("  Pop():        " + item2);
+	print("  Count():      " + queue.Count());
+	print("  " + item + " == " + item2 + " :      " + (item == item2));
+	print("  Clear():      " + queue.Clear());
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+}
+
 function Regression::Start()
 {
 	this.TestInit();
@@ -2049,6 +2124,20 @@ function Regression::Start()
 				print("      PresidentName:     " + c.GetNewName());
 			} break;
 
+			case AIEvent.ET_EXCLUSIVE_TRANSPORT_RIGHTS: {
+				local c = AIEventExclusiveTransportRights.Convert(e);
+				print("      EventName:         ExclusiveTransportRights");
+				print("      CompanyID:         " + c.GetCompanyID());
+				print("      TownID:            " + c.GetTownID());
+			} break;
+
+			case AIEvent.ET_ROAD_RECONSTRUCTION: {
+				local c = AIEventRoadReconstruction.Convert(e);
+				print("      EventName:         RoadReconstruction");
+				print("      CompanyID:         " + c.GetCompanyID());
+				print("      TownID:            " + c.GetTownID());
+			} break;
+
 			default:
 				print("      Unknown Event");
 				break;
@@ -2057,12 +2146,18 @@ function Regression::Start()
 	print("  IsEventWaiting:        false");
 
 	this.Math();
+	this.PriorityQueue();
 
 	/* Check Valuate() is actually limited, MUST BE THE LAST TEST. */
 	print("--Valuate() with excessive CPU usage--")
 	local list = AIList();
 	list.AddItem(0, 0);
 	local Infinite = function(id) { while(true); }
+	try {
+		list = AIIndustryList(Infinite);
+	} catch (e) {
+		print("constructor failed with: " + e);
+	}
 	list.Valuate(Infinite);
 }
 
diff --git a/regression/regression/require.nut b/regression/regression/require.nut
index d8dc4baa7d..872a929a5f 100644
--- a/regression/regression/require.nut
+++ b/regression/regression/require.nut
@@ -1,2 +1,9 @@
 print("  Required this file");
 
+const test_constant = 1;
+
+enum TestEnum {
+	value0,
+	value1,
+	value2
+};
diff --git a/regression/regression/result.txt b/regression/regression/result.txt
index f00c9e3813..18afcb5f2f 100644
--- a/regression/regression/result.txt
+++ b/regression/regression/result.txt
@@ -8,6 +8,10 @@
  IsValid(vehicle.plane_speed): true
  vehicle.plane_speed: 2
   Required this file
+ TestEnum.value1: 1
+ test_constant: 1
+ TestEnum.value2: 2
+ test_constant: 1
  min(6, 3): 3
  min(3, 6): 3
  max(6, 3): 6
@@ -81,7 +85,7 @@
    20
    30
    40
- Ops:      8673
+ Ops:      8649
 
 --Std--
  abs(-21): 21
@@ -571,6 +575,13 @@
     4006 => 12
   []:
     4000 => 50
+  clone:
+  Clone ListDump:
+    1005 => 1005
+    4000 => 50
+    4001 => 8002
+    4002 => 8004
+    4006 => 12
   IsEmpty():     true
     0 => 5  (true)
 ERROR: Next() is invalid as Begin() is never called
@@ -580,6 +591,12 @@ ERROR: IsEnd() is invalid as Begin() is never called
     2 => 6  (true)
     3 => 6  (true)
     9 => 0  (false)
+  Clone ListDump:
+    1005 => 1005
+    4000 => 50
+    4001 => 8002
+    4002 => 8004
+    4006 => 12
 
 --Company--
   SetName():            true
@@ -9423,13 +9440,22 @@ ERROR: IsEnd() is invalid as Begin() is never called
     23 => 652
     25 => 563
   HasStatue():                     false
-  GetRoadReworkDuration():         0
-  GetExclusiveRightsCompany():     -1
-  GetExclusiveRightsDuration():    0
   IsActionAvailable(BUILD_STATUE): true
   PerformTownAction(BUILD_STATUE): true
   IsActionAvailable(BUILD_STATUE): false
   HasStatue():                     true
+  GetRoadReworkDuration():         0
+  IsActionAvailable(ROAD_REBUILD): true
+  PerformTownAction(ROAD_REBUILD): true
+  IsActionAvailable(ROAD_REBUILD): true
+  GetRoadReworkDuration():         6
+  GetExclusiveRightsCompany():     -1
+  GetExclusiveRightsDuration():    0
+  IsActionAvailable(BUY_RIGHTS):   true
+  PerformTownAction(BUY_RIGHTS):   true
+  IsActionAvailable(BUY_RIGHTS):   false
+  GetExclusiveRightsCompany():     1
+  GetExclusiveRightsDuration():    12
 
 --Tunnel--
   IsTunnelTile():       false
@@ -9694,6 +9720,14 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetStopLocation():     1
 
 --VehicleList_Station--
+  Count():             1
+  Location ListDump:
+    20 => 23596
+  foreach():
+    20 => 23596
+  Count():             0
+  Location ListDump:
+  foreach():
   Count():             1
   Location ListDump:
     20 => 23596
@@ -9726,6 +9760,16 @@ ERROR: IsEnd() is invalid as Begin() is never called
       EventName:         CompanyRenamed
       CompanyID:         1
       CompanyName:       Little Frutford Transport
+  GetNextEvent:          instance
+    GetEventType:        28
+      EventName:         RoadReconstruction
+      CompanyID:         1
+      TownID:            12
+  GetNextEvent:          instance
+    GetEventType:        27
+      EventName:         ExclusiveTransportRights
+      CompanyID:         1
+      TownID:            12
   IsEventWaiting:        false
 
 --Math--
@@ -9760,21 +9804,38 @@ ERROR: IsEnd() is invalid as Begin() is never called
   -1          >  2147483647:   false
   -2147483648 >  2147483647:   false
    13725      > -2147483648:   true
+
+--PriorityQueue--
+  IsEmpty():    true
+  Count():      0
+  --Insert--
+    Insert(0, 0): true
+    Insert(1, 1): true
+    Insert(2, 2): true
+    Insert(3, 3): true
+    Insert(4, 4): true
+    Insert(5, 5): true
+    Insert(6, 6): true
+    Insert(7, 7): true
+    Insert(8, 8): true
+    Insert(9, 9): true
+  Exists(5):    true
+  Insert(5, 5): true
+  IsEmpty():    false
+  Count():      11
+  Peek():       0
+  Count():      11
+  Pop():        0
+  Count():      10
+  0 == 0 :      true
+  Clear():      (null : 0x00000000)
+  IsEmpty():    true
+  Count():      0
 --Valuate() with excessive CPU usage--
+constructor failed with: excessive CPU usage in list filter function
 Your script made an error: excessive CPU usage in valuator function
 
-*FUNCTION [unknown()] regression/main.nut line [2065]
-*FUNCTION [Valuate()] NATIVE line [-1]
-*FUNCTION [Start()] regression/main.nut line [2066]
-
-[id] 0
-[this] TABLE
-[Infinite] CLOSURE
-[list] INSTANCE
-[this] INSTANCE
-Your script made an error: excessive CPU usage in valuator function
-
-*FUNCTION [Start()] regression/main.nut line [2066]
+*FUNCTION [Start()] regression/main.nut line [2161]
 
 [Infinite] CLOSURE
 [list] INSTANCE
diff --git a/src/3rdparty/icu/scriptrun.h b/src/3rdparty/icu/scriptrun.h
index 792d5c55c9..21d97645b0 100644
--- a/src/3rdparty/icu/scriptrun.h
+++ b/src/3rdparty/icu/scriptrun.h
@@ -19,6 +19,7 @@
 #include <unicode/utypes.h>
 #include <unicode/uobject.h>
 #include <unicode/uscript.h>
+#include <array>
 
 U_NAMESPACE_BEGIN
 
diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp
index 0e58d989b6..d758f0e974 100644
--- a/src/3rdparty/md5/md5.cpp
+++ b/src/3rdparty/md5/md5.cpp
@@ -281,7 +281,7 @@ void Md5::Append(const void *data, const size_t nbytes)
 	if (offset) {
 		size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
 
-		memcpy(this->buf + offset, p, copy);
+		std::copy_n(p, copy, this->buf + offset);
 
 		if (offset + copy < 64) return;
 
@@ -294,7 +294,7 @@ void Md5::Append(const void *data, const size_t nbytes)
 	for (; left >= 64; p += 64, left -= 64) this->Process(p);
 
 	/* Process a final partial block. */
-	if (left) memcpy(this->buf, p, left);
+	if (left) std::copy_n(p, left, this->buf);
 }
 
 void Md5::Finish(MD5Hash &digest)
diff --git a/src/3rdparty/squirrel/include/CMakeLists.txt b/src/3rdparty/squirrel/include/CMakeLists.txt
index 5237360d31..249e97f326 100644
--- a/src/3rdparty/squirrel/include/CMakeLists.txt
+++ b/src/3rdparty/squirrel/include/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_files(
     sqstdaux.h
     sqstdmath.h
-    sqstdstring.h
     squirrel.h
 )
diff --git a/src/3rdparty/squirrel/include/sqstdstring.h b/src/3rdparty/squirrel/include/sqstdstring.h
deleted file mode 100644
index 65dae348b3..0000000000
--- a/src/3rdparty/squirrel/include/sqstdstring.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_STRING_H_
-#define _SQSTD_STRING_H_
-
-typedef unsigned int SQRexBool;
-typedef struct SQRex SQRex;
-
-typedef struct {
-	const SQChar *begin;
-	SQInteger len;
-} SQRexMatch;
-
-SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error);
-void sqstd_rex_free(SQRex *exp);
-SQBool sqstd_rex_match(SQRex* exp,const SQChar* text);
-SQBool sqstd_rex_search(SQRex* exp,const SQChar* text, const SQChar** out_begin, const SQChar** out_end);
-SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,const SQChar* text_end,const SQChar** out_begin, const SQChar** out_end);
-SQInteger sqstd_rex_getsubexpcount(SQRex* exp);
-SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp);
-
-SQRESULT sqstd_register_stringlib(HSQUIRRELVM v);
-
-#endif /*_SQSTD_STRING_H_*/
diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h
index bf0b6fec49..eb65c69c50 100644
--- a/src/3rdparty/squirrel/include/squirrel.h
+++ b/src/3rdparty/squirrel/include/squirrel.h
@@ -68,7 +68,6 @@ struct SQClass;
 struct SQInstance;
 struct SQDelegable;
 
-typedef char SQChar;
 #define MAX_CHAR 0xFFFF
 
 #define SQUIRREL_VERSION	"Squirrel 2.2.5 stable - With custom OpenTTD modifications"
@@ -164,17 +163,17 @@ typedef struct tagSQObject
 }SQObject;
 
 typedef struct tagSQStackInfos{
-	const SQChar* funcname;
-	const SQChar* source;
-	SQInteger line;
+	std::string_view funcname;
+	std::string_view source;
+	SQInteger line = -1;
 }SQStackInfos;
 
 typedef struct SQVM* HSQUIRRELVM;
 typedef SQObject HSQOBJECT;
 typedef SQInteger (*SQFUNCTION)(HSQUIRRELVM);
 typedef SQInteger (*SQRELEASEHOOK)(SQUserPointer,SQInteger size);
-typedef void (*SQCOMPILERERROR)(HSQUIRRELVM,const SQChar * /*desc*/,const SQChar * /*source*/,SQInteger /*line*/,SQInteger /*column*/);
-typedef void (*SQPRINTFUNCTION)(HSQUIRRELVM,const std::string &);
+typedef void (*SQCOMPILERERROR)(HSQUIRRELVM,std::string_view /*desc*/,std::string_view /*source*/,SQInteger /*line*/,SQInteger /*column*/);
+typedef void (*SQPRINTFUNCTION)(HSQUIRRELVM,std::string_view);
 
 typedef SQInteger (*SQWRITEFUNC)(SQUserPointer,SQUserPointer,SQInteger);
 typedef SQInteger (*SQREADFUNC)(SQUserPointer,SQUserPointer,SQInteger);
@@ -182,16 +181,16 @@ typedef SQInteger (*SQREADFUNC)(SQUserPointer,SQUserPointer,SQInteger);
 typedef char32_t (*SQLEXREADFUNC)(SQUserPointer);
 
 typedef struct tagSQRegFunction{
-	const SQChar *name;
+	std::string_view name;
 	SQFUNCTION f;
 	SQInteger nparamscheck;
-	const SQChar *typemask;
+	std::optional<std::string_view> typemask;
 }SQRegFunction;
 
 typedef struct tagSQFunctionInfo {
 	SQUserPointer funcid;
-	const SQChar *name;
-	const SQChar *source;
+	std::string_view name;
+	std::string_view source;
 }SQFunctionInfo;
 
 
@@ -213,8 +212,8 @@ SQInteger sq_getvmstate(HSQUIRRELVM v);
 void sq_decreaseops(HSQUIRRELVM v, int amount);
 
 /*compiler*/
-SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror);
-SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror);
+SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,std::string_view sourcename,SQBool raiseerror);
+SQRESULT sq_compilebuffer(HSQUIRRELVM v,std::string_view buffer,std::string_view sourcename,SQBool raiseerror);
 void sq_enabledebuginfo(HSQUIRRELVM v, SQBool enable);
 void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enable);
 void sq_setcompilererrorhandler(HSQUIRRELVM v,SQCOMPILERERROR f);
@@ -235,10 +234,9 @@ SQUserPointer sq_newuserdata(HSQUIRRELVM v,SQUnsignedInteger size);
 void sq_newtable(HSQUIRRELVM v);
 void sq_newarray(HSQUIRRELVM v,SQInteger size);
 void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars);
-SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask);
+SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,std::optional<std::string_view> typemask);
 SQRESULT sq_bindenv(HSQUIRRELVM v,SQInteger idx);
-void sq_pushstring(HSQUIRRELVM v,const SQChar *s,SQInteger len);
-inline void sq_pushstring(HSQUIRRELVM v, const std::string &str, SQInteger len = -1) { sq_pushstring(v, str.data(), len == -1 ? str.size() : len); }
+void sq_pushstring(HSQUIRRELVM v, std::string_view str);
 void sq_pushfloat(HSQUIRRELVM v,SQFloat f);
 void sq_pushinteger(HSQUIRRELVM v,SQInteger n);
 void sq_pushbool(HSQUIRRELVM v,SQBool b);
@@ -250,7 +248,7 @@ SQRESULT sq_getbase(HSQUIRRELVM v,SQInteger idx);
 SQBool sq_instanceof(HSQUIRRELVM v);
 void sq_tostring(HSQUIRRELVM v,SQInteger idx);
 void sq_tobool(HSQUIRRELVM v, SQInteger idx, SQBool *b);
-SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c);
+SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,std::string_view &str);
 SQRESULT sq_getinteger(HSQUIRRELVM v,SQInteger idx,SQInteger *i);
 SQRESULT sq_getfloat(HSQUIRRELVM v,SQInteger idx,SQFloat *f);
 SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b);
@@ -260,10 +258,10 @@ SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPoint
 SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag);
 SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
 void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
-SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize);
+std::span<char> sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize);
 SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger idx,SQFunctionInfo *fi);
 SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
-SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
+SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,std::string_view name);
 SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
 SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag);
 SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
@@ -305,10 +303,9 @@ SQRESULT sq_clear(HSQUIRRELVM v,SQInteger idx);
 /*calls*/
 SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror, int suspend = -1);
 SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror);
-const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
-const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
-SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len = -1);
-inline SQRESULT sq_throwerror(HSQUIRRELVM v, const std::string_view err) { return sq_throwerror(v, err.data(), err.size()); }
+std::optional<std::string_view> sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
+std::optional<std::string_view> sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
+SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view err);
 void sq_reseterror(HSQUIRRELVM v);
 void sq_getlasterror(HSQUIRRELVM v);
 
@@ -318,7 +315,7 @@ void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj);
 void sq_addref(HSQUIRRELVM v,HSQOBJECT *po);
 SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po);
 void sq_resetobject(HSQOBJECT *po);
-const SQChar *sq_objtostring(HSQOBJECT *o);
+std::optional<std::string_view> sq_objtostring(HSQOBJECT *o);
 SQBool sq_objtobool(HSQOBJECT *o);
 SQInteger sq_objtointeger(HSQOBJECT *o);
 SQFloat sq_objtofloat(HSQOBJECT *o);
@@ -363,7 +360,7 @@ void sq_setdebughook(HSQUIRRELVM v);
 
 /* Limit the total number of ops that can be consumed by an operation */
 struct SQOpsLimiter {
-	SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, const char *label);
+	SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, std::string_view label);
 	~SQOpsLimiter();
 private:
 	HSQUIRRELVM _v;
diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
index 1bdee97e69..f5763589c2 100644
--- a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
+++ b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
@@ -16,28 +16,22 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 		SQInteger i;
 		SQBool b;
 		SQFloat f;
-		const SQChar *s;
 		SQInteger level=1; //1 is to skip this function that is level 0
-		const SQChar *name=nullptr;
 		SQInteger seq=0;
 		pf(v,"\nCALLSTACK\n");
 		while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si)))
 		{
-			const SQChar *fn="unknown";
-			const SQChar *src="unknown";
-			if(si.funcname)fn=si.funcname;
-			if(si.source) {
+			std::string_view fn="unknown";
+			std::string_view src="unknown";
+			if(!si.funcname.empty())fn=si.funcname;
+			if(!si.source.empty()) {
 				/* We don't want to bother users with absolute paths to all AI files.
 				 * Since the path only reaches NoAI code in a formatted string we have
 				 * to strip it here. Let's hope nobody installs openttd in a subdirectory
 				 * of a directory named /ai/. */
-				src = strstr(si.source, "\\ai\\");
-				if (!src) src = strstr(si.source, "/ai/");
-				if (src) {
-					src += 4;
-				} else {
-					src = si.source;
-				}
+				auto p = si.source.find("\\ai\\");
+				if (p == std::string_view::npos) p = si.source.find("/ai/");
+				src = (p == std::string_view::npos) ? si.source : si.source.substr(p + 4);
 			}
 			pf(v,fmt::format("*FUNCTION [{}()] {} line [{}]\n",fn,src,si.line));
 			level++;
@@ -47,8 +41,9 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 
 		for(level=0;level<10;level++){
 			seq=0;
-			while((name = sq_getlocal(v,level,seq)))
-			{
+			std::optional<std::string_view> opt;
+			while ((opt = sq_getlocal(v,level,seq)).has_value()) {
+				std::string_view name = *opt;
 				seq++;
 				switch(sq_gettype(v,-1))
 				{
@@ -66,10 +61,12 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 				case OT_USERPOINTER:
 					pf(v,fmt::format("[{}] USERPOINTER\n",name));
 					break;
-				case OT_STRING:
-					sq_getstring(v,-1,&s);
-					pf(v,fmt::format("[{}] \"{}\"\n",name,s));
+				case OT_STRING: {
+					std::string_view view;
+					sq_getstring(v,-1,view);
+					pf(v,fmt::format("[{}] \"{}\"\n",name,view));
 					break;
+				}
 				case OT_TABLE:
 					pf(v,fmt::format("[{}] TABLE\n",name));
 					break;
@@ -117,10 +114,10 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
 {
 	SQPRINTFUNCTION pf = sq_getprintfunc(v);
 	if(pf) {
-		const SQChar *sErr = nullptr;
+		std::string_view error;
 		if(sq_gettop(v)>=1) {
-			if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
-				pf(v,fmt::format("\nAN ERROR HAS OCCURRED [{}]\n",sErr));
+			if(SQ_SUCCEEDED(sq_getstring(v,2,error))) {
+				pf(v,fmt::format("\nAN ERROR HAS OCCURRED [{}]\n",error));
 			}
 			else{
 				pf(v,"\nAN ERROR HAS OCCURRED [unknown]\n");
@@ -131,7 +128,7 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
 	return 0;
 }
 
-void _sqstd_compiler_error(HSQUIRRELVM v,const SQChar *sErr,const SQChar *sSource,SQInteger line,SQInteger column)
+void _sqstd_compiler_error(HSQUIRRELVM v,std::string_view sErr,std::string_view sSource,SQInteger line,SQInteger column)
 {
 	SQPRINTFUNCTION pf = sq_getprintfunc(v);
 	if(pf) {
diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp
index 7f07271f20..5345f9b21b 100644
--- a/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp
+++ b/src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp
@@ -67,7 +67,7 @@ SINGLE_ARG_FUNC(ceil, 1)
 SINGLE_ARG_FUNC(exp, 100)
 
 #define _DECL_FUNC(name,nparams,tycheck) {#name,math_##name,nparams,tycheck}
-static SQRegFunction mathlib_funcs[] = {
+static const std::initializer_list<SQRegFunction> mathlib_funcs = {
 	_DECL_FUNC(sqrt,2,".n"),
 	_DECL_FUNC(sin,2,".n"),
 	_DECL_FUNC(cos,2,".n"),
@@ -84,11 +84,10 @@ static SQRegFunction mathlib_funcs[] = {
 	_DECL_FUNC(exp,2,".n"),
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	_DECL_FUNC(srand,2,".n"),
-	_DECL_FUNC(rand,1,nullptr),
+	_DECL_FUNC(rand,1,std::nullopt),
 #endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
 	_DECL_FUNC(fabs,2,".n"),
 	_DECL_FUNC(abs,2,".n"),
-	{nullptr,nullptr,0,nullptr},
 };
 
 #ifndef M_PI
@@ -97,21 +96,19 @@ static SQRegFunction mathlib_funcs[] = {
 
 SQRESULT sqstd_register_mathlib(HSQUIRRELVM v)
 {
-	SQInteger i=0;
-	while(mathlib_funcs[i].name!=nullptr)	{
-		sq_pushstring(v,mathlib_funcs[i].name,-1);
-		sq_newclosure(v,mathlib_funcs[i].f,0);
-		sq_setparamscheck(v,mathlib_funcs[i].nparamscheck,mathlib_funcs[i].typemask);
-		sq_setnativeclosurename(v,-1,mathlib_funcs[i].name);
+	for(auto &func : mathlib_funcs) {
+		sq_pushstring(v,func.name);
+		sq_newclosure(v,func.f,0);
+		sq_setparamscheck(v,func.nparamscheck,func.typemask);
+		sq_setnativeclosurename(v,-1,func.name);
 		sq_createslot(v,-3);
-		i++;
 	}
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	sq_pushstring(v,"RAND_MAX",-1);
+	sq_pushstring(v,"RAND_MAX");
 	sq_pushinteger(v,RAND_MAX);
 	sq_createslot(v,-3);
 #endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
-	sq_pushstring(v,"PI",-1);
+	sq_pushstring(v,"PI");
 	sq_pushfloat(v,(SQFloat)M_PI);
 	sq_createslot(v,-3);
 	return SQ_OK;
diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp
deleted file mode 100644
index 16e87b3d24..0000000000
--- a/src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp
+++ /dev/null
@@ -1,632 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <exception>
-#include "sqstdstring.h"
-
-#ifdef _UNICODE
-#define scisprint iswprint
-#else
-#define scisprint isprint
-#endif
-
-#ifdef _DEBUG
-
-static const SQChar *g_nnames[] =
-{
-	"NONE","OP_GREEDY",	"OP_OR",
-	"OP_EXPR","OP_NOCAPEXPR","OP_DOT",	"OP_CLASS",
-	"OP_CCLASS","OP_NCLASS","OP_RANGE","OP_CHAR",
-	"OP_EOL","OP_BOL","OP_WB"
-};
-
-#endif
-
-#define OP_GREEDY		(MAX_CHAR+1) // * + ? {n}
-#define OP_OR			(MAX_CHAR+2)
-#define OP_EXPR			(MAX_CHAR+3) //parentesis ()
-#define OP_NOCAPEXPR	(MAX_CHAR+4) //parentesis (?:)
-#define OP_DOT			(MAX_CHAR+5)
-#define OP_CLASS		(MAX_CHAR+6)
-#define OP_CCLASS		(MAX_CHAR+7)
-#define OP_NCLASS		(MAX_CHAR+8) //negates class the [^
-#define OP_RANGE		(MAX_CHAR+9)
-#define OP_CHAR			(MAX_CHAR+10)
-#define OP_EOL			(MAX_CHAR+11)
-#define OP_BOL			(MAX_CHAR+12)
-#define OP_WB			(MAX_CHAR+13)
-
-#define SQREX_SYMBOL_ANY_CHAR ('.')
-#define SQREX_SYMBOL_GREEDY_ONE_OR_MORE ('+')
-#define SQREX_SYMBOL_GREEDY_ZERO_OR_MORE ('*')
-#define SQREX_SYMBOL_GREEDY_ZERO_OR_ONE ('?')
-#define SQREX_SYMBOL_BRANCH ('|')
-#define SQREX_SYMBOL_END_OF_STRING ('$')
-#define SQREX_SYMBOL_BEGINNING_OF_STRING ('^')
-#define SQREX_SYMBOL_ESCAPE_CHAR ('\\')
-
-
-typedef int SQRexNodeType;
-
-typedef struct tagSQRexNode{
-	SQRexNodeType type;
-	SQInteger left;
-	SQInteger right;
-	SQInteger next;
-}SQRexNode;
-
-struct SQRex{
-	const SQChar *_eol;
-	const SQChar *_bol;
-	const SQChar *_p;
-	SQInteger _first;
-	SQInteger _op;
-	SQRexNode *_nodes;
-	SQInteger _nallocated;
-	SQInteger _nsize;
-	SQInteger _nsubexpr;
-	SQRexMatch *_matches;
-	SQInteger _currsubexp;
-	const SQChar **_error;
-};
-
-static SQInteger sqstd_rex_list(SQRex *exp);
-
-static SQInteger sqstd_rex_newnode(SQRex *exp, SQRexNodeType type)
-{
-	SQRexNode n;
-	n.type = type;
-	n.next = n.right = n.left = -1;
-	if(type == OP_EXPR)
-		n.right = exp->_nsubexpr++;
-	if(exp->_nallocated < (exp->_nsize + 1)) {
-		SQInteger oldsize = exp->_nallocated;
-		exp->_nallocated *= 2;
-		exp->_nodes = (SQRexNode *)sq_realloc(exp->_nodes, oldsize * sizeof(SQRexNode) ,exp->_nallocated * sizeof(SQRexNode));
-	}
-	exp->_nodes[exp->_nsize++] = n;
-	SQInteger newid = exp->_nsize - 1;
-	return (SQInteger)newid;
-}
-
-static void sqstd_rex_error(SQRex *exp,const SQChar *error)
-{
-	if(exp->_error) *exp->_error = error;
-	throw std::exception();
-}
-
-static void sqstd_rex_expect(SQRex *exp, SQChar n){
-	if((*exp->_p) != n)
-		sqstd_rex_error(exp, "expected paren");
-	exp->_p++;
-}
-
-static SQChar sqstd_rex_escapechar(SQRex *exp)
-{
-	if(*exp->_p == SQREX_SYMBOL_ESCAPE_CHAR){
-		exp->_p++;
-		switch(*exp->_p) {
-		case 'v': exp->_p++; return '\v';
-		case 'n': exp->_p++; return '\n';
-		case 't': exp->_p++; return '\t';
-		case 'r': exp->_p++; return '\r';
-		case 'f': exp->_p++; return '\f';
-		default: return (*exp->_p++);
-		}
-	} else if(!scisprint(*exp->_p)) sqstd_rex_error(exp,"letter expected");
-	return (*exp->_p++);
-}
-
-static SQInteger sqstd_rex_charclass(SQRex *exp,SQInteger classid)
-{
-	SQInteger n = sqstd_rex_newnode(exp,OP_CCLASS);
-	exp->_nodes[n].left = classid;
-	return n;
-}
-
-static SQInteger sqstd_rex_charnode(SQRex *exp,SQBool isclass)
-{
-	SQChar t;
-	if(*exp->_p == SQREX_SYMBOL_ESCAPE_CHAR) {
-		exp->_p++;
-		switch(*exp->_p) {
-			case 'n': exp->_p++; return sqstd_rex_newnode(exp,'\n');
-			case 't': exp->_p++; return sqstd_rex_newnode(exp,'\t');
-			case 'r': exp->_p++; return sqstd_rex_newnode(exp,'\r');
-			case 'f': exp->_p++; return sqstd_rex_newnode(exp,'\f');
-			case 'v': exp->_p++; return sqstd_rex_newnode(exp,'\v');
-			case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
-			case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
-			case 'p': case 'P': case 'l': case 'u':
-				{
-				t = *exp->_p; exp->_p++;
-				return sqstd_rex_charclass(exp,t);
-				}
-			case 'b':
-			case 'B':
-				if(!isclass) {
-					SQInteger node = sqstd_rex_newnode(exp,OP_WB);
-					exp->_nodes[node].left = *exp->_p;
-					exp->_p++;
-					return node;
-				} //else default
-			default:
-				t = *exp->_p; exp->_p++;
-				return sqstd_rex_newnode(exp,t);
-		}
-	}
-	else if(!scisprint(*exp->_p)) {
-
-		sqstd_rex_error(exp,"letter expected");
-	}
-	t = *exp->_p; exp->_p++;
-	return sqstd_rex_newnode(exp,t);
-}
-static SQInteger sqstd_rex_class(SQRex *exp)
-{
-	SQInteger ret = -1;
-	SQInteger first = -1,chain;
-	if(*exp->_p == SQREX_SYMBOL_BEGINNING_OF_STRING){
-		ret = sqstd_rex_newnode(exp,OP_NCLASS);
-		exp->_p++;
-	}else ret = sqstd_rex_newnode(exp,OP_CLASS);
-
-	if(*exp->_p == ']') sqstd_rex_error(exp,"empty class");
-	chain = ret;
-	while(*exp->_p != ']' && exp->_p != exp->_eol) {
-		if(*exp->_p == '-' && first != -1){
-			SQInteger r;
-			if(*exp->_p++ == ']') sqstd_rex_error(exp,"unfinished range");
-			r = sqstd_rex_newnode(exp,OP_RANGE);
-			if(exp->_nodes[first].type>*exp->_p) sqstd_rex_error(exp,"invalid range");
-			if(exp->_nodes[first].type == OP_CCLASS) sqstd_rex_error(exp,"cannot use character classes in ranges");
-			exp->_nodes[r].left = exp->_nodes[first].type;
-			SQInteger t = sqstd_rex_escapechar(exp);
-			exp->_nodes[r].right = t;
-            exp->_nodes[chain].next = r;
-			chain = r;
-			first = -1;
-		}
-		else{
-			if(first!=-1){
-				SQInteger c = first;
-				exp->_nodes[chain].next = c;
-				chain = c;
-				first = sqstd_rex_charnode(exp,SQTrue);
-			}
-			else{
-				first = sqstd_rex_charnode(exp,SQTrue);
-			}
-		}
-	}
-	if(first!=-1){
-		SQInteger c = first;
-		exp->_nodes[chain].next = c;
-		chain = c;
-		first = -1;
-	}
-	/* hack? */
-	exp->_nodes[ret].left = exp->_nodes[ret].next;
-	exp->_nodes[ret].next = -1;
-	return ret;
-}
-
-static SQInteger sqstd_rex_parsenumber(SQRex *exp)
-{
-	SQInteger ret = *exp->_p-'0';
-	SQInteger positions = 10;
-	exp->_p++;
-	while(isdigit(*exp->_p)) {
-		ret = ret*10+(*exp->_p++-'0');
-		if(positions==1000000000) sqstd_rex_error(exp,"overflow in numeric constant");
-		positions *= 10;
-	};
-	return ret;
-}
-
-static SQInteger sqstd_rex_element(SQRex *exp)
-{
-	SQInteger ret = -1;
-	switch(*exp->_p)
-	{
-	case '(': {
-		SQInteger expr;
-		exp->_p++;
-
-
-		if(*exp->_p =='?') {
-			exp->_p++;
-			sqstd_rex_expect(exp,':');
-			expr = sqstd_rex_newnode(exp,OP_NOCAPEXPR);
-		}
-		else
-			expr = sqstd_rex_newnode(exp,OP_EXPR);
-		SQInteger newn = sqstd_rex_list(exp);
-		exp->_nodes[expr].left = newn;
-		ret = expr;
-		sqstd_rex_expect(exp,')');
-			  }
-			  break;
-	case '[':
-		exp->_p++;
-		ret = sqstd_rex_class(exp);
-		sqstd_rex_expect(exp,']');
-		break;
-	case SQREX_SYMBOL_END_OF_STRING: exp->_p++; ret = sqstd_rex_newnode(exp,OP_EOL);break;
-	case SQREX_SYMBOL_ANY_CHAR: exp->_p++; ret = sqstd_rex_newnode(exp,OP_DOT);break;
-	default:
-		ret = sqstd_rex_charnode(exp,SQFalse);
-		break;
-	}
-
-
-	SQInteger op;
-	SQBool isgreedy = SQFalse;
-	unsigned short p0 = 0, p1 = 0;
-	switch(*exp->_p){
-		case SQREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = SQTrue; break;
-		case SQREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = SQTrue; break;
-		case SQREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = SQTrue; break;
-		case '{':
-			exp->_p++;
-			if(!isdigit(*exp->_p)) sqstd_rex_error(exp,"number expected");
-			p0 = (unsigned short)sqstd_rex_parsenumber(exp);
-			/*******************************/
-			switch(*exp->_p) {
-		case '}':
-			p1 = p0; exp->_p++;
-			break;
-		case ',':
-			exp->_p++;
-			p1 = 0xFFFF;
-			if(isdigit(*exp->_p)){
-				p1 = (unsigned short)sqstd_rex_parsenumber(exp);
-			}
-			sqstd_rex_expect(exp,'}');
-			break;
-		default:
-			sqstd_rex_error(exp,", or } expected");
-			}
-			/*******************************/
-			isgreedy = SQTrue;
-			break;
-
-	}
-	if(isgreedy) {
-		SQInteger nnode = sqstd_rex_newnode(exp,OP_GREEDY);
-		op = OP_GREEDY;
-		exp->_nodes[nnode].left = ret;
-		exp->_nodes[nnode].right = ((p0)<<16)|p1;
-		ret = nnode;
-	}
-
-	if((*exp->_p != SQREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != SQREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != SQREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
-		SQInteger nnode = sqstd_rex_element(exp);
-		exp->_nodes[ret].next = nnode;
-	}
-
-	return ret;
-}
-
-static SQInteger sqstd_rex_list(SQRex *exp)
-{
-	SQInteger ret=-1,e;
-	if(*exp->_p == SQREX_SYMBOL_BEGINNING_OF_STRING) {
-		exp->_p++;
-		ret = sqstd_rex_newnode(exp,OP_BOL);
-	}
-	e = sqstd_rex_element(exp);
-	if(ret != -1) {
-		exp->_nodes[ret].next = e;
-	}
-	else ret = e;
-
-	if(*exp->_p == SQREX_SYMBOL_BRANCH) {
-		SQInteger temp,tright;
-		exp->_p++;
-		temp = sqstd_rex_newnode(exp,OP_OR);
-		exp->_nodes[temp].left = ret;
-		tright = sqstd_rex_list(exp);
-		exp->_nodes[temp].right = tright;
-		ret = temp;
-	}
-	return ret;
-}
-
-static SQBool sqstd_rex_matchcclass(SQInteger cclass,SQChar c)
-{
-	switch(cclass) {
-	case 'a': return isalpha(c)?SQTrue:SQFalse;
-	case 'A': return !isalpha(c)?SQTrue:SQFalse;
-	case 'w': return (isalnum(c) || c == '_')?SQTrue:SQFalse;
-	case 'W': return (!isalnum(c) && c != '_')?SQTrue:SQFalse;
-	case 's': return isspace(c)?SQTrue:SQFalse;
-	case 'S': return !isspace(c)?SQTrue:SQFalse;
-	case 'd': return isdigit(c)?SQTrue:SQFalse;
-	case 'D': return !isdigit(c)?SQTrue:SQFalse;
-	case 'x': return isxdigit(c)?SQTrue:SQFalse;
-	case 'X': return !isxdigit(c)?SQTrue:SQFalse;
-	case 'c': return iscntrl(c)?SQTrue:SQFalse;
-	case 'C': return !iscntrl(c)?SQTrue:SQFalse;
-	case 'p': return ispunct(c)?SQTrue:SQFalse;
-	case 'P': return !ispunct(c)?SQTrue:SQFalse;
-	case 'l': return islower(c)?SQTrue:SQFalse;
-	case 'u': return isupper(c)?SQTrue:SQFalse;
-	}
-	return SQFalse; /*cannot happen*/
-}
-
-static SQBool sqstd_rex_matchclass(SQRex* exp,SQRexNode *node,SQInteger c)
-{
-	do {
-		switch(node->type) {
-			case OP_RANGE:
-				if(c >= node->left && c <= node->right) return SQTrue;
-				break;
-			case OP_CCLASS:
-				if(sqstd_rex_matchcclass(node->left,c)) return SQTrue;
-				break;
-			default:
-				if(c == node->type)return SQTrue;
-		}
-	} while((node->next != -1) && (node = &exp->_nodes[node->next]));
-	return SQFalse;
-}
-
-static const SQChar *sqstd_rex_matchnode(SQRex* exp,SQRexNode *node,const SQChar *str,SQRexNode *next)
-{
-
-	SQRexNodeType type = node->type;
-	switch(type) {
-	case OP_GREEDY: {
-		//SQRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : nullptr;
-		SQRexNode *greedystop = nullptr;
-		SQInteger p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
-		const SQChar *s=str, *good = str;
-
-		if(node->next != -1) {
-			greedystop = &exp->_nodes[node->next];
-		}
-		else {
-			greedystop = next;
-		}
-
-		while((nmaches == 0xFFFF || nmaches < p1)) {
-
-			const SQChar *stop;
-			if(!(s = sqstd_rex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
-				break;
-			nmaches++;
-			good=s;
-			if(greedystop) {
-				//checks that 0 matches satisfy the expression(if so skips)
-				//if not would always stop(for instance if is a '?')
-				if(greedystop->type != OP_GREEDY ||
-				(greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
-				{
-					SQRexNode *gnext = nullptr;
-					if(greedystop->next != -1) {
-						gnext = &exp->_nodes[greedystop->next];
-					}else if(next && next->next != -1){
-						gnext = &exp->_nodes[next->next];
-					}
-					stop = sqstd_rex_matchnode(exp,greedystop,s,gnext);
-					if(stop) {
-						//if satisfied stop it
-						if(p0 == p1 && p0 == nmaches) break;
-						else if(nmaches >= p0 && p1 == 0xFFFF) break;
-						else if(nmaches >= p0 && nmaches <= p1) break;
-					}
-				}
-			}
-
-			if(s >= exp->_eol)
-				break;
-		}
-		if(p0 == p1 && p0 == nmaches) return good;
-		else if(nmaches >= p0 && p1 == 0xFFFF) return good;
-		else if(nmaches >= p0 && nmaches <= p1) return good;
-		return nullptr;
-	}
-	case OP_OR: {
-			const SQChar *asd = str;
-			SQRexNode *temp=&exp->_nodes[node->left];
-			while( (asd = sqstd_rex_matchnode(exp,temp,asd,nullptr)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			asd = str;
-			temp = &exp->_nodes[node->right];
-			while( (asd = sqstd_rex_matchnode(exp,temp,asd,nullptr)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			return nullptr;
-			break;
-	}
-	case OP_EXPR:
-	case OP_NOCAPEXPR:{
-			SQRexNode *n = &exp->_nodes[node->left];
-			const SQChar *cur = str;
-			SQInteger capture = -1;
-			if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
-				capture = exp->_currsubexp;
-				exp->_matches[capture].begin = cur;
-				exp->_currsubexp++;
-			}
-
-			do {
-				SQRexNode *subnext = nullptr;
-				if(n->next != -1) {
-					subnext = &exp->_nodes[n->next];
-				}else {
-					subnext = next;
-				}
-				if(!(cur = sqstd_rex_matchnode(exp,n,cur,subnext))) {
-					if(capture != -1){
-						exp->_matches[capture].begin = 0;
-						exp->_matches[capture].len = 0;
-					}
-					return nullptr;
-				}
-			} while((n->next != -1) && (n = &exp->_nodes[n->next]));
-
-			if(capture != -1)
-				exp->_matches[capture].len = cur - exp->_matches[capture].begin;
-			return cur;
-	}
-	case OP_WB:
-		if((str == exp->_bol && !isspace(*str))
-		 || (str == exp->_eol && !isspace(*(str-1)))
-		 || (!isspace(*str) && isspace(*(str+1)))
-		 || (isspace(*str) && !isspace(*(str+1))) ) {
-			return (node->left == 'b')?str:nullptr;
-		}
-		return (node->left == 'b')?nullptr:str;
-	case OP_BOL:
-		if(str == exp->_bol) return str;
-		return nullptr;
-	case OP_EOL:
-		if(str == exp->_eol) return str;
-		return nullptr;
-	case OP_DOT:{
-		*str++;
-				}
-		return str;
-	case OP_NCLASS:
-	case OP_CLASS:
-		if(sqstd_rex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?SQTrue:SQFalse):(type == OP_NCLASS?SQTrue:SQFalse)) {
-			*str++;
-			return str;
-		}
-		return nullptr;
-	case OP_CCLASS:
-		if(sqstd_rex_matchcclass(node->left,*str)) {
-			*str++;
-			return str;
-		}
-		return nullptr;
-	default: /* char */
-		if(*str != (SQChar)node->type) return nullptr;
-		*str++;
-		return str;
-	}
-	return nullptr;
-}
-
-/* public api */
-SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error)
-{
-	SQRex *exp = (SQRex *)sq_malloc(sizeof(SQRex));
-	exp->_eol = exp->_bol = nullptr;
-	exp->_p = pattern;
-	exp->_nallocated = (SQInteger)strlen(pattern) * sizeof(SQChar);
-	exp->_nodes = (SQRexNode *)sq_malloc(exp->_nallocated * sizeof(SQRexNode));
-	exp->_nsize = 0;
-	exp->_matches = 0;
-	exp->_nsubexpr = 0;
-	exp->_first = sqstd_rex_newnode(exp,OP_EXPR);
-	exp->_error = error;
-	try {
-		SQInteger res = sqstd_rex_list(exp);
-		exp->_nodes[exp->_first].left = res;
-		if(*exp->_p!='\0')
-			sqstd_rex_error(exp,"unexpected character");
-#ifdef _DEBUG
-		{
-			SQInteger nsize,i;
-			SQRexNode *t;
-			nsize = exp->_nsize;
-			t = &exp->_nodes[0];
-			printf("\n");
-			/* XXX -- The (int) casts are needed to silent warnings on 64bit systems (SQInteger is 64bit, %d assumes 32bit, (int) is 32bit) */
-			for(i = 0;i < nsize; i++) {
-				if(exp->_nodes[i].type>MAX_CHAR)
-					printf("[%02d] %10s ",(int)i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
-				else
-					printf("[%02d] %10c ",(int)i,exp->_nodes[i].type);
-				printf("left %02d right %02d next %02d\n",(int)exp->_nodes[i].left,(int)exp->_nodes[i].right,(int)exp->_nodes[i].next);
-			}
-			printf("\n");
-		}
-#endif
-		exp->_matches = (SQRexMatch *) sq_malloc(exp->_nsubexpr * sizeof(SQRexMatch));
-		memset(exp->_matches,0,exp->_nsubexpr * sizeof(SQRexMatch));
-	}
-	catch (...) {
-		sqstd_rex_free(exp);
-		return nullptr;
-	}
-	return exp;
-}
-
-void sqstd_rex_free(SQRex *exp)
-{
-	if(exp)	{
-		if(exp->_nodes) sq_free(exp->_nodes,exp->_nallocated * sizeof(SQRexNode));
-		if(exp->_matches) sq_free(exp->_matches,exp->_nsubexpr * sizeof(SQRexMatch));
-		sq_free(exp,sizeof(SQRex));
-	}
-}
-
-SQBool sqstd_rex_match(SQRex* exp,const SQChar* text)
-{
-	const SQChar* res = nullptr;
-	exp->_bol = text;
-	exp->_eol = text + strlen(text);
-	exp->_currsubexp = 0;
-	res = sqstd_rex_matchnode(exp,exp->_nodes,text,nullptr);
-	if(res == nullptr || res != exp->_eol)
-		return SQFalse;
-	return SQTrue;
-}
-
-SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,const SQChar* text_end,const SQChar** out_begin, const SQChar** out_end)
-{
-	const SQChar *cur = nullptr;
-	SQInteger node = exp->_first;
-	if(text_begin >= text_end) return SQFalse;
-	exp->_bol = text_begin;
-	exp->_eol = text_end;
-	do {
-		cur = text_begin;
-		while(node != -1) {
-			exp->_currsubexp = 0;
-			cur = sqstd_rex_matchnode(exp,&exp->_nodes[node],cur,nullptr);
-			if(!cur)
-				break;
-			node = exp->_nodes[node].next;
-		}
-		*text_begin++;
-	} while(cur == nullptr && text_begin != text_end);
-
-	if(cur == nullptr)
-		return SQFalse;
-
-	--text_begin;
-
-	if(out_begin) *out_begin = text_begin;
-	if(out_end) *out_end = cur;
-	return SQTrue;
-}
-
-SQBool sqstd_rex_search(SQRex* exp,const SQChar* text, const SQChar** out_begin, const SQChar** out_end)
-{
-	return sqstd_rex_searchrange(exp,text,text + strlen(text),out_begin,out_end);
-}
-
-SQInteger sqstd_rex_getsubexpcount(SQRex* exp)
-{
-	return exp->_nsubexpr;
-}
-
-SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp)
-{
-	if( n<0 || n >= exp->_nsubexpr) return SQFalse;
-	*subexp = exp->_matches[n];
-	return SQTrue;
-}
-
diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp
deleted file mode 100644
index f042ac7df8..0000000000
--- a/src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <sqstdstring.h>
-
-#define scstrchr strchr
-#define scatoi atoi
-#define scstrtok strtok
-#define MAX_FORMAT_LEN	20
-#define MAX_WFORMAT_LEN	3
-#define ADDITIONAL_FORMAT_SPACE (100*sizeof(SQChar))
-
-static SQInteger validate_format(HSQUIRRELVM v, SQChar *fmt, const SQChar *src, SQInteger n,SQInteger &width)
-{
-	SQChar swidth[MAX_WFORMAT_LEN];
-	SQInteger wc = 0;
-	SQInteger start = n;
-	fmt[0] = '%';
-	while (scstrchr("-+ #0", src[n])) n++;
-	while (isdigit(src[n])) {
-		swidth[wc] = src[n];
-		n++;
-		wc++;
-		if(wc>=MAX_WFORMAT_LEN)
-			return sq_throwerror(v,"width format too long");
-	}
-	swidth[wc] = '\0';
-	if(wc > 0) {
-		width = atoi(swidth);
-	}
-	else
-		width = 0;
-	if (src[n] == '.') {
-	    n++;
-
-		wc = 0;
-		while (isdigit(src[n])) {
-			swidth[wc] = src[n];
-			n++;
-			wc++;
-			if(wc>=MAX_WFORMAT_LEN)
-				return sq_throwerror(v,"precision format too long");
-		}
-		swidth[wc] = '\0';
-		if(wc > 0) {
-			width += atoi(swidth);
-		}
-	}
-	if (n-start > MAX_FORMAT_LEN )
-		return sq_throwerror(v,"format too long");
-	memcpy(&fmt[1],&src[start],((n-start)+1)*sizeof(SQChar));
-	fmt[(n-start)+2] = '\0';
-	return n;
-}
-
-static void __strip_l(const SQChar *str,const SQChar **start)
-{
-	const SQChar *t = str;
-	while(((*t) != '\0') && isspace(*t)){ t++; }
-	*start = t;
-}
-
-static void __strip_r(const SQChar *str,SQInteger len,const SQChar **end)
-{
-	if(len == 0) {
-		*end = str;
-		return;
-	}
-	const SQChar *t = &str[len-1];
-	while(t != str && isspace(*t)) { t--; }
-	*end = t+1;
-}
-
-static SQInteger _string_strip(HSQUIRRELVM v)
-{
-	const SQChar *str,*start,*end;
-	sq_getstring(v,2,&str);
-	SQInteger len = sq_getsize(v,2);
-	__strip_l(str,&start);
-	__strip_r(str,len,&end);
-	sq_pushstring(v,start,end - start);
-	return 1;
-}
-
-static SQInteger _string_lstrip(HSQUIRRELVM v)
-{
-	const SQChar *str,*start;
-	sq_getstring(v,2,&str);
-	__strip_l(str,&start);
-	sq_pushstring(v,start,-1);
-	return 1;
-}
-
-static SQInteger _string_rstrip(HSQUIRRELVM v)
-{
-	const SQChar *str,*end;
-	sq_getstring(v,2,&str);
-	SQInteger len = sq_getsize(v,2);
-	__strip_r(str,len,&end);
-	sq_pushstring(v,str,end - str);
-	return 1;
-}
-
-static SQInteger _string_split(HSQUIRRELVM v)
-{
-	const SQChar *str,*seps;
-	SQChar *stemp,*tok;
-	sq_getstring(v,2,&str);
-	sq_getstring(v,3,&seps);
-	if(sq_getsize(v,3) == 0) return sq_throwerror(v,"empty separators string");
-	SQInteger memsize = (sq_getsize(v,2)+1)*sizeof(SQChar);
-	stemp = sq_getscratchpad(v,memsize);
-	memcpy(stemp,str,memsize);
-	tok = scstrtok(stemp,seps);
-	sq_newarray(v,0);
-	while( tok != nullptr ) {
-		sq_pushstring(v,tok,-1);
-		sq_arrayappend(v,-2);
-		tok = scstrtok( nullptr, seps );
-	}
-	return 1;
-}
-
-#define SETUP_REX(v) \
-	SQRex *self = nullptr; \
-	sq_getinstanceup(v,1,(SQUserPointer *)&self,0);
-
-static SQInteger _rexobj_releasehook(SQUserPointer p, SQInteger size)
-{
-	SQRex *self = ((SQRex *)p);
-	sqstd_rex_free(self);
-	return 1;
-}
-
-static SQInteger _regexp_match(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str;
-	sq_getstring(v,2,&str);
-	if(sqstd_rex_match(self,str) == SQTrue)
-	{
-		sq_pushbool(v,SQTrue);
-		return 1;
-	}
-	sq_pushbool(v,SQFalse);
-	return 1;
-}
-
-static void _addrexmatch(HSQUIRRELVM v,const SQChar *str,const SQChar *begin,const SQChar *end)
-{
-	sq_newtable(v);
-	sq_pushstring(v,"begin",-1);
-	sq_pushinteger(v,begin - str);
-	sq_rawset(v,-3);
-	sq_pushstring(v,"end",-1);
-	sq_pushinteger(v,end - str);
-	sq_rawset(v,-3);
-}
-
-static SQInteger _regexp_search(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str,*begin,*end;
-	SQInteger start = 0;
-	sq_getstring(v,2,&str);
-	if(sq_gettop(v) > 2) sq_getinteger(v,3,&start);
-	if(sqstd_rex_search(self,str+start,&begin,&end) == SQTrue) {
-		_addrexmatch(v,str,begin,end);
-		return 1;
-	}
-	return 0;
-}
-
-static SQInteger _regexp_capture(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str,*begin,*end;
-	SQInteger start = 0;
-	sq_getstring(v,2,&str);
-	if(sq_gettop(v) > 2) sq_getinteger(v,3,&start);
-	if(sqstd_rex_search(self,str+start,&begin,&end) == SQTrue) {
-		SQInteger n = sqstd_rex_getsubexpcount(self);
-		SQRexMatch match;
-		sq_newarray(v,0);
-		for(SQInteger i = 0;i < n; i++) {
-			sqstd_rex_getsubexp(self,i,&match);
-			if(match.len > 0)
-				_addrexmatch(v,str,match.begin,match.begin+match.len);
-			else
-				_addrexmatch(v,str,str,str); //empty match
-			sq_arrayappend(v,-2);
-		}
-		return 1;
-	}
-	return 0;
-}
-
-static SQInteger _regexp_subexpcount(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	sq_pushinteger(v,sqstd_rex_getsubexpcount(self));
-	return 1;
-}
-
-static SQInteger _regexp_constructor(HSQUIRRELVM v)
-{
-	const SQChar *error,*pattern;
-	sq_getstring(v,2,&pattern);
-	SQRex *rex = sqstd_rex_compile(pattern,&error);
-	if(!rex) return sq_throwerror(v,error);
-	sq_setinstanceup(v,1,rex);
-	sq_setreleasehook(v,1,_rexobj_releasehook);
-	return 0;
-}
-
-static SQInteger _regexp__typeof(HSQUIRRELVM v)
-{
-	sq_pushstring(v,"regexp",-1);
-	return 1;
-}
-
-#define _DECL_REX_FUNC(name,nparams,pmask) {#name,_regexp_##name,nparams,pmask}
-static SQRegFunction rexobj_funcs[]={
-	_DECL_REX_FUNC(constructor,2,".s"),
-	_DECL_REX_FUNC(search,-2,"xsn"),
-	_DECL_REX_FUNC(match,2,"xs"),
-	_DECL_REX_FUNC(capture,-2,"xsn"),
-	_DECL_REX_FUNC(subexpcount,1,"x"),
-	_DECL_REX_FUNC(_typeof,1,"x"),
-	{0,0,0,0}
-};
-
-#define _DECL_FUNC(name,nparams,pmask) {#name,_string_##name,nparams,pmask}
-static SQRegFunction stringlib_funcs[]={
-	_DECL_FUNC(format,-2,".s"),
-	_DECL_FUNC(strip,2,".s"),
-	_DECL_FUNC(lstrip,2,".s"),
-	_DECL_FUNC(rstrip,2,".s"),
-	_DECL_FUNC(split,3,".ss"),
-	{0,0,0,0}
-};
-
-
-SQInteger sqstd_register_stringlib(HSQUIRRELVM v)
-{
-	sq_pushstring(v,"regexp",-1);
-	sq_newclass(v,SQFalse);
-	SQInteger i = 0;
-	while(rexobj_funcs[i].name != 0) {
-		SQRegFunction &f = rexobj_funcs[i];
-		sq_pushstring(v,f.name,-1);
-		sq_newclosure(v,f.f,0);
-		sq_setparamscheck(v,f.nparamscheck,f.typemask);
-		sq_setnativeclosurename(v,-1,f.name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	sq_createslot(v,-3);
-
-	i = 0;
-	while(stringlib_funcs[i].name!=0)
-	{
-		sq_pushstring(v,stringlib_funcs[i].name,-1);
-		sq_newclosure(v,stringlib_funcs[i].f,0);
-		sq_setparamscheck(v,stringlib_funcs[i].nparamscheck,stringlib_funcs[i].typemask);
-		sq_setnativeclosurename(v,-1,stringlib_funcs[i].name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	return 1;
-}
diff --git a/src/3rdparty/squirrel/squirrel/sqapi.cpp b/src/3rdparty/squirrel/squirrel/sqapi.cpp
index 189fe67329..18b31ad990 100644
--- a/src/3rdparty/squirrel/squirrel/sqapi.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqapi.cpp
@@ -18,6 +18,7 @@
 #include "sqfuncstate.h"
 #include "sqclass.h"
 
+#include "../../../core/string_consumer.hpp"
 #include "../../../string_func.h"
 
 #include "../../../safeguards.h"
@@ -131,7 +132,7 @@ void sq_close(HSQUIRRELVM v)
 	sq_delete(ss, SQSharedState);
 }
 
-SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror)
+SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,std::string_view sourcename,SQBool raiseerror)
 {
 	SQObjectPtr o;
 	if(Compile(v, read, p, sourcename, o, raiseerror != 0, _ss(v)->_debuginfo)) {
@@ -172,12 +173,12 @@ SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
 #endif
 }
 
-const SQChar *sq_objtostring(HSQOBJECT *o)
+std::optional<std::string_view> sq_objtostring(HSQOBJECT *o)
 {
 	if(sq_type(*o) == OT_STRING) {
 		return _stringval(*o);
 	}
-	return nullptr;
+	return std::nullopt;
 }
 
 SQInteger sq_objtointeger(HSQOBJECT *o)
@@ -209,11 +210,9 @@ void sq_pushnull(HSQUIRRELVM v)
 	v->Push(_null_);
 }
 
-void sq_pushstring(HSQUIRRELVM v,const SQChar *s,SQInteger len)
+void sq_pushstring(HSQUIRRELVM v,std::string_view s)
 {
-	if(s)
-		v->Push(SQObjectPtr(SQString::Create(_ss(v), s, len)));
-	else v->Push(_null_);
+	v->Push(SQObjectPtr(SQString::Create(_ss(v), s)));
 }
 
 void sq_pushinteger(HSQUIRRELVM v,SQInteger n)
@@ -375,7 +374,7 @@ SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparam
 	return sq_throwerror(v,"the object is not a closure");
 }
 
-SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name)
+SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,std::string_view name)
 {
 	SQObject o = stack_get(v, idx);
 	if(sq_isnativeclosure(o)) {
@@ -386,16 +385,16 @@ SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name)
 	return sq_throwerror(v,"the object is not a nativeclosure");
 }
 
-SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask)
+SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,std::optional<std::string_view> typemask)
 {
 	SQObject o = stack_get(v, -1);
 	if(!sq_isnativeclosure(o))
 		return sq_throwerror(v, "native closure expected");
 	SQNativeClosure *nc = _nativeclosure(o);
 	nc->_nparamscheck = nparamscheck;
-	if(typemask) {
+	if(typemask.has_value()) {
 		SQIntVec res;
-		if(!CompileTypemask(res, typemask))
+		if(!CompileTypemask(res, *typemask))
 			return sq_throwerror(v, "invalid typemask");
 		nc->_typecheck.copy(res);
 	}
@@ -552,11 +551,11 @@ SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b)
 	return SQ_ERROR;
 }
 
-SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c)
+SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,std::string_view &str)
 {
 	SQObjectPtr *o = nullptr;
 	_GETSAFE_OBJ(v, idx, OT_STRING,o);
-	*c = _stringval(*o);
+	str = _stringval(*o);
 	return SQ_OK;
 }
 
@@ -584,7 +583,7 @@ SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)
 	SQObjectPtr &o = stack_get(v, idx);
 	SQObjectType type = type(o);
 	switch(type) {
-	case OT_STRING:		return _string(o)->_len;
+	case OT_STRING:		return _string(o)->View().size();
 	case OT_TABLE:		return _table(o)->CountUsed();
 	case OT_ARRAY:		return _array(o)->Size();
 	case OT_USERDATA:	return _userdata(o)->_size;
@@ -896,7 +895,7 @@ SQRESULT sq_getstackobj(HSQUIRRELVM v,SQInteger idx,HSQOBJECT *po)
 	return SQ_OK;
 }
 
-const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx)
+std::optional<std::string_view> sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx)
 {
 	SQUnsignedInteger cstksize=v->_callsstacksize;
 	SQUnsignedInteger lvl=(cstksize-level)-1;
@@ -908,7 +907,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedIntege
 		}
 		SQVM::CallInfo &ci=v->_callsstack[lvl];
 		if(type(ci._closure)!=OT_CLOSURE)
-			return nullptr;
+			return std::nullopt;
 		SQClosure *c=_closure(ci._closure);
 		SQFunctionProto *func=_funcproto(c->_function);
 		if(func->_noutervalues > (SQInteger)idx) {
@@ -918,7 +917,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedIntege
 		idx -= func->_noutervalues;
 		return func->GetLocal(v,stackbase,idx,(SQInteger)(ci._ip-func->_instructions)-1);
 	}
-	return nullptr;
+	return std::nullopt;
 }
 
 void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj)
@@ -931,9 +930,9 @@ void sq_resetobject(HSQOBJECT *po)
 	po->_unVal.pUserPointer=nullptr;po->_type=OT_NULL;
 }
 
-SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len)
+SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view error)
 {
-	v->_lasterror=SQString::Create(_ss(v),err, len);
+	v->_lasterror=SQString::Create(_ss(v),error);
 	return -1;
 }
 
@@ -978,6 +977,10 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror,
 		if(!v->_suspended) {
 			v->Pop(params);//pop closure and args
 		}
+		if (!v->_can_suspend && v->IsOpsTillSuspendError()) {
+			v->Raise_Error(fmt::format("excessive CPU usage in {}", v->_ops_till_suspend_error_label));
+			return SQ_ERROR;
+		}
 		if(retval){
 			v->Push(res); return SQ_OK;
 		}
@@ -1075,7 +1078,7 @@ SQRESULT sq_readclosure(HSQUIRRELVM v,SQREADFUNC r,SQUserPointer up)
 	return SQ_OK;
 }
 
-SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize)
+std::span<char> sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize)
 {
 	return _ss(v)->GetScratchPad(minsize);
 }
@@ -1089,19 +1092,18 @@ SQInteger sq_collectgarbage(HSQUIRRELVM v)
 #endif
 }
 
-const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
+std::optional<std::string_view> sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
 {
 	SQObjectPtr &self = stack_get(v,idx);
-	const SQChar *name = nullptr;
 	if(type(self) == OT_CLOSURE) {
 		if(_closure(self)->_outervalues.size()>nval) {
 			v->Push(_closure(self)->_outervalues[nval]);
 			SQFunctionProto *fp = _funcproto(_closure(self)->_function);
 			SQOuterVar &ov = fp->_outervalues[nval];
-			name = _stringval(ov._name);
+			return _stringval(ov._name);
 		}
 	}
-	return name;
+	return std::nullopt;
 }
 
 SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
@@ -1253,44 +1255,16 @@ SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)
 	return SQ_ERROR;
 }
 
-struct BufState{
-	const SQChar *buf;
-	SQInteger ptr;
-	SQInteger size;
-};
-
 char32_t buf_lexfeed(SQUserPointer file)
 {
 	/* Convert an UTF-8 character into a char32_t */
-	BufState *buf = (BufState *)file;
-	const char *p = &buf->buf[buf->ptr];
-
-	if (buf->size < buf->ptr + 1) return 0;
-
-	/* Read the first character, and get the length based on UTF-8 specs. If invalid, bail out. */
-	uint len = Utf8EncodedCharLen(*p);
-	if (len == 0) {
-		buf->ptr++;
-		return -1;
-	}
-
-	/* Read the remaining bits. */
-	if (buf->size < buf->ptr + len) return 0;
-	buf->ptr += len;
-
-	/* Convert the character, and when definitely invalid, bail out as well. */
-	char32_t c;
-	if (Utf8Decode(&c, p) != len) return -1;
-
-	return c;
+	StringConsumer &consumer = *reinterpret_cast<StringConsumer *>(file);
+	return consumer.AnyBytesLeft() ? consumer.ReadUtf8(-1) : 0;
 }
 
-SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror) {
-	BufState buf;
-	buf.buf = s;
-	buf.size = size;
-	buf.ptr = 0;
-	return sq_compile(v, buf_lexfeed, &buf, sourcename, raiseerror);
+SQRESULT sq_compilebuffer(HSQUIRRELVM v,std::string_view buffer,std::string_view sourcename,SQBool raiseerror) {
+	StringConsumer consumer{buffer};
+	return sq_compile(v, buf_lexfeed, &consumer, sourcename, raiseerror);
 }
 
 void sq_move(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx)
@@ -1323,7 +1297,7 @@ void sq_free(void *p,SQUnsignedInteger size)
 	SQ_FREE(p,size);
 }
 
-SQOpsLimiter::SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, const char *label) : _v(v)
+SQOpsLimiter::SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, std::string_view label) : _v(v)
 {
 	this->_ops = v->_ops_till_suspend_error_threshold;
 	if (this->_ops == INT64_MIN) {
diff --git a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
index 26c02510dd..ba00fde96b 100644
--- a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
@@ -5,6 +5,7 @@
 #include "../../../stdafx.h"
 #include "../../fmt/format.h"
 
+#include "../../../core/string_consumer.hpp"
 #include "sqpcheader.h"
 #include "sqvm.h"
 #include "sqstring.h"
@@ -17,19 +18,20 @@
 
 #include "../../../safeguards.h"
 
-bool str2num(const SQChar *s,SQObjectPtr &res)
+bool str2num(std::string_view s,SQObjectPtr &res)
 {
-	SQChar *end;
-	if(strstr(s,".")){
-		SQFloat r = SQFloat(strtod(s,&end));
-		if(s == end) return false;
+	if(s.find('.') != std::string_view::npos){
+		char *end;
+		std::string str{s};
+		SQFloat r = SQFloat(strtod(str.c_str(),&end));
+		if(str.c_str() == end) return false;
 		res = r;
 		return true;
 	}
 	else{
-		SQInteger r = SQInteger(strtol(s,&end,10));
-		if(s == end) return false;
-		res = r;
+		auto val = ParseInteger<int64_t>(s);
+		if (!val.has_value()) return false;
+		res = *val;
 		return true;
 	}
 }
@@ -101,29 +103,29 @@ static SQInteger base_getstackinfos(HSQUIRRELVM v)
 	SQInteger level;
 	SQStackInfos si;
 	SQInteger seq = 0;
-	const SQChar *name = nullptr;
 	sq_getinteger(v, -1, &level);
 	if (SQ_SUCCEEDED(sq_stackinfos(v, level, &si)))
 	{
-		const SQChar *fn = "unknown";
-		const SQChar *src = "unknown";
+		std::string_view fn = "unknown";
+		std::string_view src = "unknown";
 		if(si.funcname)fn = si.funcname;
 		if(si.source)src = si.source;
 		sq_newtable(v);
-		sq_pushstring(v, "func", -1);
-		sq_pushstring(v, fn, -1);
+		sq_pushstring(v, "func");
+		sq_pushstring(v, fn);
 		sq_createslot(v, -3);
-		sq_pushstring(v, "src", -1);
-		sq_pushstring(v, src, -1);
+		sq_pushstring(v, "src");
+		sq_pushstring(v, src);
 		sq_createslot(v, -3);
-		sq_pushstring(v, "line", -1);
+		sq_pushstring(v, "line");
 		sq_pushinteger(v, si.line);
 		sq_createslot(v, -3);
-		sq_pushstring(v, "locals", -1);
+		sq_pushstring(v, "locals");
 		sq_newtable(v);
 		seq=0;
-		while ((name = sq_getlocal(v, level, seq))) {
-			sq_pushstring(v, name, -1);
+		std::optional<std::string_view> name;
+		while ((name = sq_getlocal(v, level, seq)).has_value()) {
+			sq_pushstring(v, *name);
 			sq_push(v, -2);
 			sq_createslot(v, -4);
 			sq_pop(v, 1);
@@ -169,9 +171,9 @@ static SQInteger get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,
 
 static SQInteger base_print(HSQUIRRELVM v)
 {
-	const SQChar *str;
+	std::string_view str;
 	sq_tostring(v,2);
-	sq_getstring(v,-1,&str);
+	sq_getstring(v,-1,str);
 	if(_ss(v)->_printfunc) _ss(v)->_printfunc(v,str);
 	return 0;
 }
@@ -180,14 +182,14 @@ static SQInteger base_print(HSQUIRRELVM v)
 static SQInteger base_compilestring(HSQUIRRELVM v)
 {
 	SQInteger nargs=sq_gettop(v);
-	const SQChar *src=nullptr,*name="unnamedbuffer";
+	std::string_view src, name="unnamedbuffer";
 	SQInteger size;
-	sq_getstring(v,2,&src);
+	sq_getstring(v,2,src);
 	size=sq_getsize(v,2);
 	if(nargs>2){
-		sq_getstring(v,3,&name);
+		sq_getstring(v,3,name);
 	}
-	if(SQ_SUCCEEDED(sq_compilebuffer(v,src,size,name,SQFalse)))
+	if(SQ_SUCCEEDED(sq_compilebuffer(v,src.substr(0, size),name,SQFalse)))
 		return 1;
 	else
 		return SQ_ERROR;
@@ -232,62 +234,59 @@ static SQInteger base_array(HSQUIRRELVM v)
 static SQInteger base_type(HSQUIRRELVM v)
 {
 	SQObjectPtr &o = stack_get(v,2);
-	v->Push(SQString::Create(_ss(v),GetTypeName(o),-1));
+	v->Push(SQString::Create(_ss(v),GetTypeName(o)));
 	return 1;
 }
 
-static SQRegFunction base_funcs[]={
+static const std::initializer_list<SQRegFunction> base_funcs={
 	//generic
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{"seterrorhandler",base_seterrorhandler,2, nullptr},
-	{"setdebughook",base_setdebughook,2, nullptr},
-	{"enabledebuginfo",base_enabledebuginfo,2, nullptr},
+	{"seterrorhandler",base_seterrorhandler,2, std::nullopt},
+	{"setdebughook",base_setdebughook,2, std::nullopt},
+	{"enabledebuginfo",base_enabledebuginfo,2, std::nullopt},
 	{"getstackinfos",base_getstackinfos,2, ".n"},
-	{"getroottable",base_getroottable,1, nullptr},
-	{"setroottable",base_setroottable,2, nullptr},
-	{"getconsttable",base_getconsttable,1, nullptr},
-	{"setconsttable",base_setconsttable,2, nullptr},
+	{"getroottable",base_getroottable,1, std::nullopt},
+	{"setroottable",base_setroottable,2, std::nullopt},
+	{"getconsttable",base_getconsttable,1, std::nullopt},
+	{"setconsttable",base_setconsttable,2, std::nullopt},
 #endif
-	{"assert",base_assert,2, nullptr},
-	{"print",base_print,2, nullptr},
+	{"assert",base_assert,2, std::nullopt},
+	{"print",base_print,2, std::nullopt},
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	{"compilestring",base_compilestring,-2, ".ss"},
 	{"newthread",base_newthread,2, ".c"},
-	{"suspend",base_suspend,-1, nullptr},
+	{"suspend",base_suspend,-1, std::nullopt},
 #endif
 	{"array",base_array,-2, ".n"},
-	{"type",base_type,2, nullptr},
+	{"type",base_type,2, std::nullopt},
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{"dummy",base_dummy,0,nullptr},
+	{"dummy",base_dummy,0,std::nullopt},
 #ifndef NO_GARBAGE_COLLECTOR
 	{"collectgarbage",base_collectgarbage,1, "t"},
 #endif
 #endif
-	{nullptr,nullptr,0,nullptr}
 };
 
 void sq_base_register(HSQUIRRELVM v)
 {
-	SQInteger i=0;
 	sq_pushroottable(v);
-	while(base_funcs[i].name!=nullptr) {
-		sq_pushstring(v,base_funcs[i].name,-1);
-		sq_newclosure(v,base_funcs[i].f,0);
-		sq_setnativeclosurename(v,-1,base_funcs[i].name);
-		sq_setparamscheck(v,base_funcs[i].nparamscheck,base_funcs[i].typemask);
+	for(auto &func : base_funcs) {
+		sq_pushstring(v,func.name);
+		sq_newclosure(v,func.f,0);
+		sq_setnativeclosurename(v,-1,func.name);
+		sq_setparamscheck(v,func.nparamscheck,func.typemask);
 		sq_createslot(v,-3);
-		i++;
 	}
-	sq_pushstring(v,"_version_",-1);
-	sq_pushstring(v,SQUIRREL_VERSION,-1);
+	sq_pushstring(v,"_version_");
+	sq_pushstring(v,SQUIRREL_VERSION);
 	sq_createslot(v,-3);
-	sq_pushstring(v,"_charsize_",-1);
-	sq_pushinteger(v,sizeof(SQChar));
+	sq_pushstring(v,"_charsize_");
+	sq_pushinteger(v,sizeof(char));
 	sq_createslot(v,-3);
-	sq_pushstring(v,"_intsize_",-1);
+	sq_pushstring(v,"_intsize_");
 	sq_pushinteger(v,sizeof(SQInteger));
 	sq_createslot(v,-3);
-	sq_pushstring(v,"_floatsize_",-1);
+	sq_pushstring(v,"_floatsize_");
 	sq_pushinteger(v,sizeof(SQFloat));
 	sq_createslot(v,-3);
 	sq_pop(v,1);
@@ -370,8 +369,8 @@ static SQInteger obj_clear(HSQUIRRELVM v)
 static SQInteger number_delegate_tochar(HSQUIRRELVM v)
 {
 	SQObject &o=stack_get(v,1);
-	SQChar c = (SQChar)tointeger(o);
-	v->Push(SQString::Create(_ss(v),(const SQChar *)&c,1));
+	char c = static_cast<char>(tointeger(o));
+	v->Push(SQString::Create(_ss(v),std::string_view(&c, 1)));
 	return 1;
 }
 
@@ -409,16 +408,15 @@ static SQInteger table_rawget(HSQUIRRELVM v)
 }
 
 
-SQRegFunction SQSharedState::_table_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_table_default_delegate_funcz={
 	{"len",default_delegate_len,1, "t"},
 	{"rawget",table_rawget,2, "t"},
 	{"rawset",table_rawset,3, "t"},
 	{"rawdelete",table_rawdelete,2, "t"},
 	{"rawin",container_rawexists,2, "t"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"clear",obj_clear,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };
 
 //ARRAY DEFAULT DELEGATE///////////////////////////////////////
@@ -611,7 +609,7 @@ static SQInteger array_slice(HSQUIRRELVM v)
 
 }
 
-SQRegFunction SQSharedState::_array_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_array_default_delegate_funcz={
 	{"len",default_delegate_len,1, "a"},
 	{"append",array_append,2, "a"},
 	{"extend",array_extend,2, "aa"},
@@ -624,10 +622,9 @@ SQRegFunction SQSharedState::_array_default_delegate_funcz[]={
 	{"reverse",array_reverse,1, "a"},
 	{"sort",array_sort,-1, "ac"},
 	{"slice",array_slice,-1, "ann"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"clear",obj_clear,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };
 
 //STRING DEFAULT DELEGATE//////////////////////////
@@ -636,25 +633,25 @@ static SQInteger string_slice(HSQUIRRELVM v)
 	SQInteger sidx,eidx;
 	SQObjectPtr o;
 	if(SQ_FAILED(get_slice_params(v,sidx,eidx,o)))return -1;
-	SQInteger slen = _string(o)->_len;
+	SQInteger slen = _string(o)->View().size();
 	if(sidx < 0)sidx = slen + sidx;
 	if(eidx < 0)eidx = slen + eidx;
 	if(eidx < sidx)	return sq_throwerror(v,"wrong indexes");
 	if(eidx > slen)	return sq_throwerror(v,"slice out of range");
-	v->Push(SQString::Create(_ss(v),&_stringval(o)[sidx],eidx-sidx));
+	v->Push(SQString::Create(_ss(v),_stringval(o).substr(sidx,eidx-sidx)));
 	return 1;
 }
 
 static SQInteger string_find(HSQUIRRELVM v)
 {
 	SQInteger top,start_idx=0;
-	const SQChar *str,*substr,*ret;
-	if(((top=sq_gettop(v))>1) && SQ_SUCCEEDED(sq_getstring(v,1,&str)) && SQ_SUCCEEDED(sq_getstring(v,2,&substr))){
+	std::string_view str,substr;
+	if(((top=sq_gettop(v))>1) && SQ_SUCCEEDED(sq_getstring(v,1,str)) && SQ_SUCCEEDED(sq_getstring(v,2,substr))){
 		if(top>2)sq_getinteger(v,3,&start_idx);
 		if((sq_getsize(v,1)>start_idx) && (start_idx>=0)){
-			ret=strstr(&str[start_idx],substr);
-			if(ret){
-				sq_pushinteger(v,(SQInteger)(ret-str));
+			auto ret = str.find(substr, start_idx);
+			if(ret != std::string_view::npos){
+				sq_pushinteger(v,static_cast<SQInteger>(ret));
 				return 1;
 			}
 		}
@@ -666,11 +663,11 @@ static SQInteger string_find(HSQUIRRELVM v)
 #define STRING_TOFUNCZ(func) static SQInteger string_##func(HSQUIRRELVM v) \
 { \
 	SQObject str=stack_get(v,1); \
-	SQInteger len=_string(str)->_len; \
-	const SQChar *sThis=_stringval(str); \
-	SQChar *sNew=(_ss(v)->GetScratchPad(len)); \
-	for(SQInteger i=0;i<len;i++) sNew[i]=func(sThis[i]); \
-	v->Push(SQString::Create(_ss(v),sNew,len)); \
+	std::string_view sThis=_stringval(str); \
+	size_t len=sThis.size(); \
+	std::span<char> sNew=(_ss(v)->GetScratchPad(len)); \
+	for(size_t i=0;i<len;i++) sNew[i]=func(sThis[i]); \
+	v->Push(SQString::Create(_ss(v),std::string_view(sNew.data(), len))); \
 	return 1; \
 }
 
@@ -678,7 +675,7 @@ static SQInteger string_find(HSQUIRRELVM v)
 STRING_TOFUNCZ(tolower)
 STRING_TOFUNCZ(toupper)
 
-SQRegFunction SQSharedState::_string_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_string_default_delegate_funcz={
 	{"len",default_delegate_len,1, "s"},
 	{"tointeger",default_delegate_tointeger,1, "s"},
 	{"tofloat",default_delegate_tofloat,1, "s"},
@@ -687,18 +684,16 @@ SQRegFunction SQSharedState::_string_default_delegate_funcz[]={
 	{"find",string_find,-2, "s s n "},
 	{"tolower",string_tolower,1, "s"},
 	{"toupper",string_toupper,1, "s"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
-	{nullptr,nullptr,0,nullptr}
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 };
 
 //INTEGER DEFAULT DELEGATE//////////////////////////
-SQRegFunction SQSharedState::_number_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_number_default_delegate_funcz={
 	{"tointeger",default_delegate_tointeger,1, "n|b"},
 	{"tofloat",default_delegate_tofloat,1, "n|b"},
 	{"tostring",default_delegate_tostring,1, "."},
 	{"tochar",number_delegate_tochar,1, "n|b"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
-	{nullptr,nullptr,0,nullptr}
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 };
 
 //CLOSURE DEFAULT DELEGATE//////////////////////////
@@ -749,19 +744,19 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
 			_array(params)->Set((SQInteger)n,f->_parameters[n]);
 		}
 		if(f->_varparams) {
-			_array(params)->Set(nparams-1,SQString::Create(_ss(v),"...",-1));
+			_array(params)->Set(nparams-1,SQString::Create(_ss(v),"..."));
 		}
-		res->NewSlot(SQString::Create(_ss(v),"native",-1),false);
-		res->NewSlot(SQString::Create(_ss(v),"name",-1),f->_name);
-		res->NewSlot(SQString::Create(_ss(v),"src",-1),f->_sourcename);
-		res->NewSlot(SQString::Create(_ss(v),"parameters",-1),params);
-		res->NewSlot(SQString::Create(_ss(v),"varargs",-1),f->_varparams);
+		res->NewSlot(SQString::Create(_ss(v),"native"),false);
+		res->NewSlot(SQString::Create(_ss(v),"name"),f->_name);
+		res->NewSlot(SQString::Create(_ss(v),"src"),f->_sourcename);
+		res->NewSlot(SQString::Create(_ss(v),"parameters"),params);
+		res->NewSlot(SQString::Create(_ss(v),"varargs"),f->_varparams);
 	}
 	else { //OT_NATIVECLOSURE
 		SQNativeClosure *nc = _nativeclosure(o);
-		res->NewSlot(SQString::Create(_ss(v),"native",-1),true);
-		res->NewSlot(SQString::Create(_ss(v),"name",-1),nc->_name);
-		res->NewSlot(SQString::Create(_ss(v),"paramscheck",-1),nc->_nparamscheck);
+		res->NewSlot(SQString::Create(_ss(v),"native"),true);
+		res->NewSlot(SQString::Create(_ss(v),"name"),nc->_name);
+		res->NewSlot(SQString::Create(_ss(v),"paramscheck"),nc->_nparamscheck);
 		SQObjectPtr typecheck;
 		if(!nc->_typecheck.empty()) {
 			typecheck =
@@ -770,23 +765,22 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
 					_array(typecheck)->Set((SQInteger)n,nc->_typecheck[n]);
 			}
 		}
-		res->NewSlot(SQString::Create(_ss(v),"typecheck",-1),typecheck);
+		res->NewSlot(SQString::Create(_ss(v),"typecheck"),typecheck);
 	}
 	v->Push(res);
 	return 1;
 }
 
 
-SQRegFunction SQSharedState::_closure_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_closure_default_delegate_funcz={
 	{"call",closure_call,-1, "c"},
 	{"pcall",closure_pcall,-1, "c"},
 	{"acall",closure_acall,2, "ca"},
 	{"pacall",closure_pacall,2, "ca"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"bindenv",closure_bindenv,2, "c x|y|t"},
 	{"getinfos",closure_getinfos,1, "c"},
-	{nullptr,nullptr,0,nullptr}
 };
 
 //GENERATOR DEFAULT DELEGATE
@@ -801,11 +795,10 @@ static SQInteger generator_getstatus(HSQUIRRELVM v)
 	return 1;
 }
 
-SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_generator_default_delegate_funcz={
 	{"getstatus",generator_getstatus,1, "g"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };
 
 //THREAD DEFAULT DELEGATE
@@ -871,13 +864,13 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
 	SQObjectPtr &o = stack_get(v,1);
 	switch(sq_getvmstate(_thread(o))) {
 		case SQ_VMSTATE_IDLE:
-			sq_pushstring(v,"idle",-1);
+			sq_pushstring(v,"idle");
 		break;
 		case SQ_VMSTATE_RUNNING:
-			sq_pushstring(v,"running",-1);
+			sq_pushstring(v,"running");
 		break;
 		case SQ_VMSTATE_SUSPENDED:
-			sq_pushstring(v,"suspended",-1);
+			sq_pushstring(v,"suspended");
 		break;
 		default:
 			return sq_throwerror(v,"internal VM error");
@@ -885,13 +878,12 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
 	return 1;
 }
 
-SQRegFunction SQSharedState::_thread_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_thread_default_delegate_funcz = {
 	{"call", thread_call, -1, "v"},
 	{"wakeup", thread_wakeup, -1, "v"},
 	{"getstatus", thread_getstatus, 1, "v"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr},
 };
 
 static SQInteger class_getattributes(HSQUIRRELVM v)
@@ -915,14 +907,13 @@ static SQInteger class_instance(HSQUIRRELVM v)
 	return SQ_ERROR;
 }
 
-SQRegFunction SQSharedState::_class_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_class_default_delegate_funcz = {
 	{"getattributes", class_getattributes, 2, "y."},
 	{"setattributes", class_setattributes, 3, "y.."},
 	{"rawin",container_rawexists,2, "y"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"instance",class_instance,1, "y"},
-	{nullptr,nullptr,0,nullptr}
 };
 
 static SQInteger instance_getclass(HSQUIRRELVM v)
@@ -932,12 +923,11 @@ static SQInteger instance_getclass(HSQUIRRELVM v)
 	return SQ_ERROR;
 }
 
-SQRegFunction SQSharedState::_instance_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_instance_default_delegate_funcz = {
 	{"getclass", instance_getclass, 1, "x"},
 	{"rawin",container_rawexists,2, "x"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };
 
 static SQInteger weakref_ref(HSQUIRRELVM v)
@@ -947,11 +937,10 @@ static SQInteger weakref_ref(HSQUIRRELVM v)
 	return 1;
 }
 
-SQRegFunction SQSharedState::_weakref_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_weakref_default_delegate_funcz = {
 	{"ref",weakref_ref,1, "r"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };
 
 
diff --git a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
index 560edfc66b..2d7c7d5703 100644
--- a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
@@ -57,16 +57,12 @@ typedef sqvector<ExpState> ExpStateVec;
 class SQCompiler
 {
 public:
-	SQCompiler(SQVM *v, SQLEXREADFUNC rg, SQUserPointer up, const SQChar* sourcename, bool raiseerror, bool lineinfo) : _token(0), _fs(nullptr), _lex(_ss(v), rg, up), _debugline(0), _debugop(0)
+	SQCompiler(SQVM *v, SQLEXREADFUNC rg, SQUserPointer up, std::string_view sourcename, bool raiseerror, bool lineinfo) : _token(0), _fs(nullptr), _lex(_ss(v), rg, up), _debugline(0), _debugop(0)
 	{
 		_vm=v;
 		_sourcename = SQString::Create(_ss(v), sourcename);
 		_lineinfo = lineinfo;_raiseerror = raiseerror;
 	}
-	[[noreturn]] void Error(const std::string &msg)
-	{
-		throw CompileException(msg);
-	}
 	void Lex(){	_token = _lex.Lex();}
 	void PushExpState(){ _expstates.push_back(ExpState()); }
 	bool IsDerefToken(SQInteger tok)
@@ -92,7 +88,7 @@ public:
 				//do nothing
 			}
 			else {
-				const SQChar *etypename;
+				std::string_view etypename;
 				if(tok > 255) {
 					switch(tok)
 					{
@@ -109,21 +105,21 @@ public:
 						etypename = "FLOAT";
 						break;
 					default:
-						etypename = _lex.Tok2Str(tok);
+						etypename = _lex.Tok2Str(tok).value_or("<unknown>");
 					}
-					Error(fmt::format("expected '{}'", etypename));
+					throw CompileException(fmt::format("expected '{}'", etypename));
 				}
-				Error(fmt::format("expected '{:c}'", tok));
+				throw CompileException(fmt::format("expected '{:c}'", tok));
 			}
 		}
 		SQObjectPtr ret;
 		switch(tok)
 		{
 		case TK_IDENTIFIER:
-			ret = _fs->CreateString(_lex._svalue);
+			ret = _fs->CreateString(_lex.View());
 			break;
 		case TK_STRING_LITERAL:
-			ret = _fs->CreateString(_lex._svalue,_lex._longstr.size()-1);
+			ret = _fs->CreateString(_lex.View());
 			break;
 		case TK_INTEGER:
 			ret = SQObjectPtr(_lex._nvalue);
@@ -140,7 +136,7 @@ public:
 	{
 		if(_token == ';') { Lex(); return; }
 		if(!IsEndOfStatement()) {
-			Error("end of statement expected (; or lf)");
+			throw CompileException("end of statement expected (; or lf)");
 		}
 	}
 	void MoveIfCurrentTargetIsLocal() {
@@ -233,7 +229,7 @@ public:
 			}
 			break;}
 		case TK_BREAK:
-			if(_fs->_breaktargets.size() <= 0)Error("'break' has to be in a loop block");
+			if(_fs->_breaktargets.size() <= 0)throw CompileException("'break' has to be in a loop block");
 			if(_fs->_breaktargets.top() > 0){
 				_fs->AddInstruction(_OP_POPTRAP, _fs->_breaktargets.top(), 0);
 			}
@@ -243,7 +239,7 @@ public:
 			Lex();
 			break;
 		case TK_CONTINUE:
-			if(_fs->_continuetargets.size() <= 0)Error("'continue' has to be in a loop block");
+			if(_fs->_continuetargets.size() <= 0)throw CompileException("'continue' has to be in a loop block");
 			if(_fs->_continuetargets.top() > 0) {
 				_fs->AddInstruction(_OP_POPTRAP, _fs->_continuetargets.top(), 0);
 			}
@@ -356,19 +352,19 @@ public:
 				SQInteger op = _token;
 				SQInteger ds = _exst._deref;
 				bool freevar = _exst._freevar;
-				if(ds == DEREF_NO_DEREF) Error("can't assign expression");
+				if(ds == DEREF_NO_DEREF) throw CompileException("can't assign expression");
 				Lex(); Expression();
 
 				switch(op){
 				case TK_NEWSLOT:
-					if(freevar) Error("free variables cannot be modified");
+					if(freevar) throw CompileException("free variables cannot be modified");
 					if(ds == DEREF_FIELD)
 						EmitDerefOp(_OP_NEWSLOT);
 					else //if _derefstate != DEREF_NO_DEREF && DEREF_FIELD so is the index of a local
-						Error("can't 'create' a local slot");
+						throw CompileException("can't 'create' a local slot");
 					break;
 				case '=': //ASSIGN
-					if(freevar) Error("free variables cannot be modified");
+					if(freevar) throw CompileException("free variables cannot be modified");
 					if(ds == DEREF_FIELD)
 						EmitDerefOp(_OP_SET);
 					else {//if _derefstate != DEREF_NO_DEREF && DEREF_FIELD so is the index of a local
@@ -533,7 +529,7 @@ public:
 				if(_token == TK_PARENT) {
 					Lex();
 					if(!NeedGet())
-						Error("parent cannot be set");
+						throw CompileException("parent cannot be set");
 					SQInteger src = _fs->PopTarget();
 					_fs->AddInstruction(_OP_GETPARENT, _fs->PushTarget(), src);
 				}
@@ -546,7 +542,7 @@ public:
 				}
 				break;
 			case '[':
-				if(_lex._prevtoken == '\n') Error("cannot brake deref/or comma needed after [exp]=exp slot declaration");
+				if(_lex._prevtoken == '\n') throw CompileException("cannot brake deref/or comma needed after [exp]=exp slot declaration");
 				Lex(); Expression(); Expect(']');
 				pos = -1;
 				if(NeedGet()) Emit2ArgsOP(_OP_GET);
@@ -598,7 +594,7 @@ public:
 		switch(_token)
 		{
 		case TK_STRING_LITERAL: {
-				_fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetConstant(_fs->CreateString(_lex._svalue,_lex._longstr.size()-1)));
+				_fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetConstant(_fs->CreateString(_lex.View())));
 				Lex();
 			}
 			break;
@@ -618,7 +614,7 @@ public:
 			SQObject id;
 			SQObject constant;
 				switch(_token) {
-					case TK_IDENTIFIER: id = _fs->CreateString(_lex._svalue); break;
+					case TK_IDENTIFIER: id = _fs->CreateString(_lex.View()); break;
 					case TK_THIS: id = _fs->CreateString("this"); break;
 					case TK_CONSTRUCTOR: id = _fs->CreateString("constructor"); break;
 				}
@@ -638,7 +634,7 @@ public:
 							Expect('.'); constid = Expect(TK_IDENTIFIER);
 							if(!_table(constant)->Get(constid,constval)) {
 								constval.Null();
-								Error(fmt::format("invalid constant [{}.{}]", _stringval(id),_stringval(constid)));
+								throw CompileException(fmt::format("invalid constant [{}.{}]", _stringval(id),_stringval(constid)));
 							}
 						}
 						else {
@@ -742,7 +738,7 @@ public:
 		case TK_DELEGATE : DelegateExpr(); break;
 		case '(': Lex(); CommaExpr(); Expect(')');
 			break;
-		default: Error("expression expected");
+		default: throw CompileException("expression expected");
 		}
 		return -1;
 	}
@@ -771,7 +767,7 @@ public:
 			 nargs++;
 			 if(_token == ','){
 				 Lex();
-				 if(_token == ')') Error("expression expected, found ')'");
+				 if(_token == ')') throw CompileException("expression expected, found ')'");
 			 }
 		 }
 		 Lex();
@@ -1082,13 +1078,13 @@ public:
 		_exst._funcarg = false;
 		PrefixedExpr();
 		es = PopExpState();
-		if(es._deref == DEREF_NO_DEREF) Error("invalid class name");
+		if(es._deref == DEREF_NO_DEREF) throw CompileException("invalid class name");
 		if(es._deref == DEREF_FIELD) {
 			ClassExp();
 			EmitDerefOp(_OP_NEWSLOT);
 			_fs->PopTarget();
 		}
-		else Error("cannot create a class in a local with the syntax(class <local>)");
+		else throw CompileException("cannot create a class in a local with the syntax(class <local>)");
 	}
 	SQObject ExpectScalar()
 	{
@@ -1103,7 +1099,7 @@ public:
 				val._unVal.fFloat = _lex._fvalue;
 				break;
 			case TK_STRING_LITERAL:
-				val = _fs->CreateString(_lex._svalue,_lex._longstr.size()-1);
+				val = _fs->CreateString(_lex.View());
 				break;
 			case '-':
 				Lex();
@@ -1118,12 +1114,12 @@ public:
 					val._unVal.fFloat = -_lex._fvalue;
 				break;
 				default:
-					Error("scalar expected : integer,float");
+					throw CompileException("scalar expected : integer,float");
 					val._type = OT_NULL; // Silent compile-warning
 				}
 				break;
 			default:
-				Error("scalar expected : integer,float or string");
+				throw CompileException("scalar expected : integer,float or string");
 				val._type = OT_NULL; // Silent compile-warning
 		}
 		Lex();
@@ -1226,9 +1222,9 @@ public:
 		_exst._funcarg = false;
 		PrefixedExpr();
 		es = PopExpState();
-		if(es._deref == DEREF_NO_DEREF) Error("can't delete an expression");
+		if(es._deref == DEREF_NO_DEREF) throw CompileException("can't delete an expression");
 		if(es._deref == DEREF_FIELD) Emit2ArgsOP(_OP_DELETE);
-		else Error("cannot delete a local");
+		else throw CompileException("cannot delete a local");
 	}
 	void PrefixIncDec(SQInteger token)
 	{
@@ -1255,10 +1251,10 @@ public:
 		SQInteger defparams = 0;
 		while(_token!=')') {
 			if(_token == TK_VARPARAMS) {
-				if(defparams > 0) Error("function with default parameters cannot have variable number of parameters");
+				if(defparams > 0) throw CompileException("function with default parameters cannot have variable number of parameters");
 				funcstate->_varparams = true;
 				Lex();
-				if(_token != ')') Error("expected ')'");
+				if(_token != ')') throw CompileException("expected ')'");
 				break;
 			}
 			else {
@@ -1271,10 +1267,10 @@ public:
 					defparams++;
 				}
 				else {
-					if(defparams > 0) Error("expected '='");
+					if(defparams > 0) throw CompileException("expected '='");
 				}
 				if(_token == ',') Lex();
-				else if(_token != ')') Error("expected ')' or ','");
+				else if(_token != ')') throw CompileException("expected ')' or ','");
 			}
 		}
 		Expect(')');
@@ -1289,7 +1285,7 @@ public:
 				//outers are treated as implicit local variables
 				funcstate->AddOuterValue(paramname);
 				if(_token == ',') Lex();
-				else if(_token != ')') Error("expected ')' or ','");
+				else if(_token != ')') throw CompileException("expected ')' or ','");
 			}
 			Lex();
 		}
@@ -1346,7 +1342,7 @@ private:
 	SQVM *_vm;
 };
 
-bool Compile(SQVM *vm,SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo)
+bool Compile(SQVM *vm,SQLEXREADFUNC rg, SQUserPointer up, std::string_view sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo)
 {
 	SQCompiler p(vm, rg, up, sourcename, raiseerror, lineinfo);
 	return p.Compile(out);
diff --git a/src/3rdparty/squirrel/squirrel/sqcompiler.h b/src/3rdparty/squirrel/squirrel/sqcompiler.h
index cdb6b1d65c..de3f2eb215 100644
--- a/src/3rdparty/squirrel/squirrel/sqcompiler.h
+++ b/src/3rdparty/squirrel/squirrel/sqcompiler.h
@@ -73,5 +73,5 @@ struct SQVM;
 
 using CompileException = std::runtime_error;
 
-bool Compile(SQVM *vm, SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo);
+bool Compile(SQVM *vm, SQLEXREADFUNC rg, SQUserPointer up, std::string_view sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo);
 #endif //_SQCOMPILER_H_
diff --git a/src/3rdparty/squirrel/squirrel/sqdebug.cpp b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
index 8a6f15121a..cc5c21316c 100644
--- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
@@ -37,7 +37,7 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
 {
 	SQInteger cssize = v->_callsstacksize;
 	if (cssize > level) {
-		memset(si, 0, sizeof(SQStackInfos));
+		*si = {};
 		SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
 		switch (type(ci._closure)) {
 		case OT_CLOSURE:{
@@ -101,15 +101,15 @@ void SQVM::Raise_CompareError(const SQObject &o1, const SQObject &o2)
 
 void SQVM::Raise_ParamTypeError(SQInteger nparam,SQInteger typemask,SQInteger type)
 {
-	SQObjectPtr exptypes = SQString::Create(_ss(this), "", -1);
+	SQObjectPtr exptypes = SQString::Create(_ss(this), "");
 	SQInteger found = 0;
 	for(SQInteger i=0; i<16; i++)
 	{
 		SQInteger mask = 0x00000001LL << i;
 		if(typemask & (mask)) {
-			if(found>0) StringCat(exptypes,SQString::Create(_ss(this), "|", -1), exptypes);
+			if(found>0) StringCat(exptypes,SQString::Create(_ss(this), "|"), exptypes);
 			found ++;
-			StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask), -1), exptypes);
+			StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask)), exptypes);
 		}
 	}
 	Raise_Error(fmt::format("parameter {} has an invalid type '{}' ; expected: '{}'", nparam, IdType2Name((SQObjectType)type), _stringval(exptypes)));
diff --git a/src/3rdparty/squirrel/squirrel/sqfuncproto.h b/src/3rdparty/squirrel/squirrel/sqfuncproto.h
index b65b040b49..a2cdb94fd1 100644
--- a/src/3rdparty/squirrel/squirrel/sqfuncproto.h
+++ b/src/3rdparty/squirrel/squirrel/sqfuncproto.h
@@ -114,7 +114,7 @@ public:
 		this->~SQFunctionProto();
 		sq_vm_free(this,size);
 	}
-	const SQChar* GetLocal(SQVM *v,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop);
+	std::optional<std::string_view> GetLocal(SQVM *v,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop);
 	SQInteger GetLine(SQInstruction *curr);
 	bool Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write);
 	static bool Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret);
diff --git a/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp b/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp
index 54744292a9..790805a3b5 100644
--- a/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqfuncstate.cpp
@@ -110,11 +110,6 @@ SQFuncState::SQFuncState(SQSharedState *ss,SQFuncState *parent)
 
 }
 
-void SQFuncState::Error(const SQChar *err)
-{
-	throw CompileException(err);
-}
-
 #ifdef _DEBUG_DUMP
 void SQFuncState::Dump(SQFunctionProto *func)
 {
@@ -234,7 +229,7 @@ SQInteger SQFuncState::GetConstant(const SQObject &cons)
 		_nliterals++;
 		if(_nliterals > MAX_LITERALS) {
 			val.Null();
-			Error("internal compiler error: too many literals");
+			throw CompileException("internal compiler error: too many literals");
 		}
 	}
 	return _integer(val);
@@ -264,7 +259,7 @@ SQInteger SQFuncState::AllocStackPos()
 	SQInteger npos=_vlocals.size();
 	_vlocals.push_back(SQLocalVarInfo());
 	if(_vlocals.size()>((SQUnsignedInteger)_stacksize)) {
-		if(_stacksize>MAX_FUNC_STACKSIZE) Error("internal compiler error: too many locals");
+		if(_stacksize>MAX_FUNC_STACKSIZE) throw CompileException("internal compiler error: too many locals");
 		_stacksize=_vlocals.size();
 	}
 	return npos;
@@ -499,9 +494,9 @@ void SQFuncState::AddInstruction(SQInstruction &i)
 	_instructions.push_back(i);
 }
 
-SQObject SQFuncState::CreateString(const SQChar *s,SQInteger len)
+SQObject SQFuncState::CreateString(std::string_view s)
 {
-	SQObjectPtr ns(SQString::Create(_sharedstate,s,len));
+	SQObjectPtr ns(SQString::Create(_sharedstate,s));
 	_table(_strings)->NewSlot(ns,(SQInteger)1);
 	return std::move(ns);
 }
@@ -539,7 +534,7 @@ SQFunctionProto *SQFuncState::BuildProto()
 	for(SQUnsignedInteger no = 0; no < _lineinfos.size(); no++) f->_lineinfos[no] = _lineinfos[no];
 	for(SQUnsignedInteger no = 0; no < _defaultparams.size(); no++) f->_defaultparams[no] = _defaultparams[no];
 
-	memcpy(f->_instructions,&_instructions[0],(size_t)_instructions.size()*sizeof(SQInstruction));
+	std::copy_n(&_instructions[0], _instructions.size(), f->_instructions);
 
 	f->_varparams = _varparams;
 
diff --git a/src/3rdparty/squirrel/squirrel/sqfuncstate.h b/src/3rdparty/squirrel/squirrel/sqfuncstate.h
index 739eb16261..d67f6dcc91 100644
--- a/src/3rdparty/squirrel/squirrel/sqfuncstate.h
+++ b/src/3rdparty/squirrel/squirrel/sqfuncstate.h
@@ -11,7 +11,6 @@ struct SQFuncState
 #ifdef _DEBUG_DUMP
 	void Dump(SQFunctionProto *func);
 #endif
-	[[noreturn]] void Error(const SQChar *err);
 	SQFuncState *PushChildState(SQSharedState *ss);
 	void PopChildState();
 	void AddInstruction(SQOpcode _op,SQInteger arg0=0,SQInteger arg1=0,SQInteger arg2=0,SQInteger arg3=0){SQInstruction i(_op,arg0,arg1,arg2,arg3);AddInstruction(i);}
@@ -43,7 +42,7 @@ struct SQFuncState
 	SQInteger TopTarget();
 	SQInteger GetUpTarget(SQInteger n);
 	bool IsLocal(SQUnsignedInteger stkpos);
-	SQObject CreateString(const SQChar *s,SQInteger len = -1);
+	SQObject CreateString(std::string_view s);
 	SQObject CreateTable();
 	bool IsConstant(const SQObject &name,SQObject &e);
 	SQInteger _returnexp;
diff --git a/src/3rdparty/squirrel/squirrel/sqlexer.cpp b/src/3rdparty/squirrel/squirrel/sqlexer.cpp
index 89eae0026e..6dadfa36d1 100644
--- a/src/3rdparty/squirrel/squirrel/sqlexer.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqlexer.cpp
@@ -12,6 +12,7 @@
 #include "sqlexer.h"
 
 #include "../../../core/utf8.hpp"
+#include "../../../core/string_consumer.hpp"
 
 #include "../../../safeguards.h"
 
@@ -84,22 +85,16 @@ SQLexer::SQLexer(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up)
 	_prevtoken = -1;
 	_curtoken = -1;
 
-	_svalue = nullptr;
 	_nvalue = 0;
 	_fvalue = 0;
 
 	Next();
 }
 
-[[noreturn]] void SQLexer::Error(const SQChar *err)
-{
-	throw CompileException(err);
-}
-
 void SQLexer::Next()
 {
 	char32_t t = _readf(_up);
-	if(t > MAX_CHAR) Error("Invalid character");
+	if(t > MAX_CHAR) throw CompileException("Invalid character");
 	if(t != 0) {
 		_currdata = t;
 		return;
@@ -107,7 +102,7 @@ void SQLexer::Next()
 	_currdata = SQUIRREL_EOB;
 }
 
-const SQChar *SQLexer::Tok2Str(SQInteger tok)
+std::optional<std::string_view> SQLexer::Tok2Str(SQInteger tok)
 {
 	SQObjectPtr itr, key, val;
 	SQInteger nitr;
@@ -116,7 +111,7 @@ const SQChar *SQLexer::Tok2Str(SQInteger tok)
 		if(((SQInteger)_integer(val)) == tok)
 			return _stringval(key);
 	}
-	return nullptr;
+	return std::nullopt;
 }
 
 void SQLexer::LexBlockComment()
@@ -126,7 +121,7 @@ void SQLexer::LexBlockComment()
 		switch(CUR_CHAR) {
 			case '*': { NEXT(); if(CUR_CHAR == '/') { done = true; NEXT(); }}; continue;
 			case '\n': _currentline++; NEXT(); continue;
-			case SQUIRREL_EOB: Error("missing \"*/\" in comment");
+			case SQUIRREL_EOB: throw CompileException("missing \"*/\" in comment");
 			default: NEXT();
 		}
 	}
@@ -195,11 +190,11 @@ SQInteger SQLexer::Lex()
 			SQInteger stype;
 			NEXT();
 			if(CUR_CHAR != '"')
-				Error("string expected");
+				throw CompileException("string expected");
 			if((stype=ReadString('"',true))!=-1) {
 				RETURN_TOKEN(stype);
 			}
-			Error("error parsing the string");
+			throw CompileException("error parsing the string");
 					   }
 		case '"':
 		case '\'': {
@@ -207,7 +202,7 @@ SQInteger SQLexer::Lex()
 			if((stype=ReadString(CUR_CHAR,false))!=-1){
 				RETURN_TOKEN(stype);
 			}
-			Error("error parsing the string");
+			throw CompileException("error parsing the string");
 			}
 		case '{': case '}': case '(': case ')': case '[': case ']':
 		case ';': case ',': case '?': case '^': case '~':
@@ -217,7 +212,7 @@ SQInteger SQLexer::Lex()
 			NEXT();
 			if (CUR_CHAR != '.'){ RETURN_TOKEN('.') }
 			NEXT();
-			if (CUR_CHAR != '.'){ Error("invalid token '..'"); }
+			if (CUR_CHAR != '.'){ throw CompileException("invalid token '..'"); }
 			NEXT();
 			RETURN_TOKEN(TK_VARPARAMS);
 		case '&':
@@ -263,7 +258,7 @@ SQInteger SQLexer::Lex()
 				}
 				else {
 					SQInteger c = CUR_CHAR;
-					if (iscntrl((int)c)) Error("unexpected character(control)");
+					if (iscntrl((int)c)) throw CompileException("unexpected character(control)");
 					NEXT();
 					RETURN_TOKEN(c);
 				}
@@ -274,7 +269,7 @@ SQInteger SQLexer::Lex()
 	return 0;
 }
 
-SQInteger SQLexer::GetIDType(SQChar *s)
+SQInteger SQLexer::GetIDType(std::string_view s)
 {
 	SQObjectPtr t;
 	if(_keywords->Get(SQString::Create(_sharedstate, s), t)) {
@@ -293,10 +288,10 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 		while(CUR_CHAR != ndelim) {
 			switch(CUR_CHAR) {
 			case SQUIRREL_EOB:
-				Error("unfinished string");
+				throw CompileException("unfinished string");
 				return -1;
 			case '\n':
-				if(!verbatim) Error("newline in a constant");
+				if(!verbatim) throw CompileException("newline in a constant");
 				APPEND_CHAR(CUR_CHAR); NEXT();
 				_currentline++;
 				break;
@@ -308,18 +303,18 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 					NEXT();
 					switch(CUR_CHAR) {
 					case 'x': NEXT(); {
-						if(!isxdigit(CUR_CHAR)) Error("hexadecimal number expected");
+						if(!isxdigit(CUR_CHAR)) throw CompileException("hexadecimal number expected");
 						const SQInteger maxdigits = 4;
-						SQChar temp[maxdigits+1];
-						SQInteger n = 0;
+						char temp[maxdigits];
+						size_t n = 0;
 						while(isxdigit(CUR_CHAR) && n < maxdigits) {
 							temp[n] = CUR_CHAR;
 							n++;
 							NEXT();
 						}
-						temp[n] = 0;
-						SQChar *sTemp;
-						APPEND_CHAR((SQChar)strtoul(temp,&sTemp,16));
+						auto val = ParseInteger(std::string_view{temp, n}, 16);
+						if (!val.has_value()) throw CompileException("hexadecimal number expected");
+						APPEND_CHAR(static_cast<char>(*val));
 					}
 				    break;
 					case 't': APPEND_CHAR('\t'); NEXT(); break;
@@ -334,7 +329,7 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 					case '"': APPEND_CHAR('"'); NEXT(); break;
 					case '\'': APPEND_CHAR('\''); NEXT(); break;
 					default:
-						Error("unrecognised escaper char");
+						throw CompileException("unrecognised escaper char");
 					break;
 					}
 				}
@@ -353,49 +348,16 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 			break;
 		}
 	}
-	TERMINATE_BUFFER();
-	SQInteger len = _longstr.size()-1;
 	if(ndelim == '\'') {
-		if(len == 0) Error("empty constant");
-		if(len > 1) Error("constant too long");
+		if(_longstr.empty()) throw CompileException("empty constant");
+		if(_longstr.size() > 1) throw CompileException("constant too long");
 		_nvalue = _longstr[0];
 		return TK_INTEGER;
 	}
-	_svalue = &_longstr[0];
 	return TK_STRING_LITERAL;
 }
 
-void LexHexadecimal(const SQChar *s,SQUnsignedInteger *res)
-{
-	*res = 0;
-	while(*s != 0)
-	{
-		if(isdigit(*s)) *res = (*res)*16+((*s++)-'0');
-		else if(isxdigit(*s)) *res = (*res)*16+(toupper(*s++)-'A'+10);
-		else { assert(0); }
-	}
-}
-
-void LexInteger(const SQChar *s,SQUnsignedInteger *res)
-{
-	*res = 0;
-	while(*s != 0)
-	{
-		*res = (*res)*10+((*s++)-'0');
-	}
-}
-
-SQInteger scisodigit(SQChar c) { return c >= '0' && c <= '7'; }
-
-void LexOctal(const SQChar *s,SQUnsignedInteger *res)
-{
-	*res = 0;
-	while(*s != 0)
-	{
-		if(scisodigit(*s)) *res = (*res)*8+((*s++)-'0');
-		else { assert(0); }
-	}
-}
+SQInteger scisodigit(char c) { return c >= '0' && c <= '7'; }
 
 SQInteger isexponent(SQInteger c) { return c == 'e' || c=='E'; }
 
@@ -409,7 +371,6 @@ SQInteger SQLexer::ReadNumber()
 #define TSCIENTIFIC 4
 #define TOCTAL 5
 	SQInteger type = TINT, firstchar = CUR_CHAR;
-	SQChar *sTemp;
 	INIT_TEMP_STRING();
 	NEXT();
 	if(firstchar == '0' && (toupper(CUR_CHAR) == 'X' || scisodigit(CUR_CHAR)) ) {
@@ -419,7 +380,7 @@ SQInteger SQLexer::ReadNumber()
 				APPEND_CHAR(CUR_CHAR);
 				NEXT();
 			}
-			if(isdigit(CUR_CHAR)) Error("invalid octal number");
+			if(isdigit(CUR_CHAR)) throw CompileException("invalid octal number");
 		}
 		else {
 			NEXT();
@@ -428,7 +389,7 @@ SQInteger SQLexer::ReadNumber()
 				APPEND_CHAR(CUR_CHAR);
 				NEXT();
 			}
-			if(_longstr.size() > MAX_HEX_DIGITS) Error("too many digits for an Hex number");
+			if(_longstr.size() > MAX_HEX_DIGITS) throw CompileException("too many digits for an Hex number");
 		}
 	}
 	else {
@@ -436,7 +397,7 @@ SQInteger SQLexer::ReadNumber()
 		while (CUR_CHAR == '.' || isdigit(CUR_CHAR) || isexponent(CUR_CHAR)) {
             if(CUR_CHAR == '.' || isexponent(CUR_CHAR)) type = TFLOAT;
 			if(isexponent(CUR_CHAR)) {
-				if(type != TFLOAT) Error("invalid numeric format");
+				if(type != TFLOAT) throw CompileException("invalid numeric format");
 				type = TSCIENTIFIC;
 				APPEND_CHAR(CUR_CHAR);
 				NEXT();
@@ -444,27 +405,29 @@ SQInteger SQLexer::ReadNumber()
 					APPEND_CHAR(CUR_CHAR);
 					NEXT();
 				}
-				if(!isdigit(CUR_CHAR)) Error("exponent expected");
+				if(!isdigit(CUR_CHAR)) throw CompileException("exponent expected");
 			}
 
 			APPEND_CHAR(CUR_CHAR);
 			NEXT();
 		}
 	}
-	TERMINATE_BUFFER();
 	switch(type) {
 	case TSCIENTIFIC:
-	case TFLOAT:
-		_fvalue = (SQFloat)strtod(&_longstr[0],&sTemp);
+	case TFLOAT: {
+		std::string str{View()};
+		char *sTemp;
+		_fvalue = (SQFloat)strtod(str.c_str(),&sTemp);
 		return TK_FLOAT;
+	}
 	case TINT:
-		LexInteger(&_longstr[0],(SQUnsignedInteger *)&_nvalue);
+		_nvalue = ParseInteger<SQUnsignedInteger>(View(), 10).value_or(0);
 		return TK_INTEGER;
 	case THEX:
-		LexHexadecimal(&_longstr[0],(SQUnsignedInteger *)&_nvalue);
+		_nvalue = ParseInteger<SQUnsignedInteger>(View(), 16).value_or(0);
 		return TK_INTEGER;
 	case TOCTAL:
-		LexOctal(&_longstr[0],(SQUnsignedInteger *)&_nvalue);
+		_nvalue = ParseInteger<SQUnsignedInteger>(View(), 8).value_or(0);
 		return TK_INTEGER;
 	}
 	return 0;
@@ -478,10 +441,6 @@ SQInteger SQLexer::ReadID()
 		APPEND_CHAR(CUR_CHAR);
 		NEXT();
 	} while(isalnum(CUR_CHAR) || CUR_CHAR == '_');
-	TERMINATE_BUFFER();
-	res = GetIDType(&_longstr[0]);
-	if(res == TK_IDENTIFIER || res == TK_CONSTRUCTOR) {
-		_svalue = &_longstr[0];
-	}
+	res = GetIDType(View());
 	return res;
 }
diff --git a/src/3rdparty/squirrel/squirrel/sqlexer.h b/src/3rdparty/squirrel/squirrel/sqlexer.h
index 9ce9469b24..0281e9dff8 100644
--- a/src/3rdparty/squirrel/squirrel/sqlexer.h
+++ b/src/3rdparty/squirrel/squirrel/sqlexer.h
@@ -6,11 +6,10 @@ struct SQLexer
 {
 	~SQLexer();
 	SQLexer(SQSharedState *ss,SQLEXREADFUNC rg,SQUserPointer up);
-	[[noreturn]] void Error(const SQChar *err);
 	SQInteger Lex();
-	const SQChar *Tok2Str(SQInteger tok);
+	std::optional<std::string_view> Tok2Str(SQInteger tok);
 private:
-	SQInteger GetIDType(SQChar *s);
+	SQInteger GetIDType(std::string_view s);
 	SQInteger ReadString(char32_t ndelim,bool verbatim);
 	SQInteger ReadNumber();
 	void LexBlockComment();
@@ -20,21 +19,21 @@ private:
 	SQTable *_keywords;
 	void INIT_TEMP_STRING() { _longstr.resize(0); }
 	void APPEND_CHAR(char32_t c);
-	void TERMINATE_BUFFER() { _longstr.push_back('\0'); }
 
 public:
 	SQInteger _prevtoken;
 	SQInteger _currentline;
 	SQInteger _lasttokenline;
 	SQInteger _currentcolumn;
-	const SQChar *_svalue;
 	SQInteger _nvalue;
 	SQFloat _fvalue;
 	SQLEXREADFUNC _readf;
 	SQUserPointer _up;
 	char32_t _currdata;
 	SQSharedState *_sharedstate;
-	sqvector<SQChar> _longstr;
+	sqvector<char> _longstr;
+
+	std::string_view View() const { return std::string_view(_longstr._vals, _longstr.size()); }
 };
 
 #endif
diff --git a/src/3rdparty/squirrel/squirrel/sqobject.cpp b/src/3rdparty/squirrel/squirrel/sqobject.cpp
index a0f9c75363..9fc3ae3545 100644
--- a/src/3rdparty/squirrel/squirrel/sqobject.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqobject.cpp
@@ -18,7 +18,7 @@
 #include "../../../safeguards.h"
 
 
-const SQChar *IdType2Name(SQObjectType type)
+std::string_view IdType2Name(SQObjectType type)
 {
 	switch(_RAW_TYPE(type))
 	{
@@ -42,25 +42,25 @@ const SQChar *IdType2Name(SQObjectType type)
 	case _RT_INSTANCE: return "instance";
 	case _RT_WEAKREF: return "weakref";
 	default:
-		return nullptr;
+		NOT_REACHED();
 	}
 }
 
-const SQChar *GetTypeName(const SQObjectPtr &obj1)
+std::string_view GetTypeName(const SQObjectPtr &obj1)
 {
 	return IdType2Name(type(obj1));
 }
 
-SQString *SQString::Create(SQSharedState *ss,const SQChar *s,SQInteger len)
+SQString *SQString::Create(SQSharedState *ss,std::string_view s)
 {
-	SQString *str=ADD_STRING(ss,s,len);
+	SQString *str=ss->_stringtable->Add(s);
 	str->_sharedstate=ss;
 	return str;
 }
 
 void SQString::Release()
 {
-	REMOVE_STRING(_sharedstate,this);
+	_sharedstate->_stringtable->Remove(this);
 }
 
 SQInteger SQString::Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval)
@@ -202,24 +202,21 @@ void SQArray::Extend(const SQArray *a){
 			Append(a->_values[i]);
 }
 
-const SQChar* SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop)
+std::optional<std::string_view> SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop)
 {
 	SQUnsignedInteger nvars=_nlocalvarinfos;
-	const SQChar *res=nullptr;
 	if(nvars>=nseq){
 		for(SQUnsignedInteger i=0;i<nvars;i++){
-			if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop)
-			{
+			if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop) {
 				if(nseq==0){
 					vm->Push(vm->_stack[stackbase+_localvarinfos[i]._pos]);
-					res=_stringval(_localvarinfos[i]._name);
-					break;
+					return _stringval(_localvarinfos[i]._name);
 				}
 				nseq--;
 			}
 		}
 	}
-	return res;
+	return std::nullopt;
 }
 
 SQInteger SQFunctionProto::GetLine(SQInstruction *curr)
@@ -273,10 +270,13 @@ bool WriteObject(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,SQObjectPtr &o
 {
 	_CHECK_IO(SafeWrite(v,write,up,&type(o),sizeof(SQObjectType)));
 	switch(type(o)){
-	case OT_STRING:
-		_CHECK_IO(SafeWrite(v,write,up,&_string(o)->_len,sizeof(SQInteger)));
-		_CHECK_IO(SafeWrite(v,write,up,_stringval(o),_string(o)->_len));
+	case OT_STRING: {
+		auto str = _string(o)->Span();
+		SQInteger len = str.size();
+		_CHECK_IO(SafeWrite(v,write,up,&len,sizeof(len)));
+		_CHECK_IO(SafeWrite(v,write,up,str.data(),len));
 		break;
+	}
 	case OT_INTEGER:
 		_CHECK_IO(SafeWrite(v,write,up,&_integer(o),sizeof(SQInteger)));break;
 	case OT_FLOAT:
@@ -297,11 +297,11 @@ bool ReadObject(HSQUIRRELVM v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &o)
 	switch(t){
 	case OT_STRING:{
 		SQInteger len;
-		_CHECK_IO(SafeRead(v,read,up,&len,sizeof(SQInteger)));
-		_CHECK_IO(SafeRead(v,read,up,_ss(v)->GetScratchPad(len),len));
-		o=SQString::Create(_ss(v),_ss(v)->GetScratchPad(-1),len);
-				   }
+		_CHECK_IO(SafeRead(v,read,up,&len,sizeof(len)));
+		_CHECK_IO(SafeRead(v,read,up,_ss(v)->GetScratchPad(len).data(),len));
+		o=SQString::Create(_ss(v),std::string_view(_ss(v)->GetScratchPad(-1).data(),len));
 		break;
+	}
 	case OT_INTEGER:{
 		SQInteger i;
 		_CHECK_IO(SafeRead(v,read,up,&i,sizeof(SQInteger))); o = i; break;
@@ -323,7 +323,7 @@ bool ReadObject(HSQUIRRELVM v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &o)
 bool SQClosure::Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write)
 {
 	_CHECK_IO(WriteTag(v,write,up,SQ_CLOSURESTREAM_HEAD));
-	_CHECK_IO(WriteTag(v,write,up,sizeof(SQChar)));
+	_CHECK_IO(WriteTag(v,write,up,sizeof(char)));
 	_CHECK_IO(_funcproto(_function)->Save(v,up,write));
 	_CHECK_IO(WriteTag(v,write,up,SQ_CLOSURESTREAM_TAIL));
 	return true;
@@ -332,7 +332,7 @@ bool SQClosure::Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write)
 bool SQClosure::Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret)
 {
 	_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_HEAD));
-	_CHECK_IO(CheckTag(v,read,up,sizeof(SQChar)));
+	_CHECK_IO(CheckTag(v,read,up,sizeof(char)));
 	SQObjectPtr func;
 	_CHECK_IO(SQFunctionProto::Load(v,up,read,func));
 	_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_TAIL));
diff --git a/src/3rdparty/squirrel/squirrel/sqobject.h b/src/3rdparty/squirrel/squirrel/sqobject.h
index 3b3c516067..d9bce1732d 100644
--- a/src/3rdparty/squirrel/squirrel/sqobject.h
+++ b/src/3rdparty/squirrel/squirrel/sqobject.h
@@ -138,7 +138,7 @@ struct SQObjectPtr;
 #define _refcounted(obj) ((obj)._unVal.pRefCounted)
 #define _rawval(obj) ((obj)._unVal.raw)
 
-#define _stringval(obj) (obj)._unVal.pString->_val
+#define _stringval(obj) (obj)._unVal.pString->View()
 #define _userdataval(obj) (obj)._unVal.pUserData->_val
 
 #define tofloat(num) ((type(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
@@ -357,7 +357,7 @@ struct SQObjectPtr : public SQObject
 		return *this;
 	}
 	private:
-		SQObjectPtr(const SQChar *){} //safety
+		SQObjectPtr(const char *) = delete; //safety
 };
 
 inline void _Swap(SQObject &a,SQObject &b)
@@ -449,8 +449,8 @@ struct SQDelegable : public CHAINABLE_OBJ {
 SQUnsignedInteger TranslateIndex(const SQObjectPtr &idx);
 typedef sqvector<SQObjectPtr> SQObjectPtrVec;
 typedef sqvector<SQInteger> SQIntVec;
-const SQChar *GetTypeName(const SQObjectPtr &obj1);
-const SQChar *IdType2Name(SQObjectType type);
+std::string_view GetTypeName(const SQObjectPtr &obj1);
+std::string_view IdType2Name(SQObjectType type);
 
 
 
diff --git a/src/3rdparty/squirrel/squirrel/sqopcodes.h b/src/3rdparty/squirrel/squirrel/sqopcodes.h
index a9e4a8743c..47d0e5197a 100644
--- a/src/3rdparty/squirrel/squirrel/sqopcodes.h
+++ b/src/3rdparty/squirrel/squirrel/sqopcodes.h
@@ -87,7 +87,7 @@ enum SQOpcode
 };
 
 struct SQInstructionDesc {
-	const SQChar *name;
+	std::string_view name;
 };
 
 struct SQInstruction
diff --git a/src/3rdparty/squirrel/squirrel/sqstate.cpp b/src/3rdparty/squirrel/squirrel/sqstate.cpp
index 3adb4d8f98..f75c466da0 100644
--- a/src/3rdparty/squirrel/squirrel/sqstate.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqstate.cpp
@@ -14,6 +14,7 @@
 #include "sqarray.h"
 #include "squserdata.h"
 #include "sqclass.h"
+#include "../../../core/string_consumer.hpp"
 
 #include "../../../safeguards.h"
 
@@ -32,14 +33,12 @@ SQObjectPtr _minusone_((SQInteger)-1);
 	_table(_metamethodsmap)->NewSlot(_metamethods->back(),(SQInteger)(_metamethods->size()-1)); \
 	}
 
-bool CompileTypemask(SQIntVec &res,const SQChar *typemask)
+bool CompileTypemask(SQIntVec &res,std::string_view typemask)
 {
-	SQInteger i = 0;
-
 	SQInteger mask = 0;
-	while(typemask[i] != 0) {
-
-		switch(typemask[i]){
+	StringConsumer consumer{typemask};
+	while (consumer.AnyBytesLeft()) {
+		switch(consumer.ReadChar()){
 				case 'o': mask |= _RT_NULL; break;
 				case 'i': mask |= _RT_INTEGER; break;
 				case 'f': mask |= _RT_FLOAT; break;
@@ -56,37 +55,32 @@ bool CompileTypemask(SQIntVec &res,const SQChar *typemask)
 				case 'x': mask |= _RT_INSTANCE; break;
 				case 'y': mask |= _RT_CLASS; break;
 				case 'r': mask |= _RT_WEAKREF; break;
-				case '.': mask = -1; res.push_back(mask); i++; mask = 0; continue;
-				case ' ': i++; continue; //ignores spaces
+				case '.': mask = -1; res.push_back(mask); mask = 0; continue;
+				case ' ': continue; //ignores spaces
 				default:
 					return false;
 		}
-		i++;
-		if(typemask[i] == '|') {
-			i++;
-			if(typemask[i] == 0)
-				return false;
+
+		if(consumer.ReadCharIf('|')) {
+			if(!consumer.AnyBytesLeft()) return false;
 			continue;
 		}
 		res.push_back(mask);
 		mask = 0;
-
 	}
 	return true;
 }
 
-SQTable *CreateDefaultDelegate(SQSharedState *ss,SQRegFunction *funcz)
+SQTable *CreateDefaultDelegate(SQSharedState *ss,const std::initializer_list<SQRegFunction> &funcz)
 {
-	SQInteger i=0;
 	SQTable *t=SQTable::Create(ss,0);
-	while(funcz[i].name!=nullptr){
-		SQNativeClosure *nc = SQNativeClosure::Create(ss,funcz[i].f);
-		nc->_nparamscheck = funcz[i].nparamscheck;
-		nc->_name = SQString::Create(ss,funcz[i].name);
-		if(funcz[i].typemask && !CompileTypemask(nc->_typecheck,funcz[i].typemask))
+	for (auto &func : funcz) {
+		SQNativeClosure *nc = SQNativeClosure::Create(ss,func.f);
+		nc->_nparamscheck = func.nparamscheck;
+		nc->_name = SQString::Create(ss,func.name);
+		if(func.typemask.has_value() && !CompileTypemask(nc->_typecheck,*func.typemask))
 			return nullptr;
-		t->NewSlot(SQString::Create(ss,funcz[i].name),nc);
-		i++;
+		t->NewSlot(SQString::Create(ss,func.name),nc);
 	}
 	return t;
 }
@@ -97,8 +91,6 @@ SQSharedState::SQSharedState()
 	_printfunc = nullptr;
 	_debuginfo = false;
 	_notifyallexceptions = false;
-	_scratchpad=nullptr;
-	_scratchpadsize=0;
 	_collectable_free_processing = false;
 #ifndef NO_GARBAGE_COLLECTOR
 	_gc_chain=nullptr;
@@ -212,7 +204,6 @@ SQSharedState::~SQSharedState()
 	sq_delete(_systemstrings,SQObjectPtrVec);
 	sq_delete(_metamethods,SQObjectPtrVec);
 	sq_delete(_stringtable,SQStringTable);
-	if(_scratchpad)SQ_FREE(_scratchpad,_scratchpadsize);
 }
 
 
@@ -357,19 +348,16 @@ void SQCollectable::RemoveFromChain(SQCollectable **chain,SQCollectable *c)
 }
 #endif
 
-SQChar* SQSharedState::GetScratchPad(SQInteger size)
+std::span<char> SQSharedState::GetScratchPad(SQInteger size)
 {
 	SQInteger newsize;
 	if(size>0) {
-		if(_scratchpadsize < size) {
+		if(_scratchpad.size() < static_cast<size_t>(size)) {
 			newsize = size + (size>>1);
-			_scratchpad = (SQChar *)SQ_REALLOC(_scratchpad,_scratchpadsize,newsize);
-			_scratchpadsize = newsize;
-
-		}else if(_scratchpadsize >= (size<<5)) {
-			newsize = _scratchpadsize >> 1;
-			_scratchpad = (SQChar *)SQ_REALLOC(_scratchpad,_scratchpadsize,newsize);
-			_scratchpadsize = newsize;
+			_scratchpad.resize(newsize);
+		}else if(_scratchpad.size() >= static_cast<size_t>(size<<5)) {
+			newsize = _scratchpad.size() >> 1;
+			_scratchpad.resize(newsize);
 		}
 	}
 	return _scratchpad;
@@ -550,36 +538,36 @@ void SQStringTable::AllocNodes(SQInteger size)
 {
 	_numofslots = size;
 	_strings = (SQString**)SQ_MALLOC(sizeof(SQString*)*_numofslots);
-	memset(_strings,0,sizeof(SQString*)*(size_t)_numofslots);
+	std::fill_n(_strings, _numofslots, nullptr);
 }
 
-SQString *SQStringTable::Add(const SQChar *news,SQInteger len)
+static const std::hash<std::string_view> string_table_hash{};
+
+SQString *SQStringTable::Add(std::string_view new_string)
 {
-	if(len<0)
-		len = (SQInteger)strlen(news);
-	SQHash h = ::_hashstr(news,(size_t)len)&(_numofslots-1);
+	size_t len = new_string.size();
+	auto slot = string_table_hash(new_string) & (_numofslots-1);
 	SQString *s;
-	for (s = _strings[h]; s; s = s->_next){
-		if(s->_len == len && (!memcmp(news,s->_val,(size_t)len)))
-			return s; //found
+	for (s = _strings[slot]; s; s = s->_next){
+		if(s->View() == new_string) return s; //found
 	}
 
 	SQString *t=(SQString *)SQ_MALLOC(len+sizeof(SQString));
-	new (t) SQString(news, len);
-	t->_next = _strings[h];
-	_strings[h] = t;
+	new (t) SQString(new_string);
+	t->_next = _strings[slot];
+	_strings[slot] = t;
 	_slotused++;
 	if (_slotused > _numofslots)  /* too crowded? */
 		Resize(_numofslots*2);
 	return t;
 }
 
-SQString::SQString(const SQChar *news, SQInteger len)
+SQString::SQString(std::string_view new_string)
 {
-	memcpy(_val,news,(size_t)len);
-	_val[len] = '\0';
-	_len = len;
-	_hash = ::_hashstr(news,(size_t)len);
+	std::ranges::copy(new_string, _val);
+	_val[new_string.size()] = '\0';
+	_len = new_string.size();
+	_hash = string_table_hash(new_string);
 	_next = nullptr;
 	_sharedstate = nullptr;
 }
@@ -615,7 +603,7 @@ void SQStringTable::Remove(SQString *bs)
 			else
 				_strings[h] = s->_next;
 			_slotused--;
-			SQInteger slen = s->_len;
+			size_t slen = s->View().size();
 			s->~SQString();
 			SQ_FREE(s,sizeof(SQString) + slen);
 			return;
diff --git a/src/3rdparty/squirrel/squirrel/sqstate.h b/src/3rdparty/squirrel/squirrel/sqstate.h
index 547e6de47d..d98b903b05 100644
--- a/src/3rdparty/squirrel/squirrel/sqstate.h
+++ b/src/3rdparty/squirrel/squirrel/sqstate.h
@@ -13,7 +13,7 @@ struct SQStringTable
 {
 	SQStringTable();
 	~SQStringTable();
-	SQString *Add(const SQChar *,SQInteger len);
+	SQString *Add(std::string_view str);
 	void Remove(SQString *);
 private:
 	void Resize(SQInteger size);
@@ -49,9 +49,6 @@ private:
 	RefNode **_buckets;
 };
 
-#define ADD_STRING(ss,str,len) ss->_stringtable->Add(str,len)
-#define REMOVE_STRING(ss,bstr) ss->_stringtable->Remove(bstr)
-
 struct SQObjectPtr;
 
 struct SQSharedState
@@ -59,7 +56,7 @@ struct SQSharedState
 	SQSharedState();
 	~SQSharedState();
 public:
-	SQChar* GetScratchPad(SQInteger size);
+	std::span<char> GetScratchPad(SQInteger size);
 	SQInteger GetMetaMethodIdxByName(const SQObjectPtr &name);
 	void DelayFinalFree(SQCollectable *collectable);
 #ifndef NO_GARBAGE_COLLECTOR
@@ -84,33 +81,32 @@ public:
 #endif
 	SQObjectPtr _root_vm;
 	SQObjectPtr _table_default_delegate;
-	static SQRegFunction _table_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _table_default_delegate_funcz;
 	SQObjectPtr _array_default_delegate;
-	static SQRegFunction _array_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _array_default_delegate_funcz;
 	SQObjectPtr _string_default_delegate;
-	static SQRegFunction _string_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _string_default_delegate_funcz;
 	SQObjectPtr _number_default_delegate;
-	static SQRegFunction _number_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _number_default_delegate_funcz;
 	SQObjectPtr _generator_default_delegate;
-	static SQRegFunction _generator_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _generator_default_delegate_funcz;
 	SQObjectPtr _closure_default_delegate;
-	static SQRegFunction _closure_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _closure_default_delegate_funcz;
 	SQObjectPtr _thread_default_delegate;
-	static SQRegFunction _thread_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _thread_default_delegate_funcz;
 	SQObjectPtr _class_default_delegate;
-	static SQRegFunction _class_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _class_default_delegate_funcz;
 	SQObjectPtr _instance_default_delegate;
-	static SQRegFunction _instance_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _instance_default_delegate_funcz;
 	SQObjectPtr _weakref_default_delegate;
-	static SQRegFunction _weakref_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _weakref_default_delegate_funcz;
 
 	SQCOMPILERERROR _compilererrorhandler;
 	SQPRINTFUNCTION _printfunc;
 	bool _debuginfo;
 	bool _notifyallexceptions;
 private:
-	SQChar *_scratchpad;
-	SQInteger _scratchpadsize;
+	std::vector<char> _scratchpad;
 };
 
 #define _sp(s) (_sharedstate->GetScratchPad(s))
@@ -133,6 +129,6 @@ extern SQObjectPtr _false_;
 extern SQObjectPtr _one_;
 extern SQObjectPtr _minusone_;
 
-bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+bool CompileTypemask(SQIntVec &res,std::string_view typemask);
 
 #endif //_SQSTATE_H_
diff --git a/src/3rdparty/squirrel/squirrel/sqstring.h b/src/3rdparty/squirrel/squirrel/sqstring.h
index 4d14e4adb4..830a71b8fa 100644
--- a/src/3rdparty/squirrel/squirrel/sqstring.h
+++ b/src/3rdparty/squirrel/squirrel/sqstring.h
@@ -2,29 +2,23 @@
 #ifndef _SQSTRING_H_
 #define _SQSTRING_H_
 
-inline SQHash _hashstr (const SQChar *s, size_t l)
-{
-		SQHash h = (SQHash)l;  /* seed */
-		size_t step = (l>>5)|1;  /* if string is too long, don't hash all its chars */
-		for (; l>=step; l-=step)
-			h = h ^ ((h<<5)+(h>>2)+(unsigned short)*(s++));
-		return h;
-}
-
 struct SQString : public SQRefCounted
 {
-	SQString(const SQChar *news, SQInteger len);
+	SQString(std::string_view str);
 	~SQString(){}
 public:
-	static SQString *Create(SQSharedState *ss, const SQChar *, SQInteger len = -1 );
-	static SQString *Create(SQSharedState *ss, const std::string &str) { return Create(ss, str.data(), str.size()); }
+	static SQString *Create(SQSharedState *ss, std::string_view str);
 	SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval);
 	void Release() override;
 	SQSharedState *_sharedstate;
 	SQString *_next; //chain for the string table
+	std::size_t _hash;
+
+	std::string_view View() const { return std::string_view(this->_val, this->_len); }
+	std::span<char> Span() { return std::span<char>(this->_val, this->_len); }
+private:
 	SQInteger _len;
-	SQHash _hash;
-	SQChar _val[1];
+	char _val[1];
 };
 
 
diff --git a/src/3rdparty/squirrel/squirrel/squserdata.h b/src/3rdparty/squirrel/squirrel/squserdata.h
index de75ca3c37..108c0f8f1e 100644
--- a/src/3rdparty/squirrel/squirrel/squserdata.h
+++ b/src/3rdparty/squirrel/squirrel/squserdata.h
@@ -31,7 +31,7 @@ struct SQUserData : SQDelegable
 	SQInteger _size;
 	SQRELEASEHOOK _hook;
 	SQUserPointer _typetag;
-	SQChar _val[1];
+	char _val[1];
 };
 
 #endif //_SQUSERDATA_H_
diff --git a/src/3rdparty/squirrel/squirrel/squtils.h b/src/3rdparty/squirrel/squirrel/squtils.h
index 2c7a343638..87d0473a26 100644
--- a/src/3rdparty/squirrel/squirrel/squtils.h
+++ b/src/3rdparty/squirrel/squirrel/squtils.h
@@ -93,7 +93,7 @@ public:
 	{
 		_vals[idx].~T();
 		if(idx < (_size - 1)) {
-			memmove(static_cast<void *>(&_vals[idx]), &_vals[idx+1], sizeof(T) * (_size - (size_t)idx - 1));
+			std::move(&_vals[idx + 1], &_vals[_size], &_vals[idx]);
 		}
 		_size--;
 	}
diff --git a/src/3rdparty/squirrel/squirrel/sqvm.cpp b/src/3rdparty/squirrel/squirrel/sqvm.cpp
index bb50dc2244..1637c359f3 100644
--- a/src/3rdparty/squirrel/squirrel/sqvm.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp
@@ -117,7 +117,6 @@ SQVM::SQVM(SQSharedState *ss)
 	_in_stackoverflow = false;
 	_ops_till_suspend = 0;
 	_ops_till_suspend_error_threshold = INT64_MIN;
-	_ops_till_suspend_error_label = nullptr;
 	_callsstack = nullptr;
 	_callsstacksize = 0;
 	_alloccallsstacksize = 0;
@@ -198,7 +197,7 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
 		SQObjectPtr res;
 		switch(type(o1)){
 		case OT_STRING:
-			_RET_SUCCEED(strcmp(_stringval(o1),_stringval(o2)));
+			_RET_SUCCEED(_stringval(o1).compare(_stringval(o2)));
 		case OT_INTEGER:
 			/* FS#3954: wrong integer comparison */
 			_RET_SUCCEED((_integer(o1)<_integer(o2))?-1:(_integer(o1)==_integer(o2))?0:1);
@@ -302,11 +301,7 @@ bool SQVM::StringCat(const SQObjectPtr &str,const SQObjectPtr &obj,SQObjectPtr &
 	SQObjectPtr a, b;
 	ToString(str, a);
 	ToString(obj, b);
-	SQInteger l = _string(a)->_len , ol = _string(b)->_len;
-	SQChar *s = _sp(l + ol + 1);
-	memcpy(s, _stringval(a), (size_t)l);
-	memcpy(s + l, _stringval(b), (size_t)ol);
-	dest = SQString::Create(_ss(this), _spval, l + ol);
+	dest = SQString::Create(_ss(this), fmt::format("{}{}", _stringval(a), _stringval(b)));
 	return true;
 }
 
@@ -1253,7 +1248,8 @@ bool SQVM::Get(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest,
 	if(fetchroot) {
 		if(_rawval(STK(0)) == _rawval(self) &&
 			type(STK(0)) == type(self)) {
-				return _table(_roottable)->Get(key,dest);
+				if (_table(_roottable)->Get(key,dest)) return true;
+				return _table(_ss(this)->_consts)->Get(key,dest);
 		}
 	}
 	return false;
@@ -1288,9 +1284,10 @@ bool SQVM::FallBackGet(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPt
 	case OT_STRING:
 		if(sq_isnumeric(key)){
 			SQInteger n=tointeger(key);
-			if(abs((int)n)<_string(self)->_len){
-				if(n<0)n=_string(self)->_len-n;
-				dest=SQInteger(_stringval(self)[n]);
+			std::string_view str = _stringval(self);
+			if(std::abs(n) < static_cast<SQInteger>(str.size())){
+				if(n<0)n=str.size()+n;
+				dest=SQInteger(str[n]);
 				return true;
 			}
 			return false;
diff --git a/src/3rdparty/squirrel/squirrel/sqvm.h b/src/3rdparty/squirrel/squirrel/sqvm.h
index b083cf3bdd..34554678a5 100644
--- a/src/3rdparty/squirrel/squirrel/sqvm.h
+++ b/src/3rdparty/squirrel/squirrel/sqvm.h
@@ -169,7 +169,7 @@ public:
 	SQBool _can_suspend;
 	SQInteger _ops_till_suspend;
 	SQInteger _ops_till_suspend_error_threshold;
-	const char *_ops_till_suspend_error_label;
+	std::string_view _ops_till_suspend_error_label;
 	SQBool _in_stackoverflow;
 
 	bool ShouldSuspend()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e7160c4e2..266e4e577c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -279,6 +279,10 @@ add_files(
     newgrf_animation_type.h
     newgrf_badge.cpp
     newgrf_badge.h
+    newgrf_badge_config.cpp
+    newgrf_badge_config.h
+    newgrf_badge_gui.cpp
+    newgrf_badge_gui.h
     newgrf_badge_type.h
     newgrf_callbacks.h
     newgrf_canal.cpp
diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp
index 286c78f0e9..7a2d9fcb3d 100644
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@@ -135,8 +135,8 @@ public:
 	static AIScannerLibrary *GetScannerLibrary();
 
 	/** Wrapper function for AIScanner::HasAI */
-	static bool HasAI(const struct ContentInfo *ci, bool md5sum);
-	static bool HasAILibrary(const ContentInfo *ci, bool md5sum);
+	static bool HasAI(const ContentInfo &ci, bool md5sum);
+	static bool HasAILibrary(const ContentInfo &ci, bool md5sum);
 private:
 	static uint frame_counter; ///< Tick counter for the AI code
 	static std::unique_ptr<AIScannerInfo> scanner_info; ///< ScriptScanner instance that is used to find AIs
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index f6fc28c68b..0283b38f66 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -334,12 +334,12 @@
  * @param md5sum whether to check the MD5 checksum
  * @return true iff we have an AI (library) matching.
  */
-/* static */ bool AI::HasAI(const ContentInfo *ci, bool md5sum)
+/* static */ bool AI::HasAI(const ContentInfo &ci, bool md5sum)
 {
 	return AI::scanner_info->HasScript(ci, md5sum);
 }
 
-/* static */ bool AI::HasAILibrary(const ContentInfo *ci, bool md5sum)
+/* static */ bool AI::HasAILibrary(const ContentInfo &ci, bool md5sum)
 {
 	return AI::scanner_library->HasScript(ci, md5sum);
 }
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 711441c564..c13e313130 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -84,7 +84,7 @@ static constexpr NWidgetPart _nested_ai_config_widgets[] = {
 
 /** Window definition for the configure AI window. */
 static WindowDesc _ai_config_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	{},
 	_nested_ai_config_widgets
@@ -142,7 +142,7 @@ struct AIConfigWindow : public Window {
 
 			case WID_AIC_LIST:
 				this->line_height = GetCharacterHeight(FS_NORMAL) + padding.height;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = 8 * this->line_height;
 				break;
 		}
@@ -218,7 +218,7 @@ struct AIConfigWindow : public Window {
 		if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_CONTENT_END) {
 			if (this->selected_slot == CompanyID::Invalid() || AIConfig::GetConfig(this->selected_slot) == nullptr) return;
 
-			ShowScriptTextfileWindow((TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot);
+			ShowScriptTextfileWindow(this, static_cast<TextfileType>(widget - WID_AIC_TEXTFILE), this->selected_slot);
 			return;
 		}
 
@@ -250,23 +250,23 @@ struct AIConfigWindow : public Window {
 			}
 
 			case WID_AIC_LIST: { // Select a slot
-				this->selected_slot = (CompanyID)this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget);
+				this->selected_slot = static_cast<CompanyID>(this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget));
 				this->InvalidateData();
-				if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed);
+				if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed);
 				break;
 			}
 
 			case WID_AIC_MOVE_UP:
-				if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot - 1))) {
+				if (IsEditable(this->selected_slot) && IsEditable(static_cast<CompanyID>(this->selected_slot - 1))) {
 					std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot - 1]);
-					this->selected_slot = CompanyID(this->selected_slot - 1);
+					this->selected_slot = static_cast<CompanyID>(this->selected_slot - 1);
 					this->vscroll->ScrollTowards(this->selected_slot.base());
 					this->InvalidateData();
 				}
 				break;
 
 			case WID_AIC_MOVE_DOWN:
-				if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot + 1))) {
+				if (IsEditable(this->selected_slot) && IsEditable(static_cast<CompanyID>(this->selected_slot + 1))) {
 					std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot + 1]);
 					++this->selected_slot;
 					this->vscroll->ScrollTowards(this->selected_slot.base());
@@ -282,11 +282,11 @@ struct AIConfigWindow : public Window {
 			}
 
 			case WID_AIC_CHANGE:  // choose other AI
-				if (IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed);
+				if (IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed);
 				break;
 
 			case WID_AIC_CONFIGURE: // change the settings for an AI
-				ShowScriptSettingsWindow((CompanyID)this->selected_slot);
+				ShowScriptSettingsWindow(this->selected_slot);
 				break;
 
 			case WID_AIC_CONTENT_DOWNLOAD:
@@ -320,8 +320,8 @@ struct AIConfigWindow : public Window {
 		this->SetWidgetDisabledState(WID_AIC_INCREASE_INTERVAL, GetGameSettings().difficulty.competitors_interval == MAX_COMPETITORS_INTERVAL);
 		this->SetWidgetDisabledState(WID_AIC_CHANGE, !IsEditable(this->selected_slot));
 		this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == CompanyID::Invalid() || config->GetConfigList()->empty());
-		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot - 1)));
-		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot + 1)));
+		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable(static_cast<CompanyID>(this->selected_slot - 1)));
+		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable(static_cast<CompanyID>(this->selected_slot + 1)));
 
 		this->SetWidgetDisabledState(WID_AIC_OPEN_URL, this->selected_slot == CompanyID::Invalid() || config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty());
 		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 79d5ca96dd..8e3de91a1f 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -27,14 +27,14 @@ static bool CheckAPIVersion(const std::string &api_version)
 	return std::ranges::find(AIInfo::ApiVersions, api_version) != std::end(AIInfo::ApiVersions);
 }
 
-template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq_pushstring(vm, "AIInfo", -1); return 1; }
+template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq_pushstring(vm, "AIInfo"); return 1; }
 
-/* static */ void AIInfo::RegisterAPI(Squirrel *engine)
+/* static */ void AIInfo::RegisterAPI(Squirrel &engine)
 {
 	/* Create the AIInfo class, and add the RegisterAI function */
 	DefSQClass<AIInfo, ScriptType::AI> SQAIInfo("AIInfo");
 	SQAIInfo.PreRegister(engine);
-	SQAIInfo.AddConstructor<void (AIInfo::*)(), 1>(engine, "x");
+	SQAIInfo.AddConstructor<void (AIInfo::*)()>(engine, "x");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddSetting, "AddSetting");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddLabels, "AddLabels");
 	SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");
@@ -50,8 +50,8 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::InGame}.base(), "AICONFIG_INGAME");
 
 	SQAIInfo.PostRegister(engine);
-	engine->AddMethod("RegisterAI", &AIInfo::Constructor, 2, "tx");
-	engine->AddMethod("RegisterDummyAI", &AIInfo::DummyConstructor, 2, "tx");
+	engine.AddMethod("RegisterAI", &AIInfo::Constructor, "tx");
+	engine.AddMethod("RegisterDummyAI", &AIInfo::DummyConstructor, "tx");
 }
 
 /* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)
@@ -61,11 +61,12 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	if (SQ_FAILED(sq_getinstanceup(vm, 2, &instance, nullptr)) || instance == nullptr) return sq_throwerror(vm, "Pass an instance of a child class of AIInfo to RegisterAI");
 	AIInfo *info = (AIInfo *)instance;
 
-	SQInteger res = ScriptInfo::Constructor(vm, info);
+	SQInteger res = ScriptInfo::Constructor(vm, *info);
 	if (res != 0) return res;
 
 	if (info->engine->MethodExists(info->SQ_instance, "MinVersionToLoad")) {
 		if (!info->engine->CallIntegerMethod(info->SQ_instance, "MinVersionToLoad", &info->min_loadable_version, MAX_GET_OPS)) return SQ_ERROR;
+		if (info->min_loadable_version < 0) return SQ_ERROR;
 	} else {
 		info->min_loadable_version = info->GetVersion();
 	}
@@ -101,13 +102,13 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	AIInfo *info = (AIInfo *)instance;
 	info->api_version = *std::rbegin(AIInfo::ApiVersions);
 
-	SQInteger res = ScriptInfo::Constructor(vm, info);
+	SQInteger res = ScriptInfo::Constructor(vm, *info);
 	if (res != 0) return res;
 
 	/* Remove the link to the real instance, else it might get deleted by RegisterAI() */
 	sq_setinstanceup(vm, 2, nullptr);
 	/* Register the AI to the base system */
-	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(info);
+	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(std::unique_ptr<AIInfo>(info));
 	return 0;
 }
 
@@ -124,12 +125,12 @@ bool AIInfo::CanLoadFromVersion(int version) const
 }
 
 
-/* static */ void AILibrary::RegisterAPI(Squirrel *engine)
+/* static */ void AILibrary::RegisterAPI(Squirrel &engine)
 {
 	/* Create the AILibrary class, and add the RegisterLibrary function */
-	engine->AddClassBegin("AILibrary");
-	engine->AddClassEnd();
-	engine->AddMethod("RegisterLibrary", &AILibrary::Constructor, 2, "tx");
+	engine.AddClassBegin("AILibrary");
+	engine.AddClassEnd();
+	engine.AddMethod("RegisterLibrary", &AILibrary::Constructor, "tx");
 }
 
 /* static */ SQInteger AILibrary::Constructor(HSQUIRRELVM vm)
@@ -137,7 +138,7 @@ bool AIInfo::CanLoadFromVersion(int version) const
 	/* Create a new library */
 	AILibrary *library = new AILibrary();
 
-	SQInteger res = ScriptInfo::Constructor(vm, library);
+	SQInteger res = ScriptInfo::Constructor(vm, *library);
 	if (res != 0) {
 		delete library;
 		return res;
diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.hpp
index dc2e0de500..3928588114 100644
--- a/src/ai/ai_info.hpp
+++ b/src/ai/ai_info.hpp
@@ -23,7 +23,7 @@ public:
 	/**
 	 * Register the functions of this class.
 	 */
-	static void RegisterAPI(Squirrel *engine);
+	static void RegisterAPI(Squirrel &engine);
 
 	/**
 	 * Create an AI, using this AIInfo as start-template.
@@ -64,7 +64,7 @@ public:
 	/**
 	 * Register the functions of this class.
 	 */
-	static void RegisterAPI(Squirrel *engine);
+	static void RegisterAPI(Squirrel &engine);
 
 	/**
 	 * Create an AI, using this AIInfo as start-template.
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 07dcd40023..cb8a4a00b4 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -27,7 +27,7 @@
 #include "table/strings.h"
 
 /* Manually include the Text glue. */
-#include "../script/api/template/template_text.hpp.sq"
+#include "../script/api/template/template_text.sq.hpp"
 
 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.hpp"
@@ -43,7 +43,7 @@ void AIInstance::Initialize(AIInfo *info)
 	this->api_version = info->GetAPIVersion();
 
 	/* Register the AIController (including the "import" command) */
-	SQAIController_Register(this->engine);
+	SQAIController_Register(*this->engine);
 
 	ScriptInstance::Initialize(info->GetMainScript(), info->GetInstanceName(), _current_company);
 }
@@ -53,7 +53,7 @@ void AIInstance::RegisterAPI()
 	ScriptInstance::RegisterAPI();
 
 	/* Register all classes */
-	SQAI_RegisterAll(this->engine);
+	SQAI_RegisterAll(*this->engine);
 
 	if (!this->LoadCompatibilityScripts(AI_DIR, AIInfo::ApiVersions)) this->Died();
 }
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 843229e699..827dc4cc3c 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -22,11 +22,8 @@
 #include "../safeguards.h"
 
 
-AIScannerInfo::AIScannerInfo() :
-	ScriptScanner(),
-	info_dummy(nullptr)
-{
-}
+AIScannerInfo::AIScannerInfo() = default;
+AIScannerInfo::~AIScannerInfo() = default;
 
 void AIScannerInfo::Initialize()
 {
@@ -39,22 +36,17 @@ void AIScannerInfo::Initialize()
 	Script_CreateDummyInfo(this->engine->GetVM(), "AI", "ai");
 }
 
-void AIScannerInfo::SetDummyAI(class AIInfo *info)
+void AIScannerInfo::SetDummyAI(std::unique_ptr<class AIInfo> &&info)
 {
-	this->info_dummy = info;
+	this->info_dummy = std::move(info);
 }
 
-AIScannerInfo::~AIScannerInfo()
+std::string AIScannerInfo::GetScriptName(ScriptInfo &info)
 {
-	delete this->info_dummy;
+	return info.GetName();
 }
 
-std::string AIScannerInfo::GetScriptName(ScriptInfo *info)
-{
-	return info->GetName();
-}
-
-void AIScannerInfo::RegisterAPI(class Squirrel *engine)
+void AIScannerInfo::RegisterAPI(class Squirrel &engine)
 {
 	AIInfo::RegisterAPI(engine);
 }
@@ -63,7 +55,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 {
 	if (_game_mode == GM_MENU) {
 		Debug(script, 0, "The intro game should not use AI, loading 'dummy' AI.");
-		return this->info_dummy;
+		return this->info_dummy.get();
 	}
 
 	/* Filter for AIs suitable as Random AI. */
@@ -72,7 +64,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 	uint num_random_ais = std::ranges::distance(random_ais);
 	if (num_random_ais == 0) {
 		Debug(script, 0, "No suitable AI found, loading 'dummy' AI.");
-		return this->info_dummy;
+		return this->info_dummy.get();
 	}
 
 	/* Pick a random AI */
@@ -125,13 +117,13 @@ void AIScannerLibrary::Initialize()
 	ScriptScanner::Initialize("AIScanner");
 }
 
-std::string AIScannerLibrary::GetScriptName(ScriptInfo *info)
+std::string AIScannerLibrary::GetScriptName(ScriptInfo &info)
 {
-	AILibrary *library = static_cast<AILibrary *>(info);
-	return fmt::format("{}.{}", library->GetCategory(), library->GetInstanceName());
+	AILibrary &library = static_cast<AILibrary &>(info);
+	return fmt::format("{}.{}", library.GetCategory(), library.GetInstanceName());
 }
 
-void AIScannerLibrary::RegisterAPI(class Squirrel *engine)
+void AIScannerLibrary::RegisterAPI(class Squirrel &engine)
 {
 	AILibrary::RegisterAPI(engine);
 }
diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.hpp
index a2c8a7280e..364e5642a9 100644
--- a/src/ai/ai_scanner.hpp
+++ b/src/ai/ai_scanner.hpp
@@ -37,17 +37,17 @@ public:
 	/**
 	 * Set the Dummy AI.
 	 */
-	void SetDummyAI(class AIInfo *info);
+	void SetDummyAI(std::unique_ptr<class AIInfo> &&info);
 
 protected:
-	std::string GetScriptName(ScriptInfo *info) override;
-	const char *GetFileName() const override { return PATHSEP "info.nut"; }
+	std::string GetScriptName(ScriptInfo &info) override;
+	std::string_view GetFileName() const override { return PATHSEP "info.nut"; }
 	Subdirectory GetDirectory() const override { return AI_DIR; }
-	const char *GetScannerName() const override { return "AIs"; }
-	void RegisterAPI(class Squirrel *engine) override;
+	std::string_view GetScannerName() const override { return "AIs"; }
+	void RegisterAPI(class Squirrel &engine) override;
 
 private:
-	AIInfo *info_dummy; ///< The dummy AI.
+	std::unique_ptr<AIInfo> info_dummy; ///< The dummy AI.
 };
 
 class AIScannerLibrary : public ScriptScanner {
@@ -63,11 +63,11 @@ public:
 	class AILibrary *FindLibrary(const std::string &library, int version);
 
 protected:
-	std::string GetScriptName(ScriptInfo *info) override;
-	const char *GetFileName() const override { return PATHSEP "library.nut"; }
+	std::string GetScriptName(ScriptInfo &info) override;
+	std::string_view GetFileName() const override { return PATHSEP "library.nut"; }
 	Subdirectory GetDirectory() const override { return AI_LIBRARY_DIR; }
-	const char *GetScannerName() const override { return "AI Libraries"; }
-	void RegisterAPI(class Squirrel *engine) override;
+	std::string_view GetScannerName() const override { return "AI Libraries"; }
+	void RegisterAPI(class Squirrel &engine) override;
 };
 
 #endif /* AI_SCANNER_HPP */
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 78597e3a30..aac97c84c9 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -175,7 +175,7 @@ void Aircraft::GetImage(Direction direction, EngineImageType image_type, Vehicle
 {
 	uint8_t spritenum = this->spritenum;
 
-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleSprite(this, direction, image_type, result);
 		if (result->IsValid()) return;
 
@@ -191,7 +191,7 @@ void GetRotorImage(const Aircraft *v, EngineImageType image_type, VehicleSpriteS
 	assert(v->subtype == AIR_HELICOPTER);
 
 	const Aircraft *w = v->Next()->Next();
-	if (is_custom_sprite(v->spritenum)) {
+	if (IsCustomVehicleSpriteNum(v->spritenum)) {
 		GetCustomRotorSprite(v, image_type, result);
 		if (result->IsValid()) return;
 	}
@@ -205,7 +205,7 @@ static void GetAircraftIcon(EngineID engine, EngineImageType image_type, Vehicle
 	const Engine *e = Engine::Get(engine);
 	uint8_t spritenum = e->u.air.image_index;
 
-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleIcon(engine, DIR_W, image_type, result);
 		if (result->IsValid()) return;
 
@@ -1430,7 +1430,7 @@ static void AircraftLandAirplane(Aircraft *v)
 
 	v->UpdateDeltaXY();
 
-	AirportTileAnimationTrigger(st, vt, AAT_STATION_AIRPLANE_LAND);
+	TriggerAirportTileAnimation(st, vt, AirportAnimationTrigger::AirplaneTouchdown);
 
 	if (!PlayVehicleSound(v, VSE_TOUCHDOWN)) {
 		SndPlayVehicleFx(SND_17_SKID_PLANE, v);
diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp
index 1ba0a311d5..5b7d67582b 100644
--- a/src/aircraft_gui.cpp
+++ b/src/aircraft_gui.cpp
@@ -82,7 +82,7 @@ void DrawAircraftImage(const Vehicle *v, const Rect &r, VehicleID selection, Eng
 	int x_offs = UnScaleGUI(rect.left);
 	int x = rtl ? r.right - width - x_offs : r.left - x_offs;
 	/* This magic -1 offset is related to the sprite_y_offsets in build_vehicle_gui.cpp */
-	int y = ScaleSpriteTrad(-1) + CenterBounds(r.top, r.bottom, 0);
+	int y = ScaleSpriteTrad(-1) + CentreBounds(r.top, r.bottom, 0);
 	bool helicopter = v->subtype == AIR_HELICOPTER;
 
 	int heli_offs = 0;
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 6954317887..de467e0a5c 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -21,7 +21,7 @@
 #include "company_base.h"
 #include "station_type.h"
 #include "newgrf_airport.h"
-#include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "newgrf_callbacks.h"
 #include "dropdown_type.h"
 #include "dropdown_func.h"
@@ -204,9 +204,9 @@ static constexpr NWidgetPart _nested_air_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_AIRPORT), SetFill(0, 1), SetMinimalSize(42, 22), SetSpriteTip(SPR_IMG_AIRPORT, STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(4, 22), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_DEMOLISH), SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_AIRPORT), SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_AIRPORT, STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), SetFill(1, 1), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_DEMOLISH), SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 	EndContainer(),
 };
 
@@ -401,7 +401,7 @@ public:
 			case WID_AP_AIRPORT_SPRITE:
 				if (this->preview_sprite != 0) {
 					Dimension d = GetSpriteSize(this->preview_sprite);
-					DrawSprite(this->preview_sprite, COMPANY_SPRITE_COLOUR(_local_company), CenterBounds(r.left, r.right, d.width), CenterBounds(r.top, r.bottom, d.height));
+					DrawSprite(this->preview_sprite, GetCompanyPalette(_local_company), CentreBounds(r.left, r.right, d.width), CentreBounds(r.top, r.bottom, d.height));
 				}
 				break;
 
@@ -561,7 +561,7 @@ public:
 		this->SelectOtherAirport(-1);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget == WID_AP_CLASS_DROPDOWN) {
 			_selected_airport_class = (AirportClassID)index;
@@ -575,7 +575,7 @@ public:
 		CheckRedrawStationCoverage(this);
 	}
 
-	IntervalTimer<TimerGameCalendar> yearly_interval = {{TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [this](auto) {
+	const IntervalTimer<TimerGameCalendar> yearly_interval = {{TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [this](auto) {
 		this->InvalidateData();
 	}};
 };
@@ -618,7 +618,7 @@ static constexpr NWidgetPart _nested_build_airport_widgets[] = {
 };
 
 static WindowDesc _build_airport_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_build_airport_widgets
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index 1f547b2615..ffb2fc052b 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -80,20 +80,18 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window)
 	 * either, so it doesn't matter how many articulated parts there are. */
 	if (!Vehicle::CanAllocateItem()) return 0;
 
-	Vehicle *v = nullptr;
+	std::unique_ptr<Vehicle> v;
 	if (!purchase_window) {
-		v = new Vehicle();
+		v = std::make_unique<Vehicle>();
 		v->engine_type = engine_type;
 		v->owner = _current_company;
 	}
 
 	uint i;
 	for (i = 1; i < MAX_ARTICULATED_PARTS; i++) {
-		if (GetNextArticulatedPart(i, engine_type, v) == EngineID::Invalid()) break;
+		if (GetNextArticulatedPart(i, engine_type, v.get()) == EngineID::Invalid()) break;
 	}
 
-	delete v;
-
 	return i - 1;
 }
 
@@ -432,7 +430,10 @@ void AddArticulatedParts(Vehicle *first)
 
 		if (flip_image) v->spritenum++;
 
-		if (v->type == VEH_TRAIN && TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION);
+		if (v->type == VEH_TRAIN) {
+			auto prob = TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed);
+			if (prob.has_value()) Train::From(v)->flags.Set(VehicleRailFlag::Flipped, prob.value());
+		}
 		v->UpdatePosition();
 	}
 }
diff --git a/src/autocompletion.cpp b/src/autocompletion.cpp
index 1a643f8c05..e8d36406f3 100644
--- a/src/autocompletion.cpp
+++ b/src/autocompletion.cpp
@@ -17,9 +17,12 @@
 
 #include "safeguards.h"
 
+/**
+ * @return true, if the textbuf was updated.
+ */
 bool AutoCompletion::AutoComplete()
 {
-	// We are pressing TAB for the first time after reset.
+	/* We are pressing TAB for the first time after reset. */
 	if (this->suggestions.empty()) {
 		this->InitSuggestions(this->textbuf->GetText());
 		if (this->suggestions.empty()) {
@@ -29,11 +32,11 @@ bool AutoCompletion::AutoComplete()
 		return true;
 	}
 
-	// We are pressing TAB again on the same text.
+	/* We are pressing TAB again on the same text. */
 	if (this->current_suggestion_index + 1 < this->suggestions.size()) {
 		this->ApplySuggestion(prefix, this->suggestions[++this->current_suggestion_index]);
 	} else {
-		// We are out of options, restore original text.
+		/* We are out of options, restore original text. */
 		this->textbuf->Assign(initial_buf);
 		this->Reset();
 	}
diff --git a/src/autocompletion.h b/src/autocompletion.h
index 452c23e87a..03c08f5c77 100644
--- a/src/autocompletion.h
+++ b/src/autocompletion.h
@@ -32,7 +32,6 @@ public:
 	}
 	virtual ~AutoCompletion() = default;
 
-	// Returns true the textbuf was updated.
 	bool AutoComplete();
 	void Reset();
 
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index 668360f6e7..df64561cf3 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -185,9 +185,9 @@ static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, EngineID engine_ty
 	CargoTypes union_refit_mask_b = GetUnionOfArticulatedRefitMasks(engine_type, false);
 
 	const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
-	for (const Order *o : u->Orders()) {
-		if (!o->IsRefit() || o->IsAutoRefit()) continue;
-		CargoType cargo_type = o->GetRefitCargo();
+	for (const Order &o : u->Orders()) {
+		if (!o.IsRefit() || o.IsAutoRefit()) continue;
+		CargoType cargo_type = o.GetRefitCargo();
 
 		if (!HasBit(union_refit_mask_a, cargo_type)) continue;
 		if (!HasBit(union_refit_mask_b, cargo_type)) return false;
@@ -206,13 +206,12 @@ static int GetIncompatibleRefitOrderIdForAutoreplace(const Vehicle *v, EngineID
 {
 	CargoTypes union_refit_mask = GetUnionOfArticulatedRefitMasks(engine_type, false);
 
-	const Order *o;
 	const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
 
 	const OrderList *orders = u->orders;
 	if (orders == nullptr) return -1;
 	for (VehicleOrderID i = 0; i < orders->GetNumOrders(); i++) {
-		o = orders->GetOrderAt(i);
+		const Order *o = orders->GetOrderAt(i);
 		if (!o->IsRefit()) continue;
 		if (!HasBit(union_refit_mask, o->GetRefitCargo())) return i;
 	}
@@ -373,8 +372,12 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
 	}
 
 	/* Try to reverse the vehicle, but do not care if it fails as the new type might not be reversible */
-	if (new_veh->type == VEH_TRAIN && HasBit(Train::From(old_veh)->flags, VRF_REVERSE_DIRECTION)) {
-		Command<CMD_REVERSE_TRAIN_DIRECTION>::Do(DoCommandFlag::Execute, new_veh->index, true);
+	if (new_veh->type == VEH_TRAIN && Train::From(old_veh)->flags.Test(VehicleRailFlag::Flipped)) {
+		/* Only copy the reverse state if neither old or new vehicle implements reverse-on-build probability callback. */
+		if (!TestVehicleBuildProbability(old_veh, old_veh->engine_type, BuildProbabilityType::Reversed).has_value() &&
+			!TestVehicleBuildProbability(new_veh, new_veh->engine_type, BuildProbabilityType::Reversed).has_value()) {
+			Command<CMD_REVERSE_TRAIN_DIRECTION>::Do(DoCommandFlag::Execute, new_veh->index, true);
+		}
 	}
 
 	return cost;
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 3632415472..804dd92a9d 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -311,7 +311,7 @@ public:
 
 			case WID_RV_LEFT_MATRIX:
 			case WID_RV_RIGHT_MATRIX:
-				resize.height = GetEngineListHeight(this->window_number);
+				fill.height = resize.height = GetEngineListHeight(this->window_number);
 				size.height = (this->window_number <= VEH_ROAD ? 8 : 4) * resize.height;
 				break;
 
@@ -406,11 +406,11 @@ public:
 			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE:
 				if (const Group *g = Group::GetIfValid(this->sel_group); g != nullptr) {
 					bool remove_wagon = g->flags.Test(GroupFlag::ReplaceWagonRemoval);
-					return GetString(STR_GROUP_NAME, sel_group, remove_wagon ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
+					return GetString(STR_REPLACE_REMOVE_WAGON, STR_GROUP_NAME, sel_group, remove_wagon ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
 				} else {
 					const Company *c = Company::Get(_local_company);
 					bool remove_wagon = c->settings.renew_keep_length;
-					return GetString(STR_GROUP_DEFAULT_TRAINS + this->window_number, std::monostate{}, remove_wagon ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
+					return GetString(STR_REPLACE_REMOVE_WAGON, STR_GROUP_DEFAULT_TRAINS + this->window_number, std::monostate{}, remove_wagon ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
 				}
 				break;
 
@@ -552,7 +552,7 @@ public:
 				if (g != nullptr) {
 					Command<CMD_SET_GROUP_FLAG>::Post(this->sel_group, GroupFlag::ReplaceWagonRemoval, !g->flags.Test(GroupFlag::ReplaceWagonRemoval), _ctrl_pressed);
 				} else {
-					// toggle renew_keep_length
+					/* toggle renew_keep_length */
 					Command<CMD_CHANGE_COMPANY_SETTING>::Post("company.renew_keep_length", Company::Get(_local_company)->settings.renew_keep_length ? 0 : 1);
 				}
 				break;
@@ -623,7 +623,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_RV_SORT_DROPDOWN:
@@ -744,7 +744,7 @@ static constexpr NWidgetPart _nested_replace_rail_vehicle_widgets[] = {
 		NWidget(WWT_PANEL, COLOUR_GREY, WID_RV_LEFT_DETAILS), SetMinimalSize(240, 122), SetResize(1, 0), EndContainer(),
 		NWidget(NWID_VERTICAL),
 			NWidget(WWT_PANEL, COLOUR_GREY, WID_RV_RIGHT_DETAILS), SetMinimalSize(240, 122), SetResize(1, 0), EndContainer(),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_RV_TRAIN_WAGONREMOVE_TOGGLE), SetMinimalSize(138, 12), SetStringTip(STR_REPLACE_REMOVE_WAGON, STR_REPLACE_REMOVE_WAGON_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_RV_TRAIN_WAGONREMOVE_TOGGLE), SetMinimalSize(138, 12), SetToolTip(STR_REPLACE_REMOVE_WAGON_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
diff --git a/src/base_media_base.h b/src/base_media_base.h
index cd77cef4df..6286455b2d 100644
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -16,8 +16,9 @@
 #include "3rdparty/md5/md5.h"
 #include <unordered_map>
 
-/* Forward declare these; can't do 'struct X' in functions as older GCCs barf on that */
 struct IniFile;
+struct IniGroup;
+struct IniItem;
 struct ContentInfo;
 
 /** Structure holding filename and MD5 information about a single file */
@@ -47,7 +48,7 @@ template <class T> struct BaseSetTraits;
  */
 template <class T>
 struct BaseSet {
-	typedef std::unordered_map<std::string, std::string> TranslatedStrings;
+	typedef std::unordered_map<std::string, std::string, StringHash, std::equal_to<>> TranslatedStrings;
 
 	/** Number of files in this set */
 	static constexpr size_t NUM_FILES = BaseSetTraits<T>::num_files;
@@ -62,21 +63,13 @@ struct BaseSet {
 	std::string url;               ///< URL for information about the base set
 	TranslatedStrings description; ///< Description of the base set
 	uint32_t shortname = 0; ///< Four letter short variant of the name
-	uint32_t version = 0; ///< The version of this base set
+	std::vector<uint32_t> version; ///< The version of this base set
 	bool fallback = false; ///< This set is a fallback set, i.e. it should be used only as last resort
 
 	std::array<MD5File, BaseSet<T>::NUM_FILES> files{}; ///< All files part of this set
 	uint found_files = 0; ///< Number of the files that could be found
 	uint valid_files = 0; ///< Number of the files that could be found and are valid
 
-	T *next = nullptr; ///< The next base set in this list
-
-	/** Free everything we allocated */
-	~BaseSet()
-	{
-		delete this->next;
-	}
-
 	/**
 	 * Get the number of missing files.
 	 * @return the number
@@ -96,6 +89,9 @@ struct BaseSet {
 		return BaseSet<T>::NUM_FILES - this->valid_files;
 	}
 
+	void LogError(std::string_view full_filename, std::string_view detail, int level = 0) const;
+	const IniItem *GetMandatoryItem(std::string_view full_filename, const IniGroup &group, std::string_view name) const;
+
 	bool FillSetDetails(const IniFile &ini, const std::string &path, const std::string &full_filename, bool allow_empty_filename = true);
 	void CopyCompatibleConfig([[maybe_unused]] const T &src) {}
 
@@ -107,7 +103,7 @@ struct BaseSet {
 	 * @param isocode the isocode to search for
 	 * @return the description
 	 */
-	const std::string &GetDescription(const std::string &isocode) const
+	const std::string &GetDescription(std::string_view isocode) const
 	{
 		if (!isocode.empty()) {
 			/* First the full ISO code */
@@ -166,9 +162,9 @@ struct BaseSet {
 template <class Tbase_set>
 class BaseMedia : FileScanner {
 protected:
-	static inline Tbase_set *available_sets = nullptr; ///< All available sets
-	static inline Tbase_set *duplicate_sets = nullptr; ///< All sets that aren't available, but needed for not downloading base sets when a newer version than the one on BaNaNaS is loaded.
-	static inline const Tbase_set *used_set = nullptr; ///< The currently used set
+	static inline std::vector<std::unique_ptr<Tbase_set>> available_sets; ///< All available sets
+	static inline std::vector<std::unique_ptr<Tbase_set>> duplicate_sets; ///< All sets that aren't available, but needed for not downloading base sets when a newer version than the one on BaNaNaS is loaded.
+	static inline const Tbase_set *used_set; ///< The currently used set
 
 	bool AddFile(const std::string &filename, size_t basepath_length, const std::string &tar_filename) override;
 
@@ -176,7 +172,13 @@ protected:
 	 * Get the extension that is used to identify this set.
 	 * @return the extension
 	 */
-	static const char *GetExtension();
+	static std::string_view GetExtension();
+
+	/**
+	 * Return the duplicate sets.
+	 * @return The duplicate sets.
+	 */
+	 static std::span<const std::unique_ptr<Tbase_set>> GetDuplicateSets() { return BaseMedia<Tbase_set>::duplicate_sets; }
 public:
 	/**
 	 * Determine the graphics pack that has to be used.
@@ -194,7 +196,11 @@ public:
 		return num + fs.Scan(GetExtension(), BASESET_DIR, Tbase_set::SEARCH_IN_TARS);
 	}
 
-	static Tbase_set *GetAvailableSets();
+	/**
+	 * Return the available sets.
+	 * @return The available sets.
+	 */
+	static std::span<const std::unique_ptr<Tbase_set>> GetAvailableSets() { return BaseMedia<Tbase_set>::available_sets; }
 
 	static bool SetSet(const Tbase_set *set);
 	static bool SetSetByName(const std::string &name);
@@ -211,7 +217,7 @@ public:
 	 * @param md5sum whether to check the MD5 checksum
 	 * @return true iff we have an set matching.
 	 */
-	static bool HasSet(const ContentInfo *ci, bool md5sum);
+	static bool HasSet(const ContentInfo &ci, bool md5sum);
 };
 
 /**
@@ -219,9 +225,9 @@ public:
  * @param ci The content info to compare it to.
  * @param md5sum Should the MD5 checksum be tested as well?
  * @param s The list with sets.
- * @return The filename of the first file of the base set, or \c nullptr if there is no match.
+ * @return The filename of the first file of the base set, or \c std::nullopt if there is no match.
  */
 template <class Tbase_set>
-const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s);
+std::optional<std::string_view> TryGetBaseSetFile(const ContentInfo &ci, bool md5sum, std::span<const std::unique_ptr<Tbase_set>> sets);
 
 #endif /* BASE_MEDIA_BASE_H */
diff --git a/src/base_media_func.h b/src/base_media_func.h
index 4e32a12e94..8f1fac4c26 100644
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -14,20 +14,39 @@
 #include "ini_type.h"
 #include "string_func.h"
 #include "error_func.h"
+#include "core/string_consumer.hpp"
+#include "3rdparty/fmt/ranges.h"
 
 extern void CheckExternalFiles();
 
 /**
- * Try to read a single piece of metadata and return false if it doesn't exist.
+ * Log error from reading basesets.
+ * @param full_filename the full filename of the loaded file
+ * @param detail detail log message
+ * @param level debug level
+ */
+template <class T>
+void BaseSet<T>::LogError(std::string_view full_filename, std::string_view detail, int level) const
+{
+	Debug(misc, level, "Loading base {}set details failed: {}", BaseSet<T>::SET_TYPE, full_filename);
+	Debug(misc, level, "  {}", detail);
+}
+
+/**
+ * Try to read a single piece of metadata and return nullptr if it doesn't exist.
+ * Log error, if the data is missing.
+ * @param full_filename the full filename of the loaded file (for error reporting purposes)
+ * @param group ini group to read from
  * @param name the name of the item to fetch.
  */
-#define fetch_metadata(name) \
-	item = metadata->GetItem(name); \
-	if (item == nullptr || !item->value.has_value() || item->value->empty()) { \
-		Debug(grf, 0, "Base {}set detail loading: {} field missing.", BaseSet::SET_TYPE, name); \
-		Debug(grf, 0, "  Is {} readable for the user running OpenTTD?", full_filename); \
-		return false; \
-	}
+template <class T>
+const IniItem *BaseSet<T>::GetMandatoryItem(std::string_view full_filename, const IniGroup &group, std::string_view name) const
+{
+	auto *item = group.GetItem(name);
+	if (item != nullptr && item->value.has_value() && !item->value->empty()) return item;
+	this->LogError(full_filename, fmt::format("{}.{} field missing.", group.name, name));
+	return nullptr;
+}
 
 /**
  * Read the set information from a loaded ini.
@@ -42,16 +61,17 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 {
 	const IniGroup *metadata = ini.GetGroup("metadata");
 	if (metadata == nullptr) {
-		Debug(grf, 0, "Base {}set detail loading: metadata missing.", BaseSet<T>::SET_TYPE);
-		Debug(grf, 0, "  Is {} readable for the user running OpenTTD?", full_filename);
+		this->LogError(full_filename, "Is the file readable for the user running OpenTTD?");
 		return false;
 	}
 	const IniItem *item;
 
-	fetch_metadata("name");
+	item = this->GetMandatoryItem(full_filename, *metadata, "name");
+	if (item == nullptr) return false;
 	this->name = *item->value;
 
-	fetch_metadata("description");
+	item = this->GetMandatoryItem(full_filename, *metadata, "description");
+	if (item == nullptr) return false;
 	this->description[std::string{}] = *item->value;
 
 	item = metadata->GetItem("url");
@@ -64,13 +84,24 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 		this->description[titem.name.substr(12)] = titem.value.value_or("");
 	}
 
-	fetch_metadata("shortname");
+	item = this->GetMandatoryItem(full_filename, *metadata, "shortname");
+	if (item == nullptr) return false;
 	for (uint i = 0; (*item->value)[i] != '\0' && i < 4; i++) {
 		this->shortname |= ((uint8_t)(*item->value)[i]) << (i * 8);
 	}
 
-	fetch_metadata("version");
-	this->version = atoi(item->value->c_str());
+	item = this->GetMandatoryItem(full_filename, *metadata, "version");
+	if (item == nullptr) return false;
+	for (StringConsumer consumer{*item->value};;) {
+		auto value = consumer.TryReadIntegerBase<uint32_t>(10);
+		bool valid = value.has_value();
+		if (valid) this->version.push_back(*value);
+		if (valid && !consumer.AnyBytesLeft()) break;
+		if (!valid || !consumer.ReadIf(".")) {
+			this->LogError(full_filename, fmt::format("metadata.version field is invalid: {}", *item->value));
+			return false;
+		}
+	}
 
 	item = metadata->GetItem("fallback");
 	this->fallback = (item != nullptr && item->value && *item->value != "0" && *item->value != "false");
@@ -80,13 +111,18 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 	const IniGroup *md5s   = ini.GetGroup("md5s");
 	const IniGroup *origin = ini.GetGroup("origin");
 	auto file_names = BaseSet<T>::GetFilenames();
+	bool original_set =
+		std::byteswap(this->shortname) == 'TTDD' || // TTD DOS graphics, TTD DOS music
+		std::byteswap(this->shortname) == 'TTDW' || // TTD WIN graphics, TTD WIN music
+		std::byteswap(this->shortname) == 'TTDO' || // TTD sound
+		std::byteswap(this->shortname) == 'TTOD'; // TTO music
 
 	for (uint i = 0; i < BaseSet<T>::NUM_FILES; i++) {
 		MD5File *file = &this->files[i];
 		/* Find the filename first. */
 		item = files != nullptr ? files->GetItem(file_names[i]) : nullptr;
 		if (item == nullptr || (!item->value.has_value() && !allow_empty_filename)) {
-			Debug(grf, 0, "No {} file for: {} (in {})", BaseSet<T>::SET_TYPE, file_names[i], full_filename);
+			this->LogError(full_filename, fmt::format("files.{} field missing", file_names[i]));
 			return false;
 		}
 
@@ -104,34 +140,19 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 		/* Then find the MD5 checksum */
 		item = md5s != nullptr ? md5s->GetItem(filename) : nullptr;
 		if (item == nullptr || !item->value.has_value()) {
-			Debug(grf, 0, "No MD5 checksum specified for: {} (in {})", filename, full_filename);
+			this->LogError(full_filename, fmt::format("md5s.{} field missing", filename));
 			return false;
 		}
-		const char *c = item->value->c_str();
-		for (size_t i = 0; i < file->hash.size() * 2; i++, c++) {
-			uint j;
-			if ('0' <= *c && *c <= '9') {
-				j = *c - '0';
-			} else if ('a' <= *c && *c <= 'f') {
-				j = *c - 'a' + 10;
-			} else if ('A' <= *c && *c <= 'F') {
-				j = *c - 'A' + 10;
-			} else {
-				Debug(grf, 0, "Malformed MD5 checksum specified for: {} (in {})", filename, full_filename);
-				return false;
-			}
-			if (i % 2 == 0) {
-				file->hash[i / 2] = j << 4;
-			} else {
-				file->hash[i / 2] |= j;
-			}
+		if (!ConvertHexToBytes(*item->value, file->hash)) {
+			this->LogError(full_filename, fmt::format("md5s.{} is malformed: {}", filename, *item->value));
+			return false;
 		}
 
 		/* Then find the warning message when the file's missing */
 		item = origin != nullptr ? origin->GetItem(filename) : nullptr;
 		if (item == nullptr) item = origin != nullptr ? origin->GetItem("default") : nullptr;
 		if (item == nullptr || !item->value.has_value()) {
-			Debug(grf, 1, "No origin warning message specified for: {}", filename);
+			this->LogError(full_filename, fmt::format("origin.{} field missing", filename), 1);
 			file->missing_warning.clear();
 		} else {
 			file->missing_warning = item->value.value();
@@ -148,12 +169,14 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 				break;
 
 			case MD5File::CR_MISMATCH:
-				Debug(grf, 1, "MD5 checksum mismatch for: {} (in {})", filename, full_filename);
+				/* This is normal for original sample.cat, which either matches with orig_dos or orig_win. */
+				this->LogError(full_filename, fmt::format("MD5 checksum mismatch for: {}", filename), original_set ? 1 : 0);
 				this->found_files++;
 				break;
 
 			case MD5File::CR_NO_FILE:
-				Debug(grf, 1, "The file {} specified in {} is missing", filename, full_filename);
+				/* Missing files is normal for the original basesets. Use lower debug level */
+				this->LogError(full_filename, fmt::format("File is missing: {}", filename), original_set ? 1 : 0);
 				break;
 		}
 	}
@@ -164,10 +187,9 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 template <class Tbase_set>
 bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_length, const std::string &)
 {
-	bool ret = false;
-	Debug(grf, 1, "Checking {} for base {} set", filename, BaseSet<Tbase_set>::SET_TYPE);
+	Debug(misc, 1, "Checking {} for base {} set", filename, BaseSet<Tbase_set>::SET_TYPE);
 
-	Tbase_set *set = new Tbase_set();
+	auto set = std::make_unique<Tbase_set>();
 	IniFile ini{};
 	std::string path{ filename, basepath_length };
 	ini.LoadFromDisk(path, BASESET_DIR);
@@ -179,60 +201,44 @@ bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_
 		path.clear();
 	}
 
-	if (set->FillSetDetails(ini, path, filename)) {
-		Tbase_set *duplicate = nullptr;
-		for (Tbase_set *c = BaseMedia<Tbase_set>::available_sets; c != nullptr; c = c->next) {
-			if (c->name == set->name || c->shortname == set->shortname) {
-				duplicate = c;
-				break;
-			}
+	if (!set->FillSetDetails(ini, path, filename)) return false;
+
+	auto existing = std::ranges::find_if(BaseMedia<Tbase_set>::available_sets, [&set](const auto &c) { return c->name == set->name || c->shortname == set->shortname; });
+	if (existing != std::end(BaseMedia<Tbase_set>::available_sets)) {
+		/* The more complete set takes precedence over the version number. */
+		if (((*existing)->valid_files == set->valid_files && (*existing)->version >= set->version) ||
+				(*existing)->valid_files > set->valid_files) {
+
+			Debug(misc, 1, "Not adding {} ({}) as base {} set (duplicate, {})", set->name, fmt::join(set->version, "."),
+					BaseSet<Tbase_set>::SET_TYPE,
+					(*existing)->valid_files > set->valid_files ? "fewer valid files" : "lower version");
+
+			duplicate_sets.push_back(std::move(set));
+			return false;
 		}
-		if (duplicate != nullptr) {
-			/* The more complete set takes precedence over the version number. */
-			if ((duplicate->valid_files == set->valid_files && duplicate->version >= set->version) ||
-					duplicate->valid_files > set->valid_files) {
-				Debug(grf, 1, "Not adding {} ({}) as base {} set (duplicate, {})", set->name, set->version,
-						BaseSet<Tbase_set>::SET_TYPE,
-						duplicate->valid_files > set->valid_files ? "less valid files" : "lower version");
-				set->next = BaseMedia<Tbase_set>::duplicate_sets;
-				BaseMedia<Tbase_set>::duplicate_sets = set;
-			} else {
-				Tbase_set **prev = &BaseMedia<Tbase_set>::available_sets;
-				while (*prev != duplicate) prev = &(*prev)->next;
 
-				*prev = set;
-				set->next = duplicate->next;
+		/* If the duplicate set is currently used (due to rescanning this can happen)
+		 * update the currently used set to the new one. This will 'lie' about the
+		 * version number until a new game is started which isn't a big problem */
+		if (BaseMedia<Tbase_set>::used_set == existing->get()) BaseMedia<Tbase_set>::used_set = set.get();
 
-				/* Keep baseset configuration, if compatible */
-				set->CopyCompatibleConfig(*duplicate);
+		/* Keep baseset configuration, if compatible */
+		set->CopyCompatibleConfig(**existing);
 
-				/* If the duplicate set is currently used (due to rescanning this can happen)
-				 * update the currently used set to the new one. This will 'lie' about the
-				 * version number until a new game is started which isn't a big problem */
-				if (BaseMedia<Tbase_set>::used_set == duplicate) BaseMedia<Tbase_set>::used_set = set;
+		Debug(misc, 1, "Removing {} ({}) as base {} set (duplicate, {})", (*existing)->name, fmt::join((*existing)->version, "."), BaseSet<Tbase_set>::SET_TYPE,
+				(*existing)->valid_files < set->valid_files ? "fewer valid files" : "lower version");
 
-				Debug(grf, 1, "Removing {} ({}) as base {} set (duplicate, {})", duplicate->name, duplicate->version,
-						BaseSet<Tbase_set>::SET_TYPE,
-						duplicate->valid_files < set->valid_files ? "less valid files" : "lower version");
-				duplicate->next = BaseMedia<Tbase_set>::duplicate_sets;
-				BaseMedia<Tbase_set>::duplicate_sets = duplicate;
-				ret = true;
-			}
-		} else {
-			Tbase_set **last = &BaseMedia<Tbase_set>::available_sets;
-			while (*last != nullptr) last = &(*last)->next;
+		/* Existing set is worse, move it to duplicates and replace with the current set. */
+		duplicate_sets.push_back(std::move(*existing));
 
-			*last = set;
-			ret = true;
-		}
-		if (ret) {
-			Debug(grf, 1, "Adding {} ({}) as base {} set", set->name, set->version, BaseSet<Tbase_set>::SET_TYPE);
-		}
+		Debug(misc, 1, "Adding {} ({}) as base {} set", set->name, fmt::join(set->version, "."), BaseSet<Tbase_set>::SET_TYPE);
+		*existing = std::move(set);
 	} else {
-		delete set;
+		Debug(grf, 1, "Adding {} ({}) as base {} set", set->name, set->version, BaseSet<Tbase_set>::SET_TYPE);
+		available_sets.push_back(std::move(set));
 	}
 
-	return ret;
+	return true;
 }
 
 /**
@@ -264,9 +270,9 @@ template <class Tbase_set>
 		return SetSet(nullptr);
 	}
 
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
 		if (name == s->name) {
-			return SetSet(s);
+			return SetSet(s.get());
 		}
 	}
 	return false;
@@ -284,9 +290,9 @@ template <class Tbase_set>
 		return SetSet(nullptr);
 	}
 
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
 		if (shortname == s->shortname) {
-			return SetSet(s);
+			return SetSet(s.get());
 		}
 	}
 	return false;
@@ -300,7 +306,7 @@ template <class Tbase_set>
 /* static */ void BaseMedia<Tbase_set>::GetSetsList(std::back_insert_iterator<std::string> &output_iterator)
 {
 	fmt::format_to(output_iterator, "List of {} sets:\n", BaseSet<Tbase_set>::SET_TYPE);
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
 		fmt::format_to(output_iterator, "{:>18}: {}", s->name, s->GetDescription({}));
 		int invalid = s->GetNumInvalid();
 		if (invalid != 0) {
@@ -319,28 +325,28 @@ template <class Tbase_set>
 
 #include "network/core/tcp_content_type.h"
 
-template <class Tbase_set> const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s)
+template <class Tbase_set> std::optional<std::string_view> TryGetBaseSetFile(const ContentInfo &ci, bool md5sum, std::span<const std::unique_ptr<Tbase_set>> sets)
 {
-	for (; s != nullptr; s = s->next) {
+	for (const auto &s : sets) {
 		if (s->GetNumMissing() != 0) continue;
 
-		if (s->shortname != ci->unique_id) continue;
-		if (!md5sum) return s->files[0].filename.c_str();
+		if (s->shortname != ci.unique_id) continue;
+		if (!md5sum) return s->files[0].filename;
 
 		MD5Hash md5;
 		for (const auto &file : s->files) {
 			md5 ^= file.hash;
 		}
-		if (md5 == ci->md5sum) return s->files[0].filename.c_str();
+		if (md5 == ci.md5sum) return s->files[0].filename;
 	}
-	return nullptr;
+	return std::nullopt;
 }
 
 template <class Tbase_set>
-/* static */ bool BaseMedia<Tbase_set>::HasSet(const ContentInfo *ci, bool md5sum)
+/* static */ bool BaseMedia<Tbase_set>::HasSet(const ContentInfo &ci, bool md5sum)
 {
-	return (TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::available_sets) != nullptr) ||
-			(TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::duplicate_sets) != nullptr);
+	return TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::GetAvailableSets()).has_value() ||
+			TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::GetDuplicateSets()).has_value();
 }
 
 /**
@@ -350,12 +356,9 @@ template <class Tbase_set>
 template <class Tbase_set>
 /* static */ int BaseMedia<Tbase_set>::GetNumSets()
 {
-	int n = 0;
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
-		if (s != BaseMedia<Tbase_set>::used_set && s->GetNumMissing() != 0) continue;
-		n++;
-	}
-	return n;
+	return std::ranges::count_if(BaseMedia<Tbase_set>::GetAvailableSets(), [](const auto &set) {
+		return set.get() == BaseMedia<Tbase_set>::used_set || set->GetNumMissing() == 0;
+	});
 }
 
 /**
@@ -366,8 +369,8 @@ template <class Tbase_set>
 /* static */ int BaseMedia<Tbase_set>::GetIndexOfUsedSet()
 {
 	int n = 0;
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
-		if (s == BaseMedia<Tbase_set>::used_set) return n;
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
+		if (s.get() == BaseMedia<Tbase_set>::used_set) return n;
 		if (s->GetNumMissing() != 0) continue;
 		n++;
 	}
@@ -381,9 +384,9 @@ template <class Tbase_set>
 template <class Tbase_set>
 /* static */ const Tbase_set *BaseMedia<Tbase_set>::GetSet(int index)
 {
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
-		if (s != BaseMedia<Tbase_set>::used_set && s->GetNumMissing() != 0) continue;
-		if (index == 0) return s;
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
+		if (s.get() != BaseMedia<Tbase_set>::used_set && s->GetNumMissing() != 0) continue;
+		if (index == 0) return s.get();
 		index--;
 	}
 	FatalError("Base{}::GetSet(): index {} out of range", BaseSet<Tbase_set>::SET_TYPE, index);
@@ -398,13 +401,3 @@ template <class Tbase_set>
 {
 	return BaseMedia<Tbase_set>::used_set;
 }
-
-/**
- * Return the available sets.
- * @return The available sets.
- */
-template <class Tbase_set>
-/* static */ Tbase_set *BaseMedia<Tbase_set>::GetAvailableSets()
-{
-	return BaseMedia<Tbase_set>::available_sets;
-}
diff --git a/src/base_station_base.h b/src/base_station_base.h
index dd6d3a5976..fd493d7853 100644
--- a/src/base_station_base.h
+++ b/src/base_station_base.h
@@ -74,9 +74,9 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
 	TimerGameCalendar::Date build_date{}; ///< Date of construction
 
 	uint16_t random_bits = 0; ///< Random bits assigned to this station
-	uint8_t waiting_triggers = 0; ///< Waiting triggers (NewGRF) for this station
-	uint8_t cached_anim_triggers = 0; ///< NOSAVE: Combined animation trigger bitmask, used to determine if trigger processing should happen.
-	uint8_t cached_roadstop_anim_triggers = 0; ///< NOSAVE: Combined animation trigger bitmask for road stops, used to determine if trigger processing should happen.
+	StationRandomTriggers waiting_random_triggers; ///< Waiting triggers (NewGRF), shared by all station parts/tiles, road stops, ... essentially useless and broken by design.
+	StationAnimationTriggers cached_anim_triggers; ///< NOSAVE: Combined animation trigger bitmask, used to determine if trigger processing should happen.
+	StationAnimationTriggers cached_roadstop_anim_triggers; ///< NOSAVE: Combined animation trigger bitmask for road stops, used to determine if trigger processing should happen.
 	CargoTypes cached_cargo_triggers{}; ///< NOSAVE: Combined cargo trigger bitmask
 	CargoTypes cached_roadstop_cargo_triggers{}; ///< NOSAVE: Combined cargo trigger bitmask for road stops
 
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index 6635d34d0f..5006305789 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -25,8 +25,8 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 {
 	const SpriteData *src = (const SpriteData *)bp->sprite;
 
-	const Colour *src_px = (const Colour *)(src->data + src->offset[zoom][0]);
-	const uint16_t *src_n  = (const uint16_t *)(src->data + src->offset[zoom][1]);
+	const Colour *src_px = reinterpret_cast<const Colour *>(src->data + src->offset[0][zoom]);
+	const uint16_t *src_n = reinterpret_cast<const uint16_t *>(src->data + src->offset[1][zoom]);
 
 	for (uint i = bp->skip_top; i != 0; i--) {
 		src_px = (const Colour *)((const uint8_t *)src_px + *(const uint32_t *)src_px);
@@ -389,11 +389,11 @@ void Blitter_32bppAnim::CopyFromBuffer(void *video, const void *src, int width,
 		Colour *dst_pal = dst;
 		uint16_t *anim_pal = anim_line;
 
-		memcpy(static_cast<void *>(dst), usrc, width * sizeof(uint32_t));
+		std::copy_n(usrc, width, reinterpret_cast<uint32_t *>(dst));
 		usrc += width;
 		dst += _screen.pitch;
 		/* Copy back the anim-buffer */
-		memcpy(anim_line, usrc, width * sizeof(uint16_t));
+		std::copy_n(reinterpret_cast<const uint16_t *>(usrc), width, anim_line);
 		usrc = (const uint32_t *)&((const uint16_t *)usrc)[width];
 		anim_line += this->anim_buf_pitch;
 
@@ -428,11 +428,11 @@ void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
 	const uint16_t *anim_line = this->ScreenToAnimOffset((const uint32_t *)video) + this->anim_buf;
 
 	for (; height > 0; height--) {
-		memcpy(udst, src, width * sizeof(uint32_t));
+		std::copy_n(src, width, udst);
 		src += _screen.pitch;
 		udst += width;
 		/* Copy the anim-buffer */
-		memcpy(udst, anim_line, width * sizeof(uint16_t));
+		std::copy_n(anim_line, width, reinterpret_cast<uint16_t *>(udst));
 		udst = (uint32_t *)&((uint16_t *)udst)[width];
 		anim_line += this->anim_buf_pitch;
 	}
@@ -458,11 +458,7 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 
 		uint tw = width + (scroll_x >= 0 ? -scroll_x : scroll_x);
 		uint th = height - scroll_y;
-		for (; th > 0; th--) {
-			memcpy(dst, src, tw * sizeof(uint16_t));
-			src -= this->anim_buf_pitch;
-			dst -= this->anim_buf_pitch;
-		}
+		Blitter::MovePixels(src, dst, tw, th, -this->anim_buf_pitch);
 	} else {
 		/* Calculate pointers */
 		dst = this->anim_buf + left + top * this->anim_buf_pitch;
@@ -475,15 +471,9 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 			src -= scroll_x;
 		}
 
-		/* the y-displacement may be 0 therefore we have to use memmove,
-		 * because source and destination may overlap */
 		uint tw = width + (scroll_x >= 0 ? -scroll_x : scroll_x);
 		uint th = height + scroll_y;
-		for (; th > 0; th--) {
-			memmove(dst, src, tw * sizeof(uint16_t));
-			src += this->anim_buf_pitch;
-			dst += this->anim_buf_pitch;
-		}
+		Blitter::MovePixels(src, dst, tw, th, this->anim_buf_pitch);
 	}
 
 	Blitter_32bppBase::ScrollBuffer(video, left, top, width, height, scroll_x, scroll_y);
diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp
index 37da12f71c..4ed29b33c1 100644
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/src/blitter/32bpp_anim_sse4.cpp
@@ -190,8 +190,8 @@ bmno_full_transparency:
 					const uint m1 = (uint8_t) (mvX2 >> 16);
 					const uint r1 = remap[m1];
 					if (mvX2 & 0x00FF00FF) {
+						/* Written so the compiler uses CMOV. */
 						#define CMOV_REMAP(m_colour, m_colour_init, m_src, m_m) \
-							/* Written so the compiler uses CMOV. */ \
 							Colour m_colour = m_colour_init; \
 							{ \
 							const Colour srcm = (Colour) (m_src); \
diff --git a/src/blitter/32bpp_anim_sse4.hpp b/src/blitter/32bpp_anim_sse4.hpp
index cad4295a9b..c325fb806c 100644
--- a/src/blitter/32bpp_anim_sse4.hpp
+++ b/src/blitter/32bpp_anim_sse4.hpp
@@ -39,8 +39,10 @@ public:
 	template <BlitterMode mode, Blitter_32bppSSE_Base::ReadMode read_mode, Blitter_32bppSSE_Base::BlockType bt_last, bool translucent, bool animated>
 	void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
 	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override {
-		return Blitter_32bppSSE_Base::Encode(sprite, allocator);
+
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override
+	{
+		return Blitter_32bppSSE_Base::Encode(sprite_type, sprite, allocator);
 	}
 	std::string_view GetName() override { return "32bpp-sse4-anim"; }
 	using Blitter_32bppSSE2_Anim::LookupColourInPalette;
diff --git a/src/blitter/32bpp_base.cpp b/src/blitter/32bpp_base.cpp
index 58acafc35a..5c25d4185f 100644
--- a/src/blitter/32bpp_base.cpp
+++ b/src/blitter/32bpp_base.cpp
@@ -51,7 +51,7 @@ void Blitter_32bppBase::CopyFromBuffer(void *video, const void *src, int width,
 	const uint32_t *usrc = (const uint32_t *)src;
 
 	for (; height > 0; height--) {
-		memcpy(dst, usrc, width * sizeof(uint32_t));
+		std::copy_n(usrc, width, dst);
 		usrc += width;
 		dst += _screen.pitch;
 	}
@@ -63,7 +63,7 @@ void Blitter_32bppBase::CopyToBuffer(const void *video, void *dst, int width, in
 	const uint32_t *src = (const uint32_t *)video;
 
 	for (; height > 0; height--) {
-		memcpy(udst, src, width * sizeof(uint32_t));
+		std::copy_n(src, width, udst);
 		src += _screen.pitch;
 		udst += width;
 	}
@@ -75,7 +75,7 @@ void Blitter_32bppBase::CopyImageToBuffer(const void *video, void *dst, int widt
 	const uint32_t *src = (const uint32_t *)video;
 
 	for (; height > 0; height--) {
-		memcpy(udst, src, width * sizeof(uint32_t));
+		std::copy_n(src, width, udst);
 		src += _screen.pitch;
 		udst += dst_pitch;
 	}
@@ -106,11 +106,7 @@ void Blitter_32bppBase::ScrollBuffer(void *video, int &left, int &top, int &widt
 			width += scroll_x;
 		}
 
-		for (int h = height; h > 0; h--) {
-			memcpy(dst, src, width * sizeof(uint32_t));
-			src -= _screen.pitch;
-			dst -= _screen.pitch;
-		}
+		Blitter::MovePixels(src, dst, width, height, -_screen.pitch);
 	} else {
 		/* Calculate pointers */
 		dst = (uint32_t *)video + left + top * _screen.pitch;
@@ -130,13 +126,7 @@ void Blitter_32bppBase::ScrollBuffer(void *video, int &left, int &top, int &widt
 			width += scroll_x;
 		}
 
-		/* the y-displacement may be 0 therefore we have to use memmove,
-		 * because source and destination may overlap */
-		for (int h = height; h > 0; h--) {
-			memmove(dst, src, width * sizeof(uint32_t));
-			src += _screen.pitch;
-			dst += _screen.pitch;
-		}
+		Blitter::MovePixels(src, dst, width, height, _screen.pitch);
 	}
 }
 
diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp
index eebdece030..7667597636 100644
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -32,11 +32,11 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
 
 	/* src_px : each line begins with uint32_t n = 'number of bytes in this line',
 	 *          then n times is the Colour struct for this line */
-	const Colour *src_px = (const Colour *)(src->data + src->offset[zoom][0]);
+	const Colour *src_px = reinterpret_cast<const Colour *>(src->data + src->offset[0][zoom]);
 	/* src_n  : each line begins with uint32_t n = 'number of bytes in this line',
 	 *          then interleaved stream of 'm' and 'n' channels. 'm' is remap,
 	 *          'n' is number of bytes with the same alpha channel class */
-	const uint16_t *src_n  = (const uint16_t *)(src->data + src->offset[zoom][1]);
+	const uint16_t *src_n = reinterpret_cast<const uint16_t *>(src->data + src->offset[1][zoom]);
 
 	/* skip upper lines in src_px and src_n */
 	for (uint i = bp->skip_top; i != 0; i--) {
@@ -285,12 +285,13 @@ void Blitter_32bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode,
 	this->Draw<false>(bp, mode, zoom);
 }
 
-template <bool Tpal_to_rgb> Sprite *Blitter_32bppOptimized::EncodeInternal(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+template <bool Tpal_to_rgb>
+Sprite *Blitter_32bppOptimized::EncodeInternal(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
 	/* streams of pixels (a, r, g, b channels)
 	 *
 	 * stored in separated stream so data are always aligned on 4B boundary */
-	std::array<std::unique_ptr<Colour[]>, ZOOM_LVL_END> dst_px_orig;
+	SpriteCollMap<std::unique_ptr<Colour[]>> dst_px_orig;
 
 	/* interleaved stream of 'm' channel and 'n' channel
 	 * 'n' is number of following pixels with the same alpha channel class
@@ -298,21 +299,21 @@ template <bool Tpal_to_rgb> Sprite *Blitter_32bppOptimized::EncodeInternal(const
 	 *
 	 * it has to be stored in one stream so fewer registers are used -
 	 * x86 has problems with register allocation even with this solution */
-	std::array<std::unique_ptr<uint16_t[]>, ZOOM_LVL_END> dst_n_orig;
+	SpriteCollMap<std::unique_ptr<uint16_t[]>> dst_n_orig;
 
 	/* lengths of streams */
-	uint32_t lengths[ZOOM_LVL_END][2];
+	SpriteCollMap<uint32_t> lengths[2];
 
 	ZoomLevel zoom_min;
 	ZoomLevel zoom_max;
 
-	if (sprite[ZOOM_LVL_MIN].type == SpriteType::Font) {
-		zoom_min = ZOOM_LVL_MIN;
-		zoom_max = ZOOM_LVL_MIN;
+	if (sprite_type == SpriteType::Font) {
+		zoom_min = ZoomLevel::Min;
+		zoom_max = ZoomLevel::Min;
 	} else {
 		zoom_min = _settings_client.gui.zoom_min;
 		zoom_max = _settings_client.gui.zoom_max;
-		if (zoom_max == zoom_min) zoom_max = ZOOM_LVL_MAX;
+		if (zoom_max == zoom_min) zoom_max = ZoomLevel::Max;
 	}
 
 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
@@ -405,40 +406,43 @@ template <bool Tpal_to_rgb> Sprite *Blitter_32bppOptimized::EncodeInternal(const
 			dst_n_ln =  (uint32_t *)dst_n;
 		}
 
-		lengths[z][0] = reinterpret_cast<uint8_t *>(dst_px_ln) - reinterpret_cast<uint8_t *>(dst_px_orig[z].get()); // all are aligned to 4B boundary
-		lengths[z][1] = reinterpret_cast<uint8_t *>(dst_n_ln)  - reinterpret_cast<uint8_t *>(dst_n_orig[z].get());
+		lengths[0][z] = reinterpret_cast<uint8_t *>(dst_px_ln) - reinterpret_cast<uint8_t *>(dst_px_orig[z].get()); // all are aligned to 4B boundary
+		lengths[1][z] = reinterpret_cast<uint8_t *>(dst_n_ln) - reinterpret_cast<uint8_t *>(dst_n_orig[z].get());
 	}
 
 	uint len = 0; // total length of data
 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
-		len += lengths[z][0] + lengths[z][1];
+		len += lengths[0][z] + lengths[1][z];
 	}
 
 	Sprite *dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite) + sizeof(SpriteData) + len);
 
-	dest_sprite->height = sprite[ZOOM_LVL_MIN].height;
-	dest_sprite->width  = sprite[ZOOM_LVL_MIN].width;
-	dest_sprite->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-	dest_sprite->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
+	const auto &root_sprite = sprite.Root();
+	dest_sprite->height = root_sprite.height;
+	dest_sprite->width = root_sprite.width;
+	dest_sprite->x_offs = root_sprite.x_offs;
+	dest_sprite->y_offs = root_sprite.y_offs;
 
 	SpriteData *dst = (SpriteData *)dest_sprite->data;
-	memset(dst, 0, sizeof(*dst));
 
+	uint32_t offset = 0;
 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
-		dst->offset[z][0] = z == zoom_min ? 0 : lengths[z - 1][1] + dst->offset[z - 1][1];
-		dst->offset[z][1] = lengths[z][0] + dst->offset[z][0];
+		dst->offset[0][z] = offset;
+		offset += lengths[0][z];
+		dst->offset[1][z] = offset;
+		offset += lengths[1][z];
 
-		memcpy(dst->data + dst->offset[z][0], dst_px_orig[z].get(), lengths[z][0]);
-		memcpy(dst->data + dst->offset[z][1], dst_n_orig[z].get(),  lengths[z][1]);
+		std::copy_n(reinterpret_cast<uint8_t *>(dst_px_orig[z].get()), lengths[0][z], dst->data + dst->offset[0][z]);
+		std::copy_n(reinterpret_cast<uint8_t *>(dst_n_orig[z].get()), lengths[1][z], dst->data + dst->offset[1][z]);
 	}
 
 	return dest_sprite;
 }
 
-template Sprite *Blitter_32bppOptimized::EncodeInternal<true>(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
-template Sprite *Blitter_32bppOptimized::EncodeInternal<false>(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
+template Sprite *Blitter_32bppOptimized::EncodeInternal<true>(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
+template Sprite *Blitter_32bppOptimized::EncodeInternal<false>(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
 
-Sprite *Blitter_32bppOptimized::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_32bppOptimized::Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
-	return this->EncodeInternal<true>(sprite, allocator);
+	return this->EncodeInternal<true>(sprite_type, sprite, allocator);
 }
diff --git a/src/blitter/32bpp_optimized.hpp b/src/blitter/32bpp_optimized.hpp
index ccd7d9ac2e..c1a8a37cd2 100644
--- a/src/blitter/32bpp_optimized.hpp
+++ b/src/blitter/32bpp_optimized.hpp
@@ -17,12 +17,12 @@ class Blitter_32bppOptimized : public Blitter_32bppSimple {
 public:
 	/** Data stored about a (single) sprite. */
 	struct SpriteData {
-		uint32_t offset[ZOOM_LVL_END][2]; ///< Offsets (from .data) to streams for different zoom levels, and the normal and remap image information.
+		SpriteCollMap<uint32_t> offset[2]; ///< Offsets (from .data) to streams for different zoom levels, and the normal and remap image information.
 		uint8_t data[];                      ///< Data, all zoomlevels.
 	};
 
 	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 
 	std::string_view GetName() override { return "32bpp-optimized"; }
 
@@ -30,7 +30,7 @@ public:
 
 protected:
 	template <bool Tpal_to_rgb> void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
-	template <bool Tpal_to_rgb> Sprite *EncodeInternal(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
+	template <bool Tpal_to_rgb> Sprite *EncodeInternal(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
 };
 
 /** Factory for the optimised 32 bpp blitter (without palette animation). */
diff --git a/src/blitter/32bpp_simple.cpp b/src/blitter/32bpp_simple.cpp
index e55aadb6dc..d3fe2f98ca 100644
--- a/src/blitter/32bpp_simple.cpp
+++ b/src/blitter/32bpp_simple.cpp
@@ -115,20 +115,21 @@ void Blitter_32bppSimple::DrawColourMappingRect(void *dst, int width, int height
 	Debug(misc, 0, "32bpp blitter doesn't know how to draw this colour table ('{}')", pal);
 }
 
-Sprite *Blitter_32bppSimple::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_32bppSimple::Encode(SpriteType, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
+	const auto &root_sprite = sprite.Root();
 	Blitter_32bppSimple::Pixel *dst;
-	Sprite *dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite) + static_cast<size_t>(sprite[ZOOM_LVL_MIN].height) * static_cast<size_t>(sprite[ZOOM_LVL_MIN].width) * sizeof(*dst));
+	Sprite *dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite) + static_cast<size_t>(root_sprite.height) * static_cast<size_t>(root_sprite.width) * sizeof(*dst));
 
-	dest_sprite->height = sprite[ZOOM_LVL_MIN].height;
-	dest_sprite->width  = sprite[ZOOM_LVL_MIN].width;
-	dest_sprite->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-	dest_sprite->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
+	dest_sprite->height = root_sprite.height;
+	dest_sprite->width = root_sprite.width;
+	dest_sprite->x_offs = root_sprite.x_offs;
+	dest_sprite->y_offs = root_sprite.y_offs;
 
-	dst = (Blitter_32bppSimple::Pixel *)dest_sprite->data;
-	SpriteLoader::CommonPixel *src = (SpriteLoader::CommonPixel *)sprite[ZOOM_LVL_MIN].data;
+	dst = reinterpret_cast<Blitter_32bppSimple::Pixel *>(dest_sprite->data);
+	SpriteLoader::CommonPixel *src = reinterpret_cast<SpriteLoader::CommonPixel *>(root_sprite.data);
 
-	for (int i = 0; i < sprite[ZOOM_LVL_MIN].height * sprite[ZOOM_LVL_MIN].width; i++) {
+	for (int i = 0; i < root_sprite.height * root_sprite.width; i++) {
 		if (src->m == 0) {
 			dst[i].r = src->r;
 			dst[i].g = src->g;
diff --git a/src/blitter/32bpp_simple.hpp b/src/blitter/32bpp_simple.hpp
index cbecf3c44b..4bacba345f 100644
--- a/src/blitter/32bpp_simple.hpp
+++ b/src/blitter/32bpp_simple.hpp
@@ -26,7 +26,7 @@ class Blitter_32bppSimple : public Blitter_32bppBase {
 public:
 	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
 	void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) override;
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 
 	std::string_view GetName() override { return "32bpp-simple"; }
 };
diff --git a/src/blitter/32bpp_sse2.cpp b/src/blitter/32bpp_sse2.cpp
index c0ccb269c3..6fc08ca6cd 100644
--- a/src/blitter/32bpp_sse2.cpp
+++ b/src/blitter/32bpp_sse2.cpp
@@ -20,18 +20,18 @@
 /** Instantiation of the SSE2 32bpp blitter factory. */
 static FBlitter_32bppSSE2 iFBlitter_32bppSSE2;
 
-Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_32bppSSE_Base::Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
 	/* First uint32_t of a line = the number of transparent pixels from the left.
 	 * Second uint32_t of a line = the number of transparent pixels from the right.
 	 * Then all RGBA then all MV.
 	 */
-	ZoomLevel zoom_min = ZOOM_LVL_MIN;
-	ZoomLevel zoom_max = ZOOM_LVL_MIN;
-	if (sprite[ZOOM_LVL_MIN].type != SpriteType::Font) {
+	ZoomLevel zoom_min = ZoomLevel::Min;
+	ZoomLevel zoom_max = ZoomLevel::Min;
+	if (sprite_type != SpriteType::Font) {
 		zoom_min = _settings_client.gui.zoom_min;
 		zoom_max = _settings_client.gui.zoom_max;
-		if (zoom_max == zoom_min) zoom_max = ZOOM_LVL_MAX;
+		if (zoom_max == zoom_min) zoom_max = ZoomLevel::Max;
 	}
 
 	/* Calculate sizes and allocate. */
@@ -39,23 +39,25 @@ Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::SpriteCollection &spri
 	uint all_sprites_size = 0;
 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
 		const SpriteLoader::Sprite *src_sprite = &sprite[z];
-		sd.infos[z].sprite_width = src_sprite->width;
-		sd.infos[z].sprite_offset = all_sprites_size;
-		sd.infos[z].sprite_line_size = sizeof(Colour) * src_sprite->width + sizeof(uint32_t) * META_LENGTH;
+		auto &info = sd.infos[z];
+		info.sprite_width = src_sprite->width;
+		info.sprite_offset = all_sprites_size;
+		info.sprite_line_size = sizeof(Colour) * src_sprite->width + sizeof(uint32_t) * META_LENGTH;
 
-		const uint rgba_size = sd.infos[z].sprite_line_size * src_sprite->height;
-		sd.infos[z].mv_offset = all_sprites_size + rgba_size;
+		const uint rgba_size = info.sprite_line_size * src_sprite->height;
+		info.mv_offset = all_sprites_size + rgba_size;
 
 		const uint mv_size = sizeof(MapValue) * src_sprite->width * src_sprite->height;
 		all_sprites_size += rgba_size + mv_size;
 	}
 
 	Sprite *dst_sprite = allocator.Allocate<Sprite>(sizeof(Sprite) + sizeof(SpriteData) + all_sprites_size);
-	dst_sprite->height = sprite[ZOOM_LVL_MIN].height;
-	dst_sprite->width  = sprite[ZOOM_LVL_MIN].width;
-	dst_sprite->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-	dst_sprite->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
-	memcpy(dst_sprite->data, &sd, sizeof(SpriteData));
+	const auto &root_sprite = sprite.Root();
+	dst_sprite->height = root_sprite.height;
+	dst_sprite->width = root_sprite.width;
+	dst_sprite->x_offs = root_sprite.x_offs;
+	dst_sprite->y_offs = root_sprite.y_offs;
+	std::copy_n(reinterpret_cast<std::byte *>(&sd), sizeof(SpriteData), dst_sprite->data);
 
 	/* Copy colours and determine flags. */
 	bool has_remap = false;
@@ -64,8 +66,9 @@ Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::SpriteCollection &spri
 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
 		const SpriteLoader::Sprite *src_sprite = &sprite[z];
 		const SpriteLoader::CommonPixel *src = (const SpriteLoader::CommonPixel *) src_sprite->data;
-		Colour *dst_rgba_line = (Colour *) &dst_sprite->data[sizeof(SpriteData) + sd.infos[z].sprite_offset];
-		MapValue *dst_mv = (MapValue *) &dst_sprite->data[sizeof(SpriteData) + sd.infos[z].mv_offset];
+		const auto &info = sd.infos[z];
+		Colour *dst_rgba_line = reinterpret_cast<Colour *>(&dst_sprite->data[sizeof(SpriteData) + info.sprite_offset]);
+		MapValue *dst_mv = reinterpret_cast<MapValue *>(&dst_sprite->data[sizeof(SpriteData) + info.mv_offset]);
 		for (uint y = src_sprite->height; y != 0; y--) {
 			Colour *dst_rgba = dst_rgba_line + META_LENGTH;
 			for (uint x = src_sprite->width; x != 0; x--) {
@@ -113,7 +116,7 @@ Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::SpriteCollection &spri
 			(*dst_rgba_line).data = nb_pix_transp;
 
 			Colour *nb_right = dst_rgba_line + 1;
-			dst_rgba_line = (Colour*) ((uint8_t*) dst_rgba_line + sd.infos[z].sprite_line_size);
+			dst_rgba_line = reinterpret_cast<Colour *>(reinterpret_cast<std::byte *>(dst_rgba_line) + info.sprite_line_size);
 
 			/* Count the number of transparent pixels from the right. */
 			dst_rgba = dst_rgba_line - 1;
@@ -132,7 +135,7 @@ Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::SpriteCollection &spri
 	if (has_translucency) sd.flags.Set(SpriteFlag::Translucent);
 	if (!has_remap) sd.flags.Set(SpriteFlag::NoRemap);
 	if (!has_anim) sd.flags.Set(SpriteFlag::NoAnim);
-	memcpy(dst_sprite->data, &sd, sizeof(SpriteData));
+	std::copy_n(reinterpret_cast<std::byte *>(&sd), sizeof(SpriteData), dst_sprite->data);
 
 	return dst_sprite;
 }
diff --git a/src/blitter/32bpp_sse2.hpp b/src/blitter/32bpp_sse2.hpp
index 4d2c1f10bc..383ef41c39 100644
--- a/src/blitter/32bpp_sse2.hpp
+++ b/src/blitter/32bpp_sse2.hpp
@@ -73,11 +73,11 @@ public:
 	};
 	struct SpriteData {
 		SpriteFlags flags{};
-		std::array<SpriteInfo, ZOOM_LVL_END> infos{};
+		SpriteCollMap<SpriteInfo> infos{};
 		uint8_t data[]; ///< Data, all zoomlevels.
 	};
 
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator);
 };
 
 /** The SSE2 32 bpp blitter (without palette animation). */
@@ -87,8 +87,9 @@ public:
 	template <BlitterMode mode, Blitter_32bppSSE_Base::ReadMode read_mode, Blitter_32bppSSE_Base::BlockType bt_last, bool translucent>
 	void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
 
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override {
-		return Blitter_32bppSSE_Base::Encode(sprite, allocator);
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override
+	{
+		return Blitter_32bppSSE_Base::Encode(sprite_type, sprite, allocator);
 	}
 
 	std::string_view GetName() override { return "32bpp-sse2"; }
diff --git a/src/blitter/32bpp_sse_func.hpp b/src/blitter/32bpp_sse_func.hpp
index f931ba3077..bed92686cc 100644
--- a/src/blitter/32bpp_sse_func.hpp
+++ b/src/blitter/32bpp_sse_func.hpp
@@ -309,8 +309,8 @@ inline void Blitter_32bppSSE4::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 
 					/* Remap colours. */
 					if (mvX2 & 0x00FF00FF) {
+						/* Written so the compiler uses CMOV. */
 						#define CMOV_REMAP(m_colour, m_colour_init, m_src, m_m) \
-							/* Written so the compiler uses CMOV. */ \
 							Colour m_colour = m_colour_init; \
 							{ \
 							const Colour srcm = (Colour) (m_src); \
diff --git a/src/blitter/32bpp_sse_type.h b/src/blitter/32bpp_sse_type.h
index c9a05e5c08..78d05e67e3 100644
--- a/src/blitter/32bpp_sse_type.h
+++ b/src/blitter/32bpp_sse_type.h
@@ -28,18 +28,10 @@
 #endif
 
 #define META_LENGTH 2 ///< Number of uint32_t inserted before each line of pixels in a sprite.
-#define MARGIN_NORMAL_THRESHOLD (zoom == ZOOM_LVL_OUT_8X ? 8 : 4) ///< Minimum width to use margins with BlitterMode::Normal.
+#define MARGIN_NORMAL_THRESHOLD (zoom == ZoomLevel::Out8x ? 8 : 4) ///< Minimum width to use margins with BlitterMode::Normal.
 #define MARGIN_REMAP_THRESHOLD 4 ///< Minimum width to use margins with BlitterMode::ColourRemap.
 
-#undef ALIGN
-
-#ifdef _MSC_VER
-	#define ALIGN(n) __declspec(align(n))
-#else
-	#define ALIGN(n) __attribute__ ((aligned (n)))
-#endif
-
-typedef union ALIGN(16) um128i {
+typedef union alignas(16) um128i {
 	__m128i m128i;
 	uint8_t m128i_u8[16];
 	uint16_t m128i_u16[8];
diff --git a/src/blitter/40bpp_anim.cpp b/src/blitter/40bpp_anim.cpp
index 866389644a..7ef8cd4ba8 100644
--- a/src/blitter/40bpp_anim.cpp
+++ b/src/blitter/40bpp_anim.cpp
@@ -96,11 +96,11 @@ inline void Blitter_40bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 
 	/* src_px : each line begins with uint32_t n = 'number of bytes in this line',
 	 *          then n times is the Colour struct for this line */
-	const Colour *src_px = (const Colour *)(src->data + src->offset[zoom][0]);
+	const Colour *src_px = reinterpret_cast<const Colour *>(src->data + src->offset[0][zoom]);
 	/* src_n  : each line begins with uint32_t n = 'number of bytes in this line',
 	 *          then interleaved stream of 'm' and 'n' channels. 'm' is remap,
 	 *          'n' is number of bytes with the same alpha channel class */
-	const uint16_t *src_n  = (const uint16_t *)(src->data + src->offset[zoom][1]);
+	const uint16_t *src_n = reinterpret_cast<const uint16_t *>(src->data + src->offset[1][zoom]);
 
 	/* skip upper lines in src_px and src_n */
 	for (uint i = bp->skip_top; i != 0; i--) {
@@ -377,8 +377,11 @@ void Blitter_40bppAnim::DrawColourMappingRect(void *dst, int width, int height,
 		const uint8_t *remap = GetNonSprite(pal, SpriteType::Recolour) + 1;
 		do {
 			for (int i = 0; i != width; i++) {
-				if (*anim == 0) *udst = MakeGrey(*udst);
-				*anim = remap[*anim];
+				if (*anim == 0) {
+					*udst = MakeGrey(*udst);
+				} else {
+					*anim = remap[*anim];
+				}
 				udst++;
 				anim++;
 			}
@@ -389,7 +392,7 @@ void Blitter_40bppAnim::DrawColourMappingRect(void *dst, int width, int height,
 		const uint8_t *remap = GetNonSprite(pal, SpriteType::Recolour) + 1;
 		do {
 			for (int i = 0; i != width; i++) {
-				*anim = remap[*anim];
+				if (*anim != 0) *anim = remap[*anim];
 				anim++;
 			}
 			anim = anim - width + _screen.pitch;
@@ -397,9 +400,9 @@ void Blitter_40bppAnim::DrawColourMappingRect(void *dst, int width, int height,
 	}
 }
 
-Sprite *Blitter_40bppAnim::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_40bppAnim::Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
-	return this->EncodeInternal<false>(sprite, allocator);
+	return this->EncodeInternal<false>(sprite_type, sprite, allocator);
 }
 
 
@@ -415,11 +418,11 @@ void Blitter_40bppAnim::CopyFromBuffer(void *video, const void *src, int width,
 	uint8_t *anim_line = ((uint32_t *)video - (uint32_t *)_screen.dst_ptr) + anim_buf;
 
 	for (; height > 0; height--) {
-		memcpy(dst, usrc, width * sizeof(uint32_t));
+		std::copy_n(usrc, width, dst);
 		usrc += width;
 		dst += _screen.pitch;
 		/* Copy back the anim-buffer */
-		memcpy(anim_line, usrc, width * sizeof(uint8_t));
+		std::copy_n(reinterpret_cast<const uint8_t *>(usrc), width, anim_line);
 		usrc = (const uint32_t *)((const uint8_t *)usrc + width);
 		anim_line += _screen.pitch;
 	}
@@ -437,11 +440,11 @@ void Blitter_40bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
 	const uint8_t *anim_line = ((const uint32_t *)video - (uint32_t *)_screen.dst_ptr) + anim_buf;
 
 	for (; height > 0; height--) {
-		memcpy(udst, src, width * sizeof(uint32_t));
+		std::copy_n(src, width, udst);
 		src += _screen.pitch;
 		udst += width;
 		/* Copy the anim-buffer */
-		memcpy(udst, anim_line, width * sizeof(uint8_t));
+		std::copy_n(anim_line, width, reinterpret_cast<uint8_t *>(udst));
 		udst = (uint32_t *)((uint8_t *)udst + width);
 		anim_line += _screen.pitch;
 	}
@@ -490,11 +493,7 @@ void Blitter_40bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 
 		uint tw = width + (scroll_x >= 0 ? -scroll_x : scroll_x);
 		uint th = height - scroll_y;
-		for (; th > 0; th--) {
-			memcpy(dst, src, tw * sizeof(uint8_t));
-			src -= _screen.pitch;
-			dst -= _screen.pitch;
-		}
+		Blitter::MovePixels(src, dst, tw, th, -_screen.pitch);
 	} else {
 		/* Calculate pointers */
 		dst = anim_buf + left + top * _screen.pitch;
@@ -507,15 +506,9 @@ void Blitter_40bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 			src -= scroll_x;
 		}
 
-		/* the y-displacement may be 0 therefore we have to use memmove,
-		 * because source and destination may overlap */
 		uint tw = width + (scroll_x >= 0 ? -scroll_x : scroll_x);
 		uint th = height + scroll_y;
-		for (; th > 0; th--) {
-			memmove(dst, src, tw * sizeof(uint8_t));
-			src += _screen.pitch;
-			dst += _screen.pitch;
-		}
+		Blitter::MovePixels(src, dst, tw, th, _screen.pitch);
 	}
 
 	Blitter_32bppBase::ScrollBuffer(video, left, top, width, height, scroll_x, scroll_y);
diff --git a/src/blitter/40bpp_anim.hpp b/src/blitter/40bpp_anim.hpp
index 385a4fe555..66990bae4e 100644
--- a/src/blitter/40bpp_anim.hpp
+++ b/src/blitter/40bpp_anim.hpp
@@ -27,7 +27,7 @@ public:
 	void ScrollBuffer(void *video, int &left, int &top, int &width, int &height, int scroll_x, int scroll_y) override;
 	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
 	void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal) override;
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 	size_t BufferSize(uint width, uint height) override;
 	Blitter::PaletteAnimation UsePaletteAnimation() override;
 	bool NeedsAnimationBuffer() override;
diff --git a/src/blitter/8bpp_base.cpp b/src/blitter/8bpp_base.cpp
index a936138a1a..db4e18b3fe 100644
--- a/src/blitter/8bpp_base.cpp
+++ b/src/blitter/8bpp_base.cpp
@@ -43,9 +43,10 @@ void Blitter_8bppBase::DrawLine(void *video, int x, int y, int x2, int y2, int s
 
 void Blitter_8bppBase::DrawRect(void *video, int width, int height, uint8_t colour)
 {
+	std::byte *p = static_cast<std::byte *>(video);
 	do {
-		memset(video, colour, width);
-		video = (uint8_t *)video + _screen.pitch;
+		std::fill_n(p, width, static_cast<std::byte>(colour));
+		p += _screen.pitch;
 	} while (--height);
 }
 
@@ -55,7 +56,7 @@ void Blitter_8bppBase::CopyFromBuffer(void *video, const void *src, int width, i
 	const uint8_t *usrc = (const uint8_t *)src;
 
 	for (; height > 0; height--) {
-		memcpy(dst, usrc, width * sizeof(uint8_t));
+		std::copy_n(usrc, width, dst);
 		usrc += width;
 		dst += _screen.pitch;
 	}
@@ -67,7 +68,7 @@ void Blitter_8bppBase::CopyToBuffer(const void *video, void *dst, int width, int
 	const uint8_t *src = (const uint8_t *)video;
 
 	for (; height > 0; height--) {
-		memcpy(udst, src, width * sizeof(uint8_t));
+		std::copy_n(src, width, udst);
 		src += _screen.pitch;
 		udst += width;
 	}
@@ -79,7 +80,7 @@ void Blitter_8bppBase::CopyImageToBuffer(const void *video, void *dst, int width
 	const uint8_t *src = (const uint8_t *)video;
 
 	for (; height > 0; height--) {
-		memcpy(udst, src, width * sizeof(uint8_t));
+		std::copy_n(src, width, udst);
 		src += _screen.pitch;
 		udst += dst_pitch;
 	}
@@ -110,11 +111,7 @@ void Blitter_8bppBase::ScrollBuffer(void *video, int &left, int &top, int &width
 			width += scroll_x;
 		}
 
-		for (int h = height; h > 0; h--) {
-			memcpy(dst, src, width * sizeof(uint8_t));
-			src -= _screen.pitch;
-			dst -= _screen.pitch;
-		}
+		Blitter::MovePixels(src, dst, width, height, -_screen.pitch);
 	} else {
 		/* Calculate pointers */
 		dst = (uint8_t *)video + left + top * _screen.pitch;
@@ -134,13 +131,7 @@ void Blitter_8bppBase::ScrollBuffer(void *video, int &left, int &top, int &width
 			width += scroll_x;
 		}
 
-		/* the y-displacement may be 0 therefore we have to use memmove,
-		 * because source and destination may overlap */
-		for (int h = height; h > 0; h--) {
-			memmove(dst, src, width * sizeof(uint8_t));
-			src += _screen.pitch;
-			dst += _screen.pitch;
-		}
+		Blitter::MovePixels(src, dst, width, height, _screen.pitch);
 	}
 }
 
diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp
index 775fad8253..5cc16d975a 100644
--- a/src/blitter/8bpp_optimized.cpp
+++ b/src/blitter/8bpp_optimized.cpp
@@ -11,7 +11,6 @@
 #include "../zoom_func.h"
 #include "../settings_type.h"
 #include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
 #include "8bpp_optimized.hpp"
 
 #include "../safeguards.h"
@@ -96,7 +95,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
 				}
 
 				case BlitterMode::BlackRemap:
-					MemSetT(dst, 0, pixels);
+					std::fill_n(dst, pixels, 0);
 					dst += pixels;
 					break;
 
@@ -112,7 +111,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
 				}
 
 				default:
-					MemCpyT(dst, src, pixels);
+					std::copy_n(src, pixels, dst);
 					dst += pixels; src += pixels;
 					break;
 			}
@@ -120,7 +119,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
 	}
 }
 
-Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_8bppOptimized::Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
 	/* Make memory for all zoom-levels */
 	uint memory = sizeof(SpriteData);
@@ -128,13 +127,13 @@ Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::SpriteCollection &spri
 	ZoomLevel zoom_min;
 	ZoomLevel zoom_max;
 
-	if (sprite[ZOOM_LVL_MIN].type == SpriteType::Font) {
-		zoom_min = ZOOM_LVL_MIN;
-		zoom_max = ZOOM_LVL_MIN;
+	if (sprite_type == SpriteType::Font) {
+		zoom_min = ZoomLevel::Min;
+		zoom_max = ZoomLevel::Min;
 	} else {
 		zoom_min = _settings_client.gui.zoom_min;
 		zoom_max = _settings_client.gui.zoom_max;
-		if (zoom_max == zoom_min) zoom_max = ZOOM_LVL_MAX;
+		if (zoom_max == zoom_min) zoom_max = ZoomLevel::Max;
 	}
 
 	for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
@@ -153,13 +152,14 @@ Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::SpriteCollection &spri
 
 	/* Make the sprites per zoom-level */
 	for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
+		const SpriteLoader::Sprite &src_orig = sprite[i];
 		/* Store the index table */
 		uint offset = dst - temp_dst->data;
 		temp_dst->offset[i] = offset;
 
 		/* cache values, because compiler can't cache it */
-		int scaled_height = sprite[i].height;
-		int scaled_width  = sprite[i].width;
+		int scaled_height = src_orig.height;
+		int scaled_width = src_orig.width;
 
 		for (int y = 0; y < scaled_height; y++) {
 			uint trans = 0;
@@ -168,7 +168,7 @@ Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::SpriteCollection &spri
 			uint8_t *count_dst = nullptr;
 
 			/* Store the scaled image */
-			const SpriteLoader::CommonPixel *src = &sprite[i].data[y * sprite[i].width];
+			const SpriteLoader::CommonPixel *src = &src_orig.data[y * src_orig.width];
 
 			for (int x = 0; x < scaled_width; x++) {
 				uint colour = src++->m;
@@ -220,11 +220,12 @@ Sprite *Blitter_8bppOptimized::Encode(const SpriteLoader::SpriteCollection &spri
 	/* Allocate the exact amount of memory we need */
 	Sprite *dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite) + size);
 
-	dest_sprite->height = sprite[ZOOM_LVL_MIN].height;
-	dest_sprite->width  = sprite[ZOOM_LVL_MIN].width;
-	dest_sprite->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-	dest_sprite->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
-	memcpy(dest_sprite->data, temp_dst, size);
+	const auto &root_sprite = sprite.Root();
+	dest_sprite->height = root_sprite.height;
+	dest_sprite->width = root_sprite.width;
+	dest_sprite->x_offs = root_sprite.x_offs;
+	dest_sprite->y_offs = root_sprite.y_offs;
+	std::copy_n(reinterpret_cast<std::byte *>(temp_dst), size, dest_sprite->data);
 
 	return dest_sprite;
 }
diff --git a/src/blitter/8bpp_optimized.hpp b/src/blitter/8bpp_optimized.hpp
index 8452111d73..240b6dbdd9 100644
--- a/src/blitter/8bpp_optimized.hpp
+++ b/src/blitter/8bpp_optimized.hpp
@@ -18,12 +18,12 @@ class Blitter_8bppOptimized final : public Blitter_8bppBase {
 public:
 	/** Data stored about a (single) sprite. */
 	struct SpriteData {
-		uint32_t offset[ZOOM_LVL_END]; ///< Offsets (from .data) to streams for different zoom levels.
+		SpriteCollMap<uint32_t> offset; ///< Offsets (from .data) to streams for different zoom levels.
 		uint8_t data[];                   ///< Data, all zoomlevels.
 	};
 
 	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 
 	std::string_view GetName() override { return "8bpp-optimized"; }
 };
diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp
index 9451dcd944..54cb9ee404 100644
--- a/src/blitter/8bpp_simple.cpp
+++ b/src/blitter/8bpp_simple.cpp
@@ -61,19 +61,21 @@ void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoom
 	}
 }
 
-Sprite *Blitter_8bppSimple::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_8bppSimple::Encode(SpriteType, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
+	const auto &root_sprite = sprite.Root();
 	Sprite *dest_sprite;
-	dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite) + static_cast<size_t>(sprite[ZOOM_LVL_MIN].height) * static_cast<size_t>(sprite[ZOOM_LVL_MIN].width));
+	dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite) + static_cast<size_t>(root_sprite.height) * static_cast<size_t>(root_sprite.width));
 
-	dest_sprite->height = sprite[ZOOM_LVL_MIN].height;
-	dest_sprite->width  = sprite[ZOOM_LVL_MIN].width;
-	dest_sprite->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-	dest_sprite->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
+	dest_sprite->height = root_sprite.height;
+	dest_sprite->width = root_sprite.width;
+	dest_sprite->x_offs = root_sprite.x_offs;
+	dest_sprite->y_offs = root_sprite.y_offs;
 
 	/* Copy over only the 'remap' channel, as that is what we care about in 8bpp */
-	for (int i = 0; i < sprite[ZOOM_LVL_MIN].height * sprite[ZOOM_LVL_MIN].width; i++) {
-		dest_sprite->data[i] = sprite[ZOOM_LVL_MIN].data[i].m;
+	uint8_t *dst = reinterpret_cast<uint8_t *>(dest_sprite->data);
+	for (int i = 0; i < root_sprite.height * root_sprite.width; i++) {
+		dst[i] = root_sprite.data[i].m;
 	}
 
 	return dest_sprite;
diff --git a/src/blitter/8bpp_simple.hpp b/src/blitter/8bpp_simple.hpp
index 77dcf16a84..9398456737 100644
--- a/src/blitter/8bpp_simple.hpp
+++ b/src/blitter/8bpp_simple.hpp
@@ -17,7 +17,7 @@
 class Blitter_8bppSimple final : public Blitter_8bppBase {
 public:
 	void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) override;
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 
 	std::string_view GetName() override { return "8bpp-simple"; }
 };
diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp
index 7ee97a6c20..2a31d1d0b0 100644
--- a/src/blitter/base.hpp
+++ b/src/blitter/base.hpp
@@ -207,6 +207,8 @@ public:
 	virtual ~Blitter() = default;
 
 	template <typename SetPixelT> void DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel);
+
+	template <typename T> static void MovePixels(const T *src, T *dst, size_t width, size_t height, ptrdiff_t pitch);
 };
 
 #endif /* BLITTER_BASE_HPP */
diff --git a/src/blitter/common.hpp b/src/blitter/common.hpp
index eebdfc05e7..6b36feb980 100644
--- a/src/blitter/common.hpp
+++ b/src/blitter/common.hpp
@@ -192,4 +192,24 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 	}
 }
 
+template <typename T>
+/* static */ void Blitter::MovePixels(const T *src, T *dst, size_t width, size_t height, ptrdiff_t pitch)
+{
+	if (src == dst) return;
+
+	if (src < dst) {
+		for (size_t i = 0; i < height; ++i) {
+			std::move_backward(src, src + width, dst + width);
+			src += pitch;
+			dst += pitch;
+		}
+	} else {
+		for (size_t i = 0; i < height; ++i) {
+			std::move(src, src + width, dst);
+			src += pitch;
+			dst += pitch;
+		}
+	}
+}
+
 #endif /* BLITTER_COMMON_HPP */
diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp
index 0dceea90f2..a1dffdcd4a 100644
--- a/src/blitter/factory.hpp
+++ b/src/blitter/factory.hpp
@@ -55,7 +55,7 @@ protected:
 	 * @pre description != nullptr.
 	 * @pre There is no blitter registered with this name.
 	 */
-	BlitterFactory(const char *name, const char *description, bool usable = true) :
+	BlitterFactory(std::string_view name, std::string_view description, bool usable = true) :
 			name(name), description(description)
 	{
 		if (usable) {
@@ -93,7 +93,7 @@ public:
 	 * @param name the blitter to select.
 	 * @post Sets the blitter so GetCurrentBlitter() returns it too.
 	 */
-	static Blitter *SelectBlitter(const std::string_view name)
+	static Blitter *SelectBlitter(std::string_view name)
 	{
 		BlitterFactory *b = GetBlitterFactory(name);
 		if (b == nullptr) return nullptr;
@@ -109,17 +109,17 @@ public:
 	 * @param name the blitter factory to select.
 	 * @return The blitter factory, or nullptr when there isn't one with the wanted name.
 	 */
-	static BlitterFactory *GetBlitterFactory(const std::string_view name)
+	static BlitterFactory *GetBlitterFactory(std::string_view name)
 	{
 #if defined(DEDICATED)
-		const std::string_view default_blitter = "null";
+		static const std::string_view default_blitter = "null";
 #elif defined(WITH_COCOA)
-		const std::string_view default_blitter = "32bpp-anim";
+		static const std::string_view default_blitter = "32bpp-anim";
 #else
-		const std::string_view default_blitter = "8bpp-optimized";
+		static const std::string_view default_blitter = "8bpp-optimized";
 #endif
 		if (GetBlitters().empty()) return nullptr;
-		const std::string_view bname = name.empty() ? default_blitter : name;
+		std::string_view bname = name.empty() ? default_blitter : name;
 
 		for (auto &it : GetBlitters()) {
 			BlitterFactory *b = it.second;
diff --git a/src/blitter/null.cpp b/src/blitter/null.cpp
index dc8b1c0ea2..41b8a719b1 100644
--- a/src/blitter/null.cpp
+++ b/src/blitter/null.cpp
@@ -15,15 +15,16 @@
 /** Instantiation of the null blitter factory. */
 static FBlitter_Null iFBlitter_Null;
 
-Sprite *Blitter_Null::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+Sprite *Blitter_Null::Encode(SpriteType, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
 	Sprite *dest_sprite;
 	dest_sprite = allocator.Allocate<Sprite>(sizeof(*dest_sprite));
 
-	dest_sprite->height = sprite[ZOOM_LVL_MIN].height;
-	dest_sprite->width  = sprite[ZOOM_LVL_MIN].width;
-	dest_sprite->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-	dest_sprite->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
+	const auto &root_sprite = sprite.Root();
+	dest_sprite->height = root_sprite.height;
+	dest_sprite->width = root_sprite.width;
+	dest_sprite->x_offs = root_sprite.x_offs;
+	dest_sprite->y_offs = root_sprite.y_offs;
 
 	return dest_sprite;
 }
diff --git a/src/blitter/null.hpp b/src/blitter/null.hpp
index 15dc722929..8e90ca9af8 100644
--- a/src/blitter/null.hpp
+++ b/src/blitter/null.hpp
@@ -18,7 +18,7 @@ public:
 	uint8_t GetScreenDepth() override { return 0; }
 	void Draw(Blitter::BlitterParams *, BlitterMode, ZoomLevel) override {};
 	void DrawColourMappingRect(void *, int, int, PaletteID) override {};
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 	void *MoveTo(void *, int, int) override { return nullptr; };
 	void SetPixel(void *, int, int, uint8_t) override {};
 	void DrawRect(void *, int, int, uint8_t) override {};
diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp
index b5d03fb506..8d9897b51d 100644
--- a/src/bootstrap_gui.cpp
+++ b/src/bootstrap_gui.cpp
@@ -42,7 +42,7 @@ static constexpr NWidgetPart _background_widgets[] = {
  * Window description for the background window to prevent smearing.
  */
 static WindowDesc _background_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_BOOTSTRAP, WC_NONE,
 	WindowDefaultFlag::NoClose,
 	_background_widgets
@@ -78,7 +78,7 @@ static constexpr NWidgetPart _nested_bootstrap_errmsg_widgets[] = {
 
 /** Window description for the error window. */
 static WindowDesc _bootstrap_errmsg_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_BOOTSTRAP, WC_NONE,
 	{WindowDefaultFlag::Modal, WindowDefaultFlag::NoClose},
 	_nested_bootstrap_errmsg_widgets
@@ -135,7 +135,7 @@ static constexpr NWidgetPart _nested_bootstrap_download_status_window_widgets[]
 
 /** Window description for the download window */
 static WindowDesc _bootstrap_download_status_window_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	{WindowDefaultFlag::Modal, WindowDefaultFlag::NoClose},
 	_nested_bootstrap_download_status_window_widgets
@@ -187,7 +187,7 @@ static constexpr NWidgetPart _bootstrap_query_widgets[] = {
 
 /** The window description for the query. */
 static WindowDesc _bootstrap_query_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
 	WindowDefaultFlag::NoClose,
 	_bootstrap_query_widgets
@@ -273,10 +273,10 @@ public:
 		_network_content_client.RequestContentList(CONTENT_TYPE_BASE_GRAPHICS);
 	}
 
-	void OnReceiveContentInfo(const ContentInfo *ci) override
+	void OnReceiveContentInfo(const ContentInfo &ci) override
 	{
 		/* And once the meta data is received, start downloading it. */
-		_network_content_client.Select(ci->id);
+		_network_content_client.Select(ci.id);
 		new BootstrapContentDownloadStatusWindow();
 		this->Close();
 	}
@@ -320,19 +320,19 @@ public:
 		_network_content_client.RequestContentList(CONTENT_TYPE_BASE_GRAPHICS);
 	}
 
-	void OnReceiveContentInfo(const ContentInfo *ci) override
+	void OnReceiveContentInfo(const ContentInfo &ci) override
 	{
 		if (this->downloading) return;
 
 		/* And once the metadata is received, start downloading it. */
-		_network_content_client.Select(ci->id);
+		_network_content_client.Select(ci.id);
 		_network_content_client.DownloadSelectedContent(this->total_files, this->total_bytes);
 		this->downloading = true;
 
 		EM_ASM({ if (window["openttd_bootstrap"]) openttd_bootstrap($0, $1); }, this->downloaded_bytes, this->total_bytes);
 	}
 
-	void OnDownloadProgress(const ContentInfo *, int bytes) override
+	void OnDownloadProgress(const ContentInfo &, int bytes) override
 	{
 		/* A negative value means we are resetting; for example, when retrying or using a fallback. */
 		if (bytes < 0) {
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index acfda71049..f77337014e 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -205,7 +205,7 @@ public:
 					sprite_dim = maxdim(sprite_dim, GetScaledSpriteSize(bridge_data.spec->sprite));
 					text_dim = maxdim(text_dim, GetStringBoundingBox(GetBridgeSelectString(bridge_data)));
 				}
-				resize.height = std::max(sprite_dim.height, text_dim.height) + padding.height; // Max of both sizes + account for matrix edges.
+				fill.height = resize.height = std::max(sprite_dim.height, text_dim.height) + padding.height; // Max of both sizes + account for matrix edges.
 
 				this->icon_width = sprite_dim.width; // Width of bridge icon.
 				size.width = this->icon_width + WidgetDimensions::scaled.hsep_normal + text_dim.width + padding.width;
@@ -239,7 +239,7 @@ public:
 				for (auto it = first; it != last; ++it) {
 					const BridgeSpec *b = it->spec;
 					DrawSpriteIgnorePadding(b->sprite, b->pal, tr.WithWidth(this->icon_width, rtl), SA_HOR_CENTER | SA_BOTTOM);
-					DrawStringMultiLine(tr.Indent(this->icon_width + WidgetDimensions::scaled.hsep_normal, rtl), GetBridgeSelectString(*it));
+					DrawStringMultiLineWithClipping(tr.Indent(this->icon_width + WidgetDimensions::scaled.hsep_normal, rtl), GetBridgeSelectString(*it));
 					tr = tr.Translate(0, this->resize.step_height);
 				}
 				break;
@@ -283,7 +283,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget == WID_BBS_DROPDOWN_CRITERIA && this->bridges.SortType() != index) {
 			this->bridges.SetSortType(index);
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index ad0f55141e..e713a7b5ec 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -18,6 +18,8 @@
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "newgrf_badge.h"
+#include "newgrf_badge_config.h"
+#include "newgrf_badge_gui.h"
 #include "newgrf_engine.h"
 #include "newgrf_text.h"
 #include "group.h"
@@ -72,10 +74,13 @@ static constexpr NWidgetPart _nested_build_vehicle_widgets[] = {
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BV_SHOW_HIDDEN_ENGINES),
 			NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_BV_CARGO_FILTER_DROPDOWN), SetResize(1, 0), SetFill(1, 0), SetToolTip(STR_TOOLTIP_FILTER_CRITERIA),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_BV_CONFIGURE_BADGES), SetAspect(WidgetDimensions::ASPECT_UP_DOWN_BUTTON), SetResize(0, 0), SetFill(0, 1), SetSpriteTip(SPR_EXTRA_MENU, STR_BADGE_CONFIG_MENU_TOOLTIP),
 		EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY),
 			NWidget(WWT_EDITBOX, COLOUR_GREY, WID_BV_FILTER), SetResize(1, 0), SetFill(1, 0), SetPadding(2), SetStringTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
 		EndContainer(),
+		NWidget(NWID_VERTICAL, NWidContainerFlag{}, WID_BV_BADGE_FILTER),
+		EndContainer(),
 	EndContainer(),
 	/* Vehicle list. */
 	NWidget(NWID_HORIZONTAL),
@@ -795,16 +800,20 @@ static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_
  */
 static std::optional<std::string> GetNewGRFAdditionalText(EngineID engine)
 {
-	uint16_t callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, nullptr);
+	std::array<int32_t, 16> regs100;
+	uint16_t callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, nullptr, regs100);
 	if (callback == CALLBACK_FAILED || callback == 0x400) return std::nullopt;
 	const GRFFile *grffile = Engine::Get(engine)->GetGRF();
 	assert(grffile != nullptr);
+	if (callback == 0x40F) {
+		return GetGRFStringWithTextStack(grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+	}
 	if (callback > 0x400) {
 		ErrorUnknownCallbackResult(grffile->grfid, CBID_VEHICLE_ADDITIONAL_TEXT, callback);
 		return std::nullopt;
 	}
 
-	return GetGRFStringWithTextStack(grffile, GRFSTR_MISC_GRF_TEXT + callback, 6);
+	return GetGRFStringWithTextStack(grffile, GRFSTR_MISC_GRF_TEXT + callback, regs100);
 }
 
 /**
@@ -995,7 +1004,7 @@ void DrawEngineList(VehicleType type, const Rect &r, const GUIEngineList &eng_li
 				if (lvl < item.indent) tx += level_width;
 			}
 			/* Draw our node in the tree. */
-			int ycentre = CenterBounds(textr.top, textr.bottom, WidgetDimensions::scaled.fullbevel.top);
+			int ycentre = CentreBounds(textr.top, textr.bottom, WidgetDimensions::scaled.fullbevel.top);
 			if (!HasBit(item.level_mask, item.indent)) GfxDrawLine(tx, ir.top, tx, ycentre, linecolour, WidgetDimensions::scaled.fullbevel.top);
 			GfxDrawLine(tx, ycentre, tx + offset - (rtl ? -1 : 1), ycentre, linecolour, WidgetDimensions::scaled.fullbevel.top);
 		}
@@ -1122,11 +1131,6 @@ void GUIEngineListAddChildren(GUIEngineList &dst, const GUIEngineList &src, Engi
 	}
 }
 
-/** Enum referring to the Hotkeys in the build vehicle window */
-enum BuildVehicleHotkeys : int32_t {
-	BVHK_FOCUS_FILTER_BOX, ///< Focus the edit box for editing the filter string
-};
-
 /** GUI for building vehicles. */
 struct BuildVehicleWindow : Window {
 	VehicleType vehicle_type = VEH_INVALID; ///< Type of vehicles shown in the window.
@@ -1147,9 +1151,14 @@ struct BuildVehicleWindow : Window {
 	TestedEngineDetails te{}; ///< Tested cost and capacity after refit.
 	GUIBadgeClasses badge_classes{};
 
+	static constexpr int BADGE_COLUMNS = 3; ///< Number of columns available for badges (0 = left of image, 1 = between image and name, 2 = after name)
+
 	StringFilter string_filter{}; ///< Filter for vehicle name
 	QueryString vehicle_editbox; ///< Filter editbox
 
+	std::pair<WidgetID, WidgetID> badge_filters{}; ///< First and last widgets IDs of badge filters.
+	BadgeFilterChoices badge_filter_choices{};
+
 	void SetBuyVehicleText()
 	{
 		NWidgetCore *widget = this->GetWidget<NWidgetCore>(WID_BV_BUILD);
@@ -1305,6 +1314,12 @@ struct BuildVehicleWindow : Window {
 	{
 		this->badge_classes = GUIBadgeClasses(static_cast<GrfSpecFeature>(GSF_TRAINS + this->vehicle_type));
 		this->SetCargoFilterArray();
+
+		auto container = this->GetWidget<NWidgetContainer>(WID_BV_BADGE_FILTER);
+		this->badge_filters = AddBadgeDropdownFilters(*container, WID_BV_BADGE_FILTER, COLOUR_GREY, static_cast<GrfSpecFeature>(GSF_TRAINS + this->vehicle_type));
+
+		this->widget_lookup.clear();
+		this->nested_root->FillWidgetLookup(this->widget_lookup);
 	}
 
 	/** Filter the engine list against the currently selected cargo filter */
@@ -1352,6 +1367,7 @@ struct BuildVehicleWindow : Window {
 		list.clear();
 
 		BadgeTextFilter btf(this->string_filter, GSF_TRAINS);
+		BadgeDropdownFilter bdf(this->badge_filter_choices);
 
 		/* Make list of all available train engines and wagons.
 		 * Also check to see if the previously selected engine is still available,
@@ -1368,6 +1384,8 @@ struct BuildVehicleWindow : Window {
 			/* Filter now! So num_engines and num_wagons is valid */
 			if (!FilterSingleEngine(eid)) continue;
 
+			if (!bdf.Filter(e->badges)) continue;
+
 			/* Filter by name or NewGRF extra text */
 			if (!FilterByText(e) && !btf.Filter(e->badges)) continue;
 
@@ -1573,6 +1591,12 @@ struct BuildVehicleWindow : Window {
 		return list;
 	}
 
+	DropDownList BuildBadgeConfigurationList() const
+	{
+		static const auto separators = {STR_BADGE_CONFIG_PREVIEW, STR_BADGE_CONFIG_NAME};
+		return BuildBadgeClassConfigurationList(this->badge_classes, BADGE_COLUMNS, separators);
+	}
+
 	void BuildVehicle()
 	{
 		EngineID sel_eng = this->sel_engine;
@@ -1656,6 +1680,11 @@ struct BuildVehicleWindow : Window {
 				ShowDropDownList(this, this->BuildCargoDropDownList(), this->cargo_filter_criteria, widget);
 				break;
 
+			case WID_BV_CONFIGURE_BADGES:
+				if (this->badge_classes.GetClasses().empty()) break;
+				ShowDropDownList(this, this->BuildBadgeConfigurationList(), -1, widget, 0, false, true);
+				break;
+
 			case WID_BV_SHOW_HIDE: {
 				const Engine *e = (this->sel_engine == EngineID::Invalid()) ? nullptr : Engine::Get(this->sel_engine);
 				if (e != nullptr) {
@@ -1676,6 +1705,12 @@ struct BuildVehicleWindow : Window {
 				}
 				break;
 			}
+
+			default:
+				if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+					ShowDropDownList(this, this->GetWidget<NWidgetBadgeFilter>(widget)->GetDropDownList(), -1, widget, 0, false);
+				}
+				break;
 		}
 	}
 
@@ -1726,6 +1761,10 @@ struct BuildVehicleWindow : Window {
 			}
 
 			default:
+				if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+					return this->GetWidget<NWidgetBadgeFilter>(widget)->GetStringParameter(this->badge_filter_choices);
+				}
+
 				return this->Window::GetWidgetString(widget, stringid);
 		}
 	}
@@ -1734,7 +1773,7 @@ struct BuildVehicleWindow : Window {
 	{
 		switch (widget) {
 			case WID_BV_LIST:
-				resize.height = GetEngineListHeight(this->vehicle_type);
+				fill.height = resize.height = GetEngineListHeight(this->vehicle_type);
 				size.height = 3 * resize.height;
 				size.width = std::max(size.width, this->badge_classes.GetTotalColumnsWidth() + GetVehicleImageCellSize(this->vehicle_type, EIT_PURCHASE).extend_left + GetVehicleImageCellSize(this->vehicle_type, EIT_PURCHASE).extend_right + 165) + padding.width;
 				break;
@@ -1755,6 +1794,11 @@ struct BuildVehicleWindow : Window {
 				size.width = std::max(size.width, GetDropDownListDimension(this->BuildCargoDropDownList()).width + padding.width);
 				break;
 
+			case WID_BV_CONFIGURE_BADGES:
+				/* Hide the configuration button if no configurable badges are present. */
+				if (this->badge_classes.GetClasses().empty()) size = {0, 0};
+				break;
+
 			case WID_BV_BUILD:
 				size = GetStringBoundingBox(STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON + this->vehicle_type);
 				size = maxdim(size, GetStringBoundingBox(STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON + this->vehicle_type));
@@ -1829,7 +1873,7 @@ struct BuildVehicleWindow : Window {
 		Command<CMD_RENAME_ENGINE>::Post(STR_ERROR_CAN_T_RENAME_TRAIN_TYPE + this->vehicle_type, this->rename_engine, *str);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int click_result) override
 	{
 		switch (widget) {
 			case WID_BV_SORT_DROPDOWN:
@@ -1850,6 +1894,31 @@ struct BuildVehicleWindow : Window {
 					this->SelectEngine(this->sel_engine);
 				}
 				break;
+
+			case WID_BV_CONFIGURE_BADGES: {
+				bool reopen = HandleBadgeConfigurationDropDownClick(static_cast<GrfSpecFeature>(GSF_TRAINS + this->vehicle_type), BADGE_COLUMNS, index, click_result);
+
+				this->ReInit();
+
+				if (reopen) {
+					ReplaceDropDownList(this, this->BuildBadgeConfigurationList(), -1);
+				} else {
+					this->CloseChildWindows(WC_DROPDOWN_MENU);
+				}
+				break;
+			}
+
+			default:
+				if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+					if (index < 0) {
+						ResetBadgeFilter(this->badge_filter_choices, this->GetWidget<NWidgetBadgeFilter>(widget)->GetBadgeClassID());
+					} else {
+						SetBadgeFilter(this->badge_filter_choices, BadgeID(index));
+					}
+					this->eng_list.ForceRebuild();
+					this->SetDirty();
+				}
+				break;
 		}
 		this->SetDirty();
 	}
@@ -1867,23 +1936,8 @@ struct BuildVehicleWindow : Window {
 		}
 	}
 
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case BVHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_BV_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				return ES_HANDLED;
-
-			default:
-				return ES_NOT_HANDLED;
-		}
-
-		return ES_HANDLED;
-	}
-
 	static inline HotkeyList hotkeys{"buildvehicle", {
-		Hotkey('F', "focus_filter_box", BVHK_FOCUS_FILTER_BOX),
+		Hotkey('F', "focus_filter_box", WID_BV_FILTER),
 	}};
 };
 
diff --git a/src/cachecheck.cpp b/src/cachecheck.cpp
index 8f39f8d5ed..fb0872802b 100644
--- a/src/cachecheck.cpp
+++ b/src/cachecheck.cpp
@@ -74,9 +74,8 @@ void CheckCaches()
 	for (const RoadStop *rs : RoadStop::Iterate()) {
 		if (IsBayRoadStopTile(rs->xy)) continue;
 
-		assert(rs->GetEntry(DIAGDIR_NE) != rs->GetEntry(DIAGDIR_NW));
-		rs->GetEntry(DIAGDIR_NE)->CheckIntegrity(rs);
-		rs->GetEntry(DIAGDIR_NW)->CheckIntegrity(rs);
+		rs->GetEntry(DIAGDIR_NE).CheckIntegrity(rs);
+		rs->GetEntry(DIAGDIR_NW).CheckIntegrity(rs);
 	}
 
 	std::vector<NewGRFCache> grf_cache;
diff --git a/src/cheat.cpp b/src/cheat.cpp
index 30adc36fbe..71546382de 100644
--- a/src/cheat.cpp
+++ b/src/cheat.cpp
@@ -18,5 +18,5 @@ Cheats _cheats;
 /** Reinitialise all the cheats. */
 void InitializeCheats()
 {
-	memset(&_cheats, 0, sizeof(Cheats));
+	_cheats = {};
 }
diff --git a/src/cheat_func.h b/src/cheat_func.h
index 5c205b04bd..8585a589e2 100644
--- a/src/cheat_func.h
+++ b/src/cheat_func.h
@@ -12,8 +12,6 @@
 
 #include "cheat_type.h"
 
-extern Cheats _cheats;
-
 void ShowCheatWindow();
 
 
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index b2994d5eee..5cbdb1f78f 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -35,6 +35,7 @@
 #include "timer/timer.h"
 #include "timer/timer_game_calendar.h"
 #include "timer/timer_game_economy.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/cheat_widget.h"
 
@@ -286,7 +287,7 @@ struct CheatWindow : Window {
 				case SLE_BOOL: {
 					bool on = (*(bool*)ce->variable);
 
-					DrawBoolButton(button_left, y + button_y_offset, on, true);
+					DrawBoolButton(button_left, y + button_y_offset, COLOUR_YELLOW, COLOUR_GREY, on, true);
 					str = GetString(ce->str, on ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
 					break;
 				}
@@ -354,7 +355,7 @@ struct CheatWindow : Window {
 		int32_t value = sd->Read(&GetGameSettings());
 		if (sd->IsBoolSetting()) {
 			/* Draw checkbox for boolean-value either on/off */
-			DrawBoolButton(buttons.left, buttons.top, value != 0, editable);
+			DrawBoolButton(buttons.left, buttons.top, COLOUR_YELLOW, COLOUR_GREY, value != 0, editable);
 		} else if (sd->flags.Test(SettingFlag::GuiDropdown)) {
 			/* Draw [v] button for settings of an enum-type */
 			DrawDropDownButton(buttons.left, buttons.top, COLOUR_YELLOW, state != 0, editable);
@@ -607,12 +608,13 @@ struct CheatWindow : Window {
 
 			int32_t value;
 			if (!str->empty()) {
-				long long llvalue = atoll(str->c_str());
+				auto llvalue = ParseInteger<int64_t>(*str, 10, true);
+				if (!llvalue.has_value()) return;
 
 				/* Save the correct currency-translated value */
-				if (sd->flags.Test(SettingFlag::GuiCurrency)) llvalue /= GetCurrency().rate;
+				if (sd->flags.Test(SettingFlag::GuiCurrency)) llvalue = *llvalue / GetCurrency().rate;
 
-				value = ClampTo<int32_t>(llvalue);
+				value = ClampTo<int32_t>(*llvalue);
 			} else {
 				value = sd->GetDefaultValue();
 			}
@@ -621,18 +623,19 @@ struct CheatWindow : Window {
 		} else {
 			const CheatEntry *ce = &_cheats_ui[clicked_cheat];
 			int oldvalue = static_cast<int32_t>(ReadValue(ce->variable, ce->type));
-			int value = atoi(str->c_str());
+			auto value = ParseInteger<int32_t>(*str, 10, true);
+			if (!value.has_value()) return;
 			*ce->been_used = true;
-			value = ce->proc(value, value - oldvalue);
+			value = ce->proc(*value, *value - oldvalue);
 
-			if (value != oldvalue) WriteValue(ce->variable, ce->type, static_cast<int64_t>(value));
+			if (*value != oldvalue) WriteValue(ce->variable, ce->type, static_cast<int64_t>(*value));
 		}
 
 		this->valuewindow_entry = nullptr;
 		this->SetDirty();
 	}
 
-	IntervalTimer<TimerGameCalendar> daily_interval = {{TimerGameCalendar::MONTH, TimerGameCalendar::Priority::NONE}, [this](auto) {
+	const IntervalTimer<TimerGameCalendar> daily_interval = {{TimerGameCalendar::MONTH, TimerGameCalendar::Priority::NONE}, [this](auto) {
 		this->SetDirty();
 	}};
 };
diff --git a/src/cheat_type.h b/src/cheat_type.h
index 8c5dc981b1..a13cab7eb2 100644
--- a/src/cheat_type.h
+++ b/src/cheat_type.h
@@ -14,8 +14,8 @@
  * Info about each of the cheats.
  */
 struct Cheat {
-	bool been_used; ///< has this cheat been used before?
-	bool value;     ///< tells if the bool cheat is active or not
+	bool been_used = false; ///< has this cheat been used before?
+	bool value = false; ///< tells if the bool cheat is active or not
 };
 
 /**
@@ -24,15 +24,15 @@ struct Cheat {
  * Only add new entries at the end of the struct!
  */
 struct Cheats {
-	Cheat magic_bulldozer;  ///< dynamite industries, objects
-	Cheat switch_company;   ///< change to another company
-	Cheat money;            ///< get rich or poor
-	Cheat crossing_tunnels; ///< allow tunnels that cross each other
-	Cheat no_jetcrash;      ///< no jet will crash on small airports anymore
-	Cheat change_date;      ///< changes date ingame
-	Cheat setup_prod;       ///< setup raw-material production in game
-	Cheat edit_max_hl;      ///< edit the maximum heightlevel; this is a cheat because of the fact that it needs to reset NewGRF game state and doing so as a simple configuration breaks the expectation of many
-	Cheat station_rating;   ///< Fix station ratings at 100%
+	Cheat magic_bulldozer{}; ///< dynamite industries, objects
+	Cheat switch_company{};  ///< change to another company
+	Cheat money{}; ///< get rich or poor
+	Cheat crossing_tunnels{}; ///< allow tunnels that cross each other
+	Cheat no_jetcrash{}; ///< no jet will crash on small airports anymore
+	Cheat change_date{}; ///< changes date ingame
+	Cheat setup_prod{}; ///< setup raw-material production in game
+	Cheat edit_max_hl{}; ///< edit the maximum heightlevel; this is a cheat because of the fact that it needs to reset NewGRF game state and doing so as a simple configuration breaks the expectation of many
+	Cheat station_rating{}; ///< Fix station ratings at 100%
 };
 
 extern Cheats _cheats;
diff --git a/src/command.cpp b/src/command.cpp
index 281588e89a..c11289902e 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -74,7 +74,7 @@ int RecursiveCommandCounter::_counter = 0;
  * the #CommandFlag::Auto, #CommandFlag::Offline and #CommandFlag::Server values.
  */
 struct CommandInfo {
-	const char *name;   ///< A human readable name for the procedure
+	std::string_view name; ///< A human readable name for the procedure
 	CommandFlags flags; ///< The (command) flags to that apply to this command
 	CommandType type;   ///< The type of command.
 };
@@ -129,7 +129,7 @@ CommandFlags GetCommandFlags(Commands cmd)
  * @param cmd The integer value of the command
  * @return The name for this command
  */
-const char *GetCommandName(Commands cmd)
+std::string_view GetCommandName(Commands cmd)
 {
 	assert(IsValidCommand(cmd));
 
diff --git a/src/command_func.h b/src/command_func.h
index 52c70f6aab..cb3ba95610 100644
--- a/src/command_func.h
+++ b/src/command_func.h
@@ -31,7 +31,7 @@ void NetworkSendCommand(Commands cmd, StringID err_message, CommandCallback *cal
 
 bool IsValidCommand(Commands cmd);
 CommandFlags GetCommandFlags(Commands cmd);
-const char *GetCommandName(Commands cmd);
+std::string_view GetCommandName(Commands cmd);
 bool IsCommandAllowedWhilePaused(Commands cmd);
 
 template <Commands Tcmd>
diff --git a/src/command_type.h b/src/command_type.h
index 12a81a685b..e491677871 100644
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -470,7 +470,7 @@ template <Commands Tcmd> struct CommandTraits;
 		static constexpr auto &proc = proc_; \
 		static constexpr CommandFlags flags = flags_; \
 		static constexpr CommandType type = type_; \
-		static inline constexpr const char *name = #proc_; \
+		static inline constexpr std::string_view name = #proc_; \
 	};
 
 /** Storage buffer for serialized command data. */
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 91025c7d01..6399a34cc1 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -39,6 +39,7 @@
 #include "timer/timer.h"
 #include "timer/timer_game_economy.h"
 #include "timer/timer_game_tick.h"
+#include "timer/timer_window.h"
 
 #include "widgets/statusbar_widget.h"
 
@@ -51,7 +52,7 @@ void UpdateObjectColours(const Company *c);
 
 CompanyID _local_company;   ///< Company controlled by the human player at this client. Can also be #COMPANY_SPECTATOR.
 CompanyID _current_company; ///< Company currently doing an action.
-ReferenceThroughBaseContainer<std::array<Colours, MAX_COMPANIES>> _company_colours; ///< NOSAVE: can be determined from company structs.
+TypedIndexContainer<std::array<Colours, MAX_COMPANIES>, CompanyID> _company_colours; ///< NOSAVE: can be determined from company structs.
 CompanyManagerFace _company_manager_face; ///< for company manager face storage in openttd.cfg
 uint _cur_company_tick_index;             ///< used to generate a name for one company that doesn't have a name yet per tick
 
@@ -151,6 +152,16 @@ TextColour GetDrawStringCompanyColour(CompanyID company)
 	return (TextColour)GetColourGradient(_company_colours[company], SHADE_NORMAL) | TC_IS_PALETTE_COLOUR;
 }
 
+/**
+ * Get the palette for recolouring with a company colour.
+ * @param company Company to get the colour of.
+ * @return Palette for recolouring.
+ */
+PaletteID GetCompanyPalette(CompanyID company)
+{
+	return GetColourPalette(_company_colours[company]);
+}
+
 /**
  * Draw the icon of a company.
  * @param c Company that needs its icon drawn.
@@ -159,7 +170,7 @@ TextColour GetDrawStringCompanyColour(CompanyID company)
  */
 void DrawCompanyIcon(CompanyID c, int x, int y)
 {
-	DrawSprite(SPR_COMPANY_ICON, COMPANY_SPRITE_COLOUR(c), x, y);
+	DrawSprite(SPR_COMPANY_ICON, GetCompanyPalette(c), x, y);
 }
 
 /**
@@ -193,18 +204,38 @@ static bool IsValidCompanyManagerFace(CompanyManagerFace cmf)
 	return true;
 }
 
+static CompanyMask _dirty_company_finances{}; ///< Bitmask of compamy finances that should be marked dirty.
+
 /**
- * Refresh all windows owned by a company.
+ * Mark all finance windows owned by a company as needing a refresh.
+ * The actual refresh is deferred until the end of the gameloop to reduce duplicated work.
  * @param company Company that changed, and needs its windows refreshed.
  */
 void InvalidateCompanyWindows(const Company *company)
 {
 	CompanyID cid = company->index;
-
-	if (cid == _local_company) SetWindowWidgetDirty(WC_STATUS_BAR, 0, WID_S_RIGHT);
-	SetWindowDirty(WC_FINANCES, cid);
+	_dirty_company_finances.Set(cid);
 }
 
+/**
+ * Refresh all company finance windows previously marked dirty.
+ */
+static const IntervalTimer<TimerWindow> invalidate_company_windows_interval(std::chrono::milliseconds(1), [](auto) {
+	for (CompanyID cid : _dirty_company_finances) {
+		if (cid == _local_company) SetWindowWidgetDirty(WC_STATUS_BAR, 0, WID_S_RIGHT);
+		Window *w = FindWindowById(WC_FINANCES, cid);
+		if (w != nullptr) {
+			w->SetWidgetDirty(WID_CF_EXPS_PRICE3);
+			w->SetWidgetDirty(WID_CF_OWN_VALUE);
+			w->SetWidgetDirty(WID_CF_LOAN_VALUE);
+			w->SetWidgetDirty(WID_CF_BALANCE_VALUE);
+			w->SetWidgetDirty(WID_CF_MAXLOAN_VALUE);
+		}
+		SetWindowWidgetDirty(WC_COMPANY, cid, WID_C_DESC_COMPANY_VALUE);
+	}
+	_dirty_company_finances.Reset();
+});
+
 /**
  * Get the amount of money that a company has available, or INT64_MAX
  * if there is no such valid company.
@@ -781,7 +812,7 @@ void OnTick_Companies()
  * A year has passed, update the economic data of all companies, and perhaps show the
  * financial overview window of the local company.
  */
-static IntervalTimer<TimerGameEconomy> _economy_companies_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::COMPANY}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_companies_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::COMPANY}, [](auto)
 {
 	/* Copy statistics */
 	for (Company *c : Company::Iterate()) {
diff --git a/src/company_func.h b/src/company_func.h
index 870a292424..deddcd4b60 100644
--- a/src/company_func.h
+++ b/src/company_func.h
@@ -36,8 +36,9 @@ CommandCost CheckTileOwnership(TileIndex tile);
 extern CompanyID _local_company;
 extern CompanyID _current_company;
 
-extern ReferenceThroughBaseContainer<std::array<Colours, MAX_COMPANIES>> _company_colours;
+extern TypedIndexContainer<std::array<Colours, MAX_COMPANIES>, CompanyID> _company_colours;
 extern CompanyManagerFace _company_manager_face;
+PaletteID GetCompanyPalette(CompanyID company);
 
 /**
  * Is the current company the local company?
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 0c171330e2..29f48a8957 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -45,6 +45,7 @@
 #include "object_cmd.h"
 #include "timer/timer.h"
 #include "timer/timer_window.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/company_widget.h"
 
@@ -539,7 +540,7 @@ struct CompanyFinancesWindow : Window {
 	 * Check on a regular interval if the maximum amount of money has changed.
 	 * If it has, rescale the window to fit the new amount.
 	 */
-	IntervalTimer<TimerWindow> rescale_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> rescale_interval = {std::chrono::seconds(3), [this](auto) {
 		const Company *c = Company::Get(this->window_number);
 		if (c->money > CompanyFinancesWindow::max_money) {
 			CompanyFinancesWindow::max_money = std::max(c->money * 2, CompanyFinancesWindow::max_money * 4);
@@ -589,7 +590,8 @@ static const LiveryClass _livery_class[LS_END] = {
 template <SpriteID TSprite = SPR_SQUARE>
 class DropDownListColourItem : public DropDownIcon<DropDownString<DropDownListItem>> {
 public:
-	DropDownListColourItem(int colour, bool masked) : DropDownIcon<DropDownString<DropDownListItem>>(TSprite, GENERAL_SPRITE_COLOUR(colour % COLOUR_END), GetString(colour < COLOUR_END ? (STR_COLOUR_DARK_BLUE + colour) : STR_COLOUR_DEFAULT), colour, masked)
+	DropDownListColourItem(int colour, bool masked) :
+			DropDownIcon<DropDownString<DropDownListItem>>(TSprite, GetColourPalette(static_cast<Colours>(colour % COLOUR_END)), GetString(colour < COLOUR_END ? (STR_COLOUR_DARK_BLUE + colour) : STR_COLOUR_DEFAULT), colour, masked)
 	{
 	}
 };
@@ -748,13 +750,6 @@ public:
 					d = maxdim(d, GetStringBoundingBox(STR_LIVERY_DEFAULT + scheme));
 				}
 
-				/* And group names */
-				for (const Group *g : Group::Iterate()) {
-					if (g->owner == this->window_number) {
-						d = maxdim(d, GetStringBoundingBox(GetString(STR_GROUP_NAME, g->index)));
-					}
-				}
-
 				size.width = std::max(size.width, 5 + d.width + padding.width);
 				break;
 			}
@@ -766,7 +761,7 @@ public:
 
 				size.height = 5 * this->line_height;
 				resize.width = 1;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				break;
 			}
 
@@ -878,12 +873,12 @@ public:
 			DrawString(sch.left + (rtl ? 0 : indent), sch.right - (rtl ? indent : 0), y + text_offs, str, is_selected ? TC_WHITE : TC_BLACK);
 
 			/* Text below the first dropdown. */
-			DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOUR(livery.colour1), pri_squ.left, y + square_offs);
+			DrawSprite(SPR_SQUARE, GetColourPalette(livery.colour1), pri_squ.left, y + square_offs);
 			DrawString(pri.left, pri.right, y + text_offs, (is_default_scheme || HasBit(livery.in_use, 0)) ? STR_COLOUR_DARK_BLUE + livery.colour1 : STR_COLOUR_DEFAULT, is_selected ? TC_WHITE : TC_GOLD);
 
 			/* Text below the second dropdown. */
 			if (sec.right > sec.left) { // Second dropdown has non-zero size.
-				DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOUR(livery.colour2), sec_squ.left, y + square_offs);
+				DrawSprite(SPR_SQUARE, GetColourPalette(livery.colour2), sec_squ.left, y + square_offs);
 				DrawString(sec.left, sec.right, y + text_offs, (is_default_scheme || HasBit(livery.in_use, 1)) ? STR_COLOUR_DARK_BLUE + livery.colour2 : STR_COLOUR_DEFAULT, is_selected ? TC_WHITE : TC_GOLD);
 			}
 
@@ -997,7 +992,7 @@ public:
 		this->vscroll->SetCapacityFromWidget(this, WID_SCL_MATRIX);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		bool local = this->window_number == _local_company;
 		if (!local) return;
@@ -1075,15 +1070,15 @@ static constexpr NWidgetPart _nested_select_company_livery_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_GENERAL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_COMPANY_GENERAL, STR_LIVERY_GENERAL_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_RAIL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRAINLIST, STR_LIVERY_TRAIN_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_ROAD), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRUCKLIST, STR_LIVERY_ROAD_VEHICLE_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_SHIP), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIPLIST, STR_LIVERY_SHIP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_AIRCRAFT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_AIRPLANESLIST, STR_LIVERY_AIRCRAFT_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_RAIL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_TRAIN, STR_LIVERY_TRAIN_GROUP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_ROAD), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_ROADVEH, STR_LIVERY_ROAD_VEHICLE_GROUP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_SHIP), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_SHIP, STR_LIVERY_SHIP_GROUP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_AIRCRAFT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_AIRCRAFT, STR_LIVERY_AIRCRAFT_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_GENERAL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_COMPANY_GENERAL, STR_LIVERY_GENERAL_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_RAIL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRAINLIST, STR_LIVERY_TRAIN_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_ROAD), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRUCKLIST, STR_LIVERY_ROAD_VEHICLE_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_SHIP), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIPLIST, STR_LIVERY_SHIP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_AIRCRAFT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_AIRPLANESLIST, STR_LIVERY_AIRCRAFT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_RAIL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_TRAIN, STR_LIVERY_TRAIN_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_ROAD), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_ROADVEH, STR_LIVERY_ROAD_VEHICLE_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_SHIP), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_SHIP, STR_LIVERY_SHIP_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_AIRCRAFT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_AIRCRAFT, STR_LIVERY_AIRCRAFT_GROUP_TOOLTIP),
 		NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), SetResize(1, 0), EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
@@ -1127,8 +1122,8 @@ void DrawCompanyManagerFace(CompanyManagerFace cmf, Colours colour, const Rect &
 
 	/* Determine offset from centre of drawing rect. */
 	Dimension d = GetSpriteSize(SPR_GRADIENT);
-	int x = CenterBounds(r.left, r.right, d.width);
-	int y = CenterBounds(r.top, r.bottom, d.height);
+	int x = CentreBounds(r.left, r.right, d.width);
+	int y = CentreBounds(r.top, r.bottom, d.height);
 
 	bool has_moustache   = !HasBit(ge, GENDER_FEMALE) && GetCompanyManagerFaceBits(cmf, CMFV_HAS_MOUSTACHE,   ge) != 0;
 	bool has_tie_earring = !HasBit(ge, GENDER_FEMALE) || GetCompanyManagerFaceBits(cmf, CMFV_HAS_TIE_EARRING, ge) != 0;
@@ -1148,7 +1143,7 @@ void DrawCompanyManagerFace(CompanyManagerFace cmf, Colours colour, const Rect &
 	}
 
 	/* Draw the gradient (background) */
-	DrawSprite(SPR_GRADIENT, GENERAL_SPRITE_COLOUR(colour), x, y);
+	DrawSprite(SPR_GRADIENT, GetColourPalette(colour), x, y);
 
 	for (CompanyManagerFaceVariable cmfv = CMFV_CHEEKS; cmfv < CMFV_END; cmfv++) {
 		switch (cmfv) {
@@ -1691,7 +1686,9 @@ public:
 		if (!str.has_value()) return;
 		/* Set a new company manager face number */
 		if (!str->empty()) {
-			this->face = std::strtoul(str->c_str(), nullptr, 10);
+			auto val = ParseInteger(*str, 10, true);
+			if (!val.has_value()) return;
+			this->face = *val;
 			ScaleAllCompanyManagerFaceBits(this->face);
 			ShowErrorMessage(GetEncodedString(STR_FACE_FACECODE_SET), {}, WL_INFO);
 			this->UpdateData();
@@ -1704,7 +1701,7 @@ public:
 
 /** Company manager face selection window description */
 static WindowDesc _select_company_manager_face_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_COMPANY_MANAGER_FACE, WC_NONE,
 	WindowDefaultFlag::Construction,
 	_nested_select_company_manager_face_widgets
@@ -1728,34 +1725,16 @@ static constexpr NWidgetPart _nested_company_infrastructure_widgets[] = {
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
 		NWidget(WWT_CAPTION, COLOUR_GREY, WID_CI_CAPTION),
 		NWidget(WWT_SHADEBOX, COLOUR_GREY),
+		NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.framerect), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_RAIL_DESC), SetMinimalTextLines(2, 0), SetFill(1, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_RAIL_COUNT), SetMinimalTextLines(2, 0), SetFill(0, 1),
-			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_ROAD_DESC), SetMinimalTextLines(2, 0), SetFill(1, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_ROAD_COUNT), SetMinimalTextLines(2, 0), SetFill(0, 1),
-			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_TRAM_DESC), SetMinimalTextLines(2, 0), SetFill(1, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_TRAM_COUNT), SetMinimalTextLines(2, 0), SetFill(0, 1),
-			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_WATER_DESC), SetMinimalTextLines(2, 0), SetFill(1, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_WATER_COUNT), SetMinimalTextLines(2, 0), SetFill(0, 1),
-			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_STATION_DESC), SetMinimalTextLines(3, 0), SetFill(1, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_STATION_COUNT), SetMinimalTextLines(3, 0), SetFill(0, 1),
-			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_TOTAL_DESC), SetFill(1, 0),
-				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CI_TOTAL), SetFill(0, 1),
-			EndContainer(),
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_PANEL, COLOUR_GREY, WID_CI_LIST), SetFill(1, 1), SetResize(0, 1),
+				SetMinimalTextLines(5, WidgetDimensions::unscaled.framerect.Vertical()), SetScrollbar(WID_CI_SCROLLBAR),
+		EndContainer(),
+		NWidget(NWID_VERTICAL),
+			NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_CI_SCROLLBAR),
+			NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 		EndContainer(),
 	EndContainer(),
 };
@@ -1765,70 +1744,127 @@ static constexpr NWidgetPart _nested_company_infrastructure_widgets[] = {
  */
 struct CompanyInfrastructureWindow : Window
 {
-	RailTypes railtypes{}; ///< Valid railtypes.
-	RoadTypes roadtypes{}; ///< Valid roadtypes.
+	enum class InfrastructureItemType : uint8_t {
+		Header, ///< Section header.
+		Spacer, ///< Spacer
+		Value, ///< Label with values.
+		Total, ///< Total cost.
+	};
 
-	uint total_width = 0; ///< String width of the total cost line.
+	struct InfrastructureItem {
+		InfrastructureItemType type;
+		StringID label;
+		uint count;
+		Money cost;
+	};
+
+	uint count_width = 0;
+	uint cost_width = 0;
+
+	mutable std::vector<InfrastructureItem> list;
 
 	CompanyInfrastructureWindow(WindowDesc &desc, WindowNumber window_number) : Window(desc)
 	{
-		this->UpdateRailRoadTypes();
-
 		this->InitNested(window_number);
 		this->owner = this->window_number;
 	}
 
-	void UpdateRailRoadTypes()
+	void OnInit() override
 	{
-		this->railtypes = {};
-		this->roadtypes = {};
-
-		/* Find the used railtypes. */
-		for (const Engine *e : Engine::IterateType(VEH_TRAIN)) {
-			if (!e->info.climates.Test(_settings_game.game_creation.landscape)) continue;
-
-			this->railtypes.Set(GetRailTypeInfo(e->u.rail.railtype)->introduces_railtypes);
-		}
-
-		/* Get the date introduced railtypes as well. */
-		this->railtypes = AddDateIntroducedRailTypes(this->railtypes, CalendarTime::MAX_DATE);
-		this->railtypes.Reset(_railtypes_hidden_mask);
-
-		/* Find the used roadtypes. */
-		for (const Engine *e : Engine::IterateType(VEH_ROAD)) {
-			if (!e->info.climates.Test(_settings_game.game_creation.landscape)) continue;
-
-			this->roadtypes.Set(GetRoadTypeInfo(e->u.road.roadtype)->introduces_roadtypes);
-		}
-
-		/* Get the date introduced roadtypes as well. */
-		this->roadtypes = AddDateIntroducedRoadTypes(this->roadtypes, CalendarTime::MAX_DATE);
-		this->roadtypes.Reset(_roadtypes_hidden_mask);
+		this->UpdateInfrastructureList();
 	}
 
-	/** Get total infrastructure maintenance cost. */
-	Money GetTotalMaintenanceCost() const
+	void UpdateInfrastructureList()
 	{
-		const Company *c = Company::Get(this->window_number);
-		Money total;
+		this->list.clear();
 
-		uint32_t rail_total = c->infrastructure.GetRailTotal();
-		for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
-			if (this->railtypes.Test(rt)) total += RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total);
-		}
-		total += SignalMaintenanceCost(c->infrastructure.signal);
+		const Company *c = Company::GetIfValid(this->window_number);
+		if (c == nullptr) return;
 
-		uint32_t road_total = c->infrastructure.GetRoadTotal();
-		uint32_t tram_total = c->infrastructure.GetTramTotal();
-		for (RoadType rt = ROADTYPE_BEGIN; rt != ROADTYPE_END; rt++) {
-			if (this->roadtypes.Test(rt)) total += RoadMaintenanceCost(rt, c->infrastructure.road[rt], RoadTypeIsRoad(rt) ? road_total : tram_total);
+		Money total_monthly_cost = 0;
+
+		if (uint32_t rail_total = c->infrastructure.GetRailTotal(); rail_total > 0) {
+			/* Rail types and signals. */
+			this->list.emplace_back(InfrastructureItemType::Header, STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT);
+
+			for (const RailType &rt : _sorted_railtypes) {
+				if (c->infrastructure.rail[rt] == 0) continue;
+				Money monthly_cost = RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total);
+				total_monthly_cost += monthly_cost;
+				this->list.emplace_back(InfrastructureItemType::Value, GetRailTypeInfo(rt)->strings.name, c->infrastructure.rail[rt], monthly_cost);
+			}
+
+			if (c->infrastructure.signal > 0) {
+				Money monthly_cost = SignalMaintenanceCost(c->infrastructure.signal);
+				total_monthly_cost += monthly_cost;
+				this->list.emplace_back(InfrastructureItemType::Value, STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS, c->infrastructure.signal, monthly_cost);
+			}
 		}
 
-		total += CanalMaintenanceCost(c->infrastructure.water);
-		total += StationMaintenanceCost(c->infrastructure.station);
-		total += AirportMaintenanceCost(c->index);
+		if (uint32_t road_total = c->infrastructure.GetRoadTotal(); road_total > 0) {
+			/* Road types. */
+			if (!this->list.empty()) this->list.emplace_back(InfrastructureItemType::Spacer);
+			this->list.emplace_back(InfrastructureItemType::Header, STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT);
 
-		return total;
+			for (const RoadType &rt : _sorted_roadtypes) {
+				if (!RoadTypeIsRoad(rt)) continue;
+				if (c->infrastructure.road[rt] == 0) continue;
+				Money monthly_cost = RoadMaintenanceCost(rt, c->infrastructure.road[rt], road_total);
+				total_monthly_cost += monthly_cost;
+				this->list.emplace_back(InfrastructureItemType::Value, GetRoadTypeInfo(rt)->strings.name, c->infrastructure.road[rt], monthly_cost);
+			}
+		}
+
+		if (uint32_t tram_total = c->infrastructure.GetTramTotal(); tram_total > 0) {
+			/* Tram types. */
+			if (!this->list.empty()) this->list.emplace_back(InfrastructureItemType::Spacer);
+			this->list.emplace_back(InfrastructureItemType::Header, STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT);
+
+			for (const RoadType &rt : _sorted_roadtypes) {
+				if (!RoadTypeIsTram(rt)) continue;
+				if (c->infrastructure.road[rt] == 0) continue;
+				Money monthly_cost = RoadMaintenanceCost(rt, c->infrastructure.road[rt], tram_total);
+				total_monthly_cost += monthly_cost;
+				this->list.emplace_back(InfrastructureItemType::Value, GetRoadTypeInfo(rt)->strings.name, c->infrastructure.road[rt], monthly_cost);
+			}
+		}
+
+		if (c->infrastructure.water > 0) {
+			/* Canals, locks, and ship depots (docks are counted as stations). */
+			if (!this->list.empty()) this->list.emplace_back(InfrastructureItemType::Spacer);
+			this->list.emplace_back(InfrastructureItemType::Header, STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT);
+
+			Money monthly_cost = CanalMaintenanceCost(c->infrastructure.water);
+			total_monthly_cost += monthly_cost;
+			this->list.emplace_back(InfrastructureItemType::Value, STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS, c->infrastructure.water, monthly_cost);
+		}
+
+		if (Money airport_cost = AirportMaintenanceCost(c->index); airport_cost > 0 || c->infrastructure.station > 0) {
+			/* Stations and airports. */
+			if (!this->list.empty()) this->list.emplace_back(InfrastructureItemType::Spacer);
+			this->list.emplace_back(InfrastructureItemType::Header, STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT);
+
+			if (c->infrastructure.station > 0) {
+				Money monthly_cost = StationMaintenanceCost(c->infrastructure.station);
+				total_monthly_cost += monthly_cost;
+				this->list.emplace_back(InfrastructureItemType::Value, STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS, c->infrastructure.station, monthly_cost);
+			}
+
+			if (airport_cost > 0) {
+				Money monthly_cost = airport_cost;
+				total_monthly_cost += monthly_cost;
+				this->list.emplace_back(InfrastructureItemType::Value, STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS, c->infrastructure.airport, monthly_cost);
+			}
+		}
+
+		if (_settings_game.economy.infrastructure_maintenance) {
+			/* Total monthly maintenance cost. */
+			this->list.emplace_back(InfrastructureItemType::Spacer);
+			this->list.emplace_back(InfrastructureItemType::Total, STR_NULL, 0, total_monthly_cost);
+		}
+
+		/* Update scrollbar. */
+		this->GetScrollbar(WID_CI_SCROLLBAR)->SetCount(std::size(list));
 	}
 
 	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
@@ -1842,230 +1878,122 @@ struct CompanyInfrastructureWindow : Window
 		}
 	}
 
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
+	void FindWindowPlacementAndResize(int def_width, int def_height, bool allow_resize) override
 	{
-		const Company *c = Company::Get(this->window_number);
-
-		switch (widget) {
-			case WID_CI_RAIL_DESC: {
-				uint lines = 1; // Starts at 1 because a line is also required for the section title
-
-				size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT).width + padding.width);
-
-				for (const auto &rt : _sorted_railtypes) {
-					if (this->railtypes.Test(rt)) {
-						lines++;
-						size.width = std::max(size.width, GetStringBoundingBox(GetRailTypeInfo(rt)->strings.name).width + padding.width + WidgetDimensions::scaled.hsep_indent);
-					}
-				}
-				if (this->railtypes.Any()) {
-					lines++;
-					size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS).width + padding.width + WidgetDimensions::scaled.hsep_indent);
-				}
-
-				size.height = std::max(size.height, lines * GetCharacterHeight(FS_NORMAL));
-				break;
-			}
-
-			case WID_CI_ROAD_DESC:
-			case WID_CI_TRAM_DESC: {
-				uint lines = 1; // Starts at 1 because a line is also required for the section title
-
-				size.width = std::max(size.width, GetStringBoundingBox(widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT).width + padding.width);
-
-				for (const auto &rt : _sorted_roadtypes) {
-					if (this->roadtypes.Test(rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_DESC)) {
-						lines++;
-						size.width = std::max(size.width, GetStringBoundingBox(GetRoadTypeInfo(rt)->strings.name).width + padding.width + WidgetDimensions::scaled.hsep_indent);
-					}
-				}
-
-				size.height = std::max(size.height, lines * GetCharacterHeight(FS_NORMAL));
-				break;
-			}
-
-			case WID_CI_WATER_DESC:
-				size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT).width + padding.width);
-				size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS).width + padding.width + WidgetDimensions::scaled.hsep_indent);
-				break;
-
-			case WID_CI_STATION_DESC:
-				size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT).width + padding.width);
-				size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS).width + padding.width + WidgetDimensions::scaled.hsep_indent);
-				size.width = std::max(size.width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS).width + padding.width + WidgetDimensions::scaled.hsep_indent);
-				break;
-
-			case WID_CI_RAIL_COUNT:
-			case WID_CI_ROAD_COUNT:
-			case WID_CI_TRAM_COUNT:
-			case WID_CI_WATER_COUNT:
-			case WID_CI_STATION_COUNT:
-			case WID_CI_TOTAL: {
-				/* Find the maximum count that is displayed. */
-				uint32_t max_val = 1000;  // Some random number to reserve enough space.
-				Money max_cost = 10000; // Some random number to reserve enough space.
-				uint32_t rail_total = c->infrastructure.GetRailTotal();
-				for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
-					max_val = std::max(max_val, c->infrastructure.rail[rt]);
-					max_cost = std::max(max_cost, RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
-				}
-				max_val = std::max(max_val, c->infrastructure.signal);
-				max_cost = std::max(max_cost, SignalMaintenanceCost(c->infrastructure.signal));
-				uint32_t road_total = c->infrastructure.GetRoadTotal();
-				uint32_t tram_total = c->infrastructure.GetTramTotal();
-				for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) {
-					max_val = std::max(max_val, c->infrastructure.road[rt]);
-					max_cost = std::max(max_cost, RoadMaintenanceCost(rt, c->infrastructure.road[rt], RoadTypeIsRoad(rt) ? road_total : tram_total));
-
-				}
-				max_val = std::max(max_val, c->infrastructure.water);
-				max_cost = std::max(max_cost, CanalMaintenanceCost(c->infrastructure.water));
-				max_val = std::max(max_val, c->infrastructure.station);
-				max_cost = std::max(max_cost, StationMaintenanceCost(c->infrastructure.station));
-				max_val = std::max(max_val, c->infrastructure.airport);
-				max_cost = std::max(max_cost, AirportMaintenanceCost(c->index));
-
-				uint count_width = GetStringBoundingBox(GetString(STR_JUST_COMMA, GetParamMaxValue(max_val))).width + WidgetDimensions::scaled.hsep_indent; // Reserve some wiggle room
-
-				if (_settings_game.economy.infrastructure_maintenance) {
-					StringID str_total = TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR;
-					/* Convert to per year */
-					this->total_width = GetStringBoundingBox(GetString(str_total, GetParamMaxValue(this->GetTotalMaintenanceCost() * 12))).width + WidgetDimensions::scaled.hsep_indent * 2;
-					size.width = std::max(size.width, this->total_width);
-
-					/* Convert to per year */
-					count_width += std::max(this->total_width, GetStringBoundingBox(GetString(str_total, GetParamMaxValue(max_cost * 12))).width);
-				}
-
-				size.width = std::max(size.width, count_width);
-
-				/* Set height of the total line. */
-				if (widget == WID_CI_TOTAL) {
-					size.height = _settings_game.economy.infrastructure_maintenance ? std::max<uint>(size.height, WidgetDimensions::scaled.vsep_normal + GetCharacterHeight(FS_NORMAL)) : 0;
-				}
-				break;
-			}
+		if (def_height == 0) {
+			/* Try to open the window with the exact required rows, but clamp to a reasonable limit. */
+			int rows = (this->GetWidget<NWidgetBase>(WID_CI_LIST)->current_y - WidgetDimensions::scaled.framerect.Vertical()) / GetCharacterHeight(FS_NORMAL);
+			int delta = std::min(20, static_cast<int>(std::size(this->list))) - rows;
+			def_height = this->height + delta * GetCharacterHeight(FS_NORMAL);
 		}
+
+		this->Window::FindWindowPlacementAndResize(def_width, def_height, allow_resize);
 	}
 
-	/**
-	 * Helper for drawing the counts line.
-	 * @param r            The bounds to draw in.
-	 * @param y            The y position to draw at.
-	 * @param count        The count to show on this line.
-	 * @param monthly_cost The monthly costs.
-	 */
-	void DrawCountLine(const Rect &r, int &y, int count, Money monthly_cost) const
+	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
 	{
-		Rect cr = r.Indent(this->total_width, _current_text_dir == TD_RTL);
-		DrawString(cr.left, cr.right, y += GetCharacterHeight(FS_NORMAL), GetString(STR_JUST_COMMA, count), TC_WHITE, SA_RIGHT | SA_FORCE);
+		if (widget != WID_CI_LIST) return;
+
+		uint max_count = 1000; // Some random number to reserve minimum space.
+		Money max_cost = 1000000; // Some random number to reserve minimum space.
+
+		/* List of headers that might be used. */
+		static constexpr StringID header_strings[] = {
+			STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT,
+		};
+		/* List of labels that might be used. */
+		static constexpr StringID label_strings[] = {
+			STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS,
+			STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS,
+		};
+
+		uint max_header_width = GetStringListWidth(header_strings);
+		uint max_label_width = GetStringListWidth(label_strings);
+
+		/* Include width of all possible rail and road types. */
+		for (const RailType &rt : _sorted_railtypes) max_label_width = std::max(max_label_width, GetStringBoundingBox(GetRailTypeInfo(rt)->strings.name).width);
+		for (const RoadType &rt : _sorted_roadtypes) max_label_width = std::max(max_label_width, GetStringBoundingBox(GetRoadTypeInfo(rt)->strings.name).width);
+
+		for (const InfrastructureItem &entry : this->list) {
+			max_count = std::max(max_count, entry.count);
+			max_cost = std::max(max_cost, entry.cost * 12);
+		}
+
+		max_label_width += WidgetDimensions::scaled.hsep_indent;
+		this->count_width = GetStringBoundingBox(GetString(STR_JUST_COMMA, max_count)).width;
 
 		if (_settings_game.economy.infrastructure_maintenance) {
-			Rect tr = r.WithWidth(this->total_width, _current_text_dir == TD_RTL);
-			DrawString(tr.left, tr.right, y,
-				GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, monthly_cost * 12),
-				TC_FROMSTRING, SA_RIGHT | SA_FORCE);
+			this->cost_width = GetStringBoundingBox(GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, max_cost)).width;
+		} else {
+			this->cost_width = 0;
 		}
+
+		size.width = max_label_width + WidgetDimensions::scaled.hsep_wide + this->count_width + WidgetDimensions::scaled.hsep_wide + this->cost_width;
+		size.width = std::max(size.width, max_header_width) + WidgetDimensions::scaled.framerect.Horizontal();
+
+		fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 	}
 
 	void DrawWidget(const Rect &r, WidgetID widget) const override
 	{
-		const Company *c = Company::Get(this->window_number);
+		if (widget != WID_CI_LIST) return;
 
-		int y = r.top;
+		bool rtl = _current_text_dir == TD_RTL; // We allocate space from end-to-start so the label fills.
+		int line_height = GetCharacterHeight(FS_NORMAL);
 
-		Rect ir = r.Indent(WidgetDimensions::scaled.hsep_indent, _current_text_dir == TD_RTL);
-		switch (widget) {
-			case WID_CI_RAIL_DESC:
-				DrawString(r.left, r.right, y, STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT);
+		Rect ir = r.Shrink(WidgetDimensions::scaled.framerect);
+		Rect countr = ir.WithWidth(this->count_width, !rtl);
+		Rect costr = ir.Indent(this->count_width + WidgetDimensions::scaled.hsep_wide, !rtl).WithWidth(this->cost_width, !rtl);
+		Rect labelr = ir.Indent(this->count_width + WidgetDimensions::scaled.hsep_wide + this->cost_width + WidgetDimensions::scaled.hsep_wide, !rtl);
 
-				if (this->railtypes.Any()) {
-					/* Draw name of each valid railtype. */
-					for (const auto &rt : _sorted_railtypes) {
-						if (this->railtypes.Test(rt)) {
-							DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), GetRailTypeInfo(rt)->strings.name, TC_WHITE);
-						}
+		auto [first, last] = this->GetScrollbar(WID_CI_SCROLLBAR)->GetVisibleRangeIterators(this->list);
+		for (auto it = first; it != last; ++it) {
+			switch (it->type) {
+				case InfrastructureItemType::Header:
+					/* Header is allowed to fill the window's width. */
+					DrawString(ir.left, ir.right, labelr.top, GetString(it->label), TC_ORANGE);
+					break;
+
+				case InfrastructureItemType::Spacer:
+					break;
+
+				case InfrastructureItemType::Total:
+					/* Draw line in the spacer above the total. */
+					GfxFillRect(costr.Translate(0, -WidgetDimensions::scaled.vsep_normal).WithHeight(WidgetDimensions::scaled.fullbevel.top), PC_WHITE);
+					DrawString(costr, GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, it->cost * 12), TC_BLACK, SA_RIGHT | SA_FORCE);
+					break;
+
+				case InfrastructureItemType::Value:
+					DrawString(labelr.Indent(WidgetDimensions::scaled.hsep_indent, rtl), GetString(it->label), TC_WHITE);
+					DrawString(countr, GetString(STR_JUST_COMMA, it->count), TC_WHITE, SA_RIGHT | SA_FORCE);
+					if (_settings_game.economy.infrastructure_maintenance) {
+						DrawString(costr, GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, it->cost * 12), TC_BLACK, SA_RIGHT | SA_FORCE);
 					}
-					DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS);
-				} else {
-					/* No valid railtype. */
-					DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), STR_COMPANY_VIEW_INFRASTRUCTURE_NONE);
-				}
-
-				break;
-
-			case WID_CI_RAIL_COUNT: {
-				/* Draw infrastructure count for each valid railtype. */
-				uint32_t rail_total = c->infrastructure.GetRailTotal();
-				for (const auto &rt : _sorted_railtypes) {
-					if (this->railtypes.Test(rt)) {
-						this->DrawCountLine(r, y, c->infrastructure.rail[rt], RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
-					}
-				}
-				if (this->railtypes.Any()) {
-					this->DrawCountLine(r, y, c->infrastructure.signal, SignalMaintenanceCost(c->infrastructure.signal));
-				}
-				break;
+					break;
 			}
 
-			case WID_CI_ROAD_DESC:
-			case WID_CI_TRAM_DESC: {
-				DrawString(r.left, r.right, y, widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT);
-
-				/* Draw name of each valid roadtype. */
-				for (const auto &rt : _sorted_roadtypes) {
-					if (this->roadtypes.Test(rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_DESC)) {
-						DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), GetRoadTypeInfo(rt)->strings.name, TC_WHITE);
-					}
-				}
-
-				break;
-			}
-
-			case WID_CI_ROAD_COUNT:
-			case WID_CI_TRAM_COUNT: {
-				uint32_t road_tram_total = widget == WID_CI_ROAD_COUNT ? c->infrastructure.GetRoadTotal() : c->infrastructure.GetTramTotal();
-				for (const auto &rt : _sorted_roadtypes) {
-					if (this->roadtypes.Test(rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_COUNT)) {
-						this->DrawCountLine(r, y, c->infrastructure.road[rt], RoadMaintenanceCost(rt, c->infrastructure.road[rt], road_tram_total));
-					}
-				}
-				break;
-			}
-
-			case WID_CI_WATER_DESC:
-				DrawString(r.left, r.right, y, STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT);
-				DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS);
-				break;
-
-			case WID_CI_WATER_COUNT:
-				this->DrawCountLine(r, y, c->infrastructure.water, CanalMaintenanceCost(c->infrastructure.water));
-				break;
-
-			case WID_CI_TOTAL:
-				if (_settings_game.economy.infrastructure_maintenance) {
-					Rect tr = r.WithWidth(this->total_width, _current_text_dir == TD_RTL);
-					GfxFillRect(tr.left, y, tr.right, y + WidgetDimensions::scaled.bevel.top - 1, PC_WHITE);
-					y += WidgetDimensions::scaled.vsep_normal;
-					DrawString(tr.left, tr.right, y,
-						GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, this->GetTotalMaintenanceCost() * 12),
-						TC_FROMSTRING, SA_RIGHT | SA_FORCE);
-				}
-				break;
-
-			case WID_CI_STATION_DESC:
-				DrawString(r.left, r.right, y, STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT);
-				DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS);
-				DrawString(ir.left, ir.right, y += GetCharacterHeight(FS_NORMAL), STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS);
-				break;
-
-			case WID_CI_STATION_COUNT:
-				this->DrawCountLine(r, y, c->infrastructure.station, StationMaintenanceCost(c->infrastructure.station));
-				this->DrawCountLine(r, y, c->infrastructure.airport, AirportMaintenanceCost(c->index));
-				break;
+			labelr.top += line_height;
+			countr.top += line_height;
+			costr.top += line_height;
 		}
 	}
 
+	const IntervalTimer<TimerWindow> redraw_interval = {std::chrono::seconds(1), [this](auto) {
+		this->UpdateInfrastructureList();
+		this->SetWidgetDirty(WID_CI_LIST);
+	}};
+
+	void OnResize() override
+	{
+		this->GetScrollbar(WID_CI_SCROLLBAR)->SetCapacityFromWidget(this, WID_CI_LIST, WidgetDimensions::scaled.framerect.top);
+	}
+
 	/**
 	 * Some data on this window has become invalid.
 	 * @param data Information about the changed data.
@@ -2075,7 +2003,6 @@ struct CompanyInfrastructureWindow : Window
 	{
 		if (!gui_scope) return;
 
-		this->UpdateRailRoadTypes();
 		this->ReInit();
 	}
 };
@@ -2373,7 +2300,7 @@ struct CompanyWindow : Window
 				Point offset;
 				Dimension d = GetSpriteSize(SPR_VEH_BUS_SW_VIEW, &offset);
 				d.height -= offset.y;
-				DrawSprite(SPR_VEH_BUS_SW_VIEW, COMPANY_SPRITE_COLOUR(c->index), r.left - offset.x, CenterBounds(r.top, r.bottom, d.height) - offset.y);
+				DrawSprite(SPR_VEH_BUS_SW_VIEW, GetCompanyPalette(c->index), r.left - offset.x, CentreBounds(r.top, r.bottom, d.height) - offset.y);
 				break;
 			}
 
@@ -2499,7 +2426,7 @@ struct CompanyWindow : Window
 	}
 
 	/** Redraw the window on a regular interval. */
-	IntervalTimer<TimerWindow> redraw_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> redraw_interval = {std::chrono::seconds(3), [this](auto) {
 		this->SetDirty();
 	}};
 
@@ -2524,7 +2451,9 @@ struct CompanyWindow : Window
 			default: NOT_REACHED();
 
 			case WID_C_GIVE_MONEY: {
-				Money money = std::strtoull(str->c_str(), nullptr, 10) / GetCurrency().rate;
+				auto value = ParseInteger<uint64_t>(*str, 10, true);
+				if (!value.has_value()) return;
+				Money money = *value / GetCurrency().rate;
 				Command<CMD_GIVE_MONEY>::Post(STR_ERROR_CAN_T_GIVE_MONEY, money, this->window_number);
 				break;
 			}
@@ -2643,7 +2572,7 @@ struct BuyCompanyWindow : Window {
 	/**
 	 * Check on a regular interval if the company value has changed.
 	 */
-	IntervalTimer<TimerWindow> rescale_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> rescale_interval = {std::chrono::seconds(3), [this](auto) {
 		/* Value can't change when in bankruptcy. */
 		if (!this->hostile_takeover) return;
 
@@ -2680,7 +2609,7 @@ static constexpr NWidgetPart _nested_buy_company_widgets[] = {
 };
 
 static WindowDesc _buy_company_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUY_COMPANY, WC_NONE,
 	WindowDefaultFlag::Construction,
 	_nested_buy_company_widgets
diff --git a/src/console.cpp b/src/console.cpp
index 675b8bbcb5..e94f2acb9d 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -8,6 +8,8 @@
 /** @file console.cpp Handling of the in-game console. */
 
 #include "stdafx.h"
+#include "core/string_builder.hpp"
+#include "core/string_consumer.hpp"
 #include "console_internal.h"
 #include "network/network.h"
 #include "network/network_func.h"
@@ -18,7 +20,6 @@
 
 #include "safeguards.h"
 
-static const uint ICON_TOKEN_COUNT = 20;     ///< Maximum number of tokens in one command
 static const uint ICON_MAX_RECURSE = 10;     ///< Maximum number of recursion
 
 /* console parser */
@@ -117,30 +118,6 @@ void IConsolePrint(TextColour colour_code, const std::string &string)
 	IConsoleGUIPrint(colour_code, str);
 }
 
-/**
- * Change a string into its number representation. Supports
- * decimal and hexadecimal numbers as well as 'on'/'off' 'true'/'false'
- * @param *value the variable a successful conversion will be put in
- * @param *arg the string to be converted
- * @return Return true on success or false on failure
- */
-bool GetArgumentInteger(uint32_t *value, const char *arg)
-{
-	char *endptr;
-
-	if (strcmp(arg, "on") == 0 || strcmp(arg, "true") == 0) {
-		*value = 1;
-		return true;
-	}
-	if (strcmp(arg, "off") == 0 || strcmp(arg, "false") == 0) {
-		*value = 0;
-		return true;
-	}
-
-	*value = std::strtoul(arg, &endptr, 0);
-	return arg != endptr;
-}
-
 /**
  * Creates a copy of a string with underscores removed from it
  * @param name String to remove the underscores from.
@@ -179,7 +156,7 @@ static std::string RemoveUnderscores(std::string name)
  * @param name name of the alias that will be used
  * @param cmd name of the command that 'name' will be alias of
  */
-/* static */ void IConsole::AliasRegister(const std::string &name, const std::string &cmd)
+/* static */ void IConsole::AliasRegister(const std::string &name, std::string_view cmd)
 {
 	auto result = IConsole::Aliases().try_emplace(RemoveUnderscores(name), name, cmd);
 	if (!result.second) IConsolePrint(CC_ERROR, "An alias with the name '{}' already exists.", name);
@@ -200,14 +177,12 @@ static std::string RemoveUnderscores(std::string name)
 /**
  * An alias is just another name for a command, or for more commands
  * Execute it as well.
- * @param *alias is the alias of the command
- * @param tokencount the number of parameters passed
- * @param *tokens are the parameters given to the original command (0 is the first param)
+ * @param alias is the alias of the command
+ * @param tokens are the parameters given to the original command (0 is the first param)
+ * @param recurse_count the number of re-entrant calls to this function
  */
-static void IConsoleAliasExec(const IConsoleAlias *alias, uint8_t tokencount, char *tokens[ICON_TOKEN_COUNT], const uint recurse_count)
+static void IConsoleAliasExec(const IConsoleAlias *alias, std::span<std::string> tokens, uint recurse_count)
 {
-	std::string alias_buffer;
-
 	Debug(console, 6, "Requested command is an alias; parsing...");
 
 	if (recurse_count > ICON_MAX_RECURSE) {
@@ -215,72 +190,75 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, uint8_t tokencount, ch
 		return;
 	}
 
-	for (const char *cmdptr = alias->cmdline.c_str(); *cmdptr != '\0'; cmdptr++) {
-		switch (*cmdptr) {
+	std::string buffer;
+	StringBuilder builder{buffer};
+
+	StringConsumer consumer{alias->cmdline};
+	while (consumer.AnyBytesLeft()) {
+		auto c = consumer.TryReadUtf8();
+		if (!c.has_value()) {
+			IConsolePrint(CC_ERROR, "Alias '{}' ('{}') contains malformed characters.", alias->name, alias->cmdline);
+			return;
+		}
+
+		switch (*c) {
 			case '\'': // ' will double for ""
-				alias_buffer += '\"';
+				builder.PutChar('\"');
 				break;
 
 			case ';': // Cmd separator; execute previous and start new command
-				IConsoleCmdExec(alias_buffer, recurse_count);
+				IConsoleCmdExec(builder.GetString(), recurse_count);
 
-				alias_buffer.clear();
-
-				cmdptr++;
+				buffer.clear();
 				break;
 
 			case '%': // Some or all parameters
-				cmdptr++;
-				switch (*cmdptr) {
+				c = consumer.ReadUtf8();
+				switch (*c) {
 					case '+': { // All parameters separated: "[param 1]" "[param 2]"
-						for (uint i = 0; i != tokencount; i++) {
-							if (i != 0) alias_buffer += ' ';
-							alias_buffer += '\"';
-							alias_buffer += tokens[i];
-							alias_buffer += '\"';
+						for (size_t i = 0; i < tokens.size(); ++i) {
+							if (i != 0) builder.PutChar(' ');
+							builder.PutChar('\"');
+							builder += tokens[i];
+							builder.PutChar('\"');
 						}
 						break;
 					}
 
 					case '!': { // Merge the parameters to one: "[param 1] [param 2] [param 3...]"
-						alias_buffer += '\"';
-						for (uint i = 0; i != tokencount; i++) {
-							if (i != 0) alias_buffer += " ";
-							alias_buffer += tokens[i];
+						builder.PutChar('\"');
+						for (size_t i = 0; i < tokens.size(); ++i) {
+							if (i != 0) builder.PutChar(' ');
+							builder += tokens[i];
 						}
-						alias_buffer += '\"';
+						builder.PutChar('\"');
 						break;
 					}
 
 					default: { // One specific parameter: %A = [param 1] %B = [param 2] ...
-						int param = *cmdptr - 'A';
+						size_t param = *c - 'A';
 
-						if (param < 0 || param >= tokencount) {
+						if (param >= tokens.size()) {
 							IConsolePrint(CC_ERROR, "Too many or wrong amount of parameters passed to alias.");
 							IConsolePrint(CC_HELP, "Usage of alias '{}': '{}'.", alias->name, alias->cmdline);
 							return;
 						}
 
-						alias_buffer += '\"';
-						alias_buffer += tokens[param];
-						alias_buffer += '\"';
+						builder.PutChar('\"');
+						builder += tokens[param];
+						builder.PutChar('\"');
 						break;
 					}
 				}
 				break;
 
 			default:
-				alias_buffer += *cmdptr;
+				builder.PutUtf8(*c);
 				break;
 		}
-
-		if (alias_buffer.size() >= ICON_MAX_STREAMSIZE - 1) {
-			IConsolePrint(CC_ERROR, "Requested alias execution would overflow execution buffer.");
-			return;
-		}
 	}
 
-	IConsoleCmdExec(alias_buffer, recurse_count);
+	IConsoleCmdExec(builder.GetString(), recurse_count);
 }
 
 /**
@@ -288,88 +266,73 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, uint8_t tokencount, ch
  * individual tokens (separated by spaces), then execute it if possible
  * @param command_string string to be parsed and executed
  */
-void IConsoleCmdExec(const std::string &command_string, const uint recurse_count)
+void IConsoleCmdExec(std::string_view command_string, const uint recurse_count)
 {
-	const char *cmdptr;
-	char *tokens[ICON_TOKEN_COUNT], tokenstream[ICON_MAX_STREAMSIZE];
-	uint t_index, tstream_i;
-
-	bool longtoken = false;
-	bool foundtoken = false;
-
 	if (command_string[0] == '#') return; // comments
 
-	for (cmdptr = command_string.c_str(); *cmdptr != '\0'; cmdptr++) {
-		if (!IsValidChar(*cmdptr, CS_ALPHANUMERAL)) {
-			IConsolePrint(CC_ERROR, "Command '{}' contains malformed characters.", command_string);
-			return;
-		}
-	}
-
 	Debug(console, 4, "Executing cmdline: '{}'", command_string);
 
-	memset(&tokens, 0, sizeof(tokens));
-	memset(&tokenstream, 0, sizeof(tokenstream));
+	std::string buffer;
+	StringBuilder builder{buffer};
+	StringConsumer consumer{command_string};
+
+	std::vector<std::string> tokens;
+	bool found_token = false;
+	bool in_quotes = false;
 
 	/* 1. Split up commandline into tokens, separated by spaces, commands
 	 * enclosed in "" are taken as one token. We can only go as far as the amount
 	 * of characters in our stream or the max amount of tokens we can handle */
-	for (cmdptr = command_string.c_str(), t_index = 0, tstream_i = 0; *cmdptr != '\0'; cmdptr++) {
-		if (tstream_i >= lengthof(tokenstream)) {
-			IConsolePrint(CC_ERROR, "Command line too long.");
+	while (consumer.AnyBytesLeft()) {
+		auto c = consumer.TryReadUtf8();
+		if (!c.has_value()) {
+			IConsolePrint(CC_ERROR, "Command '{}' contains malformed characters.", command_string);
 			return;
 		}
 
-		switch (*cmdptr) {
-		case ' ': // Token separator
-			if (!foundtoken) break;
+		switch (*c) {
+			case ' ': // Token separator
+				if (!found_token) break;
 
-			if (longtoken) {
-				tokenstream[tstream_i] = *cmdptr;
-			} else {
-				tokenstream[tstream_i] = '\0';
-				foundtoken = false;
-			}
-
-			tstream_i++;
-			break;
-		case '"': // Tokens enclosed in "" are one token
-			longtoken = !longtoken;
-			if (!foundtoken) {
-				if (t_index >= lengthof(tokens)) {
-					IConsolePrint(CC_ERROR, "Command line too long.");
-					return;
+				if (in_quotes) {
+					builder.PutUtf8(*c);
+					break;
 				}
-				tokens[t_index++] = &tokenstream[tstream_i];
-				foundtoken = true;
-			}
-			break;
-		case '\\': // Escape character for ""
-			if (cmdptr[1] == '"' && tstream_i + 1 < lengthof(tokenstream)) {
-				tokenstream[tstream_i++] = *++cmdptr;
+
+				tokens.emplace_back(std::move(buffer));
+				buffer.clear();
+				found_token = false;
 				break;
-			}
-			[[fallthrough]];
-		default: // Normal character
-			tokenstream[tstream_i++] = *cmdptr;
 
-			if (!foundtoken) {
-				if (t_index >= lengthof(tokens)) {
-					IConsolePrint(CC_ERROR, "Command line too long.");
-					return;
+			case '"': // Tokens enclosed in "" are one token
+				in_quotes = !in_quotes;
+				found_token = true;
+				break;
+
+			case '\\': // Escape character for ""
+				if (consumer.ReadUtf8If('"')) {
+					builder.PutUtf8('"');
+					break;
 				}
-				tokens[t_index++] = &tokenstream[tstream_i - 1];
-				foundtoken = true;
-			}
-			break;
+				[[fallthrough]];
+
+			default: // Normal character
+				builder.PutUtf8(*c);
+				found_token = true;
+				break;
 		}
 	}
 
-	for (uint i = 0; i < lengthof(tokens) && tokens[i] != nullptr; i++) {
+	if (found_token) {
+		tokens.emplace_back(std::move(buffer));
+		buffer.clear();
+	}
+
+	for (size_t i = 0; i < tokens.size(); i++) {
 		Debug(console, 8, "Token {} is: '{}'", i, tokens[i]);
 	}
 
-	if (StrEmpty(tokens[0])) return; // don't execute empty commands
+	if (tokens.empty() || tokens[0].empty()) return; // don't execute empty commands
 	/* 2. Determine type of command (cmd or alias) and execute
 	 * First try commands, then aliases. Execute
 	 * the found action taking into account its hooking code
@@ -378,21 +341,23 @@ void IConsoleCmdExec(const std::string &command_string, const uint recurse_count
 	if (cmd != nullptr) {
 		ConsoleHookResult chr = (cmd->hook == nullptr ? CHR_ALLOW : cmd->hook(true));
 		switch (chr) {
-			case CHR_ALLOW:
-				if (!cmd->proc(t_index, tokens)) { // index started with 0
-					cmd->proc(0, nullptr); // if command failed, give help
+			case CHR_ALLOW: {
+				std::vector<std::string_view> views;
+				for (auto &token : tokens) views.emplace_back(token);
+				if (!cmd->proc(views)) { // index started with 0
+					cmd->proc({}); // if command failed, give help
 				}
 				return;
+			}
 
 			case CHR_DISALLOW: return;
 			case CHR_HIDE: break;
 		}
 	}
 
-	t_index--;
 	IConsoleAlias *alias = IConsole::AliasGet(tokens[0]);
 	if (alias != nullptr) {
-		IConsoleAliasExec(alias, t_index, &tokens[1], recurse_count + 1);
+		IConsoleAliasExec(alias, std::span(tokens).subspan(1), recurse_count + 1);
 		return;
 	}
 
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 93151f364b..3293c4704f 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -8,6 +8,7 @@
 /** @file console_cmds.cpp Implementation of the console hooks. */
 
 #include "stdafx.h"
+#include "core/string_consumer.hpp"
 #include "console_internal.h"
 #include "debug.h"
 #include "engine_func.h"
@@ -56,7 +57,7 @@ static uint _script_current_depth; ///< Depth of scripts running (used to abort
 static std::string _scheduled_monthly_script; ///< Script scheduled to execute by the 'schedule' console command (empty if no script is scheduled).
 
 /** Timer that runs every month of game time for the 'schedule' console command. */
-static IntervalTimer<TimerGameCalendar> _scheduled_monthly_timer = {{TimerGameCalendar::MONTH, TimerGameCalendar::Priority::NONE}, [](auto) {
+static const IntervalTimer<TimerGameCalendar> _scheduled_monthly_timer = {{TimerGameCalendar::MONTH, TimerGameCalendar::Priority::NONE}, [](auto) {
 	if (_scheduled_monthly_script.empty()) {
 		return;
 	}
@@ -67,9 +68,23 @@ static IntervalTimer<TimerGameCalendar> _scheduled_monthly_timer = {{TimerGameCa
 	_scheduled_monthly_script.clear();
 
 	IConsolePrint(CC_DEFAULT, "Executing scheduled script file '{}'...", filename);
-	IConsoleCmdExec(std::string("exec") + " " + filename);
+	IConsoleCmdExec(fmt::format("exec {}", filename));
 }};
 
+/**
+ * Parse an integer using #ParseInteger and convert it to the requested type.
+ * @param arg The string to be converted.
+ * @tparam T The type to return.
+ * @return The number in the given type, or std::nullopt when it could not be parsed.
+ */
+template <typename T>
+static std::optional<T> ParseType(std::string_view arg)
+{
+	auto i = ParseInteger(arg);
+	if (i.has_value()) return static_cast<T>(*i);
+	return std::nullopt;
+}
+
 /** File list storage for the console, for caching the last 'ls' command. */
 class ConsoleFileList : public FileList {
 public:
@@ -105,11 +120,6 @@ static ConsoleFileList _console_file_list_savegame{FT_SAVEGAME, true}; ///< File
 static ConsoleFileList _console_file_list_scenario{FT_SCENARIO, false}; ///< File storage cache for scenarios.
 static ConsoleFileList _console_file_list_heightmap{FT_HEIGHTMAP, false}; ///< File storage cache for heightmaps.
 
-/* console command defines */
-#define DEF_CONSOLE_CMD(function) static bool function([[maybe_unused]] uint8_t argc, [[maybe_unused]] char *argv[])
-#define DEF_CONSOLE_HOOK(function) static ConsoleHookResult function(bool echo)
-
-
 /****************
  * command hooks
  ****************/
@@ -131,7 +141,7 @@ static inline bool NetworkAvailable(bool echo)
  * Check whether we are a server.
  * @return Are we a server? True when yes, false otherwise.
  */
-DEF_CONSOLE_HOOK(ConHookServerOnly)
+static ConsoleHookResult ConHookServerOnly(bool echo)
 {
 	if (!NetworkAvailable(echo)) return CHR_DISALLOW;
 
@@ -146,7 +156,7 @@ DEF_CONSOLE_HOOK(ConHookServerOnly)
  * Check whether we are a client in a network game.
  * @return Are we a client in a network game? True when yes, false otherwise.
  */
-DEF_CONSOLE_HOOK(ConHookClientOnly)
+static ConsoleHookResult ConHookClientOnly(bool echo)
 {
 	if (!NetworkAvailable(echo)) return CHR_DISALLOW;
 
@@ -161,7 +171,7 @@ DEF_CONSOLE_HOOK(ConHookClientOnly)
  * Check whether we are in a multiplayer game.
  * @return True when we are client or server in a network game.
  */
-DEF_CONSOLE_HOOK(ConHookNeedNetwork)
+static ConsoleHookResult ConHookNeedNetwork(bool echo)
 {
 	if (!NetworkAvailable(echo)) return CHR_DISALLOW;
 
@@ -176,7 +186,7 @@ DEF_CONSOLE_HOOK(ConHookNeedNetwork)
  * Check whether we are in a multiplayer game and are playing, i.e. we are not the dedicated server.
  * @return Are we a client or non-dedicated server in a network game? True when yes, false otherwise.
  */
-DEF_CONSOLE_HOOK(ConHookNeedNonDedicatedNetwork)
+static ConsoleHookResult ConHookNeedNonDedicatedNetwork(bool echo)
 {
 	if (!NetworkAvailable(echo)) return CHR_DISALLOW;
 
@@ -191,7 +201,7 @@ DEF_CONSOLE_HOOK(ConHookNeedNonDedicatedNetwork)
  * Check whether we are in singleplayer mode.
  * @return True when no network is active.
  */
-DEF_CONSOLE_HOOK(ConHookNoNetwork)
+static ConsoleHookResult ConHookNoNetwork(bool echo)
 {
 	if (_networking) {
 		if (echo) IConsolePrint(CC_ERROR, "This command is forbidden in multiplayer.");
@@ -204,7 +214,7 @@ DEF_CONSOLE_HOOK(ConHookNoNetwork)
  * Check if are either in singleplayer or a server.
  * @return True iff we are either in singleplayer or a server.
  */
-DEF_CONSOLE_HOOK(ConHookServerOrNoNetwork)
+static ConsoleHookResult ConHookServerOrNoNetwork(bool echo)
 {
 	if (_networking && !_network_server) {
 		if (echo) IConsolePrint(CC_ERROR, "This command is only available to a network server.");
@@ -213,7 +223,7 @@ DEF_CONSOLE_HOOK(ConHookServerOrNoNetwork)
 	return CHR_ALLOW;
 }
 
-DEF_CONSOLE_HOOK(ConHookNewGRFDeveloperTool)
+static ConsoleHookResult ConHookNewGRFDeveloperTool(bool echo)
 {
 	if (_settings_client.gui.newgrf_developer_tools) {
 		if (_game_mode == GM_MENU) {
@@ -229,9 +239,9 @@ DEF_CONSOLE_HOOK(ConHookNewGRFDeveloperTool)
  * Reset status of all engines.
  * @return Will always succeed.
  */
-DEF_CONSOLE_CMD(ConResetEngines)
+static bool ConResetEngines(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Reset status data of all engines. This might solve some issues with 'lost' engines. Usage: 'resetengines'.");
 		return true;
 	}
@@ -245,9 +255,9 @@ DEF_CONSOLE_CMD(ConResetEngines)
  * @return Will always return true.
  * @note Resetting the pool only succeeds when there are no vehicles ingame.
  */
-DEF_CONSOLE_CMD(ConResetEnginePool)
+static bool ConResetEnginePool(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Reset NewGRF allocations of engine slots. This will remove invalid engine definitions, and might make default engines available again.");
 		return true;
 	}
@@ -271,18 +281,18 @@ DEF_CONSOLE_CMD(ConResetEnginePool)
  * param tile number.
  * @return True when the tile is reset or the help on usage was printed (0 or two parameters).
  */
-DEF_CONSOLE_CMD(ConResetTile)
+static bool ConResetTile(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Reset a tile to bare land. Usage: 'resettile <tile>'.");
 		IConsolePrint(CC_HELP, "Tile can be either decimal (34161) or hexadecimal (0x4a5B).");
 		return true;
 	}
 
-	if (argc == 2) {
-		uint32_t result;
-		if (GetArgumentInteger(&result, argv[1])) {
-			DoClearSquare((TileIndex)result);
+	if (argv.size() == 2) {
+		auto result = ParseInteger(argv[1], 0);
+		if (result.has_value() && IsValidTile(*result)) {
+			DoClearSquare(TileIndex{*result});
 			return true;
 		}
 	}
@@ -296,46 +306,39 @@ DEF_CONSOLE_CMD(ConResetTile)
  * param level As defined by ZoomLevel and as limited by zoom_min/zoom_max from GUISettings.
  * @return True when either console help was shown or a proper amount of parameters given.
  */
-DEF_CONSOLE_CMD(ConZoomToLevel)
+static bool ConZoomToLevel(std::span<std::string_view> argv)
 {
-	switch (argc) {
+	switch (argv.size()) {
 		case 0:
 			IConsolePrint(CC_HELP, "Set the current zoom level of the main viewport.");
 			IConsolePrint(CC_HELP, "Usage: 'zoomto <level>'.");
 
-			if (ZOOM_LVL_MIN < _settings_client.gui.zoom_min) {
-				IConsolePrint(CC_HELP, "The lowest zoom-in level allowed by current client settings is {}.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min));
+			if (ZoomLevel::Min < _settings_client.gui.zoom_min) {
+				IConsolePrint(CC_HELP, "The lowest zoom-in level allowed by current client settings is {}.", std::max(ZoomLevel::Min, _settings_client.gui.zoom_min));
 			} else {
-				IConsolePrint(CC_HELP, "The lowest supported zoom-in level is {}.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min));
+				IConsolePrint(CC_HELP, "The lowest supported zoom-in level is {}.", std::max(ZoomLevel::Min, _settings_client.gui.zoom_min));
 			}
 
-			if (_settings_client.gui.zoom_max < ZOOM_LVL_MAX) {
-				IConsolePrint(CC_HELP, "The highest zoom-out level allowed by current client settings is {}.", std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX));
+			if (_settings_client.gui.zoom_max < ZoomLevel::Max) {
+				IConsolePrint(CC_HELP, "The highest zoom-out level allowed by current client settings is {}.", std::min(_settings_client.gui.zoom_max, ZoomLevel::Max));
 			} else {
-				IConsolePrint(CC_HELP, "The highest supported zoom-out level is {}.", std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX));
+				IConsolePrint(CC_HELP, "The highest supported zoom-out level is {}.", std::min(_settings_client.gui.zoom_max, ZoomLevel::Max));
 			}
 			return true;
 
 		case 2: {
-			uint32_t level;
-			if (GetArgumentInteger(&level, argv[1])) {
-				/* In case ZOOM_LVL_MIN is more than 0, the next if statement needs to be amended.
-				 * A simple check for less than ZOOM_LVL_MIN does not work here because we are
-				 * reading an unsigned integer from the console, so just check for a '-' char. */
-				static_assert(ZOOM_LVL_MIN == 0);
-				if (argv[1][0] == '-') {
-					IConsolePrint(CC_ERROR, "Zoom-in levels below {} are not supported.", ZOOM_LVL_MIN);
-				} else if (level < _settings_client.gui.zoom_min) {
-					IConsolePrint(CC_ERROR, "Current client settings do not allow zooming in below level {}.", _settings_client.gui.zoom_min);
-				} else if (level > ZOOM_LVL_MAX) {
-					IConsolePrint(CC_ERROR, "Zoom-in levels above {} are not supported.", ZOOM_LVL_MAX);
-				} else if (level > _settings_client.gui.zoom_max) {
-					IConsolePrint(CC_ERROR, "Current client settings do not allow zooming out beyond level {}.", _settings_client.gui.zoom_max);
+			auto level = ParseInteger<std::underlying_type_t<ZoomLevel>>(argv[1]);
+			if (level.has_value()) {
+				auto zoom_lvl = static_cast<ZoomLevel>(*level);
+				if (!IsInsideMM(zoom_lvl, ZoomLevel::Begin, ZoomLevel::End)) {
+					IConsolePrint(CC_ERROR, "Invalid zoom level. Valid range is {} to {}.", ZoomLevel::Min, ZoomLevel::Max);
+				} else if (!IsInsideMM(zoom_lvl, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max + 1)) {
+					IConsolePrint(CC_ERROR, "Current client settings limit zoom levels to range {} to {}.", _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
 				} else {
 					Window *w = GetMainWindow();
 					Viewport &vp = *w->viewport;
-					while (vp.zoom > level) DoZoomInOutWindow(ZOOM_IN, w);
-					while (vp.zoom < level) DoZoomInOutWindow(ZOOM_OUT, w);
+					while (vp.zoom > zoom_lvl) DoZoomInOutWindow(ZOOM_IN, w);
+					while (vp.zoom < zoom_lvl) DoZoomInOutWindow(ZOOM_OUT, w);
 				}
 				return true;
 			}
@@ -355,46 +358,47 @@ DEF_CONSOLE_CMD(ConZoomToLevel)
  *       and y coordinates.
  * @return True when either console help was shown or a proper amount of parameters given.
  */
-DEF_CONSOLE_CMD(ConScrollToTile)
+static bool ConScrollToTile(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Center the screen on a given tile.");
 		IConsolePrint(CC_HELP, "Usage: 'scrollto [instant] <tile>' or 'scrollto [instant] <x> <y>'.");
 		IConsolePrint(CC_HELP, "Numbers can be either decimal (34161) or hexadecimal (0x4a5B).");
 		IConsolePrint(CC_HELP, "'instant' will immediately move and redraw viewport without smooth scrolling.");
 		return true;
 	}
-	if (argc < 2) return false;
+	if (argv.size() < 2) return false;
 
 	uint32_t arg_index = 1;
 	bool instant = false;
-	if (strcmp(argv[arg_index], "instant") == 0) {
+	if (argv[arg_index] == "instant") {
 		++arg_index;
 		instant = true;
 	}
 
-	switch (argc - arg_index) {
+	switch (argv.size() - arg_index) {
 		case 1: {
-			uint32_t result;
-			if (GetArgumentInteger(&result, argv[arg_index])) {
-				if (result >= Map::Size()) {
+			auto result = ParseInteger(argv[arg_index], 0);
+			if (result.has_value()) {
+				if (*result >= Map::Size()) {
 					IConsolePrint(CC_ERROR, "Tile does not exist.");
 					return true;
 				}
-				ScrollMainWindowToTile((TileIndex)result, instant);
+				ScrollMainWindowToTile(TileIndex{*result}, instant);
 				return true;
 			}
 			break;
 		}
 
 		case 2: {
-			uint32_t x, y;
-			if (GetArgumentInteger(&x, argv[arg_index]) && GetArgumentInteger(&y, argv[arg_index + 1])) {
-				if (x >= Map::SizeX() || y >= Map::SizeY()) {
+			auto x = ParseInteger(argv[arg_index], 0);
+			auto y = ParseInteger(argv[arg_index + 1], 0);
+			if (x.has_value() && y.has_value()) {
+				if (*x >= Map::SizeX() || *y >= Map::SizeY()) {
 					IConsolePrint(CC_ERROR, "Tile does not exist.");
 					return true;
 				}
-				ScrollMainWindowToTile(TileXY(x, y), instant);
+				ScrollMainWindowToTile(TileXY(*x, *y), instant);
 				return true;
 			}
 			break;
@@ -409,16 +413,15 @@ DEF_CONSOLE_CMD(ConScrollToTile)
  * param filename the filename to save the map to.
  * @return True when help was displayed or the file attempted to be saved.
  */
-DEF_CONSOLE_CMD(ConSave)
+static bool ConSave(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Save the current game. Usage: 'save <filename>'.");
 		return true;
 	}
 
-	if (argc == 2) {
-		std::string filename = argv[1];
-		filename += ".sav";
+	if (argv.size() == 2) {
+		std::string filename = fmt::format("{}.sav", argv[1]);
 		IConsolePrint(CC_DEFAULT, "Saving map...");
 
 		if (SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, SAVE_DIR) != SL_OK) {
@@ -436,9 +439,9 @@ DEF_CONSOLE_CMD(ConSave)
  * Explicitly save the configuration.
  * @return True.
  */
-DEF_CONSOLE_CMD(ConSaveConfig)
+static bool ConSaveConfig(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Saves the configuration for new games to the configuration file, typically 'openttd.cfg'.");
 		IConsolePrint(CC_HELP, "It does not save the configuration of the current game to the configuration file.");
 		return true;
@@ -449,20 +452,20 @@ DEF_CONSOLE_CMD(ConSaveConfig)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConLoad)
+static bool ConLoad(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Load a game by name or index. Usage: 'load <file | number>'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
-	const char *file = argv[1];
+	std::string_view file = argv[1];
 	_console_file_list_savegame.ValidateFileList();
 	const FiosItem *item = _console_file_list_savegame.FindItem(file);
 	if (item != nullptr) {
-		if (GetAbstractFileType(item->type) == FT_SAVEGAME) {
+		if (item->type.abstract == FT_SAVEGAME) {
 			_switch_mode = SM_LOAD_GAME;
 			_file_to_saveload.Set(*item);
 		} else {
@@ -475,20 +478,20 @@ DEF_CONSOLE_CMD(ConLoad)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConLoadScenario)
+static bool ConLoadScenario(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Load a scenario by name or index. Usage: 'load_scenario <file | number>'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
-	const char *file = argv[1];
+	std::string_view file = argv[1];
 	_console_file_list_scenario.ValidateFileList();
 	const FiosItem *item = _console_file_list_scenario.FindItem(file);
 	if (item != nullptr) {
-		if (GetAbstractFileType(item->type) == FT_SCENARIO) {
+		if (item->type.abstract == FT_SCENARIO) {
 			_switch_mode = SM_LOAD_GAME;
 			_file_to_saveload.Set(*item);
 		} else {
@@ -501,20 +504,20 @@ DEF_CONSOLE_CMD(ConLoadScenario)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConLoadHeightmap)
+static bool ConLoadHeightmap(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Load a heightmap by name or index. Usage: 'load_heightmap <file | number>'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
-	const char *file = argv[1];
+	std::string_view file = argv[1];
 	_console_file_list_heightmap.ValidateFileList();
 	const FiosItem *item = _console_file_list_heightmap.FindItem(file);
 	if (item != nullptr) {
-		if (GetAbstractFileType(item->type) == FT_HEIGHTMAP) {
+		if (item->type.abstract == FT_HEIGHTMAP) {
 			_switch_mode = SM_START_HEIGHTMAP;
 			_file_to_saveload.Set(*item);
 		} else {
@@ -527,21 +530,25 @@ DEF_CONSOLE_CMD(ConLoadHeightmap)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConRemove)
+static bool ConRemove(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Remove a savegame by name or index. Usage: 'rm <file | number>'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
-	const char *file = argv[1];
+	std::string_view file = argv[1];
 	_console_file_list_savegame.ValidateFileList();
 	const FiosItem *item = _console_file_list_savegame.FindItem(file);
 	if (item != nullptr) {
-		if (!FioRemove(item->name)) {
-			IConsolePrint(CC_ERROR, "Failed to delete '{}'.", item->name);
+		if (item->type.abstract == FT_SAVEGAME) {
+			if (!FioRemove(item->name)) {
+				IConsolePrint(CC_ERROR, "Failed to delete '{}'.", item->name);
+			}
+		} else {
+			IConsolePrint(CC_ERROR, "'{}' is not a savegame.", file);
 		}
 	} else {
 		IConsolePrint(CC_ERROR, "'{}' could not be found.", file);
@@ -553,9 +560,9 @@ DEF_CONSOLE_CMD(ConRemove)
 
 
 /* List all the files in the current dir via console */
-DEF_CONSOLE_CMD(ConListFiles)
+static bool ConListFiles(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List all loadable savegames and directories in the current dir via console. Usage: 'ls | dir'.");
 		return true;
 	}
@@ -569,9 +576,9 @@ DEF_CONSOLE_CMD(ConListFiles)
 }
 
 /* List all the scenarios */
-DEF_CONSOLE_CMD(ConListScenarios)
+static bool ConListScenarios(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List all loadable scenarios. Usage: 'list_scenarios'.");
 		return true;
 	}
@@ -585,9 +592,9 @@ DEF_CONSOLE_CMD(ConListScenarios)
 }
 
 /* List all the heightmaps */
-DEF_CONSOLE_CMD(ConListHeightmaps)
+static bool ConListHeightmaps(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List all loadable heightmaps. Usage: 'list_heightmaps'.");
 		return true;
 	}
@@ -601,21 +608,23 @@ DEF_CONSOLE_CMD(ConListHeightmaps)
 }
 
 /* Change the dir via console */
-DEF_CONSOLE_CMD(ConChangeDirectory)
+static bool ConChangeDirectory(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Change the dir via console. Usage: 'cd <directory | number>'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
-	const char *file = argv[1];
+	std::string_view file = argv[1];
 	_console_file_list_savegame.ValidateFileList(true);
 	const FiosItem *item = _console_file_list_savegame.FindItem(file);
 	if (item != nullptr) {
-		switch (item->type) {
-			case FIOS_TYPE_DIR: case FIOS_TYPE_DRIVE: case FIOS_TYPE_PARENT:
+		switch (item->type.detailed) {
+			case DFT_FIOS_DIR:
+			case DFT_FIOS_DRIVE:
+			case DFT_FIOS_PARENT:
 				FiosBrowseTo(item);
 				break;
 			default: IConsolePrint(CC_ERROR, "{}: Not a directory.", file);
@@ -628,9 +637,9 @@ DEF_CONSOLE_CMD(ConChangeDirectory)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConPrintWorkingDirectory)
+static bool ConPrintWorkingDirectory(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Print out the current working directory. Usage: 'pwd'.");
 		return true;
 	}
@@ -643,9 +652,9 @@ DEF_CONSOLE_CMD(ConPrintWorkingDirectory)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConClearBuffer)
+static bool ConClearBuffer(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Clear the console buffer. Usage: 'clear'.");
 		return true;
 	}
@@ -660,38 +669,42 @@ DEF_CONSOLE_CMD(ConClearBuffer)
  * Network Core Console Commands
  **********************************/
 
-static bool ConKickOrBan(const char *argv, bool ban, const std::string &reason)
+static bool ConKickOrBan(std::string_view arg, bool ban, std::string_view reason)
 {
 	uint n;
 
-	if (strchr(argv, '.') == nullptr && strchr(argv, ':') == nullptr) { // banning with ID
-		ClientID client_id = (ClientID)atoi(argv);
+	if (arg.find_first_of(".:") == std::string::npos) { // banning with ID
+		auto client_id = ParseType<ClientID>(arg);
+		if (!client_id.has_value()) {
+			IConsolePrint(CC_ERROR, "The given client-id is not a valid number.");
+			return true;
+		}
 
 		/* Don't kill the server, or the client doing the rcon. The latter can't be kicked because
 		 * kicking frees closes and subsequently free the connection related instances, which we
 		 * would be reading from and writing to after returning. So we would read or write data
 		 * from freed memory up till the segfault triggers. */
-		if (client_id == CLIENT_ID_SERVER || client_id == _redirect_console_to_client) {
+		if (*client_id == CLIENT_ID_SERVER || *client_id == _redirect_console_to_client) {
 			IConsolePrint(CC_ERROR, "You can not {} yourself!", ban ? "ban" : "kick");
 			return true;
 		}
 
-		NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(client_id);
+		NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(*client_id);
 		if (ci == nullptr) {
-			IConsolePrint(CC_ERROR, "Invalid client ID.");
+			IConsolePrint(CC_ERROR, "Invalid client-id.");
 			return true;
 		}
 
 		if (!ban) {
 			/* Kick only this client, not all clients with that IP */
-			NetworkServerKickClient(client_id, reason);
+			NetworkServerKickClient(*client_id, reason);
 			return true;
 		}
 
 		/* When banning, kick+ban all clients with that IP */
-		n = NetworkServerKickOrBanIP(client_id, ban, reason);
+		n = NetworkServerKickOrBanIP(*client_id, ban, reason);
 	} else {
-		n = NetworkServerKickOrBanIP(argv, ban, reason);
+		n = NetworkServerKickOrBanIP(arg, ban, reason);
 	}
 
 	if (n == 0) {
@@ -703,21 +716,21 @@ static bool ConKickOrBan(const char *argv, bool ban, const std::string &reason)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConKick)
+static bool ConKick(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Kick a client from a network game. Usage: 'kick <ip | client-id> [<kick-reason>]'.");
 		IConsolePrint(CC_HELP, "For client-id's, see the command 'clients'.");
 		return true;
 	}
 
-	if (argc != 2 && argc != 3) return false;
+	if (argv.size() != 2 && argv.size() != 3) return false;
 
 	/* No reason supplied for kicking */
-	if (argc == 2) return ConKickOrBan(argv[1], false, {});
+	if (argv.size() == 2) return ConKickOrBan(argv[1], false, {});
 
 	/* Reason for kicking supplied */
-	size_t kick_message_length = strlen(argv[2]);
+	size_t kick_message_length = argv[2].size();
 	if (kick_message_length >= 255) {
 		IConsolePrint(CC_ERROR, "Maximum kick message length is 254 characters. You entered {} characters.", kick_message_length);
 		return false;
@@ -726,22 +739,22 @@ DEF_CONSOLE_CMD(ConKick)
 	}
 }
 
-DEF_CONSOLE_CMD(ConBan)
+static bool ConBan(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Ban a client from a network game. Usage: 'ban <ip | client-id> [<ban-reason>]'.");
 		IConsolePrint(CC_HELP, "For client-id's, see the command 'clients'.");
 		IConsolePrint(CC_HELP, "If the client is no longer online, you can still ban their IP.");
 		return true;
 	}
 
-	if (argc != 2 && argc != 3) return false;
+	if (argv.size() != 2 && argv.size() != 3) return false;
 
 	/* No reason supplied for kicking */
-	if (argc == 2) return ConKickOrBan(argv[1], true, {});
+	if (argv.size() == 2) return ConKickOrBan(argv[1], true, {});
 
 	/* Reason for kicking supplied */
-	size_t kick_message_length = strlen(argv[2]);
+	size_t kick_message_length = argv[2].size();
 	if (kick_message_length >= 255) {
 		IConsolePrint(CC_ERROR, "Maximum kick message length is 254 characters. You entered {} characters.", kick_message_length);
 		return false;
@@ -750,15 +763,15 @@ DEF_CONSOLE_CMD(ConBan)
 	}
 }
 
-DEF_CONSOLE_CMD(ConUnBan)
+static bool ConUnBan(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Unban a client from a network game. Usage: 'unban <ip | banlist-index>'.");
 		IConsolePrint(CC_HELP, "For a list of banned IP's, see the command 'banlist'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
 	/* Try by IP. */
 	uint index;
@@ -768,7 +781,7 @@ DEF_CONSOLE_CMD(ConUnBan)
 
 	/* Try by index. */
 	if (index >= _network_ban_list.size()) {
-		index = atoi(argv[1]) - 1U; // let it wrap
+		index = ParseInteger(argv[1]).value_or(0) - 1U; // let it wrap
 	}
 
 	if (index < _network_ban_list.size()) {
@@ -782,9 +795,9 @@ DEF_CONSOLE_CMD(ConUnBan)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConBanList)
+static bool ConBanList(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List the IP's of banned clients: Usage 'banlist'.");
 		return true;
 	}
@@ -800,9 +813,9 @@ DEF_CONSOLE_CMD(ConBanList)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConPauseGame)
+static bool ConPauseGame(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Pause a network game. Usage: 'pause'.");
 		return true;
 	}
@@ -822,9 +835,9 @@ DEF_CONSOLE_CMD(ConPauseGame)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConUnpauseGame)
+static bool ConUnpauseGame(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Unpause a network game. Usage: 'unpause'.");
 		return true;
 	}
@@ -848,16 +861,16 @@ DEF_CONSOLE_CMD(ConUnpauseGame)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConRcon)
+static bool ConRcon(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Remote control the server from another client. Usage: 'rcon <password> <command>'.");
 		IConsolePrint(CC_HELP, "Remember to enclose the command in quotes, otherwise only the first parameter is sent.");
 		IConsolePrint(CC_HELP, "When your client's public key is in the 'authorized keys' for 'rcon', the password is not checked and may be '*'.");
 		return true;
 	}
 
-	if (argc < 3) return false;
+	if (argv.size() < 3) return false;
 
 	if (_network_server) {
 		IConsoleCmdExec(argv[2]);
@@ -867,9 +880,9 @@ DEF_CONSOLE_CMD(ConRcon)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConStatus)
+static bool ConStatus(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List the status of all clients connected to the server. Usage 'status'.");
 		return true;
 	}
@@ -878,9 +891,9 @@ DEF_CONSOLE_CMD(ConStatus)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConServerInfo)
+static bool ConServerInfo(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List current and maximum client/company limits. Usage 'server_info'.");
 		IConsolePrint(CC_HELP, "You can change these values by modifying settings 'network.max_clients' and 'network.max_companies'.");
 		return true;
@@ -894,49 +907,63 @@ DEF_CONSOLE_CMD(ConServerInfo)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConClientNickChange)
+static bool ConClientNickChange(std::span<std::string_view> argv)
 {
-	if (argc != 3) {
+	if (argv.size() != 3) {
 		IConsolePrint(CC_HELP, "Change the nickname of a connected client. Usage: 'client_name <client-id> <new-name>'.");
 		IConsolePrint(CC_HELP, "For client-id's, see the command 'clients'.");
 		return true;
 	}
 
-	ClientID client_id = (ClientID)atoi(argv[1]);
+	auto client_id = ParseType<ClientID>(argv[1]);
+	if (!client_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given client-id is not a valid number.");
+		return true;
+	}
 
-	if (client_id == CLIENT_ID_SERVER) {
+	if (*client_id == CLIENT_ID_SERVER) {
 		IConsolePrint(CC_ERROR, "Please use the command 'name' to change your own name!");
 		return true;
 	}
 
-	if (NetworkClientInfo::GetByClientID(client_id) == nullptr) {
-		IConsolePrint(CC_ERROR, "Invalid client ID.");
+	if (NetworkClientInfo::GetByClientID(*client_id) == nullptr) {
+		IConsolePrint(CC_ERROR, "Invalid client-id.");
 		return true;
 	}
 
-	std::string client_name(argv[2]);
-	StrTrimInPlace(client_name);
+	std::string client_name{StrTrimView(argv[2], StringConsumer::WHITESPACE_NO_NEWLINE)};
 	if (!NetworkIsValidClientName(client_name)) {
 		IConsolePrint(CC_ERROR, "Cannot give a client an empty name.");
 		return true;
 	}
 
-	if (!NetworkServerChangeClientName(client_id, client_name)) {
+	if (!NetworkServerChangeClientName(*client_id, client_name)) {
 		IConsolePrint(CC_ERROR, "Cannot give a client a duplicate name.");
 	}
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConJoinCompany)
+static std::optional<CompanyID> ParseCompanyID(std::string_view arg)
 {
-	if (argc < 2) {
+	auto company_id = ParseType<CompanyID>(arg);
+	if (company_id.has_value() && *company_id <= MAX_COMPANIES) return static_cast<CompanyID>(*company_id - 1);
+	return company_id;
+}
+
+static bool ConJoinCompany(std::span<std::string_view> argv)
+{
+	if (argv.size() < 2) {
 		IConsolePrint(CC_HELP, "Request joining another company. Usage: 'join <company-id>'.");
 		IConsolePrint(CC_HELP, "For valid company-id see company list, use 255 for spectator.");
 		return true;
 	}
 
-	CompanyID company_id = (CompanyID)(atoi(argv[1]) <= MAX_COMPANIES ? atoi(argv[1]) - 1 : atoi(argv[1]));
+	auto company_id = ParseCompanyID(argv[1]);
+	if (!company_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
+		return true;
+	}
 
 	const NetworkClientInfo *info = NetworkClientInfo::GetByClientID(_network_own_client_id);
 	if (info == nullptr) {
@@ -945,46 +972,56 @@ DEF_CONSOLE_CMD(ConJoinCompany)
 	}
 
 	/* Check we have a valid company id! */
-	if (!Company::IsValidID(company_id) && company_id != COMPANY_SPECTATOR) {
+	if (!Company::IsValidID(*company_id) && *company_id != COMPANY_SPECTATOR) {
 		IConsolePrint(CC_ERROR, "Company does not exist. Company-id must be between 1 and {}.", MAX_COMPANIES);
 		return true;
 	}
 
-	if (info->client_playas == company_id) {
+	if (info->client_playas == *company_id) {
 		IConsolePrint(CC_ERROR, "You are already there!");
 		return true;
 	}
 
-	if (company_id != COMPANY_SPECTATOR && !Company::IsHumanID(company_id)) {
+	if (*company_id != COMPANY_SPECTATOR && !Company::IsHumanID(*company_id)) {
 		IConsolePrint(CC_ERROR, "Cannot join AI company.");
 		return true;
 	}
 
-	if (!info->CanJoinCompany(company_id)) {
+	if (!info->CanJoinCompany(*company_id)) {
 		IConsolePrint(CC_ERROR, "You are not allowed to join this company.");
 		return true;
 	}
 
 	/* non-dedicated server may just do the move! */
 	if (_network_server) {
-		NetworkServerDoMove(CLIENT_ID_SERVER, company_id);
+		NetworkServerDoMove(CLIENT_ID_SERVER, *company_id);
 	} else {
-		NetworkClientRequestMove(company_id);
+		NetworkClientRequestMove(*company_id);
 	}
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConMoveClient)
+static bool ConMoveClient(std::span<std::string_view> argv)
 {
-	if (argc < 3) {
+	if (argv.size() < 3) {
 		IConsolePrint(CC_HELP, "Move a client to another company. Usage: 'move <client-id> <company-id>'.");
 		IConsolePrint(CC_HELP, "For valid client-id see 'clients', for valid company-id see 'companies', use 255 for moving to spectators.");
 		return true;
 	}
 
-	const NetworkClientInfo *ci = NetworkClientInfo::GetByClientID((ClientID)atoi(argv[1]));
-	CompanyID company_id = (CompanyID)(atoi(argv[2]) <= MAX_COMPANIES ? atoi(argv[2]) - 1 : atoi(argv[2]));
+	auto client_id = ParseType<ClientID>(argv[1]);
+	if (!client_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given client-id is not a valid number.");
+		return true;
+	}
+	const NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(*client_id);
+
+	auto company_id = ParseCompanyID(argv[2]);
+	if (!company_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
+		return true;
+	}
 
 	/* check the client exists */
 	if (ci == nullptr) {
@@ -992,12 +1029,12 @@ DEF_CONSOLE_CMD(ConMoveClient)
 		return true;
 	}
 
-	if (!Company::IsValidID(company_id) && company_id != COMPANY_SPECTATOR) {
+	if (!Company::IsValidID(*company_id) && *company_id != COMPANY_SPECTATOR) {
 		IConsolePrint(CC_ERROR, "Company does not exist. Company-id must be between 1 and {}.", MAX_COMPANIES);
 		return true;
 	}
 
-	if (company_id != COMPANY_SPECTATOR && !Company::IsHumanID(company_id)) {
+	if (*company_id != COMPANY_SPECTATOR && !Company::IsHumanID(*company_id)) {
 		IConsolePrint(CC_ERROR, "You cannot move clients to AI companies.");
 		return true;
 	}
@@ -1007,61 +1044,65 @@ DEF_CONSOLE_CMD(ConMoveClient)
 		return true;
 	}
 
-	if (ci->client_playas == company_id) {
+	if (ci->client_playas == *company_id) {
 		IConsolePrint(CC_ERROR, "You cannot move someone to where they already are!");
 		return true;
 	}
 
 	/* we are the server, so force the update */
-	NetworkServerDoMove(ci->client_id, company_id);
+	NetworkServerDoMove(ci->client_id, *company_id);
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConResetCompany)
+static bool ConResetCompany(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Remove an idle company from the game. Usage: 'reset_company <company-id>'.");
 		IConsolePrint(CC_HELP, "For company-id's, see the list of companies from the dropdown menu. Company 1 is 1, etc.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
-	CompanyID index = (CompanyID)(atoi(argv[1]) - 1);
-
-	/* Check valid range */
-	if (!Company::IsValidID(index)) {
-		IConsolePrint(CC_ERROR, "Company does not exist. Company-id must be between 1 and {}.", MAX_COMPANIES);
+	auto index = ParseCompanyID(argv[1]);
+	if (!index.has_value()) {
+		IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
 		return true;
 	}
 
-	if (!Company::IsHumanID(index)) {
+	/* Check valid range */
+	if (!Company::IsValidID(*index)) {
+		IConsolePrint(CC_ERROR, "Company does not exist. company-id must be between 1 and {}.", MAX_COMPANIES);
+		return true;
+	}
+
+	if (!Company::IsHumanID(*index)) {
 		IConsolePrint(CC_ERROR, "Company is owned by an AI.");
 		return true;
 	}
 
-	if (NetworkCompanyHasClients(index)) {
+	if (NetworkCompanyHasClients(*index)) {
 		IConsolePrint(CC_ERROR, "Cannot remove company: a client is connected to that company.");
 		return false;
 	}
 	const NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(CLIENT_ID_SERVER);
 	assert(ci != nullptr);
-	if (ci->client_playas == index) {
+	if (ci->client_playas == *index) {
 		IConsolePrint(CC_ERROR, "Cannot remove company: the server is connected to that company.");
 		return true;
 	}
 
 	/* It is safe to remove this company */
-	Command<CMD_COMPANY_CTRL>::Post(CCA_DELETE, index, CRR_MANUAL, INVALID_CLIENT_ID);
+	Command<CMD_COMPANY_CTRL>::Post(CCA_DELETE, *index, CRR_MANUAL, INVALID_CLIENT_ID);
 	IConsolePrint(CC_DEFAULT, "Company deleted.");
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConNetworkClients)
+static bool ConNetworkClients(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Get a list of connected clients including their ID, name, company-id, and IP. Usage: 'clients'.");
 		return true;
 	}
@@ -1071,24 +1112,24 @@ DEF_CONSOLE_CMD(ConNetworkClients)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConNetworkReconnect)
+static bool ConNetworkReconnect(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
-		IConsolePrint(CC_HELP, "Reconnect to server to which you were connected last time. Usage: 'reconnect [<company>]'.");
-		IConsolePrint(CC_HELP, "Company 255 is spectator (default, if not specified), 0 means creating new company.");
+	if (argv.empty()) {
+		IConsolePrint(CC_HELP, "Reconnect to server to which you were connected last time. Usage: 'reconnect [<company-id>]'.");
+		IConsolePrint(CC_HELP, "Company 255 is spectator (default, if not specified), 254 means creating new company.");
 		IConsolePrint(CC_HELP, "All others are a certain company with Company 1 being #1.");
 		return true;
 	}
 
-	CompanyID playas = (argc >= 2) ? (CompanyID)atoi(argv[1]) : COMPANY_SPECTATOR;
-	switch (playas.base()) {
-		case 0: playas = COMPANY_NEW_COMPANY; break;
-		case COMPANY_SPECTATOR.base(): /* nothing to do */ break;
-		default:
-			/* From a user pov 0 is a new company, internally it's different and all
-			 * companies are offset by one to ease up on users (eg companies 1-8 not 0-7) */
-			if (playas < CompanyID::Begin() + 1 || playas > MAX_COMPANIES + 1) return false;
-			break;
+	CompanyID playas = COMPANY_SPECTATOR;
+	if (argv.size() >= 2) {
+		auto company_id = ParseCompanyID(argv[1]);
+		if (!company_id.has_value()) {
+			IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
+			return true;
+		}
+		if (*company_id >= MAX_COMPANIES && *company_id != COMPANY_NEW_COMPANY && *company_id != COMPANY_SPECTATOR) return false;
+		playas = *company_id;
 	}
 
 	if (_settings_client.network.last_joined.empty()) {
@@ -1102,16 +1143,16 @@ DEF_CONSOLE_CMD(ConNetworkReconnect)
 	return NetworkClientConnectGame(_settings_client.network.last_joined, playas);
 }
 
-DEF_CONSOLE_CMD(ConNetworkConnect)
+static bool ConNetworkConnect(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Connect to a remote OTTD server and join the game. Usage: 'connect <ip>'.");
 		IConsolePrint(CC_HELP, "IP can contain port and company: 'IP[:Port][#Company]', eg: 'server.ottd.org:443#2'.");
 		IConsolePrint(CC_HELP, "Company #255 is spectator all others are a certain company with Company 1 being #1.");
 		return true;
 	}
 
-	if (argc < 2) return false;
+	if (argv.size() < 2) return false;
 
 	return NetworkClientConnectGame(argv[1], COMPANY_NEW_COMPANY);
 }
@@ -1120,19 +1161,20 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
  *  script file console commands
  *********************************/
 
-DEF_CONSOLE_CMD(ConExec)
+static bool ConExec(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
-		IConsolePrint(CC_HELP, "Execute a local script file. Usage: 'exec <script> <?>'.");
+	if (argv.empty()) {
+		IConsolePrint(CC_HELP, "Execute a local script file. Usage: 'exec <script> [0]'.");
+		IConsolePrint(CC_HELP, "By passing '0' after the script name, no warning about a missing script file will be shown.");
 		return true;
 	}
 
-	if (argc < 2) return false;
+	if (argv.size() < 2) return false;
 
 	auto script_file = FioFOpenFile(argv[1], "r", BASE_DIR);
 
 	if (!script_file.has_value()) {
-		if (argc == 2 || atoi(argv[2]) != 0) IConsolePrint(CC_ERROR, "Script file '{}' not found.", argv[1]);
+		if (argv.size() == 2 || argv[2] != "0") IConsolePrint(CC_ERROR, "Script file '{}' not found.", argv[1]);
 		return true;
 	}
 
@@ -1144,15 +1186,13 @@ DEF_CONSOLE_CMD(ConExec)
 	_script_current_depth++;
 	uint script_depth = _script_current_depth;
 
-	char cmdline[ICON_CMDLN_SIZE];
-	while (fgets(cmdline, sizeof(cmdline), *script_file) != nullptr) {
+	char buffer[ICON_CMDLN_SIZE];
+	while (fgets(buffer, sizeof(buffer), *script_file) != nullptr) {
 		/* Remove newline characters from the executing script */
-		for (char *cmdptr = cmdline; *cmdptr != '\0'; cmdptr++) {
-			if (*cmdptr == '\n' || *cmdptr == '\r') {
-				*cmdptr = '\0';
-				break;
-			}
-		}
+		std::string_view cmdline{buffer};
+		auto last_non_newline = cmdline.find_last_not_of("\r\n");
+		if (last_non_newline != std::string_view::npos) cmdline = cmdline.substr(0, last_non_newline + 1);
+
 		IConsoleCmdExec(cmdline);
 		/* Ensure that we are still on the same depth or that we returned via 'return'. */
 		assert(_script_current_depth == script_depth || _script_current_depth == script_depth - 1);
@@ -1169,9 +1209,9 @@ DEF_CONSOLE_CMD(ConExec)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConSchedule)
+static bool ConSchedule(std::span<std::string_view> argv)
 {
-	if (argc < 3 || std::string_view(argv[1]) != "on-next-calendar-month") {
+	if (argv.size() < 3 || std::string_view(argv[1]) != "on-next-calendar-month") {
 		IConsolePrint(CC_HELP, "Schedule a local script to execute later. Usage: 'schedule on-next-calendar-month <script>'.");
 		return true;
 	}
@@ -1183,7 +1223,7 @@ DEF_CONSOLE_CMD(ConSchedule)
 	}
 
 	/* We only support a single script scheduled, so we tell the user what's happening if there was already one. */
-	const std::string_view filename = std::string_view(argv[2]);
+	std::string_view filename = std::string_view(argv[2]);
 	if (!_scheduled_monthly_script.empty() && filename == _scheduled_monthly_script) {
 		IConsolePrint(CC_INFO, "Script file '{}' was already scheduled to execute at the start of next calendar month.", filename);
 	} else if (!_scheduled_monthly_script.empty() && filename != _scheduled_monthly_script) {
@@ -1198,9 +1238,9 @@ DEF_CONSOLE_CMD(ConSchedule)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConReturn)
+static bool ConReturn(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Stop executing a running script. Usage: 'return'.");
 		return true;
 	}
@@ -1217,18 +1257,18 @@ extern std::span<const GRFFile> GetAllGRFFiles();
 extern void ConPrintFramerate(); // framerate_gui.cpp
 extern void ShowFramerateWindow();
 
-DEF_CONSOLE_CMD(ConScript)
+static bool ConScript(std::span<std::string_view> argv)
 {
 	extern std::optional<FileHandle> _iconsole_output_file;
 
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Start or stop logging console output to a file. Usage: 'script <filename>'.");
 		IConsolePrint(CC_HELP, "If filename is omitted, a running log is stopped if it is active.");
 		return true;
 	}
 
 	if (!CloseConsoleLogIfActive()) {
-		if (argc < 2) return false;
+		if (argv.size() < 2) return false;
 
 		_iconsole_output_file = FileHandle::Open(argv[1], "ab");
 		if (!_iconsole_output_file.has_value()) {
@@ -1241,46 +1281,62 @@ DEF_CONSOLE_CMD(ConScript)
 	return true;
 }
 
-
-DEF_CONSOLE_CMD(ConEcho)
+static bool ConEcho(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Print back the first argument to the console. Usage: 'echo <arg>'.");
 		return true;
 	}
 
-	if (argc < 2) return false;
-	IConsolePrint(CC_DEFAULT, argv[1]);
+	if (argv.size() < 2) return false;
+	IConsolePrint(CC_DEFAULT, "{}", argv[1]);
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConEchoC)
+static bool ConEchoC(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Print back the first argument to the console in a given colour. Usage: 'echoc <colour> <arg2>'.");
 		return true;
 	}
 
-	if (argc < 3) return false;
-	IConsolePrint((TextColour)Clamp(atoi(argv[1]), TC_BEGIN, TC_END - 1), argv[2]);
+	if (argv.size() < 3) return false;
+
+	auto colour = ParseInteger(argv[1]);
+	if (!colour.has_value() || !IsInsideMM(*colour, TC_BEGIN, TC_END)) {
+		IConsolePrint(CC_ERROR, "The colour must be a number between {} and {}.", TC_BEGIN, TC_END - 1);
+		return true;
+	}
+
+	IConsolePrint(static_cast<TextColour>(*colour), "{}", argv[2]);
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConNewGame)
+static bool ConNewGame(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Start a new game. Usage: 'newgame [seed]'.");
 		IConsolePrint(CC_HELP, "The server can force a new game using 'newgame'; any client joined will rejoin after the server is done generating the new game.");
 		return true;
 	}
 
-	StartNewGameWithoutGUI((argc == 2) ? std::strtoul(argv[1], nullptr, 10) : GENERATE_NEW_SEED);
+	uint32_t seed = GENERATE_NEW_SEED;
+	if (argv.size() >= 2) {
+		auto param = ParseInteger(argv[1]);
+		if (!param.has_value()) {
+			IConsolePrint(CC_ERROR, "The given seed must be a valid number.");
+			return true;
+		}
+		seed = *param;
+	}
+
+	StartNewGameWithoutGUI(seed);
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConRestart)
+static bool ConRestart(std::span<std::string_view> argv)
 {
-	if (argc == 0 || argc > 2) {
+	if (argv.empty() || argv.size() > 2) {
 		IConsolePrint(CC_HELP, "Restart game. Usage: 'restart [current|newgame]'.");
 		IConsolePrint(CC_HELP, "Restarts a game, using either the current or newgame (default) settings.");
 		IConsolePrint(CC_HELP, " * if you started from a new game, and your current/newgame settings haven't changed, the game will be identical to when you started it.");
@@ -1288,7 +1344,7 @@ DEF_CONSOLE_CMD(ConRestart)
 		return true;
 	}
 
-	if (argc == 1 || std::string_view(argv[1]) == "newgame") {
+	if (argv.size() == 1 || std::string_view(argv[1]) == "newgame") {
 		StartNewGameWithoutGUI(_settings_game.game_creation.generation_seed);
 	} else {
 		_settings_game.game_creation.map_x = Map::LogX();
@@ -1299,15 +1355,15 @@ DEF_CONSOLE_CMD(ConRestart)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConReload)
+static bool ConReload(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Reload game. Usage: 'reload'.");
 		IConsolePrint(CC_HELP, "Reloads a game if loaded via savegame / scenario / heightmap.");
 		return true;
 	}
 
-	if (_file_to_saveload.abstract_ftype == FT_NONE || _file_to_saveload.abstract_ftype == FT_INVALID) {
+	if (_file_to_saveload.ftype.abstract == FT_NONE || _file_to_saveload.ftype.abstract == FT_INVALID) {
 		IConsolePrint(CC_ERROR, "No game loaded to reload.");
 		return true;
 	}
@@ -1343,9 +1399,9 @@ bool PrintList(F list_function, Args... args)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConListAILibs)
+static bool ConListAILibs(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List installed AI libraries. Usage: 'list_ai_libs'.");
 		return true;
 	}
@@ -1353,9 +1409,9 @@ DEF_CONSOLE_CMD(ConListAILibs)
 	return PrintList(AI::GetConsoleLibraryList);
 }
 
-DEF_CONSOLE_CMD(ConListAI)
+static bool ConListAI(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List installed AIs. Usage: 'list_ai'.");
 		return true;
 	}
@@ -1363,9 +1419,9 @@ DEF_CONSOLE_CMD(ConListAI)
 	return PrintList(AI::GetConsoleList, false);
 }
 
-DEF_CONSOLE_CMD(ConListGameLibs)
+static bool ConListGameLibs(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List installed Game Script libraries. Usage: 'list_game_libs'.");
 		return true;
 	}
@@ -1373,9 +1429,9 @@ DEF_CONSOLE_CMD(ConListGameLibs)
 	return PrintList(Game::GetConsoleLibraryList);
 }
 
-DEF_CONSOLE_CMD(ConListGame)
+static bool ConListGame(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List installed Game Scripts. Usage: 'list_game'.");
 		return true;
 	}
@@ -1383,9 +1439,9 @@ DEF_CONSOLE_CMD(ConListGame)
 	return PrintList(Game::GetConsoleList, false);
 }
 
-DEF_CONSOLE_CMD(ConStartAI)
+static bool ConStartAI(std::span<std::string_view> argv)
 {
-	if (argc == 0 || argc > 3) {
+	if (argv.empty() || argv.size() > 3) {
 		IConsolePrint(CC_HELP, "Start a new AI. Usage: 'start_ai [<AI>] [<settings>]'.");
 		IConsolePrint(CC_HELP, "Start a new AI. If <AI> is given, it starts that specific AI (if found).");
 		IConsolePrint(CC_HELP, "If <settings> is given, it is parsed and the AI settings are set to that.");
@@ -1423,20 +1479,22 @@ DEF_CONSOLE_CMD(ConStartAI)
 	}
 
 	AIConfig *config = AIConfig::GetConfig((CompanyID)n);
-	if (argc >= 2) {
+	if (argv.size() >= 2) {
 		config->Change(argv[1], -1, false);
 
 		/* If the name is not found, and there is a dot in the name,
 		 * try again with the assumption everything right of the dot is
 		 * the version the user wants to load. */
 		if (!config->HasScript()) {
-			const char *e = strrchr(argv[1], '.');
-			if (e != nullptr) {
-				size_t name_length = e - argv[1];
-				e++;
-
-				int version = atoi(e);
-				config->Change(std::string(argv[1], name_length), version, true);
+			StringConsumer consumer{std::string_view{argv[1]}};
+			auto name = consumer.ReadUntilChar('.', StringConsumer::SKIP_ONE_SEPARATOR);
+			if (consumer.AnyBytesLeft()) {
+				auto version = consumer.TryReadIntegerBase<uint32_t>(10);
+				if (!version.has_value()) {
+					IConsolePrint(CC_ERROR, "The version is not a valid number.");
+					return true;
+				}
+				config->Change(name, *version, true);
 			}
 		}
 
@@ -1444,7 +1502,7 @@ DEF_CONSOLE_CMD(ConStartAI)
 			IConsolePrint(CC_ERROR, "Failed to load the specified AI.");
 			return true;
 		}
-		if (argc == 3) {
+		if (argv.size() == 3) {
 			config->StringToSettings(argv[2]);
 		}
 	}
@@ -1455,9 +1513,9 @@ DEF_CONSOLE_CMD(ConStartAI)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConReloadAI)
+static bool ConReloadAI(std::span<std::string_view> argv)
 {
-	if (argc != 2) {
+	if (argv.size() != 2) {
 		IConsolePrint(CC_HELP, "Reload an AI. Usage: 'reload_ai <company-id>'.");
 		IConsolePrint(CC_HELP, "Reload the AI with the given company id. For company-id's, see the list of companies from the dropdown menu. Company 1 is 1, etc.");
 		return true;
@@ -1473,29 +1531,34 @@ DEF_CONSOLE_CMD(ConReloadAI)
 		return true;
 	}
 
-	CompanyID company_id = (CompanyID)(atoi(argv[1]) - 1);
-	if (!Company::IsValidID(company_id)) {
+	auto company_id = ParseCompanyID(argv[1]);
+	if (!company_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
+		return true;
+	}
+
+	if (!Company::IsValidID(*company_id)) {
 		IConsolePrint(CC_ERROR, "Unknown company. Company range is between 1 and {}.", MAX_COMPANIES);
 		return true;
 	}
 
 	/* In singleplayer mode the player can be in an AI company, after cheating or loading network save with an AI in first slot. */
-	if (Company::IsHumanID(company_id) || company_id == _local_company) {
+	if (Company::IsHumanID(*company_id) || *company_id == _local_company) {
 		IConsolePrint(CC_ERROR, "Company is not controlled by an AI.");
 		return true;
 	}
 
 	/* First kill the company of the AI, then start a new one. This should start the current AI again */
-	Command<CMD_COMPANY_CTRL>::Post(CCA_DELETE, company_id, CRR_MANUAL, INVALID_CLIENT_ID);
-	Command<CMD_COMPANY_CTRL>::Post(CCA_NEW_AI, company_id, CRR_NONE, INVALID_CLIENT_ID);
+	Command<CMD_COMPANY_CTRL>::Post(CCA_DELETE, *company_id, CRR_MANUAL, INVALID_CLIENT_ID);
+	Command<CMD_COMPANY_CTRL>::Post(CCA_NEW_AI, *company_id, CRR_NONE, INVALID_CLIENT_ID);
 	IConsolePrint(CC_DEFAULT, "AI reloaded.");
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConStopAI)
+static bool ConStopAI(std::span<std::string_view> argv)
 {
-	if (argc != 2) {
+	if (argv.size() != 2) {
 		IConsolePrint(CC_HELP, "Stop an AI. Usage: 'stop_ai <company-id>'.");
 		IConsolePrint(CC_HELP, "Stop the AI with the given company id. For company-id's, see the list of companies from the dropdown menu. Company 1 is 1, etc.");
 		return true;
@@ -1511,28 +1574,33 @@ DEF_CONSOLE_CMD(ConStopAI)
 		return true;
 	}
 
-	CompanyID company_id = (CompanyID)(atoi(argv[1]) - 1);
-	if (!Company::IsValidID(company_id)) {
+	auto company_id = ParseCompanyID(argv[1]);
+	if (!company_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
+		return true;
+	}
+
+	if (!Company::IsValidID(*company_id)) {
 		IConsolePrint(CC_ERROR, "Unknown company. Company range is between 1 and {}.", MAX_COMPANIES);
 		return true;
 	}
 
 	/* In singleplayer mode the player can be in an AI company, after cheating or loading network save with an AI in first slot. */
-	if (Company::IsHumanID(company_id) || company_id == _local_company) {
+	if (Company::IsHumanID(*company_id) || *company_id == _local_company) {
 		IConsolePrint(CC_ERROR, "Company is not controlled by an AI.");
 		return true;
 	}
 
 	/* Now kill the company of the AI. */
-	Command<CMD_COMPANY_CTRL>::Post(CCA_DELETE, company_id, CRR_MANUAL, INVALID_CLIENT_ID);
+	Command<CMD_COMPANY_CTRL>::Post(CCA_DELETE, *company_id, CRR_MANUAL, INVALID_CLIENT_ID);
 	IConsolePrint(CC_DEFAULT, "AI stopped, company deleted.");
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConRescanAI)
+static bool ConRescanAI(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Rescan the AI dir for scripts. Usage: 'rescan_ai'.");
 		return true;
 	}
@@ -1547,9 +1615,9 @@ DEF_CONSOLE_CMD(ConRescanAI)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConRescanGame)
+static bool ConRescanGame(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Rescan the Game Script dir for scripts. Usage: 'rescan_game'.");
 		return true;
 	}
@@ -1564,9 +1632,9 @@ DEF_CONSOLE_CMD(ConRescanGame)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConRescanNewGRF)
+static bool ConRescanNewGRF(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Rescan the data dir for NewGRFs. Usage: 'rescan_newgrf'.");
 		return true;
 	}
@@ -1578,9 +1646,9 @@ DEF_CONSOLE_CMD(ConRescanNewGRF)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConGetSeed)
+static bool ConGetSeed(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Returns the seed used to create this game. Usage: 'getseed'.");
 		IConsolePrint(CC_HELP, "The seed can be used to reproduce the exact same map as the game started with.");
 		return true;
@@ -1590,9 +1658,9 @@ DEF_CONSOLE_CMD(ConGetSeed)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConGetDate)
+static bool ConGetDate(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Returns the current date (year-month-day) of the game. Usage: 'getdate'.");
 		return true;
 	}
@@ -1602,9 +1670,9 @@ DEF_CONSOLE_CMD(ConGetDate)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConGetSysDate)
+static bool ConGetSysDate(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Returns the current date (year-month-day) of your system. Usage: 'getsysdate'.");
 		return true;
 	}
@@ -1613,30 +1681,29 @@ DEF_CONSOLE_CMD(ConGetSysDate)
 	return true;
 }
 
-
-DEF_CONSOLE_CMD(ConAlias)
+static bool ConAlias(std::span<std::string_view> argv)
 {
 	IConsoleAlias *alias;
 
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Add a new alias, or redefine the behaviour of an existing alias . Usage: 'alias <name> <command>'.");
 		return true;
 	}
 
-	if (argc < 3) return false;
+	if (argv.size() < 3) return false;
 
-	alias = IConsole::AliasGet(argv[1]);
+	alias = IConsole::AliasGet(std::string(argv[1]));
 	if (alias == nullptr) {
-		IConsole::AliasRegister(argv[1], argv[2]);
+		IConsole::AliasRegister(std::string(argv[1]), argv[2]);
 	} else {
 		alias->cmdline = argv[2];
 	}
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConScreenShot)
+static bool ConScreenShot(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Create a screenshot of the game. Usage: 'screenshot [viewport | normal | big | giant | heightmap | minimap] [no_con] [size <width> <height>] [<filename>]'.");
 		IConsolePrint(CC_HELP, "  'viewport' (default) makes a screenshot of the current viewport (including menus, windows).");
 		IConsolePrint(CC_HELP, "  'normal' makes a screenshot of the visible area.");
@@ -1650,7 +1717,7 @@ DEF_CONSOLE_CMD(ConScreenShot)
 		return true;
 	}
 
-	if (argc > 7) return false;
+	if (argv.size() > 7) return false;
 
 	ScreenshotType type = SC_VIEWPORT;
 	uint32_t width = 0;
@@ -1658,29 +1725,29 @@ DEF_CONSOLE_CMD(ConScreenShot)
 	std::string name{};
 	uint32_t arg_index = 1;
 
-	if (argc > arg_index) {
-		if (strcmp(argv[arg_index], "viewport") == 0) {
+	if (argv.size() > arg_index) {
+		if (argv[arg_index] == "viewport") {
 			type = SC_VIEWPORT;
 			arg_index += 1;
-		} else if (strcmp(argv[arg_index], "normal") == 0) {
+		} else if (argv[arg_index] == "normal") {
 			type = SC_DEFAULTZOOM;
 			arg_index += 1;
-		} else if (strcmp(argv[arg_index], "big") == 0) {
+		} else if (argv[arg_index] == "big") {
 			type = SC_ZOOMEDIN;
 			arg_index += 1;
-		} else if (strcmp(argv[arg_index], "giant") == 0) {
+		} else if (argv[arg_index] == "giant") {
 			type = SC_WORLD;
 			arg_index += 1;
-		} else if (strcmp(argv[arg_index], "heightmap") == 0) {
+		} else if (argv[arg_index] == "heightmap") {
 			type = SC_HEIGHTMAP;
 			arg_index += 1;
-		} else if (strcmp(argv[arg_index], "minimap") == 0) {
+		} else if (argv[arg_index] == "minimap") {
 			type = SC_MINIMAP;
 			arg_index += 1;
 		}
 	}
 
-	if (argc > arg_index && strcmp(argv[arg_index], "no_con") == 0) {
+	if (argv.size() > arg_index && argv[arg_index] == "no_con") {
 		if (type != SC_VIEWPORT) {
 			IConsolePrint(CC_ERROR, "'no_con' can only be used in combination with 'viewport'.");
 			return true;
@@ -1689,24 +1756,35 @@ DEF_CONSOLE_CMD(ConScreenShot)
 		arg_index += 1;
 	}
 
-	if (argc > arg_index + 2 && strcmp(argv[arg_index], "size") == 0) {
+	if (argv.size() > arg_index + 2 && argv[arg_index] == "size") {
 		/* size <width> <height> */
 		if (type != SC_DEFAULTZOOM && type != SC_ZOOMEDIN) {
 			IConsolePrint(CC_ERROR, "'size' can only be used in combination with 'normal' or 'big'.");
 			return true;
 		}
-		GetArgumentInteger(&width, argv[arg_index + 1]);
-		GetArgumentInteger(&height, argv[arg_index + 2]);
+		auto t = ParseInteger(argv[arg_index + 1]);
+		if (!t.has_value()) {
+			IConsolePrint(CC_ERROR, "Invalid width '{}'", argv[arg_index + 1]);
+			return true;
+		}
+		width = *t;
+
+		t = ParseInteger(argv[arg_index + 2]);
+		if (!t.has_value()) {
+			IConsolePrint(CC_ERROR, "Invalid height '{}'", argv[arg_index + 2]);
+			return true;
+		}
+		height = *t;
 		arg_index += 3;
 	}
 
-	if (argc > arg_index) {
+	if (argv.size() > arg_index) {
 		/* Last parameter that was not one of the keywords must be the filename. */
 		name = argv[arg_index];
 		arg_index += 1;
 	}
 
-	if (argc > arg_index) {
+	if (argv.size() > arg_index) {
 		/* We have parameters we did not process; means we misunderstood any of the above. */
 		return false;
 	}
@@ -1715,16 +1793,16 @@ DEF_CONSOLE_CMD(ConScreenShot)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConInfoCmd)
+static bool ConInfoCmd(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Print out debugging information about a command. Usage: 'info_cmd <cmd>'.");
 		return true;
 	}
 
-	if (argc < 2) return false;
+	if (argv.size() < 2) return false;
 
-	const IConsoleCmd *cmd = IConsole::CmdGet(argv[1]);
+	const IConsoleCmd *cmd = IConsole::CmdGet(std::string(argv[1]));
 	if (cmd == nullptr) {
 		IConsolePrint(CC_ERROR, "The given command was not found.");
 		return true;
@@ -1737,28 +1815,28 @@ DEF_CONSOLE_CMD(ConInfoCmd)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConDebugLevel)
+static bool ConDebugLevel(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Get/set the default debugging level for the game. Usage: 'debug_level [<level>]'.");
 		IConsolePrint(CC_HELP, "Level can be any combination of names, levels. Eg 'net=5 ms=4'. Remember to enclose it in \"'\"s.");
 		return true;
 	}
 
-	if (argc > 2) return false;
+	if (argv.size() > 2) return false;
 
-	if (argc == 1) {
+	if (argv.size() == 1) {
 		IConsolePrint(CC_DEFAULT, "Current debug-level: '{}'", GetDebugString());
 	} else {
-		SetDebugString(argv[1], [](const std::string &err) { IConsolePrint(CC_ERROR, err); });
+		SetDebugString(argv[1], [](std::string_view err) { IConsolePrint(CC_ERROR, "{}", err); });
 	}
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConExit)
+static bool ConExit(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Exit the game. Usage: 'exit'.");
 		return true;
 	}
@@ -1769,9 +1847,9 @@ DEF_CONSOLE_CMD(ConExit)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConPart)
+static bool ConPart(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Leave the currently joined/running game (only ingame). Usage: 'part'.");
 		return true;
 	}
@@ -1787,23 +1865,23 @@ DEF_CONSOLE_CMD(ConPart)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConHelp)
+static bool ConHelp(std::span<std::string_view> argv)
 {
-	if (argc == 2) {
+	if (argv.size() == 2) {
 		const IConsoleCmd *cmd;
 		const IConsoleAlias *alias;
 
-		cmd = IConsole::CmdGet(argv[1]);
+		cmd = IConsole::CmdGet(std::string(argv[1]));
 		if (cmd != nullptr) {
-			cmd->proc(0, nullptr);
+			cmd->proc({});
 			return true;
 		}
 
-		alias = IConsole::AliasGet(argv[1]);
+		alias = IConsole::AliasGet(std::string(argv[1]));
 		if (alias != nullptr) {
 			cmd = IConsole::CmdGet(alias->cmdline);
 			if (cmd != nullptr) {
-				cmd->proc(0, nullptr);
+				cmd->proc({});
 				return true;
 			}
 			IConsolePrint(CC_ERROR, "Alias is of special type, please see its execution-line: '{}'.", alias->cmdline);
@@ -1826,16 +1904,16 @@ DEF_CONSOLE_CMD(ConHelp)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConListCommands)
+static bool ConListCommands(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List all registered commands. Usage: 'list_cmds [<pre-filter>]'.");
 		return true;
 	}
 
 	for (auto &it : IConsole::Commands()) {
 		const IConsoleCmd *cmd = &it.second;
-		if (argv[1] == nullptr || cmd->name.find(argv[1]) != std::string::npos) {
+		if (argv.size() <= 1|| cmd->name.find(argv[1]) != std::string::npos) {
 			if (cmd->hook == nullptr || cmd->hook(false) != CHR_HIDE) IConsolePrint(CC_DEFAULT, cmd->name);
 		}
 	}
@@ -1843,16 +1921,16 @@ DEF_CONSOLE_CMD(ConListCommands)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConListAliases)
+static bool ConListAliases(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List all registered aliases. Usage: 'list_aliases [<pre-filter>]'.");
 		return true;
 	}
 
 	for (auto &it : IConsole::Aliases()) {
 		const IConsoleAlias *alias = &it.second;
-		if (argv[1] == nullptr || alias->name.find(argv[1]) != std::string::npos) {
+		if (argv.size() <= 1 || alias->name.find(argv[1]) != std::string::npos) {
 			IConsolePrint(CC_DEFAULT, "{} => {}", alias->name, alias->cmdline);
 		}
 	}
@@ -1860,9 +1938,9 @@ DEF_CONSOLE_CMD(ConListAliases)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConCompanies)
+static bool ConCompanies(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List the details of all companies in the game. Usage 'companies'.");
 		return true;
 	}
@@ -1885,14 +1963,14 @@ DEF_CONSOLE_CMD(ConCompanies)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConSay)
+static bool ConSay(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Chat to your fellow players in a multiplayer game. Usage: 'say \"<msg>\"'.");
 		return true;
 	}
 
-	if (argc != 2) return false;
+	if (argv.size() != 2) return false;
 
 	if (!_network_server) {
 		NetworkClientSendChat(NETWORK_ACTION_CHAT, DESTTYPE_BROADCAST, 0 /* param does not matter */, argv[1]);
@@ -1904,54 +1982,65 @@ DEF_CONSOLE_CMD(ConSay)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConSayCompany)
+static bool ConSayCompany(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Chat to a certain company in a multiplayer game. Usage: 'say_company <company-no> \"<msg>\"'.");
 		IConsolePrint(CC_HELP, "CompanyNo is the company that plays as company <companyno>, 1 through max_companies.");
 		return true;
 	}
 
-	if (argc != 3) return false;
+	if (argv.size() != 3) return false;
 
-	CompanyID company_id = (CompanyID)(atoi(argv[1]) - 1);
-	if (!Company::IsValidID(company_id)) {
+	auto company_id = ParseCompanyID(argv[1]);
+	if (!company_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given company-id is not a valid number.");
+		return true;
+	}
+
+	if (!Company::IsValidID(*company_id)) {
 		IConsolePrint(CC_DEFAULT, "Unknown company. Company range is between 1 and {}.", MAX_COMPANIES);
 		return true;
 	}
 
 	if (!_network_server) {
-		NetworkClientSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, company_id.base(), argv[2]);
+		NetworkClientSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, company_id->base(), argv[2]);
 	} else {
 		bool from_admin = (_redirect_console_to_admin < AdminID::Invalid());
-		NetworkServerSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, company_id.base(), argv[2], CLIENT_ID_SERVER, from_admin);
+		NetworkServerSendChat(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, company_id->base(), argv[2], CLIENT_ID_SERVER, from_admin);
 	}
 
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConSayClient)
+static bool ConSayClient(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
-		IConsolePrint(CC_HELP, "Chat to a certain client in a multiplayer game. Usage: 'say_client <client-no> \"<msg>\"'.");
+	if (argv.empty()) {
+		IConsolePrint(CC_HELP, "Chat to a certain client in a multiplayer game. Usage: 'say_client <client-id> \"<msg>\"'.");
 		IConsolePrint(CC_HELP, "For client-id's, see the command 'clients'.");
 		return true;
 	}
 
-	if (argc != 3) return false;
+	if (argv.size() != 3) return false;
+
+	auto client_id = ParseType<ClientID>(argv[1]);
+	if (!client_id.has_value()) {
+		IConsolePrint(CC_ERROR, "The given client-id is not a valid number.");
+		return true;
+	}
 
 	if (!_network_server) {
-		NetworkClientSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, atoi(argv[1]), argv[2]);
+		NetworkClientSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, *client_id, argv[2]);
 	} else {
 		bool from_admin = (_redirect_console_to_admin < AdminID::Invalid());
-		NetworkServerSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, atoi(argv[1]), argv[2], CLIENT_ID_SERVER, from_admin);
+		NetworkServerSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, *client_id, argv[2], CLIENT_ID_SERVER, from_admin);
 	}
 
 	return true;
 }
 
 /** All the known authorized keys with their name. */
-static std::vector<std::pair<std::string_view, NetworkAuthorizedKeys *>> _console_cmd_authorized_keys{
+static const std::initializer_list<std::pair<std::string_view, NetworkAuthorizedKeys *>> _console_cmd_authorized_keys{
 	{ "admin", &_settings_client.network.admin_authorized_keys },
 	{ "rcon", &_settings_client.network.rcon_authorized_keys },
 	{ "server", &_settings_client.network.server_authorized_keys },
@@ -2003,9 +2092,9 @@ static void PerformNetworkAuthorizedKeyAction(std::string_view name, NetworkAuth
 	}
 }
 
-DEF_CONSOLE_CMD(ConNetworkAuthorizedKey)
+static bool ConNetworkAuthorizedKey(std::span<std::string_view> argv)
 {
-	if (argc <= 2) {
+	if (argv.size() <= 2) {
 		IConsolePrint(CC_HELP, "List and update authorized keys. Usage: 'authorized_key list [type]|add [type] [key]|remove [type] [key]'.");
 		IConsolePrint(CC_HELP, "  list: list all the authorized keys of the given type.");
 		IConsolePrint(CC_HELP, "  add: add the given key to the authorized keys of the given type.");
@@ -2013,7 +2102,7 @@ DEF_CONSOLE_CMD(ConNetworkAuthorizedKey)
 		IConsolePrint(CC_HELP, "Instead of a key, use 'client:<id>' to add/remove the key of that given client.");
 
 		std::string buffer;
-		for (auto [name, _] : _console_cmd_authorized_keys) fmt::format_to(std::back_inserter(buffer), ", {}", name);
+		for (auto [name, _] : _console_cmd_authorized_keys) format_append(buffer, ", {}", name);
 		IConsolePrint(CC_HELP, "The supported types are: all{} and company:<id>.", buffer);
 		return true;
 	}
@@ -2033,16 +2122,16 @@ DEF_CONSOLE_CMD(ConNetworkAuthorizedKey)
 
 	std::string authorized_key;
 	if (action != CNAKA_LIST) {
-		if (argc <= 3) {
+		if (argv.size() <= 3) {
 			IConsolePrint(CC_ERROR, "You must enter the key.");
 			return false;
 		}
 
 		authorized_key = argv[3];
 		if (StrStartsWithIgnoreCase(authorized_key, "client:")) {
-			std::string id_string(authorized_key.substr(7));
-			authorized_key = NetworkGetPublicKeyOfClient(static_cast<ClientID>(std::stoi(id_string)));
-			if (authorized_key.empty()) {
+			auto value = ParseInteger<uint32_t>(authorized_key.substr(7));
+			if (value.has_value()) authorized_key = NetworkGetPublicKeyOfClient(static_cast<ClientID>(*value));
+			if (!value.has_value() || authorized_key.empty()) {
 				IConsolePrint(CC_ERROR, "You must enter a valid client id; see 'clients'.");
 				return false;
 			}
@@ -2062,8 +2151,8 @@ DEF_CONSOLE_CMD(ConNetworkAuthorizedKey)
 	}
 
 	if (StrStartsWithIgnoreCase(type, "company:")) {
-		std::string id_string(type.substr(8));
-		Company *c = Company::GetIfValid(std::stoi(id_string) - 1);
+		auto value = ParseInteger<uint32_t>(type.substr(8));
+		Company *c = value.has_value() ? Company::GetIfValid(*value - 1) : nullptr;
 		if (c == nullptr) {
 			IConsolePrint(CC_ERROR, "You must enter a valid company id; see 'companies'.");
 			return false;
@@ -2090,7 +2179,7 @@ DEF_CONSOLE_CMD(ConNetworkAuthorizedKey)
 #include "network/network_content.h"
 
 /** Resolve a string to a content type. */
-static ContentType StringToContentType(const char *str)
+static ContentType StringToContentType(std::string_view str)
 {
 	static const std::initializer_list<std::pair<std::string_view, ContentType>> content_types = {
 		{"base",      CONTENT_TYPE_BASE_GRAPHICS},
@@ -2128,25 +2217,25 @@ struct ConsoleContentCallback : public ContentCallback {
  * Outputs content state information to console
  * @param ci the content info
  */
-static void OutputContentState(const ContentInfo *const ci)
+static void OutputContentState(const ContentInfo &ci)
 {
-	static const char * const types[] = { "Base graphics", "NewGRF", "AI", "AI library", "Scenario", "Heightmap", "Base sound", "Base music", "Game script", "GS library" };
+	static const std::string_view types[] = { "Base graphics", "NewGRF", "AI", "AI library", "Scenario", "Heightmap", "Base sound", "Base music", "Game script", "GS library" };
 	static_assert(lengthof(types) == CONTENT_TYPE_END - CONTENT_TYPE_BEGIN);
-	static const char * const states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" };
+	static const std::string_view states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" };
 	static const TextColour state_to_colour[] = { CC_COMMAND, CC_INFO, CC_INFO, CC_WHITE, CC_ERROR };
 
-	IConsolePrint(state_to_colour[ci->state], "{}, {}, {}, {}, {:08X}, {}", ci->id, types[ci->type - 1], states[ci->state], ci->name, ci->unique_id, FormatArrayAsHex(ci->md5sum));
+	IConsolePrint(state_to_colour[to_underlying(ci.state)], "{}, {}, {}, {}, {:08X}, {}", ci.id, types[ci.type - 1], states[to_underlying(ci.state)], ci.name, ci.unique_id, FormatArrayAsHex(ci.md5sum));
 }
 
-DEF_CONSOLE_CMD(ConContent)
+static bool ConContent(std::span<std::string_view> argv)
 {
-	static ContentCallback *cb = nullptr;
-	if (cb == nullptr) {
-		cb = new ConsoleContentCallback();
-		_network_content_client.AddCallback(cb);
-	}
+	[[maybe_unused]] static ContentCallback *const cb = []() {
+			auto res = new ConsoleContentCallback();
+			_network_content_client.AddCallback(res);
+			return res;
+		}();
 
-	if (argc <= 1) {
+	if (argv.size() <= 1) {
 		IConsolePrint(CC_HELP, "Query, select and download content. Usage: 'content update|upgrade|select [id]|unselect [all|id]|state [filter]|download'.");
 		IConsolePrint(CC_HELP, "  update: get a new list of downloadable content; must be run first.");
 		IConsolePrint(CC_HELP, "  upgrade: select all items that are upgrades.");
@@ -2158,7 +2247,7 @@ DEF_CONSOLE_CMD(ConContent)
 	}
 
 	if (StrEqualsIgnoreCase(argv[1], "update")) {
-		_network_content_client.RequestContentList((argc > 2) ? StringToContentType(argv[2]) : CONTENT_TYPE_END);
+		_network_content_client.RequestContentList((argv.size() > 2) ? StringToContentType(argv[2]) : CONTENT_TYPE_END);
 		return true;
 	}
 
@@ -2168,12 +2257,12 @@ DEF_CONSOLE_CMD(ConContent)
 	}
 
 	if (StrEqualsIgnoreCase(argv[1], "select")) {
-		if (argc <= 2) {
+		if (argv.size() <= 2) {
 			/* List selected content */
 			IConsolePrint(CC_WHITE, "id, type, state, name");
-			for (ConstContentIterator iter = _network_content_client.Begin(); iter != _network_content_client.End(); iter++) {
-				if ((*iter)->state != ContentInfo::SELECTED && (*iter)->state != ContentInfo::AUTOSELECTED) continue;
-				OutputContentState(*iter);
+			for (const ContentInfo &ci : _network_content_client.Info()) {
+				if (ci.state != ContentInfo::State::Selected && ci.state != ContentInfo::State::Autoselected) continue;
+				OutputContentState(ci);
 			}
 		} else if (StrEqualsIgnoreCase(argv[2], "all")) {
 			/* The intention of this function was that you could download
@@ -2183,30 +2272,34 @@ DEF_CONSOLE_CMD(ConContent)
 			 * the spirit of this service. Additionally, these few people were
 			 * good for 70% of the consumed bandwidth of BaNaNaS. */
 			IConsolePrint(CC_ERROR, "'select all' is no longer supported since 1.11.");
+		} else if (auto content_id = ParseType<ContentID>(argv[2]); content_id.has_value()) {
+			_network_content_client.Select(*content_id);
 		} else {
-			_network_content_client.Select((ContentID)atoi(argv[2]));
+			IConsolePrint(CC_ERROR, "The given content-id is not a number or 'all'");
 		}
 		return true;
 	}
 
 	if (StrEqualsIgnoreCase(argv[1], "unselect")) {
-		if (argc <= 2) {
+		if (argv.size() <= 2) {
 			IConsolePrint(CC_ERROR, "You must enter the id.");
 			return false;
 		}
 		if (StrEqualsIgnoreCase(argv[2], "all")) {
 			_network_content_client.UnselectAll();
+		} else if (auto content_id = ParseType<ContentID>(argv[2]); content_id.has_value()) {
+			_network_content_client.Unselect(*content_id);
 		} else {
-			_network_content_client.Unselect((ContentID)atoi(argv[2]));
+			IConsolePrint(CC_ERROR, "The given content-id is not a number or 'all'");
 		}
 		return true;
 	}
 
 	if (StrEqualsIgnoreCase(argv[1], "state")) {
 		IConsolePrint(CC_WHITE, "id, type, state, name");
-		for (ConstContentIterator iter = _network_content_client.Begin(); iter != _network_content_client.End(); iter++) {
-			if (argc > 2 && !StrContainsIgnoreCase((*iter)->name, argv[2])) continue;
-			OutputContentState(*iter);
+		for (const ContentInfo &ci : _network_content_client.Info()) {
+			if (argv.size() > 2 && !StrContainsIgnoreCase(ci.name, argv[2])) continue;
+			OutputContentState(ci);
 		}
 		return true;
 	}
@@ -2223,9 +2316,9 @@ DEF_CONSOLE_CMD(ConContent)
 }
 #endif /* defined(WITH_ZLIB) */
 
-DEF_CONSOLE_CMD(ConFont)
+static bool ConFont(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Manage the fonts configuration.");
 		IConsolePrint(CC_HELP, "Usage 'font'.");
 		IConsolePrint(CC_HELP, "  Print out the fonts configuration.");
@@ -2242,28 +2335,28 @@ DEF_CONSOLE_CMD(ConFont)
 
 	FontSize argfs;
 	for (argfs = FS_BEGIN; argfs < FS_END; argfs++) {
-		if (argc > 1 && StrEqualsIgnoreCase(argv[1], FontSizeToName(argfs))) break;
+		if (argv.size() > 1 && StrEqualsIgnoreCase(argv[1], FontSizeToName(argfs))) break;
 	}
 
 	/* First argument must be a FontSize. */
-	if (argc > 1 && argfs == FS_END) return false;
+	if (argv.size() > 1 && argfs == FS_END) return false;
 
-	if (argc > 2) {
+	if (argv.size() > 2) {
 		FontCacheSubSetting *setting = GetFontCacheSubSetting(argfs);
 		std::string font = setting->font;
 		uint size = setting->size;
-		uint v;
 		uint8_t arg_index = 2;
 		/* For <name> we want a string. */
 
-		if (!GetArgumentInteger(&v, argv[arg_index])) {
+		if (!ParseInteger(argv[arg_index]).has_value()) {
 			font = argv[arg_index++];
 		}
 
-		if (argc > arg_index) {
+		if (argv.size() > arg_index) {
 			/* For <size> we want a number. */
-			if (GetArgumentInteger(&v, argv[arg_index])) {
-				size = v;
+			auto v = ParseInteger(argv[arg_index]);
+			if (v.has_value()) {
+				size = *v;
 				arg_index++;
 			}
 		}
@@ -2287,17 +2380,17 @@ DEF_CONSOLE_CMD(ConFont)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConSetting)
+static bool ConSetting(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Change setting for all clients. Usage: 'setting <name> [<value>]'.");
 		IConsolePrint(CC_HELP, "Omitting <value> will print out the current value of the setting.");
 		return true;
 	}
 
-	if (argc == 1 || argc > 3) return false;
+	if (argv.size() == 1 || argv.size() > 3) return false;
 
-	if (argc == 2) {
+	if (argv.size() == 2) {
 		IConsoleGetSetting(argv[1]);
 	} else {
 		IConsoleSetSetting(argv[1], argv[2]);
@@ -2306,17 +2399,17 @@ DEF_CONSOLE_CMD(ConSetting)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConSettingNewgame)
+static bool ConSettingNewgame(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Change setting for the next game. Usage: 'setting_newgame <name> [<value>]'.");
 		IConsolePrint(CC_HELP, "Omitting <value> will print out the current value of the setting.");
 		return true;
 	}
 
-	if (argc == 1 || argc > 3) return false;
+	if (argv.size() == 1 || argv.size() > 3) return false;
 
-	if (argc == 2) {
+	if (argv.size() == 2) {
 		IConsoleGetSetting(argv[1], true);
 	} else {
 		IConsoleSetSetting(argv[1], argv[2], true);
@@ -2325,22 +2418,22 @@ DEF_CONSOLE_CMD(ConSettingNewgame)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConListSettings)
+static bool ConListSettings(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "List settings. Usage: 'list_settings [<pre-filter>]'.");
 		return true;
 	}
 
-	if (argc > 2) return false;
+	if (argv.size() > 2) return false;
 
-	IConsoleListSettings((argc == 2) ? argv[1] : nullptr);
+	IConsoleListSettings((argv.size() == 2) ? argv[1] : std::string_view{});
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConGamelogPrint)
+static bool ConGamelogPrint(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Print logged fundamental changes to the game since the start. Usage: 'gamelog'.");
 		return true;
 	}
@@ -2349,9 +2442,9 @@ DEF_CONSOLE_CMD(ConGamelogPrint)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConNewGRFReload)
+static bool ConNewGRFReload(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Reloads all active NewGRFs from disk. Equivalent to reapplying NewGRFs via the settings, but without asking for confirmation. This might crash OpenTTD!");
 		return true;
 	}
@@ -2360,11 +2453,11 @@ DEF_CONSOLE_CMD(ConNewGRFReload)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConListDirs)
+static bool ConListDirs(std::span<std::string_view> argv)
 {
 	struct SubdirNameMap {
 		Subdirectory subdir; ///< Index of subdirectory type
-		const char *name;    ///< UI name for the directory
+		std::string_view name; ///< UI name for the directory
 		bool default_only;   ///< Whether only the default (first existing) directory for this is interesting
 	};
 	static const SubdirNameMap subdir_name_map[] = {
@@ -2384,13 +2477,16 @@ DEF_CONSOLE_CMD(ConListDirs)
 		{ SOCIAL_INTEGRATION_DIR, "social_integration", true },
 	};
 
-	if (argc != 2) {
+	if (argv.size() != 2) {
 		IConsolePrint(CC_HELP, "List all search paths or default directories for various categories.");
 		IConsolePrint(CC_HELP, "Usage: list_dirs <category>");
-		std::string cats = subdir_name_map[0].name;
+		std::string cats{subdir_name_map[0].name};
 		bool first = true;
 		for (const SubdirNameMap &sdn : subdir_name_map) {
-			if (!first) cats = cats + ", " + sdn.name;
+			if (!first) {
+				cats += ", ";
+				cats += sdn.name;
+			}
 			first = false;
 		}
 		IConsolePrint(CC_HELP, "Valid categories: {}", cats);
@@ -2426,9 +2522,9 @@ DEF_CONSOLE_CMD(ConListDirs)
 	return false;
 }
 
-DEF_CONSOLE_CMD(ConNewGRFProfile)
+static bool ConNewGRFProfile(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Collect performance data about NewGRF sprite requests and callbacks. Sub-commands can be abbreviated.");
 		IConsolePrint(CC_HELP, "Usage: 'newgrf_profile [list]':");
 		IConsolePrint(CC_HELP, "  List all NewGRFs that can be profiled, and their status.");
@@ -2448,7 +2544,7 @@ DEF_CONSOLE_CMD(ConNewGRFProfile)
 	std::span<const GRFFile> files = GetAllGRFFiles();
 
 	/* "list" sub-command */
-	if (argc == 1 || StrStartsWithIgnoreCase(argv[1], "lis")) {
+	if (argv.size() == 1 || StrStartsWithIgnoreCase(argv[1], "lis")) {
 		IConsolePrint(CC_INFO, "Loaded GRF files:");
 		int i = 1;
 		for (const auto &grf : files) {
@@ -2456,7 +2552,7 @@ DEF_CONSOLE_CMD(ConNewGRFProfile)
 			bool selected = profiler != _newgrf_profilers.end();
 			bool active = selected && profiler->active;
 			TextColour tc = active ? TC_LIGHT_BLUE : selected ? TC_GREEN : CC_INFO;
-			const char *statustext = active ? " (active)" : selected ? " (selected)" : "";
+			std::string_view statustext = active ? " (active)" : selected ? " (selected)" : "";
 			IConsolePrint(tc, "{}: [{:08X}] {}{}", i, std::byteswap(grf.grfid), grf.filename, statustext);
 			i++;
 		}
@@ -2464,16 +2560,16 @@ DEF_CONSOLE_CMD(ConNewGRFProfile)
 	}
 
 	/* "select" sub-command */
-	if (StrStartsWithIgnoreCase(argv[1], "sel") && argc >= 3) {
-		for (size_t argnum = 2; argnum < argc; ++argnum) {
-			int grfnum = atoi(argv[argnum]);
-			if (grfnum < 1 || grfnum > (int)files.size()) { // safe cast, files.size() should not be larger than a few hundred in the most extreme cases
-				IConsolePrint(CC_WARNING, "GRF number {} out of range, not added.", grfnum);
+	if (StrStartsWithIgnoreCase(argv[1], "sel") && argv.size() >= 3) {
+		for (size_t argnum = 2; argnum < argv.size(); ++argnum) {
+			auto grfnum = ParseInteger(argv[argnum]);
+			if (!grfnum.has_value() || *grfnum < 1 || static_cast<size_t>(*grfnum) > files.size()) {
+				IConsolePrint(CC_WARNING, "GRF number {} out of range, not added.", *grfnum);
 				continue;
 			}
-			const GRFFile *grf = &files[grfnum - 1];
+			const GRFFile *grf = &files[*grfnum - 1];
 			if (std::any_of(_newgrf_profilers.begin(), _newgrf_profilers.end(), [&](NewGRFProfiler &pr) { return pr.grffile == grf; })) {
-				IConsolePrint(CC_WARNING, "GRF number {} [{:08X}] is already selected for profiling.", grfnum, std::byteswap(grf->grfid));
+				IConsolePrint(CC_WARNING, "GRF number {} [{:08X}] is already selected for profiling.", *grfnum, std::byteswap(grf->grfid));
 				continue;
 			}
 			_newgrf_profilers.emplace_back(grf);
@@ -2482,18 +2578,18 @@ DEF_CONSOLE_CMD(ConNewGRFProfile)
 	}
 
 	/* "unselect" sub-command */
-	if (StrStartsWithIgnoreCase(argv[1], "uns") && argc >= 3) {
-		for (size_t argnum = 2; argnum < argc; ++argnum) {
+	if (StrStartsWithIgnoreCase(argv[1], "uns") && argv.size() >= 3) {
+		for (size_t argnum = 2; argnum < argv.size(); ++argnum) {
 			if (StrEqualsIgnoreCase(argv[argnum], "all")) {
 				_newgrf_profilers.clear();
 				break;
 			}
-			int grfnum = atoi(argv[argnum]);
-			if (grfnum < 1 || grfnum > (int)files.size()) {
-				IConsolePrint(CC_WARNING, "GRF number {} out of range, not removing.", grfnum);
+			auto grfnum = ParseInteger(argv[argnum]);
+			if (!grfnum.has_value() || *grfnum < 1 || static_cast<size_t>(*grfnum) > files.size()) {
+				IConsolePrint(CC_WARNING, "GRF number {} out of range, not removing.", *grfnum);
 				continue;
 			}
-			const GRFFile *grf = &files[grfnum - 1];
+			const GRFFile *grf = &files[*grfnum - 1];
 			_newgrf_profilers.erase(std::ranges::find(_newgrf_profilers, grf, &NewGRFProfiler::grffile));
 		}
 		return true;
@@ -2509,16 +2605,20 @@ DEF_CONSOLE_CMD(ConNewGRFProfile)
 				started++;
 
 				if (!grfids.empty()) grfids += ", ";
-				fmt::format_to(std::back_inserter(grfids), "[{:08X}]", std::byteswap(pr.grffile->grfid));
+				format_append(grfids, "[{:08X}]", std::byteswap(pr.grffile->grfid));
 			}
 		}
 		if (started > 0) {
 			IConsolePrint(CC_DEBUG, "Started profiling for GRFID{} {}.", (started > 1) ? "s" : "", grfids);
 
-			if (argc >= 3) {
-				uint64_t ticks = std::max(atoi(argv[2]), 1);
-				NewGRFProfiler::StartTimer(ticks);
-				IConsolePrint(CC_DEBUG, "Profiling will automatically stop after {} ticks.", ticks);
+			if (argv.size() >= 3) {
+				auto ticks = StringConsumer{argv[2]}.TryReadIntegerBase<uint64_t>(0);
+				if (!ticks.has_value()) {
+					IConsolePrint(CC_ERROR, "No valid amount of ticks was given, profiling will not stop automatically.");
+				} else {
+					NewGRFProfiler::StartTimer(*ticks);
+					IConsolePrint(CC_DEBUG, "Profiling will automatically stop after {} ticks.", *ticks);
+				}
 			}
 		} else if (_newgrf_profilers.empty()) {
 			IConsolePrint(CC_ERROR, "No GRFs selected for profiling, did not start.");
@@ -2559,9 +2659,9 @@ static void IConsoleDebugLibRegister()
 }
 #endif
 
-DEF_CONSOLE_CMD(ConFramerate)
+static bool ConFramerate(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Show frame rate and game speed information.");
 		return true;
 	}
@@ -2570,9 +2670,9 @@ DEF_CONSOLE_CMD(ConFramerate)
 	return true;
 }
 
-DEF_CONSOLE_CMD(ConFramerateWindow)
+static bool ConFramerateWindow(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Open the frame rate window.");
 		return true;
 	}
@@ -2735,10 +2835,9 @@ static void ConDumpCargoTypes()
 	}
 }
 
-
-DEF_CONSOLE_CMD(ConDumpInfo)
+static bool ConDumpInfo(std::span<std::string_view> argv)
 {
-	if (argc != 2) {
+	if (argv.size() != 2) {
 		IConsolePrint(CC_HELP, "Dump debugging information.");
 		IConsolePrint(CC_HELP, "Usage: 'dump_info roadtypes|railtypes|cargotypes'.");
 		IConsolePrint(CC_HELP, "  Show information about road/tram types, rail types or cargo types.");
diff --git a/src/console_func.h b/src/console_func.h
index 293f7d701e..296f7fc7fa 100644
--- a/src/console_func.h
+++ b/src/console_func.h
@@ -46,7 +46,7 @@ inline void IConsolePrint(TextColour colour_code, fmt::format_string<A, Args...>
 }
 
 /* Parser */
-void IConsoleCmdExec(const std::string &command_string, const uint recurse_count = 0);
+void IConsoleCmdExec(std::string_view command_string, const uint recurse_count = 0);
 
 bool IsValidConsoleColour(TextColour c);
 
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index 597f65a939..def783bbb7 100644
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -8,6 +8,7 @@
 /** @file console_gui.cpp Handling the GUI of the in-game console. */
 
 #include "stdafx.h"
+#include "core/string_consumer.hpp"
 #include "textbuf_type.h"
 #include "window_gui.h"
 #include "autocompletion.h"
@@ -77,7 +78,7 @@ public:
 private:
 	std::vector<std::string> GetSuggestions(std::string_view prefix, std::string_view query) override
 	{
-		prefix = StrTrimView(prefix);
+		prefix = StrTrimView(prefix, StringConsumer::WHITESPACE_NO_NEWLINE);
 		std::vector<std::string> suggestions;
 
 		/* We only suggest commands or aliases, so we only do it for the first token or an argument to help command. */
@@ -129,7 +130,7 @@ static inline void IConsoleResetHistoryPos()
 }
 
 
-static const char *IConsoleHistoryAdd(const char *cmd);
+static std::optional<std::string_view> IConsoleHistoryAdd(std::string_view cmd);
 static void IConsoleHistoryNavigate(int direction);
 
 static constexpr NWidgetPart _nested_console_window_widgets[] = {
@@ -137,7 +138,7 @@ static constexpr NWidgetPart _nested_console_window_widgets[] = {
 };
 
 static WindowDesc _console_window_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_CONSOLE, WC_NONE,
 	{},
 	_nested_console_window_widgets
@@ -219,7 +220,7 @@ struct IConsoleWindow : Window
 	}
 
 	/** Check on a regular interval if the console buffer needs truncating. */
-	IntervalTimer<TimerWindow> truncate_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> truncate_interval = {std::chrono::seconds(3), [this](auto) {
 		assert(this->height >= 0 && this->line_height > 0);
 		size_t visible_lines = static_cast<size_t>(this->height / this->line_height);
 
@@ -276,10 +277,10 @@ struct IConsoleWindow : Window
 				 * aligned anyway. So enforce this in all cases by adding a left-to-right marker,
 				 * otherwise it will be drawn at the wrong side with right-to-left texts. */
 				IConsolePrint(CC_COMMAND, LRM "] {}", _iconsole_cmdline.GetText());
-				const char *cmd = IConsoleHistoryAdd(_iconsole_cmdline.GetText());
+				auto cmd = IConsoleHistoryAdd(_iconsole_cmdline.GetText());
 				IConsoleClearCommand();
 
-				if (cmd != nullptr) IConsoleCmdExec(cmd);
+				if (cmd.has_value()) IConsoleCmdExec(*cmd);
 				break;
 			}
 
@@ -317,7 +318,7 @@ struct IConsoleWindow : Window
 		return ES_HANDLED;
 	}
 
-	void InsertTextString(WidgetID, const char *str, bool marked, const char *caret, const char *insert_location, const char *replacement_end) override
+	void InsertTextString(WidgetID, std::string_view str, bool marked, std::optional<size_t> caret, std::optional<size_t> insert_location, std::optional<size_t> replacement_end) override
 	{
 		if (_iconsole_cmdline.InsertString(str, marked, caret, insert_location, replacement_end)) {
 			_iconsole_tab_completion.Reset();
@@ -340,7 +341,7 @@ struct IConsoleWindow : Window
 		return pt;
 	}
 
-	Rect GetTextBoundingRect(const char *from, const char *to) const override
+	Rect GetTextBoundingRect(size_t from, size_t to) const override
 	{
 		int delta = std::min<int>(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0);
 
@@ -360,8 +361,9 @@ struct IConsoleWindow : Window
 		return GetCharAtPosition(_iconsole_cmdline.GetText(), pt.x - delta);
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_C_BACKGROUND) return;
 		this->Scroll(-wheel);
 	}
 
@@ -448,13 +450,13 @@ void IConsoleClose()
  * @param cmd Text to be entered into the 'history'
  * @return the command to execute
  */
-static const char *IConsoleHistoryAdd(const char *cmd)
+static std::optional<std::string_view> IConsoleHistoryAdd(std::string_view cmd)
 {
 	/* Strip all spaces at the begin */
-	while (IsWhitespace(*cmd)) cmd++;
+	while (IsWhitespace(cmd[0])) cmd.remove_prefix(1);
 
 	/* Do not put empty command in history */
-	if (StrEmpty(cmd)) return nullptr;
+	if (cmd.empty()) return std::nullopt;
 
 	/* Do not put in history if command is same as previous */
 	if (_iconsole_history.empty() || _iconsole_history.front() != cmd) {
@@ -464,7 +466,7 @@ static const char *IConsoleHistoryAdd(const char *cmd)
 
 	/* Reset the history position */
 	IConsoleResetHistoryPos();
-	return _iconsole_history.front().c_str();
+	return _iconsole_history.front();
 }
 
 /**
diff --git a/src/console_internal.h b/src/console_internal.h
index cbf4c61bc5..f9124b45fa 100644
--- a/src/console_internal.h
+++ b/src/console_internal.h
@@ -13,7 +13,6 @@
 #include "gfx_type.h"
 
 static const uint ICON_CMDLN_SIZE     = 1024; ///< maximum length of a typed in command
-static const uint ICON_MAX_STREAMSIZE = 2048; ///< maximum length of a totally expanded command
 
 /** Return values of console hooks (#IConsoleHook). */
 enum ConsoleHookResult : uint8_t {
@@ -30,8 +29,8 @@ enum ConsoleHookResult : uint8_t {
  * If you want to handle multiple words as one, enclose them in double-quotes
  * eg. 'say "hello everybody"'
  */
-typedef bool IConsoleCmdProc(uint8_t argc, char *argv[]);
-typedef ConsoleHookResult IConsoleHook(bool echo);
+using IConsoleCmdProc = bool(std::span<std::string_view>);
+using IConsoleHook = ConsoleHookResult(bool);
 struct IConsoleCmd {
 	IConsoleCmd(const std::string &name, IConsoleCmdProc *proc, IConsoleHook *hook) : name(name), proc(proc), hook(hook) {}
 
@@ -53,7 +52,7 @@ struct IConsoleCmd {
  * - ";" allows for combining commands (see example 'ng')
  */
 struct IConsoleAlias {
-	IConsoleAlias(const std::string &name, const std::string &cmdline) : name(name), cmdline(cmdline) {}
+	IConsoleAlias(const std::string &name, std::string_view cmdline) : name(name), cmdline(cmdline) {}
 
 	std::string name;           ///< name of the alias
 	std::string cmdline;        ///< command(s) that is/are being aliased
@@ -71,7 +70,7 @@ struct IConsole
 	/* Commands */
 	static void CmdRegister(const std::string &name, IConsoleCmdProc *proc, IConsoleHook *hook = nullptr);
 	static IConsoleCmd *CmdGet(const std::string &name);
-	static void AliasRegister(const std::string &name, const std::string &cmd);
+	static void AliasRegister(const std::string &name, std::string_view cmd);
 	static IConsoleAlias *AliasGet(const std::string &name);
 };
 
@@ -81,9 +80,6 @@ void IConsoleClearBuffer();
 /* console std lib (register ingame commands/aliases) */
 void IConsoleStdLibRegister();
 
-/* Supporting functions */
-bool GetArgumentInteger(uint32_t *value, const char *arg);
-
 void IConsoleGUIInit();
 void IConsoleGUIFree();
 void IConsoleGUIPrint(TextColour colour_code, const std::string &string);
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c14d10bf39..224cfba0eb 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -7,6 +7,7 @@ add_files(
     convertible_through_base.hpp
     endian_func.hpp
     enum_type.hpp
+    flatset_type.hpp
     format.hpp
     geometry_func.cpp
     geometry_func.hpp
@@ -14,7 +15,6 @@ add_files(
     kdtree.hpp
     math_func.cpp
     math_func.hpp
-    mem_func.hpp
     multimap.hpp
     overflowsafe_type.hpp
     pool_func.cpp
@@ -25,6 +25,10 @@ add_files(
     smallstack_type.hpp
     string_builder.cpp
     string_builder.hpp
+    string_consumer.cpp
+    string_consumer.hpp
+    string_inplace.cpp
+    string_inplace.hpp
     strong_typedef_type.hpp
     utf8.cpp
     utf8.hpp
diff --git a/src/core/base_bitset_type.hpp b/src/core/base_bitset_type.hpp
index aaea935658..9ce8528d31 100644
--- a/src/core/base_bitset_type.hpp
+++ b/src/core/base_bitset_type.hpp
@@ -76,6 +76,16 @@ public:
 		return set ? this->Set(value) : this->Reset(value);
 	}
 
+	/**
+	 * Reset all bits.
+	 * @returns The bit set
+	 */
+	inline constexpr Timpl &Reset()
+	{
+		this->data = 0;
+		return static_cast<Timpl &>(*this);
+	}
+
 	/**
 	 * Reset the value-th bit.
 	 * @param value Bit to reset.
@@ -180,12 +190,24 @@ public:
 		return this->data == 0;
 	}
 
-	inline constexpr Timpl operator |(const Timpl &other) const
+	inline constexpr Timpl &operator|=(const Timpl &other)
+	{
+		this->data |= other.data;
+		return static_cast<Timpl &>(*this);
+	}
+
+	inline constexpr Timpl operator|(const Timpl &other) const
 	{
 		return Timpl{static_cast<Tstorage>(this->data | other.data)};
 	}
 
-	inline constexpr Timpl operator &(const Timpl &other) const
+	inline constexpr Timpl &operator&=(const Timpl &other)
+	{
+		this->data &= other.data;
+		return static_cast<Timpl &>(*this);
+	}
+
+	inline constexpr Timpl operator&(const Timpl &other) const
 	{
 		return Timpl{static_cast<Tstorage>(this->data & other.data)};
 	}
@@ -208,6 +230,30 @@ public:
 		return (this->base() & Tmask) == this->base();
 	}
 
+	/**
+	 * Count the number of set bits.
+	 * @return The number of bits set to true.
+	 */
+	inline uint Count() const
+	{
+		return CountBits(this->base());
+	}
+
+	/**
+	 * Get the value of the Nth set bit.
+	 * @param n The Nth set bit from which we want to know the value.
+	 * @return The value of the Nth set bit, or std::nullopt if no Nth bit set.
+	 */
+	std::optional<Tvalue_type> GetNthSetBit(uint n) const
+	{
+		for (auto i : *this) {
+			if (n == 0) return i;
+			--n;
+		}
+
+		return std::nullopt;
+	}
+
 	auto begin() const { return SetBitIterator<Tvalue_type>(this->data).begin(); }
 	auto end() const { return SetBitIterator<Tvalue_type>(this->data).end(); }
 
diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp
index 01822301e7..4e9a2cd933 100644
--- a/src/core/bitmath_func.hpp
+++ b/src/core/bitmath_func.hpp
@@ -141,18 +141,6 @@ constexpr T ClrBit(T &x, const uint8_t y)
 	return x = (T)(x & ~((T)1U << y));
 }
 
-/**
- * Clears several bits in a variable.
- *
- * This macro clears several bits in a variable. The bits to clear are
- * provided by a value. The new value is also returned.
- *
- * @param x The variable to clear some bits
- * @param y The value with set bits for clearing them in the variable
- * @return The new value of x
- */
-#define CLRBITS(x, y) ((x) &= ~(y))
-
 /**
  * Toggles a bit in a variable.
  *
diff --git a/src/core/convertible_through_base.hpp b/src/core/convertible_through_base.hpp
index 8b9fec0152..813b691341 100644
--- a/src/core/convertible_through_base.hpp
+++ b/src/core/convertible_through_base.hpp
@@ -30,23 +30,24 @@ template <typename T, typename TTo>
 concept ConvertibleThroughBaseOrTo = std::is_convertible_v<T, TTo> || ConvertibleThroughBase<T>;
 
 /**
- * A sort-of mixin that adds 'at(pos)' and 'operator[](pos)' implementations for 'ConvertibleThroughBase' types.
- * This to prevent having to call '.base()' for many container accesses.
+ * A sort-of mixin that implements 'at(pos)' and 'operator[](pos)' only for a specific type.
+ * The type must have a suitable '.base()' method and therefore must inherently match 'ConvertibleThroughBase'.
+ * This to prevent having to call '.base()' for many container accesses, whilst preventing accidental use of the wrong index type.
  */
-template <typename Container>
-class ReferenceThroughBaseContainer : public Container {
+template <typename Container, typename Index>
+class TypedIndexContainer : public Container {
 public:
 	Container::reference at(size_t pos) { return this->Container::at(pos); }
-	Container::reference at(const ConvertibleThroughBase auto &pos) { return this->Container::at(pos.base()); }
+	Container::reference at(const Index &pos) { return this->Container::at(pos.base()); }
 
 	Container::const_reference at(size_t pos) const { return this->Container::at(pos); }
-	Container::const_reference at(const ConvertibleThroughBase auto &pos) const { return this->Container::at(pos.base()); }
+	Container::const_reference at(const Index &pos) const { return this->Container::at(pos.base()); }
 
 	Container::reference operator[](size_t pos) { return this->Container::operator[](pos); }
-	Container::reference operator[](const ConvertibleThroughBase auto &pos) { return this->Container::operator[](pos.base()); }
+	Container::reference operator[](const Index &pos) { return this->Container::operator[](pos.base()); }
 
 	Container::const_reference operator[](size_t pos) const { return this->Container::operator[](pos); }
-	Container::const_reference operator[](const ConvertibleThroughBase auto &pos) const { return this->Container::operator[](pos.base()); }
+	Container::const_reference operator[](const Index &pos) const { return this->Container::operator[](pos.base()); }
 };
 
 #endif /* CONVERTIBLE_THROUGH_BASE_HPP */
diff --git a/src/core/enum_type.hpp b/src/core/enum_type.hpp
index 61f1e19767..6c30f7a39b 100644
--- a/src/core/enum_type.hpp
+++ b/src/core/enum_type.hpp
@@ -65,6 +65,55 @@ inline constexpr enum_type operator --(enum_type &e, int)
 		static const bool value = true; \
 	};
 
+/** Trait to enable prefix/postfix incrementing operators. */
+template <typename enum_type>
+struct is_enum_sequential {
+	static constexpr bool value = false;
+};
+
+template <typename enum_type>
+constexpr bool is_enum_sequential_v = is_enum_sequential<enum_type>::value;
+
+/** Add integer. */
+template <typename enum_type, std::enable_if_t<is_enum_sequential_v<enum_type>, bool> = true>
+inline constexpr enum_type operator+(enum_type e, int offset)
+{
+	return static_cast<enum_type>(to_underlying(e) + offset);
+}
+
+template <typename enum_type, std::enable_if_t<is_enum_sequential_v<enum_type>, bool> = true>
+inline constexpr enum_type &operator+=(enum_type &e, int offset)
+{
+	e = e + offset;
+	return e;
+}
+
+/** Sub integer. */
+template <typename enum_type, std::enable_if_t<is_enum_sequential_v<enum_type>, bool> = true>
+inline constexpr enum_type operator-(enum_type e, int offset)
+{
+	return static_cast<enum_type>(to_underlying(e) - offset);
+}
+
+template <typename enum_type, std::enable_if_t<is_enum_sequential_v<enum_type>, bool> = true>
+inline constexpr enum_type &operator-=(enum_type &e, int offset)
+{
+	e = e - offset;
+	return e;
+}
+
+/** Distance */
+template <typename enum_type, std::enable_if_t<is_enum_sequential_v<enum_type>, bool> = true>
+inline constexpr auto operator-(enum_type a, enum_type b)
+{
+	return to_underlying(a) - to_underlying(b);
+}
+
+/** For some enums it is useful to add/sub more than 1 */
+#define DECLARE_ENUM_AS_SEQUENTIAL(enum_type) \
+	template <> struct is_enum_sequential<enum_type> { \
+		static const bool value = true; \
+	};
 
 /** Operators to allow to work with enum as with type safe bit set in C++ */
 #define DECLARE_ENUM_AS_BIT_SET(enum_type) \
diff --git a/src/core/flatset_type.hpp b/src/core/flatset_type.hpp
new file mode 100644
index 0000000000..26f40e1379
--- /dev/null
+++ b/src/core/flatset_type.hpp
@@ -0,0 +1,73 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file flatset_type.hpp Flat set container implementation. */
+
+#ifndef FLATSET_TYPE_HPP
+#define FLATSET_TYPE_HPP
+
+/**
+ * Flat set implementation that uses a sorted vector for storage.
+ * This is subset of functionality implemented by std::flat_set in c++23.
+ * @tparam Tkey key type.
+ * @tparam Tcompare key comparator.
+ */
+template <class Tkey, class Tcompare = std::less<>>
+class FlatSet {
+	std::vector<Tkey> data; ///< Sorted vector. of values.
+public:
+	using const_iterator = std::vector<Tkey>::const_iterator;
+
+	/**
+	 * Insert a key into the set.
+	 * @param key Key to insert.
+	 */
+	void insert(const Tkey &key)
+	{
+		auto it = std::ranges::lower_bound(this->data, key, Tcompare{});
+		if (it == std::end(this->data) || *it != key) this->data.emplace(it, key);
+	}
+
+	/**
+	 * Erase a key from the set.
+	 * @param key Key to erase.
+	 * @return number of elements removed.
+	 */
+	size_t erase(const Tkey &key)
+	{
+		auto it = std::ranges::lower_bound(this->data, key, Tcompare{});
+		if (it == std::end(this->data) || *it != key) return 0;
+
+		this->data.erase(it);
+		return 1;
+	}
+
+	/**
+	 * Test if a key exists in the set.
+	 * @param key Key to test.
+	 * @return true iff the key exists in the set.
+	 */
+	bool contains(const Tkey &key)
+	{
+		return std::ranges::binary_search(this->data, key, Tcompare{});
+	}
+
+	const_iterator begin() const { return std::cbegin(this->data); }
+	const_iterator end() const { return std::cend(this->data); }
+
+	const_iterator cbegin() const { return std::cbegin(this->data); }
+	const_iterator cend() const { return std::cend(this->data); }
+
+	size_t size() const { return std::size(this->data); }
+	bool empty() const { return this->data.empty(); }
+
+	void clear() { this->data.clear(); }
+
+	auto operator<=>(const FlatSet<Tkey, Tcompare> &) const = default;
+};
+
+#endif /* FLATSET_TYPE_HPP */
diff --git a/src/core/format.hpp b/src/core/format.hpp
index a00dab44ea..f6454e73fb 100644
--- a/src/core/format.hpp
+++ b/src/core/format.hpp
@@ -45,4 +45,10 @@ struct fmt::formatter<T, Char> : fmt::formatter<typename T::BaseType> {
 	}
 };
 
+template <class... Args>
+void format_append(std::string &out, fmt::format_string<Args...> &&fmt, Args&&... args)
+{
+	fmt::format_to(std::back_inserter(out), std::forward<decltype(fmt)>(fmt), std::forward<decltype(args)>(args)...);
+}
+
 #endif /* FORMAT_HPP */
diff --git a/src/core/geometry_type.hpp b/src/core/geometry_type.hpp
index 9149ab2c3c..d901f79fbe 100644
--- a/src/core/geometry_type.hpp
+++ b/src/core/geometry_type.hpp
@@ -16,6 +16,17 @@
 #	define Point OTTD_Point
 #endif /* __APPLE__ */
 
+/**
+ * Determine where to position a centred object.
+ * @param min The top or left coordinate.
+ * @param max The bottom or right coordinate.
+ * @param size The height or width of the object to draw.
+ * @return Offset of where to position the object.
+ */
+inline int CentreBounds(int min, int max, int size)
+{
+	return (min + max - size + 1) / 2;
+}
 
 /** Coordinates of a point in 2D */
 struct Point {
@@ -223,7 +234,20 @@ struct Rect {
 	inline bool Contains(const Point &pt) const
 	{
 		/* This is a local version of IsInsideMM, to avoid including math_func everywhere. */
-		return (uint)(pt.x - this->left) < (uint)(this->right - this->left) && (uint)(pt.y - this->top) < (uint)(this->bottom - this->top);
+		return (uint)(pt.x - this->left) <= (uint)(this->right - this->left) && (uint)(pt.y - this->top) <= (uint)(this->bottom - this->top);
+	}
+
+	/**
+	 * Centre a dimension within this Rect.
+	 * @param width The horizontal dimension.
+	 * @param height The vertical dimension.
+	 * @return the new resized Rect.
+	 */
+	[[nodiscard]] inline Rect CentreTo(int width, int height) const
+	{
+		int new_left = CentreBounds(this->left, this->right, width);
+		int new_right = CentreBounds(this->top, this->bottom, height);
+		return {new_left, new_right, new_left + width, new_right + height};
 	}
 };
 
diff --git a/src/core/kdtree.hpp b/src/core/kdtree.hpp
index 8d24077f34..de9dc233cf 100644
--- a/src/core/kdtree.hpp
+++ b/src/core/kdtree.hpp
@@ -10,8 +10,6 @@
 #ifndef KDTREE_HPP
 #define KDTREE_HPP
 
-#include "../stdafx.h"
-
 /**
  * K-dimensional tree, specialised for 2-dimensional space.
  * This is not intended as a primary storage of data, but as an index into existing data.
@@ -330,11 +328,11 @@ class Kdtree {
 		assert(cy < max_y);
 
 		if (level % 2 == 0) {
-			// split in dimension 0 = x
+			/* split in dimension 0 = x */
 			this->CheckInvariant(n.left,  level + 1, min_x, cx, min_y, max_y);
 			this->CheckInvariant(n.right, level + 1, cx, max_x, min_y, max_y);
 		} else {
-			// split in dimension 1 = y
+			/* split in dimension 1 = y */
 			this->CheckInvariant(n.left,  level + 1, min_x, max_x, min_y, cy);
 			this->CheckInvariant(n.right, level + 1, min_x, max_x, cy, max_y);
 		}
diff --git a/src/core/math_func.hpp b/src/core/math_func.hpp
index 7207cf3baf..3b9b406e02 100644
--- a/src/core/math_func.hpp
+++ b/src/core/math_func.hpp
@@ -271,6 +271,12 @@ constexpr bool IsInsideMM(const size_t x, const size_t min, const size_t max) no
 
 constexpr bool IsInsideMM(const ConvertibleThroughBase auto x, const size_t min, const size_t max) noexcept { return IsInsideMM(x.base(), min, max); }
 
+template <typename enum_type, std::enable_if_t<std::is_enum_v<enum_type>, bool> = true>
+constexpr bool IsInsideMM(enum_type x, enum_type min, enum_type max) noexcept
+{
+	return IsInsideMM(to_underlying(x), to_underlying(min), to_underlying(max));
+}
+
 /**
  * Converts a "fract" value 0..255 to "percent" value 0..100
  * @param i value to convert, range 0..255
diff --git a/src/core/mem_func.hpp b/src/core/mem_func.hpp
deleted file mode 100644
index da87405e69..0000000000
--- a/src/core/mem_func.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file mem_func.hpp Functions related to memory operations. */
-
-#ifndef MEM_FUNC_HPP
-#define MEM_FUNC_HPP
-
-#include "math_func.hpp"
-
-/**
- * Type-safe version of memcpy().
- *
- * @param destination Pointer to the destination buffer
- * @param source Pointer to the source buffer
- * @param num number of items to be copied. (!not number of bytes!)
- */
-template <typename T>
-inline void MemCpyT(T *destination, const T *source, size_t num = 1)
-{
-	memcpy(destination, source, num * sizeof(T));
-}
-
-/**
- * Type-safe version of memset().
- *
- * @param ptr Pointer to the destination buffer
- * @param value Value to be set
- * @param num number of items to be set (!not number of bytes!)
- */
-template <typename T>
-inline void MemSetT(T *ptr, uint8_t value, size_t num = 1)
-{
-	memset(ptr, value, num * sizeof(T));
-}
-
-#endif /* MEM_FUNC_HPP */
diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp
index a1d3f4ae41..bf16959bef 100644
--- a/src/core/pool_type.hpp
+++ b/src/core/pool_type.hpp
@@ -137,7 +137,7 @@ public:
 	using BitmapStorage = size_t;
 	static constexpr size_t BITMAP_SIZE = std::numeric_limits<BitmapStorage>::digits;
 
-	const char * const name = nullptr; ///< Name of this pool
+	const std::string_view name{}; ///< Name of this pool
 
 	size_t first_free = 0; ///< No item with index lower than this is free (doesn't say anything about this one!)
 	size_t first_unused = 0; ///< This and all higher indexes are free (doesn't say anything about first_unused-1 !)
@@ -150,7 +150,7 @@ public:
 	std::vector<Titem *> data{}; ///< Pointers to Titem
 	std::vector<BitmapStorage> used_bitmap{}; ///< Bitmap of used indices.
 
-	Pool(const char *name) : PoolBase(Tpool_type), name(name) {}
+	Pool(std::string_view name) : PoolBase(Tpool_type), name(name) {}
 	void CleanPool() override;
 
 	/**
diff --git a/src/core/random_func.cpp b/src/core/random_func.cpp
index 6893ff65c7..6960bac154 100644
--- a/src/core/random_func.cpp
+++ b/src/core/random_func.cpp
@@ -25,7 +25,7 @@
 #	include <windows.h>
 #	include <bcrypt.h>
 #elif defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__)
-// No includes required.
+/* No includes required. */
 #elif defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 25)))
 #	include <sys/random.h>
 #elif defined(__EMSCRIPTEN__)
diff --git a/src/core/string_builder.cpp b/src/core/string_builder.cpp
index 3144656e4c..6ded799c30 100644
--- a/src/core/string_builder.cpp
+++ b/src/core/string_builder.cpp
@@ -113,13 +113,13 @@ void BaseStringBuilder::PutChar(char c)
 void BaseStringBuilder::PutUtf8(char32_t c)
 {
 	auto [buf, len] = EncodeUtf8(c);
-	this->PutBuffer(buf, len);
+	this->PutBuffer({buf, len});
 }
 
 /**
  * Append buffer.
  */
-void StringBuilder::PutBuffer(const char *str, size_type len)
+void StringBuilder::PutBuffer(std::span<const char> str)
 {
-	this->dest->append(str, len);
+	this->dest->append(str.data(), str.size());
 }
diff --git a/src/core/string_builder.hpp b/src/core/string_builder.hpp
index 77fba335fd..24247c0c4a 100644
--- a/src/core/string_builder.hpp
+++ b/src/core/string_builder.hpp
@@ -26,17 +26,12 @@ public:
 	/**
 	 * Append buffer.
 	 */
-	virtual void PutBuffer(const char *str, size_type len) = 0;
-
-	/**
-	 * Append span.
-	 */
-	void PutBuffer(std::span<const char> str) { this->PutBuffer(str.data(), str.size()); }
+	virtual void PutBuffer(std::span<const char> str) = 0;
 
 	/**
 	 * Append string.
 	 */
-	void Put(std::string_view str) { this->PutBuffer(str.data(), str.size()); }
+	void Put(std::string_view str) { this->PutBuffer(str); }
 
 	void PutUint8(uint8_t value);
 	void PutSint8(int8_t value);
@@ -53,22 +48,21 @@ public:
 	/**
 	 * Append integer 'value' in given number 'base'.
 	 */
-	template<class T>
+	template <class T>
 	void PutIntegerBase(T value, int base)
 	{
 		std::array<char, 32> buf;
 		auto result = std::to_chars(buf.data(), buf.data() + buf.size(), value, base);
 		if (result.ec != std::errc{}) return;
 		size_type len = result.ptr - buf.data();
-		this->PutBuffer(buf.data(), len);
+		this->PutBuffer({buf.data(), len});
 	}
 };
 
 /**
  * Compose data into a growing std::string.
  */
-class StringBuilder final : public BaseStringBuilder
-{
+class StringBuilder final : public BaseStringBuilder {
 	std::string *dest;
 public:
 	/**
@@ -94,8 +88,7 @@ public:
 	 */
 	[[nodiscard]] std::string &GetString() noexcept { return *dest; }
 
-	using BaseStringBuilder::PutBuffer;
-	void PutBuffer(const char *str, size_type len) override;
+	void PutBuffer(std::span<const char> str) override;
 
 	/**
 	 * Append string.
diff --git a/src/core/string_consumer.cpp b/src/core/string_consumer.cpp
new file mode 100644
index 0000000000..c878388939
--- /dev/null
+++ b/src/core/string_consumer.cpp
@@ -0,0 +1,199 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file string_consumer.cpp Implementation of string parsing. */
+
+#include "../stdafx.h"
+#include "string_consumer.hpp"
+
+#include "bitmath_func.hpp"
+#include "utf8.hpp"
+#include "string_builder.hpp"
+
+#include "../string_func.h"
+
+#if defined(STRGEN) || defined(SETTINGSGEN)
+#include "../error_func.h"
+#else
+#include "../debug.h"
+#endif
+
+#include "../safeguards.h"
+
+/* static */ const std::string_view StringConsumer::WHITESPACE_NO_NEWLINE = "\t\v\f\r ";
+/* static */ const std::string_view StringConsumer::WHITESPACE_OR_NEWLINE = "\t\n\v\f\r ";
+
+/* static */ void StringConsumer::LogError(std::string &&msg)
+{
+#if defined(STRGEN) || defined(SETTINGSGEN)
+	FatalErrorI(std::move(msg));
+#else
+	DebugPrint("misc", 0, std::move(msg));
+#endif
+}
+
+std::optional<uint8_t> StringConsumer::PeekUint8() const
+{
+	if (this->GetBytesLeft() < 1) return std::nullopt;
+	return static_cast<uint8_t>(this->src[this->position]);
+}
+
+std::optional<uint16_t> StringConsumer::PeekUint16LE() const
+{
+	if (this->GetBytesLeft() < 2) return std::nullopt;
+	return static_cast<uint8_t>(this->src[this->position]) |
+		static_cast<uint8_t>(this->src[this->position + 1]) << 8;
+}
+
+std::optional<uint32_t> StringConsumer::PeekUint32LE() const
+{
+	if (this->GetBytesLeft() < 4) return std::nullopt;
+	return static_cast<uint8_t>(this->src[this->position]) |
+		static_cast<uint8_t>(this->src[this->position + 1]) << 8 |
+		static_cast<uint8_t>(this->src[this->position + 2]) << 16 |
+		static_cast<uint8_t>(this->src[this->position + 3]) << 24;
+}
+
+std::optional<uint64_t> StringConsumer::PeekUint64LE() const
+{
+	if (this->GetBytesLeft() < 8) return std::nullopt;
+	return static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position])) |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 1])) << 8 |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 2])) << 16 |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 3])) << 24 |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 4])) << 32 |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 5])) << 40 |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 6])) << 48 |
+		static_cast<uint64_t>(static_cast<uint8_t>(this->src[this->position + 7])) << 56;
+}
+
+std::optional<char> StringConsumer::PeekChar() const
+{
+	auto result = this->PeekUint8();
+	if (!result.has_value()) return {};
+	return static_cast<char>(*result);
+}
+
+std::pair<StringConsumer::size_type, char32_t> StringConsumer::PeekUtf8() const
+{
+	auto buf = this->src.substr(this->position);
+	return DecodeUtf8(buf);
+}
+
+std::string_view StringConsumer::Peek(size_type len) const
+{
+	auto buf = this->src.substr(this->position);
+	if (len == std::string_view::npos) {
+		len = buf.size();
+	} else if (len > buf.size()) {
+		len = buf.size();
+	}
+	return buf.substr(0, len);
+}
+
+void StringConsumer::Skip(size_type len)
+{
+	if (len == std::string_view::npos) {
+		this->position = this->src.size();
+	} else if (size_type max_len = GetBytesLeft(); len > max_len) {
+		LogError(fmt::format("Source buffer too short: {} > {}", len, max_len));
+		this->position = this->src.size();
+	} else {
+		this->position += len;
+	}
+}
+
+StringConsumer::size_type StringConsumer::Find(std::string_view str) const
+{
+	assert(!str.empty());
+	auto buf = this->src.substr(this->position);
+	return buf.find(str);
+}
+
+StringConsumer::size_type StringConsumer::FindUtf8(char32_t c) const
+{
+	auto [data, len] = EncodeUtf8(c);
+	return this->Find({data, len});
+}
+
+StringConsumer::size_type StringConsumer::FindCharIn(std::string_view chars) const
+{
+	assert(!chars.empty());
+	auto buf = this->src.substr(this->position);
+	return buf.find_first_of(chars);
+}
+
+StringConsumer::size_type StringConsumer::FindCharNotIn(std::string_view chars) const
+{
+	assert(!chars.empty());
+	auto buf = this->src.substr(this->position);
+	return buf.find_first_not_of(chars);
+}
+
+std::string_view StringConsumer::PeekUntil(std::string_view str, SeparatorUsage sep) const
+{
+	assert(!str.empty());
+	auto buf = this->src.substr(this->position);
+	auto len = buf.find(str);
+	if (len != std::string_view::npos) {
+		switch (sep) {
+			case READ_ONE_SEPARATOR:
+				if (buf.compare(len, str.size(), str) == 0) len += str.size();
+				break;
+			case READ_ALL_SEPARATORS:
+				while (buf.compare(len, str.size(), str) == 0) len += str.size();
+				break;
+			default:
+				break;
+		}
+	}
+	return buf.substr(0, len);
+}
+
+std::string_view StringConsumer::PeekUntilUtf8(char32_t c, SeparatorUsage sep) const
+{
+	auto [data, len] = EncodeUtf8(c);
+	return PeekUntil({data, len}, sep);
+}
+
+std::string_view StringConsumer::ReadUntilUtf8(char32_t c, SeparatorUsage sep)
+{
+	auto [data, len] = EncodeUtf8(c);
+	return ReadUntil({data, len}, sep);
+}
+
+void StringConsumer::SkipUntilUtf8(char32_t c, SeparatorUsage sep)
+{
+	auto [data, len] = EncodeUtf8(c);
+	return SkipUntil({data, len}, sep);
+}
+
+void StringConsumer::SkipIntegerBase(int base)
+{
+	this->SkipIf("-");
+	if (base == 0) {
+		if (this->ReadIf("0x") || this->ReadIf("0X")) { // boolean short-circuit ensures only one prefix is read
+			base = 16;
+		} else {
+			base = 10;
+		}
+	}
+	switch (base) {
+		default:
+			assert(false);
+			break;
+		case 8:
+			this->SkipUntilCharNotIn("01234567");
+			break;
+		case 10:
+			this->SkipUntilCharNotIn("0123456789");
+			break;
+		case 16:
+			this->SkipUntilCharNotIn("0123456789abcdefABCDEF");
+			break;
+	}
+}
diff --git a/src/core/string_consumer.hpp b/src/core/string_consumer.hpp
new file mode 100644
index 0000000000..74d88ce586
--- /dev/null
+++ b/src/core/string_consumer.hpp
@@ -0,0 +1,927 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file string_consumer.hpp Parse strings.
+ */
+
+#ifndef STRING_CONSUMER_HPP
+#define STRING_CONSUMER_HPP
+
+#include <charconv>
+#include "format.hpp"
+
+/**
+ * Parse data from a string / buffer.
+ *
+ * There are generally four operations for each data type:
+ * - Peek: Check and return validity and value. Do not advance read position.
+ * - TryRead: Check and return validity and value. Advance reader, if valid.
+ * - Read: Check validity, return value or fallback-value. Advance reader, even if value is invalid, to avoid deadlocks/stalling.
+ * - Skip: Discard value. Advance reader, even if value is invalid, to avoid deadlocks/stalling.
+ */
+class StringConsumer {
+public:
+	using size_type = std::string_view::size_type;
+
+	/**
+	 * Special value for "end of data".
+	 */
+	static constexpr size_type npos = std::string_view::npos;
+
+	/**
+	 * ASCII whitespace characters, excluding new-line.
+	 * Usable in FindChar(In|NotIn), (Peek|Read|Skip)(If|Until)Char(In|NotIn)
+	 */
+	static const std::string_view WHITESPACE_NO_NEWLINE;
+	/**
+	 * ASCII whitespace characters, including new-line.
+	 * Usable in FindChar(In|NotIn), (Peek|Read|Skip)(If|Until)Char(In|NotIn)
+	 */
+	static const std::string_view WHITESPACE_OR_NEWLINE;
+
+private:
+	std::string_view src;
+	size_type position = 0;
+
+	static void LogError(std::string &&msg);
+
+public:
+	/**
+	 * Construct parser with data from string.
+	 */
+	explicit StringConsumer(std::string_view src) : src(src) {}
+	/**
+	 * Construct parser with data from string.
+	 */
+	explicit StringConsumer(const std::string &src) : src(src) {}
+	/**
+	 * Construct parser with data from span.
+	 */
+	explicit StringConsumer(std::span<const char> src) : src(src.data(), src.size()) {}
+
+	/**
+	 * Check whether any bytes left to read.
+	 */
+	[[nodiscard]] bool AnyBytesLeft() const noexcept { return this->position < this->src.size(); }
+	/**
+	 * Get number of bytes left to read.
+	 */
+	[[nodiscard]] size_type GetBytesLeft() const noexcept { return this->src.size() - this->position; }
+
+	/**
+	 * Check wheter any bytes were already read.
+	 */
+	[[nodiscard]] bool AnyBytesRead() const noexcept { return this->position > 0; }
+	/**
+	 * Get number of already read bytes.
+	 */
+	[[nodiscard]] size_type GetBytesRead() const noexcept { return this->position; }
+
+	/**
+	 * Get the original data, as passed to the constructor.
+	 */
+	[[nodiscard]] std::string_view GetOrigData() const noexcept { return this->src; }
+	/**
+	 * Get already read data.
+	 */
+	[[nodiscard]] std::string_view GetReadData() const noexcept { return this->src.substr(0, this->position); }
+	/**
+	 * Get data left to read.
+	 */
+	[[nodiscard]] std::string_view GetLeftData() const noexcept { return this->src.substr(this->position); }
+
+	/**
+	 * Discard all remaining data.
+	 */
+	void SkipAll() { this->position = this->src.size(); }
+
+	/**
+	 * Peek binary uint8.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<uint8_t> PeekUint8() const;
+	/**
+	 * Try to read binary uint8, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<uint8_t> TryReadUint8()
+	{
+		auto value = this->PeekUint8();
+		if (value.has_value()) this->SkipUint8();
+		return value;
+	}
+	/**
+	 * Read binary uint8, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 */
+	[[nodiscard]] uint8_t ReadUint8(uint8_t def = 0)
+	{
+		auto value = this->PeekUint8();
+		this->SkipUint8(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary uint8.
+	 */
+	void SkipUint8() { this->Skip(1); }
+
+	/**
+	 * Peek binary int8.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<int8_t> PeekSint8() const
+	{
+		auto result = PeekUint8();
+		if (!result.has_value()) return std::nullopt;
+		return static_cast<int8_t>(*result);
+	}
+	/**
+	 * Try to read binary int8, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<int8_t> TryReadSint8()
+	{
+		auto value = this->PeekSint8();
+		if (value.has_value()) this->SkipSint8();
+		return value;
+	}
+	/**
+	 * Read binary int8, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 */
+	[[nodiscard]] int8_t ReadSint8(int8_t def = 0)
+	{
+		auto value = this->PeekSint8();
+		this->SkipSint8(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary int8.
+	 */
+	void SkipSint8() { this->Skip(1); }
+
+	/**
+	 * Peek binary uint16 using little endian.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<uint16_t> PeekUint16LE() const;
+	/**
+	 * Try to read binary uint16, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<uint16_t> TryReadUint16LE()
+	{
+		auto value = this->PeekUint16LE();
+		if (value.has_value()) this->SkipUint16LE();
+		return value;
+	}
+	/**
+	 * Read binary uint16 using little endian, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	[[nodiscard]] uint16_t ReadUint16LE(uint16_t def = 0)
+	{
+		auto value = this->PeekUint16LE();
+		this->SkipUint16LE(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary uint16, and advance reader.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	void SkipUint16LE() { this->Skip(2); }
+
+	/**
+	 * Peek binary int16 using little endian.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<int16_t> PeekSint16LE() const
+	{
+		auto result = PeekUint16LE();
+		if (!result.has_value()) return std::nullopt;
+		return static_cast<int16_t>(*result);
+	}
+	/**
+	 * Try to read binary int16, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<int16_t> TryReadSint16LE()
+	{
+		auto value = this->PeekSint16LE();
+		if (value.has_value()) this->SkipSint16LE();
+		return value;
+	}
+	/**
+	 * Read binary int16 using little endian, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	[[nodiscard]] int16_t ReadSint16LE(int16_t def = 0)
+	{
+		auto value = this->PeekSint16LE();
+		this->SkipSint16LE(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary int16, and advance reader.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	void SkipSint16LE() { this->Skip(2); }
+
+	/**
+	 * Peek binary uint32 using little endian.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<uint32_t> PeekUint32LE() const;
+	/**
+	 * Try to read binary uint32, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<uint32_t> TryReadUint32LE()
+	{
+		auto value = this->PeekUint32LE();
+		if (value.has_value()) this->SkipUint32LE();
+		return value;
+	}
+	/**
+	 * Read binary uint32 using little endian, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	[[nodiscard]] uint32_t ReadUint32LE(uint32_t def = 0)
+	{
+		auto value = this->PeekUint32LE();
+		this->SkipUint32LE(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary uint32, and advance reader.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	void SkipUint32LE() { this->Skip(4); }
+
+	/**
+	 * Peek binary int32 using little endian.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<int32_t> PeekSint32LE() const
+	{
+		auto result = PeekUint32LE();
+		if (!result.has_value()) return std::nullopt;
+		return static_cast<int32_t>(*result);
+	}
+	/**
+	 * Try to read binary int32, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<int32_t> TryReadSint32LE()
+	{
+		auto value = this->PeekSint32LE();
+		if (value.has_value()) this->SkipSint32LE();
+		return value;
+	}
+	/**
+	 * Read binary int32 using little endian, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	[[nodiscard]] int32_t ReadSint32LE(int32_t def = 0)
+	{
+		auto value = this->PeekSint32LE();
+		this->SkipSint32LE(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary int32, and advance reader.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	void SkipSint32LE() { this->Skip(4); }
+
+	/**
+	 * Peek binary uint64 using little endian.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<uint64_t> PeekUint64LE() const;
+	/**
+	 * Try to read binary uint64, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<uint64_t> TryReadUint64LE()
+	{
+		auto value = this->PeekUint64LE();
+		if (value.has_value()) this->SkipUint64LE();
+		return value;
+	}
+	/**
+	 * Read binary uint64 using little endian, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	[[nodiscard]] uint64_t ReadUint64LE(uint64_t def = 0)
+	{
+		auto value = this->PeekUint64LE();
+		this->SkipUint64LE(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary uint64, and advance reader.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	void SkipUint64LE() { this->Skip(8); }
+
+	/**
+	 * Peek binary int64 using little endian.
+	 * @return Read integer, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<int64_t> PeekSint64LE() const
+	{
+		auto result = PeekUint64LE();
+		if (!result.has_value()) return std::nullopt;
+		return static_cast<int64_t>(*result);
+	}
+	/**
+	 * Try to read binary int64, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<int64_t> TryReadSint64LE()
+	{
+		auto value = this->PeekSint64LE();
+		if (value.has_value()) this->SkipSint64LE();
+		return value;
+	}
+	/**
+	 * Read binary int64 using little endian, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read integer, 'def' if not enough data.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	[[nodiscard]] int64_t ReadSint64LE(int64_t def = 0)
+	{
+		auto value = this->PeekSint64LE();
+		this->SkipSint64LE(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip binary int64, and advance reader.
+	 * @note The reader is advanced, even if not enough data was present.
+	 */
+	void SkipSint64LE() { this->Skip(8); }
+
+	/**
+	 * Peek 8-bit character.
+	 * @return Read char, std::nullopt if not enough data.
+	 */
+	[[nodiscard]] std::optional<char> PeekChar() const;
+	/**
+	 * Try to read a 8-bit character, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<char> TryReadChar()
+	{
+		auto value = this->PeekChar();
+		if (value.has_value()) this->SkipChar();
+		return value;
+	}
+	/**
+	 * Read 8-bit character, and advance reader.
+	 * @param def Default value to return, if not enough data.
+	 * @return Read character, 'def' if not enough data.
+	 */
+	[[nodiscard]] char ReadChar(char def = '?') {
+		auto value = this->PeekChar();
+		this->SkipChar(); // always advance
+		return value.value_or(def);
+	}
+	/**
+	 * Skip 8-bit character, and advance reader.
+	 */
+	void SkipChar() { this->Skip(1); }
+
+	/**
+	 * Peek UTF-8 character.
+	 * @return Length and read char, {0, 0} if no valid data.
+	 */
+	[[nodiscard]] std::pair<size_type, char32_t> PeekUtf8() const;
+	/**
+	 * Try to read a UTF-8 character, and then advance reader.
+	 */
+	[[nodiscard]] std::optional<char32_t> TryReadUtf8()
+	{
+		auto [len, value] = this->PeekUtf8();
+		if (len == 0) return std::nullopt;
+		this->Skip(len);
+		return value;
+	}
+	/**
+	 * Read UTF-8 character, and advance reader.
+	 * @param def Default value to return, if no valid data.
+	 * @return Read char, 'def' if no valid data.
+	 * @note The reader is advanced, even if no valid data was present.
+	 */
+	[[nodiscard]] char32_t ReadUtf8(char32_t def = '?')
+	{
+		auto [len, value] = this->PeekUtf8();
+		this->Skip(len > 0 ? len : 1); // advance at least one byte
+		return len > 0 ? value : def;
+	}
+	/**
+	 * Skip UTF-8 character, and advance reader.
+	 * @note The reader is advanced, even if no valid data was present.
+	 * @note This behaves different to Utf8View::iterator.
+	 *       Here we do not skip overlong encodings, because we want to
+	 *       allow binary data to follow UTF-8 data.
+	 */
+	void SkipUtf8()
+	{
+		auto len = this->PeekUtf8().first;
+		this->Skip(len > 0 ? len : 1); // advance at least one byte
+	}
+
+	/**
+	 * Check whether the next data matches 'str'.
+	 */
+	[[nodiscard]] bool PeekIf(std::string_view str) const
+	{
+		return this->src.compare(this->position, str.size(), str) == 0;
+	}
+	/**
+	 * Check whether the next data matches 'str', and skip it.
+	 */
+	[[nodiscard]] bool ReadIf(std::string_view str)
+	{
+		bool result = this->PeekIf(str);
+		if (result) this->Skip(str.size());
+		return result;
+	}
+	/**
+	 * If the next data matches 'str', then skip it.
+	 */
+	void SkipIf(std::string_view str)
+	{
+		if (this->PeekIf(str)) this->Skip(str.size());
+	}
+
+	/**
+	 * Check whether the next 8-bit char matches 'c'.
+	 */
+	[[nodiscard]] bool PeekCharIf(char c) const
+	{
+		return this->PeekIf({&c, 1});
+	}
+	/**
+	 * Check whether the next 8-bit char matches 'c', and skip it.
+	 */
+	[[nodiscard]] bool ReadCharIf(char c)
+	{
+		return this->ReadIf({&c, 1});
+	}
+	/**
+	 * If the next data matches the 8-bit char 'c', then skip it.
+	 */
+	void SkipCharIf(char c)
+	{
+		return this->SkipIf({&c, 1});
+	}
+
+	/**
+	 * Check whether the next UTF-8 char matches 'c'.
+	 */
+	[[nodiscard]] bool PeekUtf8If(char32_t c) const
+	{
+		auto [len, result] = this->PeekUtf8();
+		return len > 0 && result == c;
+	}
+	/**
+	 * Check whether the next UTF-8 char matches 'c', and skip it.
+	 */
+	[[nodiscard]] bool ReadUtf8If(char32_t c)
+	{
+		auto [len, result] = this->PeekUtf8();
+		if (len == 0 || result != c) return false;
+		this->Skip(len);
+		return true;
+	}
+	/**
+	 * If the next data matches the UTF-8 char 'c', then skip it.
+	 */
+	void SkipUtf8If(char32_t c)
+	{
+		auto [len, result] = this->PeekUtf8();
+		if (len > 0 && result == c) {
+			this->Skip(len);
+		}
+	}
+
+	/**
+	 * Peek the next 'len' bytes.
+	 * @param len Bytes to read, 'npos' to read all.
+	 * @return Up to 'len' bytes.
+	 */
+	[[nodiscard]] std::string_view Peek(size_type len) const;
+	/**
+	 * Read the next 'len' bytes, and advance reader.
+	 * @param len Bytes to read, 'npos' to read all.
+	 * @return Up to 'len' bytes.
+	 */
+	[[nodiscard]] std::string_view Read(size_type len)
+	{
+		auto result = this->Peek(len);
+		if (len != npos && len != result.size()) {
+			LogError(fmt::format("Source buffer too short: {} > {}", len, result.size()));
+		}
+		this->Skip(result.size());
+		return result;
+	}
+	/**
+	 * Discard some bytes.
+	 * @param len Number of bytes to skip, 'npos' to skip all.
+	 */
+	void Skip(size_type len);
+
+	/**
+	 * Find first occurence of 'str'.
+	 * @return Offset from current reader position. 'npos' if no match found.
+	 */
+	[[nodiscard]] size_type Find(std::string_view str) const;
+	/**
+	 * Find first occurence of 8-bit char 'c'.
+	 * @return Offset from current reader position. 'npos' if no match found.
+	 */
+	[[nodiscard]] size_type FindChar(char c) const
+	{
+		return this->Find({&c, 1});
+	}
+	/**
+	 * Find first occurence of UTF-8 char 'c'.
+	 * @return Offset from current reader position. 'npos' if no match found.
+	 */
+	[[nodiscard]] size_type FindUtf8(char32_t c) const;
+
+	/**
+	 * Find first occurence of any 8-bit char in 'chars'.
+	 * @return Offset from current reader position. 'npos' if no match found.
+	 */
+	[[nodiscard]] size_type FindCharIn(std::string_view chars) const;
+	/**
+	 * Find first occurence of any 8-bit char not in 'chars'.
+	 * @return Offset from current reader position. 'npos' if no match found.
+	 */
+	[[nodiscard]] size_type FindCharNotIn(std::string_view chars) const;
+
+	/**
+	 * Check whether the next 8-bit char is in 'chars'.
+	 * @return Matching char, std::nullopt if no match.
+	 */
+	[[nodiscard]] std::optional<char> PeekCharIfIn(std::string_view chars) const
+	{
+		assert(!chars.empty());
+		std::optional<char> c = this->PeekChar();
+		if (c.has_value() && chars.find(*c) != std::string_view::npos) return c;
+		return std::nullopt;
+	}
+	/**
+	 * Read next 8-bit char, check whether it is in 'chars', and advance reader.
+	 * @return Matching char, std::nullopt if no match.
+	 */
+	[[nodiscard]] std::optional<char> ReadCharIfIn(std::string_view chars)
+	{
+		auto result = this->PeekCharIfIn(chars);
+		if (result.has_value()) this->Skip(1);
+		return result;
+	}
+	/**
+	 * If the next 8-bit char is in 'chars', skip it.
+	 */
+	void SkipCharIfIn(std::string_view chars)
+	{
+		auto result = this->PeekCharIfIn(chars);
+		if (result.has_value()) this->Skip(1);
+	}
+
+	/**
+	 * Check whether the next 8-bit char is not in 'chars'.
+	 * @return Non-matching char, std::nullopt if match.
+	 */
+	[[nodiscard]] std::optional<char> PeekCharIfNotIn(std::string_view chars) const
+	{
+		assert(!chars.empty());
+		std::optional<char> c = this->PeekChar();
+		if (c.has_value() && chars.find(*c) == std::string_view::npos) return c;
+		return std::nullopt;
+	}
+	/**
+	 * Read next 8-bit char, check whether it is not in 'chars', and advance reader.
+	 * @return Non-matching char, std::nullopt if match.
+	 */
+	[[nodiscard]] std::optional<char> ReadCharIfNotIn(std::string_view chars)
+	{
+		auto result = this->PeekCharIfNotIn(chars);
+		if (result.has_value()) this->Skip(1);
+		return result;
+	}
+	/**
+	 * If the next 8-bit char is not in 'chars', skip it.
+	 */
+	void SkipCharIfNotIn(std::string_view chars)
+	{
+		auto result = this->PeekCharIfNotIn(chars);
+		if (result.has_value()) this->Skip(1);
+	}
+
+	/**
+	 * Peek 8-bit chars, while they are not in 'chars', until they are.
+	 * @return Non-matching chars.
+	 */
+	[[nodiscard]] std::string_view PeekUntilCharIn(std::string_view chars) const
+	{
+		size_type len = this->FindCharIn(chars);
+		return this->Peek(len);
+	}
+	/**
+	 * Read 8-bit chars, while they are not in 'chars', until they are; and advance reader.
+	 * @return Non-matching chars.
+	 */
+	[[nodiscard]] std::string_view ReadUntilCharIn(std::string_view chars)
+	{
+		size_type len = this->FindCharIn(chars);
+		return this->Read(len);
+	}
+	/**
+	 * Skip 8-bit chars, while they are not in 'chars', until they are.
+	 */
+	void SkipUntilCharIn(std::string_view chars)
+	{
+		size_type len = this->FindCharIn(chars);
+		this->Skip(len);
+	}
+
+	/**
+	 * Peek 8-bit chars, while they are in 'chars', until they are not.
+	 * @return Matching chars.
+	 */
+	[[nodiscard]] std::string_view PeekUntilCharNotIn(std::string_view chars) const
+	{
+		size_type len = this->FindCharNotIn(chars);
+		return this->Peek(len);
+	}
+	/**
+	 * Read 8-bit chars, while they are in 'chars', until they are not; and advance reader.
+	 * @return Matching chars.
+	 */
+	[[nodiscard]] std::string_view ReadUntilCharNotIn(std::string_view chars)
+	{
+		size_type len = this->FindCharNotIn(chars);
+		return this->Read(len);
+	}
+	/**
+	 * Skip 8-bit chars, while they are in 'chars', until they are not.
+	 */
+	void SkipUntilCharNotIn(std::string_view chars)
+	{
+		size_type len = this->FindCharNotIn(chars);
+		this->Skip(len);
+	}
+
+	/**
+	 * Treatment of separator characters.
+	 */
+	enum SeparatorUsage {
+		READ_ALL_SEPARATORS, ///< Read all consecutive separators, and include them all in the result
+		READ_ONE_SEPARATOR,  ///< Read one separator, and include it in the result
+		KEEP_SEPARATOR,      ///< Keep the separator in the data as next value to be read.
+		SKIP_ONE_SEPARATOR,  ///< Read and discard one separator, do not include it in the result.
+		SKIP_ALL_SEPARATORS, ///< Read and discard all consecutive separators, do not include any in the result.
+	};
+
+	/**
+	 * Peek data until the first occurrence of 'str'.
+	 * @param str Separator string.
+	 * @param sep Whether to include/exclude 'str' from the result.
+	 */
+	[[nodiscard]] std::string_view PeekUntil(std::string_view str, SeparatorUsage sep) const;
+	/**
+	 * Read data until the first occurrence of 'str', and advance reader.
+	 * @param str Separator string.
+	 * @param sep Whether to include/exclude 'str' from the result, and/or skip it.
+	 */
+	[[nodiscard]] std::string_view ReadUntil(std::string_view str, SeparatorUsage sep)
+	{
+		assert(!str.empty());
+		auto result = this->PeekUntil(str, sep);
+		this->Skip(result.size());
+		switch (sep) {
+			default:
+				break;
+			case SKIP_ONE_SEPARATOR:
+				this->SkipIf(str);
+				break;
+			case SKIP_ALL_SEPARATORS:
+				while (this->ReadIf(str)) {}
+				break;
+		}
+		return result;
+	}
+	/**
+	 * Skip data until the first occurrence of 'str'.
+	 * @param str Separator string.
+	 * @param sep Whether to also skip 'str'.
+	 */
+	void SkipUntil(std::string_view str, SeparatorUsage sep)
+	{
+		assert(!str.empty());
+		this->Skip(this->Find(str));
+		switch (sep) {
+			default:
+				break;
+			case READ_ONE_SEPARATOR:
+			case SKIP_ONE_SEPARATOR:
+				this->SkipIf(str);
+				break;
+			case READ_ALL_SEPARATORS:
+			case SKIP_ALL_SEPARATORS:
+				while (this->ReadIf(str)) {}
+				break;
+		}
+	}
+
+	/**
+	 * Peek data until the first occurrence of 8-bit char 'c'.
+	 * @param c Separator char.
+	 * @param sep Whether to include/exclude 'c' from the result.
+	 */
+	[[nodiscard]] std::string_view PeekUntilChar(char c, SeparatorUsage sep) const
+	{
+		return this->PeekUntil({&c, 1}, sep);
+	}
+	/**
+	 * Read data until the first occurrence of 8-bit char 'c', and advance reader.
+	 * @param c Separator char.
+	 * @param sep Whether to include/exclude 'c' from the result, and/or skip it.
+	 */
+	[[nodiscard]] std::string_view ReadUntilChar(char c, SeparatorUsage sep)
+	{
+		return this->ReadUntil({&c, 1}, sep);
+	}
+	/**
+	 * Skip data until the first occurrence of 8-bit char 'c'.
+	 * @param c Separator char.
+	 * @param sep Whether to also skip 'c'.
+	 */
+	void SkipUntilChar(char c, SeparatorUsage sep)
+	{
+		this->SkipUntil({&c, 1}, sep);
+	}
+
+	/**
+	 * Peek data until the first occurrence of UTF-8 char 'c'.
+	 * @param c Separator char.
+	 * @param sep Whether to include/exclude 'c' from the result.
+	 */
+	[[nodiscard]] std::string_view PeekUntilUtf8(char32_t c, SeparatorUsage sep) const;
+	/**
+	 * Read data until the first occurrence of UTF-8 char 'c', and advance reader.
+	 * @param c Separator char.
+	 * @param sep Whether to include/exclude 'c' from the result, and/or skip it.
+	 */
+	[[nodiscard]] std::string_view ReadUntilUtf8(char32_t c, SeparatorUsage sep);
+	/**
+	 * Skip data until the first occurrence of UTF-8 char 'c'.
+	 * @param c Separator char.
+	 * @param sep Whether to also skip 'c'.
+	 */
+	void SkipUntilUtf8(char32_t c, SeparatorUsage sep);
+
+private:
+	template <class T>
+	[[nodiscard]] static std::pair<size_type, T> ParseIntegerBase(std::string_view src, int base, bool clamp, bool log_errors)
+	{
+		if (base == 0) {
+			/* Try positive hex */
+			if (src.starts_with("0x") || src.starts_with("0X")) {
+				auto [len, value] = ParseIntegerBase<T>(src.substr(2), 16, clamp, log_errors);
+				if (len == 0) return {};
+				return {len + 2, value};
+			}
+
+			/* Try negative hex */
+			if (std::is_signed_v<T> && (src.starts_with("-0x") || src.starts_with("-0X"))) {
+				using Unsigned = std::make_unsigned_t<T>;
+				auto [len, uvalue] = ParseIntegerBase<Unsigned>(src.substr(3), 16, clamp, log_errors);
+				if (len == 0) return {};
+				T value = static_cast<T>(0 - uvalue);
+				if (value > 0) {
+					if (!clamp) {
+						if (log_errors) LogError(fmt::format("Integer out of range: '{}'", src.substr(0, len + 3)));
+						return {};
+					}
+					value = std::numeric_limits<T>::lowest();
+				}
+				return {len + 3, value};
+			}
+
+			/* Try decimal */
+			return ParseIntegerBase<T>(src, 10, clamp, log_errors);
+		}
+
+		T value{};
+		assert(base == 8 || base == 10 || base == 16); // we only support these bases when skipping
+		auto result = std::from_chars(src.data(), src.data() + src.size(), value, base);
+		auto len = result.ptr - src.data();
+		if (result.ec == std::errc::result_out_of_range) {
+			if (!clamp) {
+				if (log_errors) LogError(fmt::format("Integer out of range: '{}'+'{}'", src.substr(0, len), src.substr(len, 4)));
+				return {};
+			}
+			if (src.starts_with("-")) {
+				value = std::numeric_limits<T>::lowest();
+			} else {
+				value = std::numeric_limits<T>::max();
+			}
+		} else if (result.ec != std::errc{}) {
+			if (log_errors) LogError(fmt::format("Cannot parse integer: '{}'+'{}'", src.substr(0, len), src.substr(len, 4)));
+			return {};
+		}
+		return {len, value};
+	}
+
+public:
+	/**
+	 * Peek and parse an integer in number 'base'.
+	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+	 *              Negative values for unsigned results are still treated as invalid.
+	 * @return Length of string match, and parsed value.
+	 * @note The parser rejects leading whitespace and unary plus.
+	 */
+	template <class T>
+	[[nodiscard]] std::pair<size_type, T> PeekIntegerBase(int base, bool clamp = false) const
+	{
+		return ParseIntegerBase<T>(this->src.substr(this->position), base, clamp, false);
+	}
+	/**
+	 * Try to read and parse an integer in number 'base', and then advance the reader.
+	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+	 *              Negative values for unsigned results are still treated as invalid.
+	 * @return Parsed value, if valid.
+	 * @note The parser rejects leading whitespace and unary plus.
+	 */
+	template <class T>
+	[[nodiscard]] std::optional<T> TryReadIntegerBase(int base, bool clamp = false)
+	{
+		auto [len, value] = this->PeekIntegerBase<T>(base, clamp);
+		if (len == 0) return std::nullopt;
+		this->SkipIntegerBase(base);
+		return value;
+	}
+	/**
+	 * Read and parse an integer in number 'base', and advance the reader.
+	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+	 *              Negative values for unsigned results are still treated as invalid.
+	 * @return Parsed value, or 'def' if invalid.
+	 * @note The reader is advanced, even if no valid data was present.
+	 * @note The parser rejects leading whitespace and unary plus.
+	 */
+	template <class T>
+	[[nodiscard]] T ReadIntegerBase(int base, T def = 0, bool clamp = false)
+	{
+		auto [len, value] = ParseIntegerBase<T>(this->src.substr(this->position), base, clamp, true);
+		this->SkipIntegerBase(base); // always advance
+		return len > 0 ? value : def;
+	}
+	/**
+	 * Skip an integer in number 'base'.
+	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @note The reader is advanced, even if no valid data was present.
+	 * @note The parser rejects leading whitespace and unary plus.
+	 */
+	void SkipIntegerBase(int base);
+};
+
+/**
+ * Change a string into its number representation.
+ * Supports decimal and hexadecimal numbers.
+ * Accepts leading and trailing whitespace. Trailing junk is an error.
+ * @param arg The string to be converted.
+ * @param base The base for parsing the number, defaults to only decimal numbers. Use 0 to also allow hexadecimal.
+ * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+ *              Negative values for unsigned results are still treated as invalid.
+ * @return The number, or std::nullopt if it could not be parsed.
+ */
+template <class T = uint32_t>
+static inline std::optional<T> ParseInteger(std::string_view arg, int base = 10, bool clamp = false)
+{
+	StringConsumer consumer{arg};
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+	auto result = consumer.TryReadIntegerBase<T>(base, clamp);
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+	if (consumer.AnyBytesLeft()) return std::nullopt;
+	return result;
+}
+
+#endif /* STRING_CONSUMER_HPP */
diff --git a/src/core/string_inplace.cpp b/src/core/string_inplace.cpp
new file mode 100644
index 0000000000..1c3a5c8485
--- /dev/null
+++ b/src/core/string_inplace.cpp
@@ -0,0 +1,63 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file string_inplace.cpp Inplace-replacement of textual and binary data.
+ */
+
+#include "../stdafx.h"
+#include "string_inplace.hpp"
+#include "../safeguards.h"
+
+/**
+ * Check whether any unused bytes are left between the Builder and Consumer position.
+ */
+[[nodiscard]] bool InPlaceBuilder::AnyBytesUnused() const noexcept
+{
+	return this->consumer.GetBytesRead() > this->position;
+}
+
+/**
+ * Get number of unused bytes left between the Builder and Consumer position.
+ */
+[[nodiscard]] InPlaceBuilder::size_type InPlaceBuilder::GetBytesUnused() const noexcept
+{
+	return this->consumer.GetBytesRead() - this->position;
+}
+
+/**
+ * Append buffer.
+ */
+void InPlaceBuilder::PutBuffer(std::span<const char> str)
+{
+	auto unused = this->GetBytesUnused();
+	if (str.size() > unused) NOT_REACHED();
+	std::ranges::copy(str, this->dest.data() + this->position);
+	this->position += str.size();
+}
+
+/**
+ * Create coupled Consumer+Builder pair.
+ * @param buffer Data to consume and replace.
+ * @note The lifetime of the buffer must exceed the lifetime of both the Consumer and the Builder.
+ */
+InPlaceReplacement::InPlaceReplacement(std::span<char> buffer)
+	: consumer(buffer), builder(buffer, consumer)
+{
+}
+
+InPlaceReplacement::InPlaceReplacement(const InPlaceReplacement &src)
+	: consumer(src.consumer), builder(src.builder, consumer)
+{
+}
+
+InPlaceReplacement& InPlaceReplacement::operator=(const InPlaceReplacement &src)
+{
+	this->consumer = src.consumer;
+	this->builder.AssignBuffer(src.builder);
+	return *this;
+}
diff --git a/src/core/string_inplace.hpp b/src/core/string_inplace.hpp
new file mode 100644
index 0000000000..5b97735291
--- /dev/null
+++ b/src/core/string_inplace.hpp
@@ -0,0 +1,102 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file string_inplace.hpp Inplace-replacement of textual and binary data.
+ */
+
+#ifndef STRING_INPLACE_HPP
+#define STRING_INPLACE_HPP
+
+#include "string_builder.hpp"
+#include "string_consumer.hpp"
+
+/**
+ * Builder implementation for InPlaceReplacement.
+ */
+class InPlaceBuilder final : public BaseStringBuilder {
+	std::span<char> dest;
+	size_type position = 0;
+	const StringConsumer &consumer;
+
+	friend class InPlaceReplacement;
+	explicit InPlaceBuilder(std::span<char> dest, const StringConsumer &consumer) : dest(dest), consumer(consumer) {}
+	InPlaceBuilder(const InPlaceBuilder &src, const StringConsumer &consumer) : dest(src.dest), position(src.position), consumer(consumer) {}
+	void AssignBuffer(const InPlaceBuilder &src) { this->dest = src.dest; this->position = src.position; }
+public:
+	InPlaceBuilder(const InPlaceBuilder &) = delete;
+	InPlaceBuilder& operator=(const InPlaceBuilder &) = delete;
+
+	/**
+	 * Check whether any bytes have been written.
+	 */
+	[[nodiscard]] bool AnyBytesWritten() const noexcept { return this->position != 0; }
+	/**
+	 * Get number of already written bytes.
+	 */
+	[[nodiscard]] size_type GetBytesWritten() const noexcept { return this->position; }
+	/**
+	 * Get already written data.
+	 */
+	[[nodiscard]] std::string_view GetWrittenData() const noexcept { return {this->dest.data(), this->position}; }
+
+	[[nodiscard]] bool AnyBytesUnused() const noexcept;
+	[[nodiscard]] size_type GetBytesUnused() const noexcept;
+
+	void PutBuffer(std::span<const char> str) override;
+
+	/**
+	 * Implementation of std::back_insert_iterator for non-growing destination buffer.
+	 */
+	class back_insert_iterator {
+		InPlaceBuilder *parent = nullptr;
+	public:
+		using value_type = void;
+		using difference_type = void;
+		using iterator_category = std::output_iterator_tag;
+		using pointer = void;
+		using reference = void;
+
+		back_insert_iterator(InPlaceBuilder &parent) : parent(&parent) {}
+
+		back_insert_iterator &operator++() { return *this; }
+		back_insert_iterator operator++(int) { return *this; }
+		back_insert_iterator &operator*() { return *this; }
+
+		back_insert_iterator &operator=(char value)
+		{
+			this->parent->PutChar(value);
+			return *this;
+		}
+	};
+	/**
+	 * Create a back-insert-iterator.
+	 */
+	back_insert_iterator back_inserter()
+	{
+		return back_insert_iterator(*this);
+	}
+};
+
+/**
+ * Compose data into a fixed size buffer, which is consumed at the same time.
+ * - The Consumer reads data from a buffer.
+ * - The Builder writes data to the buffer, replacing already consumed data.
+ * - The Builder asserts, if it overtakes the consumer.
+ */
+class InPlaceReplacement {
+public:
+	StringConsumer consumer; ///< Consumer from shared buffer
+	InPlaceBuilder builder; ///< Builder into shared buffer
+
+public:
+	InPlaceReplacement(std::span<char> buffer);
+	InPlaceReplacement(const InPlaceReplacement &src);
+	InPlaceReplacement& operator=(const InPlaceReplacement &src);
+};
+
+#endif /* STRING_INPLACE_HPP */
diff --git a/src/core/utf8.hpp b/src/core/utf8.hpp
index db1354ef24..26e6305ba9 100644
--- a/src/core/utf8.hpp
+++ b/src/core/utf8.hpp
@@ -13,11 +13,17 @@
 #define UTF8_HPP
 
 #include <iterator>
-#include "../string_func.h"
+#include "bitmath_func.hpp"
 
 [[nodiscard]] std::pair<char[4], size_t> EncodeUtf8(char32_t c);
 [[nodiscard]] std::pair<size_t, char32_t> DecodeUtf8(std::string_view buf);
 
+/* Check if the given character is part of a UTF8 sequence */
+inline bool IsUtf8Part(char c)
+{
+	return GB(c, 6, 2) == 2;
+}
+
 /**
  * Constant span of UTF-8 encoded data.
  */
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 85c0932803..815c31e32e 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -73,7 +73,7 @@ static void SurveyRecentNews(nlohmann::json &json)
  * @param with_dir      Whether to prepend the filename with the personal directory.
  * @return The filename
  */
-std::string CrashLog::CreateFileName(const char *ext, bool with_dir) const
+std::string CrashLog::CreateFileName(std::string_view ext, bool with_dir) const
 {
 	static std::string crashname;
 
diff --git a/src/crashlog.h b/src/crashlog.h
index 836bef5082..4dbc2ebce0 100644
--- a/src/crashlog.h
+++ b/src/crashlog.h
@@ -46,7 +46,7 @@ private:
 	virtual bool TryExecute(std::string_view section_name, std::function<bool()> &&func) = 0;
 
 protected:
-	std::string CreateFileName(const char *ext, bool with_dir = true) const;
+	std::string CreateFileName(std::string_view ext, bool with_dir = true) const;
 
 public:
 	/** Stub destructor to silence some compilers. */
diff --git a/src/currency.cpp b/src/currency.cpp
index 1e8389c2c4..a839ab83c1 100644
--- a/src/currency.cpp
+++ b/src/currency.cpp
@@ -143,7 +143,7 @@ uint64_t GetMaskOfAllowedCurrencies()
 /**
  * Verify if the currency chosen by the user is about to be converted to Euro
  */
-static IntervalTimer<TimerGameCalendar> _check_switch_to_euro({TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameCalendar> _check_switch_to_euro({TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [](auto)
 {
 	if (_currency_specs[_settings_game.locale.currency].to_euro != CF_NOEURO &&
 			_currency_specs[_settings_game.locale.currency].to_euro != CF_ISEURO &&
diff --git a/src/currency.h b/src/currency.h
index 5484b19ec1..74dec0dbf2 100644
--- a/src/currency.h
+++ b/src/currency.h
@@ -94,7 +94,7 @@ struct CurrencySpec {
 
 	CurrencySpec() = default;
 
-	CurrencySpec(uint16_t rate, const char *separator, TimerGameCalendar::Year to_euro, const char *prefix, const char *suffix, const char *code, uint8_t symbol_pos, StringID name) :
+	CurrencySpec(uint16_t rate, std::string_view separator, TimerGameCalendar::Year to_euro, std::string_view prefix, std::string_view suffix, std::string_view code, uint8_t symbol_pos, StringID name) :
 		rate(rate), separator(separator), to_euro(to_euro), prefix(prefix), suffix(suffix), code(code), symbol_pos(symbol_pos), name(name)
 	{
 	}
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
index 557816fb0c..02ab436d63 100644
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -26,8 +26,7 @@
 
 /** Window to select a date graphically by using dropdowns */
 struct SetDateWindow : Window {
-	SetDateCallback *callback = nullptr; ///< Callback to call when a date has been selected
-	void *callback_data = nullptr; ///< Callback data pointer.
+	SetDateCallback callback; ///< Callback to call when a date has been selected
 	TimerGameEconomy::YearMonthDay date{}; ///< The currently selected date
 	TimerGameEconomy::Year min_year{}; ///< The minimum year in the year dropdown
 	TimerGameEconomy::Year max_year{}; ///< The maximum year (inclusive) in the year dropdown
@@ -42,10 +41,9 @@ struct SetDateWindow : Window {
 	 * @param max_year the maximum year (inclusive) to show in the year dropdown
 	 * @param callback the callback to call once a date has been selected
 	 */
-	SetDateWindow(WindowDesc &desc, WindowNumber window_number, Window *parent, TimerGameEconomy::Date initial_date, TimerGameEconomy::Year min_year, TimerGameEconomy::Year max_year, SetDateCallback *callback, void *callback_data) :
+	SetDateWindow(WindowDesc &desc, WindowNumber window_number, Window *parent, TimerGameEconomy::Date initial_date, TimerGameEconomy::Year min_year, TimerGameEconomy::Year max_year, SetDateCallback &&callback) :
 			Window(desc),
-			callback(callback),
-			callback_data(callback_data),
+			callback(std::move(callback)),
 			min_year(std::max(EconomyTime::MIN_YEAR, min_year)),
 			max_year(std::min(EconomyTime::MAX_YEAR, max_year))
 	{
@@ -149,13 +147,13 @@ struct SetDateWindow : Window {
 				break;
 
 			case WID_SD_SET_DATE:
-				if (this->callback != nullptr) this->callback(this, TimerGameEconomy::ConvertYMDToDate(this->date.year, this->date.month, this->date.day), this->callback_data);
+				this->callback(this, TimerGameEconomy::ConvertYMDToDate(this->date.year, this->date.month, this->date.day));
 				this->Close();
 				break;
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_SD_DAY:
@@ -198,7 +196,7 @@ static constexpr NWidgetPart _nested_set_date_widgets[] = {
 
 /** Description of the date setting window. */
 static WindowDesc _set_date_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_SET_DATE, WC_NONE,
 	{},
 	_nested_set_date_widgets
@@ -212,10 +210,9 @@ static WindowDesc _set_date_desc(
  * @param min_year the minimum year to show in the year dropdown
  * @param max_year the maximum year (inclusive) to show in the year dropdown
  * @param callback the callback to call once a date has been selected
- * @param callback_data extra callback data
  */
-void ShowSetDateWindow(Window *parent, int window_number, TimerGameEconomy::Date initial_date, TimerGameEconomy::Year min_year, TimerGameEconomy::Year max_year, SetDateCallback *callback, void *callback_data)
+void ShowSetDateWindow(Window *parent, int window_number, TimerGameEconomy::Date initial_date, TimerGameEconomy::Year min_year, TimerGameEconomy::Year max_year, SetDateCallback &&callback)
 {
 	CloseWindowByClass(WC_SET_DATE);
-	new SetDateWindow(_set_date_desc, window_number, parent, initial_date, min_year, max_year, callback, callback_data);
+	new SetDateWindow(_set_date_desc, window_number, parent, initial_date, min_year, max_year, std::move(callback));
 }
diff --git a/src/date_gui.h b/src/date_gui.h
index 4733f50600..8434f4cfd1 100644
--- a/src/date_gui.h
+++ b/src/date_gui.h
@@ -10,7 +10,7 @@
 #ifndef DATE_GUI_H
 #define DATE_GUI_H
 
-#include "timer/timer_game_calendar.h"
+#include "timer/timer_game_economy.h"
 #include "window_type.h"
 
 /**
@@ -18,8 +18,8 @@
  * @param w the window that sends the callback
  * @param date the date that has been chosen
  */
-typedef void SetDateCallback(const Window *w, TimerGameEconomy::Date date, void *data);
+using SetDateCallback = std::function<void (const Window *w, TimerGameEconomy::Date date)>;
 
-void ShowSetDateWindow(Window *parent, int window_number, TimerGameEconomy::Date initial_date, TimerGameEconomy::Year min_year, TimerGameEconomy::Year max_year, SetDateCallback *callback, void *callback_data);
+void ShowSetDateWindow(Window *parent, int window_number, TimerGameEconomy::Date initial_date, TimerGameEconomy::Year min_year, TimerGameEconomy::Year max_year, SetDateCallback &&callback);
 
 #endif /* DATE_GUI_H */
diff --git a/src/debug.cpp b/src/debug.cpp
index fd8d7581e5..9d9f28db64 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -8,6 +8,7 @@
 /** @file debug.cpp Handling of printing debug messages. */
 
 #include "stdafx.h"
+#include "core/string_consumer.hpp"
 #include "console_func.h"
 #include "debug.h"
 #include "string_func.h"
@@ -27,7 +28,7 @@
 
 /** Element in the queue of debug messages that have to be passed to either NetworkAdminConsole or IConsolePrint.*/
 struct QueuedDebugItem {
-	std::string level;   ///< The used debug level.
+	std::string_view level;   ///< The used debug level.
 	std::string message; ///< The actual formatted message.
 };
 std::atomic<bool> _debug_remote_console; ///< Whether we need to send data to either NetworkAdminConsole or IConsolePrint.
@@ -54,12 +55,12 @@ int _debug_random_level;
 #endif
 
 struct DebugLevel {
-	const char *name;
+	std::string_view name;
 	int *level;
 };
 
 #define DEBUG_LEVEL(x) { #x, &_debug_##x##_level }
-static const DebugLevel _debug_levels[] = {
+static const std::initializer_list<DebugLevel> _debug_levels{
 	DEBUG_LEVEL(driver),
 	DEBUG_LEVEL(grf),
 	DEBUG_LEVEL(map),
@@ -106,16 +107,16 @@ void DumpDebugFacilityNames(std::back_insert_iterator<std::string> &output_itera
  * @param level Debug category.
  * @param message The message to output.
  */
-void DebugPrint(const char *category, int level, std::string &&message)
+void DebugPrint(std::string_view category, int level, std::string &&message)
 {
-	if (strcmp(category, "desync") == 0 && level != 0) {
+	if (category == "desync" && level != 0) {
 		static auto f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
 		if (!f.has_value()) return;
 
 		fmt::print(*f, "{}{}\n", GetLogPrefix(true), message);
 		fflush(*f);
 #ifdef RANDOM_DEBUG
-	} else if (strcmp(category, "random") == 0) {
+	} else if (category == "random") {
 		static auto f = FioFOpenFile("random-out.log", "wb", AUTOSAVE_DIR);
 		if (!f.has_value()) return;
 
@@ -140,53 +141,47 @@ void DebugPrint(const char *category, int level, std::string &&message)
  * @param s Text describing the wanted debugging levels.
  * @param error_func The function to call if a parse error occurs.
  */
-void SetDebugString(const char *s, void (*error_func)(const std::string &))
+void SetDebugString(std::string_view s, SetDebugStringErrorFunc error_func)
 {
-	int v;
-	char *end;
-	const char *t;
+	StringConsumer consumer{s};
 
 	/* Store planned changes into map during parse */
-	std::map<const char *, int> new_levels;
+	std::map<std::string_view, int> new_levels;
 
 	/* Global debugging level? */
-	if (*s >= '0' && *s <= '9') {
-		v = std::strtoul(s, &end, 0);
-		s = end;
-
+	auto level = consumer.TryReadIntegerBase<int>(10);
+	if (level.has_value()) {
 		for (const auto &debug_level : _debug_levels) {
-			new_levels[debug_level.name] = v;
+			new_levels[debug_level.name] = *level;
 		}
 	}
 
+	static const std::string_view lowercase_letters{"abcdefghijklmnopqrstuvwxyz"};
+	static const std::string_view lowercase_letters_and_digits{"abcdefghijklmnopqrstuvwxyz0123456789"};
+
 	/* Individual levels */
-	for (;;) {
-		/* skip delimiters */
-		while (*s == ' ' || *s == ',' || *s == '\t') s++;
-		if (*s == '\0') break;
+	while (consumer.AnyBytesLeft()) {
+		consumer.SkipUntilCharIn(lowercase_letters);
+		if (!consumer.AnyBytesLeft()) break;
 
-		t = s;
-		while (*s >= 'a' && *s <= 'z') s++;
-
-		/* check debugging levels */
-		const DebugLevel *found = nullptr;
-		for (const auto &debug_level : _debug_levels) {
-			if (s == t + strlen(debug_level.name) && strncmp(t, debug_level.name, s - t) == 0) {
-				found = &debug_level;
-				break;
-			}
-		}
-
-		if (*s == '=') s++;
-		v = std::strtoul(s, &end, 0);
-		s = end;
-		if (found != nullptr) {
-			new_levels[found->name] = v;
-		} else {
-			std::string error_string = fmt::format("Unknown debug level '{}'", std::string(t, s - t));
-			error_func(error_string);
+		/* Find the level by name. */
+		std::string_view key = consumer.ReadUntilCharNotIn(lowercase_letters);
+		auto it = std::ranges::find(_debug_levels, key, &DebugLevel::name);
+		if (it == std::end(_debug_levels)) {
+			error_func(fmt::format("Unknown debug level '{}'", key));
 			return;
 		}
+
+		/* Do not skip lowercase letters, so 'net misc=2' won't be resolved
+		 * to setting 'net=2' and leaving misc untouched. */
+		consumer.SkipUntilCharIn(lowercase_letters_and_digits);
+		level = consumer.TryReadIntegerBase<int>(10);
+		if (!level.has_value()) {
+			error_func(fmt::format("Level for '{}' must be a valid integer.", key));
+			return;
+		}
+
+		new_levels[it->name] = *level;
 	}
 
 	/* Apply the changes after parse is successful */
@@ -208,7 +203,7 @@ std::string GetDebugString()
 	std::string result;
 	for (const auto &debug_level : _debug_levels) {
 		if (!result.empty()) result += ", ";
-		fmt::format_to(std::back_inserter(result), "{}={}", debug_level.name, *debug_level.level);
+		format_append(result, "{}={}", debug_level.name, *debug_level.level);
 	}
 	return result;
 }
diff --git a/src/debug.h b/src/debug.h
index 378466450c..161d4a3922 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -35,7 +35,7 @@
  * @param format_string The formatting string of the message.
  */
 #define Debug(category, level, format_string, ...) do { if ((level) == 0 || _debug_ ## category ## _level >= (level)) DebugPrint(#category, level, fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__)); } while (false)
-void DebugPrint(const char *category, int level, std::string &&message);
+void DebugPrint(std::string_view category, int level, std::string &&message);
 
 extern int _debug_driver_level;
 extern int _debug_grf_level;
@@ -56,24 +56,54 @@ extern int _debug_random_level;
 #endif
 
 void DumpDebugFacilityNames(std::back_insert_iterator<std::string> &output_iterator);
-void SetDebugString(const char *s, void (*error_func)(const std::string &));
+using SetDebugStringErrorFunc = void(std::string_view);
+void SetDebugString(std::string_view s, SetDebugStringErrorFunc error_func);
 std::string GetDebugString();
 
 /** TicToc profiling.
- * Usage:
+ * Usage for max_count based output:
  * static TicToc::State state("A name", 1);
  * TicToc tt(state);
  * --Do your code--
+ *
+ * Usage for per-tick output:
+ * static TicToc::State state("A name");
+ * TicToc tt(state);
+ * --Do your code--
  */
 struct TicToc {
 	/** Persistent state for TicToc profiling. */
 	struct State {
 		const std::string_view name;
-		const uint32_t max_count;
+		const std::optional<uint32_t> max_count;
 		uint32_t count = 0;
 		uint64_t chrono_sum = 0;
 
-		constexpr State(std::string_view name, uint32_t max_count) : name(name), max_count(max_count) { }
+		using States = std::vector<State *>;
+
+		State(std::string_view name, std::optional<uint32_t> max_count = {}) : name(name), max_count(max_count)
+		{
+			GetStates().push_back(this);
+		}
+
+		~State()
+		{
+			/* Container might be already destroyed. */
+			if (!GetStates().empty()) std::erase(GetStates(), this);
+		}
+
+		static States &GetStates()
+		{
+			thread_local static States s_states;
+			return s_states;
+		}
+
+		void OutputAndReset(const std::string_view prefix = "")
+		{
+			Debug(misc, 0, "[{}] [{}] {} calls in {} us [avg: {:.1f} us]", prefix, this->name, this->count, this->chrono_sum, this->chrono_sum / static_cast<double>(this->count));
+			this->count = 0;
+			this->chrono_sum = 0;
+		}
 	};
 
 	State &state;
@@ -84,15 +114,22 @@ struct TicToc {
 	inline ~TicToc()
 	{
 		this->state.chrono_sum += (std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - this->chrono_start)).count();
-		if (++this->state.count == this->state.max_count) {
-			Debug(misc, 0, "[{}] {} us [avg: {:.1f} us]", this->state.name, this->state.chrono_sum, this->state.chrono_sum / static_cast<double>(this->state.count));
-			this->state.count = 0;
-			this->state.chrono_sum = 0;
+		this->state.count++;
+		if (this->state.max_count.has_value() && this->state.count == this->state.max_count.value()) {
+			this->state.OutputAndReset("MaxCount");
+		}
+	}
+
+	static void Tick(const std::string_view prefix)
+	{
+		for (auto state : State::GetStates()) {
+			if (state->max_count.has_value() || state->count == 0) continue;
+			state->OutputAndReset(prefix);
 		}
 	}
 };
 
-void ShowInfoI(const std::string &str);
+void ShowInfoI(std::string_view str);
 #define ShowInfo(format_string, ...) ShowInfoI(fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__))
 
 std::string GetLogPrefix(bool force = false);
diff --git a/src/depot_cmd.h b/src/depot_cmd.h
index 8e4a7098cd..abd3e1900e 100644
--- a/src/depot_cmd.h
+++ b/src/depot_cmd.h
@@ -12,6 +12,7 @@
 
 #include "command_type.h"
 #include "depot_type.h"
+#include "vehicle_type.h"
 
 CommandCost CmdRenameDepot(DoCommandFlags flags, DepotID depot_id, const std::string &text);
 
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index cd2b28111a..ce738a0ad1 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -228,7 +228,7 @@ void InitDepotWindowBlockSizes()
 		if (!e->IsEnabled()) continue;
 
 		uint w = TRAININFO_DEFAULT_VEHICLE_WIDTH;
-		if (e->GetGRF() != nullptr && is_custom_sprite(e->u.rail.image_index)) {
+		if (e->GetGRF() != nullptr && IsCustomVehicleSpriteNum(e->u.rail.image_index)) {
 			w = e->GetGRF()->traininfo_vehicle_width;
 			if (w != VEHICLEINFO_FULL_VEHICLE_WIDTH) {
 				/* Hopeless.
@@ -302,6 +302,35 @@ struct DepotWindow : Window {
 		this->Window::Close();
 	}
 
+	/**
+	 * Count the dragged selection length if appropriate for the provided train.
+	 * @note This ignores potential changes in length due to callback returning different results.
+	 * @param t Train being counted.
+	 * @return Additional length of dragged selection to add.
+	 */
+	uint CountDraggedLength(const Train *t) const
+	{
+		/* Nothing is selected to add. */
+		if (this->sel == VehicleID::Invalid()) return 0;
+
+		/* Test if the dragged selection applies to this train. */
+		bool add_dragged = false;
+		for (const Train *u = t; u != nullptr; u = u->Next()) {
+			if (u->index == this->sel) return 0; // Selection is part of this train, so doesn't increase its length.
+			if (u->index == this->vehicle_over) add_dragged = true;
+		}
+
+		if (!add_dragged) return 0;
+
+		/* Sum the length of the dragged selection. */
+		uint length = 0;
+		for (Train *u = Train::Get(this->sel); u != nullptr; u = _cursor.vehchain ? u->Next() : (u->HasArticulatedPart() ? u->GetNextArticulatedPart() : nullptr)) {
+			length += u->gcache.cached_veh_length;
+		}
+
+		return length;
+	}
+
 	/**
 	 * Draw a vehicle in the depot window in the box with the top left corner at x,y.
 	 * @param v     Vehicle to draw.
@@ -327,9 +356,10 @@ struct DepotWindow : Window {
 				DrawTrainImage(u, image.Indent(x_space, rtl), this->sel, EIT_IN_DEPOT, free_wagon ? 0 : this->hscroll->GetPosition(), this->vehicle_over);
 
 				/* Length of consist in tiles with 1 fractional digit (rounded up) */
+				uint length = u->gcache.cached_total_length + this->CountDraggedLength(u);
 				Rect count = text.WithWidth(this->count_width - WidgetDimensions::scaled.hsep_normal, !rtl);
 				DrawString(count.left, count.right, count.bottom - GetCharacterHeight(FS_SMALL) + 1,
-						GetString(STR_JUST_DECIMAL, CeilDiv(u->gcache.cached_total_length * 10, TILE_SIZE), 1),
+						GetString(STR_JUST_DECIMAL, CeilDiv(length * 10, TILE_SIZE), 1),
 						TC_BLACK, SA_RIGHT | SA_FORCE, false, FS_SMALL); // Draw the counter
 				break;
 			}
diff --git a/src/direction_func.h b/src/direction_func.h
index c554873a0d..79132fbaf8 100644
--- a/src/direction_func.h
+++ b/src/direction_func.h
@@ -235,6 +235,23 @@ inline DiagDirection AxisToDiagDir(Axis a)
 	return (DiagDirection)(2 - a);
 }
 
+/**
+ * Converts an Axis to DiagDirections
+ *
+ * This function returns both DiagDirections which
+ * belong to the axis.
+ *
+ * @param a The axis
+ * @return The DiagDirections.
+ */
+inline DiagDirections AxisToDiagDirs(Axis a)
+{
+	assert(IsValidAxis(a));
+	return a == AXIS_X
+		? DiagDirections{DIAGDIR_NE, DIAGDIR_SW}
+		: DiagDirections{DIAGDIR_SE, DIAGDIR_NW};
+}
+
 /**
  * Converts an Axis to a Direction
  *
diff --git a/src/direction_type.h b/src/direction_type.h
index 0a2fd78b5c..6d220afa2b 100644
--- a/src/direction_type.h
+++ b/src/direction_type.h
@@ -38,6 +38,11 @@ enum Direction : uint8_t {
 /** Allow incrementing of Direction variables */
 DECLARE_INCREMENT_DECREMENT_OPERATORS(Direction)
 
+using Directions = EnumBitSet<Direction, uint8_t>;
+
+/** All possible directions. */
+static constexpr Directions DIRECTIONS_ALL{DIR_N, DIR_NE, DIR_E, DIR_SE, DIR_S, DIR_SW, DIR_W, DIR_NW};
+
 /**
  * Enumeration for the difference between two directions.
  *
@@ -82,6 +87,8 @@ enum DiagDirection : uint8_t {
 DECLARE_INCREMENT_DECREMENT_OPERATORS(DiagDirection)
 DECLARE_ENUM_AS_ADDABLE(DiagDirection)
 
+using DiagDirections = EnumBitSet<DiagDirection, uint8_t>;
+
 /**
  * Enumeration for the difference between to DiagDirection.
  *
diff --git a/src/disaster_vehicle.cpp b/src/disaster_vehicle.cpp
index e6b7635f0f..0b279b6059 100644
--- a/src/disaster_vehicle.cpp
+++ b/src/disaster_vehicle.cpp
@@ -940,7 +940,7 @@ static void ResetDisasterDelay()
 	_disaster_delay = GB(Random(), 0, 9) + 730;
 }
 
-static IntervalTimer<TimerGameEconomy> _economy_disaster_daily({TimerGameEconomy::DAY, TimerGameEconomy::Priority::DISASTER}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_disaster_daily({TimerGameEconomy::DAY, TimerGameEconomy::Priority::DISASTER}, [](auto)
 {
 	if (--_disaster_delay != 0) return;
 
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 2175713df5..68f3959e90 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -340,14 +340,14 @@ static constexpr NWidgetPart _nested_build_docks_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL_LTR),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(5, 22), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEPOT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DEPOT, STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_STATION), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DOCK, STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUOY), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUOY, STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetMinimalSize(23, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), SetFill(1, 1), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEPOT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DEPOT, STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_STATION), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DOCK, STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUOY), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUOY, STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
 	EndContainer(),
 };
 
@@ -385,12 +385,12 @@ static constexpr NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(5, 22), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_RIVER), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_RIVER, STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), SetFill(1, 1), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_RIVER), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_RIVER, STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
 	EndContainer(),
 };
 
@@ -481,7 +481,7 @@ public:
 		CheckRedrawStationCoverage(this);
 	}
 
-	IntervalTimer<TimerGameCalendar> yearly_interval = {{TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [this](auto) {
+	const IntervalTimer<TimerGameCalendar> yearly_interval = {{TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [this](auto) {
 		this->InvalidateData();
 	}};
 };
@@ -507,7 +507,7 @@ static constexpr NWidgetPart _nested_build_dock_station_widgets[] = {
 };
 
 static WindowDesc _build_dock_station_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_build_dock_station_widgets
@@ -602,7 +602,7 @@ static constexpr NWidgetPart _nested_build_docks_depot_widgets[] = {
 };
 
 static WindowDesc _build_docks_depot_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_build_docks_depot_widgets
diff --git a/src/driver.cpp b/src/driver.cpp
index c790c9ebbb..70e2071524 100644
--- a/src/driver.cpp
+++ b/src/driver.cpp
@@ -8,6 +8,7 @@
 /** @file driver.cpp Base for all driver handling. */
 
 #include "stdafx.h"
+#include "core/string_consumer.hpp"
 #include "debug.h"
 #include "error.h"
 #include "error_func.h"
@@ -17,6 +18,7 @@
 #include "video/video_driver.hpp"
 #include "string_func.h"
 #include "fileio_func.h"
+#include "core/string_consumer.hpp"
 
 #include "table/strings.h"
 
@@ -42,18 +44,18 @@ static const std::string HWACCELERATION_TEST_FILE = "hwaccel.dat"; ///< Filename
  * @param name The parameter name we're looking for.
  * @return The parameter value.
  */
-const char *GetDriverParam(const StringList &parm, const char *name)
+std::optional<std::string_view> GetDriverParam(const StringList &parm, std::string_view name)
 {
-	if (parm.empty()) return nullptr;
+	if (parm.empty()) return std::nullopt;
 
-	size_t len = strlen(name);
 	for (auto &p : parm) {
-		if (p.compare(0, len, name) == 0) {
-			if (p.length() == len) return "";
-			if (p[len] == '=') return p.c_str() + len + 1;
+		StringConsumer consumer{p};
+		if (consumer.ReadIf(name)) {
+			if (!consumer.AnyBytesLeft()) return "";
+			if (consumer.ReadIf("=")) return consumer.GetLeftData();
 		}
 	}
-	return nullptr;
+	return std::nullopt;
 }
 
 /**
@@ -62,9 +64,9 @@ const char *GetDriverParam(const StringList &parm, const char *name)
  * @param name The parameter name we're looking for.
  * @return The parameter value.
  */
-bool GetDriverParamBool(const StringList &parm, const char *name)
+bool GetDriverParamBool(const StringList &parm, std::string_view name)
 {
-	return GetDriverParam(parm, name) != nullptr;
+	return GetDriverParam(parm, name).has_value();
 }
 
 /**
@@ -74,10 +76,13 @@ bool GetDriverParamBool(const StringList &parm, const char *name)
  * @param def  The default value if the parameter doesn't exist.
  * @return The parameter value.
  */
-int GetDriverParamInt(const StringList &parm, const char *name, int def)
+int GetDriverParamInt(const StringList &parm, std::string_view name, int def)
 {
-	const char *p = GetDriverParam(parm, name);
-	return p != nullptr ? atoi(p) : def;
+	auto p = GetDriverParam(parm, name);
+	if (!p.has_value()) return def;
+	auto value = ParseInteger<int>(*p);
+	if (value.has_value()) return *value;
+	UserError("Invalid value for driver parameter {}: {}", name, *p);
 }
 
 /**
@@ -237,7 +242,7 @@ void DriverFactoryBase::GetDriversInfo(std::back_insert_iterator<std::string> &o
  * @param name        The name of the driver.
  * @param description A long-ish description of the driver.
  */
-DriverFactoryBase::DriverFactoryBase(Driver::Type type, int priority, const char *name, const char *description) :
+DriverFactoryBase::DriverFactoryBase(Driver::Type type, int priority, std::string_view name, std::string_view description) :
 	type(type), priority(priority), name(name), description(description)
 {
 	/* Prefix the name with driver type to make it unique */
diff --git a/src/driver.h b/src/driver.h
index e827a61898..2850a34ce3 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -13,9 +13,9 @@
 #include "core/enum_type.hpp"
 #include "string_type.h"
 
-const char *GetDriverParam(const StringList &parm, const char *name);
-bool GetDriverParamBool(const StringList &parm, const char *name);
-int GetDriverParamInt(const StringList &parm, const char *name, int def);
+std::optional<std::string_view> GetDriverParam(const StringList &parm, std::string_view name);
+bool GetDriverParamBool(const StringList &parm, std::string_view name);
+int GetDriverParamInt(const StringList &parm, std::string_view name, int def);
 
 /** A driver for communicating with the user. */
 class Driver {
@@ -103,7 +103,7 @@ private:
 	static void MarkVideoDriverOperational();
 
 protected:
-	DriverFactoryBase(Driver::Type type, int priority, const char *name, const char *description);
+	DriverFactoryBase(Driver::Type type, int priority, std::string_view name, std::string_view description);
 
 	virtual ~DriverFactoryBase();
 
diff --git a/src/dropdown.cpp b/src/dropdown.cpp
index eb2ad63cbb..efeb428b4a 100644
--- a/src/dropdown.cpp
+++ b/src/dropdown.cpp
@@ -65,7 +65,7 @@ static constexpr NWidgetPart _nested_dropdown_menu_widgets[] = {
 };
 
 static WindowDesc _dropdown_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_DROPDOWN_MENU, WC_NONE,
 	WindowDefaultFlag::NoFocus,
 	_nested_dropdown_menu_widgets
@@ -77,6 +77,7 @@ struct DropdownWindow : Window {
 	Rect wi_rect{}; ///< Rect of the button that opened the dropdown.
 	DropDownList list{}; ///< List with dropdown menu items.
 	int selected_result = 0; ///< Result value of the selected item in the list.
+	int selected_click_result = -1; ///< Click result value, from the OnClick handler of the selected item.
 	uint8_t click_delay = 0; ///< Timer to delay selection.
 	bool drag_mode = true;
 	bool instant_close = false; ///< Close the window when the mouse button is raised.
@@ -131,7 +132,7 @@ struct DropdownWindow : Window {
 		Point pt = _cursor.pos;
 		pt.x -= this->parent->left;
 		pt.y -= this->parent->top;
-		this->parent->OnDropdownClose(pt, this->parent_button, this->selected_result, this->instant_close);
+		this->parent->OnDropdownClose(pt, this->parent_button, this->selected_result, this->selected_click_result, this->instant_close);
 
 		/* Set flag on parent widget to indicate that we have just closed. */
 		NWidgetCore *nwc = this->parent->GetWidget<NWidgetCore>(this->parent_button);
@@ -225,14 +226,15 @@ struct DropdownWindow : Window {
 
 	/**
 	 * Find the dropdown item under the cursor.
-	 * @param[out] value Selected item, if function returns \c true.
+	 * @param[out] result Selected item, if function returns \c true.
+	 * @param[out] click_result Click result from OnClick of Selected item, if function returns \c true.
 	 * @return Cursor points to a dropdown item.
 	 */
-	bool GetDropDownItem(int &value)
+	bool GetDropDownItem(int &result, int &click_result)
 	{
 		if (GetWidgetFromPos(this, _cursor.pos.x - this->left, _cursor.pos.y - this->top) < 0) return false;
 
-		const Rect &r = this->GetWidget<NWidgetBase>(WID_DM_ITEMS)->GetCurrentRect().Shrink(WidgetDimensions::scaled.dropdownlist);
+		const Rect &r = this->GetWidget<NWidgetBase>(WID_DM_ITEMS)->GetCurrentRect().Shrink(WidgetDimensions::scaled.dropdownlist).Shrink(WidgetDimensions::scaled.dropdowntext, RectPadding::zero);
 		int y     = _cursor.pos.y - this->top - r.top;
 		int pos   = this->vscroll->GetPosition();
 
@@ -244,7 +246,8 @@ struct DropdownWindow : Window {
 
 			if (y < item_height) {
 				if (item->masked || !item->Selectable()) return false;
-				value = item->result;
+				result = item->result;
+				click_result = item->OnClick({r.left, 0, r.right, item_height - 1}, {_cursor.pos.x - this->left, y});
 				return true;
 			}
 
@@ -275,7 +278,7 @@ struct DropdownWindow : Window {
 				bool selected = (this->selected_result == item->result) && item->Selectable();
 				if (selected) GfxFillRect(full, PC_BLACK);
 
-				item->Draw(full, full.Shrink(WidgetDimensions::scaled.dropdowntext, RectPadding::zero), selected, colour);
+				item->Draw(full, full.Shrink(WidgetDimensions::scaled.dropdowntext, RectPadding::zero), selected, selected ? this->selected_click_result : -1, colour);
 			}
 			y += item_height;
 		}
@@ -284,16 +287,17 @@ struct DropdownWindow : Window {
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
 		if (widget != WID_DM_ITEMS) return;
-		int item;
-		if (this->GetDropDownItem(item)) {
+		int result, click_result;
+		if (this->GetDropDownItem(result, click_result)) {
 			this->click_delay = 4;
-			this->selected_result = item;
+			this->selected_result = result;
+			this->selected_click_result = click_result;
 			this->SetDirty();
 		}
 	}
 
 	/** Rate limit how fast scrolling happens. */
-	IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(30), [this](auto) {
+	const IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(30), [this](auto) {
 		if (this->scrolling == 0) return;
 
 		if (this->vscroll->UpdatePosition(this->scrolling)) this->SetDirty();
@@ -307,16 +311,16 @@ struct DropdownWindow : Window {
 			/* Close the dropdown, so it doesn't affect new window placement.
 			 * Also mark it dirty in case the callback deals with the screen. (e.g. screenshots). */
 			if (!this->persist) this->Close();
-			this->parent->OnDropdownSelect(this->parent_button, this->selected_result);
+			this->parent->OnDropdownSelect(this->parent_button, this->selected_result, this->selected_click_result);
 			return;
 		}
 
 		if (this->drag_mode) {
-			int item;
+			int result, click_result;
 
 			if (!_left_button_clicked) {
 				this->drag_mode = false;
-				if (!this->GetDropDownItem(item)) {
+				if (!this->GetDropDownItem(result, click_result)) {
 					if (this->instant_close) this->Close();
 					return;
 				}
@@ -332,30 +336,33 @@ struct DropdownWindow : Window {
 					return;
 				}
 
-				if (!this->GetDropDownItem(item)) return;
+				if (!this->GetDropDownItem(result, click_result)) return;
 			}
 
-			if (this->selected_result != item) {
-				this->selected_result = item;
+			if (this->selected_result != result || this->selected_click_result != click_result) {
+				this->selected_result = result;
+				this->selected_click_result = click_result;
 				this->SetDirty();
 			}
 		}
 	}
 
-	void ReplaceList(DropDownList &&list)
+	void ReplaceList(DropDownList &&list, std::optional<int> selected_result)
 	{
 		this->list = std::move(list);
+		if (selected_result.has_value()) this->selected_result = *selected_result;
 		this->UpdateSizeAndPosition();
 		this->ReInit(0, 0);
 		this->InitializePositionSize(this->position.x, this->position.y, this->nested_root->smallest_x, this->nested_root->smallest_y);
+		this->FindWindowPlacementAndResize(this->window_desc.GetDefaultWidth(), this->window_desc.GetDefaultHeight(), true);
 		this->SetDirty();
 	}
 };
 
-void ReplaceDropDownList(Window *parent, DropDownList &&list)
+void ReplaceDropDownList(Window *parent, DropDownList &&list, std::optional<int> selected_result)
 {
 	DropdownWindow *ddw = dynamic_cast<DropdownWindow *>(parent->FindChildWindow(WC_DROPDOWN_MENU));
-	if (ddw != nullptr) ddw->ReplaceList(std::move(list));
+	if (ddw != nullptr) ddw->ReplaceList(std::move(list), selected_result);
 }
 
 /**
diff --git a/src/dropdown_common_type.h b/src/dropdown_common_type.h
index 5193348464..21f0a01865 100644
--- a/src/dropdown_common_type.h
+++ b/src/dropdown_common_type.h
@@ -10,13 +10,17 @@
 #ifndef DROPDOWN_COMMON_TYPE_H
 #define DROPDOWN_COMMON_TYPE_H
 
+#include "dropdown_type.h"
 #include "gfx_func.h"
 #include "gfx_type.h"
 #include "palette_func.h"
+#include "settings_gui.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "window_gui.h"
 
+#include "table/strings.h"
+
 /**
  * Drop down divider component.
  * @tparam TBase Base component.
@@ -31,12 +35,12 @@ public:
 	bool Selectable() const override { return false; }
 	uint Height() const override { return std::max<uint>(GetCharacterHeight(TFs), this->TBase::Height()); }
 
-	void Draw(const Rect &full, const Rect &, bool, Colours bg_colour) const override
+	void Draw(const Rect &full, const Rect &, bool, int, Colours bg_colour) const override
 	{
 		uint8_t c1 = GetColourGradient(bg_colour, SHADE_DARK);
 		uint8_t c2 = GetColourGradient(bg_colour, SHADE_LIGHTEST);
 
-		int mid = CenterBounds(full.top, full.bottom, 0);
+		int mid = CentreBounds(full.top, full.bottom, 0);
 		GfxFillRect(full.left, mid - WidgetDimensions::scaled.bevel.bottom, full.right, mid - 1, c1);
 		GfxFillRect(full.left, mid, full.right, mid + WidgetDimensions::scaled.bevel.top - 1, c2);
 	}
@@ -72,11 +76,17 @@ public:
 
 	uint Width() const override { return this->dim.width + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dim.width, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
 		DrawStringMultiLine(r.WithWidth(this->dim.width, rtl), this->string, this->GetColour(sel), SA_CENTER, false, TFs);
-		this->TBase::Draw(full, r.Indent(this->dim.width, rtl), sel, bg_colour);
+		this->TBase::Draw(full, r.Indent(this->dim.width, rtl), sel, click_result, bg_colour);
 	}
 
 	/**
@@ -122,12 +132,18 @@ public:
 	uint Height() const override { return std::max(this->dbounds.height, this->TBase::Height()); }
 	uint Width() const override { return this->dbounds.width + WidgetDimensions::scaled.hsep_normal + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dbounds.width + WidgetDimensions::scaled.hsep_normal, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
 		Rect ir = r.WithWidth(this->dbounds.width, rtl);
-		DrawSprite(this->sprite, this->palette, CenterBounds(ir.left, ir.right, this->dsprite.width), CenterBounds(r.top, r.bottom, this->dsprite.height));
-		this->TBase::Draw(full, r.Indent(this->dbounds.width + WidgetDimensions::scaled.hsep_normal, rtl), sel, bg_colour);
+		DrawSprite(this->sprite, this->palette, CentreBounds(ir.left, ir.right, this->dsprite.width), CentreBounds(r.top, r.bottom, this->dsprite.height));
+		this->TBase::Draw(full, r.Indent(this->dbounds.width + WidgetDimensions::scaled.hsep_normal, rtl), sel, click_result, bg_colour);
 	}
 };
 
@@ -151,13 +167,69 @@ public:
 	uint Height() const override { return std::max<uint>(this->dim.height, this->TBase::Height()); }
 	uint Width() const override { return this->dim.width + WidgetDimensions::scaled.hsep_wide + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
 		if (this->checked) {
 			DrawStringMultiLine(r.WithWidth(this->dim.width, rtl), STR_JUST_CHECKMARK, this->GetColour(sel), SA_CENTER, false, TFs);
 		}
-		this->TBase::Draw(full, r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), sel, bg_colour);
+		this->TBase::Draw(full, r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), sel, click_result, bg_colour);
+	}
+};
+
+/**
+ * Drop down boolean toggle component.
+ * @tparam TBase Base component.
+ * @tparam TEnd Position toggle at end if true, or start if false.
+ */
+template <class TBase, bool TEnd = false>
+class DropDownToggle : public TBase {
+	bool on; ///< Is item on.
+	int click; ///< Click result when toggle used.
+	Colours button_colour; ///< Colour of toggle button.
+	Colours background_colour; ///< Colour of toggle background.
+public:
+	template <typename... Args>
+	explicit DropDownToggle(bool on, int click, Colours button_colour, Colours background_colour, Args&&... args)
+		: TBase(std::forward<Args>(args)...), on(on), click(click), button_colour(button_colour), background_colour(background_colour)
+	{
+	}
+
+	uint Height() const override
+	{
+		return std::max<uint>(SETTING_BUTTON_HEIGHT + WidgetDimensions::scaled.vsep_normal, this->TBase::Height());
+	}
+
+	uint Width() const override
+	{
+		return SETTING_BUTTON_WIDTH + WidgetDimensions::scaled.hsep_wide + this->TBase::Width();
+	}
+
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		int w = SETTING_BUTTON_WIDTH;
+
+		if (r.WithWidth(w, rtl).CentreTo(w, SETTING_BUTTON_HEIGHT).Contains(pt)) return this->click;
+
+		return this->TBase::OnClick(r.Indent(w + WidgetDimensions::scaled.hsep_wide, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		int w = SETTING_BUTTON_WIDTH;
+
+		Rect br = r.WithWidth(w, rtl).CentreTo(w, SETTING_BUTTON_HEIGHT);
+		DrawBoolButton(br.left, br.top, this->button_colour, this->background_colour, this->on, true);
+
+		this->TBase::Draw(full, r.Indent(w + WidgetDimensions::scaled.hsep_wide, rtl), sel, click_result, bg_colour);
 	}
 };
 
@@ -175,11 +247,30 @@ public:
 
 	uint Width() const override { return this->indent * WidgetDimensions::scaled.hsep_indent + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
-		this->TBase::Draw(full, r.Indent(this->indent * WidgetDimensions::scaled.hsep_indent, rtl), sel, bg_colour);
+		return this->TBase::OnClick(r.Indent(this->indent * WidgetDimensions::scaled.hsep_indent, rtl), pt);
 	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		this->TBase::Draw(full, r.Indent(this->indent * WidgetDimensions::scaled.hsep_indent, rtl), sel, click_result, bg_colour);
+	}
+};
+
+/**
+ * Drop down component that makes the item unselectable.
+ * @tparam TBase Base component.
+ */
+template <class TBase, FontSize TFs = FS_NORMAL>
+class DropDownUnselectable : public TBase {
+public:
+	template <typename... Args>
+	explicit DropDownUnselectable(Args&&... args) : TBase(std::forward<Args>(args)...) {}
+
+	bool Selectable() const override { return false; }
 };
 
 /* Commonly used drop down list items. */
diff --git a/src/dropdown_func.h b/src/dropdown_func.h
index 69bf6e035b..7d72c01fbf 100644
--- a/src/dropdown_func.h
+++ b/src/dropdown_func.h
@@ -10,6 +10,7 @@
 #ifndef DROPDOWN_FUNC_H
 #define DROPDOWN_FUNC_H
 
+#include "dropdown_type.h"
 #include "window_gui.h"
 
 /* Show drop down menu containing a fixed list of strings */
diff --git a/src/dropdown_type.h b/src/dropdown_type.h
index 1a6cb71eb1..5e6057d1ee 100644
--- a/src/dropdown_type.h
+++ b/src/dropdown_type.h
@@ -32,7 +32,12 @@ public:
 	virtual uint Height() const { return 0; }
 	virtual uint Width() const { return 0; }
 
-	virtual void Draw(const Rect &full, const Rect &, bool, Colours bg_colour) const
+	virtual int OnClick(const Rect &, const Point &) const
+	{
+		return -1;
+	}
+
+	virtual void Draw(const Rect &full, const Rect &, bool, int, Colours bg_colour) const
 	{
 		if (this->masked) GfxFillRect(full, GetColourGradient(bg_colour, SHADE_LIGHT), FILLRECT_CHECKER);
 	}
@@ -55,6 +60,6 @@ void ShowDropDownList(Window *w, DropDownList &&list, int selected, WidgetID but
 
 Dimension GetDropDownListDimension(const DropDownList &list);
 
-void ReplaceDropDownList(Window *parent, DropDownList &&list);
+void ReplaceDropDownList(Window *parent, DropDownList &&list, std::optional<int> selected_result = std::nullopt);
 
 #endif /* DROPDOWN_TYPE_H */
diff --git a/src/economy.cpp b/src/economy.cpp
index 0bad0f0f31..03ed9a9053 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -101,7 +101,7 @@ const ScoreInfo _score_info[] = {
 	{       0,   0}  // SCORE_TOTAL
 };
 
-ReferenceThroughBaseContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>> _score_part;
+TypedIndexContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>, CompanyID> _score_part;
 Economy _economy;
 Prices _price;
 static PriceMultipliers _price_base_multiplier;
@@ -119,7 +119,7 @@ static Money CalculateCompanyAssetValue(const Company *c)
 	uint num = 0;
 
 	for (const Station *st : Station::Iterate()) {
-		if (st->owner == owner) num += CountBits(st->facilities.base());
+		if (st->owner == owner) num += st->facilities.Count();
 	}
 
 	Money value = num * _price[PR_STATION_VALUE] * 25;
@@ -240,7 +240,7 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)
 		uint num = 0;
 		for (const Station *st : Station::Iterate()) {
 			/* Only count stations that are actually serviced */
-			if (st->owner == owner && (st->time_since_load <= 20 || st->time_since_unload <= 20)) num += CountBits(st->facilities.base());
+			if (st->owner == owner && (st->time_since_load <= 20 || st->time_since_unload <= 20)) num += st->facilities.Count();
 		}
 		_score_part[owner][SCORE_STATIONS] = num;
 	}
@@ -1167,8 +1167,8 @@ static void TriggerIndustryProduction(Industry *i)
 		}
 	}
 
-	TriggerIndustry(i, INDUSTRY_TRIGGER_RECEIVED_CARGO);
-	StartStopIndustryTileAnimation(i, IAT_INDUSTRY_RECEIVED_CARGO);
+	TriggerIndustryRandomisation(i, IndustryRandomTrigger::CargoReceived);
+	TriggerIndustryAnimation(i, IndustryAnimationTrigger::CargoReceived);
 }
 
 /**
@@ -1779,7 +1779,7 @@ static void LoadUnloadVehicle(Vehicle *front)
 			/* If there's goods waiting at the station, and the vehicle
 			 * has capacity for it, load it on the vehicle. */
 			if ((v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || (ge->HasData() && ge->GetData().cargo.AvailableCount() > 0)) && MayLoadUnderExclusiveRights(st, v)) {
-				if (v->cargo.StoredCount() == 0) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO);
+				if (v->cargo.StoredCount() == 0) TriggerVehicleRandomisation(v, VehicleRandomTrigger::NewCargo);
 				if (_settings_game.order.gradual_loading) cap_left = std::min(cap_left, GetLoadAmount(v));
 
 				uint loaded = ge->GetOrCreateData().cargo.Load(cap_left, &v->cargo, next_station, v->GetCargoTile());
@@ -1811,11 +1811,11 @@ static void LoadUnloadVehicle(Vehicle *front)
 					st->last_vehicle_type = v->type;
 
 					if (ge->GetData().cargo.TotalCount() == 0) {
-						TriggerStationRandomisation(st, st->xy, SRT_CARGO_TAKEN, v->cargo_type);
-						TriggerStationAnimation(st, st->xy, SAT_CARGO_TAKEN, v->cargo_type);
-						AirportAnimationTrigger(st, AAT_STATION_CARGO_TAKEN, v->cargo_type);
-						TriggerRoadStopRandomisation(st, st->xy, RSRT_CARGO_TAKEN, v->cargo_type);
-						TriggerRoadStopAnimation(st, st->xy, SAT_CARGO_TAKEN, v->cargo_type);
+						TriggerStationRandomisation(st, st->xy, StationRandomTrigger::CargoTaken, v->cargo_type);
+						TriggerStationAnimation(st, st->xy, StationAnimationTrigger::CargoTaken, v->cargo_type);
+						TriggerAirportAnimation(st, AirportAnimationTrigger::CargoTaken, v->cargo_type);
+						TriggerRoadStopRandomisation(st, st->xy, StationRandomTrigger::CargoTaken, v->cargo_type);
+						TriggerRoadStopAnimation(st, st->xy, StationAnimationTrigger::CargoTaken, v->cargo_type);
 					}
 
 					new_load_unload_ticks += loaded;
@@ -1834,11 +1834,11 @@ static void LoadUnloadVehicle(Vehicle *front)
 
 	if (anything_loaded || anything_unloaded) {
 		if (front->type == VEH_TRAIN) {
-			TriggerStationRandomisation(st, front->tile, SRT_TRAIN_LOADS);
-			TriggerStationAnimation(st, front->tile, SAT_TRAIN_LOADS);
+			TriggerStationRandomisation(st, front->tile, StationRandomTrigger::VehicleLoads);
+			TriggerStationAnimation(st, front->tile, StationAnimationTrigger::VehicleLoads);
 		} else if (front->type == VEH_ROAD) {
-			TriggerRoadStopRandomisation(st, front->tile, RSRT_VEH_LOADS);
-			TriggerRoadStopAnimation(st, front->tile, SAT_TRAIN_LOADS);
+			TriggerRoadStopRandomisation(st, front->tile, StationRandomTrigger::VehicleLoads);
+			TriggerRoadStopAnimation(st, front->tile, StationAnimationTrigger::VehicleLoads);
 		}
 	}
 
@@ -1910,7 +1910,7 @@ static void LoadUnloadVehicle(Vehicle *front)
 		/* Make sure the vehicle is marked dirty, since we need to update the NewGRF
 		 * properties such as weight, power and TE whenever the trigger runs. */
 		dirty_vehicle = true;
-		TriggerVehicle(front, VEHICLE_TRIGGER_EMPTY);
+		TriggerVehicleRandomisation(front, VehicleRandomTrigger::Empty);
 	}
 
 	if (dirty_vehicle) {
@@ -1969,7 +1969,7 @@ void LoadUnloadStation(Station *st)
 /**
  * Every calendar month update of inflation.
  */
-static IntervalTimer<TimerGameCalendar> _calendar_inflation_monthly({TimerGameCalendar::MONTH, TimerGameCalendar::Priority::COMPANY}, [](auto)
+static const IntervalTimer<TimerGameCalendar> _calendar_inflation_monthly({TimerGameCalendar::MONTH, TimerGameCalendar::Priority::COMPANY}, [](auto)
 {
 	if (_settings_game.economy.inflation) {
 		AddInflation();
@@ -1980,7 +1980,7 @@ static IntervalTimer<TimerGameCalendar> _calendar_inflation_monthly({TimerGameCa
 /**
  * Every economy month update of company economic data, plus economy fluctuations.
  */
-static IntervalTimer<TimerGameEconomy> _economy_companies_monthly({ TimerGameEconomy::MONTH, TimerGameEconomy::Priority::COMPANY }, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_companies_monthly({ TimerGameEconomy::MONTH, TimerGameEconomy::Priority::COMPANY }, [](auto)
 {
 	CompaniesGenStatistics();
 	CompaniesPayInterest();
diff --git a/src/economy_func.h b/src/economy_func.h
index e85e36bdb0..e199af3c90 100644
--- a/src/economy_func.h
+++ b/src/economy_func.h
@@ -23,7 +23,7 @@ void ResetPriceBaseMultipliers();
 void SetPriceBaseMultiplier(Price price, int factor);
 
 extern const ScoreInfo _score_info[];
-extern ReferenceThroughBaseContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>> _score_part;
+extern TypedIndexContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>, CompanyID> _score_part;
 extern Economy _economy;
 /* Prices and also the fractional part. */
 extern Prices _price;
diff --git a/src/economy_type.h b/src/economy_type.h
index 73ed746e47..947e6e0ce2 100644
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -207,16 +207,6 @@ enum PriceCategory : uint8_t {
 	PCAT_CONSTRUCTION, ///< Price is affected by "construction cost" difficulty setting
 };
 
-/**
- * Describes properties of price bases.
- */
-struct PriceBaseSpec {
-	Money start_price;      ///< Default value at game start, before adding multipliers.
-	PriceCategory category; ///< Price is affected by certain difficulty settings.
-	uint grf_feature;       ///< GRF Feature that decides whether price multipliers apply locally or globally, #GSF_END if none.
-	Price fallback_price;   ///< Fallback price multiplier for new prices but old grfs.
-};
-
 /** The "steps" in loan size, in British Pounds! */
 static const int LOAN_INTERVAL = 10000;
 /** The size of loan for a new company, in British Pounds! */
diff --git a/src/effectvehicle.cpp b/src/effectvehicle.cpp
index c98d7a8a17..941fa1b4a5 100644
--- a/src/effectvehicle.cpp
+++ b/src/effectvehicle.cpp
@@ -540,7 +540,7 @@ struct EffectProcs {
 };
 
 /** Per-EffectVehicleType handling. */
-static std::array<EffectProcs, EV_END> _effect_procs = {{
+static const std::array<EffectProcs, EV_END> _effect_procs = {{
 	{ ChimneySmokeInit,   ChimneySmokeTick,   TO_INDUSTRIES }, // EV_CHIMNEY_SMOKE
 	{ SteamSmokeInit,     SteamSmokeTick,     TO_INVALID    }, // EV_STEAM_SMOKE
 	{ DieselSmokeInit,    DieselSmokeTick,    TO_INVALID    }, // EV_DIESEL_SMOKE
diff --git a/src/elrail.cpp b/src/elrail.cpp
index 0188f16cc1..7b8f5208d0 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -72,9 +72,9 @@
  * @param t The tile to get the tile location group of.
  * @return The tile location group.
  */
-static inline TLG GetTLG(TileIndex t)
+static inline TileLocationGroup GetTileLocationGroup(TileIndex t)
 {
-	return (TLG)((HasBit(TileX(t), 0) << 1) + HasBit(TileY(t), 0));
+	return static_cast<TileLocationGroup>((GB(TileX(t), 0, 1) << 1) + GB(TileY(t), 0, 1));
 }
 
 /**
@@ -83,7 +83,7 @@ static inline TLG GetTLG(TileIndex t)
  * @param override pointer to PCP override, can be nullptr
  * @return trackbits of tile if it is electrified
  */
-static TrackBits GetRailTrackBitsUniversal(TileIndex t, uint8_t *override)
+static TrackBits GetRailTrackBitsUniversal(TileIndex t, DiagDirections *override)
 {
 	switch (GetTileType(t)) {
 		case MP_RAILWAY:
@@ -100,7 +100,7 @@ static TrackBits GetRailTrackBitsUniversal(TileIndex t, uint8_t *override)
 			if (GetTunnelBridgeTransportType(t) != TRANSPORT_RAIL) return TRACK_BIT_NONE;
 			if (!HasRailCatenary(GetRailType(t))) return TRACK_BIT_NONE;
 			if (override != nullptr && (IsTunnel(t) || GetTunnelBridgeLength(t, GetOtherBridgeEnd(t)) > 0)) {
-				*override = 1 << GetTunnelBridgeDirection(t);
+				*override = GetTunnelBridgeDirection(t);
 			}
 			return DiagDirToDiagTrackBits(GetTunnelBridgeDirection(t));
 
@@ -213,10 +213,10 @@ static void AdjustTileh(TileIndex tile, Slope *tileh)
  * Returns the Z position of a Pylon Control Point.
  *
  * @param tile The tile the pylon should stand on.
- * @param PCPpos The PCP of the tile.
+ * @param pcp_pos The PCP of the tile.
  * @return The Z position of the PCP.
  */
-static int GetPCPElevation(TileIndex tile, DiagDirection PCPpos)
+static int GetPCPElevation(TileIndex tile, DiagDirection pcp_pos)
 {
 	/* The elevation of the "pylon"-sprite should be the elevation at the PCP.
 	 * PCPs are always on a tile edge.
@@ -232,8 +232,8 @@ static int GetPCPElevation(TileIndex tile, DiagDirection PCPpos)
 	 * Also note that the result of GetSlopePixelZ() is very special on bridge-ramps.
 	 */
 
-	int z = GetSlopePixelZ(TileX(tile) * TILE_SIZE + std::min<int8_t>(x_pcp_offsets[PCPpos], TILE_SIZE - 1),
-	                       TileY(tile) * TILE_SIZE + std::min<int8_t>(y_pcp_offsets[PCPpos], TILE_SIZE - 1), true);
+	int z = GetSlopePixelZ(TileX(tile) * TILE_SIZE + std::min<int8_t>(_x_pcp_offsets[pcp_pos], TILE_SIZE - 1),
+	                       TileY(tile) * TILE_SIZE + std::min<int8_t>(_y_pcp_offsets[pcp_pos], TILE_SIZE - 1), true);
 	/* Round the Z to the nearest half tile height. */
 	static const uint HALF_TILE_HEIGHT = TILE_HEIGHT / 2;
 	return (z + HALF_TILE_HEIGHT / 2) / HALF_TILE_HEIGHT * HALF_TILE_HEIGHT;
@@ -249,7 +249,7 @@ static int GetPCPElevation(TileIndex tile, DiagDirection PCPpos)
 void DrawRailCatenaryOnTunnel(const TileInfo *ti)
 {
 	/* xmin, ymin, xmax + 1, ymax + 1 of BB */
-	static const int _tunnel_wire_BB[4][4] = {
+	static const int tunnel_wire_bb[4][4] = {
 		{ 0, 1, 16, 15 }, // NE
 		{ 1, 0, 15, 16 }, // SE
 		{ 0, 1, 16, 15 }, // SW
@@ -260,14 +260,14 @@ void DrawRailCatenaryOnTunnel(const TileInfo *ti)
 
 	SpriteID wire_base = GetWireBase(ti->tile);
 
-	const SortableSpriteStruct *sss = &RailCatenarySpriteData_Tunnel[dir];
-	const int *BB_data = _tunnel_wire_BB[dir];
+	const SortableSpriteStruct *sss = &_rail_catenary_sprite_data_tunnel[dir];
+	const int *bb_data = tunnel_wire_bb[dir];
 	AddSortableSpriteToDraw(
 		wire_base + sss->image_offset, PAL_NONE, ti->x + sss->x_offset, ti->y + sss->y_offset,
-		BB_data[2] - sss->x_offset, BB_data[3] - sss->y_offset, BB_Z_SEPARATOR - sss->z_offset + 1,
+		bb_data[2] - sss->x_offset, bb_data[3] - sss->y_offset, BB_Z_SEPARATOR - sss->z_offset + 1,
 		GetTilePixelZ(ti->tile) + sss->z_offset,
 		IsTransparencySet(TO_CATENARY),
-		BB_data[0] - sss->x_offset, BB_data[1] - sss->y_offset, BB_Z_SEPARATOR - sss->z_offset
+		bb_data[0] - sss->x_offset, bb_data[1] - sss->y_offset, BB_Z_SEPARATOR - sss->z_offset
 	);
 }
 
@@ -280,9 +280,9 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 	/* Pylons are placed on a tile edge, so we need to take into account
 	 * the track configuration of 2 adjacent tiles. trackconfig[0] stores the
 	 * current tile (home tile) while [1] holds the neighbour */
-	TrackBits trackconfig[TS_END];
-	TrackBits wireconfig[TS_END];
-	bool isflat[TS_END];
+	TrackBits track_config[TS_END];
+	TrackBits wire_config[TS_END];
+	bool is_flat[TS_END];
 	/* Note that ti->tileh has already been adjusted for Foundations */
 	Slope tileh[TS_END] = { ti->tileh, SLOPE_FLAT };
 
@@ -294,11 +294,11 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 		tileh[TS_HOME] = SLOPE_FLAT;
 	}
 
-	TLG tlg = GetTLG(ti->tile);
-	uint8_t pcp_status = 0;
-	uint8_t override_pcp = 0;
-	uint8_t ppp_preferred[DIAGDIR_END];
-	uint8_t ppp_allowed[DIAGDIR_END];
+	TileLocationGroup tlg = GetTileLocationGroup(ti->tile);
+	DiagDirections pcp_status{};
+	DiagDirections override_pcp{};
+	std::array<Directions, DIAGDIR_END> ppp_preferred{};
+	std::array<Directions, DIAGDIR_END> ppp_allowed{};
 
 	/* Find which rail bits are present, and select the override points.
 	 * We don't draw a pylon:
@@ -306,10 +306,10 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 	 * 2) on the "far" end of a bridge head (the one that connects to bridge middle),
 	 *    because that one is drawn on the bridge. Exception is for length 0 bridges
 	 *    which have no middle tiles */
-	trackconfig[TS_HOME] = GetRailTrackBitsUniversal(ti->tile, &override_pcp);
-	wireconfig[TS_HOME] = MaskWireBits(ti->tile, trackconfig[TS_HOME]);
+	track_config[TS_HOME] = GetRailTrackBitsUniversal(ti->tile, &override_pcp);
+	wire_config[TS_HOME] = MaskWireBits(ti->tile, track_config[TS_HOME]);
 	/* If a track bit is present that is not in the main direction, the track is level */
-	isflat[TS_HOME] = ((trackconfig[TS_HOME] & (TRACK_BIT_HORZ | TRACK_BIT_VERT)) != 0);
+	is_flat[TS_HOME] = ((track_config[TS_HOME] & (TRACK_BIT_HORZ | TRACK_BIT_VERT)) != 0);
 
 	AdjustTileh(ti->tile, &tileh[TS_HOME]);
 
@@ -330,27 +330,27 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 		/* Here's one of the main headaches. GetTileSlope does not correct for possibly
 		 * existing foundataions, so we do have to do that manually later on.*/
 		tileh[TS_NEIGHBOUR] = GetTileSlope(neighbour);
-		trackconfig[TS_NEIGHBOUR] = GetRailTrackBitsUniversal(neighbour, nullptr);
-		wireconfig[TS_NEIGHBOUR] = MaskWireBits(neighbour, trackconfig[TS_NEIGHBOUR]);
-		if (IsTunnelTile(neighbour) && i != GetTunnelBridgeDirection(neighbour)) wireconfig[TS_NEIGHBOUR] = trackconfig[TS_NEIGHBOUR] = TRACK_BIT_NONE;
+		track_config[TS_NEIGHBOUR] = GetRailTrackBitsUniversal(neighbour, nullptr);
+		wire_config[TS_NEIGHBOUR] = MaskWireBits(neighbour, track_config[TS_NEIGHBOUR]);
+		if (IsTunnelTile(neighbour) && i != GetTunnelBridgeDirection(neighbour)) wire_config[TS_NEIGHBOUR] = track_config[TS_NEIGHBOUR] = TRACK_BIT_NONE;
 
 		/* Ignore station tiles that allow neither wires nor pylons. */
-		if (IsRailStationTile(neighbour) && !CanStationTileHavePylons(neighbour) && !CanStationTileHaveWires(neighbour)) wireconfig[TS_NEIGHBOUR] = trackconfig[TS_NEIGHBOUR] = TRACK_BIT_NONE;
+		if (IsRailStationTile(neighbour) && !CanStationTileHavePylons(neighbour) && !CanStationTileHaveWires(neighbour)) wire_config[TS_NEIGHBOUR] = track_config[TS_NEIGHBOUR] = TRACK_BIT_NONE;
 
 		/* If the neighboured tile does not smoothly connect to the current tile (because of a foundation),
 		 * we have to draw all pillars on the current tile. */
-		if (elevation != GetPCPElevation(neighbour, ReverseDiagDir(i))) wireconfig[TS_NEIGHBOUR] = trackconfig[TS_NEIGHBOUR] = TRACK_BIT_NONE;
+		if (elevation != GetPCPElevation(neighbour, ReverseDiagDir(i))) wire_config[TS_NEIGHBOUR] = track_config[TS_NEIGHBOUR] = TRACK_BIT_NONE;
 
-		isflat[TS_NEIGHBOUR] = ((trackconfig[TS_NEIGHBOUR] & (TRACK_BIT_HORZ | TRACK_BIT_VERT)) != 0);
+		is_flat[TS_NEIGHBOUR] = ((track_config[TS_NEIGHBOUR] & (TRACK_BIT_HORZ | TRACK_BIT_VERT)) != 0);
 
-		ppp_preferred[i] = 0xFF; // We start with preferring everything (end-of-line in any direction)
-		ppp_allowed[i] = AllowedPPPonPCP[i];
+		ppp_preferred[i] = DIRECTIONS_ALL; // We start with preferring everything (end-of-line in any direction)
+		ppp_allowed[i] = _allowed_ppp_on_pcp[i];
 
 		/* We cycle through all the existing tracks at a PCP and see what
 		 * PPPs we want to have, or may not have at all */
 		for (uint k = 0; k < NUM_TRACKS_AT_PCP; k++) {
 			/* Next to us, we have a bridge head, don't worry about that one, if it shows away from us */
-			if (TrackSourceTile[i][k] == TS_NEIGHBOUR &&
+			if (_track_source_tile[i][k] == TS_NEIGHBOUR &&
 			    IsBridgeTile(neighbour) &&
 			    GetTunnelBridgeDirection(neighbour) == ReverseDiagDir(i)) {
 				continue;
@@ -359,23 +359,23 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 			/* We check whether the track in question (k) is present in the tile
 			 * (TrackSourceTile) */
 			DiagDirection pcp_pos = i;
-			if (HasBit(wireconfig[TrackSourceTile[i][k]], TracksAtPCP[i][k])) {
+			if (HasBit(wire_config[_track_source_tile[i][k]], _tracks_at_pcp[i][k])) {
 				/* track found, if track is in the neighbour tile, adjust the number
 				 * of the PCP for preferred/allowed determination*/
-				pcp_pos = (TrackSourceTile[i][k] == TS_HOME) ? i : ReverseDiagDir(i);
-				SetBit(pcp_status, i); // This PCP is in use
-				ppp_preferred[i] &= PreferredPPPofTrackAtPCP[TracksAtPCP[i][k]][pcp_pos];
+				pcp_pos = (_track_source_tile[i][k] == TS_HOME) ? i : ReverseDiagDir(i);
+				pcp_status.Set(i); // This PCP is in use
+				ppp_preferred[i] &= _preferred_ppp_of_track_at_pcp[_tracks_at_pcp[i][k]][pcp_pos];
 			}
 
-			if (HasBit(trackconfig[TrackSourceTile[i][k]], TracksAtPCP[i][k])) {
-				ppp_allowed[i] &= ~DisallowedPPPofTrackAtPCP[TracksAtPCP[i][k]][pcp_pos];
+			if (HasBit(track_config[_track_source_tile[i][k]], _tracks_at_pcp[i][k])) {
+				ppp_allowed[i].Reset(_disallowed_ppp_of_track_at_pcp[_tracks_at_pcp[i][k]][pcp_pos]);
 			}
 		}
 
 		/* Deactivate all PPPs if PCP is not used */
-		if (!HasBit(pcp_status, i)) {
-			ppp_preferred[i] = 0;
-			ppp_allowed[i] = 0;
+		if (!pcp_status.Test(i)) {
+			ppp_preferred[i].Reset();
+			ppp_allowed[i].Reset();
 		}
 
 		Foundation foundation = FOUNDATION_NONE;
@@ -384,7 +384,7 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 		if (IsTileType(neighbour, MP_STATION) || IsTileType(neighbour, MP_ROAD)) tileh[TS_NEIGHBOUR] = SLOPE_FLAT;
 
 		/* Read the foundations if they are present, and adjust the tileh */
-		if (trackconfig[TS_NEIGHBOUR] != TRACK_BIT_NONE && IsTileType(neighbour, MP_RAILWAY) && HasRailCatenary(GetRailType(neighbour))) foundation = GetRailFoundation(tileh[TS_NEIGHBOUR], trackconfig[TS_NEIGHBOUR]);
+		if (track_config[TS_NEIGHBOUR] != TRACK_BIT_NONE && IsTileType(neighbour, MP_RAILWAY) && HasRailCatenary(GetRailType(neighbour))) foundation = GetRailFoundation(tileh[TS_NEIGHBOUR], track_config[TS_NEIGHBOUR]);
 		if (IsBridgeTile(neighbour)) {
 			foundation = GetBridgeFoundation(tileh[TS_NEIGHBOUR], DiagDirToAxis(GetTunnelBridgeDirection(neighbour)));
 		}
@@ -400,9 +400,9 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 		/* If we have a straight (and level) track, we want a pylon only every 2 tiles
 		 * Delete the PCP if this is the case.
 		 * Level means that the slope is the same, or the track is flat */
-		if (tileh[TS_HOME] == tileh[TS_NEIGHBOUR] || (isflat[TS_HOME] && isflat[TS_NEIGHBOUR])) {
+		if (tileh[TS_HOME] == tileh[TS_NEIGHBOUR] || (is_flat[TS_HOME] && is_flat[TS_NEIGHBOUR])) {
 			for (uint k = 0; k < NUM_IGNORE_GROUPS; k++) {
-				if (ppp_preferred[i] == IgnoredPCP[k][tlg][i]) ClrBit(pcp_status, i);
+				if (ppp_preferred[i] == _ignored_pcp[k][tlg][i]) pcp_status.Reset(i);
 			}
 		}
 
@@ -410,35 +410,37 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 		 * In that case, we try the any of the allowed ones. if they don't exist either, don't draw
 		 * anything. Note that the preferred PPPs still contain the end-of-line markers.
 		 * Remove those (simply by ANDing with allowed, since these markers are never allowed) */
-		if ((ppp_allowed[i] & ppp_preferred[i]) != 0) ppp_allowed[i] &= ppp_preferred[i];
+		if (ppp_allowed[i].Any(ppp_preferred[i])) ppp_allowed[i] &= ppp_preferred[i];
 
 		if (IsBridgeAbove(ti->tile)) {
 			Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y;
 			int height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
 
 			if ((height <= GetTileMaxZ(ti->tile) + 1) &&
-					(i == PCPpositions[bridgetrack][0] || i == PCPpositions[bridgetrack][1])) {
-				SetBit(override_pcp, i);
+					(i == _pcp_positions[bridgetrack][0] || i == _pcp_positions[bridgetrack][1])) {
+				override_pcp.Set(i);
 			}
 		}
 
-		if (ppp_allowed[i] != 0 && HasBit(pcp_status, i) && !HasBit(override_pcp, i) &&
+		if (ppp_allowed[i].Any() && pcp_status.Test(i) && !override_pcp.Test(i) &&
 				(!IsRailStationTile(ti->tile) || CanStationTileHavePylons(ti->tile))) {
-			for (Direction k = DIR_BEGIN; k < DIR_END; k++) {
-				uint8_t temp = PPPorder[i][GetTLG(ti->tile)][k];
 
-				if (HasBit(ppp_allowed[i], temp)) {
-					uint x  = ti->x + x_pcp_offsets[i] + x_ppp_offsets[temp];
-					uint y  = ti->y + y_pcp_offsets[i] + y_ppp_offsets[temp];
+			const auto &ppp_orders = _ppp_order[i][GetTileLocationGroup(ti->tile)];
+			for (Direction k = DIR_BEGIN; k < DIR_END; k++) {
+				Direction temp = ppp_orders[k];
+
+				if (ppp_allowed[i].Test(temp)) {
+					uint x = ti->x + _x_pcp_offsets[i] + _x_ppp_offsets[temp];
+					uint y = ti->y + _y_pcp_offsets[i] + _y_ppp_offsets[temp];
 
 					/* Don't build the pylon if it would be outside the tile */
-					if (!HasBit(OwnedPPPonPCP[i], temp)) {
+					if (!_owned_ppp_on_pcp[i].Test(temp)) {
 						/* We have a neighbour that will draw it, bail out */
-						if (trackconfig[TS_NEIGHBOUR] != TRACK_BIT_NONE) break;
+						if (track_config[TS_NEIGHBOUR] != TRACK_BIT_NONE) break;
 						continue; // No neighbour, go looking for a better position
 					}
 
-					AddSortableSpriteToDraw(pylon_base + pylon_sprites[temp], PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE,
+					AddSortableSpriteToDraw(pylon_base + _pylon_sprites[temp], PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE,
 						elevation, IsTransparencySet(TO_CATENARY), -1, -1);
 
 					break; // We already have drawn a pylon, bail out
@@ -472,17 +474,15 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 	}
 
 	/* Drawing of pylons is finished, now draw the wires */
-	for (Track t : SetTrackBitIterator(wireconfig[TS_HOME])) {
+	for (Track t : SetTrackBitIterator(wire_config[TS_HOME])) {
 		SpriteID wire_base = (t == halftile_track) ? wire_halftile : wire_normal;
-		uint8_t pcp_config = HasBit(pcp_status, PCPpositions[t][0]) +
-			(HasBit(pcp_status, PCPpositions[t][1]) << 1);
-
-		const SortableSpriteStruct *sss;
+		uint8_t pcp_config = pcp_status.Test(_pcp_positions[t][0]) +
+			(pcp_status.Test(_pcp_positions[t][1]) << 1);
 		int tileh_selector = !(tileh[TS_HOME] % 3) * tileh[TS_HOME] / 3; // tileh for the slopes, 0 otherwise
 
 		assert(pcp_config != 0); // We have a pylon on neither end of the wire, that doesn't work (since we have no sprites for that)
 		assert(!IsSteepSlope(tileh[TS_HOME]));
-		sss = &RailCatenarySpriteData[Wires[tileh_selector][t][pcp_config]];
+		const SortableSpriteStruct *sss = &_rail_catenary_sprite_data[_rail_wires[tileh_selector][t][pcp_config]];
 
 		/*
 		 * The "wire"-sprite position is inside the tile, i.e. 0 <= sss->?_offset < TILE_SIZE.
@@ -510,24 +510,23 @@ void DrawRailCatenaryOnBridge(const TileInfo *ti)
 
 	uint length = GetTunnelBridgeLength(start, end);
 	uint num = GetTunnelBridgeLength(ti->tile, start) + 1;
-	uint height;
 
-	const SortableSpriteStruct *sss;
 	Axis axis = GetBridgeAxis(ti->tile);
-	TLG tlg = GetTLG(ti->tile);
+	TileLocationGroup tlg = GetTileLocationGroup(ti->tile);
 
 	RailCatenarySprite offset = (RailCatenarySprite)(axis == AXIS_X ? 0 : WIRE_Y_FLAT_BOTH - WIRE_X_FLAT_BOTH);
 
+	const SortableSpriteStruct *sss;
 	if ((length % 2) && num == length) {
 		/* Draw the "short" wire on the southern end of the bridge
 		 * only needed if the length of the bridge is odd */
-		sss = &RailCatenarySpriteData[WIRE_X_FLAT_BOTH + offset];
+		sss = &_rail_catenary_sprite_data[WIRE_X_FLAT_BOTH + offset];
 	} else {
 		/* Draw "long" wires on all other tiles of the bridge (one pylon every two tiles) */
-		sss = &RailCatenarySpriteData[WIRE_X_FLAT_SW + (num % 2) + offset];
+		sss = &_rail_catenary_sprite_data[WIRE_X_FLAT_SW + (num % 2) + offset];
 	}
 
-	height = GetBridgePixelHeight(end);
+	uint height = GetBridgePixelHeight(end);
 
 	SpriteID wire_base = GetWireBase(end, TCX_ON_BRIDGE);
 
@@ -544,9 +543,9 @@ void DrawRailCatenaryOnBridge(const TileInfo *ti)
 		DiagDirection pcp_pos = (axis == AXIS_X ? DIAGDIR_NE : DIAGDIR_NW);
 		Direction ppp_pos = (axis == AXIS_X ? DIR_NW : DIR_NE);
 		if (HasBit(tlg, (axis == AXIS_X ? 0 : 1))) ppp_pos = ReverseDir(ppp_pos);
-		uint x = ti->x + x_pcp_offsets[pcp_pos] + x_ppp_offsets[ppp_pos];
-		uint y = ti->y + y_pcp_offsets[pcp_pos] + y_ppp_offsets[ppp_pos];
-		AddSortableSpriteToDraw(pylon_base + pylon_sprites[ppp_pos], PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, height, IsTransparencySet(TO_CATENARY), -1, -1);
+		uint x = ti->x + _x_pcp_offsets[pcp_pos] + _x_ppp_offsets[ppp_pos];
+		uint y = ti->y + _y_pcp_offsets[pcp_pos] + _y_ppp_offsets[ppp_pos];
+		AddSortableSpriteToDraw(pylon_base + _pylon_sprites[ppp_pos], PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, height, IsTransparencySet(TO_CATENARY), -1, -1);
 	}
 
 	/* need a pylon on the southern end of the bridge */
@@ -554,9 +553,9 @@ void DrawRailCatenaryOnBridge(const TileInfo *ti)
 		DiagDirection pcp_pos = (axis == AXIS_X ? DIAGDIR_SW : DIAGDIR_SE);
 		Direction ppp_pos = (axis == AXIS_X ? DIR_NW : DIR_NE);
 		if (HasBit(tlg, (axis == AXIS_X ? 0 : 1))) ppp_pos = ReverseDir(ppp_pos);
-		uint x = ti->x + x_pcp_offsets[pcp_pos] + x_ppp_offsets[ppp_pos];
-		uint y = ti->y + y_pcp_offsets[pcp_pos] + y_ppp_offsets[ppp_pos];
-		AddSortableSpriteToDraw(pylon_base + pylon_sprites[ppp_pos], PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, height, IsTransparencySet(TO_CATENARY), -1, -1);
+		uint x = ti->x + _x_pcp_offsets[pcp_pos] + _x_ppp_offsets[ppp_pos];
+		uint y = ti->y + _y_pcp_offsets[pcp_pos] + _y_ppp_offsets[ppp_pos];
+		AddSortableSpriteToDraw(pylon_base + _pylon_sprites[ppp_pos], PAL_NONE, x, y, 1, 1, BB_HEIGHT_UNDER_BRIDGE, height, IsTransparencySet(TO_CATENARY), -1, -1);
 	}
 }
 
@@ -570,7 +569,7 @@ void DrawRailCatenary(const TileInfo *ti)
 	switch (GetTileType(ti->tile)) {
 		case MP_RAILWAY:
 			if (IsRailDepot(ti->tile)) {
-				const SortableSpriteStruct *sss = &RailCatenarySpriteData_Depot[GetRailDepotDirection(ti->tile)];
+				const SortableSpriteStruct *sss = &_rail_catenary_sprite_data_depot[GetRailDepotDirection(ti->tile)];
 
 				SpriteID wire_base = GetWireBase(ti->tile);
 
@@ -624,7 +623,7 @@ void UpdateDisableElrailSettingState(bool disable, bool update_vehicles)
 				 *  so add there also normal rail compatibility */
 				t->compatible_railtypes.Set(RAILTYPE_RAIL);
 				t->railtype = RAILTYPE_RAIL;
-				SetBit(t->flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL);
+				t->flags.Set(VehicleRailFlag::AllowedOnNormalRail);
 			}
 		}
 	}
diff --git a/src/engine.cpp b/src/engine.cpp
index 102a284c63..a63b5a1954 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -959,7 +959,7 @@ static bool IsVehicleTypeDisabled(VehicleType type, bool ai)
 }
 
 /** Daily check to offer an exclusive engine preview to the companies. */
-static IntervalTimer<TimerGameCalendar> _calendar_engines_daily({TimerGameCalendar::DAY, TimerGameCalendar::Priority::ENGINE}, [](auto)
+static const IntervalTimer<TimerGameCalendar> _calendar_engines_daily({TimerGameCalendar::DAY, TimerGameCalendar::Priority::ENGINE}, [](auto)
 {
 	for (Company *c : Company::Iterate()) {
 		c->avail_railtypes = AddDateIntroducedRailTypes(c->avail_railtypes, TimerGameCalendar::date);
@@ -976,7 +976,7 @@ static IntervalTimer<TimerGameCalendar> _calendar_engines_daily({TimerGameCalend
 					CloseWindowById(WC_ENGINE_PREVIEW, i);
 					e->preview_company = CompanyID::Invalid();
 				}
-			} else if (CountBits(e->preview_asked.base()) < MAX_COMPANIES) {
+			} else if (e->preview_asked.Count() < MAX_COMPANIES) {
 				e->preview_company = GetPreviewCompany(e);
 
 				if (e->preview_company == CompanyID::Invalid()) {
@@ -1085,22 +1085,13 @@ static void NewVehicleAvailable(Engine *e)
 	 * prevent that company from getting future intro periods for a while. */
 	if (e->flags.Test(EngineFlag::ExclusivePreview)) {
 		for (Company *c : Company::Iterate()) {
-			uint block_preview = c->block_preview;
-
 			if (!e->company_avail.Test(c->index)) continue;
 
-			/* We assume the user did NOT build it.. prove me wrong ;) */
-			c->block_preview = 20;
-
-			for (const Vehicle *v : Vehicle::Iterate()) {
-				if (v->type == VEH_TRAIN || v->type == VEH_ROAD || v->type == VEH_SHIP ||
-						(v->type == VEH_AIRCRAFT && Aircraft::From(v)->IsNormalAircraft())) {
-					if (v->owner == c->index && v->engine_type == index) {
-						/* The user did prove me wrong, so restore old value */
-						c->block_preview = block_preview;
-						break;
-					}
-				}
+			/* Check the company's 'ALL_GROUP' group statistics. This only includes countable vehicles, which is fine
+			 * as those are the only engines that can be given exclusive previews. */
+			if (GetGroupNumEngines(c->index, ALL_GROUP, e->index) == 0) {
+				/* The company did not build this engine during preview. */
+				c->block_preview = 20;
 			}
 		}
 	}
@@ -1192,7 +1183,7 @@ void CalendarEnginesMonthlyLoop()
 	}
 }
 
-static IntervalTimer<TimerGameCalendar> _calendar_engines_monthly({TimerGameCalendar::MONTH, TimerGameCalendar::Priority::ENGINE}, [](auto)
+static const IntervalTimer<TimerGameCalendar> _calendar_engines_monthly({TimerGameCalendar::MONTH, TimerGameCalendar::Priority::ENGINE}, [](auto)
 {
 	CalendarEnginesMonthlyLoop();
 });
diff --git a/src/engine_base.h b/src/engine_base.h
index ab7862e9f5..edeb45d2ff 100644
--- a/src/engine_base.h
+++ b/src/engine_base.h
@@ -74,13 +74,7 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
 	uint16_t list_position = 0;
 
 	/* NewGRF related data */
-	/**
-	 * Properties related the the grf file.
-	 * NUM_CARGO real cargo plus two pseudo cargo sprite groups.
-	 * Used for obtaining the sprite offset of custom sprites, and for
-	 * evaluating callbacks.
-	 */
-	VariableGRFFileProps grf_prop{};
+	CargoGRFFileProps grf_prop{}; ///< Link to NewGRF
 	std::vector<WagonOverride> overrides{};
 	std::vector<BadgeID> badges{};
 
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 355b3b3a51..e219a45ff2 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -141,7 +141,7 @@ struct EnginePreviewWindow : Window {
 };
 
 static WindowDesc _engine_preview_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_ENGINE_PREVIEW, WC_NONE,
 	WindowDefaultFlag::Construction,
 	_nested_engine_preview_widgets
diff --git a/src/engine_gui.h b/src/engine_gui.h
index 5eb9816b09..12d0d04d7a 100644
--- a/src/engine_gui.h
+++ b/src/engine_gui.h
@@ -12,7 +12,7 @@
 
 #include "engine_type.h"
 #include "group_type.h"
-#include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "sortlist_type.h"
 #include "gfx_type.h"
 #include "vehicle_type.h"
diff --git a/src/engine_type.h b/src/engine_type.h
index 41df86276d..94f797430e 100644
--- a/src/engine_type.h
+++ b/src/engine_type.h
@@ -10,6 +10,7 @@
 #ifndef ENGINE_TYPE_H
 #define ENGINE_TYPE_H
 
+#include "core/pool_type.hpp"
 #include "economy_type.h"
 #include "landscape_type.h"
 #include "newgrf_callbacks.h"
diff --git a/src/error.cpp b/src/error.cpp
index cd56785942..9258b46039 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -9,13 +9,14 @@
 
 #include "stdafx.h"
 #include "error_func.h"
+#include "safeguards.h"
 
 [[noreturn]] void NOT_REACHED(const std::source_location location)
 {
 	FatalError("NOT_REACHED triggered at line {} of {}", location.line(), location.file_name());
 }
 
-[[noreturn]] void AssertFailedError(const char *expression, const std::source_location location)
+[[noreturn]] void AssertFailedError(std::string_view expression, const std::source_location location)
 {
 	FatalError("Assertion failed at line {} of {}: {}", location.line(), location.file_name(), expression);
 }
diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index b9aa748da5..b4b51cf549 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -9,7 +9,6 @@
 
 #include "stdafx.h"
 #include "core/geometry_func.hpp"
-#include "core/mem_func.hpp"
 #include "landscape.h"
 #include "newgrf_text.h"
 #include "error.h"
@@ -44,7 +43,7 @@ static constexpr NWidgetPart _nested_errmsg_widgets[] = {
 };
 
 static WindowDesc _errmsg_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_ERRMSG, WC_NONE,
 	{},
 	_nested_errmsg_widgets
@@ -64,7 +63,7 @@ static constexpr NWidgetPart _nested_errmsg_face_widgets[] = {
 };
 
 static WindowDesc _errmsg_face_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_ERRMSG, WC_NONE,
 	{},
 	_nested_errmsg_face_widgets
@@ -194,14 +193,14 @@ public:
 
 			case WID_EM_MESSAGE:
 				if (this->detailed_msg.empty()) {
-					DrawStringMultiLine(r, this->summary_msg.GetDecodedString(), TC_FROMSTRING, SA_CENTER);
+					DrawStringMultiLineWithClipping(r, this->summary_msg.GetDecodedString(), TC_FROMSTRING, SA_CENTER);
 				} else if (this->extra_msg.empty()) {
 					/* Extra space when message is shorter than company face window */
 					int extra = (r.Height() - this->height_summary - this->height_detailed - WidgetDimensions::scaled.vsep_wide) / 2;
 
 					/* Note: NewGRF supplied error message often do not start with a colour code, so default to white. */
-					DrawStringMultiLine(r.WithHeight(this->height_summary + extra, false), this->summary_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
-					DrawStringMultiLine(r.WithHeight(this->height_detailed + extra, true), this->detailed_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
+					DrawStringMultiLineWithClipping(r.WithHeight(this->height_summary + extra, false), this->summary_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
+					DrawStringMultiLineWithClipping(r.WithHeight(this->height_detailed + extra, true), this->detailed_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
 				} else {
 					/* Extra space when message is shorter than company face window */
 					int extra = (r.Height() - this->height_summary - this->height_detailed - this->height_extra - (WidgetDimensions::scaled.vsep_wide * 2)) / 3;
@@ -210,9 +209,9 @@ public:
 					Rect top_section = r.WithHeight(this->height_summary + extra, false);
 					Rect bottom_section = r.WithHeight(this->height_extra + extra, true);
 					Rect middle_section = { top_section.left, top_section.bottom, top_section.right, bottom_section.top };
-					DrawStringMultiLine(top_section, this->summary_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
-					DrawStringMultiLine(middle_section, this->detailed_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
-					DrawStringMultiLine(bottom_section, this->extra_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
+					DrawStringMultiLineWithClipping(top_section, this->summary_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
+					DrawStringMultiLineWithClipping(middle_section, this->detailed_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
+					DrawStringMultiLineWithClipping(bottom_section, this->extra_msg.GetDecodedString(), TC_WHITE, SA_CENTER);
 				}
 
 				break;
diff --git a/src/fileio.cpp b/src/fileio.cpp
index 3d05b2a3c5..bae969a362 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -8,6 +8,7 @@
 /** @file fileio.cpp Standard In/Out file operations */
 
 #include "stdafx.h"
+#include "core/string_consumer.hpp"
 #include "fileio_func.h"
 #include "spriteloader/spriteloader.hpp"
 #include "debug.h"
@@ -23,7 +24,6 @@
 #include <unistd.h>
 #include <pwd.h>
 #endif
-#include <charconv>
 #include <sys/stat.h>
 #include <filesystem>
 
@@ -35,7 +35,7 @@ static bool _do_scan_working_directory = true;
 extern std::string _config_file;
 extern std::string _highscore_file;
 
-static const char * const _subdirs[] = {
+static const std::string_view _subdirs[] = {
 	"",
 	"save" PATHSEP,
 	"save" PATHSEP "autosave" PATHSEP,
@@ -118,7 +118,7 @@ static void FillValidSearchPaths(bool only_local_path)
  * @param subdir the subdirectory to look in
  * @return true if and only if the file can be opened
  */
-bool FioCheckFileExists(const std::string &filename, Subdirectory subdir)
+bool FioCheckFileExists(std::string_view filename, Subdirectory subdir)
 {
 	auto f = FioFOpenFile(filename, "rb", subdir);
 	return f.has_value();
@@ -129,7 +129,7 @@ bool FioCheckFileExists(const std::string &filename, Subdirectory subdir)
  * @param filename the file to test.
  * @return true if and only if the file exists.
  */
-bool FileExists(const std::string &filename)
+bool FileExists(std::string_view filename)
 {
 	std::error_code ec;
 	return std::filesystem::exists(OTTD2FS(filename), ec);
@@ -141,7 +141,7 @@ bool FileExists(const std::string &filename)
  * @param filename Filename to look for.
  * @return String containing the path if the path was found, else an empty string.
  */
-std::string FioFindFullPath(Subdirectory subdir, const std::string &filename)
+std::string FioFindFullPath(Subdirectory subdir, std::string_view filename)
 {
 	assert(subdir < NUM_SUBDIRS);
 
@@ -165,7 +165,7 @@ std::string FioGetDirectory(Searchpath sp, Subdirectory subdir)
 	assert(subdir < NUM_SUBDIRS);
 	assert(sp < NUM_SEARCHPATHS);
 
-	return _searchpaths[sp] + _subdirs[subdir];
+	return fmt::format("{}{}", _searchpaths[sp], _subdirs[subdir]);
 }
 
 std::string FioFindDirectory(Subdirectory subdir)
@@ -180,7 +180,7 @@ std::string FioFindDirectory(Subdirectory subdir)
 	return _personal_dir;
 }
 
-static std::optional<FileHandle> FioFOpenFileSp(const std::string &filename, const char *mode, Searchpath sp, Subdirectory subdir, size_t *filesize)
+static std::optional<FileHandle> FioFOpenFileSp(std::string_view filename, std::string_view mode, Searchpath sp, Subdirectory subdir, size_t *filesize)
 {
 #if defined(_WIN32)
 	/* fopen is implemented as a define with ellipses for
@@ -188,14 +188,14 @@ static std::optional<FileHandle> FioFOpenFileSp(const std::string &filename, con
 	 * a string, but a variable, it 'renames' the variable,
 	 * so make that variable to makes it compile happily */
 	wchar_t Lmode[5];
-	MultiByteToWideChar(CP_ACP, 0, mode, -1, Lmode, static_cast<int>(std::size(Lmode)));
+	MultiByteToWideChar(CP_ACP, 0, mode.data(), static_cast<int>(std::size(mode)), Lmode, static_cast<int>(std::size(Lmode)));
 #endif
 	std::string buf;
 
 	if (subdir == NO_DIRECTORY) {
 		buf = filename;
 	} else {
-		buf = _searchpaths[sp] + _subdirs[subdir] + filename;
+		buf = fmt::format("{}{}{}", _searchpaths[sp], _subdirs[subdir], filename);
 	}
 
 	auto f = FileHandle::Open(buf, mode);
@@ -239,7 +239,7 @@ static std::optional<FileHandle> FioFOpenFileTar(const TarFileListEntry &entry,
  * @param subdir Subdirectory to open.
  * @return File handle of the opened file, or \c nullptr if the file is not available.
  */
-std::optional<FileHandle> FioFOpenFile(const std::string &filename, const char *mode, Subdirectory subdir, size_t *filesize)
+std::optional<FileHandle> FioFOpenFile(std::string_view filename, std::string_view mode, Subdirectory subdir, size_t *filesize)
 {
 	std::optional<FileHandle> f = std::nullopt;
 	assert(subdir < NUM_SUBDIRS || subdir == NO_DIRECTORY);
@@ -252,7 +252,7 @@ std::optional<FileHandle> FioFOpenFile(const std::string &filename, const char *
 	/* We can only use .tar in case of data-dir, and read-mode */
 	if (!f.has_value() && mode[0] == 'r' && subdir != NO_DIRECTORY) {
 		/* Filenames in tars are always forced to be lowercase */
-		std::string resolved_name = filename;
+		std::string resolved_name{filename};
 		strtolower(resolved_name);
 
 		/* Resolve ".." */
@@ -460,6 +460,7 @@ bool TarScanner::AddFile(const std::string &filename, size_t, [[maybe_unused]] c
 
 		char unused[12];
 	};
+	static_assert(sizeof(TarHeader) == 512);
 
 	/* Check if we already seen this file */
 	TarList::iterator it = _tar_list[this->subdir].find(filename);
@@ -475,25 +476,22 @@ bool TarScanner::AddFile(const std::string &filename, size_t, [[maybe_unused]] c
 
 	_tar_list[this->subdir][filename] = std::string{};
 
-	std::string filename_base = FS2OTTD(std::filesystem::path(OTTD2FS(filename)).filename());
+	std::string filename_base = FS2OTTD(std::filesystem::path(OTTD2FS(filename)).filename().native());
 	SimplifyFileName(filename_base);
 
 	TarHeader th;
 	size_t num = 0, pos = 0;
 
-	/* Make a char of 512 empty bytes */
-	char empty[512];
-	memset(&empty[0], 0, sizeof(empty));
-
 	for (;;) { // Note: feof() always returns 'false' after 'fseek()'. Cool, isn't it?
-		size_t num_bytes_read = fread(&th, 1, 512, f);
-		if (num_bytes_read != 512) break;
+		size_t num_bytes_read = fread(&th, 1, sizeof(TarHeader), f);
+		if (num_bytes_read != sizeof(TarHeader)) break;
 		pos += num_bytes_read;
 
 		/* Check if we have the new tar-format (ustar) or the old one (a lot of zeros after 'link' field) */
-		if (strncmp(th.magic, "ustar", 5) != 0 && memcmp(&th.magic, &empty[0], 512 - offsetof(TarHeader, magic)) != 0) {
+		auto last_of_th = &th.unused[std::size(th.unused)];
+		if (std::string_view{th.magic, 5} != "ustar" && std::any_of(th.magic, last_of_th, [](auto c) { return c != 0; })) {
 			/* If we have only zeros in the block, it can be an end-of-file indicator */
-			if (memcmp(&th, &empty[0], 512) == 0) continue;
+			if (std::all_of(th.name, last_of_th, [](auto c) { return c == 0; })) continue;
 
 			Debug(misc, 0, "The file '{}' isn't a valid tar-file", filename);
 			return false;
@@ -514,13 +512,13 @@ bool TarScanner::AddFile(const std::string &filename, size_t, [[maybe_unused]] c
 		std::string size = ExtractString(th.size);
 		size_t skip = 0;
 		if (!size.empty()) {
-			StrTrimInPlace(size);
-			auto [_, err] = std::from_chars(size.data(), size.data() + size.size(), skip, 8);
-			if (err != std::errc()) {
+			auto value = ParseInteger<size_t>(size, 8);
+			if (!value.has_value()) {
 				Debug(misc, 0, "The file '{}' has an invalid size for '{}'", filename, name);
 				fclose(f);
 				return false;
 			}
+			skip = *value;
 		}
 
 		switch (th.typeflag) {
@@ -658,7 +656,10 @@ bool ExtractTar(const std::string &tar_filename, Subdirectory subdir)
  * @param exe the path from the current path to the executable
  * @note defined in the OS related files (win32.cpp, unix.cpp etc)
  */
-extern void DetermineBasePaths(const char *exe);
+extern void DetermineBasePaths(std::string_view exe);
+
+/** Mimicks the getcwd from POSIX for Windows. */
+char *getcwd(char *buf, size_t size);
 #else /* defined(_WIN32) */
 
 /**
@@ -668,9 +669,9 @@ extern void DetermineBasePaths(const char *exe);
  * in the same way we remove the name from the executable name.
  * @param exe the path to the executable
  */
-static bool ChangeWorkingDirectoryToExecutable(const char *exe)
+static bool ChangeWorkingDirectoryToExecutable(std::string_view exe)
 {
-	std::string path = exe;
+	std::string path{exe};
 
 #ifdef WITH_COCOA
 	for (size_t pos = path.find_first_of('.'); pos != std::string::npos; pos = path.find_first_of('.', pos + 1)) {
@@ -733,8 +734,8 @@ static std::string GetHomeDir()
 	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
 	return std::string(path.Path());
 #else
-	const char *home_env = std::getenv("HOME"); // Stack var, shouldn't be freed
-	if (home_env != nullptr) return std::string(home_env);
+	auto home_env = GetEnv("HOME"); // Stack var, shouldn't be freed
+	if (home_env.has_value()) return std::string(*home_env);
 
 	const struct passwd *pw = getpwuid(getuid());
 	if (pw != nullptr) return std::string(pw->pw_dir);
@@ -746,14 +747,13 @@ static std::string GetHomeDir()
  * Determine the base (personal dir and game data dir) paths
  * @param exe the path to the executable
  */
-void DetermineBasePaths(const char *exe)
+void DetermineBasePaths(std::string_view exe)
 {
 	std::string tmp;
 	const std::string homedir = GetHomeDir();
 #ifdef USE_XDG
-	const char *xdg_data_home = std::getenv("XDG_DATA_HOME");
-	if (xdg_data_home != nullptr) {
-		tmp = xdg_data_home;
+	if (auto xdg_data_home = GetEnv("XDG_DATA_HOME"); xdg_data_home.has_value()) {
+		tmp = *xdg_data_home;
 		tmp += PATHSEP;
 		tmp += PERSONAL_DIR[0] == '.' ? &PERSONAL_DIR[1] : PERSONAL_DIR;
 		AppendPathSeparator(tmp);
@@ -822,7 +822,7 @@ void DetermineBasePaths(const char *exe)
 			/* _config_file is not in a folder, so use current directory. */
 			tmp = cwd;
 		} else {
-			tmp = FS2OTTD(std::filesystem::weakly_canonical(std::filesystem::path(OTTD2FS(_config_file))).parent_path());
+			tmp = FS2OTTD(std::filesystem::weakly_canonical(std::filesystem::path(OTTD2FS(_config_file))).parent_path().native());
 		}
 		AppendPathSeparator(tmp);
 		_searchpaths[SP_WORKING_DIR] = tmp;
@@ -874,7 +874,7 @@ std::string _personal_dir;
  * @param exe the path from the current path to the executable
  * @param only_local_path Whether we shouldn't fill searchpaths with global folders.
  */
-void DeterminePaths(const char *exe, bool only_local_path)
+void DeterminePaths(std::string_view exe, bool only_local_path)
 {
 	DetermineBasePaths(exe);
 	FillValidSearchPaths(only_local_path);
@@ -882,9 +882,8 @@ void DeterminePaths(const char *exe, bool only_local_path)
 #ifdef USE_XDG
 	std::string config_home;
 	std::string homedir = GetHomeDir();
-	const char *xdg_config_home = std::getenv("XDG_CONFIG_HOME");
-	if (xdg_config_home != nullptr) {
-		config_home = xdg_config_home;
+	if (auto xdg_config_home = GetEnv("XDG_CONFIG_HOME"); xdg_config_home.has_value()) {
+		config_home = *xdg_config_home;
 		config_home += PATHSEP;
 		config_home += PERSONAL_DIR[0] == '.' ? &PERSONAL_DIR[1] : PERSONAL_DIR;
 	} else if (!homedir.empty()) {
@@ -976,7 +975,7 @@ void DeterminePaths(const char *exe, bool only_local_path)
 	};
 
 	for (const auto &default_subdir : default_subdirs) {
-		FioCreateDirectory(_personal_dir + _subdirs[default_subdir]);
+		FioCreateDirectory(fmt::format("{}{}", _personal_dir, _subdirs[default_subdir]));
 	}
 
 	/* If we have network we make a directory for the autodownloading of content */
@@ -1074,7 +1073,7 @@ static uint ScanPath(FileScanner *fs, std::string_view extension, const std::fil
 			if (!recursive) continue;
 			num += ScanPath(fs, extension, dir_entry.path(), basepath_length, recursive);
 		} else if (dir_entry.is_regular_file()) {
-			std::string file = FS2OTTD(dir_entry.path());
+			std::string file = FS2OTTD(dir_entry.path().native());
 			if (!MatchesExtension(extension, file)) continue;
 			if (fs->AddFile(file, basepath_length, {})) num++;
 		}
@@ -1152,7 +1151,7 @@ uint FileScanner::Scan(std::string_view extension, Subdirectory sd, bool tars, b
  * @return the number of found files, i.e. the number of times that
  *         AddFile returned true.
  */
-uint FileScanner::Scan(const std::string_view extension, const std::string &directory, bool recursive)
+uint FileScanner::Scan(std::string_view extension, const std::string &directory, bool recursive)
 {
 	std::string path(directory);
 	AppendPathSeparator(path);
@@ -1166,13 +1165,13 @@ uint FileScanner::Scan(const std::string_view extension, const std::string &dire
  * @param mode Mode to open file.
  * @return FileHandle, or std::nullopt on failure.
  */
-std::optional<FileHandle> FileHandle::Open(const std::string &filename, const std::string &mode)
+std::optional<FileHandle> FileHandle::Open(const std::string &filename, std::string_view mode)
 {
 #if defined(_WIN32)
 	/* Windows also requires mode to be wchar_t. */
 	auto f = _wfopen(OTTD2FS(filename).c_str(), OTTD2FS(mode).c_str());
 #else
-	auto f = fopen(filename.c_str(), mode.c_str());
+	auto f = fopen(filename.c_str(), std::string{mode}.c_str());
 #endif /* _WIN32 */
 
 	if (f == nullptr) return std::nullopt;
diff --git a/src/fileio_func.h b/src/fileio_func.h
index 2b65924a33..36776ed992 100644
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -13,21 +13,21 @@
 #include "core/enum_type.hpp"
 #include "fileio_type.h"
 
-std::optional<FileHandle> FioFOpenFile(const std::string &filename, const char *mode, Subdirectory subdir, size_t *filesize = nullptr);
-bool FioCheckFileExists(const std::string &filename, Subdirectory subdir);
-std::string FioFindFullPath(Subdirectory subdir, const std::string &filename);
+std::optional<FileHandle> FioFOpenFile(std::string_view filename, std::string_view mode, Subdirectory subdir, size_t *filesize = nullptr);
+bool FioCheckFileExists(std::string_view filename, Subdirectory subdir);
+std::string FioFindFullPath(Subdirectory subdir, std::string_view filename);
 std::string FioGetDirectory(Searchpath sp, Subdirectory subdir);
 std::string FioFindDirectory(Subdirectory subdir);
 void FioCreateDirectory(const std::string &name);
 bool FioRemove(const std::string &filename);
 
-const char *FiosGetScreenshotDir();
+std::string_view FiosGetScreenshotDir();
 
 void SanitizeFilename(std::string &filename);
 void AppendPathSeparator(std::string &buf);
-void DeterminePaths(const char *exe, bool only_local_path);
+void DeterminePaths(std::string_view exe, bool only_local_path);
 std::unique_ptr<char[]> ReadFileToMem(const std::string &filename, size_t &lenp, size_t maxsize);
-bool FileExists(const std::string &filename);
+bool FileExists(std::string_view filename);
 bool ExtractTar(const std::string &tar_filename, Subdirectory subdir);
 
 extern std::string _personal_dir; ///< custom directory for personal settings, saves, newgrf, etc.
diff --git a/src/fileio_type.h b/src/fileio_type.h
index 46d1fbfdca..ab1fee9c9c 100644
--- a/src/fileio_type.h
+++ b/src/fileio_type.h
@@ -11,6 +11,7 @@
 #define FILEIO_TYPE_H
 
 #include "core/enum_type.hpp"
+#include "misc/autorelease.hpp"
 
 /** The different abstract types of files that the system knows about. */
 enum AbstractFileType : uint8_t {
@@ -21,8 +22,6 @@ enum AbstractFileType : uint8_t {
 	FT_TOWN_DATA, ///< town data file
 
 	FT_INVALID = 7, ///< Invalid or unknown file type.
-	FT_NUMBITS = 3, ///< Number of bits required for storing a #AbstractFileType value.
-	FT_MASK = (1 << FT_NUMBITS) - 1, ///< Bitmask for extracting an abstract file type.
 };
 
 /** Kinds of files in each #AbstractFileType. */
@@ -58,56 +57,30 @@ enum SaveLoadOperation : uint8_t {
 	SLO_INVALID, ///< Unknown file operation.
 };
 
-/**
- * Construct an enum value for #FiosType as a combination of an abstract and a detailed file type.
- * @param abstract Abstract file type (one of #AbstractFileType).
- * @param detailed Detailed file type (one of #DetailedFileType).
- */
-#define MAKE_FIOS_TYPE(abstract, detailed) ((abstract) | ((detailed) << FT_NUMBITS))
-
 /**
  * Elements of a file system that are recognized.
- * Values are a combination of #AbstractFileType and #DetailedFileType.
- * @see GetAbstractFileType GetDetailedFileType
  */
-enum FiosType : uint16_t {
-	FIOS_TYPE_DRIVE  = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_DRIVE),
-	FIOS_TYPE_PARENT = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_PARENT),
-	FIOS_TYPE_DIR    = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_DIR),
-	FIOS_TYPE_DIRECT = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_DIRECT),
+struct FiosType {
+	AbstractFileType abstract; ///< Abstract file type.
+	DetailedFileType detailed; ///< Detailed file type.
 
-	FIOS_TYPE_FILE         = MAKE_FIOS_TYPE(FT_SAVEGAME, DFT_GAME_FILE),
-	FIOS_TYPE_OLDFILE      = MAKE_FIOS_TYPE(FT_SAVEGAME, DFT_OLD_GAME_FILE),
-	FIOS_TYPE_SCENARIO     = MAKE_FIOS_TYPE(FT_SCENARIO, DFT_GAME_FILE),
-	FIOS_TYPE_OLD_SCENARIO = MAKE_FIOS_TYPE(FT_SCENARIO, DFT_OLD_GAME_FILE),
-	FIOS_TYPE_PNG          = MAKE_FIOS_TYPE(FT_HEIGHTMAP, DFT_HEIGHTMAP_PNG),
-	FIOS_TYPE_BMP          = MAKE_FIOS_TYPE(FT_HEIGHTMAP, DFT_HEIGHTMAP_BMP),
-	FIOS_TYPE_JSON         = MAKE_FIOS_TYPE(FT_TOWN_DATA, DFT_TOWN_DATA_JSON),
-
-	FIOS_TYPE_INVALID = MAKE_FIOS_TYPE(FT_INVALID, DFT_INVALID),
+	constexpr bool operator==(const FiosType &) const noexcept = default;
 };
 
-#undef MAKE_FIOS_TYPE
+constexpr FiosType FIOS_TYPE_DRIVE{FT_NONE, DFT_FIOS_DRIVE};
+constexpr FiosType FIOS_TYPE_PARENT{FT_NONE, DFT_FIOS_PARENT};
+constexpr FiosType FIOS_TYPE_DIR{FT_NONE, DFT_FIOS_DIR};
+constexpr FiosType FIOS_TYPE_DIRECT{FT_NONE, DFT_FIOS_DIRECT};
 
-/**
- * Extract the abstract file type from a #FiosType.
- * @param fios_type Type to query.
- * @return The Abstract file type of the \a fios_type.
- */
-inline AbstractFileType GetAbstractFileType(FiosType fios_type)
-{
-	return static_cast<AbstractFileType>(static_cast<uint>(fios_type) & FT_MASK);
-}
+constexpr FiosType FIOS_TYPE_FILE{FT_SAVEGAME, DFT_GAME_FILE};
+constexpr FiosType FIOS_TYPE_OLDFILE{FT_SAVEGAME, DFT_OLD_GAME_FILE};
+constexpr FiosType FIOS_TYPE_SCENARIO{FT_SCENARIO, DFT_GAME_FILE};
+constexpr FiosType FIOS_TYPE_OLD_SCENARIO{FT_SCENARIO, DFT_OLD_GAME_FILE};
+constexpr FiosType FIOS_TYPE_PNG{FT_HEIGHTMAP, DFT_HEIGHTMAP_PNG};
+constexpr FiosType FIOS_TYPE_BMP{FT_HEIGHTMAP, DFT_HEIGHTMAP_BMP};
+constexpr FiosType FIOS_TYPE_JSON{FT_TOWN_DATA, DFT_TOWN_DATA_JSON};
 
-/**
- * Extract the detailed file type from a #FiosType.
- * @param fios_type Type to query.
- * @return The Detailed file type of the \a fios_type.
- */
-inline DetailedFileType GetDetailedFileType(FiosType fios_type)
-{
-	return static_cast<DetailedFileType>(fios_type >> FT_NUMBITS);
-}
+constexpr FiosType FIOS_TYPE_INVALID{FT_INVALID, DFT_INVALID};
 
 /**
  * The different kinds of subdirectories OpenTTD uses
@@ -158,7 +131,8 @@ DECLARE_INCREMENT_DECREMENT_OPERATORS(Searchpath)
 
 class FileHandle {
 public:
-	static std::optional<FileHandle> Open(const std::string &filename, const std::string &mode);
+	static std::optional<FileHandle> Open(const std::string &filename, std::string_view mode);
+	static std::optional<FileHandle> Open(std::string_view filename, std::string_view mode) { return FileHandle::Open(std::string{filename}, mode); }
 
 	inline void Close() { this->f.reset(); }
 
@@ -169,15 +143,7 @@ public:
 	}
 
 private:
-	/** Helper to close a FILE * with a \c std::unique_ptr. */
-	struct FileDeleter {
-		void operator ()(FILE *f)
-		{
-			if (f != nullptr) fclose(f);
-		}
-	};
-
-	std::unique_ptr<FILE, FileDeleter> f;
+	AutoRelease<FILE, fclose> f;
 
 	FileHandle(FILE *f) : f(f) { assert(this->f != nullptr); }
 };
diff --git a/src/fios.cpp b/src/fios.cpp
index 760ca1e066..0a6beb038b 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -12,6 +12,7 @@
 
 #include "stdafx.h"
 #include "3rdparty/md5/md5.h"
+#include "core/string_consumer.hpp"
 #include "fileio_func.h"
 #include "fios.h"
 #include "network/network_content.h"
@@ -37,7 +38,7 @@ extern bool FiosIsHiddenFile(const std::filesystem::path &path);
 extern void FiosGetDrives(FileList &file_list);
 
 /* get the name of an oldstyle savegame */
-extern std::string GetOldSaveGameName(const std::string &file);
+extern std::string GetOldSaveGameName(std::string_view file);
 
 /**
  * Compare two FiosItem's. Used with sort when sorting the file list.
@@ -99,7 +100,7 @@ void FileList::BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperati
  *             or a numbered entry into the filename list.
  * @return The information on the file, or \c nullptr if the file is not available.
  */
-const FiosItem *FileList::FindItem(const std::string_view file)
+const FiosItem *FileList::FindItem(std::string_view file)
 {
 	for (const auto &it : *this) {
 		const FiosItem *item = &it;
@@ -108,11 +109,9 @@ const FiosItem *FileList::FindItem(const std::string_view file)
 	}
 
 	/* If no name matches, try to parse it as number */
-	int i;
-	const char *endptr = std::from_chars(file.data(), file.data() + file.size(), i, 10).ptr;
-	if (file.data() == endptr || endptr != file.data() + file.size()) i = -1;
-
-	if (IsInsideMM(i, 0, this->size())) return &this->at(i);
+	StringConsumer consumer{file};
+	auto number = consumer.TryReadIntegerBase<int>(10);
+	if (number.has_value() && !consumer.AnyBytesLeft() && IsInsideMM(*number, 0, this->size())) return &this->at(*number);
 
 	/* As a last effort assume it is an OpenTTD savegame and
 	 * that the ".sav" part was not given. */
@@ -142,18 +141,18 @@ std::string FiosGetCurrentPath()
  */
 bool FiosBrowseTo(const FiosItem *item)
 {
-	switch (item->type) {
-		case FIOS_TYPE_DRIVE:
+	switch (item->type.detailed) {
+		case DFT_FIOS_DRIVE:
 #if defined(_WIN32)
 			assert(_fios_path != nullptr);
 			*_fios_path = std::string{ item->title, 0, 1 } + ":" PATHSEP;
 #endif
 			break;
 
-		case FIOS_TYPE_INVALID:
+		case DFT_INVALID:
 			break;
 
-		case FIOS_TYPE_PARENT: {
+		case DFT_FIOS_PARENT: {
 			assert(_fios_path != nullptr);
 			auto s = _fios_path->find_last_of(PATHSEPCHAR);
 			if (s != std::string::npos && s != 0) {
@@ -167,24 +166,18 @@ bool FiosBrowseTo(const FiosItem *item)
 			break;
 		}
 
-		case FIOS_TYPE_DIR:
+		case DFT_FIOS_DIR:
 			assert(_fios_path != nullptr);
 			*_fios_path += item->name;
 			*_fios_path += PATHSEP;
 			break;
 
-		case FIOS_TYPE_DIRECT:
+		case DFT_FIOS_DIRECT:
 			assert(_fios_path != nullptr);
 			*_fios_path = item->name;
 			break;
 
-		case FIOS_TYPE_FILE:
-		case FIOS_TYPE_OLDFILE:
-		case FIOS_TYPE_SCENARIO:
-		case FIOS_TYPE_OLD_SCENARIO:
-		case FIOS_TYPE_PNG:
-		case FIOS_TYPE_BMP:
-		case FIOS_TYPE_JSON:
+		default:
 			return false;
 	}
 
@@ -198,21 +191,21 @@ bool FiosBrowseTo(const FiosItem *item)
  * @param ext Filename extension (use \c "" for no extension).
  * @return The completed filename.
  */
-static std::string FiosMakeFilename(const std::string *path, const char *name, const char *ext)
+static std::string FiosMakeFilename(const std::string *path, std::string_view name, std::string_view ext)
 {
-	std::string buf;
+	std::string_view base_path;
 
 	if (path != nullptr) {
-		buf = *path;
+		base_path = *path;
 		/* Remove trailing path separator, if present */
-		if (!buf.empty() && buf.back() == PATHSEPCHAR) buf.pop_back();
+		if (!base_path.empty() && base_path.back() == PATHSEPCHAR) base_path.remove_suffix(1);
 	}
 
 	/* Don't append the extension if it is already there */
-	const char *period = strrchr(name, '.');
-	if (period != nullptr && StrEqualsIgnoreCase(period, ext)) ext = "";
+	auto period = name.find_last_of('.');
+	if (period != std::string_view::npos && StrEqualsIgnoreCase(name.substr(period), ext)) ext = "";
 
-	return buf + PATHSEP + name + ext;
+	return fmt::format("{}{}{}{}", base_path, PATHSEP, name, ext);
 }
 
 /**
@@ -220,9 +213,9 @@ static std::string FiosMakeFilename(const std::string *path, const char *name, c
  * @param name Name of the file.
  * @return The completed filename.
  */
-std::string FiosMakeSavegameName(const char *name)
+std::string FiosMakeSavegameName(std::string_view name)
 {
-	const char *extension = (_game_mode == GM_EDITOR) ? ".scn" : ".sav";
+	std::string_view extension = (_game_mode == GM_EDITOR) ? ".scn" : ".sav";
 
 	return FiosMakeFilename(_fios_path, name, extension);
 }
@@ -232,12 +225,9 @@ std::string FiosMakeSavegameName(const char *name)
  * @param name Filename.
  * @return The completed filename.
  */
-std::string FiosMakeHeightmapName(const char *name)
+std::string FiosMakeHeightmapName(std::string_view name)
 {
-	std::string ext(".");
-	ext += GetCurrentScreenshotExtension();
-
-	return FiosMakeFilename(_fios_path, name, ext.c_str());
+	return FiosMakeFilename(_fios_path, name, fmt::format(".{}", GetCurrentScreenshotExtension()));
 }
 
 /**
@@ -245,12 +235,12 @@ std::string FiosMakeHeightmapName(const char *name)
  * @param name Filename to delete.
  * @return Whether the file deletion was successful.
  */
-bool FiosDelete(const char *name)
+bool FiosDelete(std::string_view name)
 {
 	return FioRemove(FiosMakeSavegameName(name));
 }
 
-typedef std::tuple<FiosType, std::string> FiosGetTypeAndNameProc(SaveLoadOperation fop, const std::string &filename, const std::string_view ext);
+typedef std::tuple<FiosType, std::string> FiosGetTypeAndNameProc(SaveLoadOperation fop, std::string_view filename, std::string_view ext);
 
 /**
  * Scanner to scan for a particular type of FIOS file.
@@ -339,7 +329,7 @@ static void FiosGetFileList(SaveLoadOperation fop, bool show_dirs, FiosGetTypeAn
 			fios.type = FIOS_TYPE_PARENT;
 			fios.mtime = 0;
 			fios.name = "..";
-			fios.title = GetString(STR_SAVELOAD_PARENT_DIRECTORY, "..");
+			fios.title = GetString(STR_SAVELOAD_PARENT_DIRECTORY, ".."sv);
 			sort_start = file_list.size();
 		}
 
@@ -352,7 +342,7 @@ static void FiosGetFileList(SaveLoadOperation fop, bool show_dirs, FiosGetTypeAn
 			FiosItem &fios = file_list.emplace_back();
 			fios.type = FIOS_TYPE_DIR;
 			fios.mtime = 0;
-			fios.name = FS2OTTD(dir_entry.path().filename());
+			fios.name = FS2OTTD(dir_entry.path().filename().native());
 			fios.title = GetString(STR_SAVELOAD_DIRECTORY, fios.name + PATHSEP);
 		}
 
@@ -387,9 +377,10 @@ static void FiosGetFileList(SaveLoadOperation fop, bool show_dirs, FiosGetTypeAn
  * @param subdir the sub directory to search in
  * @return The file title.
  */
-static std::string GetFileTitle(const std::string &file, Subdirectory subdir)
+static std::string GetFileTitle(std::string_view file, Subdirectory subdir)
 {
-	auto f = FioFOpenFile(file + ".title", "r", subdir);
+	std::string filename = fmt::format("{}.title", file);
+	auto f = FioFOpenFile(filename, "r", subdir);
 	if (!f.has_value()) return {};
 
 	char title[80];
@@ -408,7 +399,7 @@ static std::string GetFileTitle(const std::string &file, Subdirectory subdir)
  * @see FiosGetFileList
  * @see FiosGetSavegameList
  */
-std::tuple<FiosType, std::string> FiosGetSavegameListCallback(SaveLoadOperation fop, const std::string &file, const std::string_view ext)
+std::tuple<FiosType, std::string> FiosGetSavegameListCallback(SaveLoadOperation fop, std::string_view file, std::string_view ext)
 {
 	/* Show savegame files
 	 * .SAV OpenTTD saved game
@@ -457,7 +448,7 @@ void FiosGetSavegameList(SaveLoadOperation fop, bool show_dirs, FileList &file_l
  * @see FiosGetFileList
  * @see FiosGetScenarioList
  */
-std::tuple<FiosType, std::string> FiosGetScenarioListCallback(SaveLoadOperation fop, const std::string &file, const std::string_view ext)
+std::tuple<FiosType, std::string> FiosGetScenarioListCallback(SaveLoadOperation fop, std::string_view file, std::string_view ext)
 {
 	/* Show scenario files
 	 * .SCN OpenTTD style scenario file
@@ -498,7 +489,7 @@ void FiosGetScenarioList(SaveLoadOperation fop, bool show_dirs, FileList &file_l
 	FiosGetFileList(fop, show_dirs, &FiosGetScenarioListCallback, subdir, file_list);
 }
 
-std::tuple<FiosType, std::string> FiosGetHeightmapListCallback(SaveLoadOperation, const std::string &file, const std::string_view ext)
+std::tuple<FiosType, std::string> FiosGetHeightmapListCallback(SaveLoadOperation, std::string_view file, std::string_view ext)
 {
 	/* Show heightmap files
 	 * .PNG PNG Based heightmap files
@@ -563,7 +554,7 @@ void FiosGetHeightmapList(SaveLoadOperation fop, bool show_dirs, FileList &file_
  * @param file Name of the file to check.
  * @return a FIOS_TYPE_JSON type of the found file, FIOS_TYPE_INVALID if not a valid JSON file, and the title of the file (if any).
  */
-static std::tuple<FiosType, std::string> FiosGetTownDataListCallback(SaveLoadOperation fop, const std::string &file, const std::string_view ext)
+static std::tuple<FiosType, std::string> FiosGetTownDataListCallback(SaveLoadOperation fop, std::string_view file, std::string_view ext)
 {
 	if (fop == SLO_LOAD) {
 		if (StrEqualsIgnoreCase(ext, ".json")) {
@@ -597,13 +588,13 @@ void FiosGetTownDataList(SaveLoadOperation fop, bool show_dirs, FileList &file_l
  * Get the directory for screenshots.
  * @return path to screenshots
  */
-const char *FiosGetScreenshotDir()
+std::string_view FiosGetScreenshotDir()
 {
 	static std::optional<std::string> fios_screenshot_path;
 
 	if (!fios_screenshot_path) fios_screenshot_path = FioFindDirectory(SCREENSHOT_DIR);
 
-	return fios_screenshot_path->c_str();
+	return *fios_screenshot_path;
 }
 
 /** Basic data to distinguish a scenario. Used in the server list window */
@@ -678,20 +669,20 @@ static ScenarioScanner _scanner;
  * Find a given scenario based on its unique ID.
  * @param ci The content info to compare it to.
  * @param md5sum Whether to look at the md5sum or the id.
- * @return The filename of the file, else \c nullptr.
+ * @return The filename of the file, else \c std::nullopt.
  */
-const char *FindScenario(const ContentInfo *ci, bool md5sum)
+std::optional<std::string_view> FindScenario(const ContentInfo &ci, bool md5sum)
 {
 	_scanner.Scan(false);
 
 	for (ScenarioIdentifier &id : _scanner) {
-		if (md5sum ? (id.md5sum == ci->md5sum)
-		           : (id.scenid == ci->unique_id)) {
-			return id.filename.c_str();
+		if (md5sum ? (id.md5sum == ci.md5sum)
+		           : (id.scenid == ci.unique_id)) {
+			return id.filename;
 		}
 	}
 
-	return nullptr;
+	return std::nullopt;
 }
 
 /**
@@ -700,9 +691,9 @@ const char *FindScenario(const ContentInfo *ci, bool md5sum)
  * @param md5sum Whether to look at the md5sum or the id.
  * @return True iff we've got the scenario.
  */
-bool HasScenario(const ContentInfo *ci, bool md5sum)
+bool HasScenario(const ContentInfo &ci, bool md5sum)
 {
-	return (FindScenario(ci, md5sum) != nullptr);
+	return FindScenario(ci, md5sum).has_value();
 }
 
 /**
@@ -725,7 +716,7 @@ FiosNumberedSaveName::FiosNumberedSaveName(const std::string &prefix) : prefix(p
 	static std::string _prefix; ///< Static as the lambda needs access to it.
 
 	/* Callback for FiosFileScanner. */
-	static FiosGetTypeAndNameProc *proc = [](SaveLoadOperation, const std::string &file, const std::string_view ext) {
+	static FiosGetTypeAndNameProc *const proc = [](SaveLoadOperation, std::string_view file, std::string_view ext) {
 		if (StrEqualsIgnoreCase(ext, ".sav") && file.starts_with(_prefix)) return std::tuple(FIOS_TYPE_FILE, std::string{});
 		return std::tuple(FIOS_TYPE_INVALID, std::string{});
 	};
diff --git a/src/fios.h b/src/fios.h
index e65b97141b..b2ef40183b 100644
--- a/src/fios.h
+++ b/src/fios.h
@@ -87,7 +87,7 @@ struct FiosItem {
 class FileList : public std::vector<FiosItem> {
 public:
 	void BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperation fop, bool show_dirs);
-	const FiosItem *FindItem(const std::string_view file);
+	const FiosItem *FindItem(std::string_view file);
 };
 
 enum SortingBits : uint8_t {
@@ -112,16 +112,16 @@ bool FiosBrowseTo(const FiosItem *item);
 
 std::string FiosGetCurrentPath();
 std::optional<uint64_t> FiosGetDiskFreeSpace(const std::string &path);
-bool FiosDelete(const char *name);
-std::string FiosMakeHeightmapName(const char *name);
-std::string FiosMakeSavegameName(const char *name);
+bool FiosDelete(std::string_view name);
+std::string FiosMakeHeightmapName(std::string_view name);
+std::string FiosMakeSavegameName(std::string_view name);
 
-std::tuple<FiosType, std::string> FiosGetSavegameListCallback(SaveLoadOperation fop, const std::string &file, const std::string_view ext);
-std::tuple<FiosType, std::string> FiosGetScenarioListCallback(SaveLoadOperation fop, const std::string &file, const std::string_view ext);
-std::tuple<FiosType, std::string> FiosGetHeightmapListCallback(SaveLoadOperation fop, const std::string &file, const std::string_view ext);
+std::tuple<FiosType, std::string> FiosGetSavegameListCallback(SaveLoadOperation fop, std::string_view file, std::string_view ext);
+std::tuple<FiosType, std::string> FiosGetScenarioListCallback(SaveLoadOperation fop, std::string_view file, std::string_view ext);
+std::tuple<FiosType, std::string> FiosGetHeightmapListCallback(SaveLoadOperation fop, std::string_view file, std::string_view ext);
 
 void ScanScenarios();
-const char *FindScenario(const ContentInfo *ci, bool md5sum);
+std::optional<std::string_view> FindScenario(const ContentInfo &ci, bool md5sum);
 
 /**
  * A savegame name automatically numbered.
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index e3ff376497..339837dd4b 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -118,7 +118,7 @@ static constexpr NWidgetPart _nested_load_dialog_widgets[] = {
 			NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SL_MISSING_NEWGRFS), SetStringTip(STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON, STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SL_NEWGRF_INFO), SetStringTip(STR_INTRO_NEWGRF_SETTINGS), SetFill(1, 0), SetResize(1, 0),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SL_NEWGRF_INFO), SetStringTip(STR_MAPGEN_NEWGRF_SETTINGS, STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SL_LOAD_BUTTON), SetStringTip(STR_SAVELOAD_LOAD_BUTTON, STR_SAVELOAD_LOAD_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 				EndContainer(),
 				NWidget(WWT_RESIZEBOX, COLOUR_GREY),
@@ -309,10 +309,10 @@ static void SortSaveGameList(FileList &file_list)
 	 * Only sort savegames/scenarios, not directories
 	 */
 	for (const auto &item : file_list) {
-		switch (item.type) {
-			case FIOS_TYPE_DIR:    sort_start++; break;
-			case FIOS_TYPE_PARENT: sort_start++; break;
-			case FIOS_TYPE_DRIVE:  sort_end++;   break;
+		switch (item.type.detailed) {
+			case DFT_FIOS_DIR:    sort_start++; break;
+			case DFT_FIOS_PARENT: sort_start++; break;
+			case DFT_FIOS_DRIVE:  sort_end++;   break;
 			default: break;
 		}
 	}
@@ -514,7 +514,7 @@ public:
 					} else if (item == this->highlighted) {
 						GfxFillRect(br.left, tr.top, br.right, tr.bottom, PC_VERY_DARK_BLUE);
 					}
-					DrawString(tr, item->title, _fios_colours[GetDetailedFileType(item->type)]);
+					DrawString(tr, item->title, _fios_colours[item->type.detailed]);
 					tr = tr.Translate(0, this->resize.step_height);
 				}
 				break;
@@ -535,8 +535,8 @@ public:
 		Rect tr = r.Shrink(WidgetDimensions::scaled.frametext);
 		tr.top += HEADER_HEIGHT;
 
-		/* Create the nice grayish rectangle at the details top */
-		GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), PC_GREY);
+		/* Create the nice lighter rectangle at the details top */
+		GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), GetColourGradient(COLOUR_GREY, SHADE_LIGHTEST));
 		DrawString(hr.left, hr.right, hr.top, STR_SAVELOAD_DETAIL_CAPTION, TC_FROMSTRING, SA_HOR_CENTER);
 
 		if (this->selected == nullptr) return;
@@ -621,7 +621,7 @@ public:
 				break;
 
 			case WID_SL_DRIVES_DIRECTORIES_LIST:
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				size.height = resize.height * 10 + padding.height;
 				break;
 			case WID_SL_SORT_BYNAME:
@@ -719,7 +719,7 @@ public:
 						this->selected = file;
 						_load_check_data.Clear();
 
-						if (GetDetailedFileType(file->type) == DFT_GAME_FILE) {
+						if (file->type.detailed == DFT_GAME_FILE) {
 							/* Other detailed file types cannot be checked before. */
 							SaveOrLoad(file->name, SLO_CHECK, DFT_GAME_FILE, NO_DIRECTORY, false);
 						}
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 8e584ac427..fb1d757c62 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -129,7 +129,7 @@ void SetFont(FontSize fontsize, const std::string &font, uint size)
 		InitFontCache(true);
 	}
 
-	LoadStringWidthTable();
+	LoadStringWidthTable(fontsize == FS_MONO);
 	UpdateAllVirtCoords();
 	ReInitAllWindows(true);
 
diff --git a/src/fontcache/freetypefontcache.cpp b/src/fontcache/freetypefontcache.cpp
index 04ddc3e21f..80bb2cda6d 100644
--- a/src/fontcache/freetypefontcache.cpp
+++ b/src/fontcache/freetypefontcache.cpp
@@ -46,7 +46,7 @@ public:
 	const void *GetOSHandle() override { return &face; }
 };
 
-FT_Library _library = nullptr;
+FT_Library _ft_library = nullptr;
 
 
 /**
@@ -113,7 +113,7 @@ void FreeTypeFontCache::SetFontSize(int pixels)
 	}
 }
 
-static FT_Error LoadFont(FontSize fs, FT_Face face, const char *font_name, uint size)
+static FT_Error LoadFont(FontSize fs, FT_Face face, std::string_view font_name, uint size)
 {
 	Debug(fontcache, 2, "Requested '{}', using '{} {}'", font_name, face->family_name, face->style_name);
 
@@ -163,8 +163,8 @@ void LoadFreeTypeFont(FontSize fs)
 	std::string font = GetFontCacheFontName(fs);
 	if (font.empty()) return;
 
-	if (_library == nullptr) {
-		if (FT_Init_FreeType(&_library) != FT_Err_Ok) {
+	if (_ft_library == nullptr) {
+		if (FT_Init_FreeType(&_ft_library) != FT_Err_Ok) {
 			ShowInfo("Unable to initialize FreeType, using sprite fonts instead");
 			return;
 		}
@@ -172,29 +172,28 @@ void LoadFreeTypeFont(FontSize fs)
 		Debug(fontcache, 2, "Initialized");
 	}
 
-	const char *font_name = font.c_str();
 	FT_Face face = nullptr;
 
 	/* If font is an absolute path to a ttf, try loading that first. */
 	int32_t index = 0;
 	if (settings->os_handle != nullptr) index = *static_cast<const int32_t *>(settings->os_handle);
-	FT_Error error = FT_New_Face(_library, font_name, index, &face);
+	FT_Error error = FT_New_Face(_ft_library, font.c_str(), index, &face);
 
 	if (error != FT_Err_Ok) {
 		/* Check if font is a relative filename in one of our search-paths. */
-		std::string full_font = FioFindFullPath(BASE_DIR, font_name);
+		std::string full_font = FioFindFullPath(BASE_DIR, font);
 		if (!full_font.empty()) {
-			error = FT_New_Face(_library, full_font.c_str(), 0, &face);
+			error = FT_New_Face(_ft_library, full_font.c_str(), 0, &face);
 		}
 	}
 
 	/* Try loading based on font face name (OS-wide fonts). */
-	if (error != FT_Err_Ok) error = GetFontByFaceName(font_name, &face);
+	if (error != FT_Err_Ok) error = GetFontByFaceName(font, &face);
 
 	if (error == FT_Err_Ok) {
-		error = LoadFont(fs, face, font_name, GetFontCacheFontSize(fs));
+		error = LoadFont(fs, face, font, GetFontCacheFontSize(fs));
 		if (error != FT_Err_Ok) {
-			ShowInfo("Unable to use '{}' for {} font, FreeType reported error 0x{:X}, using sprite font instead", font_name, FontSizeToName(fs), error);
+			ShowInfo("Unable to use '{}' for {} font, FreeType reported error 0x{:X}, using sprite font instead", font, FontSizeToName(fs), error);
 		}
 	} else {
 		FT_Done_Face(face);
@@ -243,9 +242,8 @@ const Sprite *FreeTypeFontCache::InternalGetGlyph(GlyphID key, bool aa)
 
 	/* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
 	SpriteLoader::SpriteCollection spritecollection;
-	SpriteLoader::Sprite &sprite = spritecollection[ZOOM_LVL_MIN];
-	sprite.AllocateData(ZOOM_LVL_MIN, static_cast<size_t>(width) * height);
-	sprite.type = SpriteType::Font;
+	SpriteLoader::Sprite &sprite = spritecollection[ZoomLevel::Min];
+	sprite.AllocateData(ZoomLevel::Min, static_cast<size_t>(width) * height);
 	sprite.colours = SpriteComponent::Palette;
 	if (aa) sprite.colours.Set(SpriteComponent::Alpha);
 	sprite.width = width;
@@ -275,7 +273,7 @@ const Sprite *FreeTypeFontCache::InternalGetGlyph(GlyphID key, bool aa)
 	}
 
 	UniquePtrSpriteAllocator allocator;
-	BlitterFactory::GetCurrentBlitter()->Encode(spritecollection, allocator);
+	BlitterFactory::GetCurrentBlitter()->Encode(SpriteType::Font, spritecollection, allocator);
 
 	GlyphEntry new_glyph;
 	new_glyph.data = std::move(allocator.data);
@@ -303,13 +301,13 @@ GlyphID FreeTypeFontCache::MapCharToGlyph(char32_t key, bool allow_fallback)
  */
 void UninitFreeType()
 {
-	FT_Done_FreeType(_library);
-	_library = nullptr;
+	FT_Done_FreeType(_ft_library);
+	_ft_library = nullptr;
 }
 
 #if !defined(WITH_FONTCONFIG)
 
-FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) { return FT_Err_Cannot_Open_Resource; }
+FT_Error GetFontByFaceName(std::string_view font_name, FT_Face *face) { return FT_Err_Cannot_Open_Resource; }
 
 #endif /* !defined(WITH_FONTCONFIG) */
 
diff --git a/src/fontcache/truetypefontcache.h b/src/fontcache/truetypefontcache.h
index 7af13dc149..2ce94c5d35 100644
--- a/src/fontcache/truetypefontcache.h
+++ b/src/fontcache/truetypefontcache.h
@@ -29,7 +29,7 @@ protected:
 
 	/** Container for information about a glyph. */
 	struct GlyphEntry {
-		std::unique_ptr<uint8_t[]> data; ///< The loaded sprite.
+		std::unique_ptr<std::byte[]> data; ///< The loaded sprite.
 		uint8_t width = 0; ///< The width of the glyph.
 
 		Sprite *GetSprite() { return reinterpret_cast<Sprite *>(data.get()); }
diff --git a/src/fontdetection.h b/src/fontdetection.h
index c6083878b3..55a2ab7eba 100644
--- a/src/fontdetection.h
+++ b/src/fontdetection.h
@@ -23,7 +23,7 @@
  * @param face The face that has been found.
  * @return The error we encountered.
  */
-FT_Error GetFontByFaceName(const char *font_name, FT_Face *face);
+FT_Error GetFontByFaceName(std::string_view font_name, FT_Face *face);
 
 #endif /* WITH_FREETYPE */
 
diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp
index d69bf9941f..2667a473b6 100644
--- a/src/framerate_gui.cpp
+++ b/src/framerate_gui.cpp
@@ -7,6 +7,8 @@
 
 /** @file framerate_gui.cpp GUI for displaying framerate/game speed information. */
 
+#include "stdafx.h"
+
 #include "framerate_type.h"
 #include <chrono>
 #include "gfx_func.h"
@@ -24,6 +26,7 @@
 #include "game/game_instance.hpp"
 #include "timer/timer.h"
 #include "timer/timer_window.h"
+#include "zoom_func.h"
 
 #include "widgets/framerate_widget.h"
 
@@ -367,10 +370,10 @@ static const PerformanceElement DISPLAY_ORDER_PFE[PFE_MAX] = {
 	PFE_SOUND,
 };
 
-static const char * GetAIName(int ai_index)
+static std::string_view GetAIName(int ai_index)
 {
-	if (!Company::IsValidAiID(ai_index)) return "";
-	return Company::Get(ai_index)->ai_info->GetName().c_str();
+	if (!Company::IsValidAiID(ai_index)) return {};
+	return Company::Get(ai_index)->ai_info->GetName();
 }
 
 /** @hideinitializer */
@@ -454,7 +457,7 @@ struct FramerateWindow : Window {
 	}
 
 	/** Update the window on a regular interval. */
-	IntervalTimer<TimerWindow> update_interval = {std::chrono::milliseconds(100), [this](auto) {
+	const IntervalTimer<TimerWindow> update_interval = {std::chrono::milliseconds(100), [this](auto) {
 		this->UpdateData();
 		this->SetDirty();
 	}};
@@ -528,7 +531,7 @@ struct FramerateWindow : Window {
 				size.width = 0;
 				size.height = GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal + MIN_ELEMENTS * GetCharacterHeight(FS_NORMAL);
 				resize.width = 0;
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				for (PerformanceElement e : DISPLAY_ORDER_PFE) {
 					if (_pf_data[e].num_valid == 0) continue;
 					Dimension line_size;
@@ -550,7 +553,7 @@ struct FramerateWindow : Window {
 				size.width = std::max(size.width, item_size.width);
 				size.height += GetCharacterHeight(FS_NORMAL) * MIN_ELEMENTS + WidgetDimensions::scaled.vsep_normal;
 				resize.width = 0;
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				break;
 			}
 		}
@@ -699,7 +702,7 @@ static constexpr NWidgetPart _frametime_graph_window_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(NWID_VERTICAL), SetPadding(6),
+		NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.frametext),
 			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_FGW_GRAPH),
 		EndContainer(),
 	EndContainer(),
@@ -739,13 +742,13 @@ struct FrametimeGraphWindow : Window {
 			Dimension size_s_label = GetStringBoundingBox(GetString(STR_FRAMERATE_GRAPH_SECONDS, 100));
 
 			/* Size graph in height to fit at least 10 vertical labels with space between, or at least 100 pixels */
-			graph_size.height = std::max(100u, 10 * (size_ms_label.height + 1));
+			graph_size.height = std::max<uint>(ScaleGUITrad(100), 10 * (size_ms_label.height + WidgetDimensions::scaled.vsep_normal));
 			/* Always 2:1 graph area */
 			graph_size.width = 2 * graph_size.height;
 			size = graph_size;
 
-			size.width += size_ms_label.width + 2;
-			size.height += size_s_label.height + 2;
+			size.width += size_ms_label.width + WidgetDimensions::scaled.hsep_normal;
+			size.height += size_s_label.height + WidgetDimensions::scaled.vsep_normal;
 		}
 	}
 
@@ -835,7 +838,7 @@ struct FrametimeGraphWindow : Window {
 	}
 
 	/** Update the scaling on a regular interval. */
-	IntervalTimer<TimerWindow> update_interval = {std::chrono::milliseconds(500), [this](auto) {
+	const IntervalTimer<TimerWindow> update_interval = {std::chrono::milliseconds(500), [this](auto) {
 		this->UpdateScale();
 	}};
 
@@ -884,11 +887,11 @@ struct FrametimeGraphWindow : Window {
 				GfxDrawLine(x_zero, y, x_max, y, c_grid);
 				if (division % 2 == 0) {
 					if ((TimingMeasurement)this->vertical_scale > TIMESTAMP_PRECISION) {
-						DrawString(r.left, x_zero - 2, y - GetCharacterHeight(FS_SMALL),
+						DrawString(r.left, x_zero - WidgetDimensions::scaled.hsep_normal, y - GetCharacterHeight(FS_SMALL),
 							GetString(STR_FRAMERATE_GRAPH_SECONDS, this->vertical_scale * division / 10 / TIMESTAMP_PRECISION),
 							TC_GREY, SA_RIGHT | SA_FORCE, false, FS_SMALL);
 					} else {
-						DrawString(r.left, x_zero - 2, y - GetCharacterHeight(FS_SMALL),
+						DrawString(r.left, x_zero - WidgetDimensions::scaled.hsep_normal, y - GetCharacterHeight(FS_SMALL),
 							GetString(STR_FRAMERATE_GRAPH_MILLISECONDS, this->vertical_scale * division / 10 * 1000 / TIMESTAMP_PRECISION),
 							TC_GREY, SA_RIGHT | SA_FORCE, false, FS_SMALL);
 					}
@@ -899,7 +902,7 @@ struct FrametimeGraphWindow : Window {
 				int x = Scinterlate(x_zero, x_max, 0, (int)horz_divisions, (int)horz_divisions - (int)division);
 				GfxDrawLine(x, y_max, x, y_zero, c_grid);
 				if (division % 2 == 0) {
-					DrawString(x, x_max, y_zero + 2,
+					DrawString(x, x_max, y_zero + WidgetDimensions::scaled.vsep_normal,
 						GetString(STR_FRAMERATE_GRAPH_SECONDS, division * horz_div_scl / 2),
 						TC_GREY, SA_LEFT | SA_FORCE, false, FS_SMALL);
 				}
@@ -961,9 +964,9 @@ struct FrametimeGraphWindow : Window {
 				uint64_t value = peak_value * 1000 / TIMESTAMP_PRECISION;
 				int label_y = std::max(y_max, peak_point.y - GetCharacterHeight(FS_SMALL));
 				if (peak_point.x - x_zero > (int)this->graph_size.width / 2) {
-					DrawString(x_zero, peak_point.x - 2, label_y, GetString(STR_FRAMERATE_GRAPH_MILLISECONDS, value), tc_peak, SA_RIGHT | SA_FORCE, false, FS_SMALL);
+					DrawString(x_zero, peak_point.x - WidgetDimensions::scaled.hsep_normal, label_y, GetString(STR_FRAMERATE_GRAPH_MILLISECONDS, value), tc_peak, SA_RIGHT | SA_FORCE, false, FS_SMALL);
 				} else {
-					DrawString(peak_point.x + 2, x_max, label_y, GetString(STR_FRAMERATE_GRAPH_MILLISECONDS, value), tc_peak, SA_LEFT | SA_FORCE, false, FS_SMALL);
+					DrawString(peak_point.x + WidgetDimensions::scaled.hsep_normal, x_max, label_y, GetString(STR_FRAMERATE_GRAPH_MILLISECONDS, value), tc_peak, SA_LEFT | SA_FORCE, false, FS_SMALL);
 				}
 			}
 		}
diff --git a/src/framerate_type.h b/src/framerate_type.h
index 3697a545d9..8530fc9072 100644
--- a/src/framerate_type.h
+++ b/src/framerate_type.h
@@ -35,7 +35,6 @@
 #ifndef FRAMERATE_TYPE_H
 #define FRAMERATE_TYPE_H
 
-#include "stdafx.h"
 #include "core/enum_type.hpp"
 
 /**
diff --git a/src/game/game.hpp b/src/game/game.hpp
index d6e8ba65c5..e4931712a3 100644
--- a/src/game/game.hpp
+++ b/src/game/game.hpp
@@ -101,8 +101,8 @@ public:
 	static void ResetInstance();
 
 	/** Wrapper function for GameScanner::HasGame */
-	static bool HasGame(const struct ContentInfo *ci, bool md5sum);
-	static bool HasGameLibrary(const ContentInfo *ci, bool md5sum);
+	static bool HasGame(const ContentInfo &ci, bool md5sum);
+	static bool HasGameLibrary(const ContentInfo &ci, bool md5sum);
 	/** Gets the ScriptScanner instance that is used to find Game scripts */
 	static GameScannerInfo *GetScannerInfo();
 	/** Gets the ScriptScanner instance that is used to find Game Libraries */
diff --git a/src/game/game_core.cpp b/src/game/game_core.cpp
index dbd1b672c8..14ebcd9ab9 100644
--- a/src/game/game_core.cpp
+++ b/src/game/game_core.cpp
@@ -242,12 +242,12 @@
  * @param md5sum whether to check the MD5 checksum
  * @return true iff we have an Game (library) matching.
  */
-/* static */ bool Game::HasGame(const ContentInfo *ci, bool md5sum)
+/* static */ bool Game::HasGame(const ContentInfo &ci, bool md5sum)
 {
 	return Game::scanner_info->HasScript(ci, md5sum);
 }
 
-/* static */ bool Game::HasGameLibrary(const ContentInfo *ci, bool md5sum)
+/* static */ bool Game::HasGameLibrary(const ContentInfo &ci, bool md5sum)
 {
 	return Game::scanner_library->HasScript(ci, md5sum);
 }
diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp
index cc042246fa..ec47cd6eb5 100644
--- a/src/game/game_gui.cpp
+++ b/src/game/game_gui.cpp
@@ -18,6 +18,7 @@
 #include "../dropdown_func.h"
 #include "../timer/timer.h"
 #include "../timer/timer_window.h"
+#include "../core/string_consumer.hpp"
 
 #include "game.hpp"
 #include "game_gui.hpp"
@@ -122,12 +123,12 @@ struct GSConfigWindow : public Window {
 	 */
 	void RebuildVisibleSettings()
 	{
-		visible_settings.clear();
+		this->visible_settings.clear();
 
 		for (const auto &item : *this->gs_config->GetConfigList()) {
 			bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer);
 			if (no_hide || _settings_client.gui.ai_developer_tools) {
-				visible_settings.push_back(&item);
+				this->visible_settings.push_back(&item);
 			}
 		}
 
@@ -140,7 +141,7 @@ struct GSConfigWindow : public Window {
 			case WID_GSC_SETTINGS:
 				this->line_height = std::max(SETTING_BUTTON_HEIGHT, GetCharacterHeight(FS_NORMAL)) + padding.height;
 				resize.width = 1;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = 5 * this->line_height;
 				break;
 
@@ -179,7 +180,7 @@ struct GSConfigWindow : public Window {
 				break;
 			}
 			case WID_GSC_SETTINGS: {
-				Rect ir = r.Shrink(WidgetDimensions::scaled.framerect);
+				Rect ir = r.Shrink(WidgetDimensions::scaled.frametext, RectPadding::zero);
 				bool rtl = _current_text_dir == TD_RTL;
 				Rect br = ir.WithWidth(SETTING_BUTTON_WIDTH, rtl);
 				Rect tr = ir.Indent(SETTING_BUTTON_WIDTH + WidgetDimensions::scaled.hsep_wide, rtl);
@@ -195,11 +196,11 @@ struct GSConfigWindow : public Window {
 					bool editable = this->IsEditableItem(config_item);
 
 					if (config_item.flags.Test(ScriptConfigFlag::Boolean)) {
-						DrawBoolButton(br.left, y + button_y_offset, current_value != 0, editable);
+						DrawBoolButton(br.left, y + button_y_offset, COLOUR_YELLOW, COLOUR_MAUVE, current_value != 0, editable);
 					} else {
 						int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it));
 						if (config_item.complete_labels) {
-							DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && clicked_dropdown, editable);
+							DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && this->clicked_dropdown, editable);
 						} else {
 							DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value);
 						}
@@ -227,19 +228,19 @@ struct GSConfigWindow : public Window {
 		if (widget >= WID_GSC_TEXTFILE && widget < WID_GSC_TEXTFILE + TFT_CONTENT_END) {
 			if (GameConfig::GetConfig() == nullptr) return;
 
-			ShowScriptTextfileWindow((TextfileType)(widget - WID_GSC_TEXTFILE), (CompanyID)OWNER_DEITY);
+			ShowScriptTextfileWindow(this, static_cast<TextfileType>(widget - WID_GSC_TEXTFILE), OWNER_DEITY);
 			return;
 		}
 
 		switch (widget) {
 			case WID_GSC_GSLIST: {
 				this->InvalidateData();
-				if (click_count > 1 && _game_mode != GM_NORMAL) ShowScriptListWindow((CompanyID)OWNER_DEITY, _ctrl_pressed);
+				if (click_count > 1 && _game_mode != GM_NORMAL) ShowScriptListWindow(OWNER_DEITY, _ctrl_pressed);
 				break;
 			}
 
 			case WID_GSC_CHANGE:  // choose other Game Script
-				ShowScriptListWindow((CompanyID)OWNER_DEITY, _ctrl_pressed);
+				ShowScriptListWindow(OWNER_DEITY, _ctrl_pressed);
 				break;
 
 			case WID_GSC_CONTENT_DOWNLOAD:
@@ -267,7 +268,7 @@ struct GSConfigWindow : public Window {
 
 				bool bool_item = config_item.flags.Test(ScriptConfigFlag::Boolean);
 
-				Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix, RectPadding::zero);
+				Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.frametext, RectPadding::zero);
 				int x = pt.x - r.left;
 				if (_current_text_dir == TD_RTL) x = r.Width() - 1 - x;
 
@@ -346,19 +347,20 @@ struct GSConfigWindow : public Window {
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
-		if (!str.has_value() || str->empty()) return;
-		int32_t value = atoi(str->c_str());
-		SetValue(value);
+		if (!str.has_value()) return;
+		auto value = ParseInteger<int32_t>(*str, 10, true);
+		if (!value.has_value()) return;
+		this->SetValue(*value);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_GSC_SETTING_DROPDOWN) return;
 		assert(this->clicked_dropdown);
-		SetValue(index);
+		this->SetValue(index);
 	}
 
-	void OnDropdownClose(Point, WidgetID widget, int, bool) override
+	void OnDropdownClose(Point, WidgetID widget, int, int, bool) override
 	{
 		if (widget != WID_GSC_SETTING_DROPDOWN) return;
 		/* We cannot raise the dropdown button just yet. OnClick needs some hint, whether
@@ -395,7 +397,7 @@ struct GSConfigWindow : public Window {
 		const GameConfig *config = GameConfig::GetConfig();
 		this->SetWidgetDisabledState(WID_GSC_OPEN_URL, config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty());
 		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
-			this->SetWidgetDisabledState(WID_GSC_TEXTFILE + tft, !config->GetTextfile(tft, (CompanyID)OWNER_DEITY).has_value());
+			this->SetWidgetDisabledState(WID_GSC_TEXTFILE + tft, !config->GetTextfile(tft, OWNER_DEITY).has_value());
 		}
 		this->RebuildVisibleSettings();
 		this->CloseChildWindows(WC_DROPDOWN_MENU);
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index 1045f01d82..6d128ac9a1 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -25,14 +25,14 @@ static bool CheckAPIVersion(const std::string &api_version)
 	return std::ranges::find(GameInfo::ApiVersions, api_version) != std::end(GameInfo::ApiVersions);
 }
 
-template <> SQInteger PushClassName<GameInfo, ScriptType::GS>(HSQUIRRELVM vm) { sq_pushstring(vm, "GSInfo", -1); return 1; }
+template <> SQInteger PushClassName<GameInfo, ScriptType::GS>(HSQUIRRELVM vm) { sq_pushstring(vm, "GSInfo"); return 1; }
 
-/* static */ void GameInfo::RegisterAPI(Squirrel *engine)
+/* static */ void GameInfo::RegisterAPI(Squirrel &engine)
 {
 	/* Create the GSInfo class, and add the RegisterGS function */
 	DefSQClass<GameInfo, ScriptType::GS> SQGSInfo("GSInfo");
 	SQGSInfo.PreRegister(engine);
-	SQGSInfo.AddConstructor<void (GameInfo::*)(), 1>(engine, "x");
+	SQGSInfo.AddConstructor<void (GameInfo::*)()>(engine, "x");
 	SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddSetting, "AddSetting");
 	SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddLabels, "AddLabels");
 	SQGSInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");
@@ -42,7 +42,7 @@ template <> SQInteger PushClassName<GameInfo, ScriptType::GS>(HSQUIRRELVM vm) {
 	SQGSInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::Developer}.base(), "CONFIG_DEVELOPER");
 
 	SQGSInfo.PostRegister(engine);
-	engine->AddMethod("RegisterGS", &GameInfo::Constructor, 2, "tx");
+	engine.AddMethod("RegisterGS", &GameInfo::Constructor, "tx");
 }
 
 /* static */ SQInteger GameInfo::Constructor(HSQUIRRELVM vm)
@@ -52,11 +52,12 @@ template <> SQInteger PushClassName<GameInfo, ScriptType::GS>(HSQUIRRELVM vm) {
 	if (SQ_FAILED(sq_getinstanceup(vm, 2, &instance, nullptr)) || instance == nullptr) return sq_throwerror(vm, "Pass an instance of a child class of GameInfo to RegisterGame");
 	GameInfo *info = (GameInfo *)instance;
 
-	SQInteger res = ScriptInfo::Constructor(vm, info);
+	SQInteger res = ScriptInfo::Constructor(vm, *info);
 	if (res != 0) return res;
 
 	if (info->engine->MethodExists(info->SQ_instance, "MinVersionToLoad")) {
 		if (!info->engine->CallIntegerMethod(info->SQ_instance, "MinVersionToLoad", &info->min_loadable_version, MAX_GET_OPS)) return SQ_ERROR;
+		if (info->min_loadable_version < 0) return SQ_ERROR;
 	} else {
 		info->min_loadable_version = info->GetVersion();
 	}
@@ -94,12 +95,12 @@ bool GameInfo::CanLoadFromVersion(int version) const
 }
 
 
-/* static */ void GameLibrary::RegisterAPI(Squirrel *engine)
+/* static */ void GameLibrary::RegisterAPI(Squirrel &engine)
 {
 	/* Create the GameLibrary class, and add the RegisterLibrary function */
-	engine->AddClassBegin("GSLibrary");
-	engine->AddClassEnd();
-	engine->AddMethod("RegisterLibrary", &GameLibrary::Constructor, 2, "tx");
+	engine.AddClassBegin("GSLibrary");
+	engine.AddClassEnd();
+	engine.AddMethod("RegisterLibrary", &GameLibrary::Constructor, "tx");
 }
 
 /* static */ SQInteger GameLibrary::Constructor(HSQUIRRELVM vm)
@@ -107,7 +108,7 @@ bool GameInfo::CanLoadFromVersion(int version) const
 	/* Create a new library */
 	GameLibrary *library = new GameLibrary();
 
-	SQInteger res = ScriptInfo::Constructor(vm, library);
+	SQInteger res = ScriptInfo::Constructor(vm, *library);
 	if (res != 0) {
 		delete library;
 		return res;
diff --git a/src/game/game_info.hpp b/src/game/game_info.hpp
index 8f429a62db..e2c801e18e 100644
--- a/src/game/game_info.hpp
+++ b/src/game/game_info.hpp
@@ -23,7 +23,7 @@ public:
 	/**
 	 * Register the functions of this class.
 	 */
-	static void RegisterAPI(Squirrel *engine);
+	static void RegisterAPI(Squirrel &engine);
 
 	/**
 	 * Create an Game, using this GameInfo as start-template.
@@ -56,7 +56,7 @@ public:
 	/**
 	 * Register the functions of this class.
 	 */
-	static void RegisterAPI(Squirrel *engine);
+	static void RegisterAPI(Squirrel &engine);
 
 	/**
 	 * Create an GSLibrary, using this GSInfo as start-template.
diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
index cb46650f57..2a619a0e98 100644
--- a/src/game/game_instance.cpp
+++ b/src/game/game_instance.cpp
@@ -38,7 +38,7 @@ void GameInstance::Initialize(GameInfo *info)
 	this->api_version = info->GetAPIVersion();
 
 	/* Register the GameController */
-	SQGSController_Register(this->engine);
+	SQGSController_Register(*this->engine);
 
 	ScriptInstance::Initialize(info->GetMainScript(), info->GetInstanceName(), OWNER_DEITY);
 }
@@ -48,11 +48,11 @@ void GameInstance::RegisterAPI()
 	ScriptInstance::RegisterAPI();
 
 	/* Register all classes */
-	SQGS_RegisterAll(this->engine);
-
-	RegisterGameTranslation(this->engine);
+	SQGS_RegisterAll(*this->engine);
 
 	if (!this->LoadCompatibilityScripts(GAME_DIR, GameInfo::ApiVersions)) this->Died();
+
+	if (this->IsAlive()) RegisterGameTranslation(*this->engine);
 }
 
 int GameInstance::GetSetting(const std::string &name)
diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp
index 2707e3eade..e550772883 100644
--- a/src/game/game_scanner.cpp
+++ b/src/game/game_scanner.cpp
@@ -23,12 +23,12 @@ void GameScannerInfo::Initialize()
 	ScriptScanner::Initialize("GSScanner");
 }
 
-std::string GameScannerInfo::GetScriptName(ScriptInfo *info)
+std::string GameScannerInfo::GetScriptName(ScriptInfo &info)
 {
-	return info->GetName();
+	return info.GetName();
 }
 
-void GameScannerInfo::RegisterAPI(class Squirrel *engine)
+void GameScannerInfo::RegisterAPI(class Squirrel &engine)
 {
 	GameInfo::RegisterAPI(engine);
 }
@@ -75,13 +75,13 @@ void GameScannerLibrary::Initialize()
 	ScriptScanner::Initialize("GSScanner");
 }
 
-std::string GameScannerLibrary::GetScriptName(ScriptInfo *info)
+std::string GameScannerLibrary::GetScriptName(ScriptInfo &info)
 {
-	GameLibrary *library = static_cast<GameLibrary *>(info);
-	return fmt::format("{}.{}", library->GetCategory(), library->GetInstanceName());
+	GameLibrary &library = static_cast<GameLibrary &>(info);
+	return fmt::format("{}.{}", library.GetCategory(), library.GetInstanceName());
 }
 
-void GameScannerLibrary::RegisterAPI(class Squirrel *engine)
+void GameScannerLibrary::RegisterAPI(class Squirrel &engine)
 {
 	GameLibrary::RegisterAPI(engine);
 }
diff --git a/src/game/game_scanner.hpp b/src/game/game_scanner.hpp
index 027649b1ad..88696fc584 100644
--- a/src/game/game_scanner.hpp
+++ b/src/game/game_scanner.hpp
@@ -26,11 +26,11 @@ public:
 	class GameInfo *FindInfo(const std::string &name, int version, bool force_exact_match);
 
 protected:
-	std::string GetScriptName(ScriptInfo *info) override;
-	const char *GetFileName() const override { return PATHSEP "info.nut"; }
+	std::string GetScriptName(ScriptInfo &info) override;
+	std::string_view GetFileName() const override { return PATHSEP "info.nut"; }
 	Subdirectory GetDirectory() const override { return GAME_DIR; }
-	const char *GetScannerName() const override { return "Game Scripts"; }
-	void RegisterAPI(class Squirrel *engine) override;
+	std::string_view GetScannerName() const override { return "Game Scripts"; }
+	void RegisterAPI(class Squirrel &engine) override;
 };
 
 
@@ -47,11 +47,11 @@ public:
 	class GameLibrary *FindLibrary(const std::string &library, int version);
 
 protected:
-	std::string GetScriptName(ScriptInfo *info) override;
-	const char *GetFileName() const override { return PATHSEP "library.nut"; }
+	std::string GetScriptName(ScriptInfo &info) override;
+	std::string_view GetFileName() const override { return PATHSEP "library.nut"; }
 	Subdirectory GetDirectory() const override { return GAME_LIBRARY_DIR; }
-	const char *GetScannerName() const override { return "GS Libraries"; }
-	void RegisterAPI(class Squirrel *engine) override;
+	std::string_view GetScannerName() const override { return "GS Libraries"; }
+	void RegisterAPI(class Squirrel &engine) override;
 };
 
 #endif /* GAME_SCANNER_HPP */
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index 15c4fd7bdf..27e4314f5a 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -25,19 +25,19 @@
 
 void CDECL StrgenWarningI(const std::string &msg)
 {
-	Debug(script, 0, "{}:{}: warning: {}", _file, _cur_line, msg);
-	_warnings++;
+	Debug(script, 0, "{}:{}: warning: {}", _strgen.file, _strgen.cur_line, msg);
+	_strgen.warnings++;
 }
 
 void CDECL StrgenErrorI(const std::string &msg)
 {
-	Debug(script, 0, "{}:{}: error: {}", _file, _cur_line, msg);
-	_errors++;
+	Debug(script, 0, "{}:{}: error: {}", _strgen.file, _strgen.cur_line, msg);
+	_strgen.errors++;
 }
 
 void CDECL StrgenFatalI(const std::string &msg)
 {
-	Debug(script, 0, "{}:{}: FATAL: {}", _file, _cur_line, msg);
+	Debug(script, 0, "{}:{}: FATAL: {}", _strgen.file, _strgen.cur_line, msg);
 	throw std::exception();
 }
 
@@ -63,19 +63,13 @@ LanguageStrings ReadRawLanguageStrings(const std::string &file)
 
 	char buffer[2048];
 	while (to_read != 0 && fgets(buffer, sizeof(buffer), *fh) != nullptr) {
-		size_t len = strlen(buffer);
+		std::string_view view{buffer};
+		ret.lines.emplace_back(StrTrimView(view, StringConsumer::WHITESPACE_OR_NEWLINE));
 
-		/* Remove trailing spaces/newlines from the string. */
-		size_t i = len;
-		while (i > 0 && (buffer[i - 1] == '\r' || buffer[i - 1] == '\n' || buffer[i - 1] == ' ')) i--;
-		buffer[i] = '\0';
-
-		ret.lines.emplace_back(buffer, i);
-
-		if (len > to_read) {
+		if (view.size() > to_read) {
 			to_read = 0;
 		} else {
-			to_read -= len;
+			to_read -= view.size();
 		}
 	}
 
@@ -96,7 +90,7 @@ struct StringListReader : StringReader {
 	 * @param translation Are we reading a translation?
 	 */
 	StringListReader(StringData &data, const LanguageStrings &strings, bool master, bool translation) :
-			StringReader(data, strings.language.c_str(), master, translation), p(strings.lines.begin()), end(strings.lines.end())
+			StringReader(data, strings.language, master, translation), p(strings.lines.begin()), end(strings.lines.end())
 	{
 	}
 
@@ -134,9 +128,9 @@ struct TranslationWriter : LanguageWriter {
 		/* We don't write the length. */
 	}
 
-	void Write(const char *buffer, size_t length) override
+	void Write(std::string_view buffer) override
 	{
-		this->strings.emplace_back(buffer, length);
+		this->strings.emplace_back(buffer);
 	}
 };
 
@@ -267,7 +261,7 @@ static void ExtractStringParams(const StringData &data, StringParamsList &params
 
 		if (ls != nullptr) {
 			StringParams &param = params.emplace_back();
-			ParsedCommandStruct pcs = ExtractCommandString(ls->english.c_str(), false);
+			ParsedCommandStruct pcs = ExtractCommandString(ls->english, false);
 
 			for (auto it = pcs.consuming_commands.begin(); it != pcs.consuming_commands.end(); it++) {
 				if (*it == nullptr) {
@@ -289,7 +283,7 @@ void GameStrings::Compile()
 	StringData data(32);
 	StringListReader master_reader(data, this->raw_strings[0], true, false);
 	master_reader.ParseFile();
-	if (_errors != 0) throw std::exception();
+	if (_strgen.errors != 0) throw std::exception();
 
 	this->version = data.Version();
 
@@ -302,7 +296,7 @@ void GameStrings::Compile()
 		data.FreeTranslation();
 		StringListReader translation_reader(data, p, false, p.language != "english");
 		translation_reader.ParseFile();
-		if (_errors != 0) throw std::exception();
+		if (_strgen.errors != 0) throw std::exception();
 
 		auto &strings = this->compiled_strings.emplace_back(p.language);
 		TranslationWriter writer(strings.lines);
@@ -311,7 +305,7 @@ void GameStrings::Compile()
 }
 
 /** The currently loaded game strings. */
-std::shared_ptr<GameStrings> _current_data = nullptr;
+std::shared_ptr<GameStrings> _current_gamestrings_data = nullptr;
 
 /**
  * Get the string pointer of a particular game string.
@@ -320,8 +314,8 @@ std::shared_ptr<GameStrings> _current_data = nullptr;
  */
 std::string_view GetGameStringPtr(StringIndexInTab id)
 {
-	if (_current_data == nullptr || _current_data->cur_language == nullptr || id.base() >= _current_data->cur_language->lines.size()) return GetStringPtr(STR_UNDEFINED);
-	return _current_data->cur_language->lines[id];
+	if (_current_gamestrings_data == nullptr || _current_gamestrings_data->cur_language == nullptr || id.base() >= _current_gamestrings_data->cur_language->lines.size()) return GetStringPtr(STR_UNDEFINED);
+	return _current_gamestrings_data->cur_language->lines[id];
 }
 
 /**
@@ -334,8 +328,8 @@ const StringParams &GetGameStringParams(StringIndexInTab id)
 	/* An empty result for STR_UNDEFINED. */
 	static StringParams empty;
 
-	if (id.base() >= _current_data->string_params.size()) return empty;
-	return _current_data->string_params[id];
+	if (id.base() >= _current_gamestrings_data->string_params.size()) return empty;
+	return _current_gamestrings_data->string_params[id];
 }
 
 /**
@@ -348,27 +342,27 @@ const std::string &GetGameStringName(StringIndexInTab id)
 	/* The name for STR_UNDEFINED. */
 	static const std::string undefined = "STR_UNDEFINED";
 
-	if (id.base() >= _current_data->string_names.size()) return undefined;
-	return _current_data->string_names[id];
+	if (id.base() >= _current_gamestrings_data->string_names.size()) return undefined;
+	return _current_gamestrings_data->string_names[id];
 }
 
 /**
  * Register the current translation to the Squirrel engine.
  * @param engine The engine to update/
  */
-void RegisterGameTranslation(Squirrel *engine)
+void RegisterGameTranslation(Squirrel &engine)
 {
-	_current_data = LoadTranslations();
-	if (_current_data == nullptr) return;
+	_current_gamestrings_data = LoadTranslations();
+	if (_current_gamestrings_data == nullptr) return;
 
-	HSQUIRRELVM vm = engine->GetVM();
+	HSQUIRRELVM vm = engine.GetVM();
 	sq_pushroottable(vm);
-	sq_pushstring(vm, "GSText", -1);
+	sq_pushstring(vm, "GSText");
 	if (SQ_FAILED(sq_get(vm, -2))) return;
 
 	int idx = 0;
-	for (const auto &p : _current_data->string_names) {
-		sq_pushstring(vm, p, -1);
+	for (const auto &p : _current_gamestrings_data->string_names) {
+		sq_pushstring(vm, p);
 		sq_pushinteger(vm, idx);
 		sq_rawset(vm, -3);
 		idx++;
@@ -376,6 +370,8 @@ void RegisterGameTranslation(Squirrel *engine)
 
 	sq_pop(vm, 2);
 
+	ScriptText::SetPadParameterCount(vm);
+
 	ReconsiderGameScriptLanguage();
 }
 
@@ -384,15 +380,15 @@ void RegisterGameTranslation(Squirrel *engine)
  */
 void ReconsiderGameScriptLanguage()
 {
-	if (_current_data == nullptr) return;
+	if (_current_gamestrings_data == nullptr) return;
 
-	std::string language = FS2OTTD(_current_language->file.stem());
-	for (auto &p : _current_data->compiled_strings) {
+	std::string language = FS2OTTD(_current_language->file.stem().native());
+	for (auto &p : _current_gamestrings_data->compiled_strings) {
 		if (p.language == language) {
-			_current_data->cur_language = &p;
+			_current_gamestrings_data->cur_language = &p;
 			return;
 		}
 	}
 
-	_current_data->cur_language = &_current_data->compiled_strings[0];
+	_current_gamestrings_data->cur_language = &_current_gamestrings_data->compiled_strings[0];
 }
diff --git a/src/game/game_text.hpp b/src/game/game_text.hpp
index 8c651e3093..76a08a2db3 100644
--- a/src/game/game_text.hpp
+++ b/src/game/game_text.hpp
@@ -10,6 +10,7 @@
 #ifndef GAME_TEXT_HPP
 #define GAME_TEXT_HPP
 
+#include "../string_type.h"
 #include "../strings_type.h"
 
 struct StringParam {
@@ -32,13 +33,13 @@ using StringParamsList = std::vector<StringParams>;
 std::string_view GetGameStringPtr(StringIndexInTab id);
 const StringParams &GetGameStringParams(StringIndexInTab id);
 const std::string &GetGameStringName(StringIndexInTab id);
-void RegisterGameTranslation(class Squirrel *engine);
+void RegisterGameTranslation(class Squirrel &engine);
 void ReconsiderGameScriptLanguage();
 
 /** Container for the raw (unencoded) language strings of a language. */
 struct LanguageStrings {
 	std::string language; ///< Name of the language (base filename). Empty string if invalid.
-	ReferenceThroughBaseContainer<StringList> lines; ///< The lines of the file to pass into the parser/encoder.
+	TypedIndexContainer<StringList, StringIndexInTab> lines; ///< The lines of the file to pass into the parser/encoder.
 
 	LanguageStrings() {}
 	LanguageStrings(const std::string &lang) : language(lang) {}
@@ -55,8 +56,8 @@ struct GameStrings {
 
 	std::vector<LanguageStrings> raw_strings;      ///< The raw strings per language, first must be English/the master language!.
 	std::vector<LanguageStrings> compiled_strings; ///< The compiled strings per language, first must be English/the master language!.
-	ReferenceThroughBaseContainer<StringList> string_names; ///< The names of the compiled strings.
-	ReferenceThroughBaseContainer<StringParamsList> string_params; ///< The parameters for the strings.
+	TypedIndexContainer<StringList, StringIndexInTab> string_names; ///< The names of the compiled strings.
+	TypedIndexContainer<StringParamsList, StringIndexInTab> string_params; ///< The parameters for the strings.
 
 	void Compile();
 
diff --git a/src/gamelog.cpp b/src/gamelog.cpp
index c99854a4af..c00f09d121 100644
--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -128,7 +128,7 @@ static void AddGrfInfo(std::back_insert_iterator<std::string> &output_iterator,
 
 
 /** Text messages for various logged actions */
-static const char * const la_text[] = {
+static const std::string_view la_text[] = {
 	"new game started",
 	"game loaded",
 	"GRF config changed",
diff --git a/src/genworld.cpp b/src/genworld.cpp
index a8ef616a47..fe7a8b86d5 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -351,37 +351,6 @@ void GenerateWorld(GenWorldMode mode, uint size_x, uint size_y, bool reset_setti
 	_GenerateWorld();
 }
 
-/** Town data imported from JSON files and used to place towns. */
-struct ExternalTownData {
-	TownID town_id; ///< The TownID of the town in OpenTTD. Not imported, but set during the founding proceess and stored here for convenience.
-	std::string name; ///< The name of the town.
-	uint population; ///< The target population of the town when created in OpenTTD. If input is blank, defaults to 0.
-	bool is_city; ///< Should it be created as a city in OpenTTD? If input is blank, defaults to false.
-	float x_proportion; ///< The X coordinate of the town, as a proportion 0..1 of the maximum X coordinate.
-	float y_proportion; ///< The Y coordinate of the town, as a proportion 0..1 of the maximum Y coordinate.
-};
-
-/**
- * Helper for CircularTileSearch to found a town on or near a given tile.
- * @param tile The tile to try founding the town upon.
- * @param user_data The ExternalTownData to attempt to found.
- * @return True if the town was founded successfully.
- */
-static bool TryFoundTownNearby(TileIndex tile, void *user_data)
-{
-	ExternalTownData &town = *static_cast<ExternalTownData *>(user_data);
-	std::tuple<CommandCost, Money, TownID> result = Command<CMD_FOUND_TOWN>::Do(DoCommandFlag::Execute, tile, TSZ_SMALL, town.is_city, _settings_game.economy.town_layout, false, 0, town.name);
-
-	TownID id = std::get<TownID>(result);
-
-	/* Check if the command failed. */
-	if (id == TownID::Invalid()) return false;
-
-	/* The command succeeded, send the ID back through user_data. */
-	town.town_id = id;
-	return true;
-}
-
 /**
  * Load town data from _file_to_saveload, place towns at the appropriate locations, and expand them to their target populations.
  */
@@ -426,7 +395,11 @@ void LoadTownData()
 
 	/* Iterate through towns and attempt to found them. */
 	for (auto &feature : town_data) {
-		ExternalTownData town;
+		std::string name; // The name of the town.
+		uint population; // The target population of the town when created in OpenTTD. If input is blank, defaults to 0.
+		bool is_city; // Should it be created as a city in OpenTTD? If input is blank, defaults to false.
+		float x_proportion; // The X coordinate of the town, as a proportion 0..1 of the maximum X coordinate.
+		float y_proportion; // The Y coordinate of the town, as a proportion 0..1 of the maximum Y coordinate.
 
 		/* Ensure JSON is formatted properly. */
 		if (!feature.is_object()) {
@@ -446,56 +419,63 @@ void LoadTownData()
 				!feature.contains("city") || !feature.at("city").is_boolean() ||
 				!feature.contains("x") || !feature.at("x").is_number() ||
 				!feature.contains("y") || !feature.at("y").is_number()) {
-			feature.at("name").get_to(town.name);
+			feature.at("name").get_to(name);
 			ShowErrorMessage(GetEncodedString(STR_TOWN_DATA_ERROR_LOAD_FAILED),
-				GetEncodedString(STR_TOWN_DATA_ERROR_TOWN_FORMATTED_INCORRECTLY, town.name), WL_ERROR);
+				GetEncodedString(STR_TOWN_DATA_ERROR_TOWN_FORMATTED_INCORRECTLY, name), WL_ERROR);
 			return;
 		}
 
 		/* Set town properties. */
-		feature.at("name").get_to(town.name);
-		feature.at("population").get_to(town.population);
-		feature.at("city").get_to(town.is_city);
+		feature.at("name").get_to(name);
+		feature.at("population").get_to(population);
+		feature.at("city").get_to(is_city);
 
 		/* Set town coordinates. */
-		feature.at("x").get_to(town.x_proportion);
-		feature.at("y").get_to(town.y_proportion);
+		feature.at("x").get_to(x_proportion);
+		feature.at("y").get_to(y_proportion);
 
 		/* Check for improper coordinates and warn the player. */
-		if (town.x_proportion <= 0.0f || town.y_proportion <= 0.0f || town.x_proportion >= 1.0f || town.y_proportion >= 1.0f) {
+		if (x_proportion <= 0.0f || y_proportion <= 0.0f || x_proportion >= 1.0f || y_proportion >= 1.0f) {
 			ShowErrorMessage(GetEncodedString(STR_TOWN_DATA_ERROR_LOAD_FAILED),
-				GetEncodedString(STR_TOWN_DATA_ERROR_BAD_COORDINATE, town.name), WL_ERROR);
+				GetEncodedString(STR_TOWN_DATA_ERROR_BAD_COORDINATE, name), WL_ERROR);
 			return;
 		}
 
 		/* Find the target tile for the town. */
-		TileIndex tile;
+		TileIndex target_tile;
 		switch (_settings_game.game_creation.heightmap_rotation) {
 			case HM_CLOCKWISE:
 				/* Tile coordinates align with what we expect. */
-				tile = TileXY(town.x_proportion * Map::MaxX(), town.y_proportion * Map::MaxY());
+				target_tile = TileXY(x_proportion * Map::MaxX(), y_proportion * Map::MaxY());
 				break;
 			case HM_COUNTER_CLOCKWISE:
 				/* Tile coordinates are rotated and must be adjusted. */
-				tile = TileXY((1 - town.y_proportion * Map::MaxX()), town.x_proportion * Map::MaxY());
+				target_tile = TileXY((1 - y_proportion * Map::MaxX()), x_proportion * Map::MaxY());
 				break;
 			default: NOT_REACHED();
 		}
 
+		TownID town_id; // The TownID of the town in OpenTTD. Not imported, but set during the founding proceess and stored here for convenience.
 		/* Try founding on the target tile, and if that doesn't work, find the nearest suitable tile up to 16 tiles away.
 		 * The target might be on water, blocked somehow, or on a steep slope that can't be terraformed by the founding command. */
-		TileIndex search_tile = tile;
-		bool success = CircularTileSearch(&search_tile, 16, 0, 0, TryFoundTownNearby, &town);
+		for (auto tile : SpiralTileSequence(target_tile, 16, 0, 0)) {
+			std::tuple<CommandCost, Money, TownID> result = Command<CMD_FOUND_TOWN>::Do(DoCommandFlag::Execute, tile, TSZ_SMALL, is_city, _settings_game.economy.town_layout, false, 0, name);
+
+			town_id = std::get<TownID>(result);
+
+			/* Check if the command succeeded. */
+			if (town_id != TownID::Invalid()) break;
+		}
 
 		/* If we still fail to found the town, we'll create a sign at the intended location and tell the player how many towns we failed to create in an error message.
 		 * This allows the player to diagnose a heightmap misalignment, if towns end up in the sea, or place towns manually, if in rough terrain. */
-		if (!success) {
-			Command<CMD_PLACE_SIGN>::Post(tile, town.name);
+		if (town_id == TownID::Invalid()) {
+			Command<CMD_PLACE_SIGN>::Post(target_tile, name);
 			failed_towns++;
 			continue;
 		}
 
-		towns.emplace_back(std::make_pair(Town::Get(town.town_id), town.population));
+		towns.emplace_back(std::make_pair(Town::Get(town_id), population));
 	}
 
 	/* If we couldn't found a town (or multiple), display a message to the player with the number of failed towns. */
@@ -521,7 +501,7 @@ void LoadTownData()
 
 		do {
 			uint before = t->cache.num_houses;
-			Command<CMD_EXPAND_TOWN>::Post(t->index, HOUSES_TO_GROW);
+			Command<CMD_EXPAND_TOWN>::Post(t->index, HOUSES_TO_GROW, {TownExpandMode::Buildings, TownExpandMode::Roads});
 			if (t->cache.num_houses <= before) fail_limit--;
 		} while (fail_limit > 0 && try_limit-- > 0 && t->cache.population < population);
 	}
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 52218c2380..bcda461abe 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -33,6 +33,7 @@
 #include "ai/ai_gui.hpp"
 #include "game/game_gui.hpp"
 #include "industry.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/genworld_widget.h"
 
@@ -851,7 +852,7 @@ struct GenerateLandscapeWindow : public Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_GL_MAPSIZE_X_PULLDOWN:     _settings_newgame.game_creation.map_x = index; break;
@@ -913,7 +914,9 @@ struct GenerateLandscapeWindow : public Window {
 
 		int32_t value;
 		if (!str->empty()) {
-			value = atoi(str->c_str());
+			auto val = ParseInteger<int32_t>(*str, 10, true);
+			if (!val.has_value()) return;
+			value = *val;
 		} else {
 			/* An empty string means revert to the default */
 			switch (this->widget_id) {
@@ -972,14 +975,14 @@ struct GenerateLandscapeWindow : public Window {
 };
 
 static WindowDesc _generate_landscape_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	{},
 	_nested_generate_landscape_widgets
 );
 
 static WindowDesc _heightmap_load_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	{},
 	_nested_heightmap_load_widgets
@@ -997,7 +1000,7 @@ static void _ShowGenerateLandscape(GenerateLandscapeWindowMode mode)
 
 	if (mode == GLWM_HEIGHTMAP) {
 		/* If the function returns negative, it means there was a problem loading the heightmap */
-		if (!GetHeightmapDimensions(_file_to_saveload.detail_ftype, _file_to_saveload.name.c_str(), &x, &y)) return;
+		if (!GetHeightmapDimensions(_file_to_saveload.ftype.detailed, _file_to_saveload.name, &x, &y)) return;
 	}
 
 	WindowDesc &desc = (mode == GLWM_HEIGHTMAP) ? _heightmap_load_desc : _generate_landscape_desc;
@@ -1187,7 +1190,7 @@ struct CreateScenarioWindow : public Window
 		this->RaiseWidgetsWhenLowered(WID_CS_START_DATE_DOWN, WID_CS_START_DATE_UP, WID_CS_FLAT_LAND_HEIGHT_DOWN, WID_CS_FLAT_LAND_HEIGHT_UP);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_CS_MAPSIZE_X_PULLDOWN: _settings_newgame.game_creation.map_x = index; break;
@@ -1198,19 +1201,20 @@ struct CreateScenarioWindow : public Window
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
-		if (!str.has_value() || str->empty()) return;
+		if (!str.has_value()) return;
 
-		int32_t value = atoi(str->c_str());
+		auto value = ParseInteger<int32_t>(*str, 10, true);
+		if (!value.has_value()) return;
 
 		switch (this->widget_id) {
 			case WID_CS_START_DATE_TEXT:
 				this->SetWidgetDirty(WID_CS_START_DATE_TEXT);
-				_settings_newgame.game_creation.starting_year = Clamp(TimerGameCalendar::Year(value), CalendarTime::MIN_YEAR, CalendarTime::MAX_YEAR);
+				_settings_newgame.game_creation.starting_year = Clamp(TimerGameCalendar::Year(*value), CalendarTime::MIN_YEAR, CalendarTime::MAX_YEAR);
 				break;
 
 			case WID_CS_FLAT_LAND_HEIGHT_TEXT:
 				this->SetWidgetDirty(WID_CS_FLAT_LAND_HEIGHT_TEXT);
-				_settings_newgame.game_creation.se_flat_world_height = Clamp(value, 0, GetMapHeightLimit());
+				_settings_newgame.game_creation.se_flat_world_height = Clamp(*value, 0, GetMapHeightLimit());
 				break;
 		}
 
@@ -1278,7 +1282,7 @@ static constexpr NWidgetPart _nested_create_scenario_widgets[] = {
 };
 
 static WindowDesc _create_scenario_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	{},
 	_nested_create_scenario_widgets
@@ -1304,7 +1308,7 @@ static constexpr NWidgetPart _nested_generate_progress_widgets[] = {
 
 
 static WindowDesc _generate_progress_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_MODAL_PROGRESS, WC_NONE,
 	WindowDefaultFlag::NoClose,
 	_nested_generate_progress_widgets
@@ -1393,7 +1397,7 @@ struct GenerateProgressWindow : public Window {
 				DrawFrameRect(r, COLOUR_GREY, {FrameFlag::BorderOnly, FrameFlag::Lowered});
 				Rect br = r.Shrink(WidgetDimensions::scaled.bevel);
 				DrawFrameRect(br.WithWidth(br.Width() * GenWorldStatus::percent / 100, _current_text_dir == TD_RTL), COLOUR_MAUVE, {});
-				DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, GetCharacterHeight(FS_NORMAL)),
+				DrawString(br.left, br.right, CentreBounds(br.top, br.bottom, GetCharacterHeight(FS_NORMAL)),
 					GetString(STR_GENERATION_PROGRESS, GenWorldStatus::percent), TC_FROMSTRING, SA_HOR_CENTER);
 				break;
 			}
diff --git a/src/gfx.cpp b/src/gfx.cpp
index f116343b00..6e12254374 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -54,11 +54,11 @@ static uint8_t _stringwidth_table[FS_END][224]; ///< Cache containing width of o
 DrawPixelInfo *_cur_dpi;
 
 static void GfxMainBlitterViewport(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub = nullptr, SpriteID sprite_id = SPR_CURSOR_MOUSE);
-static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub = nullptr, SpriteID sprite_id = SPR_CURSOR_MOUSE, ZoomLevel zoom = ZOOM_LVL_MIN);
+static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub = nullptr, SpriteID sprite_id = SPR_CURSOR_MOUSE, ZoomLevel zoom = ZoomLevel::Min);
 
 static ReusableBuffer<uint8_t> _cursor_backup;
 
-ZoomLevel _gui_zoom  = ZOOM_LVL_NORMAL;     ///< GUI Zoom level
+ZoomLevel _gui_zoom = ZoomLevel::Normal; ///< GUI Zoom level
 ZoomLevel _font_zoom = _gui_zoom;           ///< Sprite font Zoom level (not clamped)
 int _gui_scale       = MIN_INTERFACE_SCALE; ///< GUI scale, 100 is 100%.
 int _gui_scale_cfg;                         ///< GUI scale in config.
@@ -101,7 +101,7 @@ void GfxScroll(int left, int top, int width, int height, int xo, int yo)
 /**
  * Applies a certain FillRectMode-operation to a rectangle [left, right] x [top, bottom] on the screen.
  *
- * @pre dpi->zoom == ZOOM_LVL_MIN, right >= left, bottom >= top
+ * @pre dpi->zoom == ZoomLevel::Min, right >= left, bottom >= top
  * @param left Minimum X (inclusive)
  * @param top Minimum Y (inclusive)
  * @param right Maximum X (inclusive)
@@ -120,7 +120,7 @@ void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectM
 	const int otop = top;
 	const int oleft = left;
 
-	if (dpi->zoom != ZOOM_LVL_MIN) return;
+	if (dpi->zoom != ZoomLevel::Min) return;
 	if (left > right || top > bottom) return;
 	if (right < dpi->left || left >= dpi->left + dpi->width) return;
 	if (bottom < dpi->top || top >= dpi->top + dpi->height) return;
@@ -200,7 +200,7 @@ static std::vector<LineSegment> MakePolygonSegments(std::span<const Point> shape
  * The odd-even winding rule is used, i.e. self-intersecting polygons will have holes in them.
  * Left and top edges are inclusive, right and bottom edges are exclusive.
  * @note For rectangles the GfxFillRect function will be faster.
- * @pre dpi->zoom == ZOOM_LVL_MIN
+ * @pre dpi->zoom == ZoomLevel::Min
  * @param shape List of points on the polygon.
  * @param colour An 8 bit palette index (FILLRECT_OPAQUE and FILLRECT_CHECKER) or a recolour spritenumber (FILLRECT_RECOLOUR).
  * @param mode
@@ -212,7 +212,7 @@ void GfxFillPolygon(std::span<const Point> shape, int colour, FillRectMode mode)
 {
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	const DrawPixelInfo *dpi = _cur_dpi;
-	if (dpi->zoom != ZOOM_LVL_MIN) return;
+	if (dpi->zoom != ZoomLevel::Min) return;
 
 	std::vector<LineSegment> segments = MakePolygonSegments(shape, Point{ dpi->left, dpi->top });
 
@@ -839,6 +839,41 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str,
 	return DrawStringMultiLine(left, right, top, bottom, GetString(str), colour, align, underline, fontsize);
 }
 
+/**
+ * Draw a multiline string, possibly over multiple lines, if the region is within the current display clipping area.
+ * @note With clipping, it is not possible to determine how tall the rendered text will be, as it's not layouted.
+ *       Regulard DrawStringMultiLine must be used if the height needs to be known.
+ *
+ * @param left   The left most position to draw on.
+ * @param right  The right most position to draw on.
+ * @param top    The top most position to draw on.
+ * @param bottom The bottom most position to draw on.
+ * @param str    String to draw.
+ * @param colour Colour used for drawing the string, for details see _string_colourmap in
+ *               table/palettes.h or docs/ottd-colourtext-palette.png or the enum TextColour in gfx_type.h
+ * @param align  The horizontal and vertical alignment of the string.
+ * @param underline Whether to underline all strings
+ * @param fontsize The size of the initial characters.
+ *
+ * @return true iff the string was drawn.
+ */
+bool DrawStringMultiLineWithClipping(int left, int right, int top, int bottom, std::string_view str, TextColour colour, StringAlignment align, bool underline, FontSize fontsize)
+{
+	/* The string may contain control chars to change the font, just use the biggest font for clipping. */
+	int max_height = std::max({GetCharacterHeight(FS_SMALL), GetCharacterHeight(FS_NORMAL), GetCharacterHeight(FS_LARGE), GetCharacterHeight(FS_MONO)});
+
+	/* Funny glyphs may extent outside the usual bounds, so relax the clipping somewhat. */
+	int extra = max_height / 2;
+
+	if (_cur_dpi->top + _cur_dpi->height + extra < top || _cur_dpi->top > bottom + extra ||
+			_cur_dpi->left + _cur_dpi->width + extra < left || _cur_dpi->left > right + extra) {
+		return false;
+	}
+
+	DrawStringMultiLine(left, right, top, bottom, str, colour, align, underline, fontsize);
+	return true;
+}
+
 /**
  * Return the string dimension in pixels. The height and width are returned
  * in a single Dimension value. TINYFONT, BIGFONT modifiers are only
@@ -907,8 +942,8 @@ void DrawCharCentered(char32_t c, const Rect &r, TextColour colour)
 {
 	SetColourRemap(colour);
 	GfxMainBlitter(GetGlyph(FS_NORMAL, c),
-		CenterBounds(r.left, r.right, GetCharacterWidth(FS_NORMAL, c)),
-		CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)),
+		CentreBounds(r.left, r.right, GetCharacterWidth(FS_NORMAL, c)),
+		CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)),
 		BlitterMode::ColourRemap);
 }
 
@@ -1127,7 +1162,7 @@ static void GfxBlitter(const Sprite * const sprite, int x, int y, BlitterMode mo
 		if (topleft <= clicked && clicked <= bottomright) {
 			uint offset = (((size_t)clicked - (size_t)topleft) / (blitter->GetScreenDepth() / 8)) % bp.pitch;
 			if (offset < (uint)bp.width) {
-				include(_newgrf_debug_sprite_picker.sprites, sprite_id);
+				_newgrf_debug_sprite_picker.sprites.insert(sprite_id);
 			}
 		}
 	}
@@ -1521,7 +1556,7 @@ bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int heigh
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	const DrawPixelInfo *o = _cur_dpi;
 
-	n->zoom = ZOOM_LVL_MIN;
+	n->zoom = ZoomLevel::Min;
 
 	assert(width > 0);
 	assert(height > 0);
@@ -1747,12 +1782,12 @@ void UpdateGUIZoom()
 		_gui_scale = Clamp(_gui_scale_cfg, MIN_INTERFACE_SCALE, MAX_INTERFACE_SCALE);
 	}
 
-	int8_t new_zoom = ScaleGUITrad(1) <= 1 ? ZOOM_LVL_NORMAL : ScaleGUITrad(1) >= 4 ? ZOOM_LVL_IN_4X : ZOOM_LVL_IN_2X;
+	ZoomLevel new_zoom = ScaleGUITrad(1) <= 1 ? ZoomLevel::Normal : ScaleGUITrad(1) >= 4 ? ZoomLevel::In4x : ZoomLevel::In2x;
 	/* Font glyphs should not be clamped to min/max zoom. */
-	_font_zoom = static_cast<ZoomLevel>(new_zoom);
+	_font_zoom = new_zoom;
 	/* Ensure the gui_zoom is clamped between min/max. */
 	new_zoom = Clamp(new_zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
-	_gui_zoom = static_cast<ZoomLevel>(new_zoom);
+	_gui_zoom = new_zoom;
 }
 
 /**
@@ -1792,7 +1827,7 @@ bool AdjustGUIZoom(bool automatic)
 			w->top    = (w->top    * _gui_scale) / old_scale;
 		}
 		if (w->viewport != nullptr) {
-			w->viewport->zoom = static_cast<ZoomLevel>(Clamp(w->viewport->zoom - zoom_shift, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max));
+			w->viewport->zoom = Clamp(w->viewport->zoom - zoom_shift, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
 		}
 	}
 
diff --git a/src/gfx_func.h b/src/gfx_func.h
index d7febfdc74..ed9d2c2cec 100644
--- a/src/gfx_func.h
+++ b/src/gfx_func.h
@@ -70,7 +70,9 @@ extern Palette _cur_palette; ///< Current palette
 
 void HandleToolbarHotkey(int hotkey);
 void HandleKeypress(uint keycode, char32_t key);
-void HandleTextInput(const char *str, bool marked = false, const char *caret = nullptr, const char *insert_location = nullptr, const char *replacement_end = nullptr);
+void HandleTextInput(std::string_view str, bool marked = false,
+		std::optional<size_t> caret = std::nullopt,
+		std::optional<size_t> insert_location = std::nullopt, std::optional<size_t> replacement_end = std::nullopt);
 void HandleCtrlChanged();
 void HandleMouseEvents();
 void UpdateWindows();
@@ -97,6 +99,7 @@ int DrawString(int left, int right, int top, std::string_view str, TextColour co
 int DrawString(int left, int right, int top, StringID str, TextColour colour = TC_FROMSTRING, StringAlignment align = SA_LEFT, bool underline = false, FontSize fontsize = FS_NORMAL);
 int DrawStringMultiLine(int left, int right, int top, int bottom, std::string_view str, TextColour colour = TC_FROMSTRING, StringAlignment align = (SA_TOP | SA_LEFT), bool underline = false, FontSize fontsize = FS_NORMAL);
 int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str, TextColour colour = TC_FROMSTRING, StringAlignment align = (SA_TOP | SA_LEFT), bool underline = false, FontSize fontsize = FS_NORMAL);
+bool DrawStringMultiLineWithClipping(int left, int right, int top, int bottom, std::string_view str, TextColour colour = TC_FROMSTRING, StringAlignment align = (SA_TOP | SA_LEFT), bool underline = false, FontSize fontsize = FS_NORMAL);
 
 void DrawCharCentered(char32_t c, const Rect &r, TextColour colour);
 
@@ -127,6 +130,11 @@ inline int DrawStringMultiLine(const Rect &r, StringID str, TextColour colour =
 	return DrawStringMultiLine(r.left, r.right, r.top, r.bottom, str, colour, align, underline, fontsize);
 }
 
+inline bool DrawStringMultiLineWithClipping(const Rect &r, std::string_view str, TextColour colour = TC_FROMSTRING, StringAlignment align = (SA_TOP | SA_LEFT), bool underline = false, FontSize fontsize = FS_NORMAL)
+{
+	return DrawStringMultiLineWithClipping(r.left, r.right, r.top, r.bottom, str, colour, align, underline, fontsize);
+}
+
 inline void GfxFillRect(const Rect &r, int colour, FillRectMode mode = FILLRECT_OPAQUE)
 {
 	GfxFillRect(r.left, r.top, r.right, r.bottom, colour, mode);
@@ -156,18 +164,6 @@ inline bool FillDrawPixelInfo(DrawPixelInfo *n, const Rect &r)
 	return FillDrawPixelInfo(n, r.left, r.top, r.Width(), r.Height());
 }
 
-/**
- * Determine where to draw a centred object inside a widget.
- * @param min The top or left coordinate.
- * @param max The bottom or right coordinate.
- * @param size The height or width of the object to draw.
- * @return Offset of where to start drawing the object.
- */
-inline int CenterBounds(int min, int max, int size)
-{
-	return (min + max - size + 1) / 2;
-}
-
 /* window.cpp */
 void DrawOverlappedWindowForAll(int left, int top, int right, int bottom);
 
diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
index 213bfd4fdb..8c43f7b2c0 100644
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -35,7 +35,7 @@
 
 
 /** Cache of ParagraphLayout lines. */
-Layouter::LineCache *Layouter::linecache;
+std::unique_ptr<Layouter::LineCache> Layouter::linecache;
 
 /** Cache of Font instances. */
 Layouter::FontColourMap Layouter::fonts[FS_END];
@@ -174,11 +174,21 @@ Layouter::Layouter(std::string_view str, int maxw, FontSize fontsize) : string(s
 			}
 		}
 
-		/* Move all lines into a local cache so we can reuse them later on more easily. */
-		for (;;) {
-			auto l = line.layout->NextLine(maxw);
-			if (l == nullptr) break;
-			this->push_back(std::move(l));
+		if (line.cached_width != maxw) {
+			/* First run or width has changed, so we need to go through the layouter. Lines are moved into a cache to
+			 * be reused if the width is not changed. */
+			line.cached_layout.clear();
+			line.cached_width = maxw;
+			for (;;) {
+				auto l = line.layout->NextLine(maxw);
+				if (l == nullptr) break;
+				line.cached_layout.push_back(std::move(l));
+			}
+		}
+
+		/* Retrieve layout from the cache. */
+		for (const auto &l : line.cached_layout) {
+			this->push_back(l.get());
 		}
 
 		/* Break out if this was the last line. */
@@ -214,7 +224,7 @@ static bool IsConsumedFormattingCode(char32_t ch)
 	if (ch == SCC_PUSH_COLOUR) return true;
 	if (ch == SCC_POP_COLOUR) return true;
 	if (ch >= SCC_FIRST_FONT && ch <= SCC_LAST_FONT) return true;
-	// All other characters defined in Unicode standard are assumed to be non-consumed.
+	/* All other characters defined in Unicode standard are assumed to be non-consumed. */
 	return false;
 }
 
@@ -380,19 +390,20 @@ Layouter::LineCacheItem &Layouter::GetCachedParagraphLayout(std::string_view str
 {
 	if (linecache == nullptr) {
 		/* Create linecache on first access to avoid trouble with initialisation order of static variables. */
-		linecache = new LineCache();
+		linecache = std::make_unique<LineCache>(4096);
 	}
 
-	if (auto match = linecache->find(LineCacheQuery{state, str});
-		match != linecache->end()) {
-		return match->second;
+	if (auto match = linecache->GetIfValid(LineCacheQuery{state, str});
+		match != nullptr) {
+		return *match;
 	}
 
 	/* Create missing entry */
 	LineCacheKey key;
 	key.state_before = state;
 	key.str.assign(str);
-	return (*linecache)[std::move(key)];
+	linecache->Insert(key, {});
+	return *linecache->GetIfValid(key);
 }
 
 /**
@@ -400,33 +411,21 @@ Layouter::LineCacheItem &Layouter::GetCachedParagraphLayout(std::string_view str
  */
 void Layouter::ResetLineCache()
 {
-	if (linecache != nullptr) linecache->clear();
-}
-
-/**
- * Reduce the size of linecache if necessary to prevent infinite growth.
- */
-void Layouter::ReduceLineCache()
-{
-	if (linecache != nullptr) {
-		/* TODO LRU cache would be fancy, but not exactly necessary */
-		if (linecache->size() > 4096) ResetLineCache();
-	}
+	if (linecache != nullptr) linecache->Clear();
 }
 
 /**
  * Get the leading corner of a character in a single-line string relative
  * to the start of the string.
  * @param str String containing the character.
- * @param ch Pointer to the character in the string.
+ * @param pos Index to the character in the string.
  * @param start_fontsize Font size to start the text with.
  * @return Upper left corner of the glyph associated with the character.
  */
-ParagraphLayouter::Position GetCharPosInString(std::string_view str, const char *ch, FontSize start_fontsize)
+ParagraphLayouter::Position GetCharPosInString(std::string_view str, size_t pos, FontSize start_fontsize)
 {
-	/* Ensure "ch" is inside "str" or at the exact end. */
-	assert(ch >= str.data() && (ch - str.data()) <= static_cast<ptrdiff_t>(str.size()));
-	auto it_ch = str.begin() + (ch - str.data());
+	assert(pos <= str.size());
+	auto it_ch = str.begin() + pos;
 
 	Layouter layout(str, INT32_MAX, start_fontsize);
 	return layout.GetCharPosition(it_ch);
diff --git a/src/gfx_layout.h b/src/gfx_layout.h
index e6f91e4d7f..b37741a59b 100644
--- a/src/gfx_layout.h
+++ b/src/gfx_layout.h
@@ -10,11 +10,11 @@
 #ifndef GFX_LAYOUT_H
 #define GFX_LAYOUT_H
 
+#include "misc/lrucache.hpp"
 #include "fontcache.h"
 #include "gfx_func.h"
 #include "core/math_func.hpp"
 
-#include <stack>
 #include <string_view>
 
 /**
@@ -24,12 +24,13 @@
 struct FontState {
 	FontSize fontsize;       ///< Current font size.
 	TextColour cur_colour;   ///< Current text colour.
-
-	std::stack<TextColour, std::vector<TextColour>> colour_stack; ///< Stack of colours to assist with colour switching.
+	std::vector<TextColour> colour_stack; ///< Stack of colours to assist with colour switching.
 
 	FontState() : fontsize(FS_END), cur_colour(TC_INVALID) {}
 	FontState(TextColour colour, FontSize fontsize) : fontsize(fontsize), cur_colour(colour) {}
 
+	auto operator<=>(const FontState &) const = default;
+
 	/**
 	 * Switch to new colour \a c.
 	 * @param c New colour to use.
@@ -47,8 +48,8 @@ struct FontState {
 	inline void PopColour()
 	{
 		if (colour_stack.empty()) return;
-		SetColour(colour_stack.top());
-		colour_stack.pop();
+		SetColour(colour_stack.back());
+		colour_stack.pop_back();
 	}
 
 	/**
@@ -56,7 +57,7 @@ struct FontState {
 	 */
 	inline void PushColour()
 	{
-		colour_stack.push(this->cur_colour);
+		colour_stack.push_back(this->cur_colour);
 	}
 
 	/**
@@ -69,6 +70,27 @@ struct FontState {
 	}
 };
 
+template <typename T> struct std::hash<std::vector<T>> {
+	size_t operator()(const std::vector<T> &vec) const
+	{
+		/* This is not an optimal hash algorithm but in most cases this is empty and therefore the same anyway. */
+		return std::transform_reduce(std::begin(vec), std::end(vec),
+			std::hash<size_t>{}(std::size(vec)),
+			[](const size_t &a, const size_t &b) -> size_t { return a ^ b; },
+			[](const T &x) -> size_t { return std::hash<T>{}(x); });
+	}
+};
+
+template <> struct std::hash<FontState> {
+	std::size_t operator()(const FontState &state) const noexcept
+	{
+		size_t h1 = std::hash<FontSize>{}(state.fontsize);
+		size_t h2 = std::hash<TextColour>{}(state.cur_colour);
+		size_t h3 = std::hash<std::vector<TextColour>>{}(state.colour_stack);
+		return h1 ^ (h2 << 1) ^ (h3 << 2);
+	}
+};
+
 /**
  * Container with information about a font.
  */
@@ -135,7 +157,7 @@ public:
  *
  * It also accounts for the memory allocations and frees.
  */
-class Layouter : public std::vector<std::unique_ptr<const ParagraphLayouter::Line>> {
+class Layouter : public std::vector<const ParagraphLayouter::Line *> {
 	std::string_view string; ///< Pointer to the original string.
 
 	/** Key into the linecache */
@@ -149,20 +171,19 @@ class Layouter : public std::vector<std::unique_ptr<const ParagraphLayouter::Lin
 		std::string_view str;    ///< Source string of the line (including colour and font size codes).
 	};
 
-	/** Comparator for std::map */
-	struct LineCacheCompare {
-		using is_transparent = void; ///< Enable map queries with various key types
+	friend struct std::hash<Layouter::LineCacheQuery>;
+	struct LineCacheHash;
 
-		/** Comparison operator for LineCacheKey and LineCacheQuery */
-		template <typename Key1, typename Key2>
-		bool operator()(const Key1 &lhs, const Key2 &rhs) const
+	struct LineCacheEqualTo {
+		using is_transparent = void;
+
+		template <typename Tlhs, typename Trhs>
+		bool operator()(const Tlhs &lhs, const Trhs &rhs) const
 		{
-			if (lhs.state_before.fontsize != rhs.state_before.fontsize) return lhs.state_before.fontsize < rhs.state_before.fontsize;
-			if (lhs.state_before.cur_colour != rhs.state_before.cur_colour) return lhs.state_before.cur_colour < rhs.state_before.cur_colour;
-			if (lhs.state_before.colour_stack != rhs.state_before.colour_stack) return lhs.state_before.colour_stack < rhs.state_before.colour_stack;
-			return lhs.str < rhs.str;
+			return lhs.state_before == rhs.state_before && lhs.str == rhs.str;
 		}
 	};
+
 public:
 	/** Item in the linecache */
 	struct LineCacheItem {
@@ -174,10 +195,13 @@ public:
 
 		FontState state_after;     ///< Font state after the line.
 		std::unique_ptr<ParagraphLayouter> layout = nullptr; ///< Layout of the line.
+
+		std::vector<std::unique_ptr<const ParagraphLayouter::Line>> cached_layout{}; ///< Cached results of line layouting.
+		int cached_width = 0; ///< Width used for the cached layout.
 	};
 private:
-	typedef std::map<LineCacheKey, LineCacheItem, LineCacheCompare> LineCache;
-	static LineCache *linecache;
+	using LineCache = LRUCache<LineCacheKey, LineCacheItem, LineCacheHash, LineCacheEqualTo>;
+	static std::unique_ptr<LineCache> linecache;
 
 	static LineCacheItem &GetCachedParagraphLayout(std::string_view str, const FontState &state);
 
@@ -194,10 +218,25 @@ public:
 	static void Initialize();
 	static void ResetFontCache(FontSize size);
 	static void ResetLineCache();
-	static void ReduceLineCache();
 };
 
-ParagraphLayouter::Position GetCharPosInString(std::string_view str, const char *ch, FontSize start_fontsize = FS_NORMAL);
+ParagraphLayouter::Position GetCharPosInString(std::string_view str, size_t pos, FontSize start_fontsize = FS_NORMAL);
 ptrdiff_t GetCharAtPosition(std::string_view str, int x, FontSize start_fontsize = FS_NORMAL);
 
+template <> struct std::hash<Layouter::LineCacheQuery> {
+	std::size_t operator()(const Layouter::LineCacheQuery &state) const noexcept
+	{
+		size_t h1 = std::hash<std::string_view>{}(state.str);
+		size_t h2 = std::hash<FontState>{}(state.state_before);
+		return h1 ^ (h2 << 1);
+	}
+};
+
+struct Layouter::LineCacheHash {
+	using is_transparent = void;
+
+	std::size_t operator()(const Layouter::LineCacheKey &query) const { return std::hash<Layouter::LineCacheQuery>{}(LineCacheQuery{query.state_before, query.str}); }
+	std::size_t operator()(const Layouter::LineCacheQuery &query) const { return std::hash<Layouter::LineCacheQuery>{}(query); }
+};
+
 #endif /* GFX_LAYOUT_H */
diff --git a/src/gfx_type.h b/src/gfx_type.h
index b507b26183..664aecaed9 100644
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -183,6 +183,8 @@ union ColourRGBA {
 	 * @param data The colour in the correct packed format.
 	 */
 	constexpr ColourRGBA(uint data = 0) : data(data) { }
+
+	bool operator==(const ColourRGBA &other) const { return this->data == other.data; };
 };
 
 /** Packed colour union to access the alpha, red, green, and blue channels from a 32 bit number for big-endian systems. */
@@ -206,6 +208,8 @@ union ColourARGB {
 	 * @param data The colour in the correct packed format.
 	 */
 	constexpr ColourARGB(uint data = 0) : data(data) { }
+
+	bool operator==(const ColourARGB &other) const { return this->data == other.data; };
 };
 
 /** Packed colour union to access the alpha, red, green, and blue channels from a 32 bit number for little-endian systems. */
@@ -229,6 +233,8 @@ union ColourBGRA {
 	 * @param data The colour in the correct packed format.
 	 */
 	constexpr ColourBGRA(uint data = 0) : data(data) { }
+
+	bool operator==(const ColourBGRA &other) const { return this->data == other.data; };
 };
 
 #if defined(__EMSCRIPTEN__)
@@ -252,9 +258,9 @@ enum FontSize : uint8_t {
 };
 DECLARE_INCREMENT_DECREMENT_OPERATORS(FontSize)
 
-inline const char *FontSizeToName(FontSize fs)
+inline std::string_view FontSizeToName(FontSize fs)
 {
-	static const char *SIZE_TO_NAME[] = { "medium", "small", "large", "mono" };
+	static const std::string_view SIZE_TO_NAME[] = { "medium", "small", "large", "mono" };
 	assert(fs < FS_END);
 	return SIZE_TO_NAME[fs];
 }
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 3a2bd06f10..deaaf405b2 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -228,9 +228,9 @@ static void LoadSpriteTables()
 }
 
 
-static void RealChangeBlitter(const std::string_view repl_blitter)
+static void RealChangeBlitter(std::string_view repl_blitter)
 {
-	const std::string_view cur_blitter = BlitterFactory::GetCurrentBlitter()->GetName();
+	std::string_view cur_blitter = BlitterFactory::GetCurrentBlitter()->GetName();
 	if (cur_blitter == repl_blitter) return;
 
 	Debug(driver, 1, "Switching blitter from '{}' to '{}'... ", cur_blitter, repl_blitter);
@@ -299,7 +299,7 @@ static bool SwitchNewGRFBlitter()
 	};
 
 	const bool animation_wanted = HasBit(_display_opt, DO_FULL_ANIMATION);
-	const std::string_view cur_blitter = BlitterFactory::GetCurrentBlitter()->GetName();
+	std::string_view cur_blitter = BlitterFactory::GetCurrentBlitter()->GetName();
 
 	for (const auto &replacement_blitter : replacement_blitters) {
 		if (animation_wanted && (replacement_blitter.animation == 0)) continue;
@@ -346,28 +346,29 @@ void GfxLoadSprites()
 	UpdateCursorSize();
 }
 
-// instantiate here, because unique_ptr needs a complete type
+/* instantiate here, because unique_ptr needs a complete type */
 GraphicsSet::GraphicsSet() = default;
 
-// instantiate here, because unique_ptr needs a complete type
+/* instantiate here, because unique_ptr needs a complete type */
 GraphicsSet::~GraphicsSet() = default;
 
 bool GraphicsSet::FillSetDetails(const IniFile &ini, const std::string &path, const std::string &full_filename)
 {
-	bool ret = this->BaseSet<GraphicsSet>::FillSetDetails(ini, path, full_filename, false);
-	if (ret) {
-		const IniGroup *metadata = ini.GetGroup("metadata");
-		assert(metadata != nullptr); /* ret can't be true if metadata isn't present. */
-		const IniItem *item;
+	if (!this->BaseSet<GraphicsSet>::FillSetDetails(ini, path, full_filename, false)) return false;
 
-		fetch_metadata("palette");
-		this->palette = ((*item->value)[0] == 'D' || (*item->value)[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
+	const IniGroup *metadata = ini.GetGroup("metadata");
+	assert(metadata != nullptr); /* already checked by the inherited FillSetDetails. */
+	const IniItem *item;
 
-		/* Get optional blitter information. */
-		item = metadata->GetItem("blitter");
-		this->blitter = (item != nullptr && (*item->value)[0] == '3') ? BLT_32BPP : BLT_8BPP;
-	}
-	return ret;
+	item = this->GetMandatoryItem(full_filename, *metadata, "palette");
+	if (item == nullptr) return false;
+	this->palette = ((*item->value)[0] == 'D' || (*item->value)[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
+
+	/* Get optional blitter information. */
+	item = metadata->GetItem("blitter");
+	this->blitter = (item != nullptr && (*item->value)[0] == '3') ? BLT_32BPP : BLT_8BPP;
+
+	return true;
 }
 
 /**
@@ -479,7 +480,7 @@ template <>
 
 	const GraphicsSet *best = nullptr;
 
-	auto IsBetter = [&best] (const auto *current) {
+	auto IsBetter = [&best] (const GraphicsSet *current) {
 		/* Nothing chosen yet. */
 		if (best == nullptr) return true;
 		/* Not being a fallback is better. */
@@ -494,11 +495,11 @@ template <>
 		return best->palette != PAL_DOS && current->palette == PAL_DOS;
 	};
 
-	for (const GraphicsSet *c = BaseMedia<GraphicsSet>::available_sets; c != nullptr; c = c->next) {
+	for (const auto &c : BaseMedia<GraphicsSet>::available_sets) {
 		/* Skip unusable sets */
 		if (c->GetNumMissing() != 0) continue;
 
-		if (IsBetter(c)) best = c;
+		if (IsBetter(c.get())) best = c.get();
 	}
 
 	BaseMedia<GraphicsSet>::used_set = best;
@@ -506,7 +507,7 @@ template <>
 }
 
 template <>
-/* static */ const char *BaseMedia<GraphicsSet>::GetExtension()
+/* static */ std::string_view BaseMedia<GraphicsSet>::GetExtension()
 {
 	return ".obg"; // OpenTTD Base Graphics
 }
diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index cccb600371..d5734184c2 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -172,7 +172,7 @@ struct GoalListWindow : public Window {
 		Dimension d = GetStringBoundingBox(STR_GOALS_NONE);
 
 		resize.width = 1;
-		resize.height = d.height;
+		fill.height = resize.height = d.height;
 
 		d.height *= 5;
 		d.width += WidgetDimensions::scaled.framerect.Horizontal();
@@ -440,25 +440,25 @@ static constexpr auto _nested_goal_question_widgets_error    = NestedGoalWidgets
 
 static WindowDesc _goal_question_list_desc[] = {
 	{
-		WDP_CENTER, nullptr, 0, 0,
+		WDP_CENTER, {}, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WindowDefaultFlag::Construction,
 		_nested_goal_question_widgets_question,
 	},
 	{
-		WDP_CENTER, nullptr, 0, 0,
+		WDP_CENTER, {}, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WindowDefaultFlag::Construction,
 		_nested_goal_question_widgets_info,
 	},
 	{
-		WDP_CENTER, nullptr, 0, 0,
+		WDP_CENTER, {}, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WindowDefaultFlag::Construction,
 		_nested_goal_question_widgets_warning,
 	},
 	{
-		WDP_CENTER, nullptr, 0, 0,
+		WDP_CENTER, {}, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WindowDefaultFlag::Construction,
 		_nested_goal_question_widgets_error,
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index e3b89744b4..23c24d134a 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -35,8 +35,6 @@
 
 /* Bitmasks of company and cargo indices that shouldn't be drawn. */
 static CompanyMask _legend_excluded_companies;
-static CargoTypes _legend_excluded_cargo_payment_rates;
-static CargoTypes _legend_excluded_cargo_production_history;
 
 /* Apparently these don't play well with enums. */
 static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn.
@@ -73,10 +71,10 @@ struct GraphLegendWindow : Window {
 
 		const Rect ir = r.Shrink(WidgetDimensions::scaled.framerect);
 		Dimension d = GetSpriteSize(SPR_COMPANY_ICON);
-		DrawCompanyIcon(cid, rtl ? ir.right - d.width : ir.left, CenterBounds(ir.top, ir.bottom, d.height));
+		DrawCompanyIcon(cid, rtl ? ir.right - d.width : ir.left, CentreBounds(ir.top, ir.bottom, d.height));
 
 		const Rect tr = ir.Indent(d.width + WidgetDimensions::scaled.hsep_normal, rtl);
-		DrawString(tr.left, tr.right, CenterBounds(tr.top, tr.bottom, GetCharacterHeight(FS_NORMAL)), GetString(STR_COMPANY_NAME_COMPANY_NUM, cid, cid), _legend_excluded_companies.Test(cid) ? TC_BLACK : TC_WHITE);
+		DrawString(tr.left, tr.right, CentreBounds(tr.top, tr.bottom, GetCharacterHeight(FS_NORMAL)), GetString(STR_COMPANY_NAME_COMPANY_NUM, cid, cid), _legend_excluded_companies.Test(cid) ? TC_BLACK : TC_WHITE);
 	}
 
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
@@ -116,7 +114,7 @@ static std::unique_ptr<NWidgetBase> MakeNWidgetCompanyLines()
 {
 	auto vert = std::make_unique<NWidgetVertical>(NWidContainerFlag::EqualSize);
 	vert->SetPadding(2, 2, 2, 2);
-	uint sprite_height = GetSpriteSize(SPR_COMPANY_ICON, nullptr, ZOOM_LVL_NORMAL).height;
+	uint sprite_height = GetSpriteSize(SPR_COMPANY_ICON, nullptr, ZoomLevel::Normal).height;
 
 	for (WidgetID widnum = WID_GL_FIRST_COMPANY; widnum <= WID_GL_LAST_COMPANY; widnum++) {
 		auto panel = std::make_unique<NWidgetBackground>(WWT_PANEL, COLOUR_BROWN, widnum);
@@ -213,6 +211,10 @@ protected:
 
 	std::span<const StringID> ranges = {};
 
+	uint8_t highlight_data = UINT8_MAX; ///< Data set that should be highlighted, or UINT8_MAX for none.
+	uint8_t highlight_range = UINT8_MAX; ///< Data range that should be highlighted, or UINT8_MAX for none.
+	bool highlight_state = false; ///< Current state of highlight, toggled every TIMER_BLINK_INTERVAL period.
+
 	/**
 	 * Get appropriate part of dataset values for the current number of horizontal points.
 	 * @param dataset Dataset to get values of
@@ -442,19 +444,23 @@ protected:
 			y += y_sep;
 		}
 
+		x = rtl ? r.right : r.left;
+		y = r.bottom + ScaleGUITrad(2);
+
+		/* if there are not enough datapoints to fill the graph, align to the right */
+		x += (this->num_vert_lines - this->num_on_x_axis) * x_sep;
+
 		/* Draw x-axis labels and markings for graphs based on financial quarters and years.  */
 		if (this->draw_dates) {
-			x = rtl ? r.right : r.left;
-			y = r.bottom + ScaleGUITrad(2);
 			TimerGameEconomy::Month month = this->month;
 			TimerGameEconomy::Year year = this->year;
 			for (int i = 0; i < this->num_on_x_axis; i++) {
 				if (rtl) {
-					DrawStringMultiLine(x + x_sep, x, y, this->height,
+					DrawStringMultiLineWithClipping(x + x_sep, x, y, this->height,
 						GetString(month == 0 ? STR_GRAPH_X_LABEL_MONTH_YEAR : STR_GRAPH_X_LABEL_MONTH, STR_MONTH_ABBREV_JAN + month, year),
 						GRAPH_AXIS_LABEL_COLOUR, SA_LEFT);
 				} else {
-					DrawStringMultiLine(x, x + x_sep, y, this->height,
+					DrawStringMultiLineWithClipping(x, x + x_sep, y, this->height,
 						GetString(month == 0 ? STR_GRAPH_X_LABEL_MONTH_YEAR : STR_GRAPH_X_LABEL_MONTH, STR_MONTH_ABBREV_JAN + month, year),
 						GRAPH_AXIS_LABEL_COLOUR, SA_LEFT);
 				}
@@ -471,9 +477,6 @@ protected:
 			}
 		} else {
 			/* Draw x-axis labels for graphs not based on quarterly performance (cargo payment rates, and all graphs when using wallclock units). */
-			x = rtl ? r.right : r.left;
-			y = r.bottom + ScaleGUITrad(2);
-
 			int16_t iterator;
 			uint16_t label;
 			if (this->x_values_reversed) {
@@ -501,9 +504,9 @@ protected:
 		uint pointoffs1 = (linewidth + 1) / 2;
 		uint pointoffs2 = linewidth + 1 - pointoffs1;
 
-		for (const DataSet &dataset : this->data) {
-			if (HasBit(this->excluded_data, dataset.exclude_bit)) continue;
-			if (HasBit(this->excluded_range, dataset.range_bit)) continue;
+		auto draw_dataset = [&](const DataSet &dataset, uint8_t colour) {
+			if (HasBit(this->excluded_data, dataset.exclude_bit)) return;
+			if (HasBit(this->excluded_range, dataset.range_bit)) return;
 
 			/* Centre the dot between the grid lines. */
 			if (rtl) {
@@ -512,6 +515,9 @@ protected:
 				x = r.left + (x_sep / 2);
 			}
 
+			/* if there are not enough datapoints to fill the graph, align to the right */
+			x += (this->num_vert_lines - this->num_on_x_axis) * x_sep;
+
 			uint prev_x = INVALID_DATAPOINT_POS;
 			uint prev_y = INVALID_DATAPOINT_POS;
 
@@ -541,10 +547,10 @@ protected:
 					y = r.top + x_axis_offset - ((r.bottom - r.top) * datapoint) / (interval_size >> reduce_range);
 
 					/* Draw the point. */
-					GfxFillRect(x - pointoffs1, y - pointoffs1, x + pointoffs2, y + pointoffs2, dataset.colour);
+					GfxFillRect(x - pointoffs1, y - pointoffs1, x + pointoffs2, y + pointoffs2, colour);
 
 					/* Draw the line connected to the previous point. */
-					if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, dataset.colour, linewidth, dash);
+					if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, colour, linewidth, dash);
 
 					prev_x = x;
 					prev_y = y;
@@ -555,6 +561,23 @@ protected:
 
 				x += x_sep;
 			}
+		};
+
+		/* Draw unhighlighted datasets. */
+		for (const DataSet &dataset : this->data) {
+			if (dataset.exclude_bit != this->highlight_data && dataset.range_bit != this->highlight_range) {
+				draw_dataset(dataset, dataset.colour);
+			}
+		}
+
+		/* If any dataset or range is highlighted, draw separately after the rest so they appear on top of all other
+		 * data. Highlighted data is only drawn when highlight_state is set, otherwise it is invisible. */
+		if (this->highlight_state && (this->highlight_data != UINT8_MAX || this->highlight_range != UINT8_MAX)) {
+			for (const DataSet &dataset : this->data) {
+				if (dataset.exclude_bit == this->highlight_data || dataset.range_bit == this->highlight_range) {
+					draw_dataset(dataset, PC_WHITE);
+				}
+			}
 		}
 	}
 
@@ -565,20 +588,14 @@ protected:
 		SetWindowDirty(WC_GRAPH_LEGEND, 0);
 	}
 
-	void InitializeWindow(WindowNumber number)
-	{
-		/* Initialise the dataset */
-		this->UpdateStatistics(true);
+	const IntervalTimer<TimerWindow> blink_interval = {TIMER_BLINK_INTERVAL, [this](auto) {
+		/* If nothing is highlighted then no redraw is needed. */
+		if (this->highlight_data == UINT8_MAX && this->highlight_range == UINT8_MAX) return;
 
-		this->CreateNestedTree();
-
-		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
-		if (wid != nullptr && TimerGameEconomy::UsingWallclockUnits()) {
-			wid->SetString(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL);
-		}
-
-		this->FinishInitNested(number);
-	}
+		/* Toggle the highlight state and redraw. */
+		this->highlight_state = !this->highlight_state;
+		this->SetDirty();
+	}};
 
 public:
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
@@ -664,11 +681,6 @@ public:
 		}
 	}
 
-	virtual OverflowSafeInt64 GetGraphData(const Company *, int)
-	{
-		return INVALID_DATAPOINT;
-	}
-
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
 		/* Clicked on legend? */
@@ -689,6 +701,31 @@ public:
 		}
 	}
 
+	void OnMouseOver(Point pt, WidgetID widget) override
+	{
+		/* Test if a range should be highlighted. */
+		uint8_t new_highlight_range = UINT8_MAX;
+		if (widget == WID_GRAPH_RANGE_MATRIX) {
+			int row = GetRowFromWidget(pt.y, widget, 0, GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.framerect.Vertical());
+			if (!HasBit(this->excluded_range, row)) new_highlight_range = static_cast<uint8_t>(row);
+		}
+
+		/* Test if a dataset should be highlighted. */
+		uint8_t new_highlight_data = UINT8_MAX;
+		if (widget == WID_GRAPH_MATRIX) {
+			auto dataset_index = this->GetDatasetIndex(pt.y);
+			if (dataset_index.has_value() && !HasBit(this->excluded_data, *dataset_index)) new_highlight_data = *dataset_index;
+		}
+
+		if (this->highlight_data == new_highlight_data && this->highlight_range == new_highlight_range) return;
+
+		/* Range or data set highlight has changed, set and redraw. */
+		this->highlight_data = new_highlight_data;
+		this->highlight_range = new_highlight_range;
+		this->highlight_state = true;
+		this->SetDirty();
+	}
+
 	void OnGameTick() override
 	{
 		this->UpdateStatistics(false);
@@ -705,11 +742,33 @@ public:
 		this->UpdateStatistics(true);
 	}
 
+	virtual void UpdateStatistics(bool initialize) = 0;
+
+	virtual std::optional<uint8_t> GetDatasetIndex(int) { return std::nullopt; }
+};
+
+class BaseCompanyGraphWindow : public BaseGraphWindow {
+public:
+	BaseCompanyGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(desc, format_str_y_axis) {}
+
+	void InitializeWindow(WindowNumber number)
+	{
+		/* Initialise the dataset */
+		this->UpdateStatistics(true);
+
+		this->CreateNestedTree();
+
+		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
+		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? STR_GRAPH_LAST_72_MINUTES_TIME_LABEL : STR_EMPTY);
+
+		this->FinishInitNested(number);
+	}
+
 	/**
 	 * Update the statistics.
 	 * @param initialize Initialize the data structure.
 	 */
-	virtual void UpdateStatistics(bool initialize)
+	void UpdateStatistics(bool initialize) override
 	{
 		CompanyMask excluded_companies = _legend_excluded_companies;
 
@@ -762,6 +821,8 @@ public:
 			}
 		}
 	}
+
+	virtual OverflowSafeInt64 GetGraphData(const Company *, int) = 0;
 };
 
 
@@ -769,9 +830,9 @@ public:
 /* OPERATING PROFIT */
 /********************/
 
-struct OperatingProfitGraphWindow : BaseGraphWindow {
+struct OperatingProfitGraphWindow : BaseCompanyGraphWindow {
 	OperatingProfitGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+			BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -796,14 +857,10 @@ static constexpr NWidgetPart _nested_operating_profit_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 160), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 160), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -826,9 +883,9 @@ void ShowOperatingProfitGraph()
 /* INCOME GRAPH */
 /****************/
 
-struct IncomeGraphWindow : BaseGraphWindow {
+struct IncomeGraphWindow : BaseCompanyGraphWindow {
 	IncomeGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+			BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -853,14 +910,10 @@ static constexpr NWidgetPart _nested_income_graph_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -881,9 +934,9 @@ void ShowIncomeGraph()
 /* DELIVERED CARGO */
 /*******************/
 
-struct DeliveredCargoGraphWindow : BaseGraphWindow {
+struct DeliveredCargoGraphWindow : BaseCompanyGraphWindow {
 	DeliveredCargoGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_COMMA)
+			BaseCompanyGraphWindow(desc, STR_JUST_COMMA)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -908,14 +961,10 @@ static constexpr NWidgetPart _nested_delivered_cargo_graph_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -936,9 +985,9 @@ void ShowDeliveredCargoGraph()
 /* PERFORMANCE HISTORY */
 /***********************/
 
-struct PerformanceHistoryGraphWindow : BaseGraphWindow {
+struct PerformanceHistoryGraphWindow : BaseCompanyGraphWindow {
 	PerformanceHistoryGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_COMMA)
+			BaseCompanyGraphWindow(desc, STR_JUST_COMMA)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -970,14 +1019,10 @@ static constexpr NWidgetPart _nested_performance_history_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -998,9 +1043,9 @@ void ShowPerformanceHistoryGraph()
 /* COMPANY VALUE */
 /*****************/
 
-struct CompanyValueGraphWindow : BaseGraphWindow {
+struct CompanyValueGraphWindow : BaseCompanyGraphWindow {
 	CompanyValueGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+			BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -1025,14 +1070,10 @@ static constexpr NWidgetPart _nested_company_value_graph_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -1049,37 +1090,49 @@ void ShowCompanyValueGraph()
 	AllocateWindowDescFront<CompanyValueGraphWindow>(_company_value_graph_desc, 0);
 }
 
-/*****************/
-/* PAYMENT RATES */
-/*****************/
-
-struct PaymentRatesGraphWindow : BaseGraphWindow {
-	uint line_height = 0; ///< Pixel height of each cargo type row.
+struct BaseCargoGraphWindow : BaseGraphWindow {
 	Scrollbar *vscroll = nullptr; ///< Cargo list scrollbar.
+	uint line_height = 0; ///< Pixel height of each cargo type row.
 	uint legend_width = 0; ///< Width of legend 'blob'.
 
-	PaymentRatesGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+	CargoTypes cargo_types{}; ///< Cargo types that can be selected.
+
+	BaseCargoGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(desc, format_str_y_axis) {}
+
+	void InitializeWindow(WindowNumber number, StringID footer_wallclock = STR_EMPTY, StringID footer_calendar = STR_EMPTY)
 	{
-		this->num_on_x_axis = GRAPH_PAYMENT_RATE_STEPS;
-		this->num_vert_lines = GRAPH_PAYMENT_RATE_STEPS;
-		this->draw_dates = false;
-
-		this->x_values_reversed = false;
-		/* The x-axis is labeled in either seconds or days. A day is two seconds, so we adjust the label if needed. */
-		this->x_values_increment = (TimerGameEconomy::UsingWallclockUnits() ? PAYMENT_GRAPH_X_STEP_SECONDS : PAYMENT_GRAPH_X_STEP_DAYS);
-
 		this->CreateNestedTree();
+
+		this->cargo_types = this->GetCargoTypes(number);
+
 		this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR);
-		this->vscroll->SetCount(_sorted_standard_cargo_specs.size());
+		this->vscroll->SetCount(CountBits(this->cargo_types));
 
 		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
-		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS : STR_GRAPH_CARGO_PAYMENT_RATES_DAYS);
+		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? footer_wallclock : footer_calendar);
+
+		this->FinishInitNested(number);
 
 		/* Initialise the dataset */
-		this->UpdatePaymentRates();
+		this->InvalidateData();
+	}
 
-		this->FinishInitNested(window_number);
+	virtual CargoTypes GetCargoTypes(WindowNumber number) const = 0;
+	virtual CargoTypes &GetExcludedCargoTypes() const = 0;
+
+	std::optional<uint8_t> GetDatasetIndex(int y) override
+	{
+		int row = this->vscroll->GetScrolledRowFromWidget(y, this, WID_GRAPH_MATRIX);
+		if (row >= this->vscroll->GetCount()) return std::nullopt;
+
+		for (const CargoSpec *cs : _sorted_cargo_specs) {
+			if (!HasBit(this->cargo_types, cs->Index())) continue;
+			if (row-- > 0) continue;
+
+			return cs->Index();
+		}
+
+		return std::nullopt;
 	}
 
 	void OnInit() override
@@ -1088,11 +1141,6 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		this->legend_width = GetCharacterHeight(FS_SMALL) * 9 / 6;
 	}
 
-	void UpdateExcludedData()
-	{
-		this->excluded_data = _legend_excluded_cargo_payment_rates;
-	}
-
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
 	{
 		if (widget != WID_GRAPH_MATRIX) {
@@ -1102,7 +1150,9 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 
 		size.height = GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.framerect.Vertical();
 
-		for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
+		for (CargoType cargo_type : SetCargoBitIterator(this->cargo_types)) {
+			const CargoSpec *cs = CargoSpec::Get(cargo_type);
+
 			Dimension d = GetStringBoundingBox(GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
 			d.width += this->legend_width + WidgetDimensions::scaled.hsep_normal; // colour field
 			d.width += WidgetDimensions::scaled.framerect.Horizontal();
@@ -1113,7 +1163,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		this->line_height = size.height;
 		size.height = this->line_height * 11; /* Default number of cargo types in most climates. */
 		resize.width = 0;
-		resize.height = this->line_height;
+		fill.height = resize.height = this->line_height;
 	}
 
 	void DrawWidget(const Rect &r, WidgetID widget) const override
@@ -1125,13 +1175,18 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 
 		bool rtl = _current_text_dir == TD_RTL;
 
-		auto [first, last] = this->vscroll->GetVisibleRangeIterators(_sorted_standard_cargo_specs);
+		int pos = this->vscroll->GetPosition();
+		int max = pos + this->vscroll->GetCapacity();
 
 		Rect line = r.WithHeight(this->line_height);
-		for (auto it = first; it != last; ++it) {
-			const CargoSpec *cs = *it;
 
-			bool lowered = !HasBit(_legend_excluded_cargo_payment_rates, cs->Index());
+		for (const CargoSpec *cs : _sorted_cargo_specs) {
+			if (!HasBit(this->cargo_types, cs->Index())) continue;
+
+			if (pos-- > 0) continue;
+			if (--max < 0) break;
+
+			bool lowered = !HasBit(this->excluded_data, cs->Index());
 
 			/* Redraw frame if lowered */
 			if (lowered) DrawFrameRect(line, COLOUR_BROWN, FrameFlag::Lowered);
@@ -1141,7 +1196,9 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 			/* Cargo-colour box with outline */
 			const Rect cargo = text.WithWidth(this->legend_width, rtl);
 			GfxFillRect(cargo, PC_BLACK);
-			GfxFillRect(cargo.Shrink(WidgetDimensions::scaled.bevel), cs->legend_colour);
+			uint8_t pc = cs->legend_colour;
+			if (this->highlight_data == cs->Index()) pc = this->highlight_state ? PC_WHITE : PC_BLACK;
+			GfxFillRect(cargo.Shrink(WidgetDimensions::scaled.bevel), pc);
 
 			/* Cargo name */
 			DrawString(text.Indent(this->legend_width + WidgetDimensions::scaled.hsep_normal, rtl), GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
@@ -1155,27 +1212,31 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		switch (widget) {
 			case WID_GRAPH_ENABLE_CARGOES:
 				/* Remove all cargoes from the excluded lists. */
-				_legend_excluded_cargo_payment_rates = 0;
-				this->excluded_data = 0;
+				this->GetExcludedCargoTypes() = {};
+				this->excluded_data = this->GetExcludedCargoTypes();
 				this->SetDirty();
 				break;
 
 			case WID_GRAPH_DISABLE_CARGOES: {
 				/* Add all cargoes to the excluded lists. */
-				for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
-					SetBit(_legend_excluded_cargo_payment_rates, cs->Index());
-					SetBit(this->excluded_data, cs->Index());
-				}
+				this->GetExcludedCargoTypes() = this->cargo_types;
+				this->excluded_data = this->GetExcludedCargoTypes();
 				this->SetDirty();
 				break;
 			}
 
 			case WID_GRAPH_MATRIX: {
-				auto it = this->vscroll->GetScrolledItemFromWidget(_sorted_standard_cargo_specs, pt.y, this, WID_GRAPH_MATRIX);
-				if (it != _sorted_standard_cargo_specs.end()) {
-					ToggleBit(_legend_excluded_cargo_payment_rates, (*it)->Index());
-					this->UpdateExcludedData();
+				int row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GRAPH_MATRIX);
+				if (row >= this->vscroll->GetCount()) return;
+
+				for (const CargoSpec *cs : _sorted_cargo_specs) {
+					if (!HasBit(this->cargo_types, cs->Index())) continue;
+					if (row-- > 0) continue;
+
+					ToggleBit(this->GetExcludedCargoTypes(), cs->Index());
+					this->excluded_data = this->GetExcludedCargoTypes();
 					this->SetDirty();
+					break;
 				}
 				break;
 			}
@@ -1190,10 +1251,36 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 	{
 		this->vscroll->SetCapacityFromWidget(this, WID_GRAPH_MATRIX);
 	}
+};
 
-	void OnGameTick() override
+/*****************/
+/* PAYMENT RATES */
+/*****************/
+
+struct PaymentRatesGraphWindow : BaseCargoGraphWindow {
+	static inline CargoTypes excluded_cargo_types{};
+
+	PaymentRatesGraphWindow(WindowDesc &desc, WindowNumber window_number) : BaseCargoGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
-		/* Override default OnGameTick */
+		this->num_on_x_axis = GRAPH_PAYMENT_RATE_STEPS;
+		this->num_vert_lines = GRAPH_PAYMENT_RATE_STEPS;
+		this->draw_dates = false;
+
+		this->x_values_reversed = false;
+		/* The x-axis is labeled in either seconds or days. A day is two seconds, so we adjust the label if needed. */
+		this->x_values_increment = (TimerGameEconomy::UsingWallclockUnits() ? PAYMENT_GRAPH_X_STEP_SECONDS : PAYMENT_GRAPH_X_STEP_DAYS);
+
+		this->InitializeWindow(window_number, STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS, STR_GRAPH_CARGO_PAYMENT_RATES_DAYS);
+	}
+
+	CargoTypes GetCargoTypes(WindowNumber) const override
+	{
+		return _standard_cargo_mask;
+	}
+
+	CargoTypes &GetExcludedCargoTypes() const override
+	{
+		return PaymentRatesGraphWindow::excluded_cargo_types;
 	}
 
 	/**
@@ -1208,16 +1295,18 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 	}
 
 	/** Update the payment rates on a regular interval. */
-	IntervalTimer<TimerWindow> update_payment_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> update_payment_interval = {std::chrono::seconds(3), [this](auto) {
 		this->UpdatePaymentRates();
 	}};
 
+	void UpdateStatistics(bool) override {}
+
 	/**
 	 * Update the payment rates according to the latest information.
 	 */
 	void UpdatePaymentRates()
 	{
-		this->UpdateExcludedData();
+		this->excluded_data = this->GetExcludedCargoTypes();
 
 		this->data.clear();
 		for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
@@ -1241,11 +1330,7 @@ static constexpr NWidgetPart _nested_cargo_payment_rates_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND), SetMinimalSize(568, 128),
-		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_HEADER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-		EndContainer(),
+		NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_HEADER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetStringTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1),
 			NWidget(NWID_VERTICAL),
@@ -1262,9 +1347,7 @@ static constexpr NWidgetPart _nested_cargo_payment_rates_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
 			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
@@ -1381,7 +1464,7 @@ struct PerformanceRatingDetailWindow : Window {
 			if (this->IsWidgetDisabled(widget)) return;
 			CompanyID cid = (CompanyID)(widget - WID_PRD_COMPANY_FIRST);
 			Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON);
-			DrawCompanyIcon(cid, CenterBounds(r.left, r.right, sprite_size.width), CenterBounds(r.top, r.bottom, sprite_size.height));
+			DrawCompanyIcon(cid, CentreBounds(r.left, r.right, sprite_size.width), CentreBounds(r.top, r.bottom, sprite_size.height));
 			return;
 		}
 
@@ -1404,8 +1487,8 @@ struct PerformanceRatingDetailWindow : Window {
 			needed = SCORE_MAX;
 		}
 
-		uint bar_top  = CenterBounds(r.top, r.bottom, this->bar_height);
-		uint text_top = CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL));
+		uint bar_top  = CentreBounds(r.top, r.bottom, this->bar_height);
+		uint text_top = CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL));
 
 		DrawString(this->score_info_left, this->score_info_right, text_top, STR_PERFORMANCE_DETAIL_VEHICLES + score_type);
 
@@ -1510,18 +1593,16 @@ CompanyID PerformanceRatingDetailWindow::company = CompanyID::Invalid();
 /* INDUSTRY PRODUCTION HISTORY */
 /*******************************/
 
-struct IndustryProductionGraphWindow : BaseGraphWindow {
-	uint line_height = 0; ///< Pixel height of each cargo type row.
-	Scrollbar *vscroll = nullptr; ///< Cargo list scrollbar.
-	uint legend_width = 0;  ///< Width of legend 'blob'.
-
+struct IndustryProductionGraphWindow : BaseCargoGraphWindow {
 	static inline constexpr StringID RANGE_LABELS[] = {
 		STR_GRAPH_INDUSTRY_RANGE_PRODUCED,
 		STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED
 	};
 
+	static inline CargoTypes excluded_cargo_types{};
+
 	IndustryProductionGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_COMMA)
+			BaseCargoGraphWindow(desc, STR_JUST_COMMA)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -1530,156 +1611,22 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 		this->draw_dates = !TimerGameEconomy::UsingWallclockUnits();
 		this->ranges = RANGE_LABELS;
 
-		this->CreateNestedTree();
-		this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR);
+		this->InitializeWindow(window_number, STR_GRAPH_LAST_24_MINUTES_TIME_LABEL);
+	}
 
-		int count = 0;
+	CargoTypes GetCargoTypes(WindowNumber window_number) const override
+	{
+		CargoTypes cargo_types{};
 		const Industry *i = Industry::Get(window_number);
 		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-			count++;
+			if (IsValidCargoType(p.cargo)) SetBit(cargo_types, p.cargo);
 		}
-		this->vscroll->SetCount(count);
-
-		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
-		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? STR_GRAPH_LAST_24_MINUTES_TIME_LABEL : STR_EMPTY);
-
-		this->FinishInitNested(window_number);
-
-		/* Initialise the dataset */
-		this->UpdateStatistics(true);
+		return cargo_types;
 	}
 
-	void OnInit() override
+	CargoTypes &GetExcludedCargoTypes() const override
 	{
-		/* Width of the legend blob. */
-		this->legend_width = GetCharacterHeight(FS_SMALL) * 9 / 6;
-	}
-
-	void UpdateExcludedData()
-	{
-		this->excluded_data = 0;
-
-		const Industry *i = Industry::Get(this->window_number);
-		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-			if (HasBit(_legend_excluded_cargo_production_history, p.cargo)) SetBit(this->excluded_data, p.cargo);
-		}
-	}
-
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
-	{
-		if (widget != WID_GRAPH_MATRIX) {
-			BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize);
-			return;
-		}
-
-		const Industry *i = Industry::Get(this->window_number);
-		const CargoSpec *cs;
-		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-
-			cs = CargoSpec::Get(p.cargo);
-			Dimension d = GetStringBoundingBox(GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
-			d.width += this->legend_width + WidgetDimensions::scaled.hsep_normal; // colour field
-			d.width += WidgetDimensions::scaled.framerect.Horizontal();
-			d.height += WidgetDimensions::scaled.framerect.Vertical();
-			size = maxdim(d, size);
-		}
-
-		this->line_height = size.height;
-		size.height = this->line_height * 11; /* Default number of cargo types in most climates. */
-		resize.width = 0;
-		resize.height = this->line_height;
-	}
-
-	void DrawWidget(const Rect &r, WidgetID widget) const override
-	{
-		if (widget != WID_GRAPH_MATRIX) {
-			BaseGraphWindow::DrawWidget(r, widget);
-			return;
-		}
-
-		bool rtl = _current_text_dir == TD_RTL;
-
-		int pos = this->vscroll->GetPosition();
-		int max = pos + this->vscroll->GetCapacity();
-
-		Rect line = r.WithHeight(this->line_height);
-		const Industry *i = Industry::Get(this->window_number);
-		const CargoSpec *cs;
-
-		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-
-			if (pos-- > 0) continue;
-			if (--max < 0) break;
-
-			cs = CargoSpec::Get(p.cargo);
-
-			bool lowered = !HasBit(_legend_excluded_cargo_production_history, p.cargo);
-
-			/* Redraw frame if lowered */
-			if (lowered) DrawFrameRect(line, COLOUR_BROWN, FrameFlag::Lowered);
-
-			const Rect text = line.Shrink(WidgetDimensions::scaled.framerect);
-
-			/* Cargo-colour box with outline */
-			const Rect cargo = text.WithWidth(this->legend_width, rtl);
-			GfxFillRect(cargo, PC_BLACK);
-			GfxFillRect(cargo.Shrink(WidgetDimensions::scaled.bevel), cs->legend_colour);
-
-			/* Cargo name */
-			DrawString(text.Indent(this->legend_width + WidgetDimensions::scaled.hsep_normal, rtl), GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
-
-			line = line.Translate(0, this->line_height);
-		}
-	}
-
-	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
-	{
-		switch (widget) {
-			case WID_GRAPH_ENABLE_CARGOES:
-				/* Remove all cargoes from the excluded lists. */
-				_legend_excluded_cargo_production_history = 0;
-				this->excluded_data = 0;
-				this->SetDirty();
-				break;
-
-			case WID_GRAPH_DISABLE_CARGOES: {
-				/* Add all cargoes to the excluded lists. */
-				const Industry *i = Industry::Get(this->window_number);
-				for (const auto &p : i->produced) {
-					if (!IsValidCargoType(p.cargo)) continue;
-
-					SetBit(_legend_excluded_cargo_production_history, p.cargo);
-					SetBit(this->excluded_data, p.cargo);
-				}
-				this->SetDirty();
-				break;
-			}
-
-			case WID_GRAPH_MATRIX: {
-				int row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GRAPH_MATRIX);
-				if (row >= this->vscroll->GetCount()) return;
-
-				const Industry *i = Industry::Get(this->window_number);
-				for (const auto &p : i->produced) {
-					if (!IsValidCargoType(p.cargo)) continue;
-					if (row-- > 0) continue;
-
-					ToggleBit(_legend_excluded_cargo_production_history, p.cargo);
-					this->UpdateExcludedData();
-					this->SetDirty();
-					break;
-				}
-				break;
-			}
-
-			default:
-				this->BaseGraphWindow::OnClick(pt, widget, click_count);
-				break;
-		}
+		return IndustryProductionGraphWindow::excluded_cargo_types;
 	}
 
 	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
@@ -1689,16 +1636,8 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 		return this->Window::GetWidgetString(widget, stringid);
 	}
 
-	void OnResize() override
-	{
-		this->vscroll->SetCapacityFromWidget(this, WID_GRAPH_MATRIX);
-	}
-
 	void UpdateStatistics(bool initialize) override
 	{
-		CargoTypes excluded_cargo = this->excluded_data;
-		this->UpdateExcludedData();
-
 		int mo = TimerGameEconomy::month - this->num_vert_lines;
 		auto yr = TimerGameEconomy::year;
 		while (mo < 0) {
@@ -1706,11 +1645,12 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 			mo += 12;
 		}
 
-		if (!initialize && this->excluded_data == excluded_cargo && this->num_on_x_axis == this->num_vert_lines && this->year == yr && this->month == mo) {
+		if (!initialize && this->excluded_data == this->GetExcludedCargoTypes() && this->num_on_x_axis == this->num_vert_lines && this->year == yr && this->month == mo) {
 			/* There's no reason to get new stats */
 			return;
 		}
 
+		this->excluded_data = this->GetExcludedCargoTypes();
 		this->year = yr;
 		this->month = mo;
 
@@ -1741,8 +1681,6 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 			}
 		}
 
-		this->vscroll->SetCount(std::size(this->data));
-
 		this->SetDirty();
 	}
 };
@@ -1774,9 +1712,7 @@ static constexpr NWidgetPart _nested_industry_production_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
 			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
@@ -1860,6 +1796,6 @@ void ShowPerformanceRatingDetail()
 void InitializeGraphGui()
 {
 	_legend_excluded_companies = CompanyMask{};
-	_legend_excluded_cargo_payment_rates = 0;
-	_legend_excluded_cargo_production_history = 0;
+	PaymentRatesGraphWindow::excluded_cargo_types = {};
+	IndustryProductionGraphWindow::excluded_cargo_types = {};
 }
diff --git a/src/group.h b/src/group.h
index fabbaf3137..28de518012 100644
--- a/src/group.h
+++ b/src/group.h
@@ -11,6 +11,7 @@
 #define GROUP_H
 
 #include "group_type.h"
+#include "core/flatset_type.hpp"
 #include "core/pool_type.hpp"
 #include "company_type.h"
 #include "vehicle_type.h"
@@ -78,6 +79,7 @@ struct Group : GroupPool::PoolItem<&_group_pool> {
 	Livery livery{}; ///< Custom colour scheme for vehicles in this group
 	GroupStatistics statistics{}; ///< NOSAVE: Statistics and caches on the vehicles in the group.
 
+	FlatSet<GroupID> children; ///< NOSAVE: child groups belonging to this group.
 	bool folded = false; ///< NOSAVE: Is this group folded in the group view?
 
 	GroupID parent = GroupID::Invalid(); ///< Parent group
@@ -104,6 +106,7 @@ inline bool IsAllGroupID(GroupID id_g)
 }
 
 
+void UpdateGroupChildren();
 uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e);
 uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type);
 uint GetGroupNumVehicleMinAge(CompanyID company, GroupID id_g, VehicleType type);
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 2ccbfe2420..84527d9b9f 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -41,6 +41,16 @@ void GroupStatistics::Clear()
 	this->num_engines.clear();
 }
 
+/**
+ * Update children list for each group.
+ */
+void UpdateGroupChildren()
+{
+	for (Group *g : Group::Iterate()) {
+		if (g->parent != GroupID::Invalid()) Group::Get(g->parent)->children.insert(g->index);
+	}
+}
+
 /**
  * Get number of vehicles of a specific engine ID.
  * @param engine Engine ID.
@@ -294,12 +304,11 @@ static void PropagateChildLivery(const Group *g, bool reset_cache)
 		}
 	}
 
-	for (Group *cg : Group::Iterate()) {
-		if (cg->parent == g->index) {
-			if (!HasBit(cg->livery.in_use, 0)) cg->livery.colour1 = g->livery.colour1;
-			if (!HasBit(cg->livery.in_use, 1)) cg->livery.colour2 = g->livery.colour2;
-			PropagateChildLivery(cg, reset_cache);
-		}
+	for (const GroupID &childgroup : g->children) {
+		Group *cg = Group::Get(childgroup);
+		if (!HasBit(cg->livery.in_use, 0)) cg->livery.colour1 = g->livery.colour1;
+		if (!HasBit(cg->livery.in_use, 1)) cg->livery.colour2 = g->livery.colour2;
+		PropagateChildLivery(cg, reset_cache);
 	}
 }
 
@@ -333,7 +342,7 @@ std::tuple<CommandCost, GroupID> CmdCreateGroup(DoCommandFlags flags, VehicleTyp
 
 	if (!Group::CanAllocateItem()) return { CMD_ERROR, GroupID::Invalid() };
 
-	const Group *pg = Group::GetIfValid(parent_group);
+	Group *pg = Group::GetIfValid(parent_group);
 	if (pg != nullptr) {
 		if (pg->owner != _current_company) return { CMD_ERROR, GroupID::Invalid() };
 		if (pg->vehicle_type != vt) return { CMD_ERROR, GroupID::Invalid() };
@@ -353,6 +362,7 @@ std::tuple<CommandCost, GroupID> CmdCreateGroup(DoCommandFlags flags, VehicleTyp
 			g->livery.colour1 = pg->livery.colour1;
 			g->livery.colour2 = pg->livery.colour2;
 			g->flags = pg->flags;
+			pg->children.insert(g->index);
 		}
 
 		InvalidateWindowData(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_GROUP_LIST, vt, _current_company).ToWindowNumber());
@@ -380,10 +390,8 @@ CommandCost CmdDeleteGroup(DoCommandFlags flags, GroupID group_id)
 	Command<CMD_REMOVE_ALL_VEHICLES_GROUP>::Do(flags, group_id);
 
 	/* Delete sub-groups */
-	for (const Group *gp : Group::Iterate()) {
-		if (gp->parent == g->index) {
-			Command<CMD_DELETE_GROUP>::Do(flags, gp->index);
-		}
+	for (const GroupID &childgroup : g->children) {
+		Command<CMD_DELETE_GROUP>::Do(flags, childgroup);
 	}
 
 	if (flags.Test(DoCommandFlag::Execute)) {
@@ -401,6 +409,11 @@ CommandCost CmdDeleteGroup(DoCommandFlags flags, GroupID group_id)
 			c->freegroups.ReleaseID(g->number);
 		}
 
+		if (g->parent != GroupID::Invalid()) {
+			Group *pg = Group::Get(g->parent);
+			pg->children.erase(g->index);
+		}
+
 		VehicleType vt = g->vehicle_type;
 
 		/* Delete the Replace Vehicle Windows */
@@ -445,6 +458,9 @@ CommandCost CmdAlterGroup(DoCommandFlags flags, AlterGroupMode mode, GroupID gro
 			}
 		}
 	} else if (mode == AlterGroupMode::SetParent) {
+		/* Do nothing if the parent group isn't actually changed. */
+		if (g->parent == parent_id) return CommandCost();
+
 		/* Set group parent */
 		const Group *pg = Group::GetIfValid(parent_id);
 
@@ -458,7 +474,10 @@ CommandCost CmdAlterGroup(DoCommandFlags flags, AlterGroupMode mode, GroupID gro
 		}
 
 		if (flags.Test(DoCommandFlag::Execute)) {
+			if (g->parent != GroupID::Invalid()) Group::Get(g->parent)->children.erase(g->index);
 			g->parent = (pg == nullptr) ? GroupID::Invalid() : pg->index;
+			if (g->parent != GroupID::Invalid()) Group::Get(g->parent)->children.insert(g->index);
+
 			GroupStatistics::UpdateAutoreplace(g->owner);
 
 			if (!HasBit(g->livery.in_use, 0) || !HasBit(g->livery.in_use, 1)) {
@@ -515,6 +534,9 @@ static void AddVehicleToGroup(Vehicle *v, GroupID new_g)
 			break;
 	}
 
+	InvalidateWindowData(WC_VEHICLE_VIEW, v->index);
+	InvalidateWindowData(WC_VEHICLE_DETAILS, v->index);
+
 	GroupStatistics::CountVehicle(v, 1);
 }
 
@@ -572,10 +594,6 @@ std::tuple<CommandCost, GroupID> CmdAddVehicleGroup(DoCommandFlags flags, GroupI
 			}
 
 			SetWindowDirty(WC_VEHICLE_DEPOT, v->tile);
-			SetWindowDirty(WC_VEHICLE_VIEW, v->index);
-			SetWindowDirty(WC_VEHICLE_DETAILS, v->index);
-			InvalidateWindowData(WC_VEHICLE_VIEW, v->index);
-			InvalidateWindowData(WC_VEHICLE_DETAILS, v->index);
 		}
 
 		GroupStatistics::UpdateAutoreplace(_current_company);
@@ -697,8 +715,8 @@ static void SetGroupFlag(Group *g, GroupFlag flag, bool set, bool children)
 
 	if (!children) return;
 
-	for (Group *pg : Group::Iterate()) {
-		if (pg->parent == g->index) SetGroupFlag(pg, flag, set, true);
+	for (const GroupID &childgroup : g->children) {
+		SetGroupFlag(Group::Get(childgroup), flag, set, true);
 	}
 }
 
@@ -791,11 +809,14 @@ void UpdateTrainGroupID(Train *v)
 uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
 {
 	uint count = 0;
-	const Engine *e = Engine::Get(id_e);
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) count += GetGroupNumEngines(company, g->index, id_e);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			count += GetGroupNumEngines(company, childgroup, id_e);
+		}
 	}
-	return count + GroupStatistics::Get(company, id_g, e->type).GetNumEngines(id_e);
+
+	return count + GroupStatistics::Get(company, id_g, Engine::Get(id_e)->type).GetNumEngines(id_e);
 }
 
 /**
@@ -809,9 +830,13 @@ uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
 uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type)
 {
 	uint count = 0;
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) count += GetGroupNumVehicle(company, g->index, type);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			count += GetGroupNumVehicle(company, childgroup, type);
+		}
 	}
+
 	return count + GroupStatistics::Get(company, id_g, type).num_vehicle;
 }
 
@@ -826,9 +851,13 @@ uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type)
 uint GetGroupNumVehicleMinAge(CompanyID company, GroupID id_g, VehicleType type)
 {
 	uint count = 0;
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) count += GetGroupNumVehicleMinAge(company, g->index, type);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			count += GetGroupNumVehicleMinAge(company, childgroup, type);
+		}
 	}
+
 	return count + GroupStatistics::Get(company, id_g, type).num_vehicle_min_age;
 }
 
@@ -843,9 +872,13 @@ uint GetGroupNumVehicleMinAge(CompanyID company, GroupID id_g, VehicleType type)
 Money GetGroupProfitLastYearMinAge(CompanyID company, GroupID id_g, VehicleType type)
 {
 	Money sum = 0;
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) sum += GetGroupProfitLastYearMinAge(company, g->index, type);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			sum += GetGroupProfitLastYearMinAge(company, childgroup, type);
+		}
 	}
+
 	return sum + GroupStatistics::Get(company, id_g, type).profit_last_year_min_age;
 }
 
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 20eb26180f..e94844f02f 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -111,65 +111,12 @@ static constexpr NWidgetPart _nested_group_widgets[] = {
 	EndContainer(),
 };
 
-/**
- * Add children to GUI group list to build a hierarchical tree.
- * @param dst Destination list.
- * @param src Source list.
- * @param fold Whether to handle group folding/hiding.
- * @param parent Current tree parent (set by self with recursion).
- * @param indent Current tree indentation level (set by self with recursion).
- */
-static void GuiGroupListAddChildren(GUIGroupList &dst, const GUIGroupList &src, bool fold, GroupID parent = GroupID::Invalid(), uint8_t indent = 0)
+static void SortGUIGroupList(std::vector<GUIGroupListItem> &list)
 {
-	for (const auto &item : src) {
-		if (item.group->parent != parent) continue;
-
-		dst.emplace_back(item.group, indent);
-
-		if (fold && item.group->folded) {
-			/* Test if this group has children at all. If not, the folded flag should be cleared to avoid lingering unfold buttons in the list. */
-			GroupID groupid = item.group->index;
-			bool has_children = std::any_of(src.begin(), src.end(), [groupid](const auto &child) { return child.group->parent == groupid; });
-			Group::Get(item.group->index)->folded = has_children;
-		} else {
-			GuiGroupListAddChildren(dst, src, fold, item.group->index, indent + 1);
-		}
-	}
-
-	if (indent > 0 || dst.empty()) return;
-
-	/* Hierarchy is complete, traverse in reverse to find where indentation levels continue. */
-	uint16_t level_mask = 0;
-	for (auto it = std::rbegin(dst); std::next(it) != std::rend(dst); ++it) {
-		auto next_it = std::next(it);
-		AssignBit(level_mask, it->indent, it->indent <= next_it->indent);
-		next_it->level_mask = level_mask;
-	}
-}
-
-/**
- * Build GUI group list, a sorted hierarchical list of groups for owner and vehicle type.
- * @param dst Destination list, owned by the caller.
- * @param fold Whether to handle group folding/hiding.
- * @param owner Owner of groups.
- * @param veh_type Vehicle type of groups.
- */
-void BuildGuiGroupList(GUIGroupList &dst, bool fold, Owner owner, VehicleType veh_type)
-{
-	GUIGroupList list;
-
-	for (const Group *g : Group::Iterate()) {
-		if (g->owner == owner && g->vehicle_type == veh_type) {
-			list.emplace_back(g, 0);
-		}
-	}
-
-	list.ForceResort();
-
 	/* Sort the groups by their name */
 	std::array<std::pair<const Group *, std::string>, 2> last_group{};
 
-	list.Sort([&last_group](const GUIGroupListItem &a, const GUIGroupListItem &b) -> bool {
+	std::ranges::sort(list, [&last_group](const GUIGroupListItem &a, const GUIGroupListItem &b) -> bool {
 		if (a.group != last_group[0].first) {
 			last_group[0] = {a.group, GetString(STR_GROUP_NAME, a.group->index)};
 		}
@@ -182,8 +129,68 @@ void BuildGuiGroupList(GUIGroupList &dst, bool fold, Owner owner, VehicleType ve
 		if (r == 0) return a.group->number < b.group->number;
 		return r < 0;
 	});
+}
 
-	GuiGroupListAddChildren(dst, list, fold, GroupID::Invalid(), 0);
+/**
+ * Add children to GUI group list to build a hierarchical tree.
+ * @param list Destination list.
+ * @param item Group item to add children to.
+ * @param fold Whether to handle group folding/hiding.
+ * @param indent Current tree indentation level (set by self with recursion).
+ */
+static void GuiGroupListAddChildren(GUIGroupList &list, GUIGroupListItem &item, bool fold, uint8_t indent = 1)
+{
+	if (fold && item.group->folded) {
+		Group::Get(item.group->index)->folded = !item.group->children.empty();
+		return;
+	}
+
+	if (item.group->children.empty()) return;
+
+	std::vector<GUIGroupListItem> sublist;
+	for (const GroupID &group : item.group->children) {
+		sublist.emplace_back(Group::Get(group), indent);
+	}
+	SortGUIGroupList(sublist);
+
+	for (const GUIGroupListItem &subitem : sublist) {
+		GuiGroupListAddChildren(list, list.emplace_back(subitem), fold, indent + 1);
+	}
+}
+
+/**
+ * Build GUI group list, a sorted hierarchical list of groups for owner and vehicle type.
+ * @param dst Destination list, owned by the caller.
+ * @param fold Whether to handle group folding/hiding.
+ * @param owner Owner of groups.
+ * @param veh_type Vehicle type of groups.
+ */
+void BuildGuiGroupList(GUIGroupList &list, bool fold, Owner owner, VehicleType veh_type)
+{
+	/* Make a temporary list of parent groups */
+	std::vector<GUIGroupListItem> sublist;
+	for (const Group *g : Group::Iterate()) {
+		if (g->parent != GroupID::Invalid()) continue;
+		if (g->owner != owner) continue;
+		if (g->vehicle_type != veh_type) continue;
+		sublist.emplace_back(g, 0);
+	}
+	SortGUIGroupList(sublist);
+
+	/* Now add each parent group, and its children if necessary, to the list. */
+	for (auto &item : sublist) {
+		GuiGroupListAddChildren(list, list.emplace_back(item), fold);
+	}
+
+	if (list.empty()) return;
+
+	/* Hierarchy is complete, traverse in reverse to find where indentation levels continue. */
+	uint16_t level_mask = 0;
+	for (auto it = std::rbegin(list); std::next(it) != std::rend(list); ++it) {
+		auto next_it = std::next(it);
+		AssignBit(level_mask, it->indent, it->indent <= next_it->indent);
+		next_it->level_mask = level_mask;
+	}
 }
 
 class VehicleGroupWindow : public BaseVehicleListWindow {
@@ -423,8 +430,7 @@ public:
 		switch (widget) {
 			case WID_GL_LIST_GROUP:
 				size.width = this->ComputeGroupInfoSize();
-				resize.height = this->tiny_step_height;
-				fill.height = this->tiny_step_height;
+				fill.height = resize.height = this->tiny_step_height;
 				break;
 
 			case WID_GL_ALL_VEHICLES:
@@ -443,7 +449,7 @@ public:
 
 			case WID_GL_LIST_VEHICLE:
 				this->ComputeGroupInfoSize();
-				resize.height = GetVehicleListHeight(this->vli.vtype, this->tiny_step_height);
+				fill.height = resize.height = GetVehicleListHeight(this->vli.vtype, this->tiny_step_height);
 				size.height = 4 * resize.height;
 				break;
 
@@ -981,7 +987,7 @@ public:
 		this->vscroll->SetCapacityFromWidget(this, WID_GL_LIST_VEHICLE);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_GL_GROUP_BY_DROPDOWN:
diff --git a/src/group_gui.h b/src/group_gui.h
index 7b855deafb..a4385ca853 100644
--- a/src/group_gui.h
+++ b/src/group_gui.h
@@ -11,6 +11,8 @@
 #define GROUP_GUI_H
 
 #include "company_type.h"
+#include "group_type.h"
+#include "sortlist_type.h"
 #include "vehicle_type.h"
 
 void ShowCompanyGroup(CompanyID company, VehicleType veh, GroupID group = GroupID::Invalid());
diff --git a/src/gui.h b/src/gui.h
index 60c5c394e9..5cfded5c8f 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -25,7 +25,6 @@ void InitializeGUI();
 
 /* settings_gui.cpp */
 void ShowGameOptions();
-void ShowGameSettings();
 
 /* train_gui.cpp */
 void ShowOrdersWindow(const Vehicle *v);
diff --git a/src/heightmap.cpp b/src/heightmap.cpp
index 7520745cc0..462d8d15ea 100644
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -135,7 +135,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
  * If map == nullptr only the size of the PNG is read, otherwise a map
  * with grayscale pixels is allocated and assigned to *map.
  */
-static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
+static bool ReadHeightmapPNG(std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
 {
 	png_structp png_ptr = nullptr;
 	png_infop info_ptr  = nullptr;
@@ -256,7 +256,7 @@ static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &inf
  * If map == nullptr only the size of the BMP is read, otherwise a map
  * with grayscale pixels is allocated and assigned to *map.
  */
-static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
+static bool ReadHeightmapBMP(std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
 {
 	auto f = FioFOpenFile(filename, "rb", HEIGHTMAP_DIR);
 	if (!f.has_value()) {
@@ -475,7 +475,7 @@ void FixSlopes()
  * @param[in,out] map If not \c nullptr, destination to store the loaded block of image data.
  * @return Whether loading was successful.
  */
-static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
+static bool ReadHeightMap(DetailedFileType dft, std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
 {
 	switch (dft) {
 		default:
@@ -499,7 +499,7 @@ static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, u
  * @param y dimension y
  * @return Returns false if loading of the image failed.
  */
-bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x, uint *y)
+bool GetHeightmapDimensions(DetailedFileType dft, std::string_view filename, uint *x, uint *y)
 {
 	return ReadHeightMap(dft, filename, x, y, nullptr);
 }
@@ -511,7 +511,7 @@ bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x,
  * @param dft Type of image file.
  * @param filename of the heightmap file to be imported
  */
-bool LoadHeightmap(DetailedFileType dft, const char *filename)
+bool LoadHeightmap(DetailedFileType dft, std::string_view filename)
 {
 	uint x, y;
 	std::vector<uint8_t> map;
diff --git a/src/heightmap.h b/src/heightmap.h
index 5809e1b126..013781f117 100644
--- a/src/heightmap.h
+++ b/src/heightmap.h
@@ -21,8 +21,8 @@ enum HeightmapRotation : uint8_t {
 	HM_CLOCKWISE,         ///< Rotate the map clockwise 45 degrees
 };
 
-bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x, uint *y);
-bool LoadHeightmap(DetailedFileType dft, const char *filename);
+bool GetHeightmapDimensions(DetailedFileType dft, std::string_view filename, uint *x, uint *y);
+bool LoadHeightmap(DetailedFileType dft, std::string_view filename);
 void FlatEmptyWorld(uint8_t tile_height);
 void FixSlopes();
 
diff --git a/src/help_gui.cpp b/src/help_gui.cpp
index 43493d0897..14c18652a8 100644
--- a/src/help_gui.cpp
+++ b/src/help_gui.cpp
@@ -61,7 +61,7 @@ static std::optional<std::string> FindGameManualFilePath(std::string_view filena
 
 /** Window class displaying the game manual textfile viewer. */
 struct GameManualTextfileWindow : public TextfileWindow {
-	GameManualTextfileWindow(std::string_view filename, Subdirectory subdir) : TextfileWindow(TFT_GAME_MANUAL)
+	GameManualTextfileWindow(std::string_view filename, Subdirectory subdir) : TextfileWindow(nullptr, TFT_GAME_MANUAL)
 	{
 		this->ConstructWindow();
 
@@ -202,7 +202,7 @@ static constexpr NWidgetPart _nested_helpwin_widgets[] = {
 };
 
 static WindowDesc _helpwin_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_HELPWIN, WC_NONE,
 	{},
 	_nested_helpwin_widgets
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
index fc71a31f79..798e1ec61a 100644
--- a/src/highscore_gui.cpp
+++ b/src/highscore_gui.cpp
@@ -214,14 +214,14 @@ static constexpr NWidgetPart _nested_highscore_widgets[] = {
 };
 
 static WindowDesc _highscore_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_HIGHSCORE, WC_NONE,
 	{},
 	_nested_highscore_widgets
 );
 
 static WindowDesc _endgame_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_ENDSCREEN, WC_NONE,
 	{},
 	_nested_highscore_widgets
@@ -252,7 +252,7 @@ void ShowEndGameChart()
 	new EndGameWindow(_endgame_desc);
 }
 
-static IntervalTimer<TimerGameCalendar> _check_end_game({TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameCalendar> _check_end_game({TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [](auto)
 {
 	/* 0 = never */
 	if (_settings_game.game_creation.ending_year == 0) return;
diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
index 476b92f8fe..59a623a968 100644
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -13,6 +13,7 @@
 #include "ini_type.h"
 #include "string_func.h"
 #include "window_gui.h"
+#include "core/string_consumer.hpp"
 
 #include "safeguards.h"
 
@@ -90,56 +91,49 @@ static const std::initializer_list<KeycodeNames> _keycode_to_name = {
 
 /**
  * Try to parse a single part of a keycode.
- * @param start Start of the string to parse.
- * @param end End of the string to parse.
- * @return A keycode if a match is found or 0.
+ * @param keystr Input.
+ * @return A keycode if a match is found.
  */
-static uint16_t ParseCode(const char *start, const char *end)
+static std::optional<uint16_t> ParseCode(std::string_view keystr)
 {
-	assert(start <= end);
-	while (start < end && *start == ' ') start++;
-	while (end > start && *end == ' ') end--;
-	std::string_view str{start, end};
+	keystr = StrTrimView(keystr, StringConsumer::WHITESPACE_NO_NEWLINE);
 	for (const auto &kn : _keycode_to_name) {
-		if (StrEqualsIgnoreCase(str, kn.name)) {
+		if (StrEqualsIgnoreCase(keystr, kn.name)) {
 			return kn.keycode;
 		}
 	}
-	if (end - start == 1) {
-		if (*start >= 'a' && *start <= 'z') return *start - ('a'-'A');
+	if (keystr.size() == 1) {
+		auto c = keystr[0];
+		if (c >= 'a' && c <= 'z') return c - ('a'-'A');
 		/* Ignore invalid keycodes */
-		if (*(const uint8_t *)start < 128) return *start;
+		if (static_cast<uint8_t>(c) < 128) return c;
 	}
-	return 0;
+	return std::nullopt;
 }
 
 /**
  * Parse a string representation of a keycode.
- * @param start Start of the input.
- * @param end End of the input.
- * @return A valid keycode or 0.
+ * @param keystr Input.
+ * @return A valid keycode or std::nullopt.
  */
-static uint16_t ParseKeycode(const char *start, const char *end)
+static std::optional<uint16_t> ParseKeycode(std::string_view keystr)
 {
-	assert(start <= end);
+	if (keystr.empty()) return std::nullopt;
+	StringConsumer consumer{keystr};
 	uint16_t keycode = 0;
-	for (;;) {
-		const char *cur = start;
-		while (*cur != '+' && cur != end) cur++;
-		uint16_t code = ParseCode(start, cur);
-		if (code == 0) return 0;
-		if (code & WKC_SPECIAL_KEYS) {
+	while (consumer.AnyBytesLeft()) {
+		auto cur = consumer.ReadUntilChar('+', StringConsumer::SKIP_ONE_SEPARATOR);
+		auto code = ParseCode(cur);
+		if (!code.has_value()) return std::nullopt;
+		if (*code & WKC_SPECIAL_KEYS) {
 			/* Some completely wrong keycode we don't support. */
-			if (code & ~WKC_SPECIAL_KEYS) return 0;
-			keycode |= code;
+			if (*code & ~WKC_SPECIAL_KEYS) return std::nullopt;
+			keycode |= *code;
 		} else {
 			/* Ignore the code if it has more then 1 letter. */
-			if (keycode & ~WKC_SPECIAL_KEYS) return 0;
-			keycode |= code;
+			if (keycode & ~WKC_SPECIAL_KEYS) return std::nullopt;
+			keycode |= *code;
 		}
-		if (cur == end) break;
-		assert(cur < end);
-		start = cur + 1;
 	}
 	return keycode;
 }
@@ -149,15 +143,13 @@ static uint16_t ParseKeycode(const char *start, const char *end)
  * @param hotkey The hotkey object to add the keycodes to
  * @param value The string to parse
  */
-static void ParseHotkeys(Hotkey &hotkey, const char *value)
+static void ParseHotkeys(Hotkey &hotkey, std::string_view value)
 {
-	const char *start = value;
-	while (*start != '\0') {
-		const char *end = start;
-		while (*end != '\0' && *end != ',') end++;
-		uint16_t keycode = ParseKeycode(start, end);
-		if (keycode != 0) hotkey.AddKeycode(keycode);
-		start = (*end == ',') ? end + 1: end;
+	StringConsumer consumer{value};
+	while (consumer.AnyBytesLeft()) {
+		auto keystr = consumer.ReadUntilChar(',', StringConsumer::SKIP_ONE_SEPARATOR);
+		auto keycode = ParseKeycode(keystr);
+		if (keycode.has_value()) hotkey.AddKeycode(*keycode);
 	}
 }
 
@@ -282,7 +274,7 @@ void HotkeyList::Load(const IniFile &ini)
 		const IniItem *item = group->GetItem(hotkey.name);
 		if (item != nullptr) {
 			hotkey.keycodes.clear();
-			if (item->value.has_value()) ParseHotkeys(hotkey, item->value->c_str());
+			if (item->value.has_value()) ParseHotkeys(hotkey, *item->value);
 		}
 	}
 }
diff --git a/src/house.h b/src/house.h
index 56405c9444..0f362f83df 100644
--- a/src/house.h
+++ b/src/house.h
@@ -52,35 +52,40 @@ static constexpr BuildingFlags BUILDING_2_TILES_X   = {BuildingFlag::Size2x1, Bu
 static constexpr BuildingFlags BUILDING_2_TILES_Y   = {BuildingFlag::Size1x2, BuildingFlag::Size2x2};
 static constexpr BuildingFlags BUILDING_HAS_4_TILES = {BuildingFlag::Size2x2};
 
-enum HouseZonesBits : uint8_t {
-	HZB_BEGIN     = 0,
-	HZB_TOWN_EDGE = 0,
-	HZB_TOWN_OUTSKIRT,
-	HZB_TOWN_OUTER_SUBURB,
-	HZB_TOWN_INNER_SUBURB,
-	HZB_TOWN_CENTRE,
-	HZB_END,
-};
-static_assert(HZB_END == 5);
+enum class HouseZone : uint8_t {
+	TownEdge = 0,
+	TownOutskirt = 1,
+	TownOuterSuburb = 2,
+	TownInnerSuburb = 3,
+	TownCentre = 4,
+	TownEnd,
 
-DECLARE_INCREMENT_DECREMENT_OPERATORS(HouseZonesBits)
-
-enum HouseZones : uint16_t {
-	HZ_NOZNS             = 0x0000,  ///<       0          This is just to get rid of zeros, meaning none
-	HZ_ZON1              = 1U << HZB_TOWN_EDGE,    ///< 0..4 1,2,4,8,10  which town zones the building can be built in, Zone1 been the further suburb
-	HZ_ZON2              = 1U << HZB_TOWN_OUTSKIRT,
-	HZ_ZON3              = 1U << HZB_TOWN_OUTER_SUBURB,
-	HZ_ZON4              = 1U << HZB_TOWN_INNER_SUBURB,
-	HZ_ZON5              = 1U << HZB_TOWN_CENTRE,  ///<  center of town
-	HZ_ZONALL            = 0x001F,  ///<       1F         This is just to englobe all above types at once
-	HZ_SUBARTC_ABOVE     = 0x0800,  ///< 11    800        can appear in sub-arctic climate above the snow line
-	HZ_TEMP              = 0x1000,  ///< 12   1000        can appear in temperate climate
-	HZ_SUBARTC_BELOW     = 0x2000,  ///< 13   2000        can appear in sub-arctic climate below the snow line
-	HZ_SUBTROPIC         = 0x4000,  ///< 14   4000        can appear in subtropical climate
-	HZ_TOYLND            = 0x8000,  ///< 15   8000        can appear in toyland climate
-	HZ_CLIMALL           = 0xF800,  ///< Bitmask of all climate bits
+	ClimateSubarcticAboveSnow = 11, ///< Building can appear in sub-arctic climate above the snow line
+	ClimateTemperate = 12, ///< Building can appear in temperate climate
+	ClimateSubarcticBelowSnow = 13, ///< Building can appear in sub-arctic climate below the snow line
+	ClimateSubtropic = 14, ///< Building can appear in subtropical climate
+	ClimateToyland = 15, ///< Building can appear in toyland climate
+};
+using HouseZones = EnumBitSet<HouseZone, uint16_t>;
+
+static constexpr uint NUM_HOUSE_ZONES = to_underlying(HouseZone::TownEnd);
+static_assert(NUM_HOUSE_ZONES == 5);
+
+static constexpr HouseZones HZ_ZONE_ALL = {
+	HouseZone::TownEdge,
+	HouseZone::TownOutskirt,
+	HouseZone::TownOuterSuburb,
+	HouseZone::TownInnerSuburb,
+	HouseZone::TownCentre,
+};
+
+static constexpr HouseZones HZ_CLIMATE_ALL = {
+	HouseZone::ClimateSubarcticAboveSnow,
+	HouseZone::ClimateTemperate,
+	HouseZone::ClimateSubarcticBelowSnow,
+	HouseZone::ClimateSubtropic,
+	HouseZone::ClimateToyland,
 };
-DECLARE_ENUM_AS_BIT_SET(HouseZones)
 
 enum class HouseExtraFlag : uint8_t {
 	BuildingIsHistorical   = 0, ///< this house will only appear during town generation in random games, thus the historical
@@ -106,13 +111,13 @@ struct HouseSpec {
 	bool enabled;                             ///< the house is available to build (true by default, but can be disabled by newgrf)
 
 	/* NewHouses properties */
-	GRFFileProps grf_prop;                    ///< Properties related the the grf file
+	SubstituteGRFFileProps grf_prop; ///< Properties related the the grf file
 	HouseCallbackMasks callback_mask;                     ///< Bitmask of house callbacks that have to be called
 	Colours random_colour[4];                 ///< 4 "random" colours
 	uint8_t probability;                         ///< Relative probability of appearing (16 is the standard value)
 	HouseExtraFlags extra_flags{};              ///< some more flags
 	HouseClassID class_id;                    ///< defines the class this house has (not grf file based)
-	AnimationInfo animation;                  ///< information about the animation.
+	AnimationInfo<void> animation; ///< information about the animation.
 	uint8_t processing_time;                     ///< Periodic refresh multiplier
 	uint8_t minimum_life;                        ///< The minimum number of years this house will survive before the town rebuilds it
 	CargoTypes watched_cargoes;               ///< Cargo types watched for acceptance.
@@ -139,5 +144,6 @@ inline HouseID GetTranslatedHouseID(HouseID hid)
 }
 
 void ShowBuildHousePicker(struct Window *);
+HouseZones GetClimateMaskForLandscape();
 
 #endif /* HOUSE_H */
diff --git a/src/house_type.h b/src/house_type.h
index 6c5f4d136f..bac5d01712 100644
--- a/src/house_type.h
+++ b/src/house_type.h
@@ -15,4 +15,16 @@ typedef uint16_t HouseClassID; ///< Classes of houses.
 
 struct HouseSpec;
 
+/** Randomisation triggers for houses */
+enum class HouseRandomTrigger : uint8_t {
+	/* The tile of the house has been triggered during the tileloop. */
+	TileLoop,
+	/*
+	 * The top tile of a (multitile) building has been triggered during and all
+	 * the tileloop other tiles of the same building get the same random value.
+	 */
+	TileLoopNorth,
+};
+using HouseRandomTriggers = EnumBitSet<HouseRandomTrigger, uint8_t>;
+
 #endif /* HOUSE_TYPE_H */
diff --git a/src/industry.h b/src/industry.h
index d7683d0c41..50e669ce4d 100644
--- a/src/industry.h
+++ b/src/industry.h
@@ -10,6 +10,7 @@
 #ifndef INDUSTRY_H
 #define INDUSTRY_H
 
+#include "core/flatset_type.hpp"
 #include "newgrf_storage.h"
 #include "subsidy_type.h"
 #include "industry_map.h"
@@ -257,7 +258,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
 		return this->cached_name;
 	}
 
-	static std::array<std::vector<IndustryID>, NUM_INDUSTRYTYPES> industries; ///< List of industries of each type.
+	static std::array<FlatSet<IndustryID>, NUM_INDUSTRYTYPES> industries; ///< List of industries of each type.
 
 private:
 	void FillCachedName() const;
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index a71421bc1b..617bb91847 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -63,7 +63,7 @@ void BuildOilRig(TileIndex tile);
 static uint8_t _industry_sound_ctr;
 static TileIndex _industry_sound_tile;
 
-std::array<std::vector<IndustryID>, NUM_INDUSTRYTYPES> Industry::industries;
+std::array<FlatSet<IndustryID>, NUM_INDUSTRYTYPES> Industry::industries;
 
 IndustrySpec _industry_specs[NUM_INDUSTRYTYPES];
 IndustryTileSpec _industry_tile_specs[NUM_INDUSTRYTILES];
@@ -190,8 +190,7 @@ Industry::~Industry()
 	delete this->psa;
 
 	auto &industries = Industry::industries[type];
-	auto it = std::ranges::lower_bound(industries, this->index);
-	industries.erase(it);
+	industries.erase(this->index);
 
 	DeleteIndustryNews(this->index);
 	CloseWindowById(WC_INDUSTRY_VIEW, this->index);
@@ -336,7 +335,7 @@ static void DrawTile_Industry(TileInfo *ti)
 		 * DrawNewIndustry will return false if ever the resolver could not
 		 * find any sprite to display.  So in this case, we will jump on the
 		 * substitute gfx instead. */
-		if (indts->grf_prop.GetSpriteGroup() != nullptr && DrawNewIndustryTile(ti, ind, gfx, indts)) {
+		if (indts->grf_prop.HasSpriteGroups() && DrawNewIndustryTile(ti, ind, gfx, indts)) {
 			return;
 		} else {
 			/* No sprite group (or no valid one) found, meaning no graphics associated.
@@ -363,7 +362,7 @@ static void DrawTile_Industry(TileInfo *ti)
 	if (image == SPR_FLAT_WATER_TILE && IsTileOnWater(ti->tile)) {
 		DrawWaterClassGround(ti);
 	} else {
-		DrawGroundSprite(image, GroundSpritePaletteTransform(image, dits->ground.pal, GENERAL_SPRITE_COLOUR(ind->random_colour)));
+		DrawGroundSprite(image, GroundSpritePaletteTransform(image, dits->ground.pal, GetColourPalette(ind->random_colour)));
 	}
 
 	/* If industries are transparent and invisible, do not draw the upper part */
@@ -372,7 +371,7 @@ static void DrawTile_Industry(TileInfo *ti)
 	/* Add industry on top of the ground? */
 	image = dits->building.sprite;
 	if (image != 0) {
-		AddSortableSpriteToDraw(image, SpriteLayoutPaletteTransform(image, dits->building.pal, GENERAL_SPRITE_COLOUR(ind->random_colour)),
+		AddSortableSpriteToDraw(image, SpriteLayoutPaletteTransform(image, dits->building.pal, GetColourPalette(ind->random_colour)),
 			ti->x + dits->subtile_x,
 			ti->y + dits->subtile_y,
 			dits->width,
@@ -405,7 +404,7 @@ static Foundation GetFoundation_Industry(TileIndex tile, Slope tileh)
 	 */
 	if (gfx >= NEW_INDUSTRYTILEOFFSET) {
 		const IndustryTileSpec *indts = GetIndustryTileSpec(gfx);
-		if (indts->grf_prop.GetSpriteGroup() != nullptr && indts->callback_mask.Test(IndustryTileCallbackMask::DrawFoundations)) {
+		if (indts->callback_mask.Test(IndustryTileCallbackMask::DrawFoundations)) {
 			uint32_t callback_res = GetIndustryTileCallback(CBID_INDTILE_DRAW_FOUNDATIONS, 0, 0, gfx, Industry::GetByTile(tile), tile);
 			if (callback_res != CALLBACK_FAILED && !ConvertBooleanCallback(indts->grf_prop.grffile, CBID_INDTILE_DRAW_FOUNDATIONS, callback_res)) return FOUNDATION_NONE;
 		}
@@ -696,7 +695,7 @@ static void AnimateTile_Industry(TileIndex tile)
 {
 	IndustryGfx gfx = GetIndustryGfx(tile);
 
-	if (GetIndustryTileSpec(gfx)->animation.status != ANIM_STATUS_NO_ANIMATION) {
+	if (GetIndustryTileSpec(gfx)->animation.status != AnimationStatus::NoAnimation) {
 		AnimateNewIndustryTile(tile);
 		return;
 	}
@@ -763,7 +762,7 @@ static void MakeIndustryTileBigger(TileIndex tile)
 	uint8_t stage = GetIndustryConstructionStage(tile) + 1;
 	SetIndustryConstructionCounter(tile, 0);
 	SetIndustryConstructionStage(tile, stage);
-	StartStopIndustryTileAnimation(tile, IAT_CONSTRUCTION_STATE_CHANGE);
+	TriggerIndustryTileAnimation_ConstructionStageChanged(tile, false);
 	if (stage == INDUSTRY_COMPLETED) SetIndustryCompleted(tile);
 
 	MarkTileDirtyByTile(tile);
@@ -844,7 +843,7 @@ static void TileLoop_Industry(TileIndex tile)
 	 * returning from TileLoop_Water. */
 	if (!IsTileType(tile, MP_INDUSTRY)) return;
 
-	TriggerIndustryTile(tile, INDTILE_TRIGGER_TILE_LOOP);
+	TriggerIndustryTileRandomisation(tile, IndustryRandomTrigger::TileLoop);
 
 	if (!IsIndustryCompleted(tile)) {
 		MakeIndustryTileBigger(tile);
@@ -853,7 +852,7 @@ static void TileLoop_Industry(TileIndex tile)
 
 	if (_game_mode == GM_EDITOR) return;
 
-	if (TransportIndustryGoods(tile) && !StartStopIndustryTileAnimation(Industry::GetByTile(tile), IAT_INDUSTRY_DISTRIBUTES_CARGO)) {
+	if (TransportIndustryGoods(tile) && !TriggerIndustryAnimation(Industry::GetByTile(tile), IndustryAnimationTrigger::CargoDistributed)) {
 		uint newgfx = GetIndustryTileSpec(GetIndustryGfx(tile))->anim_production;
 
 		if (newgfx != INDUSTRYTILE_NOANIM) {
@@ -865,7 +864,7 @@ static void TileLoop_Industry(TileIndex tile)
 		}
 	}
 
-	if (StartStopIndustryTileAnimation(tile, IAT_TILELOOP)) return;
+	if (TriggerIndustryTileAnimation(tile, IndustryAnimationTrigger::TileLoop)) return;
 
 	IndustryGfx newgfx = GetIndustryTileSpec(GetIndustryGfx(tile))->anim_next;
 	if (newgfx != INDUSTRYTILE_NOANIM) {
@@ -1103,30 +1102,6 @@ void PlantRandomFarmField(const Industry *i)
 	if (tile != INVALID_TILE) PlantFarmField(tile, i->index);
 }
 
-/**
- * Search callback function for ChopLumberMillTrees
- * @param tile to test
- * @return the result of the test
- */
-static bool SearchLumberMillTrees(TileIndex tile, void *)
-{
-	if (IsTileType(tile, MP_TREES) && GetTreeGrowth(tile) >= TreeGrowthStage::Grown) {
-		/* found a tree */
-
-		Backup<CompanyID> cur_company(_current_company, OWNER_NONE);
-
-		_industry_sound_ctr = 1;
-		_industry_sound_tile = tile;
-		if (_settings_client.sound.ambient) SndPlayTileFx(SND_38_LUMBER_MILL_1, tile);
-
-		Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlag::Execute, tile);
-
-		cur_company.Restore();
-		return true;
-	}
-	return false;
-}
-
 /**
  * Perform a circular search around the Lumber Mill in order to find trees to cut
  * @param i industry
@@ -1144,9 +1119,20 @@ static void ChopLumberMillTrees(Industry *i)
 		}
 	}
 
-	TileIndex tile = i->location.tile;
-	if (CircularTileSearch(&tile, 40, SearchLumberMillTrees, nullptr)) { // 40x40 tiles  to search.
-		itp->waiting = ClampTo<uint16_t>(itp->waiting + ScaleByCargoScale(45, false)); // Found a tree, add according value to waiting cargo.
+	for (auto tile : SpiralTileSequence(i->location.tile, 40)) { // 40x40 tiles  to search.
+		if (!IsTileType(tile, MP_TREES) || GetTreeGrowth(tile) < TreeGrowthStage::Grown) continue;
+
+		/* found a tree */
+		_industry_sound_ctr = 1;
+		_industry_sound_tile = tile;
+		if (_settings_client.sound.ambient) SndPlayTileFx(SND_38_LUMBER_MILL_1, tile);
+
+		AutoRestoreBackup<CompanyID> cur_company(_current_company, OWNER_NONE);
+		Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlag::Execute, tile);
+
+		/* Add according value to waiting cargo. */
+		itp->waiting = ClampTo<uint16_t>(itp->waiting + ScaleByCargoScale(45, false));
+		break;
 	}
 }
 
@@ -1235,8 +1221,8 @@ static void ProduceIndustryGoods(Industry *i)
 			if (cut) ChopLumberMillTrees(i);
 		}
 
-		TriggerIndustry(i, INDUSTRY_TRIGGER_INDUSTRY_TICK);
-		StartStopIndustryTileAnimation(i, IAT_INDUSTRY_TICK);
+		TriggerIndustryRandomisation(i, IndustryRandomTrigger::IndustryTick);
+		TriggerIndustryAnimation(i, IndustryAnimationTrigger::IndustryTick);
 	}
 }
 
@@ -1321,7 +1307,7 @@ static CommandCost CheckNewIndustry_OilRefinery(TileIndex tile)
 	return CommandCost(STR_ERROR_CAN_ONLY_BE_POSITIONED);
 }
 
-extern bool _ignore_restrictions;
+extern bool _ignore_industry_restrictions;
 
 /**
  * Check the conditions of #CHECK_OIL_RIG (Industries at sea should be positioned near edge of the map).
@@ -1330,7 +1316,7 @@ extern bool _ignore_restrictions;
  */
 static CommandCost CheckNewIndustry_OilRig(TileIndex tile)
 {
-	if (_game_mode == GM_EDITOR && _ignore_restrictions) return CommandCost();
+	if (_game_mode == GM_EDITOR && _ignore_industry_restrictions) return CommandCost();
 
 	if (TileHeight(tile) == 0 &&
 			CheckScaledDistanceFromEdge(TileAddXY(tile, 1, 1), _settings_game.game_creation.oil_refinery_limit)) return CommandCost();
@@ -1566,7 +1552,7 @@ static CommandCost CheckIfIndustryTileSlopes(TileIndex tile, const IndustryTileL
 	/* It is almost impossible to have a fully flat land in TG, so what we
 	 *  do is that we check if we can make the land flat later on. See
 	 *  CheckIfCanLevelIndustryPlatform(). */
-	if (!refused_slope || (_settings_game.game_creation.land_generator == LG_TERRAGENESIS && _generating_world && !custom_shape && !_ignore_restrictions)) {
+	if (!refused_slope || (_settings_game.game_creation.land_generator == LG_TERRAGENESIS && _generating_world && !custom_shape && !_ignore_industry_restrictions)) {
 		return CommandCost();
 	}
 	return CommandCost(STR_ERROR_SITE_UNSUITABLE);
@@ -1773,7 +1759,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
 	i->type = type;
 
 	auto &industries = Industry::industries[type];
-	industries.emplace(std::ranges::lower_bound(industries, i->index), i->index);
+	industries.insert(i->index);
 
 	for (size_t index = 0; index < std::size(indspec->produced_cargo); ++index) {
 		if (!IsValidCargoType(indspec->produced_cargo[index])) break;
@@ -1955,7 +1941,16 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
 			/* it->gfx is stored in the map. But the translated ID cur_gfx is the interesting one */
 			IndustryGfx cur_gfx = GetTranslatedIndustryTileID(it.gfx);
 			const IndustryTileSpec *its = GetIndustryTileSpec(cur_gfx);
-			if (its->animation.status != ANIM_STATUS_NO_ANIMATION) AddAnimatedTile(cur_tile);
+			if (its->animation.status != AnimationStatus::NoAnimation) AddAnimatedTile(cur_tile);
+		}
+	}
+
+	/* Call callbacks after all tiles have been created. */
+	for (TileIndex cur_tile : i->location) {
+		if (i->TileBelongsToIndustry(cur_tile)) {
+			/* There are no shared random bits, consistent with "MakeIndustryTileBigger" in tile loop.
+			 * So, trigger tiles individually */
+			TriggerIndustryTileAnimation_ConstructionStageChanged(cur_tile, true);
 		}
 	}
 
@@ -2023,7 +2018,7 @@ static CommandCost CreateNewIndustryHelper(TileIndex tile, IndustryType type, Do
 	if (ret.Failed()) return ret;
 
 	if (!custom_shape_check && _settings_game.game_creation.land_generator == LG_TERRAGENESIS && _generating_world &&
-			!_ignore_restrictions && !CheckIfCanLevelIndustryPlatform(tile, DoCommandFlag::NoWater, layout)) {
+			!_ignore_industry_restrictions && !CheckIfCanLevelIndustryPlatform(tile, DoCommandFlag::NoWater, layout)) {
 		return CommandCost(STR_ERROR_SITE_UNSUITABLE);
 	}
 
@@ -2740,14 +2735,14 @@ int WhoCanServiceIndustry(Industry *ind)
 		 * We cannot check the first of shared orders only, since the first vehicle in such a chain
 		 * may have a different cargo type.
 		 */
-		for (const Order *o : v->Orders()) {
-			if (o->IsType(OT_GOTO_STATION) && !(o->GetUnloadType() & OUFB_TRANSFER)) {
+		for (const Order &o : v->Orders()) {
+			if (o.IsType(OT_GOTO_STATION) && !(o.GetUnloadType() & OUFB_TRANSFER)) {
 				/* Vehicle visits a station to load or unload */
-				Station *st = Station::Get(o->GetDestination().ToStationID());
+				Station *st = Station::Get(o.GetDestination().ToStationID());
 				assert(st != nullptr);
 
 				/* Same cargo produced by industry is dropped here => not serviced by vehicle v */
-				if ((o->GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break;
+				if ((o.GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break;
 
 				if (ind->stations_near.find(st) != ind->stations_near.end()) {
 					if (v->owner == _local_company) return 2; // Company services industry
@@ -2809,11 +2804,12 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
 
 	bool callback_enabled = indspec->callback_mask.Test(monthly ? IndustryCallbackMask::MonthlyProdChange : IndustryCallbackMask::ProductionChange);
 	if (callback_enabled) {
-		uint16_t res = GetIndustryCallback(monthly ? CBID_INDUSTRY_MONTHLYPROD_CHANGE : CBID_INDUSTRY_PRODUCTION_CHANGE, 0, Random(), i, i->type, i->location.tile);
+		std::array<int32_t, 1> regs100;
+		uint16_t res = GetIndustryCallback(monthly ? CBID_INDUSTRY_MONTHLYPROD_CHANGE : CBID_INDUSTRY_PRODUCTION_CHANGE, 0, Random(), i, i->type, i->location.tile, regs100);
 		if (res != CALLBACK_FAILED) { // failed callback means "do nothing"
 			suppress_message = HasBit(res, 7);
 			/* Get the custom message if any */
-			if (HasBit(res, 8)) str = MapGRFStringID(indspec->grf_prop.grfid, GRFStringID(GB(GetRegister(0x100), 0, 16)));
+			if (HasBit(res, 8)) str = MapGRFStringID(indspec->grf_prop.grfid, GRFStringID(GB(regs100[0], 0, 16)));
 			res = GB(res, 0, 4);
 			switch (res) {
 				default: NOT_REACHED();
@@ -2831,7 +2827,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
 					increment = res == 0x0D ? -1 : 1;
 					break;
 				case 0xF:                         // Set production to third byte of register 0x100
-					i->prod_level = Clamp(GB(GetRegister(0x100), 16, 8), PRODLEVEL_MINIMUM, PRODLEVEL_MAXIMUM);
+					i->prod_level = Clamp(GB(regs100[0], 16, 8), PRODLEVEL_MINIMUM, PRODLEVEL_MAXIMUM);
 					recalculate_multipliers = true;
 					break;
 			}
@@ -3006,7 +3002,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
  * For small maps, it implies that less than one change per month is required, while on bigger maps,
  * it would be way more. The daily loop handles those changes.
  */
-static IntervalTimer<TimerGameEconomy> _economy_industries_daily({TimerGameEconomy::DAY, TimerGameEconomy::Priority::INDUSTRY}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_industries_daily({TimerGameEconomy::DAY, TimerGameEconomy::Priority::INDUSTRY}, [](auto)
 {
 	_economy.industry_daily_change_counter += _economy.industry_daily_increment;
 
@@ -3048,7 +3044,7 @@ static IntervalTimer<TimerGameEconomy> _economy_industries_daily({TimerGameEcono
 	InvalidateWindowData(WC_INDUSTRY_DIRECTORY, 0, IDIWD_PRODUCTION_CHANGE);
 });
 
-static IntervalTimer<TimerGameEconomy> _economy_industries_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::INDUSTRY}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_industries_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::INDUSTRY}, [](auto)
 {
 	Backup<CompanyID> cur_company(_current_company, OWNER_NONE);
 
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 651dac4014..6119c486dd 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -21,6 +21,7 @@
 #include "town.h"
 #include "cheat_type.h"
 #include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "newgrf_industries.h"
 #include "newgrf_text.h"
 #include "newgrf_debug.h"
@@ -47,6 +48,7 @@
 #include "timer/timer.h"
 #include "timer/timer_window.h"
 #include "hotkeys.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/industry_widget.h"
 
@@ -56,7 +58,7 @@
 
 #include "safeguards.h"
 
-bool _ignore_restrictions;
+bool _ignore_industry_restrictions;
 std::bitset<NUM_INDUSTRYTYPES> _displayed_industries; ///< Communication from the industry chain window to the smallmap window about what industries to display.
 
 /** Cargo suffix type (for which window is it requested) */
@@ -99,13 +101,14 @@ static void GetCargoSuffix(uint cargo, CargoSuffixType cst, const Industry *ind,
 
 	if (indspec->callback_mask.Test(IndustryCallbackMask::CargoSuffix)) {
 		TileIndex t = (cst != CST_FUND) ? ind->location.tile : INVALID_TILE;
-		uint16_t callback = GetIndustryCallback(CBID_INDUSTRY_CARGO_SUFFIX, 0, (cst << 8) | cargo, const_cast<Industry *>(ind), ind_type, t);
+		std::array<int32_t, 16> regs100;
+		uint16_t callback = GetIndustryCallback(CBID_INDUSTRY_CARGO_SUFFIX, 0, (cst << 8) | cargo, const_cast<Industry *>(ind), ind_type, t, regs100);
 		if (callback == CALLBACK_FAILED) return;
 
 		if (indspec->grf_prop.grffile->grf_version < 8) {
 			if (GB(callback, 0, 8) == 0xFF) return;
 			if (callback < 0x400) {
-				suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback, 6);
+				suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback, regs100);
 				suffix.display = CSD_CARGO_AMOUNT_TEXT;
 				return;
 			}
@@ -113,18 +116,30 @@ static void GetCargoSuffix(uint cargo, CargoSuffixType cst, const Industry *ind,
 			return;
 
 		} else { // GRF version 8 or higher.
-			if (callback == 0x400) return;
-			if (callback == 0x401) {
-				suffix.display = CSD_CARGO;
-				return;
+			switch (callback) {
+				case 0x400:
+					return;
+				case 0x401:
+					suffix.display = CSD_CARGO;
+					return;
+				case 0x40E:
+					suffix.display = CSD_CARGO_TEXT;
+					suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+					return;
+				case 0x40F:
+					suffix.display = CSD_CARGO_AMOUNT_TEXT;
+					suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+					return;
+				default:
+					break;
 			}
 			if (callback < 0x400) {
-				suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback, 6);
+				suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback, regs100);
 				suffix.display = CSD_CARGO_AMOUNT_TEXT;
 				return;
 			}
 			if (callback >= 0x800 && callback < 0xC00) {
-				suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback - 0x800, 6);
+				suffix.text = GetGRFStringWithTextStack(indspec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback - 0x800, regs100);
 				suffix.display = CSD_CARGO_TEXT;
 				return;
 			}
@@ -174,12 +189,12 @@ static inline void GetAllCargoSuffixes(CargoSuffixInOut use_input, CargoSuffixTy
 		}
 		switch (use_input) {
 			case CARGOSUFFIX_OUT:
-				// Handle INDUSTRY_ORIGINAL_NUM_OUTPUTS cargoes
+				/* Handle INDUSTRY_ORIGINAL_NUM_OUTPUTS cargoes */
 				if (IsValidCargoType(cargoes[0])) GetCargoSuffix(3, cst, ind, ind_type, indspec, suffixes[0]);
 				if (IsValidCargoType(cargoes[1])) GetCargoSuffix(4, cst, ind, ind_type, indspec, suffixes[1]);
 				break;
 			case CARGOSUFFIX_IN:
-				// Handle INDUSTRY_ORIGINAL_NUM_INPUTS cargoes
+				/* Handle INDUSTRY_ORIGINAL_NUM_INPUTS cargoes */
 				if (IsValidCargoType(cargoes[0])) GetCargoSuffix(0, cst, ind, ind_type, indspec, suffixes[0]);
 				if (IsValidCargoType(cargoes[1])) GetCargoSuffix(1, cst, ind, ind_type, indspec, suffixes[1]);
 				if (IsValidCargoType(cargoes[2])) GetCargoSuffix(2, cst, ind, ind_type, indspec, suffixes[2]);
@@ -389,7 +404,7 @@ class BuildIndustryWindow : public Window {
 		if (numcargo > 0) {
 			cargostring = GetString(prefixstr, CargoSpec::Get(cargolist[firstcargo])->name, cargo_suffix[firstcargo].text) + cargostring;
 		} else {
-			cargostring = GetString(prefixstr, STR_JUST_NOTHING, "");
+			cargostring = GetString(prefixstr, STR_JUST_NOTHING, ""sv);
 		}
 
 		return cargostring;
@@ -429,7 +444,7 @@ public:
 				for (const auto &indtype : this->list) {
 					d = maxdim(d, GetStringBoundingBox(GetIndustrySpec(indtype)->name));
 				}
-				resize.height = std::max<uint>({this->legend.height, d.height, count.height}) + padding.height;
+				fill.height = resize.height = std::max<uint>({this->legend.height, d.height, count.height}) + padding.height;
 				d.width += this->badge_classes.GetTotalColumnsWidth() + this->legend.width + WidgetDimensions::scaled.hsep_wide + WidgetDimensions::scaled.hsep_normal + count.width + padding.width;
 				d.height = 5 * resize.height;
 				size = maxdim(size, d);
@@ -588,15 +603,19 @@ public:
 
 				/* Get the additional purchase info text, if it has not already been queried. */
 				if (indsp->callback_mask.Test(IndustryCallbackMask::FundMoreText)) {
-					uint16_t callback_res = GetIndustryCallback(CBID_INDUSTRY_FUND_MORE_TEXT, 0, 0, nullptr, this->selected_type, INVALID_TILE);
+					std::array<int32_t, 16> regs100;
+					uint16_t callback_res = GetIndustryCallback(CBID_INDUSTRY_FUND_MORE_TEXT, 0, 0, nullptr, this->selected_type, INVALID_TILE, regs100);
 					if (callback_res != CALLBACK_FAILED && callback_res != 0x400) {
-						if (callback_res > 0x400) {
+						std::string str;
+						if (callback_res == 0x40F) {
+							str = GetGRFStringWithTextStack(indsp->grf_prop.grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+						} else if (callback_res > 0x400) {
 							ErrorUnknownCallbackResult(indsp->grf_prop.grfid, CBID_INDUSTRY_FUND_MORE_TEXT, callback_res);
 						} else {
-							std::string str = GetGRFStringWithTextStack(indsp->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback_res, 6);
-							if (!str.empty()) {
-								DrawStringMultiLine(ir, str, TC_YELLOW);
-							}
+							str = GetGRFStringWithTextStack(indsp->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback_res, regs100);
+						}
+						if (!str.empty()) {
+							DrawStringMultiLine(ir, str, TC_YELLOW);
 						}
 					}
 				}
@@ -722,15 +741,11 @@ public:
 				return;
 			}
 
-			Backup<CompanyID> cur_company(_current_company, OWNER_NONE);
-			Backup<bool> old_generating_world(_generating_world, true);
-			_ignore_restrictions = true;
+			AutoRestoreBackup backup_cur_company(_current_company, OWNER_NONE);
+			AutoRestoreBackup backup_generating_world(_generating_world, true);
+			AutoRestoreBackup backup_ignore_industry_restritions(_ignore_industry_restrictions, true);
 
 			Command<CMD_BUILD_INDUSTRY>::Post(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY, &CcBuildIndustry, tile, this->selected_type, layout_index, false, seed);
-
-			cur_company.Restore();
-			old_generating_world.Restore();
-			_ignore_restrictions = false;
 		} else {
 			success = Command<CMD_BUILD_INDUSTRY>::Post(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY, tile, this->selected_type, layout_index, false, seed);
 		}
@@ -739,7 +754,7 @@ public:
 		if (success && !_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
 	}
 
-	IntervalTimer<TimerWindow> update_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> update_interval = {std::chrono::seconds(3), [this](auto) {
 		if (_game_mode == GM_EDITOR) return;
 		if (this->selected_type == IT_INVALID) return;
 
@@ -827,7 +842,7 @@ public:
 
 		this->InitNested(window_number);
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_IV_VIEWPORT);
-		nvp->InitializeViewport(this, Industry::Get(window_number)->location.GetCenterTile(), ScaleZoomGUI(ZOOM_LVL_INDUSTRY));
+		nvp->InitializeViewport(this, Industry::Get(window_number)->location.GetCenterTile(), ScaleZoomGUI(ZoomLevel::Industry));
 
 		const Industry *i = Industry::Get(window_number);
 		if (!i->IsCargoProduced()) this->DisableWidget(WID_IV_GRAPH);
@@ -868,7 +883,7 @@ public:
 		SpriteID icon = CargoSpec::Get(cargo_type)->GetCargoIcon();
 		Dimension d = GetSpriteSize(icon);
 		Rect ir = r.WithWidth(this->cargo_icon_size.width, rtl).WithHeight(GetCharacterHeight(FS_NORMAL));
-		DrawSprite(icon, PAL_NONE, CenterBounds(ir.left, ir.right, d.width), CenterBounds(ir.top, ir.bottom, this->cargo_icon_size.height));
+		DrawSprite(icon, PAL_NONE, CentreBounds(ir.left, ir.right, d.width), CentreBounds(ir.top, ir.bottom, this->cargo_icon_size.height));
 	}
 
 	std::string GetAcceptedCargoString(const Industry::AcceptedCargo &ac, const CargoSuffix &suffix) const
@@ -974,16 +989,20 @@ public:
 
 		/* Get the extra message for the GUI */
 		if (ind->callback_mask.Test(IndustryCallbackMask::WindowMoreText)) {
-			uint16_t callback_res = GetIndustryCallback(CBID_INDUSTRY_WINDOW_MORE_TEXT, 0, 0, i, i->type, i->location.tile);
+			std::array<int32_t, 16> regs100;
+			uint16_t callback_res = GetIndustryCallback(CBID_INDUSTRY_WINDOW_MORE_TEXT, 0, 0, i, i->type, i->location.tile, regs100);
 			if (callback_res != CALLBACK_FAILED && callback_res != 0x400) {
-				if (callback_res > 0x400) {
+				std::string str;
+				if (callback_res == 0x40F) {
+					str = GetGRFStringWithTextStack(ind->grf_prop.grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+				} else if (callback_res > 0x400) {
 					ErrorUnknownCallbackResult(ind->grf_prop.grfid, CBID_INDUSTRY_WINDOW_MORE_TEXT, callback_res);
 				} else {
-					std::string str = GetGRFStringWithTextStack(ind->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback_res, 6);
-					if (!str.empty()) {
-						ir.top += WidgetDimensions::scaled.vsep_wide;
-						ir.top = DrawStringMultiLine(ir, str, TC_YELLOW);
-					}
+					str = GetGRFStringWithTextStack(ind->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback_res, regs100);
+				}
+				if (!str.empty()) {
+					ir.top += WidgetDimensions::scaled.vsep_wide;
+					ir.top = DrawStringMultiLine(ir, str, TC_YELLOW);
 				}
 			}
 		}
@@ -1133,8 +1152,9 @@ public:
 		}
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_IV_VIEWPORT) return;
 		if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
 			DoZoomInOutWindow(wheel < 0 ? ZOOM_IN : ZOOM_OUT, this);
 		}
@@ -1145,16 +1165,17 @@ public:
 		if (!str.has_value() || str->empty()) return;
 
 		Industry *i = Industry::Get(this->window_number);
-		uint value = atoi(str->c_str());
+		auto value = ParseInteger(*str, 10, true);
+		if (!value.has_value()) return;
 		switch (this->editbox_line) {
 			case IL_NONE: NOT_REACHED();
 
 			case IL_MULTIPLIER:
-				i->prod_level = ClampU(RoundDivSU(value * PRODLEVEL_DEFAULT, 100), PRODLEVEL_MINIMUM, PRODLEVEL_MAXIMUM);
+				i->prod_level = ClampU(RoundDivSU(*value * PRODLEVEL_DEFAULT, 100), PRODLEVEL_MINIMUM, PRODLEVEL_MAXIMUM);
 				break;
 
 			default:
-				i->produced[this->editbox_line - IL_RATE1].rate = ClampU(RoundDivSU(value, 8), 0, 255);
+				i->produced[this->editbox_line - IL_RATE1].rate = ClampU(RoundDivSU(*value, 8), 0, 255);
 				break;
 		}
 		UpdateIndustryProduction(i);
@@ -1322,10 +1343,6 @@ static bool CargoFilter(const Industry * const *industry, const std::pair<CargoT
 
 static GUIIndustryList::FilterFunction * const _industry_filter_funcs[] = { &CargoFilter };
 
-/** Enum referring to the Hotkeys in the industry directory window */
-enum IndustryDirectoryHotkeys : int32_t {
-	IDHK_FOCUS_FILTER_BOX, ///< Focus the filter box
-};
 /**
  * The list of industries.
  */
@@ -1763,7 +1780,7 @@ public:
 
 			case WID_ID_INDUSTRY_LIST: {
 				Dimension d = GetStringBoundingBox(STR_INDUSTRY_DIRECTORY_NONE);
-				resize.height = d.height;
+				fill.height = resize.height = d.height;
 				d.height *= 5;
 				d.width += padding.width;
 				d.height += padding.height;
@@ -1825,7 +1842,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_ID_DROPDOWN_CRITERIA: {
@@ -1872,7 +1889,7 @@ public:
 	}
 
 	/** Rebuild the industry list on a regular interval. */
-	IntervalTimer<TimerWindow> rebuild_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> rebuild_interval = {std::chrono::seconds(3), [this](auto) {
 		this->industries.ForceResort();
 		this->BuildSortIndustriesList();
 	}};
@@ -1900,21 +1917,8 @@ public:
 		}
 	}
 
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case IDHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_ID_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				break;
-			default:
-				return ES_NOT_HANDLED;
-		}
-		return ES_HANDLED;
-	}
-
 	static inline HotkeyList hotkeys {"industrydirectory", {
-		Hotkey('F', "focus_filter_box", IDHK_FOCUS_FILTER_BOX),
+		Hotkey('F', "focus_filter_box", WID_ID_FILTER),
 	}};
 };
 
@@ -2640,7 +2644,7 @@ struct IndustryCargoesWindow : public Window {
 	{
 		switch (widget) {
 			case WID_IC_PANEL:
-				resize.height = CargoesField::normal_height;
+				fill.height = resize.height = CargoesField::normal_height;
 				size.width = CargoesField::industry_width * 3 + CargoesField::cargo_field_width * 2 + WidgetDimensions::scaled.frametext.Horizontal();
 				size.height = CargoesField::small_height + 2 * resize.height + WidgetDimensions::scaled.frametext.Vertical();
 				break;
@@ -2707,19 +2711,13 @@ struct IndustryCargoesWindow : public Window {
 	 */
 	static bool HousesCanAccept(const std::span<const CargoType> cargoes)
 	{
-		HouseZones climate_mask;
-		switch (_settings_game.game_creation.landscape) {
-			case LandscapeType::Temperate: climate_mask = HZ_TEMP; break;
-			case LandscapeType::Arctic:    climate_mask = HZ_SUBARTC_ABOVE | HZ_SUBARTC_BELOW; break;
-			case LandscapeType::Tropic:    climate_mask = HZ_SUBTROPIC; break;
-			case LandscapeType::Toyland:   climate_mask = HZ_TOYLND; break;
-			default: NOT_REACHED();
-		}
+		HouseZones climate_mask = GetClimateMaskForLandscape();
+
 		for (const CargoType cargo_type : cargoes) {
 			if (!IsValidCargoType(cargo_type)) continue;
 
 			for (const auto &hs : HouseSpec::Specs()) {
-				if (!hs.enabled || !(hs.building_availability & climate_mask)) continue;
+				if (!hs.enabled || !hs.building_availability.Any(climate_mask)) continue;
 
 				for (uint j = 0; j < lengthof(hs.accepts_cargo); j++) {
 					if (hs.cargo_acceptance[j] > 0 && cargo_type == hs.accepts_cargo[j]) return true;
@@ -3134,7 +3132,7 @@ struct IndustryCargoesWindow : public Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (index < 0) return;
 
diff --git a/src/industry_map.h b/src/industry_map.h
index 8a18184b06..700d33f4da 100644
--- a/src/industry_map.h
+++ b/src/industry_map.h
@@ -247,10 +247,10 @@ inline void SetIndustryRandomBits(Tile tile, uint8_t bits)
  * @pre IsTileType(tile, MP_INDUSTRY)
  * @return requested triggers
  */
-inline uint8_t GetIndustryTriggers(Tile tile)
+inline IndustryRandomTriggers GetIndustryRandomTriggers(Tile tile)
 {
 	assert(IsTileType(tile, MP_INDUSTRY));
-	return GB(tile.m6(), 3, 3);
+	return static_cast<IndustryRandomTriggers>(GB(tile.m6(), 3, 3));
 }
 
 
@@ -261,10 +261,10 @@ inline uint8_t GetIndustryTriggers(Tile tile)
  * @param triggers the triggers to set
  * @pre IsTileType(tile, MP_INDUSTRY)
  */
-inline void SetIndustryTriggers(Tile tile, uint8_t triggers)
+inline void SetIndustryRandomTriggers(Tile tile, IndustryRandomTriggers triggers)
 {
 	assert(IsTileType(tile, MP_INDUSTRY));
-	SB(tile.m6(), 3, 3, triggers);
+	SB(tile.m6(), 3, 3, triggers.base());
 }
 
 /**
@@ -283,7 +283,7 @@ inline void MakeIndustry(Tile t, IndustryID index, IndustryGfx gfx, uint8_t rand
 	SetIndustryRandomBits(t, random); // m3
 	t.m4() = 0;
 	SetIndustryGfx(t, gfx); // m5, part of m6
-	SetIndustryTriggers(t, 0); // rest of m6
+	SetIndustryRandomTriggers(t, {}); // rest of m6
 	SetWaterClass(t, wc);
 	t.m7() = 0;
 }
diff --git a/src/industry_type.h b/src/industry_type.h
index 7915b45564..ed01773729 100644
--- a/src/industry_type.h
+++ b/src/industry_type.h
@@ -10,6 +10,8 @@
 #ifndef INDUSTRY_TYPE_H
 #define INDUSTRY_TYPE_H
 
+#include "core/pool_type.hpp"
+
 using IndustryID = PoolID<uint16_t, struct IndustryIDTag, 64000, 0xFFFF>;
 
 typedef uint16_t IndustryGfx;
@@ -19,6 +21,24 @@ struct Industry;
 struct IndustrySpec;
 struct IndustryTileSpec;
 
+/** Available industry random triggers. */
+enum class IndustryRandomTrigger : uint8_t {
+	TileLoop, ///< The tile of the industry has been triggered during the tileloop.
+	IndustryTick, ///< The industry has been triggered via its tick.
+	CargoReceived, ///< Cargo has been delivered.
+};
+using IndustryRandomTriggers = EnumBitSet<IndustryRandomTrigger, uint8_t>;
+
+/** Animation triggers of the industries. */
+enum class IndustryAnimationTrigger : uint8_t {
+	ConstructionStageChanged, ///< Trigger whenever the construction stage changes.
+	TileLoop, ///< Trigger in the periodic tile loop.
+	IndustryTick, ///< Trigger every tick.
+	CargoReceived, ///< Trigger when cargo is received .
+	CargoDistributed, ///< Trigger when cargo is distributed.
+};
+using IndustryAnimationTriggers = EnumBitSet<IndustryAnimationTrigger, uint8_t>;
+
 static const IndustryType NUM_INDUSTRYTYPES_PER_GRF = 128;            ///< maximum number of industry types per NewGRF; limited to 128 because bit 7 has a special meaning in some variables/callbacks (see MapNewGRFIndustryType).
 
 static const IndustryType NEW_INDUSTRYOFFSET     = 37;                ///< original number of industry types
diff --git a/src/industrytype.h b/src/industrytype.h
index 87fad405cf..1f06ab64e6 100644
--- a/src/industrytype.h
+++ b/src/industrytype.h
@@ -131,7 +131,7 @@ struct IndustrySpec {
 	/* Newgrf data */
 	IndustryCallbackMasks callback_mask;                       ///< Bitmask of industry callbacks that have to be called
 	bool enabled;                               ///< entity still available (by default true).newgrf can disable it, though
-	GRFFileProps grf_prop;                      ///< properties related to the grf file
+	SubstituteGRFFileProps grf_prop; ///< properties related to the grf file
 	std::vector<uint8_t> random_sounds; ///< Random sounds;
 	std::vector<BadgeID> badges;
 
@@ -157,15 +157,15 @@ struct IndustryTileSpec {
 	uint8_t anim_next;                       ///< Next frame in an animation
 	/**
 	 * When true, the tile has to be drawn using the animation
-	 * state instead of the construction state
+	 * state instead of the construction stage
 	 */
 	bool anim_state;
 	/* Newgrf data */
 	IndustryTileCallbackMasks callback_mask;                  ///< Bitmask of industry tile callbacks that have to be called
-	AnimationInfo animation;              ///< Information about the animation (is it looping, how many loops etc)
+	AnimationInfo<IndustryAnimationTriggers> animation; ///< Information about the animation (is it looping, how many loops etc)
 	IndustryTileSpecialFlags special_flags; ///< Bitmask of extra flags used by the tile
 	bool enabled;                         ///< entity still available (by default true).newgrf can disable it, though
-	GRFFileProps grf_prop;                ///< properties related to the grf file
+	SubstituteGRFFileProps grf_prop; ///< properties related to the grf file
 	std::vector<BadgeID> badges;
 
 	std::array<std::variant<CargoLabel, MixedCargoType>, INDUSTRY_ORIGINAL_NUM_INPUTS> accepts_cargo_label; ///< Cargo labels of accepted cargo for default industry tiles.
diff --git a/src/ini.cpp b/src/ini.cpp
index d13cca3cd3..d169833aa1 100644
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -101,14 +101,14 @@ bool IniFile::SaveToDisk(const std::string &filename)
 	return true;
 }
 
-/* virtual */ std::optional<FileHandle> IniFile::OpenFile(const std::string &filename, Subdirectory subdir, size_t *size)
+/* virtual */ std::optional<FileHandle> IniFile::OpenFile(std::string_view filename, Subdirectory subdir, size_t *size)
 {
 	/* Open the text file in binary mode to prevent end-of-line translations
 	 * done by ftell() and friends, as defined by K&R. */
 	return FioFOpenFile(filename, "rb", subdir, size);
 }
 
-/* virtual */ void IniFile::ReportFileError(const char * const pre, const char * const buffer, const char * const post)
+/* virtual */ void IniFile::ReportFileError(std::string_view message)
 {
-	ShowInfo("{}{}{}", pre, buffer, post);
+	ShowInfo("{}", message);
 }
diff --git a/src/ini_load.cpp b/src/ini_load.cpp
index bea0e90dda..7702eed8ce 100644
--- a/src/ini_load.cpp
+++ b/src/ini_load.cpp
@@ -8,7 +8,7 @@
 /** @file ini_load.cpp Definition of the #IniLoadFile class, related to reading and storing '*.ini' files. */
 
 #include "stdafx.h"
-#include "core/mem_func.hpp"
+#include "core/string_consumer.hpp"
 #include "ini_type.h"
 #include "string_func.h"
 
@@ -183,7 +183,7 @@ void IniLoadFile::RemoveGroup(std::string_view name)
  * @param subdir the sub directory to load the file from.
  * @pre nothing has been loaded yet.
  */
-void IniLoadFile::LoadFromDisk(const std::string &filename, Subdirectory subdir)
+void IniLoadFile::LoadFromDisk(std::string_view filename, Subdirectory subdir)
 {
 	assert(this->groups.empty());
 
@@ -198,78 +198,68 @@ void IniLoadFile::LoadFromDisk(const std::string &filename, Subdirectory subdir)
 
 	end += ftell(*in);
 
+	size_t line = 0;
 	/* for each line in the file */
 	while (static_cast<size_t>(ftell(*in)) < end && fgets(buffer, sizeof(buffer), *in)) {
-		char c, *s;
-		/* trim whitespace from the left side */
-		for (s = buffer; *s == ' ' || *s == '\t'; s++) {}
-
-		/* trim whitespace from right side. */
-		char *e = s + strlen(s);
-		while (e > s && ((c = e[-1]) == '\n' || c == '\r' || c == ' ' || c == '\t')) e--;
-		*e = '\0';
+		++line;
+		StringConsumer consumer{StrTrimView(buffer, StringConsumer::WHITESPACE_OR_NEWLINE)};
 
 		/* Skip comments and empty lines outside IGT_SEQUENCE groups. */
-		if ((group == nullptr || group->type != IGT_SEQUENCE) && (*s == '#' || *s == ';' || *s == '\0')) {
-			comment += std::string_view(s, e - s);
-			comment += '\n'; // comment newline
+		if ((group == nullptr || group->type != IGT_SEQUENCE) && (!consumer.AnyBytesLeft() || consumer.PeekCharIfIn("#;"))) {
+			comment += consumer.GetOrigData();
+			comment += "\n";
 			continue;
 		}
 
 		/* it's a group? */
-		if (s[0] == '[') {
-			if (e[-1] != ']') {
-				this->ReportFileError("ini: invalid group name '", buffer, "'");
-			} else {
-				e--;
+		if (consumer.ReadCharIf('[')) {
+			std::string_view group_name = consumer.ReadUntilChar(']', StringConsumer::KEEP_SEPARATOR);
+			if (!consumer.ReadCharIf(']') || consumer.AnyBytesLeft()) {
+				this->ReportFileError(fmt::format("ini [{}]: invalid group name '{}'", line, consumer.GetOrigData()));
 			}
-			s++; // skip [
-			group = &this->CreateGroup(std::string_view(s, e - s));
+			group = &this->CreateGroup(group_name);
 			group->comment = std::move(comment);
 			comment.clear(); // std::move leaves comment in a "valid but unspecified state" according to the specification.
 		} else if (group != nullptr) {
 			if (group->type == IGT_SEQUENCE) {
 				/* A sequence group, use the line as item name without further interpretation. */
-				IniItem &item = group->CreateItem(std::string_view(buffer, e - buffer));
+				IniItem &item = group->CreateItem(consumer.GetOrigData());
 				item.comment = std::move(comment);
 				comment.clear(); // std::move leaves comment in a "valid but unspecified state" according to the specification.
 				continue;
 			}
-			char *t;
+
+			static const std::string_view key_parameter_separators = "=\t ";
+			std::string_view key;
 			/* find end of keyname */
-			if (*s == '\"') {
-				s++;
-				for (t = s; *t != '\0' && *t != '\"'; t++) {}
-				if (*t == '\"') *t = ' ';
+			if (consumer.ReadCharIf('\"')) {
+				key = consumer.ReadUntilChar('\"', StringConsumer::SKIP_ONE_SEPARATOR);
 			} else {
-				for (t = s; *t != '\0' && *t != '=' && *t != '\t' && *t != ' '; t++) {}
+				key = consumer.ReadUntilCharIn(key_parameter_separators);
 			}
 
 			/* it's an item in an existing group */
-			IniItem &item = group->CreateItem(std::string_view(s, t - s));
+			IniItem &item = group->CreateItem(key);
 			item.comment = std::move(comment);
 			comment.clear(); // std::move leaves comment in a "valid but unspecified state" according to the specification.
 
 			/* find start of parameter */
-			while (*t == '=' || *t == ' ' || *t == '\t') t++;
+			consumer.SkipUntilCharNotIn(key_parameter_separators);
 
-			bool quoted = (*t == '\"');
-			/* remove starting quotation marks */
-			if (*t == '\"') t++;
-			/* remove ending quotation marks */
-			e = t + strlen(t);
-			if (e > t && e[-1] == '\"') e--;
-			*e = '\0';
-
-			/* If the value was not quoted and empty, it must be nullptr */
-			if (!quoted && e == t) {
+			if (consumer.ReadCharIf('\"')) {
+				/* There is no escaping in our loader, so we just remove the first and last quote. */
+				std::string_view value = consumer.GetLeftData();
+				if (value.ends_with("\"")) value.remove_suffix(1);
+				item.value = StrMakeValid(value);
+			} else if (!consumer.AnyBytesLeft()) {
+				/* If the value was not quoted and empty, it must be nullptr */
 				item.value.reset();
 			} else {
-				item.value = StrMakeValid(std::string_view(t));
+				item.value = StrMakeValid(consumer.GetLeftData());
 			}
 		} else {
 			/* it's an orphan item */
-			this->ReportFileError("ini: '", buffer, "' outside of group");
+			this->ReportFileError(fmt::format("ini [{}]: '{}' is outside of group", line, consumer.GetOrigData()));
 		}
 	}
 
diff --git a/src/ini_type.h b/src/ini_type.h
index 5bb89e5f5e..0393d4a91b 100644
--- a/src/ini_type.h
+++ b/src/ini_type.h
@@ -48,7 +48,7 @@ struct IniGroup {
 
 /** Ini file that only supports loading. */
 struct IniLoadFile {
-	using IniGroupNameList = std::initializer_list<std::string_view>;
+	using IniGroupNameList = std::initializer_list<const std::string_view>;
 
 	std::list<IniGroup> groups; ///< all groups in the ini
 	std::string comment;                  ///< last comment in file
@@ -64,7 +64,7 @@ struct IniLoadFile {
 	IniGroup &CreateGroup(std::string_view name);
 	void RemoveGroup(std::string_view name);
 
-	void LoadFromDisk(const std::string &filename, Subdirectory subdir);
+	void LoadFromDisk(std::string_view filename, Subdirectory subdir);
 
 	/**
 	 * Open the INI file.
@@ -73,15 +73,13 @@ struct IniLoadFile {
 	 * @param[out] size Size of the opened file.
 	 * @return File handle of the opened file, or \c std::nullopt.
 	 */
-	virtual std::optional<FileHandle> OpenFile(const std::string &filename, Subdirectory subdir, size_t *size) = 0;
+	virtual std::optional<FileHandle> OpenFile(std::string_view filename, Subdirectory subdir, size_t *size) = 0;
 
 	/**
 	 * Report an error about the file contents.
-	 * @param pre    Prefix text of the \a buffer part.
-	 * @param buffer Part of the file with the error.
-	 * @param post   Suffix text of the \a buffer part.
+	 * @param message The message to show.
 	 */
-	virtual void ReportFileError(const char * const pre, const char * const buffer, const char * const post) = 0;
+	virtual void ReportFileError(std::string_view message) = 0;
 };
 
 /** Ini file that supports both loading and saving. */
@@ -90,8 +88,8 @@ struct IniFile : IniLoadFile {
 
 	bool SaveToDisk(const std::string &filename);
 
-	std::optional<FileHandle> OpenFile(const std::string &filename, Subdirectory subdir, size_t *size) override;
-	void ReportFileError(const char * const pre, const char * const buffer, const char * const post) override;
+	std::optional<FileHandle> OpenFile(std::string_view filename, Subdirectory subdir, size_t *size) override;
+	void ReportFileError(std::string_view message) override;
 };
 
 #endif /* INI_TYPE_H */
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index 396fa4efb9..642b6f9792 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -27,6 +27,7 @@
 #include "game/game_gui.hpp"
 #include "gfx_func.h"
 #include "core/geometry_func.hpp"
+#include "core/string_consumer.hpp"
 #include "language.h"
 #include "rev.h"
 #include "highscore.h"
@@ -117,53 +118,54 @@ struct SelectGameWindow : public Window {
 		intro_viewport_commands.clear();
 
 		/* Regular expression matching the commands: T, spaces, integer, spaces, flags, spaces, integer */
-		const char *sign_langauge = "^T\\s*([0-9]+)\\s*([-+A-Z0-9]+)\\s*([0-9]+)";
-		std::regex re(sign_langauge, std::regex_constants::icase);
+		static const std::string sign_language = "^T\\s*([0-9]+)\\s*([-+A-Z0-9]+)\\s*([0-9]+)";
+		std::regex re(sign_language, std::regex_constants::icase);
 
 		/* List of signs successfully parsed to delete afterwards. */
 		std::vector<SignID> signs_to_delete;
 
 		for (const Sign *sign : Sign::Iterate()) {
 			std::smatch match;
-			if (std::regex_search(sign->name, match, re)) {
-				IntroGameViewportCommand vc;
-				/* Sequence index from the first matching group. */
-				vc.command_index = std::stoi(match[1].str());
-				/* Sign coordinates for positioning. */
-				vc.position = RemapCoords(sign->x, sign->y, sign->z);
-				/* Delay from the third matching group. */
-				vc.delay = std::stoi(match[3].str()) * 1000; // milliseconds
+			if (!std::regex_search(sign->name, match, re)) continue;
 
-				/* Parse flags from second matching group. */
-				enum IdType : uint8_t {
-					ID_NONE, ID_VEHICLE
-				} id_type = ID_NONE;
-				for (char c : match[2].str()) {
-					if (isdigit(c)) {
-						if (id_type == ID_VEHICLE) {
-							vc.vehicle = static_cast<VehicleID>(vc.vehicle.base() * 10 + (c - '0'));
-						}
-					} else {
-						id_type = ID_NONE;
-						switch (toupper(c)) {
-							case '-': vc.zoom_adjust = +1; break;
-							case '+': vc.zoom_adjust = -1; break;
-							case 'T': vc.align_v = IntroGameViewportCommand::TOP; break;
-							case 'M': vc.align_v = IntroGameViewportCommand::MIDDLE; break;
-							case 'B': vc.align_v = IntroGameViewportCommand::BOTTOM; break;
-							case 'L': vc.align_h = IntroGameViewportCommand::LEFT; break;
-							case 'C': vc.align_h = IntroGameViewportCommand::CENTRE; break;
-							case 'R': vc.align_h = IntroGameViewportCommand::RIGHT; break;
-							case 'P': vc.pan_to_next = true; break;
-							case 'V': id_type = ID_VEHICLE; vc.vehicle = VehicleID::Begin(); break;
-						}
-					}
-				}
-
-				/* Successfully parsed, store. */
-				intro_viewport_commands.push_back(vc);
-				signs_to_delete.push_back(sign->index);
+			IntroGameViewportCommand vc;
+			/* Sequence index from the first matching group. */
+			if (auto value = ParseInteger<int>(match[1].str()); value.has_value()) {
+				vc.command_index = *value;
+			} else {
+				continue;
 			}
+			/* Sign coordinates for positioning. */
+			vc.position = RemapCoords(sign->x, sign->y, sign->z);
+			/* Delay from the third matching group. */
+			if (auto value = ParseInteger<uint>(match[3].str()); value.has_value()) {
+				vc.delay = *value * 1000; // milliseconds
+			} else {
+				continue;
+			}
+
+			/* Parse flags from second matching group. */
+			auto flags = match[2].str();
+			StringConsumer consumer{flags};
+			while (consumer.AnyBytesLeft()) {
+				auto c = consumer.ReadUtf8();
+				switch (toupper(c)) {
+					case '-': vc.zoom_adjust = +1; break;
+					case '+': vc.zoom_adjust = -1; break;
+					case 'T': vc.align_v = IntroGameViewportCommand::TOP; break;
+					case 'M': vc.align_v = IntroGameViewportCommand::MIDDLE; break;
+					case 'B': vc.align_v = IntroGameViewportCommand::BOTTOM; break;
+					case 'L': vc.align_h = IntroGameViewportCommand::LEFT; break;
+					case 'C': vc.align_h = IntroGameViewportCommand::CENTRE; break;
+					case 'R': vc.align_h = IntroGameViewportCommand::RIGHT; break;
+					case 'P': vc.pan_to_next = true; break;
+					case 'V': vc.vehicle = static_cast<VehicleID>(consumer.ReadIntegerBase<uint32_t>(10, VehicleID::Invalid().base())); break;
+				}
+			}
+
+			/* Successfully parsed, store. */
+			intro_viewport_commands.push_back(vc);
+			signs_to_delete.push_back(sign->index);
 		}
 
 		/* Sort the commands by sequence index. */
@@ -253,20 +255,6 @@ struct SelectGameWindow : public Window {
 		if (intro_viewport_commands.size() == 1 && vc.vehicle == VehicleID::Invalid()) intro_viewport_commands.clear();
 	}
 
-	/**
-	 * Some data on this window has become invalid.
-	 * @param data Information about the changed data.
-	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
-	 */
-	void OnInvalidateData([[maybe_unused]] int data = 0, [[maybe_unused]] bool gui_scope = true) override
-	{
-		if (!gui_scope) return;
-		this->SetWidgetLoweredState(WID_SGI_TEMPERATE_LANDSCAPE, _settings_newgame.game_creation.landscape == LandscapeType::Temperate);
-		this->SetWidgetLoweredState(WID_SGI_ARCTIC_LANDSCAPE,    _settings_newgame.game_creation.landscape == LandscapeType::Arctic);
-		this->SetWidgetLoweredState(WID_SGI_TROPIC_LANDSCAPE,    _settings_newgame.game_creation.landscape == LandscapeType::Tropic);
-		this->SetWidgetLoweredState(WID_SGI_TOYLAND_LANDSCAPE,   _settings_newgame.game_creation.landscape == LandscapeType::Toyland);
-	}
-
 	void OnInit() override
 	{
 		bool missing_sprites = _missing_extra_graphics > 0 && !IsReleasedVersion();
@@ -289,17 +277,6 @@ struct SelectGameWindow : public Window {
 		}
 	}
 
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
-	{
-		switch (widget) {
-			case WID_SGI_TEMPERATE_LANDSCAPE: case WID_SGI_ARCTIC_LANDSCAPE:
-			case WID_SGI_TROPIC_LANDSCAPE: case WID_SGI_TOYLAND_LANDSCAPE:
-				size.width += WidgetDimensions::scaled.fullbevel.Horizontal();
-				size.height += WidgetDimensions::scaled.fullbevel.Vertical();
-				break;
-		}
-	}
-
 	void OnResize() override
 	{
 		bool changed = false;
@@ -317,23 +294,31 @@ struct SelectGameWindow : public Window {
 
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
-		/* Do not create a network server when you (just) have closed one of the game
-		 * creation/load windows for the network server. */
-		if (IsInsideMM(widget, WID_SGI_GENERATE_GAME, WID_SGI_EDIT_SCENARIO + 1)) _is_network_server = false;
-
 		switch (widget) {
 			case WID_SGI_GENERATE_GAME:
+				_is_network_server = false;
 				if (_ctrl_pressed) {
 					StartNewGameWithoutGUI(GENERATE_NEW_SEED);
 				} else {
 					ShowGenerateLandscape();
 				}
 				break;
-
-			case WID_SGI_LOAD_GAME:      ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD); break;
-			case WID_SGI_PLAY_SCENARIO:  ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD); break;
-			case WID_SGI_PLAY_HEIGHTMAP: ShowSaveLoadDialog(FT_HEIGHTMAP,SLO_LOAD); break;
-			case WID_SGI_EDIT_SCENARIO:  StartScenarioEditor(); break;
+			case WID_SGI_LOAD_GAME:
+				_is_network_server = false;
+				ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD);
+				break;
+			case WID_SGI_PLAY_SCENARIO:
+				_is_network_server = false;
+				ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD);
+				break;
+			case WID_SGI_PLAY_HEIGHTMAP:
+				_is_network_server = false;
+				ShowSaveLoadDialog(FT_HEIGHTMAP,SLO_LOAD);
+				break;
+			case WID_SGI_EDIT_SCENARIO:
+				_is_network_server = false;
+				StartScenarioEditor();
+				break;
 
 			case WID_SGI_PLAY_NETWORK:
 				if (!_network_available) {
@@ -343,16 +328,9 @@ struct SelectGameWindow : public Window {
 				}
 				break;
 
-			case WID_SGI_TEMPERATE_LANDSCAPE: case WID_SGI_ARCTIC_LANDSCAPE:
-			case WID_SGI_TROPIC_LANDSCAPE: case WID_SGI_TOYLAND_LANDSCAPE:
-				SetNewLandscapeType(LandscapeType(widget - WID_SGI_TEMPERATE_LANDSCAPE));
-				break;
-
 			case WID_SGI_OPTIONS:         ShowGameOptions(); break;
 			case WID_SGI_HIGHSCORE:       ShowHighscoreTable(); break;
 			case WID_SGI_HELP:            ShowHelpWindow(); break;
-			case WID_SGI_SETTINGS_OPTIONS:ShowGameSettings(); break;
-			case WID_SGI_GRF_SETTINGS:    ShowNewGRFSettings(true, true, false, _grfconfig_newgame); break;
 			case WID_SGI_CONTENT_DOWNLOAD:
 				if (!_network_available) {
 					ShowErrorMessage(GetEncodedString(STR_NETWORK_ERROR_NOTAVAILABLE), {}, WL_ERROR);
@@ -360,8 +338,6 @@ struct SelectGameWindow : public Window {
 					ShowNetworkContentListWindow();
 				}
 				break;
-			case WID_SGI_AI_SETTINGS:     ShowAIConfigWindow(); break;
-			case WID_SGI_GS_SETTINGS:     ShowGSConfigWindow(); break;
 			case WID_SGI_EXIT:            HandleExitGameRequest(); break;
 		}
 	}
@@ -372,32 +348,18 @@ static constexpr NWidgetPart _nested_select_game_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_BROWN),
 		NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.sparse),
 
-			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
-				/* 'New Game' and 'Load Game' buttons */
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetStringTip(STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetStringTip(STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetFill(1, 0),
-				EndContainer(),
-
-				/* 'Play Scenario' and 'Play Heightmap' buttons */
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetStringTip(STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetStringTip(STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetFill(1, 0),
-				EndContainer(),
-
-				/* 'Scenario Editor' and 'Multiplayer' buttons */
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetStringTip(STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetStringTip(STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetFill(1, 0),
-				EndContainer(),
+			/* Single player */
+			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_LANDSCAPING, STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SHOW_COUNTOURS, STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SUBSIDIES, STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SAVE, STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_HIGHSCORE), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_COMPANY_LEAGUE, STR_INTRO_HIGHSCORE, STR_INTRO_TOOLTIP_HIGHSCORE), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
 			EndContainer(),
 
-			/* Climate selection buttons */
-			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), SetPIPRatio(1, 1, 1),
-				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TEMPERATE_LANDSCAPE), SetSpriteTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),
-				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_ARCTIC_LANDSCAPE), SetSpriteTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),
-				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TROPIC_LANDSCAPE), SetSpriteTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
-				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TOYLAND_LANDSCAPE), SetSpriteTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
+			/* Multi player */
+			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_COMPANY_GENERAL, STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
 			EndContainer(),
 
 			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_BASESET_SELECTION),
@@ -412,42 +374,23 @@ static constexpr NWidgetPart _nested_select_game_widgets[] = {
 				EndContainer(),
 			EndContainer(),
 
-			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
-				/* 'Game Options' and 'Settings' buttons */
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetStringTip(STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_SETTINGS_OPTIONS), SetStringTip(STR_INTRO_CONFIG_SETTINGS_TREE, STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE), SetFill(1, 0),
-				EndContainer(),
-
-				/* 'AI Settings' and 'Game Script Settings' buttons */
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_AI_SETTINGS), SetStringTip(STR_INTRO_AI_SETTINGS, STR_INTRO_TOOLTIP_AI_SETTINGS), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GS_SETTINGS), SetStringTip(STR_INTRO_GAMESCRIPT_SETTINGS, STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS), SetFill(1, 0),
-				EndContainer(),
-
-				/* 'Check Online Content' and 'NewGRF Settings' buttons */
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetStringTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GRF_SETTINGS), SetStringTip(STR_INTRO_NEWGRF_SETTINGS, STR_INTRO_TOOLTIP_NEWGRF_SETTINGS), SetFill(1, 0),
-				EndContainer(),
+			/* Other */
+			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SETTINGS, STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SHOW_VEHICLES, STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SMALLMAP, STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_HELP), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_QUERY, STR_INTRO_HELP, STR_INTRO_TOOLTIP_HELP), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
 			EndContainer(),
 
-			/* 'Help and Manuals' and 'Highscore Table' buttons */
-			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_HELP), SetStringTip(STR_INTRO_HELP, STR_INTRO_TOOLTIP_HELP), SetFill(1, 0),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_HIGHSCORE), SetStringTip(STR_INTRO_HIGHSCORE, STR_INTRO_TOOLTIP_HIGHSCORE), SetFill(1, 0),
-			EndContainer(),
-
-			/* 'Exit' button */
-			NWidget(NWID_HORIZONTAL), SetPIPRatio(1, 0, 1),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetMinimalSize(128, 0), SetStringTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),
+			NWidget(NWID_VERTICAL),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetToolbarMinimalSize(1), SetStringTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
 };
 
 static WindowDesc _select_game_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_SELECT_GAME, WC_NONE,
 	WindowDefaultFlag::NoClose,
 	_nested_select_game_widgets
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 702889a922..5db1c9177a 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -27,6 +27,7 @@
 #include "effectvehicle_func.h"
 #include "landscape_type.h"
 #include "animated_tile_func.h"
+#include "core/flatset_type.hpp"
 #include "core/random_func.hpp"
 #include "object_base.h"
 #include "company_func.h"
@@ -836,7 +837,7 @@ static void GenerateTerrain(int type, uint flag)
 
 	if (DiagDirToAxis(direction) == AXIS_Y) std::swap(w, h);
 
-	const uint8_t *p = templ->data;
+	const uint8_t *p = reinterpret_cast<const uint8_t *>(templ->data);
 
 	if ((flag & 4) != 0) {
 		/* This is only executed in secondary/tertiary loops to generate the terrain for arctic and tropic.
@@ -980,7 +981,7 @@ static void CreateDesertOrRainForest(uint desert_tropic_line)
  * @param tile The tile to consider for being the spring.
  * @return True iff it is suitable as a spring.
  */
-static bool FindSpring(TileIndex tile, void *)
+static bool FindSpring(TileIndex tile)
 {
 	int reference_height;
 	if (!IsTileFlat(tile, &reference_height) || IsWaterTile(tile)) return false;
@@ -1013,54 +1014,48 @@ static bool FindSpring(TileIndex tile, void *)
 /**
  * Make a connected lake; fill all tiles in the circular tile search that are connected.
  * @param tile The tile to consider for lake making.
- * @param user_data The height of the lake.
- * @return Always false, so it continues searching.
+ * @param height_lake The height of the lake.
  */
-static bool MakeLake(TileIndex tile, void *user_data)
+static void MakeLake(TileIndex tile, uint height_lake)
 {
-	uint height_lake = *static_cast<uint *>(user_data);
-	if (!IsValidTile(tile) || TileHeight(tile) != height_lake || !IsTileFlat(tile)) return false;
-	if (_settings_game.game_creation.landscape == LandscapeType::Tropic && GetTropicZone(tile) == TROPICZONE_DESERT) return false;
+	if (!IsValidTile(tile) || TileHeight(tile) != height_lake || !IsTileFlat(tile)) return;
+	if (_settings_game.game_creation.landscape == LandscapeType::Tropic && GetTropicZone(tile) == TROPICZONE_DESERT) return;
 
 	for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 		TileIndex t = tile + TileOffsByDiagDir(d);
 		if (IsWaterTile(t)) {
 			MakeRiverAndModifyDesertZoneAround(tile);
-			return false;
+			return;
 		}
 	}
-
-	return false;
 }
 
 /**
  * Widen a river by expanding into adjacent tiles via circular tile search.
  * @param tile The tile to try expanding the river into.
- * @param user_data The tile to try surrounding the river around.
- * @return Always false, so it continues searching.
+ * @param origin_tile The tile to try surrounding the river around.
  */
-static bool RiverMakeWider(TileIndex tile, void *user_data)
+static void RiverMakeWider(TileIndex tile, TileIndex origin_tile)
 {
 	/* Don't expand into void tiles. */
-	if (!IsValidTile(tile)) return false;
+	if (!IsValidTile(tile)) return;
 
 	/* If the tile is already sea or river, don't expand. */
-	if (IsWaterTile(tile)) return false;
+	if (IsWaterTile(tile)) return;
 
 	/* If the tile is at height 0 after terraforming but the ocean hasn't flooded yet, don't build river. */
-	if (GetTileMaxZ(tile) == 0) return false;
+	if (GetTileMaxZ(tile) == 0) return;
 
-	TileIndex origin_tile = *static_cast<TileIndex *>(user_data);
 	Slope cur_slope = GetTileSlope(tile);
 	Slope desired_slope = GetTileSlope(origin_tile); // Initialize matching the origin tile as a shortcut if no terraforming is needed.
 
 	/* Never flow uphill. */
-	if (GetTileMaxZ(tile) > GetTileMaxZ(origin_tile)) return false;
+	if (GetTileMaxZ(tile) > GetTileMaxZ(origin_tile)) return;
 
 	/* If the new tile can't hold a river tile, try terraforming. */
 	if (!IsTileFlat(tile) && !IsInclinedSlope(cur_slope)) {
 		/* Don't try to terraform steep slopes. */
-		if (IsSteepSlope(cur_slope)) return false;
+		if (IsSteepSlope(cur_slope)) return;
 
 		bool flat_river_found = false;
 		bool sloped_river_found = false;
@@ -1070,7 +1065,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 		 * 2. River descending, adjacent tile has either one or three corners raised.
 		 */
 
-		/* First, determine the desired slope based on adjacent river tiles. This doesn't necessarily match the origin tile for the CircularTileSearch. */
+		/* First, determine the desired slope based on adjacent river tiles. This doesn't necessarily match the origin tile for the SpiralTileSequence. */
 		for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 			TileIndex other_tile = TileAddByDiagDir(tile, d);
 			Slope other_slope = GetTileSlope(other_tile);
@@ -1092,7 +1087,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 			}
 		}
 		/* We didn't find either an inclined or flat river, so we're climbing the wrong slope. Bail out. */
-		if (!sloped_river_found && !flat_river_found) return false;
+		if (!sloped_river_found && !flat_river_found) return;
 
 		/* We didn't find an inclined river, but there is a flat river. */
 		if (!sloped_river_found && flat_river_found) desired_slope = SLOPE_FLAT;
@@ -1104,7 +1099,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 			/* Make sure we're not affecting an existing river slope tile. */
 			for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 				TileIndex other_tile = TileAddByDiagDir(tile, d);
-				if (IsInclinedSlope(GetTileSlope(other_tile)) && IsWaterTile(other_tile)) return false;
+				if (IsInclinedSlope(GetTileSlope(other_tile)) && IsWaterTile(other_tile)) return;
 			}
 			Command<CMD_TERRAFORM_LAND>::Do({DoCommandFlag::Execute, DoCommandFlag::Auto}, tile, ComplementSlope(cur_slope), true);
 
@@ -1118,7 +1113,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 				if (d == DIAGDIRDIFF_SAME || d == DIAGDIRDIFF_REVERSE) continue;
 
 				TileIndex other_tile = (TileAddByDiagDir(tile, ChangeDiagDir(river_direction, d)));
-				if (IsWaterTile(other_tile) && IsRiver(other_tile) && IsTileFlat(other_tile)) return false;
+				if (IsWaterTile(other_tile) && IsRiver(other_tile) && IsTileFlat(other_tile)) return;
 			}
 
 			/* Get the corners which are different between the current and desired slope. */
@@ -1149,7 +1144,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 		TileIndex downstream_tile = TileAddByDiagDir(tile, ReverseDiagDir(slope_direction));
 
 		/* Don't look outside the map. */
-		if (!IsValidTile(upstream_tile) || !IsValidTile(downstream_tile)) return false;
+		if (!IsValidTile(upstream_tile) || !IsValidTile(downstream_tile)) return;
 
 		/* Downstream might be new ocean created by our terraforming, and it hasn't flooded yet. */
 		bool downstream_is_ocean = GetTileZ(downstream_tile) == 0 && (GetTileSlope(downstream_tile) == SLOPE_FLAT || IsSlopeWithOneCornerRaised(GetTileSlope(downstream_tile)));
@@ -1157,7 +1152,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 		/* If downstream is dry, flat, and not ocean, try making it a river tile. */
 		if (!IsWaterTile(downstream_tile) && !downstream_is_ocean) {
 			/* If the tile upstream isn't flat, don't bother. */
-			if (GetTileSlope(downstream_tile) != SLOPE_FLAT) return false;
+			if (GetTileSlope(downstream_tile) != SLOPE_FLAT) return;
 
 			MakeRiverAndModifyDesertZoneAround(downstream_tile);
 		}
@@ -1165,7 +1160,7 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 		/* If upstream is dry and flat, try making it a river tile. */
 		if (!IsWaterTile(upstream_tile)) {
 			/* If the tile upstream isn't flat, don't bother. */
-			if (GetTileSlope(upstream_tile) != SLOPE_FLAT) return false;
+			if (GetTileSlope(upstream_tile) != SLOPE_FLAT) return;
 
 			MakeRiverAndModifyDesertZoneAround(upstream_tile);
 		}
@@ -1175,9 +1170,6 @@ static bool RiverMakeWider(TileIndex tile, void *user_data)
 	if (cur_slope == desired_slope) {
 		MakeRiverAndModifyDesertZoneAround(tile);
 	}
-
-	/* Always return false to keep searching. */
-	return false;
 }
 
 /**
@@ -1207,103 +1199,95 @@ static bool FlowsDown(TileIndex begin, TileIndex end)
 	return slope_end == SLOPE_FLAT || slope_begin == SLOPE_FLAT;
 }
 
-/** Parameters for river generation to pass as AyStar user data. */
-struct River_UserData {
-	TileIndex spring; ///< The current spring during river generation.
-	bool main_river;  ///< Whether the current river is a big river that others flow into.
-};
-
-/* AyStar callback for checking whether we reached our destination. */
-static AyStarStatus River_EndNodeCheck(const AyStar *aystar, const PathNode *current)
-{
-	return current->GetTile() == *static_cast<TileIndex *>(aystar->user_target) ? AyStarStatus::FoundEndNode : AyStarStatus::Done;
-}
-
-/* AyStar callback for getting the cost of the current node. */
-static int32_t River_CalculateG(AyStar *, AyStarNode *, PathNode *)
-{
-	return 1 + RandomRange(_settings_game.game_creation.river_route_random);
-}
-
-/* AyStar callback for getting the estimated cost to the destination. */
-static int32_t River_CalculateH(AyStar *aystar, AyStarNode *current, PathNode *)
-{
-	return DistanceManhattan(*static_cast<TileIndex *>(aystar->user_target), current->tile);
-}
-
-/* AyStar callback for getting the neighbouring nodes of the given node. */
-static void River_GetNeighbours(AyStar *aystar, PathNode *current)
-{
-	TileIndex tile = current->GetTile();
-
-	aystar->neighbours.clear();
-	for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
-		TileIndex t = tile + TileOffsByDiagDir(d);
-		if (IsValidTile(t) && FlowsDown(tile, t)) {
-			auto &neighbour = aystar->neighbours.emplace_back();
-			neighbour.tile = t;
-			neighbour.td = INVALID_TRACKDIR;
-		}
+/** Search path and build river */
+class RiverBuilder : public AyStar {
+protected:
+	AyStarStatus EndNodeCheck(const PathNode &current) const override
+	{
+		return current.GetTile() == this->end ? AyStarStatus::FoundEndNode : AyStarStatus::Done;
 	}
-}
 
-/* AyStar callback when an route has been found. */
-static void River_FoundEndNode(AyStar *aystar, PathNode *current)
-{
-	River_UserData *data = static_cast<River_UserData *>(aystar->user_data);
+	int32_t CalculateG(const AyStarNode &, const PathNode &) const override
+	{
+		return 1 + RandomRange(_settings_game.game_creation.river_route_random);
+	}
 
-	/* First, build the river without worrying about its width. */
-	for (PathNode *path = current->parent; path != nullptr; path = path->parent) {
-		TileIndex tile = path->GetTile();
-		if (!IsWaterTile(tile)) {
-			MakeRiverAndModifyDesertZoneAround(tile);
+	int32_t CalculateH(const AyStarNode &current, const PathNode &) const override
+	{
+		return DistanceManhattan(this->end, current.tile);
+	}
+
+	void GetNeighbours(const PathNode &current, std::vector<AyStarNode> &neighbours) const override
+	{
+		TileIndex tile = current.GetTile();
+
+		neighbours.clear();
+		for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
+			TileIndex t = tile + TileOffsByDiagDir(d);
+			if (IsValidTile(t) && FlowsDown(tile, t)) {
+				auto &neighbour = neighbours.emplace_back();
+				neighbour.tile = t;
+				neighbour.td = INVALID_TRACKDIR;
+			}
 		}
 	}
 
-	/* If the river is a main river, go back along the path to widen it.
-	 * Don't make wide rivers if we're using the original landscape generator.
-	 */
-	if (_settings_game.game_creation.land_generator != LG_ORIGINAL && data->main_river) {
-		const uint long_river_length = _settings_game.game_creation.min_river_length * 4;
-
-		for (PathNode *path = current->parent; path != nullptr; path = path->parent) {
+	void FoundEndNode(const PathNode &current) override
+	{
+		/* First, build the river without worrying about its width. */
+		for (PathNode *path = current.parent; path != nullptr; path = path->parent) {
 			TileIndex tile = path->GetTile();
+			if (!IsWaterTile(tile)) {
+				MakeRiverAndModifyDesertZoneAround(tile);
+			}
+		}
 
-			/* Check if we should widen river depending on how far we are away from the source. */
-			uint current_river_length = DistanceManhattan(data->spring, tile);
-			uint radius = std::min(3u, (current_river_length / (long_river_length / 3u)) + 1u);
+		/* If the river is a main river, go back along the path to widen it.
+		 * Don't make wide rivers if we're using the original landscape generator.
+		 */
+		if (_settings_game.game_creation.land_generator != LG_ORIGINAL && this->main_river) {
+			const uint long_river_length = _settings_game.game_creation.min_river_length * 4;
 
-			if (radius > 1) CircularTileSearch(&tile, radius, RiverMakeWider, &path->key.tile);
+			for (PathNode *path = current.parent; path != nullptr; path = path->parent) {
+				TileIndex origin_tile = path->GetTile();
+
+				/* Check if we should widen river depending on how far we are away from the source. */
+				uint current_river_length = DistanceManhattan(this->spring, origin_tile);
+				uint diameter = std::min(3u, (current_river_length / (long_river_length / 3u)) + 1u);
+				if (diameter <= 1) continue;
+
+				for (auto tile : SpiralTileSequence(origin_tile, diameter)) {
+					RiverMakeWider(tile, origin_tile);
+				}
+			}
 		}
 	}
-}
 
-/**
- * Actually build the river between the begin and end tiles using AyStar.
- * @param begin The begin of the river.
- * @param end The end of the river.
- * @param spring The springing point of the river.
- * @param main_river Whether the current river is a big river that others flow into.
- */
-static void BuildRiver(TileIndex begin, TileIndex end, TileIndex spring, bool main_river)
-{
-	River_UserData user_data = { spring, main_river };
+	RiverBuilder(TileIndex end, TileIndex spring, bool main_river) : end(end), spring(spring), main_river(main_river) {}
 
-	AyStar finder = {};
-	finder.CalculateG = River_CalculateG;
-	finder.CalculateH = River_CalculateH;
-	finder.GetNeighbours = River_GetNeighbours;
-	finder.EndNodeCheck = River_EndNodeCheck;
-	finder.FoundEndNode = River_FoundEndNode;
-	finder.user_target = &end;
-	finder.user_data = &user_data;
+private:
+	TileIndex end; ///< Destination for the river.
+	TileIndex spring; ///< The current spring during river generation.
+	bool main_river; ///< Whether the current river is a big river that others flow into.
 
-	AyStarNode start;
-	start.tile = begin;
-	start.td = INVALID_TRACKDIR;
-	finder.AddStartNode(&start, 0);
-	finder.Main();
-}
+public:
+	/**
+	 * Actually build the river between the begin and end tiles using AyStar.
+	 * @param begin The begin of the river.
+	 * @param end The end of the river.
+	 * @param spring The springing point of the river.
+	 * @param main_river Whether the current river is a big river that others flow into.
+	 */
+	static void Exec(TileIndex begin, TileIndex end, TileIndex spring, bool main_river)
+	{
+		RiverBuilder builder(end, spring, main_river);
+		AyStarNode start;
+		start.tile = begin;
+		start.td = INVALID_TRACKDIR;
+		builder.AddStartNode(&start, 0);
+		builder.Main();
+	}
+};
 
 /**
  * Try to flow the river down from a given begin.
@@ -1320,7 +1304,7 @@ static std::tuple<bool, bool> FlowRiver(TileIndex spring, TileIndex begin, uint
 		return { DistanceManhattan(spring, begin) > min_river_length, GetTileZ(begin) == 0 };
 	}
 
-	std::set<TileIndex> marks;
+	FlatSet<TileIndex> marks;
 	marks.insert(begin);
 
 	/* Breadth first search for the closest tile we can flow down to. */
@@ -1356,7 +1340,7 @@ static std::tuple<bool, bool> FlowRiver(TileIndex spring, TileIndex begin, uint
 		std::tie(found, main_river) = FlowRiver(spring, end, min_river_length);
 	} else if (count > 32) {
 		/* Maybe we can make a lake. Find the Nth of the considered tiles. */
-		std::set<TileIndex>::const_iterator cit = marks.cbegin();
+		auto cit = marks.cbegin();
 		std::advance(cit, RandomRange(count - 1));
 		TileIndex lake_centre = *cit;
 
@@ -1373,17 +1357,21 @@ static std::tuple<bool, bool> FlowRiver(TileIndex spring, TileIndex begin, uint
 				DistanceManhattan(spring, lake_centre) > min_river_length) {
 			end = lake_centre;
 			MakeRiverAndModifyDesertZoneAround(lake_centre);
-			uint range = RandomRange(8) + 3;
-			CircularTileSearch(&lake_centre, range, MakeLake, &height_begin);
-			/* Call the search a second time so artefacts from going circular in one direction get (mostly) hidden. */
-			lake_centre = end;
-			CircularTileSearch(&lake_centre, range, MakeLake, &height_begin);
+			uint diameter = RandomRange(8) + 3;
+
+			/* Run the loop twice, so artefacts from going circular in one direction get (mostly) hidden. */
+			for (uint loops = 0; loops < 2; ++loops) {
+				for (auto tile : SpiralTileSequence(lake_centre, diameter)) {
+					MakeLake(tile, height_begin);
+				}
+			}
+
 			found = true;
 		}
 	}
 
 	marks.clear();
-	if (found) BuildRiver(begin, end, spring, main_river);
+	if (found) RiverBuilder::Exec(begin, end, spring, main_river);
 	return { found, main_river };
 }
 
@@ -1402,20 +1390,30 @@ static void CreateRivers()
 	/* Try to create long rivers. */
 	for (; wells > num_short_rivers; wells--) {
 		IncreaseGeneratingWorldProgress(GWP_RIVER);
+		bool done = false;
 		for (int tries = 0; tries < 512; tries++) {
-			TileIndex t = RandomTile();
-			if (!CircularTileSearch(&t, 8, FindSpring, nullptr)) continue;
-			if (std::get<0>(FlowRiver(t, t, _settings_game.game_creation.min_river_length * 4))) break;
+			for (auto t : SpiralTileSequence(RandomTile(), 8)) {
+				if (FindSpring(t)) {
+					done = std::get<0>(FlowRiver(t, t, _settings_game.game_creation.min_river_length * 4));
+					break;
+				}
+			}
+			if (done) break;
 		}
 	}
 
 	/* Try to create short rivers. */
 	for (; wells != 0; wells--) {
 		IncreaseGeneratingWorldProgress(GWP_RIVER);
+		bool done = false;
 		for (int tries = 0; tries < 128; tries++) {
-			TileIndex t = RandomTile();
-			if (!CircularTileSearch(&t, 8, FindSpring, nullptr)) continue;
-			if (std::get<0>(FlowRiver(t, t, _settings_game.game_creation.min_river_length))) break;
+			for (auto t : SpiralTileSequence(RandomTile(), 8)) {
+				if (FindSpring(t)) {
+					done = std::get<0>(FlowRiver(t, t, _settings_game.game_creation.min_river_length));
+					break;
+				}
+			}
+			if (done) break;
 		}
 	}
 
@@ -1543,7 +1541,7 @@ bool GenerateLandscape(uint8_t mode)
 
 	if (mode == GWM_HEIGHTMAP) {
 		SetGeneratingWorldProgress(GWP_LANDSCAPE, steps + GLS_HEIGHTMAP);
-		if (!LoadHeightmap(_file_to_saveload.detail_ftype, _file_to_saveload.name.c_str())) {
+		if (!LoadHeightmap(_file_to_saveload.ftype.detailed, _file_to_saveload.name)) {
 			return false;
 		}
 		IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 66e53c2423..e5784c58a2 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -391,7 +391,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Verlaat
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spel opsies
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Stellings
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF stellings
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Deursigtigheid opsies
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Dorp name vertoon
@@ -865,8 +864,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spel Ops
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Geldeenheid
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Geld eendheid keuse
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Geldeenheid
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Geld eendheid keuse
 
 
 ###length 45
@@ -910,21 +910,21 @@ STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuwe Taiwan dol
 STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Outostoor
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Kies interval tussen outomatiese store
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Outostoor
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Kies interval tussen outomatiese store
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Af
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Taal
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Kies die koppelvlak taal om te gebruik
+STR_GAME_OPTIONS_LANGUAGE                                       :Taal
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Kies die koppelvlak taal om te gebruik
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Volskerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kies die blokkie om OpenTTD in volleskerm te speel
+STR_GAME_OPTIONS_FULLSCREEN                                     :Volskerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Kies die blokkie om OpenTTD in volleskerm te speel
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skerm resolusie
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Kies die skerm resolusie om te gebruik
+STR_GAME_OPTIONS_RESOLUTION                                     :Skerm resolusie
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Kies die skerm resolusie om te gebruik
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ander
 
 
@@ -937,17 +937,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ander
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafikastel
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kies die basis-grafikastel stel om te gebruik
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Meer inligting oor die basis-grafikastel
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis klank stel
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Kies die basis klank stel om te gebruik
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Addisionele informasie oor die basis klank stel
+STR_GAME_OPTIONS_BASE_GRF                                       :Basis-grafikastel
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Kies die basis-grafikastel stel om te gebruik
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Meer inligting oor die basis-grafikastel
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis musiek stel
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Kies die basis musiek stel om te gebruik
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Addisionele informasie oor die basis musiek stel
+STR_GAME_OPTIONS_BASE_SFX                                       :Basis klank stel
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Kies die basis klank stel om te gebruik
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Addisionele informasie oor die basis klank stel
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basis musiek stel
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Kies die basis musiek stel om te gebruik
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Addisionele informasie oor die basis musiek stel
 
 
 
@@ -1050,11 +1051,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissief
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Geen geskikte KI beskikbaar...{}Jy kan verskeie KI's aflaai deur middel van die 'Aanlyn Inhoud' stelsel
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Stellings
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter string:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Brei alles uit
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Krimp alles in
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter string:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Brei alles uit
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Krimp alles in
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(geen verduideliking beskikbaar)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standaard waarde: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Stelling tipe: {ORANGE}{STRING}
@@ -1064,9 +1064,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Maatskappy inst
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Maatskappy instelling (word gestoor in Spaarspeletjies; raak net nuwe speletjies)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Maatskappy instelling (word gestoor in spaarspeletjie; raak net die huidige maatskappy)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipe:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Beperk die lys hier onder deur voorafgestelde "filters" te gebruik slegs veranderde verstellings
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipe:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Beperk die lys hier onder deur voorafgestelde "filters" te gebruik slegs veranderde verstellings
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basiese (wys net belangrik verstellings)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Gevorderde (wys meeste verstellings)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspert (wys alle verstellings, insluitend vreemde verstellings)
@@ -1083,9 +1083,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Maatskappy-inst
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Geen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Wys alle soekresultate deur oprigting{}{SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING} {BLACK}en {SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Wys alle soekresultate deur oprigting{}{SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING} {BLACK}en {SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Af
@@ -1890,7 +1890,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Allokeri
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nuwe Spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Laai Spel
@@ -1901,8 +1900,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multispe
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spel Opsies
 STR_INTRO_HIGHSCORE                                             :{BLACK}Hoogste Tellings Tafel
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Stellings
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Stellings
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Soek aanlyn
 STR_INTRO_QUIT                                                  :{BLACK}Verlaat
 
@@ -1920,8 +1917,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Kies 'sp
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Vertoon speletjie opsies
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Vertoon hoogste tellings tafel
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Vertoon instellings
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Wys NewGRF stellings
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Kyk vir nuwe of bygewerkde inhoud om af te laai
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Verlaat 'OpenTTD'
 
@@ -2589,6 +2584,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Kies dor
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stede groei viniger as gewone dorpe{}Afhangende van stellings, is hulle grooter waneer hulle gestig word
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Straat uitleg van dorp:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Kies straat uitleg wat vir die dorp gebruik word
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Oorspronklik
@@ -2962,14 +2958,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Stoor vo
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Beskikbare voorafinstellings, kies een om te gebruik as eksemplaar vir 'n nuwe een
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Kies 'n naam vir die voorafinstellings
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Gekose naam om voorafstellings te stoor
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Kanselleer
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Moenie voorafinstellings verander nie
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Stoor
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Stoor die voorafinstellings na gekose naam
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Verander NewGRF parameters
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Maak Toe
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Herstel
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Stel alle parameters na hul verstek waarde
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -4061,7 +4054,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rooster
 STR_TIMETABLE_NO_TRAVEL                                         :Geen reis
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Reis (outomaties; getabuleer volgens eiehandige bevel)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (Nie op rooster nie)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis nie meer as {2:VELOCITY} nie (nie volgens tydrooster nie)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis vir {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis vir {STRING} met die meeste {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Reis (vir {STRING}, nie volgens tydrooster nie)
@@ -4171,8 +4163,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aanvaar
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Kies beligte skrif
-STR_AI_LIST_CANCEL                                              :{BLACK}Kanseleer
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Moenie skrif verander nie
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Neem 'n skermkiekie
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normale skermkiekie
@@ -4184,7 +4174,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimap-
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Maak toe
 STR_AI_SETTINGS_RESET                                           :{BLACK}Herstel
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 944a7e7911..5e26566ada 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -412,7 +412,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :انهاء
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :إعدادات اللعبه
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :الإعدادات
 STR_SETTINGS_MENU_AI_SETTINGS                                   :اعدادات االذكاء الاصطناعي
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :إعدادات اﻹضافات
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :خيارات الشفافية
@@ -880,8 +879,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}إعدا
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}وحدة العملة
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}اختيار وحدة العملة
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :وحدة العملة
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :اختيار وحدة العملة
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -930,8 +930,8 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :الروبية
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :رينغيت ماليزي
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :لاتفيا لاتس
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}حفظ آلي
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}اختار مدة الحفظ الآلي
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :حفظ آلي
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :اختار مدة الحفظ الآلي
 
 # Autosave dropdown
 ###length 5
@@ -941,57 +941,57 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :كل 30 دقي
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :كل 60 دقيقة
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :كل 120 دقيقة
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}لغة
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}اختر لغة الواجهه
+STR_GAME_OPTIONS_LANGUAGE                                       :لغة
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :اختر لغة الواجهه
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% مكتمل)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}شاشة كاملة
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}اختر هذا المربع للعب OpenTTD على لشاشة الكاملة
+STR_GAME_OPTIONS_FULLSCREEN                                     :شاشة كاملة
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :اختر هذا المربع للعب OpenTTD على لشاشة الكاملة
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}دقة الشاشة
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}اختر دقة الشاشة
+STR_GAME_OPTIONS_RESOLUTION                                     :دقة الشاشة
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :اختر دقة الشاشة
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :اخرى
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}تسريع الأجهزة
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}اخترهذا المربع للسماح لـ OpenTTD بمحاولة استخدام تسريع الأجهزة. سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :تسريع الأجهزة
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :اخترهذا المربع للسماح لـ OpenTTD بمحاولة استخدام تسريع الأجهزة. سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}لن يعمل الإعداد إلا بعد إعادة تشغيل اللعبة
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}حدد هذا المربع لمزامنة الشاشة (v-sync). سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة. يعمل فقط مع تمكين تسريع الأجهزة (hardware acceleration)
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :حدد هذا المربع لمزامنة الشاشة (v-sync). سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة. يعمل فقط مع تمكين تسريع الأجهزة (hardware acceleration)
 
 
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}اسحب شريط التمرير لتعيين حجم الواجهة. اضغط مع الاستمرار على Ctrl للتعديل المستمر
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}الكشف التلقائي عن الحجم
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}اختر هذا المربع لكشف حجم الواجهة تلقائيا
+
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :اسحب شريط التمرير لتعيين حجم الواجهة. اضغط مع الاستمرار على Ctrl للتعديل المستمر
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :الكشف التلقائي عن الحجم
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :اختر هذا المربع لكشف حجم الواجهة تلقائيا
 
 
 
 
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}الرسومات
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}معدل تحديث الشاشة
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}حدد معدل تحديث الشاشة
+STR_GAME_OPTIONS_REFRESH_RATE                                   :معدل تحديث الشاشة
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :حدد معدل تحديث الشاشة
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}هرتز
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}قد تؤثر معدلات التحديث الأعلى من 60 هرتز على الأداء.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK} الواجهة الرسومية الاساسية
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK} اختر مجموعة الواجهة الرسومية
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK} معلومات اضافية عن القاعدة الرسومية
+STR_GAME_OPTIONS_BASE_GRF                                       : الواجهة الرسومية الاساسية
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               : اختر مجموعة الواجهة الرسومية
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   : معلومات اضافية عن القاعدة الرسومية
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}قاعدة الاصوات الاساسية
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}اختر الاصوات الاساسية للاستخدام
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}معلومات اضافية حول مجوعة الصوت
+STR_GAME_OPTIONS_BASE_SFX                                       :قاعدة الاصوات الاساسية
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :اختر الاصوات الاساسية للاستخدام
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :معلومات اضافية حول مجوعة الصوت
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}قاعده الموسيقى الاساسيه
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}اختر الموسيقى الاساسية التي تود استخدامها
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}معلومات اضافية عن الموسيقى الاساسية
+STR_GAME_OPTIONS_BASE_MUSIC                                     :قاعده الموسيقى الاساسيه
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :اختر الموسيقى الاساسية التي تود استخدامها
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :معلومات اضافية عن الموسيقى الاساسية
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(لا توجد اضافات مثبتة للتكامل مع منصات التواصل)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}المنصة:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}حالة الاضافة:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :المنصة:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :حالة الاضافة:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}فشلت التهيئة
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} غير مفعلة
@@ -1097,17 +1097,16 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :متساهل (
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}لايوجد ذكاء اصطناعي متاح ...{}تستطيع تجميل العديد من الذكاء الاصطناعي عن طريق اللانترنت
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}الإعدادات
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}تصفية القائمة:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}مدد الكل
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}إسحب الكل
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}اعادة ضبط جميع القيم
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :تصفية القائمة:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :مدد الكل
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :إسحب الكل
+STR_CONFIG_SETTING_RESET_ALL                                    :اعادة ضبط جميع القيم
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(لا يوجد تفسير متوفر)
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}تحذير!
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK} فئة:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}نوع:
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            : فئة:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :نوع:
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :اﻹعدادات الاساسيه
 
 STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT                       :{BLACK}احصر القائمة على انواع اعدادات محددة
@@ -1120,7 +1119,7 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :اعدادات
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE} - بدون -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}عرض جميع النتائج بالنسبة للإعداد{}{SILVER} الفئة {BLACK} إلى {WHITE}{STRING} {BLACK}و{SILVER}نوع {BLACK} إلى{WHITE} جميع انواع الإعدادات
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :عرض جميع النتائج بالنسبة للإعداد{}{SILVER} الفئة {BLACK} إلى {WHITE}{STRING} {BLACK}و{SILVER}نوع {BLACK} إلى{WHITE} جميع انواع الإعدادات
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :قفل
@@ -1762,7 +1761,6 @@ STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}نفذت
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... لم يتم العثور على GPU متوافق. تم تعطيل تسريع الأجهزة
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}لعبة جديدة
 STR_INTRO_LOAD_GAME                                             :{BLACK} تحميل
@@ -1773,10 +1771,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}لعب 
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}إعدادات اللعبه
 STR_INTRO_HIGHSCORE                                             :{BLACK}قائمه المتفوقين
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}الاعدادات
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK} اعدادات NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK} إبحث عن المحتوى عبر الشبكه العنكبوتيه
-STR_INTRO_AI_SETTINGS                                           :{BLACK}اعدادات االذكاء الاصطناعي
 STR_INTRO_QUIT                                                  :{BLACK}خروج
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}بدأ لعبة جديدة
@@ -1793,10 +1788,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK} اخت
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}عرض خيارات اللعبة
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}عرض قائمه المتفوقين
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}إعدادات العرض
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}عرض إعدادات اﻹضافات
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK} ابحث عن محتوى جديد او تحديث
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK} اعدادات الOpen AI
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}اغلاق'OpenTTD'
 
 STR_INTRO_TRANSLATION                                           :{BLACK}هذة الترجمة تفتقد لـ {NUM}عبارات/عبارة. فضلا اجعل الترجمة افضل بالتسجيل في موقع الترجمة, اقرأ ملف المساعدة readme
@@ -2506,6 +2498,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}حدد 
 STR_FOUND_TOWN_CITY                                             :{BLACK}مدينة
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK} المدن الكبيرة تنمو اسرع من المدن العادية.{} كلما كانت اكبر عند انشائها, بالاعتماد على الاعدادات.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW} تصميم طرق المدينة
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK} اختر تصميم الطرق لهذه المدينة
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK} اصلي
@@ -2889,14 +2882,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}حفظ 
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}لائحة الإعدادات المسبقة. اختر واحدة لنسخها للإسم المحفوظ بالإسفل
 STR_SAVE_PRESET_TITLE                                           :{BLACK}أدخل اسم للإعداد المسبق
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}الإسم المختار لحفظ الإعداد المسبق
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}إلغاء
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}لا تغير الإعداد المسبق
 STR_SAVE_PRESET_SAVE                                            :{BLACK}إحفظ
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK} احفظ الإعدادات للإسم المختار حاليا
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}غير خصائص الاضافات الجديدة
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}اغلق
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}استرجاع القياسي
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}استرجاع جميع الخصائص لقيمها الاصلية
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :نمط {NUM}
@@ -3939,7 +3929,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}جدول
 STR_TIMETABLE_NO_TRAVEL                                         :لا رحيل
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :مسافرة (ذاتي: مجدول بواسطة الامر اليدوي التالي)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :مسافرة (غير مجدول)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :مسافرة (ليس مجدول) بسرعة لا تتعدى {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :مسافر لـ {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :سافر لي {STRING} بمعدل {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :مسافرة (ل {STRING}، ليس مجدول)
@@ -4053,15 +4042,12 @@ STR_AI_LIST_URL                                                 :{LTBLUE}الع
 
 STR_AI_LIST_ACCEPT                                              :{BLACK} موافق
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK} اختر الذكاء الصناعي المنتقى
-STR_AI_LIST_CANCEL                                              :{BLACK} الغاء
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK} لا تغير الذكاء الصناعي
 
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}لقطة شاشة عادية
 STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}التقط لقطة شاشة كاملة
 STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}صور الخاريطة الكاملة
 
 # Script Parameters
-STR_AI_SETTINGS_CLOSE                                           :{BLACK} اغلاق
 STR_AI_SETTINGS_RESET                                           :{BLACK} اعادة ضبط
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/basque.txt b/src/lang/basque.txt
index 9a94d286b6..50c5114852 100644
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -381,7 +381,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Irten
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Jokoaren aukerak
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Ezarpenak
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF ezarpenak
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Transparentzia ezarpenak
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Herri izenak erakutsita
@@ -842,8 +841,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Jokoaren
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Diru unitateak
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Diru unitatearen aukeraketa
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Diru unitateak
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Diru unitatearen aukeraketa
 
 
 ###length 45
@@ -882,21 +882,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Pertsonalizatua
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiarra
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniarra
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Auto-gordea
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Aukeratu jokoa automatikoki gordetzeko denbora
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Auto-gordea
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Aukeratu jokoa automatikoki gordetzeko denbora
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Ez
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Hizkuntza
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Aukeratu interfazean erabiltzeko hizkuntza
+STR_GAME_OPTIONS_LANGUAGE                                       :Hizkuntza
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Aukeratu interfazean erabiltzeko hizkuntza
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantaila osoa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Markatu kaxa hau OpenTTD pantaila osoko moduan jolasteko
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantaila osoa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Markatu kaxa hau OpenTTD pantaila osoko moduan jolasteko
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Pantailaren resoluzioa
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pantailaren resulozioa aukeratu
+STR_GAME_OPTIONS_RESOLUTION                                     :Pantailaren resoluzioa
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pantailaren resulozioa aukeratu
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :besteak
 
 
@@ -909,17 +909,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :besteak
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafiko basea markatu
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Aukeratu erabili beharreko grafiko paketea
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Markatutako grafiko basearen informazio gehiago
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base musika paketea
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Aukeratu erabili beharreko soinu paketea
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Soinu paketearen informazio gehiago
+STR_GAME_OPTIONS_BASE_GRF                                       :Grafiko basea markatu
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Aukeratu erabili beharreko grafiko paketea
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Markatutako grafiko basearen informazio gehiago
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base musika konfiguratu
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Aukeratu erabili beharreko musika paketea
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Musika paketearen informazio gehiago
+STR_GAME_OPTIONS_BASE_SFX                                       :Base musika paketea
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Aukeratu erabili beharreko soinu paketea
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Soinu paketearen informazio gehiago
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base musika konfiguratu
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Aukeratu erabili beharreko musika paketea
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Musika paketearen informazio gehiago
 
 
 
@@ -1021,11 +1022,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Jasankorra
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ez dago IA egokirik aukeratzeko..{}IA asko jaitsi ditzakezu 'Online edukiera' sistemaren bidez
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Ezarpenak
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Lokarri iragazkia:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Guztia haunditu
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Guztia kolapsatu
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Lokarri iragazkia:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Guztia haunditu
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Guztia kolapsatu
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(Ez dago azalpen erabilgarririk)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Balio lehenetsia: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Mota ezarpena: {ORANGE}{STRING}
@@ -1035,9 +1035,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Joko ezarpenak
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Konpainia ezarpenak (Gorden bilduta; bakarrik joko berriei eragingo die)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Konpainia ezarpenak (Gorden bilduta; bakarrik uneko konpainiari eragiten dio)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Mota:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Beheko zerrenda laburtu bakarrik aldatutako ezarpenak erakutsiz
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Mota:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Beheko zerrenda laburtu bakarrik aldatutako ezarpenak erakutsiz
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Oinarrizkoa (ezarpen garrantzitsuak bakarrik erakutsi)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Aurreratua (ezarpen gehienak erakutsi)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Aditua (ezarpen guztiak erakutsi, arraroak barne)
@@ -1780,7 +1780,6 @@ STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}Memoriaz
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Joko berria
 STR_INTRO_LOAD_GAME                                             :{BLACK}Kargatu joko bat
@@ -1791,10 +1790,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijok
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Jokoaren Aukerak
 STR_INTRO_HIGHSCORE                                             :{BLACK}Puntuazio taula
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Ezarpenak
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-ren Ezarpenak
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Edukiak Online Kontsultatu
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AAren ezarpenak
 STR_INTRO_QUIT                                                  :{BLACK}Irten
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Joko berria hasi. Krtl+klik mapa konfigurazioa desgaitzen du
@@ -1811,8 +1807,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Aukeratu
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Jokoaren aukerak erakutsi
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Puntuazioen taula erakutsi
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Ezarpenak erakutsi
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF ezarpenak erakutsi
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Bilatu eduki berria eta eguneratua deskargatzeko
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD'-tik Irten
 
@@ -2465,6 +2459,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Herriare
 STR_FOUND_TOWN_CITY                                             :{BLACK}Hiria
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Hiriak herriak baino azkarrago hazten dira{}Ezarpenen arabera sortzerakoan handiagoak izan daitezke
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Herri errepideen diseinua:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Herriaren errepide diseinua aukeratu
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Jatorrizkoa
@@ -2795,11 +2790,9 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desgaitua
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}OpenTTD-ren bertsio honekin bateraezina
 
 # NewGRF save preset window
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ez aldatu berezko balioa
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF parametroak aldatu
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Itxi
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Lehengoratu
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Parametro guztiak hasierako baloreetan jarri
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :{NUM} Parametroa
@@ -3833,7 +3826,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Ordutegi
 STR_TIMETABLE_NO_TRAVEL                                         :Bidaiarik ez
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Bidaia (automatikoa)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Bidaia (ordutegirik gabe)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Gehienez {2:VELOCITY}-ko abiadurara bidaiatu (ordutegirik gabe)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} bidaiatu
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING}-ra bidaiatu gehienez {VELOCITY}ra
 STR_TIMETABLE_STAY_FOR                                          :{STRING} gelditu
@@ -3939,13 +3931,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Onartu
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Piztutako script-a aukeratu
-STR_AI_LIST_CANCEL                                              :{BLACK}Ezeztatu
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ez aldatu script-a
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :IA
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Itxi
 STR_AI_SETTINGS_RESET                                           :{BLACK}Berrabiarazi
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt
index 9c4b2f9fbe..d640020a49 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -754,7 +754,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Выхад
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Наладкі гульні
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Наладкі
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Наладкі ШІ
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Наладкі гульнёвых скрыптоў
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Наладкі NewGRF
@@ -1258,21 +1257,22 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Пера
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Наладкі гульні
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Асноўныя
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Асноўныя наладкі гульні
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Асноўныя наладкі гульні
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Графіка
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Наладкі графікі
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Наладкі графікі
 STR_GAME_OPTIONS_TAB_SOUND                                      :Гук
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Наладкі гуку і музыкі
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Наладкі гуку і музыкі
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Сацыяльныя
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Наладкі сацыяльнай інтэграцыі
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Наладкі сацыяльнай інтэграцыі
 
 STR_GAME_OPTIONS_VOLUME                                         :Гучнасць
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Гукавыя эфекты
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Музыка
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Валюта
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Выбар валюты
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Валюта
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Выбар валюты
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1321,8 +1321,8 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Інданэз
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Малайзійскі рынгіт
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Латвійскі лат
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Аўтазахаваньне
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Інтэрвал паміж аўтаматычнымі захаваньнямі гульні
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Аўтазахаваньне
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Інтэрвал паміж аўтаматычнымі захаваньнямі гульні
 
 # Autosave dropdown
 ###length 5
@@ -1332,74 +1332,74 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :кожныя 30
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :кожныя 60 хвілін
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :кожныя 120 хвілін
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Мова
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Выбраць мову інтэрфэйсу
+STR_GAME_OPTIONS_LANGUAGE                                       :Мова
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Выбраць мову інтэрфэйсу
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% перакладзены)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Поўны экран
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Уключыць/выключыць поўнаэкранны рэжым
+STR_GAME_OPTIONS_FULLSCREEN                                     :Поўны экран
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Уключыць/выключыць поўнаэкранны рэжым
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Вырашэньне экрана
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Выбар вырашэньня экрана
+STR_GAME_OPTIONS_RESOLUTION                                     :Вырашэньне экрана
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Выбар вырашэньня экрана
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Iншае
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Апаратнае паскарэньне
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Уключыць/выключыць апаратнае паскарэньне. Пасля гэтага гульню запатрабуецца перазапусціць.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Апаратнае паскарэньне
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Уключыць/выключыць апаратнае паскарэньне. Пасля гэтага гульню запатрабуецца перазапусціць.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Гэта наладка будзе ўжыта толькі пасля перазапуску гульні
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Вертыкальная сінхранізацыя
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Уключыць/выключыць вертыкальную сінхранізацыю. Пасля гэтага гульню запатрабуецца перазапусціць. Працуе толькі пры ўключаным апаратным паскарэньні.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Вертыкальная сінхранізацыя
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Уключыць/выключыць вертыкальную сінхранізацыю. Пасля гэтага гульню запатрабуецца перазапусціць. Працуе толькі пры ўключаным апаратным паскарэньні.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Відэадрайвер: {STRING}
-
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Маштаб інтэрфейсу
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Змяняйце маштаб інтэрфейсу з дапамогай паўзунка. Утрымлівайце Ctrl для дакладнай наладкі.
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Аўтавызначэньне
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Пастаўце адзнаку для аўтаматычнай усталёўкі маштабу інтэрфейсу
-
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Рэльефныя элементы
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Пастаўце адзнаку, каб маштабаваць рэльефныя элементы інтэрфейсу
-
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Выкарыстоўваць растравы шрыфт
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Пастаўце адзнаку, каб выкарыстоўваць класічны растравы шрыфт фіксаванага памеру.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Згладжваньне шрыфтоў
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Пастаўце адзнаку, каб уключыць згладжваньне маштабуемых шрыфтоў
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Відэадрайвер: {STRING}
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Аўтаматычны збор дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Дазволіць збор і адпраўку дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Дазволіць аўтаматычны збор дадзеных пра вашы наладкі гульні і выкарыстаныя модулі. OpenTTD адправіць гэтыя дадзеныя пры зачыненьні гульні.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Пра збор дадзеных і прыватнасьць
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Адкрыць спасылку з інфармацыяй пра аўтаматычны збор дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Прагляд сабраных дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Паказаць дадзеныя, сабраныя ў бягучым сеансе і падрыхтаваныя да адпраўкі
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Маштаб інтэрфейсу
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Змяняйце маштаб інтэрфейсу з дапамогай паўзунка. Утрымлівайце Ctrl для дакладнай наладкі.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Аўтавызначэньне
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Пастаўце адзнаку для аўтаматычнай усталёўкі маштабу інтэрфейсу
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Наладкі ґрафікі
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Рэльефныя элементы
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Пастаўце адзнаку, каб маштабаваць рэльефныя элементы інтэрфейсу
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Чашчыня абнаўлення экрана
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Выбар чашчыні абнаўленьня экрана
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Выкарыстоўваць растравы шрыфт
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Пастаўце адзнаку, каб выкарыстоўваць класічны растравы шрыфт фіксаванага памеру.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Згладжваньне шрыфтоў
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Пастаўце адзнаку, каб уключыць згладжваньне маштабуемых шрыфтоў
+
+
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Аўтаматычны збор дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Дазволіць збор і адпраўку дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Дазволіць аўтаматычны збор дадзеных пра вашы наладкі гульні і выкарыстаныя модулі. OpenTTD адправіць гэтыя дадзеныя пры зачыненьні гульні.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Пра збор дадзеных і прыватнасьць
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Адкрыць спасылку з інфармацыяй пра аўтаматычны збор дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Прагляд сабраных дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Паказаць дадзеныя, сабраныя ў бягучым сеансе і падрыхтаваныя да адпраўкі
+
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Чашчыня абнаўлення экрана
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Выбар чашчыні абнаўленьня экрана
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}{NBSP}Гц
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Чашчыня абнаўленьня вышэй 60{NBSP}Гц можа адмоўна адбіцца на прадукцыйнасці.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Набор базавай ґрафікі
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Выбар асноўнага ґрафічнага пакета (яго нельга змяніць у гульні; толькі ў галоўным меню)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Дадатковая інфармацыя аб базавым ґрафічным наборы
+STR_GAME_OPTIONS_BASE_GRF                                       :Набор базавай ґрафікі
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Выбар асноўнага ґрафічнага пакета (яго нельга змяніць у гульні; толькі ў галоўным меню)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Дадатковая інфармацыя аб базавым ґрафічным наборы
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Базавы набор гукаў
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Выбар асноўнага пакета гукавых эфектаў (яго нельга змяніць у гульні; толькі ў галоўным меню)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Дадатковая інфармацыя аб базавым гукавым наборы
+STR_GAME_OPTIONS_BASE_SFX                                       :Базавы набор гукаў
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Выбар асноўнага пакета гукавых эфектаў (яго нельга змяніць у гульні; толькі ў галоўным меню)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Дадатковая інфармацыя аб базавым гукавым наборы
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Базавы набор музыкі
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Выберыце базавы музычны набор для выкарыстаньня
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Дадатковая інфармацыя аб базавым музычным наборы
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Базавы набор музыкі
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Выберыце базавы музычны набор для выкарыстаньня
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Дадатковая інфармацыя аб базавым музычным наборы
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(модулі ўзаемадзеяньня з сацыяльнымі платформамі не ўсталяваны)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Платформа:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Стан модуля:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Платформа:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Стан модуля:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Запушчаны
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Не атрымалася ініцыялізаваць
@@ -1512,12 +1512,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Дазваля
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Модулі штучнага інтэлекту (ШІ/AI) адсутнічаюць.{}Іх можна спампаваць праз сістэму праверкі "анлайн-кантэнту".
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Наладкі
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Фільтар:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Разгарнуць усё
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Згарнуць усё
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Скінуць усе значэньні
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Фільтар:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Разгарнуць усё
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Згарнуць усё
+STR_CONFIG_SETTING_RESET_ALL                                    :Скінуць усе значэньні
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(няма тлумачэньня)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Значэньне па змоўчаньні: {ORANGE}{STRING}
@@ -1530,9 +1529,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Наладкі
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Увага!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Вы ўпэўнены, што жадаеце скінуць усе наладкі гульні да значэньняў па змаўчаньні?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Катэґорыя:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Тып:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Адлюстроўваць у спісе толькі наладкі, якія адпавядаюць абранай катэгорыі
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Катэґорыя:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Тып:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Адлюстроўваць у спісе толькі наладкі, якія адпавядаюць абранай катэгорыі
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Асноўныя наладкі (толькі самыя важныя)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Пашыраныя наладкі (практычна ўсе)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Спэцыяльныя наладкі (усе, уключаючы самыя незразумелыя)
@@ -1549,9 +1548,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Наладкі
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Няма -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Паказаць усе вынікі пошуку па наладках{}{SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING} {BLACK}і {SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Паказаць усе вынікі пошуку па наладках{}{SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING} {BLACK}і {SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :не
@@ -2473,7 +2472,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... не
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... драйвер відэакарты выклікаў крытычную памылку. Апаратнае паскарэньне адключана.
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Новая гульня
 STR_INTRO_LOAD_GAME                                             :{BLACK}Загрузіць гульню
@@ -2485,11 +2483,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Сетк
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Наладкі гульні
 STR_INTRO_HIGHSCORE                                             :{BLACK}Табліца рэкордаў
 STR_INTRO_HELP                                                  :{BLACK}Дапамога і дакументацыя
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Наладкі
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Наладкi NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Праверыць анлайн-кантэнт
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Наладкі ШІ
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Наладкі гульнёвых скрыптоў
 STR_INTRO_QUIT                                                  :{BLACK}Выхад
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Пачаць новую гульню. Ctrl+клік прапускае этап наладак мапы
@@ -2507,11 +2501,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Выбр
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Адкрыць акно з асноўнымі наладкамі гульні
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Паказаць табліцу рэкордаў
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Спасылкі на дакументацыю і інтэрнэт-рэсурсы
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Адкрыць наладкі
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Адкрыць наладкі NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Праверыць новы й абноўлены кантэнт, каб спампаваць
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Адкрыць наладкі ШІ
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Адкрыць наладкі гульнёвых скрыптоў
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Выйсьці з OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}У абраным наборы базавай графікі адсутнічае {NUM} спрайт{P "" а аў}. Калі ласка, абнавіце набор графікі.
@@ -3330,6 +3320,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Выбе
 STR_FOUND_TOWN_CITY                                             :{BLACK}Мэґаполіс
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Мэґаполісы растуць хутчэй за звычайныя гарады (мястэчкі).{}У залежнасьці ад наладак, яны большыя ўжо падчас заснаваньня.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Сетка гарадзкіх дарогаў:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Выберыце альґарытм будаўніцтва дарогаў гэтым горадам
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Арыґінальная
@@ -3762,15 +3753,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Заха
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Сьпіс даступных набораў. Выберыце адзін з іх, каб скапіяваць яго назву ў радок імя.
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Увядзіце імя набору
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Бягучае імя для захаваньня набору
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Адмена
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Не рабіць ніякіх змен
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Захаваць
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Захаваць набор пад выбраным імем
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Зьмена параметраў базавага графічнага пакета
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Зьмяніць парамэтры NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Закрыць
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Ськiд
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Ськінуць значэньнi ўсіх парамэтраў
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамэтр {NUM}
@@ -5011,7 +4999,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Раск
 STR_TIMETABLE_NO_TRAVEL                                         :Няма назначэньня
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Прабег (аўтаматычна; у расклад наступным заданьнем уручную)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Час у шляху (не зададзены)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Рухацца не хутчэй за {2:VELOCITY} (расклад ня вызначаны)
 STR_TIMETABLE_TRAVEL_FOR                                        :Час у шляху — {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Рухацца да {STRING} не хутчэй за {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :У дарозе прыкладна {STRING} (графік не складзены)
@@ -5135,8 +5122,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Выбраць
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Выбраць падсьвечаны скрыпт
-STR_AI_LIST_CANCEL                                              :{BLACK}Скасаваць
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Не змяняць скрыпт
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Здымак экрана
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Звычайны здымак
@@ -5149,7 +5134,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Здым
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :ШI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :гульнёвых скрыптоў
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Закрыць
 STR_AI_SETTINGS_RESET                                           :{BLACK}Ськід
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index e326cf566e..1071970a12 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -286,7 +286,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fechar j
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título da janela - arraste isto para mover a janela
 STR_TOOLTIP_SHADE                                               :{BLACK}Encolher janela - mostrar apenas a barra de título
 STR_TOOLTIP_DEBUG                                               :{BLACK}Mostrar informação de depuração de NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar a janela para o tamanho padrão. Ctrl+Clique para salvar o tamanho atual como padrão
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar a janela para o tamanho padrão. Ctrl+Clique para salvar o tamanho atual como padrão. Ctrl+Clique duas vezes para redefinir o padrão armazenado
 STR_TOOLTIP_STICKY                                              :{BLACK}Fixar esta janela para ela não ser fechada pela tecla 'Fechar Todas as Janelas'. Ctrl+Clique para salvar o estado como padrão
 STR_TOOLTIP_RESIZE                                              :{BLACK}Clique e arraste para redimensionar esta janela
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alternar entre janela grande/pequena
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Colocar casas
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opções do jogo
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Configurações
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Configurações de IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Configurações de Script de Jogo
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Configurações de NewGRF
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copiar a
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opções do Jogo
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Geral
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Escolher as definições gerais
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Escolher as definições gerais
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gráficos
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Escolher as definições gráficas
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Escolher as definições gráficas
 STR_GAME_OPTIONS_TAB_SOUND                                      :Som
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Escolher as definições de sons e música
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Escolher as definições de sons e música
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Escolher as definições de integração social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Escolher as definições de integração social
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avançado
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Alterar configurações avançadas
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efeitos sonoros
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidades monetárias
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Seleção de unidades monetárias
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unidades monetárias
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Seleção de unidades monetárias
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats da Letôni
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo Português
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia Ucraniana
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvar automaticamente
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Escolher o intervalo entre jogos salvos automaticamente
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Salvar automaticamente
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Escolher o intervalo para salvar o jogo automaticamente
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :A cada 30 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :A cada 60 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :A cada 120 minutos
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Idioma
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Escolher o idioma da interface do jogo
+STR_GAME_OPTIONS_LANGUAGE                                       :Idioma
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Escolher o idioma da interface do jogo
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% concluído)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Tela cheia
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marque esta caixa para jogar o OpenTTD em modo de tela cheia
+STR_GAME_OPTIONS_FULLSCREEN                                     :Tela cheia
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marque esta caixa para jogar o OpenTTD em modo de tela cheia
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolução da tela
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecione uma resolução de tela para usar
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolução da tela
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecione uma resolução de tela para usar
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :outra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aceleração por hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Marque esta caixa para permitir que o OpenTTD tente usar aceleração por hardware. Se modificada, esta configuração só terá efeito após reiniciar o jogo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aceleração por hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marque esta caixa para permitir que o OpenTTD tente usar aceleração por hardware. Se modificada, esta configuração só terá efeito após reiniciar o jogo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}A configuração só terá efeito após reiniciar o jogo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Marque esta caixa para ativar v-sync na tela. Se modificada, esta configuração só terá efeito após reiniciar o jogo. Funciona somente com aceleração por hardware ativada
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Marque esta caixa para ativar v-sync na tela. Se modificada, esta configuração só terá efeito após reiniciar o jogo. Funciona somente com aceleração por hardware ativada
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Controlador atual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador atual: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Tamanho da interface
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arraste o controle deslizante para definir o tamanho da interface. Ctrl+Arraste para um ajuste contínuo
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detectar automaticamente o tamanho
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marque esta caixa para detectar automaticamente o tamanho da interface
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Escalar bordas
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marque esta caixa para dimensionar as bordas pelo tamanho de interface
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Tamanho da interface
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arraste o controle deslizante para definir o tamanho da interface. Ctrl+Arraste para um ajuste contínuo
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detectar automaticamente o tamanho
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marque esta caixa para detectar automaticamente o tamanho da interface
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usar a fonte fixa tradicional
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marque esta caixa se preferir usar o tipo de fonte tradicional de tamanho fixo
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Fontes com contornos suaves
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marque esta caixa para usar fontes redimensionáveis com contornos suaves
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escalar bordas
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marque esta caixa para dimensionar as bordas pelo tamanho de interface
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usar a fonte fixa tradicional
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marque esta caixa se preferir usar o tipo de fonte tradicional de tamanho fixo
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Fontes com contornos suaves
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marque esta caixa para usar fontes redimensionáveis com contornos suaves
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Pesquisa automatizada
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participar da pesquisa automatizada
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Quando ativado, o OpenTTD enviará uma pesquisa ao sair de um jogo
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Sobre pesquisa e privacidade
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Abrir um navegador com mais informações sobre a pesquisa automatizada
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Pré-visualizar resultado da pesquisa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostrar o resultado da pesquisa do jogo atual em execução
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Pesquisa automatizada
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participar da pesquisa automatizada
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Quando ativado, o OpenTTD enviará uma pesquisa ao sair de um jogo
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Sobre pesquisa e privacidade
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Abrir um navegador com mais informações sobre a pesquisa automatizada
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Pré-visualizar resultado da pesquisa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostrar o resultado da pesquisa do jogo atual em execução
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Gráficos
+STR_GAME_OPTIONS_DISPLAY                                        :Tela
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Taxa de atualização da tela
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Selecione uma taxa de atualização de tela para usar
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Taxa de atualização da tela
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Selecione uma taxa de atualização de tela para usar
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Taxas de atualização superiores a 60Hz podem interferir no desempenho.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos básicos
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecione um conjunto de gráficos básicos para usar (não pode ser alterado no jogo, só a partir do menu principal)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informação adicional sobre sobre o conjunto de gráficos básicos
+STR_GAME_OPTIONS_BASE_GRF                                       :Conjunto de gráficos básicos
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecione um conjunto de gráficos básicos para usar (não pode ser alterado no jogo, só a partir do menu principal)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informação adicional sobre sobre o conjunto de gráficos básicos
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Conjunto de sons básicos
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selecione um conjunto de sons básicos para usar (não pode ser alterado no jogo, só a partir do menu principal)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informação adicional sobre sobre o conjunto de sons básicos
+STR_GAME_OPTIONS_BASE_SFX                                       :Conjunto de sons básicos
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selecione um conjunto de sons básicos para usar (não pode ser alterado no jogo, só a partir do menu principal)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informação adicional sobre sobre o conjunto de sons básicos
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Conjunto de músicas básicas
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selecione um conjunto de músicas básicas para usar
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informação adicional sobre o conjunto de músicas básicas
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Conjunto de músicas básicas
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selecione um conjunto de músicas básicas para usar
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informação adicional sobre o conjunto de músicas básicas
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Obter Conteúdo
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Verificar por conteúdo novo e atualizado para download
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(não existem plugins instalados para integrar com as plataformas sociais)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(não existem plugins instalados para integrar com as plataformas sociais)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estado do plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estado do plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Executando (ativo)
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Falha ao inicializar
@@ -1220,12 +1225,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissiva (sem
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Não existem IAs disponíveis...{}{}Você pode obter várias IAs usando o sistema de 'Conteúdo Online'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Configurações
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtro:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expandir tudo
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Colapsar tudo
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restaurar todos os valores
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtro:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expandir tudo
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Colapsar tudo
+STR_CONFIG_SETTING_RESET_ALL                                    :Restaurar todos os valores
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(sem explicação disponível)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor padrão: {ORANGE}{STRING}
@@ -1238,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Configuração
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Cuidado!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Esta ação irá restaurar todas as configurações do jogo para os seus valores padrão.{}Você quer mesmo fazer a restauração?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restringir a lista abaixo usando filtros pré-definidos
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restringir a lista abaixo usando filtros pré-definidos
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Básico (mostrar somente as configurações importantes)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avançado (mostrar a maioria das configurações)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Especialista (mostrar todas as configurações, incluindo as estranhas)
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Configurações
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nenhum -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Mostrar todos os resultados da pesquisa por configuração{}{SILVER}Categoria {BLACK}para {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Mostrar todos os resultados da pesquisa por configuração{}{SILVER}Tipo {BLACK}para {WHITE}Todos os tipos de configuração
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Mostrar todos os resultados da pesquisa por configuração{}{SILVER}Categoria {BLACK}para {WHITE}{STRING} {BLACK}e {SILVER}Tipo {BLACK}para {WHITE}Todos os tipos de configuração
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Mostrar todos os resultados da pesquisa por configuração{}{PUSH_COLOUR}{SILVER}Categoria {POP_COLOUR}para {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Mostrar todos os resultados da pesquisa por configuração{}{PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}para {WHITE}Todos os tipos de configuração
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Mostrar todos os resultados da pesquisa por configuração{}{PUSH_COLOUR}{SILVER}Categoria {POP_COLOUR}para {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}e {PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}para {WHITE}Todos os tipos de configuração
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Não
@@ -2192,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nenh
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... controlador gráfico travou o jogo. Aceleração por hardware desativada
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Novo Jogo
 STR_INTRO_LOAD_GAME                                             :{BLACK}Abrir Jogo
@@ -2204,11 +2209,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijog
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opções de Jogo
 STR_INTRO_HIGHSCORE                                             :{BLACK}Painel de Classificação
 STR_INTRO_HELP                                                  :{BLACK}Ajuda & Manuais
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Configurações
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configurações de NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Conteúdo Online
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Configurações de IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Configurações de Script de Jogo
 STR_INTRO_QUIT                                                  :{BLACK}Sair do OpenTTD
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Iniciar um novo jogo. Ctrl+Clique para saltar a configuração do mapa
@@ -2226,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Selecion
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Abrir opções de jogo
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Mostrar classificação das melhores empresas
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Acessar a documentação e recursos online
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Abrir configurações
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Abrir configurações de NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Verificar por conteúdo novo e atualizado para download
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Abrir configurações de IA
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Abrir configurações de Script de Jogo
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair do 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Faltam {NUM} sprite{P "" s} no conjunto de gráficos básicos selecionado. Por favor, verifique se existem atualizações para o conjunto.
@@ -3077,6 +3074,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Escolher
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cidades crescem mais depressa do que as localidades normais{}Dependendo das configurações, elas são maiores quando fundadas
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansão da cidade:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Construções
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumentar as construções das cidades
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Estradas
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumentar as estradas das localidades
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposição das estradas na localidade:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selecionar disposição das estradas utilizada nesta localidade
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3526,15 +3529,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Salvar p
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista de predefinições disponíveis, selecione uma para usar o nome na gravação abaixo
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Introduza um nome para a predefinição
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nome que está selecionado para salvar a predefinição
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancelar
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Não alterar a predefinição
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Salvar
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Salvar a predefinição com o nome selecionado
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Alterar parâmetros dos gráficos básicos
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Alterar parâmetros de NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Fechar
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Restaurar
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Restaurar todos os parâmetros para os valores padrão
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parâmetro {NUM}
@@ -3703,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Alterar
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar o tamanho da localidade
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expandir com construções
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumentar as construções da localidade
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expandir com estradas
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumentar as estradas da localidade
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Remover
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Remover completamente esta localidade
 
@@ -4441,10 +4445,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostrar
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostrar as ordens da aeronave. Ctrl+Clique para mostrar a tabela de horários da aeronave
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do trem
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes da embarcação
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do trem. Ctrl+Clique para mostrar o grupo do trem
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo. Ctrl+Clique para mostrar o grupo do veículo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes da embarcação. Ctrl+Clique para mostrar o grupo da embarcação
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave. Ctrl+Clique para mostrar o grupo da aeronave
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Estado atual do trem - clique para iniciar/parar o trem
@@ -4768,15 +4772,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horário
 STR_TIMETABLE_NO_TRAVEL                                         :Não viajar
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viajar (automático; programado pela próxima ordem manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (não programado)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (não programado) no máximo a {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (não programado) no máximo a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar durante {STRING} no máximo a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajar (durante {STRING}, não programado)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajar (durante {STRING}, não programado) no máximo a {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(ficar por {STRING}, não programado)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viajar durante {STRING}, não programado)
-STR_TIMETABLE_STAY_FOR                                          :e ficar por {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viajar durante {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}e ficar por {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}e viajar durante {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Este horário levará aproximadamente {STRING} para ser concluído
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Este horário levará {STRING} para ser concluído
@@ -4895,8 +4899,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceitar
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Usar o script selecionado
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar o script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Fazer uma captura de tela
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura de tela normal
@@ -4909,7 +4911,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parâmetros da IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parâmetros do Script de Jogo
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fechar
 STR_AI_SETTINGS_RESET                                           :{BLACK}Restaurar
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5887,6 +5888,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}G
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5926,3 +5928,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abrir configuração de crachá
+STR_BADGE_CONFIG_RESET                                          :Restaurar
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Ícones de Crachá
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtros de Crachá
+STR_BADGE_CONFIG_PREVIEW                                        :Pré-visualizar imagem
+STR_BADGE_CONFIG_NAME                                           :Nome
+STR_BADGE_FILTER_ANY_LABEL                                      :Qualquer {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} é {STRING}
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 79a17380df..fe22204fa6 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Постави
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Игрови настройки
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Разширени настройки
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Настройки на ИИ
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Настройки на игровия скрипт
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Newgrf настройки
@@ -952,22 +951,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Прем
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Игрови настройки
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Основни
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Изберете основни настройки
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Изберете основни настройки
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Графични
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Изберете графични настройки
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Изберете графични настройки
 STR_GAME_OPTIONS_TAB_SOUND                                      :Звукови
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Изберете звукови и музикални настройки
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Изберете звукови и музикални настройки
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Социални
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Изберете настройки за социална интеграция
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Изберете настройки за социална интеграция
 
 STR_GAME_OPTIONS_VOLUME                                         :Височина на звук
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Звукови ефекти
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Музика
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Парична единица
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Избор на парична единица
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Парична единица
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Избор на парична единица
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1017,8 +1017,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Малайзи
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Латвийски лат
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Португалско ескудо
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Автоматично записване
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Изберете интервала между две автоматични записваня
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Автоматично записване
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Изберете интервала между две автоматични записваня
 
 # Autosave dropdown
 ###length 5
@@ -1028,77 +1028,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Всеки 30 
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Всеки 60 минути
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Всеки 120 минути
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Език
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Избор на език
+STR_GAME_OPTIONS_LANGUAGE                                       :Език
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Избор на език
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% завършени)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Цял екран
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Изберете тази настройка, за да играете OpenTTD на цял екран
+STR_GAME_OPTIONS_FULLSCREEN                                     :Цял екран
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Изберете тази настройка, за да играете OpenTTD на цял екран
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Размер на екрана
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Избор размера на екран
+STR_GAME_OPTIONS_RESOLUTION                                     :Размер на екрана
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Избор размера на екран
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :друго
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Хардуерно ускорение
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Отметнете тук, за да позволите на OpenTTD да опита да ползва хардуерно ускорение. Променена настройка ще бъде приложена само след рестартиране на играта
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Хардуерно ускорение
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Отметнете тук, за да позволите на OpenTTD да опита да ползва хардуерно ускорение. Променена настройка ще бъде приложена само след рестартиране на играта
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Настройката ще се промени след рестарт на играта
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Отметнете тук, за да използвате v-sync с екрана. Променена настройка ще бъде приложена само след рестартиране на играта. Работи единствено с хардуерно ускорение
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Отметнете тук, за да използвате v-sync с екрана. Променена настройка ще бъде приложена само след рестартиране на играта. Работи единствено с хардуерно ускорение
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Настоящ драйвер: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Настоящ драйвер: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Размер на интерфейса
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Плъзнете, за да зададете размер на интерфейса. Ctrl+плъзгане за непрекъснато регулиране
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Автоматично разпознаване на размера
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Отметнете тук, за да се разпознае автоматично размера на интерфейса
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Мащабни скосявания
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Отметнете тук, за да се скоси мащаба спрямо размера на интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Размер на интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Плъзнете, за да зададете размер на интерфейса. Ctrl+плъзгане за непрекъснато регулиране
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Автоматично разпознаване на размера
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Отметнете тук, за да се разпознае автоматично размера на интерфейса
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Използвай традиционен sprite шрифт
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Отметнете тук, за да се използват традиционни sprite шрифтове с фиксиран размер
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Анти-Alias шрифтове
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Отметнете тук, за да се добави anti-alias към променливи шрифтове
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Мащабни скосявания
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Отметнете тук, за да се скоси мащаба спрямо размера на интерфейса
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Използвай традиционен sprite шрифт
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Отметнете тук, за да се използват традиционни sprite шрифтове с фиксиран размер
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Анти-Alias шрифтове
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Отметнете тук, за да се добави anti-alias към променливи шрифтове
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Автоматизирано проучване
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Участвайте в автоматизирано проучване
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Когато е активирана, OpenTTD ще предаде анкета при напускане на играта
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Относно проучването и поверителност
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Това отваря браузър с повече информация за автоматизираната анкета
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Покажи резултати от проучването
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Покажи резултати от проучването от текущата игра
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Автоматизирано проучване
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Участвайте в автоматизирано проучване
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Когато е активирана, OpenTTD ще предаде анкета при напускане на играта
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Относно проучването и поверителност
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Това отваря браузър с повече информация за автоматизираната анкета
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Покажи резултати от проучването
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Покажи резултати от проучването от текущата игра
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Графика
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Покажи честота на опресняване
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Избери честота на опресняване
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Покажи честота на опресняване
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Избери честота на опресняване
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Честота на опресняване над 60Hz може да повлияе на производителността
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базов графичен набор
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Изберете основния графичен набор, който да използвате (не може да се променя в играта, само от главното меню)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Допълнителна информация за базовия графичен пакет
+STR_GAME_OPTIONS_BASE_GRF                                       :Базов графичен набор
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Изберете основния графичен набор, който да използвате (не може да се променя в играта, само от главното меню)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Допълнителна информация за базовия графичен пакет
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Базов звуков пакет
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Изберете базовите звуци, които да използвате (не могат да се променят в играта, само от главното меню)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Допълнителна информация за базовите звуци
+STR_GAME_OPTIONS_BASE_SFX                                       :Базов звуков пакет
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Изберете базовите звуци, които да използвате (не могат да се променят в играта, само от главното меню)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Допълнителна информация за базовите звуци
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Пакет базова музика
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Избери пакет базова музика
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Допълнителна информация за пакетa базова музика
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Пакет базова музика
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Избери пакет базова музика
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Допълнителна информация за пакетa базова музика
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Изтегляне на съдържание
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Проверка за ново и актуализирано съдържание за изтегляне
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(няма инсталирани плъгини за интеграция със социални платформи)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Платформа:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Състояние на плъгин:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Платформа:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Състояние на плъгин:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Активен
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Неуспешна инициализация
@@ -1211,12 +1211,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Разреша
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Няма подходящи ИИ...{}Може да свалите допълнителни ИИ чрез системата Online Content (Онлайн Съдържание)
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Разширени настройки
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Филтър:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Разгъни всички
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Сгъни всички
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Върни всичко към начални стойности
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Филтър:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Разгъни всички
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Сгъни всички
+STR_CONFIG_SETTING_RESET_ALL                                    :Върни всичко към начални стойности
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(липсва пояснение)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Стойност по подразбиране: {ORANGE}{STRING}
@@ -1229,9 +1228,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Настрой
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Внимание!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Връщане на всички настройки на играта до техните стойности по подразбиране.{}Сигурни ли сте, че искате да продължите?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Категория:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Тип:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Ограничи долният списък, да показва само променените настройки
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Категория:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Тип:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Ограничи долният списък, да показва само променените настройки
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Прости настройки
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Разширени настройки
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Експертни настройки / всички настройки
@@ -1248,9 +1247,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Настрой
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Нищо -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Показване на всички резултати от търсенето чрез задаване{}{SILVER}Категория {BLACK}на {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Показване на всички резултати от търсенето, като зададете{}{SILVER}Тип {BLACK}на {WHITE}Всички типове настройки
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Покажете всички резултати от търсенето като зададете{}{SILVER}Категория {BLACK}на {WHITE}{STRING} {BLACK}и {SILVER}Тип {BLACK}на {WHITE}Всички видове настройки
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Показване на всички резултати от търсенето чрез задаване{}{SILVER}Категория {BLACK}на {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Показване на всички резултати от търсенето, като зададете{}{SILVER}Тип {BLACK}на {WHITE}Всички типове настройки
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Покажете всички резултати от търсенето като зададете{}{SILVER}Категория {BLACK}на {WHITE}{STRING} {BLACK}и {SILVER}Тип {BLACK}на {WHITE}Всички видове настройки
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Изключено
@@ -2185,7 +2184,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... не
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Графичният драйвер блокира играта. Хардуерното ускорение е изключено
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Нова игра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Отваряне на игра
@@ -2197,11 +2195,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Онла
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Игрови настройки
 STR_INTRO_HIGHSCORE                                             :{BLACK}Най-добри резултати
 STR_INTRO_HELP                                                  :{BLACK}Помощ и ръководства
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Разширени настройки
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF настройки
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Онлайн съдържание
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Настройки на ИИ
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Игрови скрипт
 STR_INTRO_QUIT                                                  :{BLACK}Изход
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Започване на нова игра. Ctrl+Click пропуска конфигурацията на картата
@@ -2219,11 +2213,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Изби
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Отваряне на настройките на играта
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Отваряне на таблицата с най-добри резултати
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Достъп до документация и онлайн ресурси
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Отваряне на настройките на дисплея
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Отваряне на NewGRF настройки
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Проверка за ново съдържание за сваляне
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Отворете ИИ настройки
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Отворете настройките на игровия скрипт
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Изход от 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}От текущият избран графичен комплект липсва{P 0 "" т} {NUM} спрайт{P "" a}. Моля, проверете за актуализации на графичния комплект.
@@ -3054,6 +3044,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Избе
 STR_FOUND_TOWN_CITY                                             :{BLACK}Метрополис
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Метрополисите се разрастват по-бързо от градовете.{}В зависимост от настройките те са по-големи при тяхното създаване
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}План на пътищата:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Изберете план за пътищата в този град
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Оргинален
@@ -3498,15 +3489,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Запа
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Списък на наличните предварително зададени настройки. Изберете една, за да я копирате в името за запис по-долу
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Въведете име за шаблона
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Текущо избраното име за именуване на шаблона
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Отказ
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Не променяй шаблона
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Запис
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Запази шаблона с текущо избраното име
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Промяна на параметрите на базовата графика
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Промени параметрите на новите графики (NewGRF)
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Затвори
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Изчисти
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Върни всички параметри към началните им стойности
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Параметър {NUM}
@@ -4734,7 +4722,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Разп
 STR_TIMETABLE_NO_TRAVEL                                         :Без преминаване
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Пътувай (автоматично; включено в разписанието чрез следващата ваша заповед)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Пътувай (без разписание)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Пътувай (без разписание) с не повече от {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Пътувай за {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Пътувай за {STRING} с не повече от {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Пътувай (за {STRING}, без разписание)
@@ -4858,8 +4845,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Приеми
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Изберете маркирания ИИ
-STR_AI_LIST_CANCEL                                              :{BLACK}Отмени
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Не променяй ИИ
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Снимка на екрана
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Нормална снимка на екрана
@@ -4872,7 +4857,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Сним
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :ИИ
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Игрови скрипт
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Затвори
 STR_AI_SETTINGS_RESET                                           :{BLACK}Рестартиране
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index f7857ce6a6..9bf6a5b385 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Posa cases
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcions de la partida
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Configuració
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Configuració de la IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Configuració de l'script de partida
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Extensions NewGRF
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copia el
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcions de la partida
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Trieu la configuració general.
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Trieu la configuració general.
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gràfics
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Trieu la configuració dels gràfics.
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Trieu la configuració dels gràfics.
 STR_GAME_OPTIONS_TAB_SOUND                                      :So
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Escolliu la configuració de so i de música.
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Escolliu la configuració de so i de música.
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Trieu les opcions d'integració social.
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Trieu les opcions d'integració social.
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avançada
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Canvia la configuració avançada.
 
 STR_GAME_OPTIONS_VOLUME                                         :Volum
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efectes de so
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}{NBSP}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Moneda
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecció de la unitat monetària
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Moneda
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Selecció de la unitat monetària
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letó
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escut portuguès
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia ucraïnès
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Desa automàticament
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selecciona l'interval de desada automàtica de la partida
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Desa automàticament
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selecciona l'interval de desada automàtica de la partida
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Cada 30 minuts
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Cada 60 minuts
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Cada 120 minuts
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Idioma
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selecciona l'idioma de la interfície
+STR_GAME_OPTIONS_LANGUAGE                                       :Idioma
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selecciona l'idioma de la interfície
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}{NBSP}% completat)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantalla completa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marqueu la casella per mostrar l'OpenTTD a pantalla completa.
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marqueu la casella per mostrar l'OpenTTD a pantalla completa.
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolució de pantalla
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecciona la resolució de pantalla
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolució de pantalla
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecciona la resolució de pantalla
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :altres
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Acceleració per maquinari
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Seleccioneu aquesta opció per permetre que l'OpenTTD provi d'usar acceleració per maquinari. Si es canvia l'opció, s'aplicarà quan es reiniciï el programa.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Acceleració per maquinari
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Seleccioneu aquesta opció per permetre que l'OpenTTD provi d'usar acceleració per maquinari. Si es canvia l'opció, s'aplicarà quan es reiniciï el programa.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}La configuració tindrà efecte quan es reiniciï el programa.
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Selecciona aquesta casella per activar la sincronització vertical de la pantalla. Els canvis s'aplicaran quan es reiniciï el programa. Només funciona si s'activa l'acceleració per maquinari.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Selecciona aquesta casella per activar la sincronització vertical de la pantalla. Els canvis s'aplicaran quan es reiniciï el programa. Només funciona si s'activa l'acceleració per maquinari.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Controlador actual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador actual: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Mida de la interfície
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arrossegueu el botó lliscant per a triar la mida de la interfície. Amb Ctrl+arrossega, s'aplica un ajust continu.
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detecta la mida automàticament
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marqueu aquesta opció si voleu que s'ajusti la mida de la interfície automàticament.
+STR_GAME_OPTIONS_INTERFACE                                      :Interfície
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Escala els bisells
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marqueu aquesta opció si voleu que s'escalin els bisells segons la mida de la interfície.
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Mida de la interfície
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arrossegueu el botó lliscant per a triar la mida de la interfície. Amb Ctrl+arrossega, s'aplica un ajust continu.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detecta la mida automàticament
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marqueu aquesta opció si voleu que s'ajusti la mida de la interfície automàticament.
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Fes servir la font tradicional
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marqueu aquesta casella si preferiu fer servir la font tradicional de mida fixa i pixelada.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Aplica anti-àlies a les fonts
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marqueu aquesta casella per a fer servir tècniques d'anti-àlies a les fonts redimensionables.
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escala els bisells
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marqueu aquesta opció si voleu que s'escalin els bisells segons la mida de la interfície.
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Fes servir la font tradicional
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marqueu aquesta casella si preferiu fer servir la font tradicional de mida fixa i pixelada.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Aplica anti-àlies a les fonts
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marqueu aquesta casella per a fer servir tècniques d'anti-àlies a les fonts redimensionables.
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Sondeig automatitzat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participa al sondeig automatitzat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Quan s'activa, l'OpenTTD transmetrà dades sobre l'ús del joc del sondeig quan se surti d'una partida.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Sobre el sondeig i la privacitat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Obre una pàgina amb més informació sobre el sondeig automatitzat.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Vista prèvia del resultat del sondeig
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostra el resultat del sondeig automatitzat de la partida actual.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Sondeig automatitzat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participa al sondeig automatitzat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Quan s'activa, l'OpenTTD transmetrà dades sobre l'ús del joc del sondeig quan se surti d'una partida.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Sobre el sondeig i la privacitat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Obre una pàgina amb més informació sobre el sondeig automatitzat.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Vista prèvia del resultat del sondeig
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostra el resultat del sondeig automatitzat de la partida actual.
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Gràfics
+STR_GAME_OPTIONS_DISPLAY                                        :Pantalla
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Rati de refresc de la pantalla
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Seleccioneu el rati de refresc de la pantalla que voleu usar.
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Rati de refresc de la pantalla
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Seleccioneu el rati de refresc de la pantalla que voleu usar.
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}{NBSP}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Ratis de refresc major a 60{NBSP}Hz poden causar problemes de rendiment.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunt de gràfics base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona el conjunt de gràfics base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informació addicional sobre el conjunt de gràfics base
+STR_GAME_OPTIONS_BASE_GRF                                       :Conjunt de gràfics base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecciona el conjunt de gràfics base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informació addicional sobre el conjunt de gràfics base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Conjunt de sons base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selecciona un conjunt de sons base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informació addicional sobre el joc de sons base
+STR_GAME_OPTIONS_BASE_SFX                                       :Conjunt de sons base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selecciona un conjunt de sons base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informació addicional sobre el joc de sons base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Conjunt de peces de música base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selecciona el conjunt de peces de música base a utilitzar
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informació addicional sobre el conjunt de peces de música base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Conjunt de peces de música base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selecciona el conjunt de peces de música base a utilitzar
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informació addicional sobre el conjunt de peces de música base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Descarrega contingut
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Comprova si hi ha continguts nous o actualitzats per a descarregar.
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no s'han instal·lat complements per a interactuar amb plataformes socials)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estat del complement:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estat del complement:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}En funcionament
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}No s'ha pogut inicialitzar.
@@ -1220,12 +1225,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissiva (les
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No hi ha cap IA disponible...{}Podeu descarregar-ne a través del «Contingut en línia».
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Configuració
+# Settings tree in the Game Options window
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{G=Masculin}{BLACK}Filtre:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Desplega-ho tot
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Plega-ho tot
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restableix tots els valors
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Desplega-ho tot
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Plega-ho tot
+STR_CONFIG_SETTING_RESET_ALL                                    :Restableix tots els valors
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(cap explicació disponible)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor per defecte: {ORANGE}{STRING}
@@ -1238,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Paràmetre de l
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Avís!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Aquesta acció restablirà la configuració de la partida als seus valors per defecte.{}Esteu segur que voleu fer-ho?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipus:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restringeix la llista de sota usant els filtres predefinits
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipus:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restringeix la llista de sota usant els filtres predefinits
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Paràmetres bàsics (mostra només els paràmetres importants)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Paràmetres avançats (mostra la majoria dels paràmetres)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Paràmetres per experts (mostra tots els paràmetres, fins i tot els rars)
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Paràmetres de
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Cap -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Mostra tots els resultats establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}»{BLACK}.
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Mostrar tots els resultats de la cerca filtrada amb {WHITE}tots els tipus de paràmetres
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Mostra tots els resultats de la cerca establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}» {BLACK}i {SILVER}«Tipus» {BLACK}a {WHITE}«Tots els paràmetres»{BLACK}.
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Mostra tots els resultats establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}»{BLACK}.
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Mostrar tots els resultats de la cerca filtrada amb {WHITE}tots els tipus de paràmetres
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Mostra tots els resultats de la cerca establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}» {BLACK}i {SILVER}«Tipus» {BLACK}a {WHITE}«Tots els paràmetres»{BLACK}.
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Inactiu
@@ -2192,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no s
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... el controlador de la GPU ha fallat durant la partida. Es desactiva l'acceleració per maquinari.
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Partida nova
 STR_INTRO_LOAD_GAME                                             :{BLACK}Carrega una partida
@@ -2204,11 +2209,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijug
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opcions del joc
 STR_INTRO_HIGHSCORE                                             :{BLACK}Taula de rècords
 STR_INTRO_HELP                                                  :{BLACK}Ajuda i manuals
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Configuració
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Extensions NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contingut en línia
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Configuració de la IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Configuració de l'script de partida
 STR_INTRO_QUIT                                                  :{BLACK}Surt
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comença una partida nova. Amb Ctrl+clic, es salta la configuració del mapa.
@@ -2226,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Seleccio
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Obre la finestra d'opcions de la partida.
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Obre la finestra de la taula de rècords.
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Accediu a la documentació i recursos en línia.
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Obre la finestra de configuració.
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Obre la finestra de configuració de les extensions NewGRF.
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Comprova si hi ha continguts nous i actualitzats per a descarregar.
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Obre la finestra d'opcions d'IA.
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Obre la finestra de configuració de l'script de partida.
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Surt de l'OpenTTD.
 
 STR_INTRO_BASESET                                               :{WHITE}Al joc de gràfics base seleccionat li falten {NUM} sprite{P "" s}.{}Si us plau, comproveu si hi ha actualitzacions disponibles.
@@ -3077,6 +3074,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciutat
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Les ciutats creixen més ràpid que els pobles{}Depenent de la configuració, són més grans quan es funden
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposició de les carreteres de la població:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selecciona la disposició de les carreteres utilitzades per a aquesta població
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Distribució original
@@ -3526,15 +3524,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Guardar
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Llista de totes les configuracions NewGRF preestablertes; seleccioneu-ne una per a copiar el nom
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Introduïu un nom per a l'actual configuració NewGRF
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nom amb què guardar la nova configuració preestablerta de NewGRF
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancel·la
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}No guardar els canvies en la configuració NewGRF preestablerta
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Guarda
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Guarda la configuració NewGRF preestablerta amb el nom seleccionat
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Canvia els paràmetres dels gràfics base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Canvia els paràmetres NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Tanca
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Restableix
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Estableix tots els paràmetres al seu valor predeterminat
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paràmetre {NUM}
@@ -4768,7 +4763,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horari -
 STR_TIMETABLE_NO_TRAVEL                                         :Sense viatge
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viatge (automàtic; programat per la següent ordre manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viatge (fora d'horari)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viatja (sense horari) com a molt a {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Viatge a {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viatja durant {STRING} com a molt a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viatja (durant {STRING}, sense horari)
@@ -4895,8 +4889,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}D'acord
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecciona l'script marcat.
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancel·la
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No canviïs l'script.
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Pren una captura de pantalla
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura de pantalla normal
@@ -4909,7 +4901,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Paràmetres d'IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Paràmetres de l'script de partida
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tanca
 STR_AI_SETTINGS_RESET                                           :{BLACK}Restableix
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5887,6 +5878,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}G
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt
index 9f866818cb..e7a01a440c 100644
--- a/src/lang/chuvash.txt
+++ b/src/lang/chuvash.txt
@@ -461,20 +461,21 @@ STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Пӗлт
 
 
 
+
 ###length 45
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Вырӑсла тенкӗ
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Хӑй управ
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Хӑй управ
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Сӳнтер
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Чӗлхи
+STR_GAME_OPTIONS_LANGUAGE                                       :Чӗлхи
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Тулли экран
+STR_GAME_OPTIONS_FULLSCREEN                                     :Тулли экран
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Экрана сӑнарлама пултарни
+STR_GAME_OPTIONS_RESOLUTION                                     :Экрана сӑнарлама пултарни
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :расна
 
 
@@ -495,6 +496,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :расна
 
 
 
+
 
 # Custom currency window
 
@@ -540,7 +542,7 @@ STR_CLIMATE_TOYLAND_LANDSCAPE                                   :Вӑйӑ пах
 ###length 4
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 
 
 
@@ -860,15 +862,12 @@ STR_CONFIG_SETTING_AI                                           :Ӑмӑртуҫ
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF майлаштару
 STR_INTRO_QUIT                                                  :{BLACK}Вӗҫле
 
 
 
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF майлаштару кӑтар
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD' вӗҫле
 
 
@@ -1142,6 +1141,7 @@ STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Ӑнсӑ
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Хула пысӑкӑшӗ суйла
 STR_FOUND_TOWN_CITY                                             :{BLACK}Тӑп хула
 
+
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Чӑн
 STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 серепе
 STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 серепе
@@ -1241,7 +1241,6 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Верс
 # NewGRF save preset window
 
 # NewGRF parameters window
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Хуп
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Сикӗ
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Ӗнерленӳ {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index a2ce05ae5b..b43190830c 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -489,7 +489,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Izlaz
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Postavke igre
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Postavke
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Postavke za NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Postavke prozirnosti
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Prikaži imena gradova
@@ -964,8 +963,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Postavke
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Novčane jedinice
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor novčanih jedinica
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Novčane jedinice
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Izbor novčanih jedinica
 
 
 ###length 45
@@ -1010,26 +1010,26 @@ STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kineski Renminb
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkonški Dolar
 STR_GAME_OPTIONS_CURRENCY_INR                                   :Indijska Rupija
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatsko spremanje
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Odaberi interval između automatskih spremanja igre
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatsko spremanje
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Odaberi interval između automatskih spremanja igre
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Isključeno
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jezik
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Odaberi jezik sučelja
+STR_GAME_OPTIONS_LANGUAGE                                       :Jezik
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Odaberi jezik sučelja
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cijeli zaslon
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Označi ovu kućicu kako bi igrao OpenTTD preko cijelog zaslona
+STR_GAME_OPTIONS_FULLSCREEN                                     :Cijeli zaslon
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Označi ovu kućicu kako bi igrao OpenTTD preko cijelog zaslona
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Razlučivost zaslona
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Odaberi razlučivost zaslona
+STR_GAME_OPTIONS_RESOLUTION                                     :Razlučivost zaslona
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Odaberi razlučivost zaslona
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ostalo
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
 
 
 
@@ -1039,17 +1039,18 @@ STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni set grafike
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberi osnovni grafički set za igru
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o osnovnom grafičkom setu
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set osnovnih zvukova
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Odaberite osnovni set zvukova
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o setu osnovnih zvukova
+STR_GAME_OPTIONS_BASE_GRF                                       :Osnovni set grafike
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Odaberi osnovni grafički set za igru
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Dodatne informacije o osnovnom grafičkom setu
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set osnovne glazbe
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Odaberi set osnovne glazbe za uporabu
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatne informacije o setu osnovne glazbe
+STR_GAME_OPTIONS_BASE_SFX                                       :Set osnovnih zvukova
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Odaberite osnovni set zvukova
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Dodatne informacije o setu osnovnih zvukova
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set osnovne glazbe
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Odaberi set osnovne glazbe za uporabu
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Dodatne informacije o setu osnovne glazbe
 
 
 
@@ -1152,12 +1153,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Dopustiv
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Odgovarajuća UI nije dostupna...{}Možete preuzeti nekoliko UI pomoću sustava 'Online sadržaja'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Postavke
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtriraj slijed:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Otvori sve
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Zatvori sve
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Ponovno postavi sve vrijednosti
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtriraj slijed:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Otvori sve
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Zatvori sve
+STR_CONFIG_SETTING_RESET_ALL                                    :Ponovno postavi sve vrijednosti
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(nema dostupnog pojašnjenja)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Osnovna vrijednost: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Vrsta postavki: {ORANGE}{STRING}
@@ -1167,9 +1167,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Postavke igre (
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Postavke tvrtke (pohranjene u snimljenoj datoteci; utječu samo na nove igre)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Postavke tvrtke (pohranjene u snimljenoj datoteci; utječu samo na trenutnu tvrtku)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tip:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Sužava doljnju listu koristeći samo predpostavljene filtere
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tip:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Sužava doljnju listu koristeći samo predpostavljene filtere
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Osnovno (prikaži samo važne postavke)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Napredno (prikaži većinu postavki)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Stručno (prikaži sve postavke, uključujući i one neobične)
@@ -1186,9 +1186,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Postavke tvrtke
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nijedna -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Prikaži sve rezultate pretraga po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Prikaži sve rezultate pretraga po postavkama{}{SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}i {SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Prikaži sve rezultate pretraga po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Prikaži sve rezultate pretraga po postavkama{}{SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}i {SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Isključeno
@@ -2010,7 +2010,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Dodjelji
 STR_VIDEO_DRIVER_ERROR                                          :{WHITE}Pogreška video postavka...
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova igra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Učitaj igru
@@ -2021,8 +2020,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Više ig
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Postavke igre
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tablica najboljih rezultata
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Postavke
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Postavke
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Provjeri online sadržaj
 STR_INTRO_QUIT                                                  :{BLACK}Izlaz
 
@@ -2040,8 +2037,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Odaberi
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Prikaži postavke igre
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Prikaži tablicu najboljih rezultata
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Prikaži postavke
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži postavke NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Provjeri novi i nadograđeni sadržaj za preuzimanje
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Izzađi it 'OpenTTD'-a
 
@@ -2733,6 +2728,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Odaberi
 STR_FOUND_TOWN_CITY                                             :{BLACK}Grad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velegradovi rastu brže od običnih gradova{}Ovisno o postavkama, veći su prilikom osnivanja
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Raspored gradskih cesta
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Odaberi raspored cesta za ovaj grad
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3132,14 +3128,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Snimiti
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Popis dostupnih predpostavki, odaberite jednu za kopiranje pod imenom ispod
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Unesite ime za predpostavke
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Trenutno odabrano ime za snimanje predpostavki
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Odustani
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ne mijenjati predpostavke
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Snimanje
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Snimite predpostavke u trenutno odabrano ime
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Promijeni NewGRF parametre
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zatvori
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Resetiraj
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Namjesti sve parametre na osnovne vrijednosti
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametar {NUM}
@@ -4247,7 +4240,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Vozni re
 STR_TIMETABLE_NO_TRAVEL                                         :Nema putovanja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Putovanje (automatsko; prema rasporedu sljedeće ručno određene naredbe)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Putovanje (izvan voznog reda)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Putovanje (nije mjereno) uz najviše {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Putuj prema {STRING} uz najviše {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Putovanje (za {STRING}, nije mjereno)
@@ -4357,8 +4349,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Prihvati
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Odaberi označenu skriptu
-STR_AI_LIST_CANCEL                                              :{BLACK}Odustani
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemoj mijenjati skriptu
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Napravi sliku zaslova
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normalna snimka zaslona
@@ -4370,7 +4360,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Slika mi
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :UI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zatvori
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetiraj
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index ab95bcfa9a..ea6a7e4c37 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -519,7 +519,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Budovat domy
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti hry
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Nastavení
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Nastavení AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Nastavení herních skriptů
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Nastavení grafik
@@ -1046,22 +1045,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Nastavit
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnosti hry
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Obecné
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Zobrazit obecná nastavení
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Zobrazit obecná nastavení
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Zobrazit nastavení grafiky
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Zobrazit nastavení grafiky
 STR_GAME_OPTIONS_TAB_SOUND                                      :Zvuk
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Zobrazit nastavení zvuku a hudby
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Zobrazit nastavení zvuku a hudby
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sociální
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Zobrazit nastavení pro sociální interakci
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Zobrazit nastavení pro sociální interakci
 
 STR_GAME_OPTIONS_VOLUME                                         :Hlasitost
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Zvukové efekty
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Hudba
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Měna
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výběr jednotek měny
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Měna
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Výběr jednotek měny
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1112,8 +1112,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lotyšský lat
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalské escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrajinská hřivna
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatické ukládání
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Volba intervalu mezi automatickým ukládáním hry
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatické ukládání
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Volba intervalu mezi automatickým ukládáním hry
 
 # Autosave dropdown
 ###length 5
@@ -1123,77 +1123,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Každých 30 mi
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Každých 60 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Každých 120 minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jazyk
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Zvolit jazyk uživatelského rozhraní
+STR_GAME_OPTIONS_LANGUAGE                                       :Jazyk
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Zvolit jazyk uživatelského rozhraní
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% dokončeno)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Na celou obrazovku
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaškrtnutím této volby poběží OpenTTD na celé obrazovce
+STR_GAME_OPTIONS_FULLSCREEN                                     :Na celou obrazovku
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Zaškrtnutím této volby poběží OpenTTD na celé obrazovce
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozlišení obrazovky
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Zvolit rozlišení obrazovky
+STR_GAME_OPTIONS_RESOLUTION                                     :Rozlišení obrazovky
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Zvolit rozlišení obrazovky
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :jiné
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardwarová akcelerace
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Zaškrtni, pokud chceš OpenTTD povolit použití hardwarové akcelerace. Změněné nastavení bude aplikováno po restartu hry
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardwarová akcelerace
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Zaškrtni, pokud chceš OpenTTD povolit použití hardwarové akcelerace. Změněné nastavení bude aplikováno po restartu hry
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Nastavení vstoupí v platnost pouze po restartu hry
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Zaškrtní tento box pro v-sync obrazovky. Změna se projeví po znovu spuštění hry. Funguje to pouze pro povolenou hardwarovou akceleraci.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Zaškrtní tento box pro v-sync obrazovky. Změna se projeví po znovu spuštění hry. Funguje to pouze pro povolenou hardwarovou akceleraci.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktuální ovladač: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktuální ovladač: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Velikost uživatelského rozhraní
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Přetažením posuvníku změníš velikost rozhraní. Drž Ctrl pro plynulé přizpůsobení
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automaticky detekovat velikost
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Zaškrtni pro automatické nastavení velikosti uživatelského rozhraní
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Škálovat úkosy
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Zaškrtni toto políčko pro škálování úkosů dle velikosti uživatelského rozhraní
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Velikost uživatelského rozhraní
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Přetažením posuvníku změníš velikost rozhraní. Drž Ctrl pro plynulé přizpůsobení
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automaticky detekovat velikost
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Zaškrtni pro automatické nastavení velikosti uživatelského rozhraní
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Používat tradiční písma ze sprite
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Zaškrtni toto políčko, pokud dáváš přednost tradičním písmům pevné velikosti ze sprite
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-aliasovat písma
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Zaškrtni toto políčko pro zapnutí anti-aliasování škálovatelných písem
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Škálovat úkosy
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Zaškrtni toto políčko pro škálování úkosů dle velikosti uživatelského rozhraní
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Používat tradiční písma ze sprite
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Zaškrtni toto políčko, pokud dáváš přednost tradičním písmům pevné velikosti ze sprite
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-aliasovat písma
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Zaškrtni toto políčko pro zapnutí anti-aliasování škálovatelných písem
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatický průzkum
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Účastnit se automatického průzkumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Pokud je zapnuto, OpenTTD odešle průzkum při opuštění hry
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}O anketě a ochraně soukromí
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Otevře prohlížeč s více informacemi o automatickém průzkumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Náhled výsledků průzkumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Zobrazovat výsledek průzkumu z aktuálně běžící hry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatický průzkum
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Účastnit se automatického průzkumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Pokud je zapnuto, OpenTTD odešle průzkum při opuštění hry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :O anketě a ochraně soukromí
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Otevře prohlížeč s více informacemi o automatickém průzkumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Náhled výsledků průzkumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Zobrazovat výsledek průzkumu z aktuálně běžící hry
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafiky
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Obnovovací frekvence obrazovky
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Zvolit obnovovací frekvenci obrazovky
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Obnovovací frekvence obrazovky
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Zvolit obnovovací frekvenci obrazovky
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Obnovovací frekvence vyšší než 60Hz může mít dopad výkon.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Základní sada grafiky
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vyber si základní sadu grafiky (nemůže být změněna během hry, ale pouze z hlavního menu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Další informace o základní sadě grafiky
+STR_GAME_OPTIONS_BASE_GRF                                       :Základní sada grafiky
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vyber si základní sadu grafiky (nemůže být změněna během hry, ale pouze z hlavního menu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Další informace o základní sadě grafiky
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Základní sada zvuků
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vyber si základní sadu zvuků (nemůže být změněna během hry, ale pouze z hlavního menu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Další informace o základní sadě zvuků
+STR_GAME_OPTIONS_BASE_SFX                                       :Základní sada zvuků
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vyber si základní sadu zvuků (nemůže být změněna během hry, ale pouze z hlavního menu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Další informace o základní sadě zvuků
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Základní hudební set
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vyberte jaký základní hudební set použít
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Další informace o základním hudebním setu
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Základní hudební set
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vyberte jaký základní hudební set použít
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Další informace o základním hudebním setu
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Získat obsah
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Zkontrolovat nový a aktualizovaný obsah ke stažení
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nejsou nainstalovány žádné zásuvné moduly pro integraci sociálních platforem)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stav zásuvného modulu:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stav zásuvného modulu:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Spuštěn
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inicializace selhala
@@ -1305,12 +1305,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Nezaujatý (bez
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Žádná vhodná AI není k dispozici...{}Některé AI lze stáhnout pomocí služby "Stahovat součásti"
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Nastavení
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrovat:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Rozbalit vše
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sbalit vše
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Vymazat všechny hodnoty
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrovat:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Rozbalit vše
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Sbalit vše
+STR_CONFIG_SETTING_RESET_ALL                                    :Vymazat všechny hodnoty
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(žádné vysvětlení není k dispozici)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Výchozí hodnota: {ORANGE}{STRING}
@@ -1323,9 +1322,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Nastavení spol
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Pozor!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tato akce resetuje všechna nastavení hry na výchozí hodnoty.{}Jste si jistý, že chcete pokračovat?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Druh:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Omezit nastavení v seznamu níže pomocí předdefinovaných filtrů
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Druh:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Omezit nastavení v seznamu níže pomocí předdefinovaných filtrů
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Základní (zobrazí pouze důležitá nastavení)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Pokročilé (zobrazí většinu nastavení)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expertní (zobrazí všechna nastavení, včetně těch podivných)
@@ -1342,9 +1341,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Nastavení spol
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nic -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Vypnuto
@@ -2271,7 +2270,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... neby
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... grafická karta způsobila pád hry. Hadwarová akcelerace byla zakázána
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nová hra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Nahrát hru
@@ -2283,11 +2281,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Více hr
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Možnosti hry
 STR_INTRO_HIGHSCORE                                             :{BLACK}Nejlepší výsledky
 STR_INTRO_HELP                                                  :{BLACK}Nápověda a Manuály
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Nastavení
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavení grafik
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Stahovat součásti
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Nastavení AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Nastavení herních skriptů
 STR_INTRO_QUIT                                                  :{BLACK}Ukončit
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Hrát novou hru. Pomocí Ctrl přeskočíš nastavení mapy
@@ -2305,11 +2299,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Země hr
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Otevřít možnosti hry
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Zobrazit tabulku nejlepších výsledků
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Prohlédnout dokumentaci a online zdroje
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Otevřít nastavení
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Otevřít nastavení NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Ukázat, jaký nový nebo upravený obsah se dá stáhnout
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Otevřít nastavení AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Otevřít nastavení herních skriptů
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ukončit 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}V aktuálně zvolené základní sadě grafiky chybí {NUM} sprit{P "" y ů}. Zkuste, prosím, vyhledat aktualizovanou základní sadu.
@@ -3152,6 +3142,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Zvolte v
 STR_FOUND_TOWN_CITY                                             :{BLACK}Velkoměsto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velkoměsta rostou rychleji než běžná města. V závislosti na nastavení jsou při založení větší
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Silniční síť města:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Zvolte rozvržení silniční sítě v tomto městě
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Původní
@@ -3604,15 +3595,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Uložit
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Seznam předvoleb k dispozici, vyber jednu pro zkopírování do uložené hry vybrané níže
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Vlož název pro předvolby
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Aktuálně zvolený název pro předvolby
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Zrušit
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Neměnit předvolby
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Uložit
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Uloží předvolby do aktuálně zvolené uložené hry
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Změnit parametry základní grafiky
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Úprava nastavení parametrů
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zavřít
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Nastav všechny parametry na jejich výchozí hodnotu
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametr {NUM}
@@ -4845,7 +4833,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Jízdní
 STR_TIMETABLE_NO_TRAVEL                                         :Nikam nejet
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Jet do (automatický; jizdní řád podle následujícího ručního příkazu)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Jet do (mimo jízdní řád)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Jet (mimo jízdní řád) maximální rychlostí {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Jet do {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Jeď {STRING} a maximálně {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Jeď ({STRING}, mimo jízdní řád)
@@ -4971,8 +4958,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Potvrdit
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrat označený skript
-STR_AI_LIST_CANCEL                                              :{BLACK}Zrušit
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Neměňte skript
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Pořídit snímek obrazovky
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Běžný snímek obrazovky
@@ -4985,7 +4970,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Snímek
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parametry AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parametry herního skriptu
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zavřít
 STR_AI_SETTINGS_RESET                                           :{BLACK}Obnovit nastavení
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 710607d8fe..f8f3b93812 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Luk vind
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vinduestitel - træk her for at flytte vinduet
 STR_TOOLTIP_SHADE                                               :{BLACK}Oprul vindue - vis kun titellinien
 STR_TOOLTIP_DEBUG                                               :{BLACK}Vis information om NewGRF fejl
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Gendan vinduets standardstørrelse. Ctrl+Klik for at gemme nuværende størrelse som standard
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Ændre vinduesstørrelsen til standardstørrelsen. Ctrl+klik for at gemme den aktuelle størrelse som standard. Dobbelt Ctrl+klik for at nulstille den gemte standardstørrelse.
 STR_TOOLTIP_STICKY                                              :{BLACK}Marker dette vindue som ulukkeligt af 'Luk ALLE vinduer' tasten. Ctrl+Klik for også at gemme tilstand som standart
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klik og træk for at ændre vinduets størrelse
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Skift mellem stort/lille vindue
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Placer huse
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opsætning
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Indstillinger
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI indstillinger
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Indstillinger for spilscript
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF indstillinger
@@ -452,7 +451,12 @@ STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Sandkasse mulig
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Gennemsigtighedsvalg
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Bynavne vist
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Stationsnavne vist
+STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Togstationer
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Lastbilen stopper
 STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Busstoppesteder
+STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Havne
+STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Lufthavne
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Spøgelse
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Rutepunkt-navne vist
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Viste skilte
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Modstander skilte og navne vist
@@ -933,7 +937,7 @@ STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLAC
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Tilskudsordning i udbud:{}{}Første {STRING} fra {STRING} til {STRING} vil udløse et {UNITS_YEARS_OR_MINUTES}s tilskud fra den lokale myndighed!
 ###length 4
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Servicetilskud tildelt til {STRING}!{}{}{STRING} fra {STRING} til {STRING} vil betale 50% ekstra for de næste {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} vil betale dobbelt takster for den næste {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Servicetilskud tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} vil betale dobbelt takster for den næste {UNITS_YEARS_OR_MINUTES}!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} betaler tredobbelte takster for de næste {UNITS_YEARS_OR_MINUTES}!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} betaler firedobbelt takster for de næste {UNITS_YEARS_OR_MINUTES}!
 
@@ -954,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Bevæg h
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opsætning
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generel
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Vælg generelle indstillinger
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Vælg generelle indstillinger
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Vælg grafikindstillinger
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Vælg grafikindstillinger
 STR_GAME_OPTIONS_TAB_SOUND                                      :Lyd
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Vælg lyd og musik indstillinger
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Vælg lyd og musik indstillinger
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Vælg sociale integrationsindstillinger
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Vælg indstillinger for social integration
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanceret
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Skift avancerede indstillinger
 
 STR_GAME_OPTIONS_VOLUME                                         :Lydstyrke
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Lydeffekter
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :musik
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaenhed
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valg af valutaenhed
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valutaenheder
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valg af valutaenheder
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1018,9 +1026,10 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesisk Rupi
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysisk Ringgit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :lettiske lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugisiske Escudo
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainsk hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisk gemning
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vælg interval imellem automatisk gemning
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatisk gem spil
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vælg interval imellem automatisk gem spil
 
 # Autosave dropdown
 ###length 5
@@ -1030,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Hvert 30. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Hvert 60. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Hvert 120. minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Sprog
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vælg sprog til brugerfladen
+STR_GAME_OPTIONS_LANGUAGE                                       :Sprog
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Vælg sprog til brugerfladen
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% færdig)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fuld skærm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Afkryds for at spille OpenTTD i fuld skærm
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fuld skærm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Afkryds for at spille OpenTTD i fuld skærm
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skærmopløsning
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vælg ønsket skærmopløsning
+STR_GAME_OPTIONS_RESOLUTION                                     :Skærmopløsning
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Vælg ønsket skærmopløsning
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :andet
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware-acceleration
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Marker dette felt for at tillade at OpenTTD forsøger at bruge hardwareacceleration. Ændringer af indstillingen er først effektiv efter spillet er genstartet.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware-acceleration
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marker dette felt for at tillade at OpenTTD forsøger at bruge hardwareacceleration. Ændringer af indstillingen er først effektiv efter spillet er genstartet.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Indstillingen er først effektiv efter spillet er genstartet.
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Afmærk dette felt for at v-synkronisere skærmen. Ændringer af indstillingen er først effektiv efter spillet er genstartet. Fungerer kun med hardware-acceleration aktiveret.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Afmærk dette felt for at v-synkronisere skærmen. Ændringer af indstillingen er først effektiv efter spillet er genstartet. Fungerer kun med hardware-acceleration aktiveret.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nuværende fører: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Nuværende fører: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interface størrelse
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Træk skyderen for at indstille grænsefladestørrelsen. Hold Ctrl nede for kontinuerlig justering
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automatisk registrering af størrelse
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marker dette felt for automatisk at registrere grænsefladestørrelse
+STR_GAME_OPTIONS_INTERFACE                                      :Grænseflade
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skalere facetter
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marker dette afkrydsningsfelt for at skalere facetter efter grænsefladestørrelse
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interface størrelse
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Træk skyderen for at indstille grænsefladestørrelsen. Hold Ctrl nede for kontinuerlig justering
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automatisk registrering af størrelse
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marker dette felt for automatisk at registrere grænsefladestørrelse
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Brug traditionel sprite-skrifttype
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marker dette felt, hvis du foretrækker at bruge den traditionelle sprite-skrifttype med fast størrelse
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias skrifttyper
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marker dette felt for at skrifttyper, der kan ændres størrelse, kan udlignes
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skalere facetter
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marker dette afkrydsningsfelt for at skalere facetter efter grænsefladestørrelse
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Brug traditionel sprite-skrifttype
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marker dette felt, hvis du foretrækker at bruge den traditionelle sprite-skrifttype med fast størrelse
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias skrifttyper
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marker dette felt for at skrifttyper, der kan ændres størrelse, kan udlignes
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatiseret undersøgelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Deltag i automatiseret undersøgelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Når det er aktiveret, sender OpenTTD en undersøgelse, når du forlader et spil
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatiseret undersøgelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Deltag i automatiseret undersøgelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Når det er aktiveret, sender OpenTTD en undersøgelse, når du forlader et spil
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Om GPDR og privatliv
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dette åbner en browser med mere information om den automatiserede undersøgelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Forhåndsvisning af undersøgelsesresultat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Vis undersøgelsesresultatet af det aktuelle spil
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dette åbner en browser med mere information om den automatiserede undersøgelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Forhåndsvisning af undersøgelsesresultat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Vis undersøgelsesresultatet af det aktuelle spil
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafik
+STR_GAME_OPTIONS_DISPLAY                                        :Vis
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Skærm opdateringshastighed
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Vælg den opdateringshastighed der skal bruges på skærmen
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Skærm opdateringshastighed
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Vælg den opdateringshastighed der skal bruges på skærmen
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Opdateringshastigheder over 60Hz kan påvirke ydeevnen.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafiksæt
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vælg det grundlæggende grafiksæt, der skal bruges
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Yderligere information om basis-grafiksættet
+STR_GAME_OPTIONS_BASE_GRF                                       :Basis-grafiksæt
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vælg det grundlæggende grafiksæt, der skal bruges (kan ikke ændres i spillet, kun fra hovedmenuen)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Yderligere information om basis-grafiksættet
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis-lydsæt
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vælg det grundlæggende lyd sæt, der skal bruges
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Mere information om basis-lydsættet
+STR_GAME_OPTIONS_BASE_SFX                                       :Basis lydsæt
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vælg det grundlæggende lyd sæt, der skal bruges (kan ikke ændres i spillet, kun fra hovedmenuen)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Mere information om basis lydsættet
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis-musiksæt
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vælg basismusik-sæt
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Yderligere information om basismusik-sættet
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basis musiksæt
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vælg basismusik sæt
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Yderligere information om basismusik-sættet
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Hent indhold
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Søg efter nyt og opdateret indhold, der skal downloades
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(ingen plugins til at integrere med sociale platforme installeret)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin-tilstand:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Plugin-tilstand:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Køre
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Initialisering mislykkedes
@@ -1213,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Passiv (ingen i
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Der blev ikke fundet en egnet computer-spiller...{}Du kan downloade flere forskellige computer-spillere gennem 'Online Indhold'.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Indstillinger
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filterstreng:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Udvid alle
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Skjul alle
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Nulstil alle værdier
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filterstreng:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Udvid alle
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Skjul alle
+STR_CONFIG_SETTING_RESET_ALL                                    :Nulstil alle værdier
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(ingen forklaring tilgængelig)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standard: {ORANGE}{STRING}
@@ -1231,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firma indstilli
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Advarsel!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Denne handling vil nulstille alle spilindstillinger til deres standardværdier.{}Ønsker du at fortsætte?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Begrænser listen nedenfor så den kun viser ændrede indstillinger
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Begrænser listen nedenfor så den kun viser ændrede indstillinger
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grund Indstillinger
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avancerede indstillinger
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspertindstillinger / alle indstillinger
@@ -1250,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firma indstilli
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ingen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Vis alle søgeresultater ved at sætte{}{SILVER}Kategori {BLACK}to {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Vis alle søgeresultater ved at sætte{}{SILVER}Indtast {BLACK}til {WHITE}Alle Indstillingstyper
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Vis alle søgeresultater ved at sætte{} {SILVER}Kategori {BLACK}til {WHITE} {STRING} {BLACK}og {SILVER} Indtast {BLACK}til {WHITE}Alle Indstillingstyper
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Vis alle søgeresultater ved at sætte{}{SILVER}Kategori {BLACK}to {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Vis alle søgeresultater ved at sætte{}{SILVER}Indtast {BLACK}til {WHITE}Alle Indstillingstyper
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Vis alle søgeresultater ved at sætte{} {SILVER}Kategori {BLACK}til {WHITE} {STRING} {BLACK}og {SILVER} Indtast {BLACK}til {WHITE}Alle Indstillingstyper
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Fra
@@ -1925,6 +1935,7 @@ STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Aldrig
 STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Økonomitype: {STRING}
 ###length 2
 STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Udjævnet økonomi ændrer produktionsniveauet oftere, og i mindre trin. Frossen økonomi forhindrer ændringer i produktionsniveauet og industrilukninger. Denne indstilling kan muligvis ikke have nogen effekt hvis industrityperne stammer fra en NewGRF
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT_PERIOD                 :Jævn økonomi ændrer produktionen oftere og i mindre trin. En frossen økonomi stopper produktionsændringer og industrilukninger. Denne indstilling har muligvis ingen effekt, hvis industrityper leveres af en NewGRF.{}{}Industriens produktion pr. minut kan stadig synes at variere, hvis økonomien er frossen, fordi produktionen udløses med faste intervaller, der ikke præcist svarer til minutter.
 
 ###length 3
 STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Original
@@ -1979,7 +1990,12 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Forbudt
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Tilladt
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Tilladt, tilpasset by-layout
 
+STR_CONFIG_SETTING_HOUSE_PLACER                                 :Placering af individuelle byhuse:{STRING}
+STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :Aktivering af denne indstilling giver spillerne mulighed for at placere byhuse manuelt
 ###length 3
+STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Forbudt
+STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Tilladt
+STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :Tilladt, fuldt konstrueret
 
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Godsgenerering i byer: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Hvor meget gods der bliver produceret af byers bygninger, i forhold til byens samlede indbyggertal.{}Kvadratisk vækst: En by med dobbelt indbyggertal genererer fire gange så mange passagerer.{}Lineær vækst: En by med dobbelt indbyggertal genererer dobbelt så mange passagerer
@@ -2179,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... inge
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU-driver fik spillet til at gå ned. Hardwareacceleration deaktiveret
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nyt spil
 STR_INTRO_LOAD_GAME                                             :{BLACK}Fortsæt spil
@@ -2191,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Netværk
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opsætning
 STR_INTRO_HIGHSCORE                                             :{BLACK} Topresultater
 STR_INTRO_HELP                                                  :{BLACK}Hjælp og manualer
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Indstillinger
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF indstillinger
-STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Tjek Online Indhold
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI Indstillinger
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Indstillinger for spilscript
+STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online Indhold
 STR_INTRO_QUIT                                                  :{BLACK}Afslut
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start et nyt spil. Ctrl+Klik springer kortindstillingerne over.
@@ -2213,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Vælg 'l
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Åbn spilmuligheder
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Åben topscoreliste
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Få adgang til dokumentation og online ressourcer
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Åben indstillinger
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Åben NewGRF-indstillinger
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tjek for nyt og opdateret indhold til download
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Åben AI indstillinger
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Åben indstillinger for spilscript
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Afslut 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK} Det aktuelt valgte base grafiksæt mangler {NUM} sprite {P "" s}. Se venligst efter opdateringer til basesættet.
@@ -2242,6 +2251,7 @@ STR_HELP_WINDOW_README                                          :{BLACK}Læs mig
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Ændringslog
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Kendte Bugs
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Licens
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Skrifttyper
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Manual / Wiki
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Anmeld en fejl
@@ -2646,7 +2656,7 @@ STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}Din serv
 STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL                   :{WHITE}Andre spillere vil ikke kunne forbinde til din server
 
 # Content downloading window
-STR_CONTENT_TITLE                                               :{WHITE}Download af indhold
+STR_CONTENT_TITLE                                               :{WHITE}Online indhold
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
 STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Indholdstype
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Navn
@@ -2845,6 +2855,7 @@ STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}År: {OR
 STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}År: {ORANGE}til {NUM}
 STR_HOUSE_PICKER_SIZE                                           :{BLACK}Størrelse: {ORANGE}{NUM}x{NUM} fliser
 STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Gods accepteret: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Produceret last: {ORANGE}{CARGO_LIST}
 
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Kant
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Udkant
@@ -2852,6 +2863,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Ydre Forstæder
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Indre Forstæder
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Bymidte
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :Forhindre opgraderinger
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Vælg om dette hus skal beskyttes mod udskiftning i takt med at byen vokser
 STR_HOUSE_PICKER_PROTECT_OFF                                    :Slukket
 STR_HOUSE_PICKER_PROTECT_ON                                     :tændt
 
@@ -3060,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vælg by
 STR_FOUND_TOWN_CITY                                             :{BLACK}Storby
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Storbyer vokser hurtigere en almindelige byer{}Afhængig af indstillingerne kan de være større ved grundlæggelsen
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Byudvidelse:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Bygninger
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Forøg bygningerne i byerne
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Veje
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Forøg byernes veje
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Byens vej-layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vælg vej-layout for denne by
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalt
@@ -3131,6 +3150,8 @@ STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Sporvejs
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Togspors hastighedsgrænse: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Vej hastighedsbegrænsning: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Sporvogn hastighedsgrænse: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}Byen kan opgraderes: {LTBLUE}Ja
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}Byen kan opgraderes: {LTBLUE}Nej
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Klipper
@@ -3139,6 +3160,9 @@ STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bart land
 STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Græs
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Marker
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :Snedækkede klipper
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :Snedækket, ujævnt land
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :Snedækket græs
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbanespor
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbanespor med bloksignaler
@@ -3504,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Gem foru
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK} Liste over tilgængelige presets, skal du vælge en til at kopiere det til gemte navn nedenfor
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Indtast et navn til det forudindstillede
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Aktuelt valgte navn til den forudindstillede at gemme
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Annuller
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Du må ikke ændre den forudindstillede
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Gem
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Gem forudindstilling til det valgte navn
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Skift grundlæggende grafiske parametre
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Ændre NewGRF parameterne
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Luk
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Nulstil
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Sæt alle parameter til deres standart niveau
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3681,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Ændre n
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Udvid
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Forøg størrelsen af byen
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Udvid bygninger
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Forøg byens bygninger
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Udvid veje
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Forøg byens veje
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Slet
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Slet denne by fuldstændigt
 
@@ -4016,6 +4041,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Producer
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Kræver:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} venter{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} venter
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion (multipla af 8, op til 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Ændre produktions niveauet (Op til 800%)
@@ -4673,6 +4702,7 @@ STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Værksted
 STR_ORDER_SHIP_DEPOT                                            :Skibsdok
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} den nærmeste hangar
 STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} den nærmeste {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
@@ -4695,10 +4725,10 @@ STR_ORDER_UNLOAD_FULL_LOAD                                      :(Los og vent p
 STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Los og vent på fuld last af hvilken som helst type fragt)
 STR_ORDER_UNLOAD_NO_LOAD                                        :(Los og efterlad tom)
 STR_ORDER_TRANSFER                                              :(Overfør og last fragt)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Overfør og vent på fuld last)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Overfør og vent på fuld last af hvilken som helst type fragt)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :{SPACE}(Overfør og vent på fuld last)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :{SPACE}(Overfør og vent på fuld last af hvilken som helst type fragt)
 STR_ORDER_TRANSFER_NO_LOAD                                      :(Overfør og efterlad tom)
-STR_ORDER_NO_UNLOAD                                             :(Los ikke og last fragt)
+STR_ORDER_NO_UNLOAD                                             :{SPACE}(Los ikke og last fragt)
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Los ikke og vent på fuld last)
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Los ikke af og vent på fuld last af hvilken som helst type)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Los ikke og last ikke)
@@ -4710,8 +4740,8 @@ STR_ORDER_UNLOAD_REFIT                                          :(Los og medtag
 STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Los og vent på fuld last med auto-tilpas til {STRING})
 STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Los og vent på fuld vilkårlig last med auto-tilpas til {STRING})
 STR_ORDER_TRANSFER_REFIT                                        :(Overfør og medtag last med auto-tilpas til {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Overfør og vent på fuld last med auto-tilpas til {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Overfør og vent på fuld vilkårlig last med auto-tilpas til {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :{SPACE}(Overfør og vent på fuld last med auto-tilpas til {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :{SPACE}(Overfør og vent på fuld vilkårlig last med auto-tilpas til {STRING})
 STR_ORDER_NO_UNLOAD_REFIT                                       :(Ingen losning og medtag last med with auto-tilpas til {STRING})
 STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(Ingen losning og vent på fuld last med with auto-tilpas til {STRING})
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(Ingen losning og vent på fuld vilkårlig last med with auto-tilpas til {STRING})
@@ -4741,7 +4771,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Kørepla
 STR_TIMETABLE_NO_TRAVEL                                         :Rejs ikke
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rejs (automatisk; planlagt med næste manuelle ordre)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Rejs (ikke iflg. køreplan)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Rejs med højst {2:VELOCITY} (ikke skemalagt)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Rejs med højst {VELOCITY} (ikke skemalagt)
 STR_TIMETABLE_TRAVEL_FOR                                        :Rejs i {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Rejs mod {STRING} med højst {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Køreplan (for {STRING}, ikke skemalagt)
@@ -4768,6 +4798,7 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Sekunder til ti
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ændre tid
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ændre den tid, som den fremhævede rækkefølge skal tage. Ctrl+klik angiver tidspunktet for alle ordrer
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Skift tid
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nulstil tid
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nulstil tiden for den markerede ordre. Ctrl+klik for at rydde tiden for alle ordrer
@@ -4867,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Godkend
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vælg markeret script
-STR_AI_LIST_CANCEL                                              :{BLACK}Afbryd
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Skift ikke scriptet
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Tag skærmbillede
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normalt skærmbillede
@@ -4881,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minikort
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI-parametre
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Spil Script parametre
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Luk
 STR_AI_SETTINGS_RESET                                           :{BLACK}Nulstil
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5306,11 +5334,16 @@ STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan ikke
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan ikke sælge flyet...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_SELL_ALL_TRAIN                                  :{WHITE}Kan ikke sælge alle jernbanevogne...
 STR_ERROR_CAN_T_SELL_ALL_ROAD_VEHICLE                           :{WHITE}Kan ikke sælge alle vejkøretøjer...
 STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Kan ikke sælge alle skibe...
 STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Kan ikke sælge alle fly...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Kan ikke automatisk erstatte jernbanevogne...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Kan ikke automatisk erstatte vejkøretøjer...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Kan ikke automatisk erstatte skibe...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Kan ikke automatisk erstatte fly...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}For mange køretøjer i spillet
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan ikke ændre serviceinterval...
@@ -5854,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5893,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Åbn badgekonfiguration
+STR_BADGE_CONFIG_RESET                                          :Nulstil
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge-ikoner
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badgefiltre
+STR_BADGE_CONFIG_PREVIEW                                        :Forhåndsvisningsbillede
+STR_BADGE_CONFIG_NAME                                           :Navn
+STR_BADGE_FILTER_ANY_LABEL                                      :Enhver {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} er {STRING}
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index c3556bff8d..73d8ac06ef 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Venster
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vensternaam - sleep om venster te verplaatsen
 STR_TOOLTIP_SHADE                                               :{BLACK}Venster inklappen - alleen titelbalk weergeven
 STR_TOOLTIP_DEBUG                                               :{BLACK}Probleemgegevens voor NewGRF weergeven
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Venster op standaardgrootte weergeven. Ctrl+klik slaat huidige grootte op als standaard.
+STR_TOOLTIP_DEFSIZE                                             :Venster op standaardgrootte weergeven. Ctrl+klik slaat huidige grootte op als standaard.
 STR_TOOLTIP_STICKY                                              :{BLACK}Dit venster markeren als niet-sluitbaar met de knop 'Alle vensters sluiten'. Ctrl+klik om slaat status op als standaard.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klik en sleep om de grootte van dit venster te veranderen
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Schakelen tussen groot/klein venster
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Huizen plaatsen
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelopties
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Instellingen
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI-instellingen
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Spelscript-instellingen
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-instellingen
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Kopieer
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spelopties
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Algemeen
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Algemene instellingen kiezen
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Algemene instellingen kiezen
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafische elementen
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Grafische instellingen kiezen
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Grafische instellingen kiezen
 STR_GAME_OPTIONS_TAB_SOUND                                      :Geluid
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Geluids- en muziekinstellingen kiezen
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Geluids- en muziekinstellingen kiezen
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sociaal
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Instellingen voor sociale integratie kiezen
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Instellingen voor sociale integratie kiezen
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Geavanceerd
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Geavanceerde instellingen wijzigen
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Geluidseffecten
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muziek
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuta kiezen
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valuta kiezen
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Letse lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugese Escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Oekraïense hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisch opslaan
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Tijdsduur kiezen tussen automatisch opgeslagen spellen
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatisch opslaan
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Tijdsduur kiezen tussen automatisch opgeslagen spellen
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Elke 30 minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Elke 60 minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Elke 120 minuten
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Taal
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Taal selecteren voor gebruikersscherm
+STR_GAME_OPTIONS_LANGUAGE                                       :Taal
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Taal selecteren voor gebruikersscherm
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% voltooid)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Volledig scherm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Vink dit vakje aan om OpenTTD op volledig scherm te spelen
+STR_GAME_OPTIONS_FULLSCREEN                                     :Volledig scherm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Vink dit vakje aan om OpenTTD op volledig scherm te spelen
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Schermresolutie
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecteer de schermresolutie
+STR_GAME_OPTIONS_RESOLUTION                                     :Schermresolutie
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecteer de schermresolutie
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Anders
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardwareversnelling
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Selecteer dit vakje om OpenTTD hardwareversnelling te laten gebruiken. De gewijzigde instelling wordt pas van kracht nadat het spel opnieuw is gestart.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardwareversnelling
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Selecteer dit vakje om OpenTTD hardwareversnelling te laten gebruiken. De gewijzigde instelling wordt pas van kracht nadat het spel opnieuw is gestart.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}De instelling wordt pas van kracht als het spel opnieuw is gestart
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Selecteer dit vakje om het scherm verticaal te synchroniseren. De wijziging gaat pas in nadat je het spel opnieuw hebt opgestart. Werkt alleen als hardwareversnelling is ingeschakeld
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Selecteer dit vakje om het scherm verticaal te synchroniseren. De wijziging gaat pas in nadat je het spel opnieuw hebt opgestart. Werkt alleen als hardwareversnelling is ingeschakeld
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Huidige driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Huidig stuurprogramma: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Grootte gebruikersscherm
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Sleep de schuif om de grootte van het gebruikersscherm in te stellen. Ctrl+slepen voor geleidelijke aanpassing
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Grootte automatisch detecteren
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Vink dit vakje aan om de grootte van het gebruikersscherm automatisch te detecteren
+STR_GAME_OPTIONS_INTERFACE                                      :Gebruikersscherm
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Randen schalen
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Vink dit vakje aan om randen te schalen op grootte van gebruikersscherm
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Grootte gebruikersscherm
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Sleep de schuif om de grootte van het gebruikersscherm in te stellen. Ctrl+slepen voor geleidelijke aanpassing
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Grootte automatisch detecteren
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Vink dit vakje aan om de grootte van het gebruikersscherm automatisch te detecteren
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Traditioneel sprite-lettertype gebruiken
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Vink dit vakje aan als je het traditionele sprite-lettertype met vaste breedte wilt gebruiken
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Lettertypen met anti-alias
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Vink dit vakje aan voor in grootte aanpasbare lettertypen met anti-alias
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Randen schalen
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Vink dit vakje aan om randen te schalen op grootte van gebruikersscherm
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Traditioneel sprite-lettertype gebruiken
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Vink dit vakje aan als je het traditionele sprite-lettertype met vaste breedte wilt gebruiken
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Lettertypen met anti-alias
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Vink dit vakje aan voor in grootte aanpasbare lettertypen met anti-alias
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Geautomatiseerd onderzoek
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Deelnemen aan geautomatiseerd onderzoek
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Als dit is ingeschakeld, verzendt OpenTTD een onderzoek wanneer je het spel afsluit
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Onderzoek en privacy
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Hiermee open je een browser met meer informatie over het geautomatiseerde onderzoek.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Voorbeeld van resultaten van onderzoek
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Geef de resultaten weer van het onderzoek van het huidige spel
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Geautomatiseerd onderzoek
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Deelnemen aan geautomatiseerd onderzoek
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Als dit is ingeschakeld, verzendt OpenTTD een onderzoek wanneer je het spel afsluit
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Onderzoek en privacy
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Hiermee open je een browser met meer informatie over het geautomatiseerde onderzoek.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Voorbeeld van resultaten van onderzoek
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Geef de resultaten weer van het onderzoek van het huidige spel
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Weergave
+STR_GAME_OPTIONS_DISPLAY                                        :Weergave
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Verversingssnelheid weergeven
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Selecteer de gewenste schermverversingssnelheid
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Verversingssnelheid weergeven
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Selecteer de gewenste schermverversingssnelheid
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Verversingssnelheden boven 60 Hz kunnen de prestaties beïnvloeden.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisset voor graphics
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecteer de te gebruiken basisset voor grafische elementen (kan tijdens het spel niet worden gewijzigd, alleen in het hoofdmenu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Aanvullende informatie over de basisset voor graphics
+STR_GAME_OPTIONS_BASE_GRF                                       :Basisset voor grafische elementen
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecteer de te gebruiken basisset voor grafische elementen (kan tijdens het spel niet worden gewijzigd, alleen in het hoofdmenu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Aanvullende informatie over de basisset voor grafische elementen
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basisset voor geluidseffecten
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selecteer de te gebruiken basisset voor geluidseffecten (kan tijdens het spel niet worden gewijzigd, alleen in het hoofdmenu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Aanvullende informatie over de basisset voor geluidseffecten
+STR_GAME_OPTIONS_BASE_SFX                                       :Basisset voor geluiden
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selecteer de te gebruiken basisset voor geluiden (kan tijdens het spel niet worden gewijzigd, alleen in het hoofdmenu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Aanvullende informatie over de basisset voor geluiden
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basisset voor muziek
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selecteer de te gebruiken basisset voor muziek
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Aanvullende informatie over the basisset voor muziek
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basisset voor muziek
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selecteer de te gebruiken basisset voor muziek
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Aanvullende informatie over the basisset voor muziek
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Inhoud ophalen
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Controleren op nieuwe en aangepaste inhoud om te downloaden
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(geen invoegtoepassingen voor integratie met sociale platforms geïnstalleerd)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(geen invoegtoepassingen voor integratie met sociale platforms geïnstalleerd)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Status invoegtoepassing:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Status invoegtoepassing:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Lopend
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Kon niet initialiseren
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Toegeeflijk (ge
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Geen bruikbare AI's beschikbaar...{}{}Je kunt diverse AI's downloaden via het 'online-inhoud'-systeem
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Instellingen
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles uitvouwen
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles inklappen
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Alle waarden terugstellen
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles uitvouwen
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles inklappen
+STR_CONFIG_SETTING_RESET_ALL                                    :Alle waarden terugstellen
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(geen uitleg beschikbaar)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standaardwaarde: {ORANGE}{STRING}
@@ -1237,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Bedrijfsinstell
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Voorzichtig!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Met deze actie herstel je alle spelinstellingen naar hun standaardwaarden.{}Weet je zeker dat je wilt doorgaan?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Beperkt de onderstaande lijst met vooraf gedefinieerde filters
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Beperkt de onderstaande lijst met vooraf gedefinieerde filters
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basis (alleen belangrijke instellingen weergeven)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Geavanceerd (meeste instellingen weergeven)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (alle instellingen weergeven, inclusief vreemde)
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Bedrijfsinstell
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Geen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Alle zoekresultaten per instelling weergeven{}{SILVER}Categorie {BLACK}naar {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Alle zoekresultaten per instelling weergeven{}{SILVER}Type {BLACK}naar {WHITE}alle instellingstypen
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Alle zoekresultaten per instelling weergeven{}{SILVER}Categorie {BLACK}naar {WHITE}{STRING} {BLACK}en {SILVER}type {BLACK}naar {WHITE}Alle instellingstypen
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Alle zoekresultaten per instelling weergeven{}{PUSH_COLOUR}{SILVER}Categorie {POP_COLOUR}naar {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Alle zoekresultaten per instelling weergeven{}{PUSH_COLOUR}{SILVER}Type {POP_COLOUR}naar {WHITE}alle instellingstypen
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Alle zoekresultaten per instelling weergeven{PUSH_COLOUR}{SILVER}Categorie {POP_COLOUR}naar {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}en {PUSH_COLOUR}{SILVER}type {POP_COLOUR}naar {WHITE}Alle instellingstypen
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Uit
@@ -2191,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... geen
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Spel is vastgelopen door het GPU-stuurprogramma. Hardwareversnelling wordt uitgeschakeld
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nieuw spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Spel laden
@@ -2203,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Netwerks
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spelopties
 STR_INTRO_HIGHSCORE                                             :{BLACK}Scoretabel
 STR_INTRO_HELP                                                  :{BLACK}Help en handleiding
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Instellingen
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-instellingen
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online inhoud
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI-instellingen
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Spelscript-instellingen
 STR_INTRO_QUIT                                                  :{BLACK}Afsluiten
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start een nieuw spel. Ctrl+klik slaat de kaartconfiguratie over
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Speelgoe
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Spelopties openen
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Scoretabel openen
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Toegang tot documentatie en online-hulpbronnen
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Instellingen openen
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF-instellingen openen
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Zoeken naar nieuwe en aangepaste inhoud om te downloaden
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}AI-instellingen openen
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Spelscript-instellingen openen
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD' afsluiten
 
 STR_INTRO_BASESET                                               :{BLACK}De huidige gekozen set grafische elementen mist {NUM} sprite{P "" s}. Controleer of er updates zijn voor deze basisset.
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Stadsgro
 STR_FOUND_TOWN_CITY                                             :{BLACK}Groeistad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Groeisteden groeien sneller dan gewone steden{}Afhankelijk van de instellingen kunnen ze ook groter zijn als ze gesticht worden
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Uitbreiding van stad:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Gebouwen
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Meer gebouwen in steden
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Wegen
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Meer wegen in steden
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Wegpatroon
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Wegpatroon voor deze stad kiezen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Origineel
@@ -3525,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Voorkeur
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lijst met beschikbare voorkeursinstellingen, Selecteer om deze te kopiëren naar de opslagnaam hieronder.
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Voer een naam in voor de voorkeursinstelling
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Huidige gekozen naam voor de voorkeursinstelling om op te slaan
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Annuleren
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Voorkeursinstelling niet wijzigen
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Opslaan
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Sla de huidige voorkeursinstelling op onder de huidige gekozen naam
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Grafische basisinstellingen wijzigen
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF-parameters wijzigen
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Sluiten
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Terugstellen
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Stel alle parameters terug naar de standaardwaarde
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Hiermee
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Vergroot
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Vergroot stadsgrootte
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Gebouwen uitbreiden
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Meer gebouwen in stad
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Wegen uitbreiden
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Meer wegen in steden
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Verwijder
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Verwijder deze hele stad
 
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Orders v
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Orders van vliegtuig weergeven. Ctrl+klik geeft de dienstregeling van het vliegtuig.
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Details van trein weergeven
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Details van wegvoertuig weergeven
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Details van schip weergeven
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Details van vliegtuig weergeven
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Details van trein weergeven. Ctrl+klik om de voertuiggroep weer te geven
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Details van voertuig weergeven. Ctrl+klik om de voertuiggroep weer te geven
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Details van schip weergeven. Ctrl+klik om de voertuiggroep weer te geven
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Details van vliegtuig weergeven. Ctrl+klik om de voertuiggroep weer te geven
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Huidige treinactie - klik om de trein te starten of stoppen
@@ -4767,15 +4771,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Dienstre
 STR_TIMETABLE_NO_TRAVEL                                         :Niet rijden
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rijden (automatisch; volgens dienstregeling bij volgende handmatige bestemming)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (geen dienstregeling)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis met maximaal {2:VELOCITY} (geen dienstregeling)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis met maximaal {VELOCITY} (geen dienstregeling)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis naar {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis {STRING} met maximaal {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Reis (gedurende {STRING}, geen dienstregeling)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Reis (gedurende {STRING}, geen dienstregeling) maximaal {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(wacht {STRING} lang, geen dienstregeling)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(reis gedurende {STRING}, geen dienstregeling)
-STR_TIMETABLE_STAY_FOR                                          :en blijf gedurende {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :en rijd {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}en blijf gedurende {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}en rijd {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Deze dienstregeling heeft ongeveer {STRING} nodig om te voltooien.
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Deze dienstregeling duurt {STRING}
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}Webadre
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accepteren
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Gemarkeerd script selecteren
-STR_AI_LIST_CANCEL                                              :{BLACK}Annuleren
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Script niet wijzigen
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Een schermafbeelding maken
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normale schermafbeelding
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Schermaf
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI-parameters
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Spelscript-parameters
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sluiten
 STR_AI_SETTINGS_RESET                                           :{BLACK}Terugstellen
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mjd
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}bn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Badgeconfiguratie openen
+STR_BADGE_CONFIG_RESET                                          :Terugstellen
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badgepictogrammen
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badgefilters
+STR_BADGE_CONFIG_PREVIEW                                        :Voorbeeld
+STR_BADGE_CONFIG_NAME                                           :Naam
+STR_BADGE_FILTER_ANY_LABEL                                      :Willekeurige {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 811c38810f..21d0e08940 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Close wi
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Window title - drag this to move window
 STR_TOOLTIP_SHADE                                               :{BLACK}Shade window - only show the title bar
 STR_TOOLTIP_DEBUG                                               :{BLACK}Show NewGRF debug information
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Resize window to default size. Ctrl+Click to store current size as default
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Resize window to default size. Ctrl+Click to store current size as default. Double Ctrl+Click to reset stored default
 STR_TOOLTIP_STICKY                                              :{BLACK}Mark this window as uncloseable by the 'Close All Windows' key. Ctrl+Click to also save state as default
 STR_TOOLTIP_RESIZE                                              :{BLACK}Click and drag to resize this window
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Toggle large/small window size
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Place houses
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Game options
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Settings
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI settings
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Game script settings
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF settings
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copy the
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Game Options
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Choose general settings
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Choose general settings
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graphics
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Choose graphics settings
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Choose graphics settings
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Choose sound and music settings
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Choose sound and music settings
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Choose social integration settings
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Choose social integration settings
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Advanced
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Change advanced settings
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sound effects
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Music
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency units
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Currency units
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Currency units selection
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({RAW_STRING})
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvian Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portuguese Escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainian Hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autosave
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Select interval between automatic game saves
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Every 30 minute
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Every 60 minutes
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Every 120 minutes
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Language
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Select the interface language to use
+STR_GAME_OPTIONS_LANGUAGE                                       :Language
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Select the interface language to use
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{RAW_STRING} ({NUM}% completed)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullscreen
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Check this box to play OpenTTD fullscreen mode
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullscreen
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Check this box to play OpenTTD fullscreen mode
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Screen resolution
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Select the screen resolution to use
+STR_GAME_OPTIONS_RESOLUTION                                     :Screen resolution
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Select the screen resolution to use
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :other
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware acceleration
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Check this box to allow OpenTTD to try to use hardware acceleration. A changed setting will only be applied upon game restart
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware acceleration
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Check this box to allow OpenTTD to try to use hardware acceleration. A changed setting will only be applied upon game restart
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}The setting will only take effect after a game restart
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Check this box to v-sync the screen. A changed setting will only be applied upon game restart. Only works with hardware acceleration enabled
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Check this box to v-sync the screen. A changed setting will only be applied upon game restart. Only works with hardware acceleration enabled
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Current driver: {RAW_STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Current driver: {RAW_STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interface size
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Drag slider to set interface size. Ctrl+Drag for continuous adjustment
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Auto-detect size
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Check this box to detect interface size automatically
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scale bevels
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Check this box to scale bevels by interface size
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interface size
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Drag slider to set interface size. Ctrl+Drag for continuous adjustment
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Auto-detect size
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Check this box to detect interface size automatically
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Use traditional sprite font
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Check this box if you prefer to use the traditional fixed-size sprite font
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fonts
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Check this box to anti-alias resizable fonts
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scale bevels
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Check this box to scale bevels by interface size
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Use traditional sprite font
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Check this box if you prefer to use the traditional fixed-size sprite font
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fonts
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Check this box to anti-alias resizable fonts
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participate in automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}When enabled, OpenTTD will transmit a survey when leaving a game
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}About survey and privacy
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}This opens a browser with more information about the automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Preview survey result
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Show the survey result of the current running game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participate in automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :When enabled, OpenTTD will transmit a survey when leaving a game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :About survey and privacy
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :This opens a browser with more information about the automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Preview survey result
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Show the survey result of the current running game
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Graphics
+STR_GAME_OPTIONS_DISPLAY                                        :Display
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Display refresh rate
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Select the screen refresh rate to use
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Display refresh rate
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Select the screen refresh rate to use
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Refresh rates higher than 60Hz might impact performance.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base graphics set
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select the base graphics set to use (cannot be changed in-game, only from the main menu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base graphics set
+STR_GAME_OPTIONS_BASE_GRF                                       :Base graphics set
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Select the base graphics set to use (cannot be changed in-game, only from the main menu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Additional information about the base graphics set
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base sounds set
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Select the base sounds set to use (cannot be changed in-game, only from the main menu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base sounds set
+STR_GAME_OPTIONS_BASE_SFX                                       :Base sounds set
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Select the base sounds set to use (cannot be changed in-game, only from the main menu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Additional information about the base sounds set
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base music set
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Select the base music set to use
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Additional information about the base music set
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base music set
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Select the base music set to use
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Additional information about the base music set
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Get Content
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Check for new and updated content to download
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no plugins to integrate with social platforms installed)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(no plugins to integrate with social platforms installed)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{RAW_STRING} ({RAW_STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin state:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{RAW_STRING} ({RAW_STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Plugin state:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Running
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Failed to initialize
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissive (no
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No suitable AIs available...{}{}You can download several AIs via the 'Online Content' system
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Settings
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expand all
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Collapse all
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Reset all values
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expand all
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Collapse all
+STR_CONFIG_SETTING_RESET_ALL                                    :Reset all values
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(no explanation available)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING1}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Default value: {ORANGE}{STRING1}
@@ -1237,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Company setting
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Caution!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}This action will reset all game settings to their default values.{}Are you sure you want to proceed?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Category:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restricts the list below using predefined filters
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Category:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restricts the list below using predefined filters
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basic (show only important settings)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Advanced (show most settings)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (show all settings, including weird ones)
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Company setting
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- None -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Show all search results by setting{}{SILVER}Category {BLACK}to {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Show all search results by setting{}{SILVER}Type {BLACK}to {WHITE}All setting types
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Show all search results by setting{}{SILVER}Category {BLACK}to {WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Category {POP_COLOUR}to {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Type {POP_COLOUR}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Category {POP_COLOUR}to {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}and {PUSH_COLOUR}{SILVER}Type {POP_COLOUR}to {WHITE}All setting types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Off
@@ -2191,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no c
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU driver crashed the game. Hardware acceleration disabled
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}New Game
 STR_INTRO_LOAD_GAME                                             :{BLACK}Load Game
@@ -2203,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multipla
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Game Options
 STR_INTRO_HIGHSCORE                                             :{BLACK}Highscore Table
 STR_INTRO_HELP                                                  :{BLACK}Help & Manuals
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Settings
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Settings
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online Content
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI Settings
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Game Script Settings
 STR_INTRO_QUIT                                                  :{BLACK}Exit
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start a new game. Ctrl+Click skips map configuration
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Select '
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Open game options
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Open highscore table
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Get access to documentation and online resources
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Open settings
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Open NewGRF settings
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check for new and updated content to download
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Open AI settings
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Open Game script settings
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Exit 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}The currently selected base graphics set is missing {NUM} sprite{P "" s}. Please check for updates for the baseset.
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select t
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Town expansion:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Buildings
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Increase buildings of towns
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Roads
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Increase roads of towns
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Select road layout used for this town
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3525,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Save pre
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}List of available presets, select one to copy it to the save name below
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Enter a name for the preset
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Currently selected name for the preset to save
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancel
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Don't change the preset
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Save
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Save the preset to the current selected name
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Change base graphics parameters
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Change NewGRF parameters
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Close
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Set all parameters to their default value
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change t
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expand buildings
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Increase buildings of town
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expand roads
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Increase roads of town
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Show shi
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Show aircraft's orders. Ctrl+Click to show aircraft's timetable
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show road vehicle details
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details. Ctrl+Click to show train's group
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show vehicle details. Ctrl+Click to show vehicle's group
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details. Ctrl+Click to show ship's group
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details. Ctrl+Click to show aircraft's group
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Current train action - click to stop/start train
@@ -4767,15 +4771,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING1}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING1} with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Travel (for {STRING1}, not timetabled)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Travel (for {STRING1}, not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(stay for {STRING1}, not timetabled)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(travel for {STRING1}, not timetabled)
-STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING1}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING1}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}and stay for {STRING1}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}and travel for {STRING1}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}This timetable will take approximately {STRING1} to complete
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}This timetable will take {STRING1} to complete
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accept
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select highlighted script
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancel
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Don't change the script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Take a screenshot
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal screenshot
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimap
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI Parameters
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Game Script Parameters
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Close
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{RAW_STRING}: {ORANGE}{STRING1}
 
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{RAW_STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Open badge configuration
+STR_BADGE_CONFIG_RESET                                          :Reset
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge Icons
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badge Filters
+STR_BADGE_CONFIG_PREVIEW                                        :Preview Image
+STR_BADGE_CONFIG_NAME                                           :Name
+STR_BADGE_FILTER_ANY_LABEL                                      :Any {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}
diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt
index dbd25e79fe..d971ade190 100644
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Close wi
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Window title - drag this to move window
 STR_TOOLTIP_SHADE                                               :{BLACK}Shade window - only show the title bar
 STR_TOOLTIP_DEBUG                                               :{BLACK}Show NewGRF debug information
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Resize window to default size. Ctrl+Click to store current size as default
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Resize window to default size. Ctrl+Click to store current size as default. Double Ctrl+Click to reset stored default
 STR_TOOLTIP_STICKY                                              :{BLACK}Mark this window as uncloseable by the 'Close All Windows' key. Ctrl+Click to also save state as default
 STR_TOOLTIP_RESIZE                                              :{BLACK}Click and drag to resize this window
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Toggle large/small window size
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Place houses
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Game options
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Settings
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI settings
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Game script settings
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF settings
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Paste th
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Game Options
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Choose general settings
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Choose general settings
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graphics
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Choose graphics settings
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Choose graphics settings
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Choose sound and music settings
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Choose sound and music settings
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Choose social integration settings
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Choose social integration settings
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Advanced
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Change advanced settings
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sound effects
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Music
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency units
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Currency units
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Currency units selection
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvian Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portuguese Escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainian Hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autosave
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Select interval between automatic game saves
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Every 30 minute
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Every 60 minutes
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Every 120 minutes
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Language
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Select the interface language to use
+STR_GAME_OPTIONS_LANGUAGE                                       :Language
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Select the interface language to use
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completed)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullscreen
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Check this box to play OpenTTD fullscreen mode
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullscreen
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Check this box to play OpenTTD fullscreen mode
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Screen resolution
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Select the screen resolution to use
+STR_GAME_OPTIONS_RESOLUTION                                     :Screen resolution
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Select the screen resolution to use
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :other
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware acceleration
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Check this box to allow OpenTTD to try to use hardware acceleration. A changed setting will only be applied upon game restart
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware acceleration
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Check this box to allow OpenTTD to try to use hardware acceleration. A changed setting will only be applied upon game restart
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}The setting will only take effect after a game restart
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Check this box to v-sync the screen. A changed setting will only be applied upon game restart. Only works with hardware acceleration enabled
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Check this box to v-sync the screen. A changed setting will only be applied upon game restart. Only works with hardware acceleration enabled
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Current driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Current driver: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interface size
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Drag slider to set interface size. Ctrl+Drag for continuous adjustment
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Auto-detect size
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Check this box to detect interface size automatically
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scale bevels
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Check this box to scale bevels by interface size
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interface size
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Drag slider to set interface size. Ctrl+Drag for continuous adjustment
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Auto-detect size
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Check this box to detect interface size automatically
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Use traditional sprite font
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Check this box if you prefer to use the traditional fixed-size sprite font
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fonts
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Check this box to anti-alias resizable fonts
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scale bevels
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Check this box to scale bevels by interface size
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Use traditional sprite font
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Check this box if you prefer to use the traditional fixed-size sprite font
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fonts
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Check this box to anti-alias resizable fonts
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participate in automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}When enabled, OpenTTD will transmit a survey when leaving a game
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}About survey and privacy
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}This opens a browser with more information about the automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Preview survey result
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Show the survey result of the current running game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participate in automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :When enabled, OpenTTD will transmit a survey when leaving a game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :About survey and privacy
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :This opens a browser with more information about the automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Preview survey result
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Show the survey result of the current running game
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Graphics
+STR_GAME_OPTIONS_DISPLAY                                        :Display
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Display refresh rate
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Select the screen refresh rate to use
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Display refresh rate
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Select the screen refresh rate to use
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Refresh rates higher than 60Hz might impact performance.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base graphics set
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select the base graphics set to use (cannot be changed in-game, only from the main menu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base graphics set
+STR_GAME_OPTIONS_BASE_GRF                                       :Base graphics set
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Select the base graphics set to use (cannot be changed in-game, only from the main menu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Additional information about the base graphics set
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base sounds set
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Select the base sounds set to use (cannot be changed in-game, only from the main menu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base sounds set
+STR_GAME_OPTIONS_BASE_SFX                                       :Base sounds set
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Select the base sounds set to use (cannot be changed in-game, only from the main menu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Additional information about the base sounds set
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base music set
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Select the base music set to use
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Additional information about the base music set
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base music set
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Select the base music set to use
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Additional information about the base music set
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Get Content
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Check for new and updated content to download
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no plugins to integrate with social platforms installed)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(no plugins to integrate with social platforms installed)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin state:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Plugin state:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Running
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Failed to initialize
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissive (no
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No suitable AIs available...{}{}You can download several AIs via the 'Online Content' system
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Settings
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expand all
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Collapse all
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Reset all values
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expand all
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Collapse all
+STR_CONFIG_SETTING_RESET_ALL                                    :Reset all values
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(no explanation available)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Default value: {ORANGE}{STRING}
@@ -1237,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Company setting
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Caution!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}This action will reset all game settings to their default values.{}Are you sure you want to proceed?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Category:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restricts the list below using predefined filters
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Category:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restricts the list below using predefined filters
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basic settings
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Advanced settings
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert settings / all settings
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Company setting
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- None -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Show all search results by setting{}{SILVER}Category {BLACK}to {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Show all search results by setting{}{SILVER}Type {BLACK}to {WHITE}All setting types
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Show all search results by setting{}{SILVER}Category {BLACK}to {WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Category {POP_COLOUR}to {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Type {POP_COLOUR}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Category {POP_COLOUR}to {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}and {PUSH_COLOUR}{SILVER}Type {POP_COLOUR}to {WHITE}All setting types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Off
@@ -2191,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no c
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU driver crashed the game. Hardware acceleration disabled
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}New Game
 STR_INTRO_LOAD_GAME                                             :{BLACK}Load Game
@@ -2203,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multipla
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Game Options
 STR_INTRO_HIGHSCORE                                             :{BLACK}Highscore Table
 STR_INTRO_HELP                                                  :{BLACK}Help & Manuals
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Settings
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Settings
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online Content
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI Settings
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Game Script Settings
 STR_INTRO_QUIT                                                  :{BLACK}Exit
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start a new game. Ctrl+Click skips map configuration
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Select '
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Open game options
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Open highscore table
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Get access to documentation and online resources
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Open settings
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Open NewGRF settings
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check for new and updated content to download
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Open AI settings
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Open Game script settings
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Exit 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}The currently selected base graphics set is missing {NUM} sprite{P "" s}. Please check for updates for the baseset.
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select t
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Town expansion:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Buildings
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Increase buildings of towns
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Roads
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Increase roads of towns
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Select road layout used for this town
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3525,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Save pre
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}List of available presets, select one to copy it to the save name below
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Enter a name for the preset
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Currently selected name for the preset to save
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancel
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Don't change the preset
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Save
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Save the preset to the current selected name
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Change base graphics parameters
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Change NewGRF parameters
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Close
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Set all parameters to their default value
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change t
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expand buildings
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Increase buildings of town
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expand roads
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Increase roads of town
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Show shi
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Show aircraft's orders. Ctrl+Click to show aircraft's timetable
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show road vehicle details
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details. Ctrl+Click to show train's group
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show vehicle details. Ctrl+Click to show vehicle's group
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details. Ctrl+Click to show ship's group
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details. Ctrl+Click to show aircraft's group
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Current train action - click to stop/start train
@@ -4767,15 +4771,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING} with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Travel (for {STRING}, not timetabled)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Travel (for {STRING}, not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(stay for {STRING}, not timetabled)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(travel for {STRING}, not timetabled)
-STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}and stay for {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}and travel for {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}This timetable will take approximately {STRING} to complete
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}This timetable will take {STRING} to complete
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accept
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select highlighted script
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancel
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Don't change the script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Take a screenshot
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal screenshot
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimap
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI Parameters
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Game Script Parameters
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Close
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Open badge configuration
+STR_BADGE_CONFIG_RESET                                          :Reset
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge Icons
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badge Filters
+STR_BADGE_CONFIG_PREVIEW                                        :Preview Image
+STR_BADGE_CONFIG_NAME                                           :Name
+STR_BADGE_FILTER_ANY_LABEL                                      :Any {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 09cbd73417..deb7b3e6e3 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Close wi
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Window title - drag this to move window
 STR_TOOLTIP_SHADE                                               :{BLACK}Shade window - only show the title bar
 STR_TOOLTIP_DEBUG                                               :{BLACK}Show NewGRF debug information
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Resize window to default size. Ctrl+Click to store current size as default
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Resize window to default size. Ctrl+Click to store current size as default. Double Ctrl+Click to reset stored default
 STR_TOOLTIP_STICKY                                              :{BLACK}Mark this window as uncloseable by the 'Close All Windows' key. Ctrl+Click to also save state as default
 STR_TOOLTIP_RESIZE                                              :{BLACK}Click and drag to resize this window
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Toggle large/small window size
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Place houses
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Game options
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Settings
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI settings
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Game script settings
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF settings
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copy the
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Game Options
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Choose general settings
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Choose general settings
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graphics
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Choose graphics settings
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Choose graphics settings
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Choose sound and music settings
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Choose sound and music settings
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Choose social integration settings
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Choose social integration settings
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Advanced
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Change advanced settings
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sound effects
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Music
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency units
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Currency units
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Currency units selection
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvian Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portuguese Escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainian Hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autosave
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Select interval between automatic game saves
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Every 30 minute
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Every 60 minutes
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Every 120 minutes
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Language
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Select the interface language to use
+STR_GAME_OPTIONS_LANGUAGE                                       :Language
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Select the interface language to use
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completed)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullscreen
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Check this box to play OpenTTD fullscreen mode
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullscreen
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Check this box to play OpenTTD fullscreen mode
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Screen resolution
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Select the screen resolution to use
+STR_GAME_OPTIONS_RESOLUTION                                     :Screen resolution
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Select the screen resolution to use
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :other
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware acceleration
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Check this box to allow OpenTTD to try to use hardware acceleration. A changed setting will only be applied upon game restart
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware acceleration
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Check this box to allow OpenTTD to try to use hardware acceleration. A changed setting will only be applied upon game restart
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}The setting will only take effect after a game restart
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Check this box to v-sync the screen. A changed setting will only be applied upon game restart. Only works with hardware acceleration enabled
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Check this box to v-sync the screen. A changed setting will only be applied upon game restart. Only works with hardware acceleration enabled
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Current driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Current driver: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interface size
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Drag slider to set interface size. Ctrl+Drag for continuous adjustment
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Auto-detect size
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Check this box to detect interface size automatically
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scale bevels
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Check this box to scale bevels by interface size
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interface size
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Drag slider to set interface size. Ctrl+Drag for continuous adjustment
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Auto-detect size
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Check this box to detect interface size automatically
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Use traditional sprite font
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Check this box if you prefer to use the traditional fixed-size sprite font
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fonts
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Check this box to anti-alias resizable fonts
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scale bevels
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Check this box to scale bevels by interface size
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Use traditional sprite font
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Check this box if you prefer to use the traditional fixed-size sprite font
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fonts
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Check this box to anti-alias resizable fonts
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participate in automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}When enabled, OpenTTD will transmit a survey when leaving a game
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}About survey and privacy
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}This opens a browser with more information about the automated survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Preview survey result
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Show the survey result of the current running game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participate in automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :When enabled, OpenTTD will transmit a survey when leaving a game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :About survey and privacy
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :This opens a browser with more information about the automated survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Preview survey result
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Show the survey result of the current running game
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Graphics
+STR_GAME_OPTIONS_DISPLAY                                        :Display
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Display refresh rate
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Select the screen refresh rate to use
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Display refresh rate
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Select the screen refresh rate to use
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Refresh rates higher than 60Hz might impact performance.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base graphics set
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select the base graphics set to use (cannot be changed in-game, only from the main menu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base graphics set
+STR_GAME_OPTIONS_BASE_GRF                                       :Base graphics set
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Select the base graphics set to use (cannot be changed in-game, only from the main menu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Additional information about the base graphics set
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base sounds set
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Select the base sounds set to use (cannot be changed in-game, only from the main menu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base sounds set
+STR_GAME_OPTIONS_BASE_SFX                                       :Base sounds set
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Select the base sounds set to use (cannot be changed in-game, only from the main menu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Additional information about the base sounds set
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base music set
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Select the base music set to use
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Additional information about the base music set
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base music set
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Select the base music set to use
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Additional information about the base music set
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Get Content
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Check for new and updated content to download
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no plugins to integrate with social platforms installed)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(no plugins to integrate with social platforms installed)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin state:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Plugin state:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Running
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Failed to initialize
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissive (no
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No suitable AIs available...{}{}You can download several AIs via the 'Online Content' system
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Settings
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expand all
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Collapse all
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Reset all values
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expand all
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Collapse all
+STR_CONFIG_SETTING_RESET_ALL                                    :Reset all values
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(no explanation available)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Default value: {ORANGE}{STRING}
@@ -1237,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Company setting
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Caution!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}This action will reset all game settings to their default values.{}Are you sure you want to proceed?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Category:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restricts the list below using predefined filters
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Category:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restricts the list below using predefined filters
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basic (show only important settings)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Advanced (show most settings)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (show all settings, including weird ones)
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Company setting
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- None -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Show all search results by setting{}{SILVER}Category {BLACK}to {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Show all search results by setting{}{SILVER}Type {BLACK}to {WHITE}All setting types
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Show all search results by setting{}{SILVER}Category {BLACK}to {WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Category {POP_COLOUR}to {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Type {POP_COLOUR}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Show all search results by setting{}{PUSH_COLOUR}{SILVER}Category {POP_COLOUR}to {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}and {PUSH_COLOUR}{SILVER}Type {POP_COLOUR}to {WHITE}All setting types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Off
@@ -2020,7 +2024,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Maximum number
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Number of non-sticky open windows before old windows get automatically closed to make room for new windows
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :disabled
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Disabled
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Maximum zoom in level: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :The maximum zoom-in level for viewports. Note that enabling higher zoom-in levels increases memory requirements
@@ -2191,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no c
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU driver crashed the game. Hardware acceleration disabled
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}New Game
 STR_INTRO_LOAD_GAME                                             :{BLACK}Load Game
@@ -2203,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multipla
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Game Options
 STR_INTRO_HIGHSCORE                                             :{BLACK}Highscore Table
 STR_INTRO_HELP                                                  :{BLACK}Help & Manuals
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Settings
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Settings
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online Content
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI Settings
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Game Script Settings
 STR_INTRO_QUIT                                                  :{BLACK}Quit
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start a new game. Ctrl+Click skips map configuration
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Select '
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Open game options
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Open highscore table
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Get access to documentation and online resources
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Open settings
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Open NewGRF settings
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check for new and updated content to download
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Open AI settings
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Open Game script settings
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quit 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}The currently selected base graphics set is missing {NUM} sprite{P "" s}. Please check for updates for the baseset.
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select t
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Town expansion:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Buildings
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Increase buildings of towns
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Roads
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Increase roads of towns
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Select road layout used for this town
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3525,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Save pre
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}List of available presets, select one to copy it to the save name below
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Enter a name for the preset
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Currently selected name for the preset to save
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancel
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Don't change the preset
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Save
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Save the preset to the current selected name
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Change base graphics parameters
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Change NewGRF parameters
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Close
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Set all parameters to their default value
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change t
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expand buildings
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Increase buildings of town
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expand roads
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Increase roads of town
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Show shi
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Show aircraft's orders. Ctrl+Click to show aircraft's timetable
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show road vehicle details
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details. Ctrl+Click to show train's group
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show vehicle details. Ctrl+Click to show vehicle's group
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details. Ctrl+Click to show ship's group
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details. Ctrl+Click to show aircraft's group
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Current train action - click to stop/start train
@@ -4767,15 +4771,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING} with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Travel (for {STRING}, not timetabled)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Travel (for {STRING}, not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(stay for {STRING}, not timetabled)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(travel for {STRING}, not timetabled)
-STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}and stay for {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}and travel for {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}This timetable will take approximately {STRING} to complete
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}This timetable will take {STRING} to complete
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accept
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select highlighted script
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancel
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Don't change the script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Take a screenshot
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal screenshot
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimap
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI Parameters
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Game Script Parameters
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Close
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Open badge configuration
+STR_BADGE_CONFIG_RESET                                          :Reset
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge Icons
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badge Filters
+STR_BADGE_CONFIG_PREVIEW                                        :Preview Image
+STR_BADGE_CONFIG_NAME                                           :Name
+STR_BADGE_FILTER_ANY_LABEL                                      :Any {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 96e48a7abf..97d5ae6b76 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -523,7 +523,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Forlasi
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Ludaj agordoj
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Agordoj
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI agordoj
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Ludoskriptaj agordoj
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Agordoj de NewGRF
@@ -1011,19 +1010,20 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Gluu la
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludaj agordoj
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Ĝenerale
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Elektu ĝeneralajn agordojn
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Elektu ĝeneralajn agordojn
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafiko
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Elektu agordojn pri grafiko
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Elektu agordojn pri grafiko
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sono
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Elektu agordojn pri sono kaj muziko
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Elektu agordojn pri sono kaj muziko
 
 STR_GAME_OPTIONS_VOLUME                                         :Laŭteco
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sonefektoj
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muziko
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Monunuoj
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elekto de monunuoj
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Monunuoj
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Elekto de monunuoj
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1073,8 +1073,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajzia ringit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvaj Latoj
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalaj Eskudoj
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Aŭtomata konservado
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Elektu intervalon inter aŭtomataj konservadoj de la ludo
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Aŭtomata konservado
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Elektu intervalon inter aŭtomataj konservadoj de la ludo
 
 # Autosave dropdown
 ###length 5
@@ -1084,67 +1084,67 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Ĉiujn 30 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Ĉiujn 60 minutojn
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Ĉiujn 120 minutojn
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingvo
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Elektu uzotan interfacan lingvon
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingvo
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Elektu uzotan interfacan lingvon
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% kompleta)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Plena ekrano
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Ŝaltu ĉi tiun kvadrateton por plenekrane ludi OpenTTD
+STR_GAME_OPTIONS_FULLSCREEN                                     :Plena ekrano
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Ŝaltu ĉi tiun kvadrateton por plenekrane ludi OpenTTD
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrana montrogrando
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Elektu uzotan ekranan montrograndon
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekrana montrogrando
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Elektu uzotan ekranan montrograndon
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :alia
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aparatara plirapidigo
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Elektu tiun ĉi agordon por ke OpenTTD klopodu uzi aparataran akceladon. Se vi ŝanĝas tiun ĉi agordon, la nova agordo validos nur ekde restartigo de la ludo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aparatara plirapidigo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Elektu tiun ĉi agordon por ke OpenTTD klopodu uzi aparataran akceladon. Se vi ŝanĝas tiun ĉi agordon, la nova agordo validos nur ekde restartigo de la ludo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Tiu ĉi agordo ekefikos nur post restartigo de la ludo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Vertikala sinkronigo
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Vertikala sinkronigo
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nuna pelilo: {STRING}
-
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interfacgrandeco
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Aŭtomate rekonu grandecon
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Ŝaltu ĉi tiun kvadrateton por aŭtomate detekti grandecon de la interfaco
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Nuna pelilo: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Uzu tradician bildetan tiparon
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Ŝaltu ĉi tiun kvadrateton se vi preferas uzi la tradician fiksgrandecan bildetan tiparon.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Glatigu tiparojn
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Ŝaltu ĉi tiun kvadrateton por glatigi aligrandigeblajn tiparojn
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interfacgrandeco
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Aŭtomate rekonu grandecon
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Ŝaltu ĉi tiun kvadrateton por aŭtomate detekti grandecon de la interfaco
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Aŭtomata sondado
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Partopreni aŭtomatan sondadon
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kiam tiu ĉi agordo estas aktiva, OpenTTD sendos sondaĵon je forlaso de ludo
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Pri sondado kaj privateco
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Tio ĉi malfermos retumilon kun pli da informoj pri la aŭtomata sondado
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Antaŭmontru sondaĵrezulton
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Montru la sondaĵrezulton de la kuranta ludo
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Uzu tradician bildetan tiparon
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Ŝaltu ĉi tiun kvadrateton se vi preferas uzi la tradician fiksgrandecan bildetan tiparon.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Glatigu tiparojn
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Ŝaltu ĉi tiun kvadrateton por glatigi aligrandigeblajn tiparojn
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafiko
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Montru aktualigoftecon
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Elektu ekranan aktualigoftecon
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Aŭtomata sondado
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Partopreni aŭtomatan sondadon
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Kiam tiu ĉi agordo estas aktiva, OpenTTD sendos sondaĵon je forlaso de ludo
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Pri sondado kaj privateco
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Tio ĉi malfermos retumilon kun pli da informoj pri la aŭtomata sondado
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Antaŭmontru sondaĵrezulton
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Montru la sondaĵrezulton de la kuranta ludo
+
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Montru aktualigoftecon
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Elektu ekranan aktualigoftecon
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Aktualigoftecoj pli altaj ol 60Hz povas kaŭzi malrapidiĝon.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Baza grafikaro
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektu la uzotan bazan grafikaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Aldonaj informoj pri la baza grafikaro
+STR_GAME_OPTIONS_BASE_GRF                                       :Baza grafikaro
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selektu la uzotan bazan grafikaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Aldonaj informoj pri la baza grafikaro
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Baza sonaro
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Elektu la uzotan bazan sonaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Aldonaj informoj pri la baza sonaro
+STR_GAME_OPTIONS_BASE_SFX                                       :Baza sonaro
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Elektu la uzotan bazan sonaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Aldonaj informoj pri la baza sonaro
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Baza muzikaro.
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Elekti bazan muzikaron por uzi.
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Pluaj informoj pri la baza muzikaro.
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Baza muzikaro.
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Elekti bazan muzikaron por uzi.
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Pluaj informoj pri la baza muzikaro.
 
 
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stato de la kromprogramo:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stato de la kromprogramo:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}Duplikata kromprogramo
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_INVALID_SIGNATURE          :{RED}Malvalida subskribo
@@ -1249,13 +1249,12 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permesema (ne e
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Neniu taŭga AI estas disponebla...{}Kelkaj AI-oj estas elŝuteblaj per la sistemo 'Enreta Enhavo'.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Agordoj
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrilo:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Etendu ĉion
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Maletendu ĉiujn
-STR_CONFIG_SETTING_COLLAPSE_ALL.n                               :{BLACK}Collapse all
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restarigu ĉiujn valorojn
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrilo:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Etendu ĉion
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Maletendu ĉiujn
+STR_CONFIG_SETTING_COLLAPSE_ALL.n                               :Collapse all
+STR_CONFIG_SETTING_RESET_ALL                                    :Restarigu ĉiujn valorojn
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(neniu ekspliko disponeble)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Defaŭlta valoro: {ORANGE}{STRING}
@@ -1268,9 +1267,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Kompania agordo
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Atentu!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tiu ĉi ago reagordos ĉiujn agordojn al la defaŭltaj valoroj.{}Ĉu vi certas ke vi volas daŭrigi?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorio:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limigas la liston per antaŭdifinitaj filtroj
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorio:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limigas la liston per antaŭdifinitaj filtroj
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bazniveloj agordoj
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Altnivelaj agordoj
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Altnivelaj agordoj / ĉiu agordoj
@@ -1287,9 +1286,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Kompaniaj agord
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Neniu -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}{BLACK}kaj {SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}{BLACK}kaj {SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Malaktiva
@@ -2154,7 +2153,6 @@ STR_VIDEO_DRIVER_ERROR                                          :{WHITE}Eraro pr
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... ne troveblis kongrua grafika procesoro. Malŝaltis aparataran plirapidigon
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Novan ludon
 STR_INTRO_LOAD_GAME                                             :{BLACK}Ŝarĝu ludon
@@ -2165,11 +2163,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Pluraj L
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Ludaj agordoj
 STR_INTRO_HIGHSCORE                                             :{BLACK}Altpoentara tabelo
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Agordoj
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Agordoj de NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Kontroli ĉeretajn aldonaĵojn
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI-agordoj
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Ludoskriptaj agordoj
 STR_INTRO_QUIT                                                  :{BLACK}Forlasi
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Starti novan ludon. Stir-Klak por preterpasi mapan agordon.
@@ -2186,11 +2180,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Elektu '
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Montri ludajn agordojn
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Malfermu altpoentaran tabelon
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Montru agordojn
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Montri NewGRF-agordojn
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Serĉi pri nova kaj ĝisdatigita enhavo por elŝuti
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Montru AI-agordojn
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Montru ludoskriptajn agordojn
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Fermu 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}En la elektita baza grafikaro mankas {NUM} bildeto{P "" j}. Bonvolu kontrolu ĉu estas ĝisdatigoj por la bazaj datumoj.
@@ -2961,6 +2951,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Elektu u
 STR_FOUND_TOWN_CITY                                             :{BLACK}Urbo
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbegoj kreskas pli rapide ol kutimaj urboj{}Depende de agordoj, ili pli grandas je fondiĝo
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Urba strataranĝo:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selektu strataranĝon uzendan por ĉi tiu urbo
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originale
@@ -3379,13 +3370,10 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Malkongrua
 
 # NewGRF save preset window
 STR_SAVE_PRESET_CAPTION                                         :{WHITE}Konservu antaŭagordon
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Nuligu
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ne ŝanĝu la antaŭagordon
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Konservu
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Ŝanĝu parametroj de la NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Fermu
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reigu
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Kondiĉu ĉiujn parametrojn al ilia norma valoro
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametro {NUM}
@@ -4555,7 +4543,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horaro -
 STR_TIMETABLE_NO_TRAVEL                                         :Neniu veturo
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Veturu (aŭtomata; horara ĝis sekvanta mana ordono)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Veturo (ne horarita)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Veturu (sen horaro) je maksimume {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Veturu dum {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Veturu dum {STRING} je maksimume {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Veturu (dum {STRING}, sen horaro)
@@ -4676,8 +4663,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Akcepti
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Elekti emfazita skripto
-STR_AI_LIST_CANCEL                                              :{BLACK}Nuligi
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne ŝanĝu AI-on
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Faru ekrankapton
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normala ekrankapto
@@ -4690,7 +4675,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Ekrankap
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Ludoskripto
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fermi
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reŝargo
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 1ed2b4cf68..f848235dad 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -498,7 +498,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Välju
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Mängu seadistus
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Seaded
 STR_SETTINGS_MENU_AI_SETTINGS                                   :TI seaded
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :GameScript'i seaded
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-i seadistus
@@ -1001,22 +1000,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Vaateala
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Liidese seadistus
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Üldine
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Vali üldised seaded
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Vali üldised seaded
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Vali graafika seaded
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Vali graafika seaded
 STR_GAME_OPTIONS_TAB_SOUND                                      :Heli
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Vali heli ja muusika seaded
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Vali heli ja muusika seaded
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sotsiaal
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Vali sotsiaalse integratsiooni seaded
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Vali sotsiaalse integratsiooni seaded
 
 STR_GAME_OPTIONS_VOLUME                                         :Helitase
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Heliefektid
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muusika
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuuta valimine
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valuuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valuuta valimine
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1066,8 +1066,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaisia ringit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Läti Latt
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugali eskuudo
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvestusvälp
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vali salvestamise välp
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Salvestusvälp
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vali salvestamise välp
 
 # Autosave dropdown
 ###length 5
@@ -1077,75 +1077,75 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Iga 30. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Iga 60. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Iga 120. minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Keel
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Valib kasutajaliideses kasutatava keele
+STR_GAME_OPTIONS_LANGUAGE                                       :Keel
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Valib kasutajaliideses kasutatava keele
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% valmis)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Täisekraan
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Märgi see kast, et OpenTTD täisekraanirežiimis mängida
+STR_GAME_OPTIONS_FULLSCREEN                                     :Täisekraan
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Märgi see kast, et OpenTTD täisekraanirežiimis mängida
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekraanilahutus
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Ekraanilahutuse valimine
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekraanilahutus
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Ekraanilahutuse valimine
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :muu
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Riistvarakiirendus
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Märkides selle ruudu, lubad OpenTTD-l üritada kasutada riistvarakiirendust. Muudetud seade omab mõju pärast mängu taaskäivitust
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Riistvarakiirendus
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Märkides selle ruudu, lubad OpenTTD-l üritada kasutada riistvarakiirendust. Muudetud seade omab mõju pärast mängu taaskäivitust
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Seade omab mõju alles pärast mängu taaskäivitust
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Märgi, et ekraani v-sync sisse lülitada. Seade kohaldub alles pärast mängu taaskäivitust. Töötab vaid, kui riistvarakiirendus on peal
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Märgi, et ekraani v-sync sisse lülitada. Seade kohaldub alles pärast mängu taaskäivitust. Töötab vaid, kui riistvarakiirendus on peal
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Hetke draiver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Hetke draiver: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Liidese suurus
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Lohista liugurit liidesesuuruse seadmiseks. Ctrl+lohistamisel pidevkohendamine
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Tuvasta automaatselt suurus
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Märgi see kast, et tuvastada liidese suurus automaatselt
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skaleeri kaldeid
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Skaleeri kaldeid liidese suuruse järgi
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Liidese suurus
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Lohista liugurit liidesesuuruse seadmiseks. Ctrl+lohistamisel pidevkohendamine
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Tuvasta automaatselt suurus
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Märgi see kast, et tuvastada liidese suurus automaatselt
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Kasuta traditsioonilist märgipõhist fonti
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Märgi, kui eelistad traditsioonilist kindla suurusega märgipõhist fonti
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fondid
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Kasti märkimisel tehakse muudetava suurusega fontidele anti-alias
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skaleeri kaldeid
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Skaleeri kaldeid liidese suuruse järgi
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Kasuta traditsioonilist märgipõhist fonti
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Märgi, kui eelistad traditsioonilist kindla suurusega märgipõhist fonti
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fondid
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Kasti märkimisel tehakse muudetava suurusega fontidele anti-alias
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automaatne uuring
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Osale automaatses uuringus
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kui võimaldatud, saadab OpenTTD uuringu mängu sulgemisel
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Uuringust ja privaatsusest
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}See avab brauseriakna, kus on lisateave automaatsest uuringust
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Uuringutulemuste eelvaade
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Näita käimasoleva mängu uuringutulemusi
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automaatne uuring
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Osale automaatses uuringus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Kui võimaldatud, saadab OpenTTD uuringu mängu sulgemisel
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Uuringust ja privaatsusest
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :See avab brauseriakna, kus on lisateave automaatsest uuringust
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Uuringutulemuste eelvaade
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Näita käimasoleva mängu uuringutulemusi
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Graafika
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ekraani värskendussagedus
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Vali, mis värskendussagedust kasutada
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ekraani värskendussagedus
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Vali, mis värskendussagedust kasutada
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Värskendussagedused üle 60Hz võivad jõudlusele löögi anda.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Põhigraafika komplekt
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vali kasutatav põhigraafika komplekt (mängus ei saa muuta, ainult peamenüüst)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Lisateave põhigraafika komplekti kohta
+STR_GAME_OPTIONS_BASE_GRF                                       :Põhigraafika komplekt
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vali kasutatav põhigraafika komplekt (mängus ei saa muuta, ainult peamenüüst)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Lisateave põhigraafika komplekti kohta
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Põhihelide komplekt
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vali põhihelide komplekt (mängus ei saa muuta, ainult peamenüüst)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Lisateave põhihelide komplekti kohta
+STR_GAME_OPTIONS_BASE_SFX                                       :Põhihelide komplekt
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vali põhihelide komplekt (mängus ei saa muuta, ainult peamenüüst)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Lisateave põhihelide komplekti kohta
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Põhimuusika komplekt
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Valib kasutatava põhimuusika komplekti
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Rohkem teavet põhimuusika komplekti kohta
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Põhimuusika komplekt
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Valib kasutatava põhimuusika komplekti
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Rohkem teavet põhimuusika komplekti kohta
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(puuduvad pistikprogrammid sotsiaalplatvormidega integreerumiseks)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platvorm:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Pistikprogrammi olek:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platvorm:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Pistikprogrammi olek:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Töötab
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Alglaadimine ebaõnnestus
@@ -1258,12 +1258,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Lubav (ei oma m
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Sobiv AI puudub...{}Mitmesuguseid AI-sid saab alla laadida 'aineste allalaadimise' kaudu
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Seaded
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Märksõna:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Ava kõik
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sulge kõik
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Nulli kõik väärtused
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Märksõna:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Ava kõik
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Sulge kõik
+STR_CONFIG_SETTING_RESET_ALL                                    :Nulli kõik väärtused
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(seletus puudub)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Vaikeväärtus: {ORANGE}{STRING}
@@ -1276,9 +1275,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Ettevõtte sead
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Ettevaatust!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}See toiming nullib kõik mänguseaded.{}Oled sa kindel, et jätkata?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Jagu:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Liik:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Piirab varem tehtud filtridega alljärgnevat loendit
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Jagu:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Liik:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Piirab varem tehtud filtridega alljärgnevat loendit
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Põhilised (kuva vaid tähtsad seaded)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Täpsustatud (näita enamikke seadeid)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Asjatundja (näita kõiki seaded, s.h. ebatavalisi)
@@ -1295,9 +1294,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firma seaded (h
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Puudub -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Kõiki otsingu tulemusi näeb, kui{}{SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING} {BLACK}ja {SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Kõiki otsingu tulemusi näeb, kui{}{SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING} {BLACK}ja {SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Väljas
@@ -2222,7 +2221,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... ei l
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Mäng seiskus graafikadraiveri pärast. Riistvarakiirendus lülitati välja
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Uus mäng
 STR_INTRO_LOAD_GAME                                             :{BLACK}Mängu jätk
@@ -2234,11 +2232,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Mitmikm
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Liidese seadistus
 STR_INTRO_HIGHSCORE                                             :{BLACK}Edetabel
 STR_INTRO_HELP                                                  :{BLACK}Abi & kasutusjuhendid
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Seaded
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-i seadistus
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Aineste allalaadimine
-STR_INTRO_AI_SETTINGS                                           :{BLACK}TI Seaded
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}GameScript'i seaded
 STR_INTRO_QUIT                                                  :{BLACK}Välju
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Alusta uut mängu. Ctrl+klõps jätab kaardi seadistamise vahele
@@ -2256,11 +2250,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Vali 'm
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Ava liidese seadus
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Ava edetabel
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Saa ligipääs dokumentatsioonile ja veebiressursidele
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Ava seaded
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Ava NewGRF-i seadistus
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Otsi allalaadimiseks uusi ja uuendatud aineseid
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Ava TI-seaded
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Ava GameScript'i seaded
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Välju 'OpenTTD'st
 
 STR_INTRO_BASESET                                               :{BLACK}Hetkel valitud põhigraafika komplektist puudub {NUM} sprite{P "" 'i}. Kontrolli, kas põhikomplektile on uuendusi.
@@ -3073,6 +3063,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vali asu
 STR_FOUND_TOWN_CITY                                             :{BLACK}Linn
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Linnad kasvavad kiiremini, kui tavalised asulad{}Sõltuvalt seadetest on need ka alguses suuremad
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Asula teeplaneering
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vali selle asula teeplaneering
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Algne
@@ -3510,15 +3501,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Salvesta
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Võimalike eeltöötluste nimekiri, vali üks et see kopeerida allpool asuvasse salvestuse nimesse
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Sisesta eelseadistuse nimi
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Hetkel eelseadistusele valitud nimi
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Tühista
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ära muuda eelseadistust
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Salvesta
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Salvesta eelseadistus praegusele valitud nimele
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Muuda põhigraafika komplekti parameetreid
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Muuda NewGRF parameetreid
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Sulge
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Nulli
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Säti kõikidele parameetritele vaikeväärtused
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameeter {NUM}
@@ -4737,7 +4725,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Graafik
 STR_TIMETABLE_NO_TRAVEL                                         :Sõitu pole
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Reisi (automaatne; ajakava järgmise manuaalse käsu järgi)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Sõitmine (graafikuta)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reisi kõike suurema {2:VELOCITY} (ei ole ajastatud)
 STR_TIMETABLE_TRAVEL_FOR                                        :Sõida {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reisi selleks {STRING} kõige rohkema {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Sõit ({STRING}, ei ole ajastatud)
@@ -4862,8 +4849,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Nõustu
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vali esiletõstetud skript
-STR_AI_LIST_CANCEL                                              :{BLACK}Loobu
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ära skripti muuda
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Tee ekraanipilt
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Tavaline ekraanipilt
@@ -4876,7 +4861,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Pisikaar
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :GameScript
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sulge
 STR_AI_SETTINGS_RESET                                           :{BLACK}Nulli
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt
index 9b80134a30..b0f87c268b 100644
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -822,8 +822,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spæli m
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Gjaldsoyra eindir
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Úrval av gjaldsoyra eindum
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Gjaldsoyra eindir
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Úrval av gjaldsoyra eindum
 
 
 ###length 45
@@ -862,21 +863,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Sjálvgjørt...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiskur Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranskur Rial
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Sjálvgoymsla
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vel títtleika av sjálvgoymslu
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Sjálvgoymsla
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vel títtleika av sjálvgoymslu
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Sløkt
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Mál
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vel mál at nýta í takførisflatu
+STR_GAME_OPTIONS_LANGUAGE                                       :Mál
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Vel mál at nýta í takførisflatu
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullan skerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marka hendan kassan fyri at spæla OpenTTD í fullum skermi
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullan skerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marka hendan kassan fyri at spæla OpenTTD í fullum skermi
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skerm upploysn
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vel hvørja skermupploysn tú vil brúka
+STR_GAME_OPTIONS_RESOLUTION                                     :Skerm upploysn
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Vel hvørja skermupploysn tú vil brúka
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
@@ -889,17 +890,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base grafikk sett
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vel ta base grafikk setti tú vil brúka
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Meira kunning um base grafikk setti
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base ljóð sett
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vel ta base ljóð setti tú vil brúka
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Meira kunning um base ljóð setti
+STR_GAME_OPTIONS_BASE_GRF                                       :Base grafikk sett
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vel ta base grafikk setti tú vil brúka
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Meira kunning um base grafikk setti
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base tónleika sett
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vel ta base tónleika setti tú vil brúka
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Meira kunning um base tónleika setti
+STR_GAME_OPTIONS_BASE_SFX                                       :Base ljóð sett
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vel ta base ljóð setti tú vil brúka
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Meira kunning um base ljóð setti
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base tónleika sett
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vel ta base tónleika setti tú vil brúka
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Meira kunning um base tónleika setti
 
 
 
@@ -1000,10 +1002,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Eftirgevandi
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Einki hóskandi AI til taks...{}Tú kann heinta niður fleiri ymisk AI gjøgnum 'Online tilfar' kervi
 
-# Settings tree window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtur strongur:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Víðka alt
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Toga alt saman
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtur strongur:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Víðka alt
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Toga alt saman
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(eingin frágreiðing tøk)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Vanligt virði: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Slag av instilling: {ORANGE}{STRING}
@@ -1013,7 +1015,7 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Goymslu instill
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Fyritøku instilling (goymt í goymslufílum; ávirkar einans nýggj spøl)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Fyritøku instilling (goymt í goymslufílum; ávirkar einans núverðandi fyritøku)
 
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Avmarkar listan niðanfyr so hann einans vísur broyttar instillingar
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Avmarkar listan niðanfyr so hann einans vísur broyttar instillingar
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grund innstillingar
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Víðkaðir innstillingar
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Serfrøðinga innstillingar / allir innstillingar
@@ -1694,7 +1696,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Leitan e
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nýtt spæl
 STR_INTRO_LOAD_GAME                                             :{BLACK}Heinta spæl
@@ -1705,7 +1706,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Hópspæ
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spæli møguleikar
 STR_INTRO_HIGHSCORE                                             :{BLACK}Hástigs yvirlit
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF innstillingar
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Kanna online tilfar
 STR_INTRO_QUIT                                                  :{BLACK}Gevst
 
@@ -1723,7 +1723,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Vel 'toy
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Vís spæli møguleikar
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Vís hástigs yvirlit
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Vís NewGRF innstillingar
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Kanna um nýtt og betra tilfar er klárt at heinta niður
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Gevst at spæla 'OpenTTD'
 
@@ -2306,6 +2305,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vel stø
 STR_FOUND_TOWN_CITY                                             :{BLACK}Býur
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Býir vaksa skjótari enn vanligar bygdir{}Treyta av innstillingum, eru teir størri tá teir verða stovnaðir
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Bygda vegakervi:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vel hvat vegakervi skal nýtast í hesi bygdini
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Upprunaligt
@@ -2629,7 +2629,6 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Samsvarar
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Broyt NewGRF parametur
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Lat aftur
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Endustilla
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Áset øll parametur til teirra vanligu virði
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametur {NUM}
@@ -3600,13 +3599,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Góðtak
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vel undirstrikaða scripti
-STR_AI_LIST_CANCEL                                              :{BLACK}Angra
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ikki broyta scripti
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Lat aftur
 STR_AI_SETTINGS_RESET                                           :{BLACK}Endurstilla
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index c1b241407a..d4b9c34b46 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Sulje ik
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Ikkunan otsake – siirrä ikkunaa vetämällä tästä
 STR_TOOLTIP_SHADE                                               :{BLACK}Pienennä ikkuna – näytä vain otsikko
 STR_TOOLTIP_DEBUG                                               :{BLACK}Näytä NewGRF-vianmääritystiedot
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Palauta ikkunan oletuskoko. Ctrl+napsautus tallentaa nykyisen koon oletukseksi.
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Palauta ikkuna oletuskokoon. Ctrl+napsautus tallentaa nykyisen koon oletukseksi. Ctrl+kaksoisnapautus asettaa oletuskoon alkutilaan
 STR_TOOLTIP_STICKY                                              :{BLACK}Aseta ikkuna säilymään ”Sulje kaikki ikkunat” -napista huolimatta. Ctrl+napsautus tallentaa tilan oletukseksi.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Suurenna/pienennä ikkuna
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Sijoita taloja
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pelin valinnat
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Asetukset
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Tekoälyasetukset
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Peliskriptiasetukset
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-asetukset
@@ -579,32 +578,32 @@ STR_DAY_NUMBER_30TH                                             :30.
 STR_DAY_NUMBER_31ST                                             :31.
 
 ###length 12
-STR_MONTH_ABBREV_JAN                                            :{NBSP}1.
-STR_MONTH_ABBREV_FEB                                            :{NBSP}2.
-STR_MONTH_ABBREV_MAR                                            :{NBSP}3.
-STR_MONTH_ABBREV_APR                                            :{NBSP}4.
-STR_MONTH_ABBREV_MAY                                            :{NBSP}5.
-STR_MONTH_ABBREV_JUN                                            :{NBSP}6.
-STR_MONTH_ABBREV_JUL                                            :{NBSP}7.
-STR_MONTH_ABBREV_AUG                                            :{NBSP}8.
-STR_MONTH_ABBREV_SEP                                            :{NBSP}9.
+STR_MONTH_ABBREV_JAN                                            :1.
+STR_MONTH_ABBREV_FEB                                            :2.
+STR_MONTH_ABBREV_MAR                                            :3.
+STR_MONTH_ABBREV_APR                                            :4.
+STR_MONTH_ABBREV_MAY                                            :5.
+STR_MONTH_ABBREV_JUN                                            :6.
+STR_MONTH_ABBREV_JUL                                            :7.
+STR_MONTH_ABBREV_AUG                                            :8.
+STR_MONTH_ABBREV_SEP                                            :9.
 STR_MONTH_ABBREV_OCT                                            :10.
 STR_MONTH_ABBREV_NOV                                            :11.
 STR_MONTH_ABBREV_DEC                                            :12.
 
 ###length 12
-STR_MONTH_JAN                                                   :Tammikuu
-STR_MONTH_FEB                                                   :Helmikuu
-STR_MONTH_MAR                                                   :Maaliskuu
-STR_MONTH_APR                                                   :Huhtikuu
-STR_MONTH_MAY                                                   :Toukokuu
-STR_MONTH_JUN                                                   :Kesäkuu
-STR_MONTH_JUL                                                   :Heinäkuu
-STR_MONTH_AUG                                                   :Elokuu
-STR_MONTH_SEP                                                   :Syyskuu
-STR_MONTH_OCT                                                   :Lokakuu
-STR_MONTH_NOV                                                   :Marraskuu
-STR_MONTH_DEC                                                   :Joulukuu
+STR_MONTH_JAN                                                   :tammikuu
+STR_MONTH_FEB                                                   :helmikuu
+STR_MONTH_MAR                                                   :maaliskuu
+STR_MONTH_APR                                                   :huhtikuu
+STR_MONTH_MAY                                                   :toukokuu
+STR_MONTH_JUN                                                   :kesäkuu
+STR_MONTH_JUL                                                   :heinäkuu
+STR_MONTH_AUG                                                   :elokuu
+STR_MONTH_SEP                                                   :syyskuu
+STR_MONTH_OCT                                                   :lokakuu
+STR_MONTH_NOV                                                   :marraskuu
+STR_MONTH_DEC                                                   :joulukuu
 
 # Graph window
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Selite
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Siirrä
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pelin valinnat
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Yleiset
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Valitse yleisasetukset
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Valitse yleisasetukset
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafiikka
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Valitse grafiikka-asetukset
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Valitse grafiikka-asetukset
 STR_GAME_OPTIONS_TAB_SOUND                                      :Ääni
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Valitse ääni- ja musiikkiasetukset
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Valitse ääni- ja musiikkiasetukset
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sosiaaliset
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Valitse sosiaalisen integraation asetukset
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Valitse sosiaalisen integraation asetukset
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Edistyneet
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Muuta lisäasetuksia
 
 STR_GAME_OPTIONS_VOLUME                                         :Äänenvoimakkuus
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Äänitehosteet
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musiikki
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}{NBSP}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Rahayksikkö
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Rahayksikön valinta
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Rahayksiköt
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Rahayksiköiden valinta
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvian lati
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalin escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainan hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automaattitallennus
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Valitse aikaväli automaattisille pelitallennuksille
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automaattitallennus
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Valitse automaattisten pelitallennusten välinen aika
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :30 minuutin vä
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :60 minuutin välein
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :120 minuutin välein
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Kieli
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Valitse käyttöliittymän kieli
+STR_GAME_OPTIONS_LANGUAGE                                       :Kieli
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Valitse käyttöliittymän kieli
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}{NBSP}% valmiina)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Koko näyttö
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Valitse tämä pelataksesi kokoruututilassa
+STR_GAME_OPTIONS_FULLSCREEN                                     :Koko näyttö
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Valitse tämä pelataksesi OpenTTD:tä koko ruudun tilassa
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Näytön tarkkuus
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Valitse käytettävä näytön tarkkuus
+STR_GAME_OPTIONS_RESOLUTION                                     :Näytön tarkkuus
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Valitse käytettävä näytön tarkkuus
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :muu
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}×{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Laitteistokiihdytys
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Valitse tämä, jos haluat, että OpenTTD yrittää käyttää laitteistokiihdytystä. Muutettu asetus tulee voimaan vasta pelin uudelleenkäynnistyksen jälkeen.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Laitteistokiihdytys
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Valitse tämä, jos haluat, että OpenTTD yrittää käyttää laitteistokiihdytystä. Muutettu asetus tulee voimaan vasta pelin uudelleenkäynnistyksen jälkeen
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Asetus tulee voimaan vasta pelin uudelleenkäynnistyksen jälkeen
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Pystytahdistus
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Valitse tämä ottaaksesi käyttöön näytön pystytahdistuksen. Muutettu asetus tulee voimaan vasta pelin uudelleenkäynnistyksen jälkeen. Edellyttää, että laitteistokiihdytys on käytössä.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Pystytahdistus
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Valitse tämä ottaaksesi käyttöön näytön pystytahdistuksen. Muutettu asetus tulee voimaan vasta pelin uudelleenkäynnistyksen jälkeen. Edellyttää, että laitteistokiihdytys on käytössä
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nykyinen ajuri: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Nykyinen ajuri: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Käyttöliittymän koko
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Vedä liukusäädintä asettaaksesi käyttöliittymän koon. Pidä Ctrl-näppäintä painettuna säätääksesi portaattomasti
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Tunnista koko automaattisesti
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Valitse tämä ruutu käyttöliittymän koon tunnistamiseksi automaattisesti
+STR_GAME_OPTIONS_INTERFACE                                      :Käyttöliittymä
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skaalaa viisteet
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Valitse tämä ruutu reunusten skaalaamiseksi käyttöliittymän koon mukaan
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Käyttöliittymän koko
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Vedä liukusäädintä asettaaksesi käyttöliittymän koon. Pidä Ctrl-näppäintä painettuna säätääksesi portaattomasti
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Tunnista koko automaattisesti
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Valitse tämä ruutu käyttöliittymän koon tunnistamiseksi automaattisesti
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Käytä perinteistä sprite-fonttia
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Valitse tämä ruutu käyttääksesi perinteistä kiinteäkokoista sprite-kirjasintyyppiä
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Pehmennä kirjasinten reunoja
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Valitse tämä ruutu pehmentääksesi muuttuvan kokoisten fonttien reunoja
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skaalaa viisteet
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Valitse tämä ruutu viisteiden skaalaamiseksi käyttöliittymän koon mukaan
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Käytä perinteistä sprite-fonttia
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Valitse tämä ruutu käyttääksesi perinteistä kiinteäkokoista sprite-kirjasintyyppiä
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Pehmennä kirjasinten reunoja
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Valitse tämä ruutu pehmentääksesi muuttuvan kokoisten fonttien reunoja
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}×
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatisoitu tutkimus
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Osallistu automatisoituun tutkimukseen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Mikäli käytössä, OpenTTD lähettää tilastointitietoja pelistä poistuttaessa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Tutkimuksesta ja yksityisyydestä
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Avaa selaimen, jossa lisätietoja automatisoidusta tutkimuksesta
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Esikatsele tutkimustulosta
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Näytä meneillään olevan pelin tutkimustulos
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatisoitu tutkimus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Osallistu automatisoituun tutkimukseen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Mikäli käytössä, OpenTTD lähettää tilastointitietoja pelistä poistuttaessa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Tutkimuksesta ja yksityisyydestä
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Avaa selaimen, missä lisätietoja automatisoidusta tutkimuksesta
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Esikatsele tutkimustulosta
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Näytä meneillään olevan pelin tutkimustulos
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafiikka
+STR_GAME_OPTIONS_DISPLAY                                        :Näyttö
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Näytön virkistystaajuus
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Valitse käytettävä näytönvirkistystaajuus
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Näytön virkistystaajuus
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Valitse käytettävä näytönvirkistystaajuus
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM} Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Yli 60 Hz:n virkistystaajuudet saattavat vaikuttaa suorituskykyyn.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Perusgrafiikat
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Valitse käytettävät perusgrafiikat (ei vaihdettavissa pelin aikana, ainoastaan päävalikosta)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Lisätietoja perusgrafiikoista
+STR_GAME_OPTIONS_BASE_GRF                                       :Perusgrafiikkakokoelma
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Valitse käytettävä perusgrafiikkakokoelma (ei vaihdettavissa pelin aikana, ainoastaan päävalikosta)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Lisätietoja perusgrafiikkakokoelmasta
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Perusäänet
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Valitse käytettävät perusäänet (ei vaihdettavissa pelin aikana, ainoastaan päävalikosta)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Lisätietoja perusäänistä
+STR_GAME_OPTIONS_BASE_SFX                                       :Perusäänikokoelma
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Valitse käytettävä perusäänikokoelma (ei vaihdettavissa pelin aikana, ainoastaan päävalikosta)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Lisätietoja perusäänikokoelmasta
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Musiikkipaketti
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Valitse käytettävä musiikkipaketti
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Lisätietoja musiikkipaketista
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Musiikkipaketti
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Valitse käytettävä musiikkipaketti
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Lisätietoja musiikkipaketista
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Hae sisältöä
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Tarkista, onko ladattavissa uutta tai päivitettyä sisältöä
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(ei sosiaalisten alustojen integroinnin liitännäisiä asennettuna)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(ei sosiaalisten alustojen integroinnin liitännäisiä asennettuna)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Alusta:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Liitännäisen tila:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Alusta:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Liitännäisen tila:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Käynnissä
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Alustus epäonnistui
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Salliva (ei vai
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ei soveltuvia tekoälyjä saatavilla…{}{}Voit ladata tekoälyjä online-sisältöpalvelun kautta
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Asetukset
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Suodatin:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Avaa kaikki
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sulje kaikki
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Palauta oletukset
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Suodatin:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Laajenna kaikki
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Tiivistä kaikki
+STR_CONFIG_SETTING_RESET_ALL                                    :Palauta oletukset
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(selitystä ei saatavilla)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Oletusarvo: {ORANGE}{STRING}
@@ -1237,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Yhtiön asetus
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Varoitus!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tämä toiminto palauttaa pelin kaikki asetukset oletusarvoihinsa.{}Haluatko varmasti jatkaa?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tyyppi:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Rajaa alla olevaa listaa ennalta määritellyillä suodattimilla
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tyyppi:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Rajaa alla olevaa listaa ennalta määritellyillä suodattimilla
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Perus (näytä vain tärkeät asetukset)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Kehittynyt (näytä useimmat asetukset)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Edistynyt (näytä kaikki asetukset, oudotkin)
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Yhtiön asetuks
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ei mitään -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Näytä kaikki tulokset muuttamalla{}{SILVER}kategoriaksi {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Näytä kaikki hakutulokset muuttamalla{}{SILVER}Tyypiksi {WHITE}Kaikki asetustyypit
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Näytä kaikki tulokset muuttamalla{}{SILVER}kategoriaksi {WHITE}{STRING} {BLACK}ja {SILVER}tyypiksi {WHITE}kaikki asetustyypit
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Näytä kaikki tulokset muuttamalla{}PUSH_COLOUR}{SILVER}kategoriaksi {POP_COLOUR}{WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Näytä kaikki hakutulokset muuttamalla{}{PUSH_COLOUR}{SILVER}tyypiksi {POP_COLOUR}{WHITE}kaikki asetustyypit
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Näytä kaikki tulokset muuttamalla{}{PUSH_COLOUR}{SILVER}kategoriaksi {POP_COLOUR}{PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}ja {PUSH_COLOUR}{SILVER}tyypiksi {POP_COLOUR}{WHITE}kaikki asetustyypit
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :pois
@@ -2175,7 +2179,7 @@ STR_CONFIG_ERROR_INVALID_GRF                                    :{WHITE}... jät
 STR_CONFIG_ERROR_INVALID_GRF_NOT_FOUND                          :ei löydetty
 STR_CONFIG_ERROR_INVALID_GRF_UNSAFE                             :ei turvallinen staattiseen käyttöön
 STR_CONFIG_ERROR_INVALID_GRF_SYSTEM                             :järjestelmä-NewGRF
-STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :epäyhteensopiva tämän OpenTTD-version kanssa
+STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :yhteensopimaton OpenTTD:n tämän version kanssa
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :tuntematon
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... pakkaustaso ”{STRING}” on kelvoton
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... pelitallennemuoto ”{STRING}” ei ole saatavilla. Palataan muotoon ”{STRING}”
@@ -2191,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}… yhte
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}… Näytönohjaimen ajuri kaatoi pelin. Laitteistokiihdytys on poistettu käytöstä
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Uusi peli
 STR_INTRO_LOAD_GAME                                             :{BLACK}Lataa peli
@@ -2203,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Moninpel
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Pelin valinnat
 STR_INTRO_HIGHSCORE                                             :{BLACK}Pistetaulukko
 STR_INTRO_HELP                                                  :{BLACK}Ohjeet ja oppaat
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Asetukset
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-asetukset
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online-sisältö
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Tekoälyasetukset
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Peliskriptiasetukset
 STR_INTRO_QUIT                                                  :{BLACK}Poistu
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Aloita uusi peli. Ctrl+napsautus ohittaa kartan asetusten valinnan.
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Valitse
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Avaa pelin valinnat
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Avaa pistetaulukko
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Tutustu dokumentaatioon ja online-resursseihin
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Avaa asetukset
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Avaa NewGRF-asetukset
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tarkista, onko ladattavissa uutta tai päivitettyä sisältöä
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Avaa tekoälyasetukset
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Avaa peliskriptiasetukset
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Lopeta OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}Valitusta perusgrafiikkapaketista puuttuu {NUM} sprite{P "" ä}. Tarkista, onko sille päivityksiä.
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Valitse
 STR_FOUND_TOWN_CITY                                             :{BLACK}Kaupunki
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Kaupungit kasvavat nopeammin kuin tavalliset kunnat{}Asetuksista riippuen, ne ovat suurempia perustettaessa
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Kuntien laajentaminen:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Rakennukset
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Kasvata rakennusten määrää kunnissa
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Tiet
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Kasvata teiden määrää kunnissa
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Kunnan tiekaava:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Valitse tiekaava tälle kunnalle
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Alkuperäinen
@@ -3518,22 +3521,19 @@ STR_NEWGRF_SETTINGS_PARAMETER_NONE                              :Ei mitään
 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ei tietoa
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Sopivaa tiedostoa ei löydy
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Ei käytössä
-STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Epäyhteensopiva tämän OpenTTD-version kanssa
+STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Yhteensopimaton OpenTTD:n tämän version kanssa
 
 # NewGRF save preset window
 STR_SAVE_PRESET_CAPTION                                         :{WHITE}Tallenna valmislistaksi
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Luettelo saatavilla olevista valmislistoista, valitse yksi kopioitavaksi alla olevaan tallenteeseen
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Syötä nimi valmislistalle
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Valittu nimi tallennettavalle valmislistalle
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Peruuta
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Älä muuta valmislistaa
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Tallenna
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Tallenna valmislista valitulle nimelle
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Muuta perusgrafiikan parametreja
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Muuta NewGRF-parametreja
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Sulje
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Palauta
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Aseta kaikki parametrit oletusarvoihin
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametri {NUM}
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Vaihda k
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Laajenna
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Laajenna kuntaa
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Laajenna rakennuksia
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Kasvata rakennusten määrää kunnassa
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Laajenna teitä
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Kasvata teiden määrää kunnassa
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Poista
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Poista tämä kunta kokonaan.
 
@@ -4169,7 +4173,7 @@ STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}Ilma-alu
 
 ###length 3
 STR_CARGO_TYPE_FILTER_ALL                                       :Kaikki rahtityypit
-STR_CARGO_TYPE_FILTER_FREIGHT                                   :Rahti
+STR_CARGO_TYPE_FILTER_FREIGHT                                   :Rahtitavara
 STR_CARGO_TYPE_FILTER_NONE                                      :Ei mikään
 
 ###length VEHICLE_TYPES
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Näytä
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näytä ilma-aluksen käskyt. Ctrl+napsautus näyttää ilma-aluksen aikataulun
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näytä junan tiedot
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näytä ajoneuvon tiedot
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näytä laivan tiedot
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näytä ilma-aluksen tiedot
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näytä junan tiedot. Ctrl+napsautus näyttää junan ryhmän
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näytä kulkuneuvon tiedot. Ctrl+napsautus näyttää kulkuneuvon ryhmän
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näytä laivan tiedot. Ctrl+napsautus näyttää laivan ryhmän
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näytä ilma-aluksen tiedot. Ctrl+napsautus näyttää ilma-aluksen ryhmän
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Nykyisen junan toiminnot – napsauta pysäyttääksesi/käynnistääksesi
@@ -4767,15 +4771,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Aikataul
 STR_TIMETABLE_NO_TRAVEL                                         :Ei kulkua
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Kulje (automaattinen; aikataulu seuraavan manuaalisen käskyn mukaisesti)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Kiertävä (ei aikataulua)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Kulje (ilman aikataulua) enimmillään {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Kulje (ilman aikataulua) enimmillään {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Kulje kohteeseen {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Kulje kohteeseen {STRING} enintään {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Kulje ({STRING}, ei aikataulua)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Kulje ({STRING}, ei aikataulua) enimmillään {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(pysy {STRING}, ei aikataulua)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(matkusta {STRING}, ei aikataulua)
-STR_TIMETABLE_STAY_FOR                                          :ja odota {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :ja kulje {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(kulje {STRING}, ei aikataulua)
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}ja odota {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}ja kulje {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Aikataulun kesto on noin {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Aikataulun kesto on {STRING}
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Hyväksy
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Valitse korostettu skripti
-STR_AI_LIST_CANCEL                                              :{BLACK}Peruuta
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Älä vaihda skriptiä
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Ota kuvakaappaus
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Tavallinen kuvakaappaus
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Pienoisk
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Tekoälyparametrit
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Peliskriptin parametrit
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sulje
 STR_AI_SETTINGS_RESET                                           :{BLACK}Palauta
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5823,9 +5824,9 @@ STR_VEHICLE_NAME_AIRCRAFT_POWERNAUT_HELICOPTER                  :Powernaut-helik
 
 ##id 0x8800
 # Formatting of some strings
-STR_FORMAT_DATE_TINY                                            :{ZEROFILL_NUM}-{ZEROFILL_NUM}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_TINY                                            :{ZEROFILL_NUM}.{ZEROFILL_NUM}.{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING}ssa {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING}{STRING}{NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:ZEROFILL_NUM}-{0:ZEROFILL_NUM}
 
 STR_FORMAT_COMPANY_NUM                                          :(yhtiö {COMMA})
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mrd.
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}bilj.
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Avaa tunnusasetukset
+STR_BADGE_CONFIG_RESET                                          :Palauta
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Tunnuskuvakkeet
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Tunnussuodattimet
+STR_BADGE_CONFIG_PREVIEW                                        :Esikatselu
+STR_BADGE_CONFIG_NAME                                           :Nimi
+STR_BADGE_FILTER_ANY_LABEL                                      :Mikä tahansa {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} on {STRING}
diff --git a/src/lang/french.txt b/src/lang/french.txt
index da6631bd10..3f788f8ece 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -286,7 +286,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fermer l
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titre de fenêtre - Faire glisser pour déplacer la fenêtre
 STR_TOOLTIP_SHADE                                               :{BLACK}Réduire la fenêtre - N'affiche que la barre de titre
 STR_TOOLTIP_DEBUG                                               :{BLACK}Afficher les informations de débogage NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionner la fenêtre à sa taille par défaut. Ctrl-clic pour définir la taille actuelle comme défaut
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionner la fenêtre à sa taille par défaut. Ctrl+clic pour définir la taille actuelle comme défaut. Double Ctrl+clic pour réinitialiser la taille par défaut
 STR_TOOLTIP_STICKY                                              :{BLACK}Marquer cette fenêtre comme ineffaçable pour la touche «{NBSP}Fermer toutes les fenêtres{NBSP}». Ctrl-clic pour définir l'état par défaut
 STR_TOOLTIP_RESIZE                                              :{BLACK}Cliquer et faire glisser pour redimensionner la fenêtre
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alterner entre grande et petite fenêtre
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Placer des mais
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Options du Jeu
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Paramètres
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Configuration des IAs
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Configuration du script de jeu
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Paramètres NewGRF
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copier l
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Options du jeu
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Général
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Afficher les paramètres généraux
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Afficher les paramètres généraux
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graphiques
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Afficher les paramètres graphiques
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Afficher les paramètres graphiques
 STR_GAME_OPTIONS_TAB_SOUND                                      :Son
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Afficher les paramètres de son et de musique
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Afficher les paramètres de son et de musique
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Afficher les paramètres d'intégration sociale
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Afficher les paramètres d'intégration sociale
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avancé
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Afficher les paramètres avancés
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Effets sonores
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musique
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}{NBSP}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Devise
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Sélectionner l'unité monétaire
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Devise
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Sélectionner l'unité monétaire
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letton
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portugais
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia Ukrainienne
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Sauvegarde automatique
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Sélectionner l'intervalle de temps entre les sauvegardes automatiques
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Sauvegarde automatique
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Sélectionner l'intervalle de temps entre les sauvegardes automatiques
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Toutes les 30 m
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Toutes les 60 minutes
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Toutes les 120 minutes
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Langue
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Sélectionner la langue à utiliser pour l'interface
+STR_GAME_OPTIONS_LANGUAGE                                       :Langue
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Sélectionner la langue à utiliser pour l'interface
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}{NBSP}% terminé{P "" s})
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Plein écran
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Cochez cette case pour jouer à OpenTTD en plein écran
+STR_GAME_OPTIONS_FULLSCREEN                                     :Mode plein écran
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Cochez cette case pour jouer à OpenTTD en mode plein écran
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Résolution
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Sélectionner la résolution d'écran à utiliser
+STR_GAME_OPTIONS_RESOLUTION                                     :Résolution d'écran
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Sélectionner la résolution d'écran à utiliser
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Autre
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Accélération matérielle
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Cocher cette case permet à OpenTTD d'utiliser l'accélération matérielle, si possible. Un paramètre modifié ne sera pris en compte qu'au redémarrage du jeu
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Accélération matérielle
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Cocher cette case permet à OpenTTD d'utiliser l'accélération matérielle, si possible. Un paramètre modifié ne sera pris en compte qu'au redémarrage du jeu
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Les paramètres ne prendront effet qu'après le redémarrage du jeu
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Cochez cette case pour activer la synchronisation verticale de l'écran. La modification de ce paramètre ne sera effective qu'après le redémarrage du jeu. Fonctionne uniquement si l’accélération matérielle est active.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Cochez cette case pour activer la synchronisation verticale de l'écran. La modification de ce paramètre ne sera effective qu'après le redémarrage du jeu. Fonctionne uniquement si l’accélération matérielle est active.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Pilote actif{NBSP}: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Pilote actif{NBSP}: {STRING}
+
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
 STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Taille de l'interface
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Faites glisser la souris pour définir la taille de l'interface. Maintenir Ctrl pour un réglage en continu
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Faites glisser la souris pour définir la taille de l'interface. Maintenir Ctrl pour un réglage en continu
 STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Détection automatique de la taille
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Cochez cette case pour détecter automatiquement la taille de l'interface
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Cochez cette case pour détecter automatiquement la taille de l'interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Mettre à l’échelle les bordures
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Cochez cette case pour mettre les bordures à l'échelle avec la taille de l'interface
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Mettre à l’échelle les bordures
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Cochez cette case pour mettre les bordures à l'échelle avec la taille de l'interface
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Utiliser la police d'écriture par défaut
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Cochez cette case si vous préferez utiliser la police d'écriture par défaut
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Police supportant l'anti-crénelage
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Cochez cette case pour activer l'anti-crénelage sur la police d'écriture à taille variable
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Utiliser la police d'écriture par défaut
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Cochez cette case si vous préferez utiliser la police d'écriture par défaut
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Police supportant l'anti-crénelage
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Cochez cette case pour activer l'anti-crénelage sur les polices d'écriture le supportant
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Données d'analyse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participer à l'envoi de données d'analyse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Si activé, OpenTTD transmettra les données d'analyse en quittant une partie
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}À propos des données et de la confidentialité
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Ouvre une fenêtre à propos de la confidentialité des données d'analyse envoyées
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Prévisualisation des données d'analyse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Voir les données d'analyse de la partie en cours
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Données d'analyse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participer à l'envoi de données d'analyse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Si activé, OpenTTD transmettra les données d'analyse recueillies en quittant une partie
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :À propos des données et de la confidentialité
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ouvre une fenêtre dans votre navigateur à propos de la confidentialité des données d'analyse envoyées
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Aperçu des données d'analyse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Voir les données d'analyse de la partie en cours
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK} Graphiques
+STR_GAME_OPTIONS_DISPLAY                                        :Affichage
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Taux de rafraîchissement de l'affichage
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK} Sélectionnez la fréquence de rafraîchissement à utiliser
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Fréquence de rafraîchissement de l'affichage
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Sélectionnez la fréquence de rafraîchissement à utiliser
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE} Les taux de rafraîchissement supérieurs à 60Hz peuvent avoir un impact sur les performances.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Graphiques de base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Sélectionner les graphiques de base à utiliser (ne peuvent pas être modifiés en jeu, que depuis le menu principal)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informations additionnelles sur les graphiques de base
+STR_GAME_OPTIONS_BASE_GRF                                       :Graphiques de base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Sélectionner les graphiques de base à utiliser (ne peuvent pas être modifiés en jeu, que depuis le menu principal)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informations additionnelles sur les graphiques de base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Sons de base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Sélectionner les sons de base à utiliser (ne peuvent pas être modifiés en jeu, que depuis le menu principal)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informations additionnelles sur les sons de base
+STR_GAME_OPTIONS_BASE_SFX                                       :Sons de base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Sélectionner les sons de base à utiliser (ne peuvent pas être modifiés en jeu, que depuis le menu principal)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informations additionnelles sur les sons de base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Musique de base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Sélectionner la musique de base à utiliser
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informations additionnelles sur la musique de base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Musique de base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Sélectionner la musique de base à utiliser
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informations additionnelles sur la musique de base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Obtenir le contenu
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Vérifier les contenus nouveaux ou mis à jour téléchargeables
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(aucun plugin d'intégration avec les plateformes sociales installé)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(aucun plugin d'intégration avec les plateformes sociales installé)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforme{NBSP}:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}État du plugin{NBSP}:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plateforme{NBSP}:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :État du plugin{NBSP}:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Actif
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Échec de l'initialisation
@@ -1144,7 +1149,7 @@ STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Définir
 STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Passer à l'euro plus tôt
 STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Passer à l'euro plus tard
 
-STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prévisualisation{NBSP}: {ORANGE}{CURRENCY_LONG}
+STR_CURRENCY_PREVIEW                                            :{LTBLUE}Aperçu{NBSP}: {ORANGE}{CURRENCY_LONG}
 STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10{NBSP}000 livres (£) dans cette devise
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Changer les paramètres de la devise personnalisée
 
@@ -1220,12 +1225,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissive (pas
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Aucune IA utilisable...{}{}Vous pouvez télécharger diverses IA via le système de «{NBSP}Contenu en ligne{NBSP}».
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Paramètres
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtre{NBSP}:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Tout développer
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Tout réduire
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Réinitialiser tous les réglages
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtre{NBSP}:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Tout développer
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Tout réduire
+STR_CONFIG_SETTING_RESET_ALL                                    :Réinitialiser tous les réglages
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(pas d'explication disponible)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valeur par défaut{NBSP}: {ORANGE}{STRING}
@@ -1238,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Paramètre de c
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Attention{NBSP}!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Par cette action, toues les réglages seront réinitialisés aux valeurs par défaut.{}Êtes-vous sûr de vouloir continuer{NBSP}?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Catégorie{NBSP}:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type{NBSP}:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restreint la liste ci-dessous en utilisant des filtres prédéfinis
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Catégorie{NBSP}:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type{NBSP}:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restreint la liste ci-dessous en utilisant des filtres prédéfinis
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basique (n'afficher que les paramètres importants)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avancé (afficher la plupart des paramètres)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (afficher tous les paramètres, même les plus bizarres)
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Paramètres de
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Aucun -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Afficher tous les résultats de la recherche en définissant{}la {SILVER}catégorie {BLACK}sur {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Afficher tous les résultats de la recherche en définissant{}le {SILVER}type {BLACK}sur {WHITE}tous les types
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Afficher tous les résultats de la recherche en définissant{}la{SILVER}catégorie {BLACK}sur {WHITE}{STRING} {BLACK}et le{SILVER} type {BLACK}sur {WHITE}tous les types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Afficher tous les résultats de la recherche en définissant{}la {PUSH_COLOUR}{SILVER}catégorie {POP_COLOUR}sur {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Afficher tous les résultats de la recherche en définissant{}le {PUSH_COLOUR}{SILVER}type {POP_COLOUR}sur {WHITE}tous les types
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Afficher tous les résultats de la recherche en définissant{}la{PUSH_COLOUR}{SILVER}catégorie {POP_COLOUR}sur {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}et le{PUSH_COLOUR}{SILVER} type {POP_COLOUR}sur {WHITE}tous les types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Désactivé
@@ -1416,7 +1420,7 @@ STR_CONFIG_SETTING_SHOWFINANCES_PERIOD                          :Afficher le bil
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :Si activé, le bilan financier sera affiché à la fin de chaque année pour permettre un contrôle rapide de l'état de la compagnie.
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT_PERIOD                 :Si activé, le bilan financier sera affiché à la fin de chaque période pour permettre un contrôle rapide de l'état de la compagnie.
 
-STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :Les nouveaux ordres sont « sans arrêt » par défaut{NBSP}: {STRING}
+STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :Les nouveaux ordres sont «{NBSP}sans arrêt{NBSP}» par défaut{NBSP}: {STRING}
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT                  :Normalement, un véhicule s'arrête dans chaque station qu'il traverse. En activant ce paramètre, il traversera toutes les stations sur le chemin de sa destination finale sans s'arrêter. Noter que ce paramètre définit uniquement une valeur par défaut pour les nouveaux ordres. Les ordres peuvent par après être réglés individuellement avec un autre comportement
 
 STR_CONFIG_SETTING_STOP_LOCATION                                :Les nouveaux ordres arrêtent les trains {G 0 au au "à la"} {STRING} du quai par défaut
@@ -2192,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE} ... auc
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... le pilote du GPU a fait planter le jeu. L'accélération matérielle est désactivée
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Jouer une nouvelle partie
 STR_INTRO_LOAD_GAME                                             :{BLACK}Charger une partie
@@ -2201,14 +2206,10 @@ STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jouer un
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Éditeur de scénario
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Jouer en multijoueur
 
-STR_INTRO_GAME_OPTIONS                                          :{BLACK}Options globales
+STR_INTRO_GAME_OPTIONS                                          :{BLACK}Options du jeu
 STR_INTRO_HIGHSCORE                                             :{BLACK}Meilleurs scores
 STR_INTRO_HELP                                                  :{BLACK}Aide et manuels
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Paramètres de jeu
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Paramètres NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenu en ligne
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Configuration des IAs
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Configuration du script de jeu
 STR_INTRO_QUIT                                                  :{BLACK}Quitter
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Démarrer une nouvelle partie. Ctrl-clic pour passer outre la configuration du terrain.
@@ -2226,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Sélecti
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Ouvrir les options du jeu
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Ouvrir le tableau des meilleurs scores
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Accéder à la documentation et aux ressources en ligne
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Ouvrir les paramètres
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Ouvrir la configuration des NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Vérifier les contenus nouveaux ou mis à jour téléchargeables
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Ouvrir la configuration des IAs
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Ouvrir la configuration du script de jeu
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quitter OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}{NUM} sprite{P "" s} manque{P "" "nt"} dans les graphiques de base actuellement sélectionnés. Veuillez vérifier les mises à jours pour les graphiques de base.
@@ -2386,7 +2383,7 @@ STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY                       :Invitation uniq
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijoueurs
-STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Votre nom de joueur :
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Votre nom de joueur{NBSP}:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ceci est le nom sous lequel vous serez connu des autres joueurs
 
 STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nom de la partie
@@ -2545,7 +2542,7 @@ STR_NETWORK_ASK_RELAY_YES_ALWAYS                                :{BLACK}Oui, ne
 
 STR_NETWORK_ASK_SURVEY_CAPTION                                  :Participer à l'envoi automatique de données d'analyse ?
 STR_NETWORK_ASK_SURVEY_TEXT                                     :Souhaitez-vous participer à l'envoi automatique de données d'analyse ?{}OpenTTD transmettra les données d'analyse lorsque vous quitterez une partie.{}Vous pouvez changer ceci à tout moment dans les options du jeu.
-STR_NETWORK_ASK_SURVEY_PREVIEW                                  :Prévisualiser les données d'analyse
+STR_NETWORK_ASK_SURVEY_PREVIEW                                  :Aperçu des données d'analyse
 STR_NETWORK_ASK_SURVEY_LINK                                     :Données d'analyse et confidentialité
 STR_NETWORK_ASK_SURVEY_NO                                       :Non
 STR_NETWORK_ASK_SURVEY_YES                                      :Oui
@@ -3077,6 +3074,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Sélecti
 STR_FOUND_TOWN_CITY                                             :{BLACK}Métropole
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Les métropoles se développent plus vite que les villes.{}Leur taille à la création dépend du paramétrage de la configuration.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Agencement des routes{NBSP}:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Sélectionner l'agencement des routes pour cette ville
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3526,15 +3524,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Sauvegar
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Liste des présélections disponibles, en sélectionner une pour la copier sous le nom de sauvegarde ci-dessous
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Entrer un nom pour la présélection
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nom actuellement sélectionné pour la présélection à sauvegarder
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Annuler
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ne pas modifier la présélection
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Sauvegarder
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Sauvegarder la présélection sous le nom actuellement sélectionné
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Modifier les paramètres des graphiques de base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Modifier les paramètres NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Fermer
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Réinitialiser
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Régler tous les paramètres à leur valeur par défaut
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paramètre {NUM}
@@ -4441,10 +4436,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Afficher
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Afficher les ordres de l'aéronef.{}Ctrl-clic pour afficher son horaire.
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Afficher les détails du train
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Afficher les détails du véhicule routier
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Afficher les détails du navire
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Afficher les détails de l'aéronef
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Afficher les détails du train. Ctrl-clic pour afficher son groupe
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Afficher les détails du véhicule routier. Ctrl-clic pour afficher son groupe
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Afficher les détails du navire. Ctrl-clic pour afficher son groupe
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Afficher les détails de l'aéronef. Ctrl-clic pour afficher son groupe
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Action courante du train - cliquer pour le démarrer/l'arrêter
@@ -4768,15 +4763,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horaire
 STR_TIMETABLE_NO_TRAVEL                                         :Pas de voyage
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Voyager (automatique{NBSP}; horaire au prochain ordre manuel)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Voyager (sans horaire)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Voyager (non planifié) à {2:VELOCITY} max.
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Voyager (non planifié) à {VELOCITY} max.
 STR_TIMETABLE_TRAVEL_FOR                                        :Voyager pendant {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Voyager pendant {STRING} à {VELOCITY} max.
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Voyager (pendant {STRING}, non planifié)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Voyager (pendant {STRING}, non planifié) à {VELOCITY} max.
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(rester pendant {STRING}, non planifié)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(voyager pendant {STRING}, non planifié)
-STR_TIMETABLE_STAY_FOR                                          :et rester pendant {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :et voyager pendant {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}et rester pendant {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}et voyager pendant {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}C'est horaire prendra approximativement {STRING} pour s'achever
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Cet horaire prendra {STRING} pour s'achever
@@ -4895,8 +4890,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL{NBS
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accepter
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Sélectionner le script en surbrillance
-STR_AI_LIST_CANCEL                                              :{BLACK}Annuler
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne pas modifier le script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Faire une capture d'écran
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Capture d'écran normale
@@ -4909,7 +4902,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Capture
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Paramètres de l'IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Paramètres du script de jeu
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fermer
 STR_AI_SETTINGS_RESET                                           :{BLACK}Réinitialiser
 STR_AI_SETTINGS_SETTING                                         :{STRING}{NBSP}: {ORANGE}{STRING}
 
@@ -4932,7 +4924,7 @@ STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :Afficher la lic
 STR_TEXTFILE_README_CAPTION                                     :{WHITE}Lisez-moi du module {STRING} {STRING}
 STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Journal des modifications pour le module {STRING} {STRING}
 STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Licence du module {STRING} {STRING}
-STR_TEXTFILE_SURVEY_RESULT_CAPTION                              :{WHITE}Prévisualisation des données d'analyse
+STR_TEXTFILE_SURVEY_RESULT_CAPTION                              :{WHITE}Aperçu des données d'analyse
 STR_TEXTFILE_GAME_MANUAL_CAPTION                                :{WHITE}Document OpenTTD '{STRING}'
 
 
@@ -5887,6 +5879,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}G
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5926,3 +5919,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Ouvrir la configuration des badges
+STR_BADGE_CONFIG_RESET                                          :Réinitialiser
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Icônes de badges
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtres de badges
+STR_BADGE_CONFIG_PREVIEW                                        :Aperçu du véhicule
+STR_BADGE_CONFIG_NAME                                           :Nom
+STR_BADGE_FILTER_ANY_LABEL                                      :Tous {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} est {STRING}
diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt
index 4f3a57aeae..16b656f843 100644
--- a/src/lang/frisian.txt
+++ b/src/lang/frisian.txt
@@ -385,7 +385,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Ofslute
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spulopsjes
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Ynstellings
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-ynstellings
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Trochsichtigensopsjes
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Stêdsnammen sjen litte
@@ -854,8 +853,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spulopsj
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Muntienheid
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Muntienheidseleksje
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Muntienheid
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Muntienheidseleksje
 
 
 ###length 45
@@ -902,21 +902,21 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :Yndyske rupee
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Yndonezyske Roepia
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Maleizyske Ringgit
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatysk opslaan
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selektearje de interval foar automatysk opslaan
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatysk opslaan
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selektearje de interval foar automatysk opslaan
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Ut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Taal
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selektearje de interfacetaal
+STR_GAME_OPTIONS_LANGUAGE                                       :Taal
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selektearje de interfacetaal
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Folslein skerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Finkje dit fakje oan om OpenTTD te boartsje yn in folslein skerm
+STR_GAME_OPTIONS_FULLSCREEN                                     :Folslein skerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Finkje dit fakje oan om OpenTTD te boartsje yn in folslein skerm
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skermresolúsje
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selektearje de skermresolutje om te brûken
+STR_GAME_OPTIONS_RESOLUTION                                     :Skermresolúsje
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selektearje de skermresolutje om te brûken
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oars
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
@@ -929,19 +929,20 @@ STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Byldferfaskingssnelheid
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisset for ôfbyldings
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektearje de basis ôfbyldingsset om te brûken
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Oanfoljende ynformaasje oer de basisset foar ôfbyldings
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Byldferfaskingssnelheid
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basisset foar lûdseffekten
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selektearje de basislûdsset om te brûken
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Oanfoljende ynformaasje oer de basislûdsset
+STR_GAME_OPTIONS_BASE_GRF                                       :Basisset for ôfbyldings
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selektearje de basis ôfbyldingsset om te brûken
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Oanfoljende ynformaasje oer de basisset foar ôfbyldings
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basisset foar musyk
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selektearje de basisset foar musyk om te brûken
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Oanfoljende ynformaasje oer de basisset foar musyk
+STR_GAME_OPTIONS_BASE_SFX                                       :Basisset foar lûdseffekten
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selektearje de basislûdsset om te brûken
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Oanfoljende ynformaasje oer de basislûdsset
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basisset foar musyk
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selektearje de basisset foar musyk om te brûken
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Oanfoljende ynformaasje oer de basisset foar musyk
 
 
 
@@ -1046,11 +1047,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tajouwend (gjin
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Gjin brûkbere AIs beskikber...{}jo kinne ferskillende AIs downloade fia it 'Online Content' systeem
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Ynstellings
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles útklappe
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles ynklappe
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles útklappe
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles ynklappe
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(gjin útlis beskikber)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standerdwaarde: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Ynstellingstype: {ORANGE}{STRING}
@@ -1060,9 +1060,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Spulynstellings
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op nije spullen)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op it hjoeddeiske bedriuw)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategory:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Behein de ûndersteande list ta feroare ynstellings
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategory:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Behein de ûndersteande list ta feroare ynstellings
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basisynstellings (allinich wichtige ynstellings sjen litte)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Wiidweidige ynstellings (measte ynstellings sjen litte)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspêrynstelltings (alle ynstellings sjen litte, wêrûnder fremde)
@@ -1079,9 +1079,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Bedriuwynstelli
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Gjin -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Lit alle sykresultaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Lit alle sykresultaten per ynstelling sjen{}{SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Lit alle sykresyltaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING} {BLACK}en {SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Lit alle sykresultaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Lit alle sykresultaten per ynstelling sjen{}{SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Lit alle sykresyltaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING} {BLACK}en {SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ut
@@ -1823,7 +1823,6 @@ STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}Gjin geh
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nei Spul
 STR_INTRO_LOAD_GAME                                             :{BLACK}Laad Spul
@@ -1834,8 +1833,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multispi
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spul Opsjes
 STR_INTRO_HIGHSCORE                                             :{BLACK}Topskoretabel
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Ynstellings
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF ynstellings
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Sikje online ynhâld
 STR_INTRO_QUIT                                                  :{BLACK}Ôfslute
 
@@ -1853,8 +1850,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Selektea
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Lit spul opsjes sjen
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Topskoretabel sjen litte
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Ynstellings sjen litte
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Lit NewGRF ynstellings sjen
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Strún ynternet ôf om nije ynhâld del te heljen
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Slút 'OpenTTD' ôf
 
@@ -2436,6 +2431,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selektea
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stêd
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stêden groeien flugger as doarpen{}Ôfhinklik fan ynstellings binne se grutter at se makke wurde
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Strjittenpatroan
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selektear strjittenpatroan foar dit plak
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orizjiniel
@@ -2774,13 +2770,10 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Dat strykt
 STR_SAVE_PRESET_CAPTION                                         :{WHITE}Sla ynstellings op
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Jou dizze ynstellings in namme
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Op dit stuit selektearre namme foar preset om op te slaan
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Annulearje
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ynstellings net feroarje
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Opslaan
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Feroarje NewGRF-parameters
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Slút
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Set werom
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Set alle ynstellings op normale wearde
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3795,13 +3788,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Akseptearje
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selekteare highlighted script
-STR_AI_LIST_CANCEL                                              :{BLACK}Annulearje
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Skript net feroare
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Slúte
 STR_AI_SETTINGS_RESET                                           :{BLACK}Weromsette
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index b7ad9f92f6..90d5551beb 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -572,7 +572,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Fàg an-seo
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Roghainnean a' gheama
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Roghainnean
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Roghainnean NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Roghainnean trìd-shoilleireachd
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Ainmean nam bailtean gan sealltainn
@@ -1055,8 +1054,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Roghainn
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Aonadan airgeadra
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Tagh aonadan airgeadra
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Aonadan airgeadra
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Tagh aonadan airgeadra
 
 
 ###length 45
@@ -1095,21 +1095,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Gnàthaichte...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Cairtbheileach
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iorànach
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Fèin-shàbhaladh
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Tagh dè cho tric ’s a thèid an geama fèin-shàbhaladh
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Fèin-shàbhaladh
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Tagh dè cho tric ’s a thèid an geama fèin-shàbhaladh
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Dheth
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Cànan
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Tagh cànan an eadar-aghaidh a chleachdas tu
+STR_GAME_OPTIONS_LANGUAGE                                       :Cànan
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Tagh cànan an eadar-aghaidh a chleachdas tu
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Làn-sgrìn
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Cuir cromag sa bhogsa seo gus OpenTTD a chluiche sa mhodh làn-sgrìn
+STR_GAME_OPTIONS_FULLSCREEN                                     :Làn-sgrìn
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Cuir cromag sa bhogsa seo gus OpenTTD a chluiche sa mhodh làn-sgrìn
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Dùmhlachd-bhreacaidh na sgrìn
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Tagh dùmhlachd-bhreacaidh na sgrìn a chleachdas tu
+STR_GAME_OPTIONS_RESOLUTION                                     :Dùmhlachd-bhreacaidh na sgrìn
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Tagh dùmhlachd-bhreacaidh na sgrìn a chleachdas tu
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Gnàthaichte
 
 
@@ -1122,17 +1122,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Gnàthaichte
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Seata grafaigeachd bunasach
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Tagh an seata grafaigeachd bunasach a chleachdas tu
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Barrachd fiosrachaidh mun t-seata ghrafaigeachd bhunasach
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Seata fhuaimean bunasach
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Tagh an seata fhuaimean bunasach a chleachdas tu
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Barrachd fiosrachaidh mun t-seata fhuaimean bhunasach
+STR_GAME_OPTIONS_BASE_GRF                                       :Seata grafaigeachd bunasach
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Tagh an seata grafaigeachd bunasach a chleachdas tu
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Barrachd fiosrachaidh mun t-seata ghrafaigeachd bhunasach
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Seata ciùil bunasach
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Tagh an seata ciùil bunasach a chleachdas tu
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Barrachd fiosrachaidh mun t-seata chiùil bhunasach
+STR_GAME_OPTIONS_BASE_SFX                                       :Seata fhuaimean bunasach
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Tagh an seata fhuaimean bunasach a chleachdas tu
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Barrachd fiosrachaidh mun t-seata fhuaimean bhunasach
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Seata ciùil bunasach
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Tagh an seata ciùil bunasach a chleachdas tu
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Barrachd fiosrachaidh mun t-seata chiùil bhunasach
 
 
 
@@ -1235,11 +1236,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Coibhneil
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Chan eil IF freagarrach ri fhaighinn...{}’S urrainn dhut roghainn dhe IFan a luchdadh a-nuas leis an t-siostam “Susbaint air loidhne"
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Roghainnean
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Sreang criathraige:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Leudaich a h-uile
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Co-theannaich a h-uile
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Sreang criathraige:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Leudaich a h-uile
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Co-theannaich a h-uile
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(chan eil mìneachadh ri làimh)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Luach bunaiteach: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Seòrsa an roghainn: {ORANGE}{STRING}
@@ -1249,9 +1249,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Roghainnean a'
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Roghainnean na companaidh (thèid an sàbhaladh leis a' gheama; gun bhuaidh ach air geamannan ùra)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Roghainnean na companaidh (thèid an sàbhaladh leis a' gheama; gun bhuaidh ach air a' chompanaidh seo)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Roinn-seòrsa:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Seòrsa:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Cuingichidh seo an liosta gu h-ìosal le criathradh ro-shocraichte
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Roinn-seòrsa:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Seòrsa:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Cuingichidh seo an liosta gu h-ìosal le criathradh ro-shocraichte
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bunasach (na seall ach roghainnean cudromach)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Adhartach (a’ mhòrchuid dhe na roghainnean)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Eòlaiche (a h-uile roghainn, a’ gabhail a-steach an fheadhainn neònach)
@@ -1268,9 +1268,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Roghainnean na
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Chan eil gin -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING} {BLACK}agus {SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING} {BLACK}agus {SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Dheth
@@ -2062,7 +2062,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Dh'fhài
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Geama ùr
 STR_INTRO_LOAD_GAME                                             :{BLACK}Luchdaich geama
@@ -2073,8 +2072,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Ioma-chl
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Roghainnean a' gheama
 STR_INTRO_HIGHSCORE                                             :{BLACK}Clàr nan sgòran àrda
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Roghainnean
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Roghainnean NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Susbaint air loidhne
 STR_INTRO_QUIT                                                  :{BLACK}Fàg an-seo
 
@@ -2092,8 +2089,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Tagh an
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Seall roghainnean a' gheama
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Seall clàr nan sgòran àrda
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Roghainnean an t-seallaidh
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Seall na roghainnean NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Thoir sùil airson susbainte ùire no air a h-ùrachadh ri luchdadh a-nuas
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Fàg “OpenTTD"
 
@@ -2776,6 +2771,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Tagh meu
 STR_FOUND_TOWN_CITY                                             :{BLACK}Mòr-bhaile
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Fàsaidh mòr-bhailtean nas luaithe na bailtean àbhaisteach{}A' crochadh air na roghainnean, tha iad nas motha nuair a thèid an stèidheachadh
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Co-dhealbhachd rathaidean a' bhaile
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Tagh co-dhealbhachd nan rathaidean aig a' bhaile
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Tùsail
@@ -3149,14 +3145,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Sàbhail
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Liosta dhe na ro-shocrachaidhean ri làimh, tagh fear gus lethbhreac dheth a chur gun ainm sàbhalaidh gu h-ìosal
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Cuir a-steach ainm an ro-shocrachaidh
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}An t-ainm a chaidh a thaghadh an-dràsta gus an ro-shocrachadh a shàbhaladh ann
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Sguir dheth
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Na atharraich an ro-shocrachadh
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Sàbhail
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Sàbhail an ro-shocrachadh dhan ainm air a thaghadh an-dràsta
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Atharraich paramadairean NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Dùin
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Ath-shuidhich
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Suidhich a h-uile paramadair air a luach tùsail
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paramadair {NUM}
@@ -4212,7 +4205,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Clàr-am
 STR_TIMETABLE_NO_TRAVEL                                         :Na siubhail
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Siubhail (fèin-obrachail; clàr-ama ga chruthachadh leis an ath-òrdugh a làimh)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Siubhail (gun chlàr-ama)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Siubhal le {2:VELOCITY} as motha (gun chlàr-ama)
 STR_TIMETABLE_TRAVEL_FOR                                        :Siubhail fad {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Siubhail fad {STRING} le {VELOCITY} as motha
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Siubhail (fad {STRING} gun chlàr-ama)
@@ -4322,13 +4314,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Gabh ris
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Cleachd an sgriobt a thagh thu
-STR_AI_LIST_CANCEL                                              :{BLACK}Sguir dheth
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Na atharraich an sgriobt
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :IF
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Dùin
 STR_AI_SETTINGS_RESET                                           :{BLACK}Ath-shuidhich
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 1d88295ce8..db72feac86 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Colocar casas
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcións do xogo
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Opcións
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Axustes da IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Axustes dos scripts do xogo
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Configuración NewGRF
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copia a
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcións da partida
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Xeral
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Escolle os axustes xerais
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Escolle os axustes xerais
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gráficos
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Escoller opcións gráficas
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Escoller opcións gráficas
 STR_GAME_OPTIONS_TAB_SOUND                                      :Son
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Escoller axustes de son e música
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Escoller axustes de son e música
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Escolle as opcións de integración social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Escolle as opcións de integración social
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanzado
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Cambiar a configuración avanzada
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efectos de son
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidades monetarias
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selección de unidades monetarias
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unidades monetarias
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Selección de unidades monetarias
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letón
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portugués
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hrivna ucraína
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autogravado
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selecciona o intervalo entre autogravados
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autogravado
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selecciona o intervalo entre autogravados
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Cada 30 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Cada 60 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Cada 120 minutos
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingua
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selecciona a lingua para a interface
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingua
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selecciona a lingua para a interface
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completado)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantalla completa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marca esta opción para xogar a OpenTTD en modo de pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marca esta opción para xogar a OpenTTD en modo de pantalla completa
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolución de pantalla
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecciona a resolución de pantalla a empregar
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolución de pantalla
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecciona a resolución de pantalla a empregar
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :outra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aceleración por hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Marca esta caixa para permitirlle a OpenTTD intentar usar a aceleración por hardware.  O cambio da configuración só se aplicará o reiniciar o xogo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aceleración por hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marca esta caixa para permitirlle a OpenTTD intentar usar a aceleración por hardware.  O cambio da configuración só se aplicará o reiniciar o xogo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}O cambio da configuración só se aplicará o reiniciar o xogo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Marca esta caixa para activar o V-sync da pantalla. O cambio só se aplicará tras reiniciar o xogo. Só funciona coa aceleración de hardware habilitada
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Marca esta caixa para activar o V-sync da pantalla. O cambio só se aplicará tras reiniciar o xogo. Só funciona coa aceleración de hardware habilitada
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Controlador actual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador actual: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Tamaño da interface
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arrastra o deslizante para establecer o tamaño da interface. Mantén Ctrl e arrastra para un axuste continuo
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Auto-detectar tamaño
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marca esta caixa para detectar o tamaño da interface automáticamente
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Escalar biseles
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marca esta caixa para escalar os biseles segundo o tamaño da interface
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Tamaño da interface
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arrastra o deslizante para establecer o tamaño da interface. Mantén Ctrl e arrastra para un axuste continuo
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Auto-detectar tamaño
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marca esta caixa para detectar o tamaño da interface automáticamente
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usar a fonte tradicional dos sprites
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marca esta opción se prefires usar a fonte tradicional de tamaño fixo dos sprites
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Suavizar fontes
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marca esta opción para suavizar as fontes redimensionables
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escalar biseles
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marca esta caixa para escalar os biseles segundo o tamaño da interface
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usar a fonte tradicional dos sprites
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marca esta opción se prefires usar a fonte tradicional de tamaño fixo dos sprites
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Suavizar fontes
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marca esta opción para suavizar as fontes redimensionables
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Enquisa automática
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participar nunha enquisa automática
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Cando se activa, OpenTTD enviará unha enquisa cando se sala dunha partida
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Acerca da enquisa e privacidade
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Isto abre un navegador con máis información sobre a enquisa automática
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Previsualizar resultado da enquisa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Amosar o resultado da enquisa da partida actual
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Enquisa automática
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participar nunha enquisa automática
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Cando se activa, OpenTTD enviará unha enquisa cando se sala dunha partida
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Acerca da enquisa e privacidade
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Isto abre un navegador con máis información sobre a enquisa automática
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Previsualizar resultado da enquisa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Amosar o resultado da enquisa da partida actual
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Gráficos
+STR_GAME_OPTIONS_DISPLAY                                        :Pantalla
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Amosar tasa de refresco
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Selecciona a tasa de refresco de pantalla a usar
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Amosar tasa de refresco
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Selecciona a tasa de refresco de pantalla a usar
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}As tasas de refresco superiores a 60Hz poden afectar o rendemento.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conxunto básico de gráficos
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona o conxunto de gráficos básico a empregar (non se pode cambiar na partida, só dende o menú principal)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre o conxunto de gráficos básico
+STR_GAME_OPTIONS_BASE_GRF                                       :Conxunto básico de gráficos
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecciona o conxunto de gráficos básico a empregar (non se pode cambiar na partida, só dende o menú principal)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Información adicional sobre o conxunto de gráficos básico
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Conxunto de sons base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selecciona o conxunto de sons base a empregar (non se pode cambiar na partida, só dende o menú principal)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre o conxunto de sons base
+STR_GAME_OPTIONS_BASE_SFX                                       :Conxunto de sons base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selecciona o conxunto de sons base a empregar (non se pode cambiar na partida, só dende o menú principal)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Información adicional sobre o conxunto de sons base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Conxunto de música base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selecciona o conxunto de música base a empregar
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Información adicional sobre o conxunto de música base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Conxunto de música base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selecciona o conxunto de música base a empregar
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Información adicional sobre o conxunto de música base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Obter contido
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Comprobar contido novo e actualizado para descargar
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(non hai instalado ningún complemento para integrar con plataformas sociais)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(non hai instalado ningún complemento para integrar con plataformas sociais)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estado do complemento:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estado do complemento:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Executándose
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Fallou o inicializarse
@@ -1218,14 +1223,13 @@ STR_CITY_APPROVAL_TOLERANT                                      :Tolerante
 STR_CITY_APPROVAL_HOSTILE                                       :Hostil
 STR_CITY_APPROVAL_PERMISSIVE                                    :Permisiva (sen efecto nas accións da compañía)
 
-STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Non hai IA adecuada dispoñíbel...{}Podes descargar varias IAs a través do sistema de contidos online
+STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Non hai IA adecuada dispoñíbel...{}{}Podes descargar varias IAs a través do sistema de contidos online
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Opcións
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrar:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expandir todos
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Minimizar todos
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restablecer todos os valores
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrar:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expandir todos
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Minimizar todos
+STR_CONFIG_SETTING_RESET_ALL                                    :Restablecer todos os valores
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(sen explicación dispoñíbel)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor por defecto: {ORANGE}{STRING}
@@ -1238,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Configuración
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Coidado!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Esta acción restablecera todas as configuracións do xogo os seus valores por defecto.{}Estas seguro de que queres continuar?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoría:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restrinxe a seguinte lista amosando só os valores alterados
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoría:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restrinxe a seguinte lista amosando só os valores alterados
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Configuración básica
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Configuración avanzada
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Configuración experta / tódalas configuracións
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Configuración
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ningún -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Amosa todos os resultados da procura por configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Amosa todos os resultados da procura por opción{}{SILVER}Tipo {BLACK}a {WHITE}Todos os tipos de configuración
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Amosa todos os resultados de procura por configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING} {BLACK}e {SILVER}Tipo {BLACK}a {WHITE}Todos os tipos de configuración
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Amosa todos os resultados da procura por configuración{}{PUSH_COLOUR}{SILVER}Categoría {POP_COLOUR}a {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Amosa todos os resultados da procura por opción{}{PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}a {WHITE}Todos os tipos de configuración
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Amosa todos os resultados de procura por configuración{}{PUSH_COLOUR}{SILVER}Categoría {POP_COLOUR}a {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}e {PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}a {WHITE}Todos os tipos de configuración
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Off
@@ -2192,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... non
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Os drivers da GPU provocaron un fallo no xogo. Deshabilitada aceleración por hardware.
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova partida
 STR_INTRO_LOAD_GAME                                             :{BLACK}Cargar partida
@@ -2204,11 +2209,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multixog
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opcións da partida
 STR_INTRO_HIGHSCORE                                             :{BLACK}Táboa das máximas puntuacións
 STR_INTRO_HELP                                                  :{BLACK}Axuda e manuais
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Opcións
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configuración NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contido en liña
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Axustes da IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Axustes dos scripts do xogo
 STR_INTRO_QUIT                                                  :{BLACK}Saír
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comezar unha nova partida. Ctrl+Click para saltarse a configuración do mapa
@@ -2226,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Seleccio
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Abrir as opcións da partida
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Abrir a táboa das máximas puntuacións
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Obten acceso a documentación e recursos en liña
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Abrir axustes
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Abrir a configuración de NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Buscar contidos novos e actualizados para descargar
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Abrir axustes da IA
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Abrir os axustes dos scripts do xogo
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Saír de 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}A base gráfica seleccionada actualmente está perdendo {NUM} sprite{P "" s}. Por favor comproba se hai actualizacións para o conxunto base.
@@ -2651,7 +2648,7 @@ STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} sa
 STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} cambiou o seu nome a {STRING}
 STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} deu {CURRENCY_LONG} a {STRING}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}O servidor pechou a sesión
-STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}O servidor estase a reiniciar...{}Agarda por favor...
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}O servidor estase a reiniciar...{}{}Agarda por favor...
 STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} foi expulsado. Motivo: ({STRING})
 
 STR_NETWORK_ERROR_COORDINATOR_REGISTRATION_FAILED               :{WHITE}Fallou o rexistro do servidor
@@ -2904,6 +2901,7 @@ STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Seleccio
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selección de pontes - pincha na ponte seleccionada para construíla
 STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED                           :{GOLD}{STRING},{} {VELOCITY}
+STR_SELECT_BRIDGE_INFO_NAME_COST                                :{GOLD}{STRING},{} {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST                      :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Colgante, aceiro
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Vigas, aceiro
@@ -3076,6 +3074,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}As cidades crecen máis rápido que os pobos{}Segundo a configuración, son máis grandes cando se fundan
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposición das estradas das poboacións:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selecciona a disposición das estradas para esta poboación
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orixinal
@@ -3157,6 +3156,9 @@ STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terra deserta
 STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Herba
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Leiras
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deserto
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :rochas cubertas de neve
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :terra árida cuberta de neve
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :herba cuberta de neve
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Vía de ferrocarril
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Vía de ferrocarril con sinais de bloqueo
@@ -3522,15 +3524,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Grava os
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista de preaxustes dispoñibles, selecciona unha para copiala no nome de gravación de embaixo
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Engade un nome para o preestablecido
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nome seleccionado actualmente para o preestablecido a gravar
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancelar
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Non troques o preestablecido
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Gravar
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Gravar o establecido ao nome seleccionado actualmente
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Cambiar os parámetros dos gráficos base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Cambiar os parámetros de NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Pechar
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reiniciar
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Establecer tódolos parámetros cos seus valores por defecto
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parámetro {NUM}
@@ -3628,17 +3627,17 @@ STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Atopado
 STR_NEWGRF_LIST_MISSING                                         :{RED}Faltan arquivos
 
 # NewGRF 'it's broken' warnings
-STR_NEWGRF_BROKEN                                               :{WHITE}O comportamento do NewGRF '{0:STRING}' pode causar desincronizacións e/ou colgues
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Cambiou o estado 'vagón con potencia' para '{1:ENGINE}' fóra dun depósito
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Cambiou a lonxitude do vehículo a '{1:ENGINE}' cando non está nun depósito
-STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Cambiou a capacidade do vehículo en '{1:ENGINE}' cando non está nun depósito ou modificándose
+STR_NEWGRF_BROKEN                                               :{WHITE}O comportamento do NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' pode causar desincronizacións e/ou colgues
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Cambiou o estado 'vagón con potencia' para '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}'' fóra dun depósito
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Cambiou a lonxitude do vehículo a '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' cando non está nun depósito
+STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Cambiou a capacidade do vehículo en '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' cando non está nun depósito ou modificándose
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}O tren '{VEHICLE}' pertencente a '{COMPANY}' ten unha lonxitude inválida. Isto está causado probabelmente por problemas con NewGRFs. O xogo pode desincronizarse ou colgarse
 
-STR_NEWGRF_BUGGY                                                :{WHITE}O NewGRF '{0:STRING}' proporciona información incorrecta.
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Información de carga/reforma para '{1:ENGINE}' difiire da lista de compra despois da construción. Isto pode causar que a renovación/reemprazo automáticos non reformen correctamente
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' produciu un bucle sen fin na chamada de retorno de produción
+STR_NEWGRF_BUGGY                                                :{WHITE}O NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' proporciona información incorrecta.
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Información de carga/reforma para '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' difiire da lista de compra despois da construción. Isto pode causar que a renovación/reemprazo automáticos non reformen correctamente
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' produciu un bucle sen fin na chamada de retorno de produción
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}A chamada {1:HEX} devolveu o resultado inválido ou descoñecido {2:HEX}
-STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' tipo de produción inválido {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' devolveu un tipo de carga inválido na devolución de chamada de produción en {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<carga inválida>
@@ -4034,6 +4033,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produce:
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Require:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} agardando{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} agardando
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar produción (múltiplo de 8, ata 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Cambiar o nivel de produción (porcentaxe, ata 800%)
@@ -4433,10 +4436,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostra-l
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostra-las ordes do avión. Ctrl+click mostra o horario
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra-los detalles do tren
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra-los detalles do vehículo de estrada
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra-los detalles do barco
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra-los detalles do avión
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra-los detalles do tren. Ctrl+Click para amosar o grupo do tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra-los detalles do vehículo. Ctrl+Click para amosar o grupo do vehículo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra-los detalles do barco. Ctrl+Click para amosar o grupo do barco
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra-los detalles do avión. Ctrl+Click para amosar o grupo do avión
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Acción do tren actual - Click para parar/arrancar o tren
@@ -4691,54 +4694,56 @@ STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de Ve
 STR_ORDER_SHIP_DEPOT                                            :Depósito de Barcos
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} o hangar máis cercano
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} o {STRING} mais cercano
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
-STR_ORDER_REFIT_ORDER                                           :(Reaxustar a {STRING})
-STR_ORDER_REFIT_STOP_ORDER                                      :(Reaxustar a {STRING} e parar)
-STR_ORDER_STOP_ORDER                                            :(Parar)
+STR_ORDER_REFIT_ORDER                                           :{SPACE}(Reaxustar a {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Reaxustar a {STRING} e parar)
+STR_ORDER_STOP_ORDER                                            :{SPACE}(Parar)
 
-STR_ORDER_WAIT_TO_UNBUNCH                                       :(agarda para desagrupar)
+STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(agarda para desagrupar)
 
 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION}
 STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION                       :{PUSH_COLOUR}{RED}(Non pode usar a estación){POP_COLOUR} {STRING} {STATION}
 
-STR_ORDER_IMPLICIT                                              :(Implícito)
+STR_ORDER_IMPLICIT                                              :{SPACE}(Implícito)
 
-STR_ORDER_FULL_LOAD                                             :(Carga completa)
-STR_ORDER_FULL_LOAD_ANY                                         :(Carga completa de calquera carga)
-STR_ORDER_NO_LOAD                                               :(Non cargar)
-STR_ORDER_UNLOAD                                                :(Descargar e tomar carga)
-STR_ORDER_UNLOAD_FULL_LOAD                                      :(Descargar e esperar a carga completa)
-STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Descargar e esperar a calquera carga completa)
-STR_ORDER_UNLOAD_NO_LOAD                                        :(Descargar e saír baleiro)
-STR_ORDER_TRANSFER                                              :(Transferir e tomar carga)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Transferir e esperar a carga completa)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Transferir e esperar a calquera carga completa)
-STR_ORDER_TRANSFER_NO_LOAD                                      :(Transferir e saír baleiro)
-STR_ORDER_NO_UNLOAD                                             :(Non descargar e tomar carga)
-STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Non descargar e esperar a carga completa)
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Non descargar e esperar a calquera carga completa)
-STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Non descargar nin cargar)
+STR_ORDER_FULL_LOAD                                             :{SPACE}(Carga completa)
+STR_ORDER_FULL_LOAD_ANY                                         :{SPACE}(Carga completa de calquera carga)
+STR_ORDER_NO_LOAD                                               :{SPACE}(Non cargar)
+STR_ORDER_UNLOAD                                                :{SPACE}(Descargar e tomar carga)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :{SPACE}(Descargar e esperar a carga completa)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :{SPACE}(Descargar e esperar a calquera carga completa)
+STR_ORDER_UNLOAD_NO_LOAD                                        :{SPACE}(Descargar e saír baleiro)
+STR_ORDER_TRANSFER                                              :{SPACE}(Transferir e tomar carga)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :{SPACE}(Transferir e esperar a carga completa)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :{SPACE}(Transferir e esperar a calquera carga completa)
+STR_ORDER_TRANSFER_NO_LOAD                                      :{SPACE}(Transferir e saír baleiro)
+STR_ORDER_NO_UNLOAD                                             :{SPACE}(Non descargar e tomar carga)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :{SPACE}(Non descargar e esperar a carga completa)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :{SPACE}(Non descargar e esperar a calquera carga completa)
+STR_ORDER_NO_UNLOAD_NO_LOAD                                     :{SPACE}(Non descargar nin cargar)
 
-STR_ORDER_AUTO_REFIT                                            :(Auto-axuste a {STRING})
-STR_ORDER_FULL_LOAD_REFIT                                       :(Carga completa con auto-axuste a {STRING})
-STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(Carga completa de calquera carga con auto-axuste a {STRING})
-STR_ORDER_UNLOAD_REFIT                                          :(Descargar e tomar cargo con autoaxuste para {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Descargar e agardar por carga completa con auto-axuste a {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Descargar e esperar a calquera carga completa con auto-axuste a {STRING})
-STR_ORDER_TRANSFER_REFIT                                        :(Transferir e tomar carga con autoaxuste para {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Transferir e esperar a carga completa con auto-axuste a {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Transferir e esperar por calquera carga completa con auto-axuste a {STRING})
-STR_ORDER_NO_UNLOAD_REFIT                                       :(Non descargar e tomar carga con auto-axuste a {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(Non descargar e esperar a carga completa con auto-axuste a {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(Non descargar e esperar a calquera carga completa con auto-axuste a {STRING})
+STR_ORDER_AUTO_REFIT                                            :{SPACE}(Auto-axuste a {STRING})
+STR_ORDER_FULL_LOAD_REFIT                                       :{SPACE}(Carga completa con auto-axuste a {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Carga completa de calquera carga con auto-axuste a {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :{SPACE}(Descargar e tomar cargo con autoaxuste para {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :{SPACE}(Descargar e agardar por carga completa con auto-axuste a {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :{SPACE}(Descargar e esperar a calquera carga completa con auto-axuste a {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :{SPACE}(Transferir e tomar carga con autoaxuste para {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :{SPACE}(Transferir e esperar a carga completa con auto-axuste a {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :{SPACE}(Transferir e esperar por calquera carga completa con auto-axuste a {STRING})
+STR_ORDER_NO_UNLOAD_REFIT                                       :{SPACE}(Non descargar e tomar carga con auto-axuste a {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :{SPACE}(Non descargar e esperar a carga completa con auto-axuste a {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :{SPACE}(Non descargar e esperar a calquera carga completa con auto-axuste a {STRING})
 
 STR_ORDER_AUTO_REFIT_ANY                                        :carga dispoñible
 
 ###length 3
-STR_ORDER_STOP_LOCATION_NEAR_END                                :[preto do final]
-STR_ORDER_STOP_LOCATION_MIDDLE                                  :[medio]
-STR_ORDER_STOP_LOCATION_FAR_END                                 :[lonxe do final]
+STR_ORDER_STOP_LOCATION_NEAR_END                                :{SPACE}[preto do final]
+STR_ORDER_STOP_LOCATION_MIDDLE                                  :{SPACE}[medio]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :{SPACE}[lonxe do final]
 
 STR_ORDER_OUT_OF_RANGE                                          :{RED} (O próximo destino está fora de alcance)
 
@@ -4758,15 +4763,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horario
 STR_TIMETABLE_NO_TRAVEL                                         :Sen viaxe
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viaxar (automático; programado pola próxima orde manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viaxar (sen horario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaxar polo menos a {2:VELOCITY} (sen horarios)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaxar polo menos a {VELOCITY} (sen horarios)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaxar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaxar por {STRING} polo menos a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viaxe (para {STRING}, non calendarizada)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viaxe (para {STRING}, non calendarizado) con como máximo {VELOCITY}
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(permanece por {STRING}, non calendarizado)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(viaxe para {STRING}, sen calendarizar)
-STR_TIMETABLE_STAY_FOR                                          :e parar durante {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaxar durante {STRING}
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(permanece por {STRING}, non calendarizado)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viaxe para {STRING}, sen calendarizar)
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}e parar durante {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}e viaxar durante {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Completar este horario levará aproximadamente {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Levará {STRING} completar este horario
@@ -4785,12 +4790,14 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Segundos até e
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambiar Tempo
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambiar o tempo que debería levar a orde seleccionada. Ctrl+Clic cambia o tempo para todas as ordes
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Cambiar tempo
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Borrar tempo
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Borrar o tempo para a orde seleccionada. Ctrl+Clic borra o tempo para todas as ordes
 
 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Cambiar o límite de velocidade
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Cambiar a velocidade máxima da orde seleccionada. Ctrl+Click para fixar a velocidade de todas as ordes.
+STR_TIMETABLE_CHANGE_SPEED_QUERY                                :Cambiar o límite de velocidade
 
 STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Borrar o límite de velocidade
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Borrar a velocidade máxima da orde seleccionada. Ctrl+Clic borra a velocidade para todas as ordes.
@@ -4883,8 +4890,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceptar
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecciona-lo script marcado
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Non cambia-lo script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Tomar unha captura de pantalla
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura de pantalla normal
@@ -4895,9 +4900,8 @@ STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Captura
 STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura de pantalla do minimapa
 
 # Script Parameters
-STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script do xogo
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Pechar
+STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parámetros da IA
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parámetros do script do xogo
 STR_AI_SETTINGS_RESET                                           :{BLACK}Restablecer
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4957,7 +4961,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<non dispoñíb
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}A partida gravouse nunha versión sen soporte para tranvías. Quitáronse tódolos tranvías.
 
 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Xeración de mapas detida...{}... non hai emprazamentos para pobos adecuados
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Xeración de mapas detida...{}{}... non hai emprazamentos para vilas axeitados
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... non hai ningunha vila neste escenario
 
 STR_ERROR_PNGMAP                                                :{WHITE}Non se pode cargar o terreo dende o PNG...
@@ -5048,7 +5052,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... dema
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... hai demasiadas cidades
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... non queda máis espazo no mapa
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Obras na estrada en curso
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Non se pode borrar esta vila...{}Unha estación ou depósito está relacionado coa vila ou un cadro propiedade da vila non pode ser eliminado
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Non se pode borrar esta vila...{}{}Unha estación ou depósito está relacionado coa vila ou un cadro propiedade da vila non pode ser eliminado
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... non hai ningún sitio adecuado para unha estatua no centro desta vila
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}Non se pode construír a casa...
 
@@ -5875,6 +5879,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
diff --git a/src/lang/german.txt b/src/lang/german.txt
index c4c5adad8d..6aef78a466 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Häuser platzie
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spieleinstellungen
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Einstellungen
 STR_SETTINGS_MENU_AI_SETTINGS                                   :KI-Einstellungen
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Spielskripteinstellungen
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-Einstellungen
@@ -951,22 +950,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Hauptans
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spieleinstellungen
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Allgemein
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Wähle allgemeine Einstellungen
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Wähle allgemeine Einstellungen
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Grafikeinstellungen wählen
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Grafikeinstellungen wählen
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Sound- und Musikeinstellungen auswählen
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Sound- und Musikeinstellungen auswählen
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Soziales
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Soziale-Medien-Integrationseinstellungen auswählen
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Soziale-Medien-Integrationseinstellungen auswählen
 
 STR_GAME_OPTIONS_VOLUME                                         :Lautstärke
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sound-Effekte
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Währung
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währung auswählen
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Währung
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Währung auswählen
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1016,8 +1016,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysische Rin
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lettlandischer Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugiesische Escudo
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosicherung
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Abstand zwischen den automatischen Spielesicherungen wählen
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autosicherung
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Abstand zwischen den automatischen Spielesicherungen wählen
 
 # Autosave dropdown
 ###length 5
@@ -1027,77 +1027,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Alle 30 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Alle 60 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Alle 120 Minuten
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Sprache
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Sprache für die Spieloberfläche auswählen
+STR_GAME_OPTIONS_LANGUAGE                                       :Sprache
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Sprache für die Spieloberfläche auswählen
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% abgeschlossen)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Vollbild
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD im Vollbildmodus spielen
+STR_GAME_OPTIONS_FULLSCREEN                                     :Vollbild
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :OpenTTD im Vollbildmodus spielen
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Bildschirmauflösung
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Bildschirmauflösung auswählen
+STR_GAME_OPTIONS_RESOLUTION                                     :Bildschirmauflösung
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Bildschirmauflösung auswählen
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Andere
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware-Beschleunigung
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Dieses Kästchen ankreuzen, um OpenTTD zu erlauben, die Hardwarebeschleunigung zu verwenden. Eine geänderte Einstellung wird nur beim Spielneustart wirksam
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware-Beschleunigung
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Dieses Kästchen ankreuzen, um OpenTTD zu erlauben, die Hardwarebeschleunigung zu verwenden. Eine geänderte Einstellung wird nur beim Spielneustart wirksam
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Die Einstellung tritt nur nach einem Neustart des Spiels in Kraft
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Dieses Kästchen ankreuzen, um VSync zu aktivieren. Eine geänderte Einstellung wird nur beim Spielneustart wirksam. Funktioniert nur mit aktivierter Hardwarebeschleunigung
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Dieses Kästchen ankreuzen, um VSync zu aktivieren. Eine geänderte Einstellung wird nur beim Spielneustart wirksam. Funktioniert nur mit aktivierter Hardwarebeschleunigung
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktueller Treiber: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktueller Treiber: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Oberflächengröße
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Schieberegler ziehen, um die Größe der Benutzeroberfläche zu wählen. Strg+Ziehen für eine stetige Anpassung
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Größe automatisch erkennen
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Dieses Kästchen ankreuzen, um die Größe der Benutzeroberfläche automatisch zu erkennen
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Schrägen skalieren
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Dieses Kästchen ankreuzen, um Schrägen nach der Oberflächengröße zu skalieren
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Oberflächengröße
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Schieberegler ziehen, um die Größe der Benutzeroberfläche zu wählen. Strg+Ziehen für eine stetige Anpassung
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Größe automatisch erkennen
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Dieses Kästchen ankreuzen, um die Größe der Benutzeroberfläche automatisch zu erkennen
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Nutze die traditionelle Sprite-Schriftart
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Dieses Kästchen ankreuzen, um die traditionelle Sprite-Schrift mit fester Größe zu verwenden
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Kantenglättung für Schriften
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Dieses Kästchen ankreuzen, um Kantenglättung für skalierbare Schriften zu aktivieren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Schrägen skalieren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Dieses Kästchen ankreuzen, um Schrägen nach der Oberflächengröße zu skalieren
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Nutze die traditionelle Sprite-Schriftart
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Dieses Kästchen ankreuzen, um die traditionelle Sprite-Schrift mit fester Größe zu verwenden
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Kantenglättung für Schriften
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Dieses Kästchen ankreuzen, um Kantenglättung für skalierbare Schriften zu aktivieren
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}×
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatische Datenerhebung
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Bei automatischer Datenerhebung teilnehmen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Falls aktiviert, wird OpenTTD eine Datenerhebung beim Verlassen des Spiels übertragen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Über Datenerhebung und Privatsphäre
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dies öffnet einen Browser mit mehr Informationen über die automatische Datenerhebung
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Vorschau des Datenerhebungsergebnisses
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Zeige die Datenerhebungsergebnisse des gerade laufenden Spiels an
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatische Datenerhebung
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Bei automatischer Datenerhebung teilnehmen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Falls aktiviert, wird OpenTTD eine Datenerhebung beim Verlassen des Spiels übertragen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Über Datenerhebung und Privatsphäre
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dies öffnet einen Browser mit mehr Informationen über die automatische Datenerhebung
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Vorschau des Datenerhebungsergebnisses
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Zeige die Datenerhebungsergebnisse des gerade laufenden Spiels an
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafik
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Bildwiederholrate
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Zu verwendende Bildwiederholrate auswählen
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Bildwiederholrate
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Zu verwendende Bildwiederholrate auswählen
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Wiederholraten größer als 60Hz beeinträchtigen möglicherweise die Performance.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisgrafiken
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zu benutzendes Set an Basisgrafiken auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Zusatzinformationen zu den Basisgrafiken
+STR_GAME_OPTIONS_BASE_GRF                                       :Basisgrafiken
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Zu benutzendes Set an Basisgrafiken auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Zusatzinformationen zu den Basisgrafiken
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basissounds
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Basissounds auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Zusatzinformationen zu den Basissounds
+STR_GAME_OPTIONS_BASE_SFX                                       :Basissounds
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Basissounds auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Zusatzinformationen zu den Basissounds
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basismusikset
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Ein Basismusikset auswählen
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Zusätzliche Informationen über das Basismusikset
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basismusikset
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Ein Basismusikset auswählen
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Zusätzliche Informationen über das Basismusikset
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Inhalt holen
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Nach neuen und aktualisierten Inhalt zum Herunterladen prüfen
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(keine Plugins für Soziale Medien installiert!)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Bahnsteig:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Zustand des Plugins:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Bahnsteig:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Zustand des Plugins:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Am laufen
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Initialisieren fehlgeschlagen
@@ -1210,12 +1210,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Hoch (kein Effe
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Keine KI gefunden ...{}Verschiedene KI sind via „Erweiterungen herunterladen“ verfügbar
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Einstellungen
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles ausklappen
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles einklappen
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Alle Werte zurücksetzen
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles ausklappen
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles einklappen
+STR_CONFIG_SETTING_RESET_ALL                                    :Alle Werte zurücksetzen
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(keine Erklärung verfügbar)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standardwert: {ORANGE}{STRING}
@@ -1228,9 +1227,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firmen-Einstell
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Achtung!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Diese Aktion setzt alle Spieleinstellungen auf ihre Standardwerte zurück.{}Sind Sie sicher, dass Sie fortfahren möchten?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Art:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Vordefinierte Filter auf die untenstehende Liste anwenden
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Art:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Vordefinierte Filter auf die untenstehende Liste anwenden
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grundlegend (Zeigt nur die wichtigsten Einstellungen)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Erweitert (Zeigt die meisten Einstellungen)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Alle (Zeigt alle Einstellungen, auch die abwegigen)
@@ -1247,9 +1246,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firmeneinstellu
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Keine -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Typ {BLACK}auf {WHITE}Alle Arten von Einstellungen
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Zeige alle Suchergebnisse an indem{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING} {BLACK}und {SILVER}Art {BLACK}auf {WHITE}Alle Arten von Einstellungen
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Typ {BLACK}auf {WHITE}Alle Arten von Einstellungen
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Zeige alle Suchergebnisse an indem{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING} {BLACK}und {SILVER}Art {BLACK}auf {WHITE}Alle Arten von Einstellungen
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Aus
@@ -2176,7 +2175,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... kein
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}… GPU-Treiber brachte das Spiel zum Absturz. Hardwarebeschleunigung deaktiviert
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Neues Spiel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Spiel laden
@@ -2188,11 +2186,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Mehrspie
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spieleinstellungen
 STR_INTRO_HIGHSCORE                                             :{BLACK}Bestenliste
 STR_INTRO_HELP                                                  :{BLACK}Hilfe u. Anleitungen
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Einstellungen
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-Einstellungen
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Erweiterungen herunterladen
-STR_INTRO_AI_SETTINGS                                           :{BLACK}KI-Einstellungen
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Spielskripteinstellungen
 STR_INTRO_QUIT                                                  :{BLACK}Beenden
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Ein neues Spiel beginnen. Strg+Klick überspringt Karteneinstellungen
@@ -2210,11 +2204,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Spielzeu
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Spieleinstellungen öffnen
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Bestenliste öffnen
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Zugriff auf Dokumentation und Onlinehilfsmittel erhalten
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Einstellungen öffnen
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF-Einstellungen öffnen
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Prüfe, ob neue oder aktualisierte Erweiterungen zum Herunterladen bereitstehen
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}KI-Einstellungen öffnen
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Spielskripteinstellungen öffnen
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}OpenTTD beenden
 
 STR_INTRO_BASESET                                               :{BLACK}Den momentan ausgewählten Basisgrafiken fehl{P 0 "t" "en"} {NUM} Sprite{P 0 "" "s"}. Bitte überprüfen, ob es Updates für die Basisgrafiken gibt.
@@ -3045,6 +3035,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Stadtgr
 STR_FOUND_TOWN_CITY                                             :{BLACK}Großstadt
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Großstädte wachsen schneller als normale Städte und sind (abhängig von den Einstellungen) bereits bei der Gründung größer
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Städtischer Straßenbauplan:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Straßenbauplan für diese Stadt auswählen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3489,15 +3480,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Voreinst
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Liste der verfügbaren Voreinstellungen. Eine wählen, um deren Namen zum Speichern auszuwählen
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Namen der Voreinstellung eingeben
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Name, der zum Speichern der Voreinstellung verwendet wird
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Abbrechen
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Voreinstellung nicht ändern
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Speichern
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Voreinstellung unter dem ausgewählten Namen speichern
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Parameter der Basisgrafiken ändern
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF Parameter ändern
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Schließen
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Zurücksetzen
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Alle Parameter auf ihre Vorgabewerte zurücksetzen
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -4725,7 +4713,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Fahrplan
 STR_TIMETABLE_NO_TRAVEL                                         :Nicht unterwegs
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Unterwegs (automatisch; Fahrplan abhängig vom nächsten manuellen Auftrag)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Unterwegs (ohne Fahrplan)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Fahrt (ohne Fahrplan) mit höchstens {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} unterwegs
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Fahrt zu {STRING} mit höchstens {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Fahre ({STRING}, ohne Fahrplan)
@@ -4849,8 +4836,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Anwenden
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Ausgewähltes Skript verwenden
-STR_AI_LIST_CANCEL                                              :{BLACK}Abbrechen
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Skript nicht wechseln
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Screenshot erzeugen
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normaler Screenshot
@@ -4863,7 +4848,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Übersic
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :KI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Spielskript
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Schließen
 STR_AI_SETTINGS_RESET                                           :{BLACK}Zurücksetzen
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 051e2f4ed7..14c9b738c8 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -347,7 +347,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Κλεί
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Τίτλος παραθύρου - σύρετε το για να το μετακινήσετε
 STR_TOOLTIP_SHADE                                               :{BLACK}Απόκρυψη παραθύρου - Εμφάνιση μόνο της μπάρας τιτλου
 STR_TOOLTIP_DEBUG                                               :{BLACK}Εμφάνιση πληροφοριών αποσφαλμάτωσης για NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Επαναφέρει το παράθυρο στο προκαθορισμένο μέγεθος. Με Ctrl+Κλικ αποθηκεύεται το τρέχον μέγεθος ως προκαθορισμένο
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Επαναφέρει το παράθυρο στο προκαθορισμένο μέγεθος. Με Ctrl+Κλικ αποθηκεύεται το τρέχον μέγεθος ως προκαθορισμένο. Με διπλό Ctrl+Κλικ εκτελείται επαναφορά του αποθηκευμένου προκαθορισμένου στην αρχική τιμή
 STR_TOOLTIP_STICKY                                              :{BLACK}Σημειώστε αυτό το παραθύρο ωστέ να μην κλείνει από το πλήκτρο «Κλείσιμο Όλων των Παραθύρων». Πατήστε Ctrl+Κλικ για να αποθηκεύσετε την κατάσταση απο επιλογή
 STR_TOOLTIP_RESIZE                                              :{BLACK}Πατήστε και σύρετε για να αλλάξετε το μέγεθος του παραθύρου
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Εναλλαγή μεγάλου/μικρού παραθύρου
@@ -457,10 +457,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}Εμφά
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Εμφάνιση εταιρικών γραφημάτων και ποσοστών πληρωμής φορτίου
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Εμφάνιση πίνακα κατάταξης των εταιριών
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Εμφάνιση λίστας βιομηχανιών ή χρηματοδότηση κατασκευής νέας βιομηχανίας
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Εμφάνιση λίστας με τα τρένα της εταιρίας. Με Ctrl+Κλικ εναλλάσσεται η εμφάνιση/απόκρυψη των ομάδων οχημάτων
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Εμφάνιση λίστας με τα οδικά οχήματα της εταιρίας. Με Ctrl+Κλικ εναλλάσσεται η εμφάνιση/απόκρυψη των ομάδων οχημάτων
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Εμφάνιση λίστας με τα πλοία της εταιρίας. Με Ctrl+Κλικ εναλλάσσεται η εμφάνιση/απόκρυψη των ομάδων οχημάτων
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Εμφάνιση λίστας με τα αεροσκάφη της εταιρίας. Με Ctrl+Κλικ εναλλάσσεται η εμφάνιση/απόκρυψη των ομάδων οχημάτων
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Εμφάνιση λίστας με τα τρένα της εταιρίας. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων οχημάτων
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Εμφάνιση λίστας με τα οδικά οχήματα της εταιρίας.Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων οχημάτων
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Εμφάνιση λίστας με τα πλοία της εταιρίας. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων οχημάτων
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Εμφάνιση λίστας με τα αεροσκάφη της εταιρίας. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων οχημάτων
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Μεγέθυνση εικόνας
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Σμίκρυνση εικόνας
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Κατασκευή σιδηροτροχιάς
@@ -506,7 +506,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Τοποθέτ
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Επιλογές παιχνιδιού
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Ρυθμίσεις
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Ρυθμίσεις AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Ρυθμίσεις σενάριου παιχνιδιού
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Ρυθμίσεις NewGRF
@@ -1052,22 +1051,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Επικ
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Επιλογές Παιχνιδιού
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Γενικά
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Επιλέξτε γενικές ρυθμίσεις
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Επιλέξτε γενικές ρυθμίσεις
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Γραφικά
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Επιλέξτε ρυθμίσεις γραφικών
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Επιλέξτε ρυθμίσεις γραφικών
 STR_GAME_OPTIONS_TAB_SOUND                                      :Ήχος
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Επιλέξτε ρυθμίσεις ήχου και μουσικής
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Επιλέξτε ρυθμίσεις ήχου και μουσικής
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Κοινωνικά
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Επιλέξτε ρυθμίσεις κοινωνικής ενσωμάτωσης
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Επιλέξτε ρυθμίσεις κοινωνικής ενσωμάτωσης
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Για προχωρημένους
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Αλλαγή ρυθμίσεων για προχωρημένους
 
 STR_GAME_OPTIONS_VOLUME                                         :Ένταση Ήχου
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Ηχητικά εφέ
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Μουσική
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Νομισματικές μονάδες
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Επιλογή νομισματικών μονάδων
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Νομισματικές μονάδες
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Επιλογή νομισματικών μονάδων
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1118,8 +1121,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Λετονικ
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Πορτογαλικό Εσκούδο
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ουκρανικά Γρίβνα
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Αυτόματη αποθήκευση
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Επιλογή διάκενου ανάμεσα στις αυτόματες αποθηκεύσεις
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Αυτόματη αποθήκευση
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Επιλογή διαστήματος μεταξύ αυτόματων αποθηκεύσεων
 
 # Autosave dropdown
 ###length 5
@@ -1129,77 +1132,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Ανά 30 λε
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Ανά 60 λεπτά
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Ανά 120 λεπτά
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Γλώσσα
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Επιλογή της γλώσσας του παιχνιδιού
+STR_GAME_OPTIONS_LANGUAGE                                       :Γλώσσα
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Επιλογή της γλώσσας του παιχνιδιού
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% ολοκλήρωση)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Πλήρης οθόνη
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Τσεκάρετε αυτό το κουτάκι ωστε να παίξετε το OpenTTD σε όλη την οθόνη
+STR_GAME_OPTIONS_FULLSCREEN                                     :Πλήρης οθόνη
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Τσεκάρετε αυτό το κουτάκι ωστε να παίξετε το OpenTTD σε όλη την οθόνη
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ανάλυση οθόνης
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Διαλέξτε την ανάλυση της οθόνης που θέλετε
+STR_GAME_OPTIONS_RESOLUTION                                     :Ανάλυση οθόνης
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Διαλέξτε την ανάλυση της οθόνης
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :άλλη
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Επιτάχυνση υλικού
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Τσεκάρετε αυτό το κουτί για να επιτρέψετε στο OpenTTD να δοκιμάσει να χρησιμοποιήσει την επιτάχυνση υλικού. Η αλλαγή αυτή θα εφαρμοστεί μόνο μετά από επανεκκίνηση του παιχνιδιού
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Επιτάχυνση υλικού
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Τσεκάρετε αυτό το κουτί για να επιτρέψετε στο OpenTTD να δοκιμάσει να χρησιμοποιήσει την επιτάχυνση υλικού. Η αλλαγή αυτή θα εφαρμοστεί μόνο μετά από επανεκκίνηση του παιχνιδιού
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Η ρύθμιση θα εφαρμοστεί μόνο μετά από επανεκκίνηση του παιχνιδιού
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Τσεκάρετε αυτό το κουτί για να ενεργοποιήσετε το v-sync στην οθόνη. Η αλλαγή αυτή θα εφαρμοστεί μετά από επανεκκίνηση του παιχνιδιού. Λειτουργεί μόνο με ενεργοποιημένη την επιτάχυνση υλικού
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Τσεκάρετε αυτό το κουτί για να ενεργοποιήσετε το v-sync (κάθετος συγχρονισμός) στην οθόνη. Η αλλαγή αυτή θα εφαρμοστεί μετά από επανεκκίνηση του παιχνιδιού. Λειτουργεί μόνο με ενεργοποιημένη την επιτάχυνση υλικού
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Τρέχων οδηγός: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Τρέχων οδηγός: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Μέγεθος διεπαφής
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Σύρετε το κουμπί για να ορίσετε το μέγεθος του περιβάλλοντος διεπαφής. Ctrl+Σύρσιμο για συνεχή προσαρμογή
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Αυτόματος εντοπισμός μεγέθους
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Τσεκάρετε αυτό το κουτάκι για να ανιχνεύεται το μέγεθος της διεπαφής αυτόματα
+STR_GAME_OPTIONS_INTERFACE                                      :Διεπαφή
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Κλίση κλίμακας
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Τσεκάρετε αυτό το κουτί για να αλλάζει μέγεθος το περίγραμμα με βάση το μέγεθος της διεπαφής
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Μέγεθος διεπαφής
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Σύρετε το κουμπί για να ορίσετε το μέγεθος της διεπαφής. Ctrl+Σύρσιμο για συνεχή προσαρμογή
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Αυτόματος εντοπισμός μεγέθους
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Τσεκάρετε αυτό το κουτάκι για να ανιχνεύεται το μέγεθος της διεπαφής αυτόματα
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Χρήση παραδοσιακής γραμματοσειράς
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Τσεκάρετε αυτό το κουτάκι εάν προτιμάτε να χρησιμοποιήσετε την παραδοσιακή γραμματοσειρά σταθερού μεγέθους
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Εξομάλυνση εμφάνισης γραμματοσειράς
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Τσεκάρετε αυτό το κουτάκι για εξομάλυνση εμφάνισης γραμματοσειράς
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Κλίση κλίμακας
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Τσεκάρετε αυτό το κουτί για να αλλάζει μέγεθος το περίγραμμα με βάση το μέγεθος της διεπαφής
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Χρήση παραδοσιακής γραμματοσειράς
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Τσεκάρετε αυτό το κουτάκι εάν προτιμάτε να χρησιμοποιήσετε την παραδοσιακή γραμματοσειρά σταθερού μεγέθους
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Εξομάλυνση εμφάνισης γραμματοσειράς
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Τσεκάρετε αυτό το κουτάκι για εξομάλυνση εμφάνισης γραμματοσειράς μεταβλητού μεγέθους
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Αυτοματοποιημένη έρευνα
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Συμμετοχή σε αυτοματοποιημένη έρευνα
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Όταν είναι ενεργοποιημένο, το OpenTTD θα μεταδίδει μια έρευνα κατά την έξοδο παιχνιδιού
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Πληροφορίες για την αυτοματοποιημένη έρευνα και ιδιωτικότητα
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Αυτό ανοίγει ένα πρόγραμμα περιήγησης/browser με περισσότερες πληροφορίες σχετικά με την αυτοματοποιημένη έρευνα
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Προεπισκόπηση αποτελέσματος έρευνας
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Εμφάνιση του αποτελέσματος της έρευνας του τρέχοντος παιχνιδιού
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Αυτοματοποιημένη έρευνα
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Συμμετοχή σε αυτοματοποιημένη έρευνα
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Όταν είναι ενεργοποιημένο, το OpenTTD θα μεταδίδει μια έρευνα κατά την έξοδο από ένα παιχνίδι
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Πληροφορίες για την αυτοματοποιημένη έρευνα και ιδιωτικότητα
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Αυτό ανοίγει ένα πρόγραμμα περιήγησης με περισσότερες πληροφορίες σχετικά με την αυτοματοποιημένη έρευνα
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Προεπισκόπηση αποτελέσματος έρευνας
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Εμφάνιση του αποτελέσματος έρευνας του τρέχοντος παιχνιδιού
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Γραφικά
+STR_GAME_OPTIONS_DISPLAY                                        :Οθόνη
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Εμφάνιση ρυθμού ανανέωσης
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Επιλέξτε τον ρυθμό ανανέωσης της οθόνης
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Εμφάνιση ρυθμού ανανέωσης
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Επιλέξτε τον ρυθμό ανανέωσης της οθόνης
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Ρυθμοί ανανέωσης μεγαλύτεροι από 60Hz μπορεί να μειώσουν την απόδοση.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Βασικό σετ γραφικών
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Επιλογή του βασικού σετ γραφικών που θα χρησιμοποιηθεί (δεν αλλάζει μέσα από ένα παιχνίδι, μόνο από το κεντρικό μενού)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Επιπλέον πληροφορίες σχετικά με το βασικό πακέτο γραφικών
+STR_GAME_OPTIONS_BASE_GRF                                       :Βασικό σετ γραφικών
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Επιλογή του βασικού σετ γραφικών που θα χρησιμοποιηθεί (δεν αλλάζει μέσα από ένα παιχνίδι, μόνο από το κεντρικό μενού)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Επιπλέον πληροφορίες σχετικά με το βασικό πακέτο γραφικών
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Σετ βασικών ήχων
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Επιλογή των βασικών ήχων που θα χρησιμοποιηθούν (δεν αλλάζει μέσα από ένα παιχνίδι, μόνο από το κεντρικό μενού)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Επιπλέον πληροφορίες σχετικά με τους βασικούς ήχους
+STR_GAME_OPTIONS_BASE_SFX                                       :Σετ βασικών ήχων
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Επιλογή του βασικού σετ ήχων που θα χρησιμοποιηθεί (δεν αλλάζει μέσα από ένα παιχνίδι, μόνο από το κεντρικό μενού)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Επιπλέον πληροφορίες σχετικά με τους βασικούς ήχους
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Βασικό σετ μουσικής
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Επιλέξτε το βασικό σετ μουσικής για χρήση
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Επιπλέον πληροφορίες σχετικά με το βασικό πακέτο μουσικής
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Βασικό σετ μουσικής
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Επιλέξτε το βασικό σετ μουσικής για χρήση
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Επιπλέον πληροφορίες σχετικά με το βασικό πακέτο μουσικής
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Λήψη Περιεχομένου
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Ελέγξτε για νέο και ενημερωμένο περιεχόμενο προς λήψη
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(δεν έχουν εγκατασταθεί plugins για διασύνδεση με πλατφόρμες κοινωνικής δικτύωσης)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(δεν έχουν εγκατασταθεί πρόσθετα (plugins) για διασύνδεση με πλατφόρμες κοινωνικής δικτύωσης)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Πλατφόρμα:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin state:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Πλατφόρμα:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Κατάσταση προσθέτων (plugins):
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Τρέχει
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Αποτυχία αρχικοποίησης
@@ -1312,12 +1317,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Ανεκτικ
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Δεν υπάρχει διαθέσιμο κατάλληλο Al...{}{}Μπορείτε να κατεβάσετε AI μέσω του συστήματος «Διαδικτυακού Περιεχομένου»
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Ρυθμίσεις
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Φιλτράρισμα:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Επέκταση όλων
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Σύμπτυξη όλων
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Επαναφορά όλων των τιμών
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Φίλτρο:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Επέκταση όλων
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Σύμπτυξη όλων
+STR_CONFIG_SETTING_RESET_ALL                                    :Επαναφορά όλων των τιμών
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(δεν υπάρχει διαθέσιμη επεξήγηση)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Προκαθορισμένη τιμή: {ORANGE}{STRING}
@@ -1330,9 +1334,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Ρύθμιση
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Προσοχή!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Αυτή η ενέργεια θα επαναφέρει όλες τις ρυθμίσεις του παιχνιδιού στις προκαθορισμένες τιμές τους.{}Σίγουρα θέλετε να προχωρήσετε;
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Κατηγορία:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Τύπος:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Περιορίζει την παρακάτω λίστα με τη χρήση προκαθορισμένων φίλτρων
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Κατηγορία:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Τύπος:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Περιορίζει την παρακάτω λίστα με τη χρήση προκαθορισμένων φίλτρων
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Βασικές (εμφάνιση μόνο σημαντικών ρυθμίσεων)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Για προχωρημένους (εμφάνιση των περισσότερων ρυθμίσεων)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Για ειδικούς (εμφάνιση όλων των ρυθμίσεων, ακομη και παράξενων)
@@ -1349,9 +1353,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Ρυθμίσε
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Κανένα -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Εμφάνιση όλων των αποτελεσμάτων αναζήτησης ανά ρύθμιση{}{SILVER}Κατηγορία {BLACK}εώς {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Εμφάνιση όλων των αποτελεσμάτων αναζήτησης ανά ρύθμιση{}{SILVER}Τύπος {BLACK}εώς {WHITE}Όλοι οι τύποι ρυθμίσεων
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Εμφάνιση όλων των αποτελεσμάτων αναζήτησης ανά ρύθμιση{}{SILVER}Κατηγορία {BLACK}εώς {WHITE}{STRING} {BLACK}και {SILVER}Τύπος {BLACK}εώς {WHITE}Όλοι οι τύποι ρυθμίσεων
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Εμφάνιση όλων των αποτελεσμάτων αναζήτησης ανά ρύθμιση{}{PUSH_COLOUR}{SILVER}Κατηγορία {POP_COLOUR}εώς {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Εμφάνιση όλων των αποτελεσμάτων αναζήτησης ανά ρύθμιση{}{PUSH_COLOUR}{SILVER}Τύπος {POP_COLOUR}εώς {WHITE}Όλοι οι τύποι ρυθμίσεων
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Εμφάνιση όλων των αποτελεσμάτων αναζήτησης ανά ρύθμιση{}{PUSH_COLOUR}{SILVER}Κατηγορία {POP_COLOUR}εώς {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}και {PUSH_COLOUR}{SILVER}Τύπος {POP_COLOUR}εώς {WHITE}Όλοι οι τύποι ρυθμίσεων
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ανενεργό
@@ -2284,7 +2288,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... δε
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Το πρόγραμμα οδήγησης της κάρτας γραφικών προκάλεσε πρόβλημα στο παιχνίδι. Η επιτάχυνση υλικού απενεργοποιήθηκε
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Νέο Παιχνίδι
 STR_INTRO_LOAD_GAME                                             :{BLACK}Φόρτωση Παιχνιδιού
@@ -2296,11 +2301,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Παιχ
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Επιλογές Παιχνιδιού
 STR_INTRO_HIGHSCORE                                             :{BLACK}Πίνακας Βαθμολογιών
 STR_INTRO_HELP                                                  :{BLACK}Βοήθεια και εγχειρίδια χρήσης
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Ρυθμίσεις
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Ρυθμίσεις NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Διαδικτυακό Περιεχόμενο
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Ρυθμίσεις AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Ρυθμίσεις σενάριου παιχνιδιού
 STR_INTRO_QUIT                                                  :{BLACK}Έξοδος
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Έναρξη νέου παιχνιδιού. Με Ctrl+Κλικ παρακάμπτεται η ρύθμιση του χάρτη
@@ -2318,11 +2319,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Επιλ
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Εμφάνιση επιλογών παιχνιδιού
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Εμφάνιση του πίνακα βαθμολογιών
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Αποκτήστε πρόσβαση στην τεκμηρίωση και σε διαδικτυακούς πόρους
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Εμφάνιση ρυθμίσεων
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Εμφάνιση ρυθμίσεων NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Έλεγχος για νέο και ανανεωμένο περιεχόμενο για λήψη
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Εμφάνιση ρυθμίσεων ΤΝ
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Εμφάνιση ρυθμίσεων σενάριου παιχνιδιού
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Έξοδος από το «OpenTTD»
 
 STR_INTRO_BASESET                                               :{BLACK}Λείπουν {NUM} sprite{P "" s} από το επιλεγμένο βασικό σετ γραφικών. Παρακαλούμε ελέγξτε για ενημερώσεις του βασικού σετ.
@@ -3169,6 +3166,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Επιλ
 STR_FOUND_TOWN_CITY                                             :{BLACK}Πόλη
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Οι πόλεις αναπτύσσονται ταχύτερα από τις απλές κωμοπόλεις{}Ανάλογα με τις ρυθμίσεις, είναι μεγαλύτερες όταν ιδρύονται
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Επέκταση πόλης:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Κτίρια
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Αύξηση κτιρίων πόλεων
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Δρόμοι
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Αύξηση δρόμων πόλεων
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Σχέδιο δρόμων πόλης
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Επιλογή σχεδίου δρόμων που χρησιμοποιείται για αυτή την πόλη
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Αρχικό
@@ -3618,15 +3621,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Αποθ
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Λίστα διαθέσιμων προκαθορισμένων, επιλέχτε ένα για την αντιγραφή το στο όνομα αποθήκευσης απο κάτω
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Δώστε ένα όνομα για το προκαθορισμένο
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Τρέχον επιλεγμένο όνομα για το προκαθορισμένο για αποθήκευση
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Ακύρωση
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Μη αλλαγή του προκαθορισμένου
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Αποθήκευση
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Αποθήκευση προκαθορισμένου, χρησιμοποιώντας το επιλεγμένο όνομα
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Αλλαγή παραμέτρων βασικού σετ γραφικών
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Αλλαγή παραμέτρων NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Κλείσιμο
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Επαναφορά
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Ρύθμιση όλων των παραμέτρων στις προεπιλεγμένες τιμές
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Παράμετρος {NUM}
@@ -3795,6 +3795,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Αλλα
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Επέκταση
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Αύξηση μεγέθους της πόλης
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Επέκταση κτιρίων
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Αύξηση κτιρίων της πόλης
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Επέκταση δρόμων
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Αύξηση δρόμων της πόλης
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Διαγραφή
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Διαγραφή της πόλης ολοκληρωτικά
 
@@ -4541,10 +4545,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Εμφά
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Εμφάνιση των εντολών του αεροσκάφους. Με Ctrl+Κλικ εμφανίζεται το χρονοδιάγραμμα
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Εμφάνιση λεπτομερειών τρένου
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Εμφάνιση λεπτομερειών οδικού οχήματος
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Εμφάνιση λεπτομερειών πλοίου
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Εμφάνιση λεπτομερειών αεροσκάφους
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Εμφάνιση λεπτομερειών τρένου. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων τρένων
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Εμφάνιση λεπτομερειών οχήματος. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων οχημάτων
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Εμφάνιση λεπτομερειών πλοίου. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων πλοίων
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Εμφάνιση λεπτομερειών αεροσκάφους. Ctrl+Κλικ για εμφάνιση/απόκρυψη των ομάδων αεροσκαφών
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Τρέχουσα δράση τρένου - πατήστε για να σταματήσετε/ξεκινήσετε το τρένο
@@ -4868,15 +4872,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Δρομ
 STR_TIMETABLE_NO_TRAVEL                                         :Μην ταξιδέψεις
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Ταξίδι (αυτόματα· με δρομολόγιο στην επόμενη μη αυτόματη εντολή)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ταξίδεψε (όχι μεσώ δρομολογίου)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Ταξίδι (μη δρομολογημένο) με μέγιστη ταχύτητα {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Ταξίδι (μη δρομολογημένο) με μέγιστη ταχύτητα {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Ταξίδεψε για {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Ταξίδεψε για {STRING} με στο μέγιστο {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Ταξίδι (για {STRING}, μη δρομολογημένο)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Ταξίδι γιά {STRING}, (μη δρομολογημένο) με μέγιστη ταχύτητα {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(αναμονή για {STRING}, μη δρομολογημένο)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(ταξίδι για {STRING}, μη δρομολογημένο)
-STR_TIMETABLE_STAY_FOR                                          :και μείνε για {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :και ταξίδεψε για {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}και μείνε για {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}και ταξίδεψε για {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Θα χρειαστούν περίπου {STRING} για να ολοκληρωθεί αυτό το χρονοδιάγραμμα
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Το δρομολόγιο αυτό θα χρειαστεί τουλάχιστον {STRING} για να ολοκληρωθεί
@@ -4995,8 +4999,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}Ιστ
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Αποδοχή
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Αποδοχή της επιλεγμένης δέσμης ενεργειών
-STR_AI_LIST_CANCEL                                              :{BLACK}Άκυρωση
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Να μην γίνει αλλαγή δέσμης ενεργειών
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Βγάλτε στιγμιότυπο εικόνας
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Κανονικό στιγμιότυπο
@@ -5009,7 +5011,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Στιγ
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Παράμετροι ΤΝ (Τεχνητης Νοημοσύνης)
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Παράμετροι σεναρίου παιχνιδιού
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Κλείσιμο
 STR_AI_SETTINGS_RESET                                           :{BLACK}Επαναφορά
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5991,6 +5992,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}δισ.
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}τρισ.
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -6030,3 +6032,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Άνοιγμα ρυθμίσεων badge
+STR_BADGE_CONFIG_RESET                                          :Επαναφορά
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Εικονίδια Badge
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Φίλτρα Badge
+STR_BADGE_CONFIG_PREVIEW                                        :Προεπισκόπιση Εικόνας
+STR_BADGE_CONFIG_NAME                                           :Όνομα
+STR_BADGE_FILTER_ANY_LABEL                                      :Κάθε {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} είναι {STRING}
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index efdb283652..3603fe79e4 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -426,7 +426,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :יציאה
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :אפשרויות המשחק
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :הגדרות
 STR_SETTINGS_MENU_AI_SETTINGS                                   :הגדרות בינה מלאכותית
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :אפשרויות סקריפטי משחק
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :הגדרות GRF חדש
@@ -908,8 +907,9 @@ STR_GAME_OPTIONS_TAB_GRAPHICS                                   :גרפיקות
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}מטבע
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}בחירת מטבע
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :מטבע
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :בחירת מטבע
 
 
 ###length 45
@@ -950,67 +950,67 @@ STR_GAME_OPTIONS_CURRENCY_IRR                                   :ריאל איר
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :רובל רוסי
 STR_GAME_OPTIONS_CURRENCY_INR                                   :רופי הודי
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}שמירה אוטומטית
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}בחר פרק זמן בין שמירות אוטומטיות
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :שמירה אוטומטית
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :בחר פרק זמן בין שמירות אוטומטיות
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :כבוי
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}שפה
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}בחר את שפת הממשק
+STR_GAME_OPTIONS_LANGUAGE                                       :שפה
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :בחר את שפת הממשק
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% הסתיים)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}מסך מלא
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}סמן תיבה זו כדי לשחק OpenTTD על כל המסך
+STR_GAME_OPTIONS_FULLSCREEN                                     :מסך מלא
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :סמן תיבה זו כדי לשחק OpenTTD על כל המסך
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}רזלוציית המסך
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}בחר את רזולוציית המסך
+STR_GAME_OPTIONS_RESOLUTION                                     :רזלוציית המסך
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :בחר את רזולוציית המסך
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :אחר
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
 STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :האצת חומרה
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}סמן תיבה זו כדי לאפשר ל-OpenTTD לנסות לבצע האצת חומרה. ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :סמן תיבה זו כדי לאפשר ל-OpenTTD לנסות לבצע האצת חומרה. ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}סמן תיבה זו כדי לבצע סנכרון אנכי (v-sync). ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש. עובד רק כאשר האצת החומרה מופעלת
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :סמן תיבה זו כדי לבצע סנכרון אנכי (v-sync). ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש. עובד רק כאשר האצת החומרה מופעלת
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}מנהל ההתקן הנוכחי: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :מנהל ההתקן הנוכחי: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}גודל הממשק
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}זהה גודל אוטומטית
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}סמן תיבה זו כדי לזהות את גודל הממשק אוטומטית
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}התאם שוליים
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}סמן תיבה זו כדי להתאים את השוליים לפי גודל הממשק
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :גודל הממשק
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :זהה גודל אוטומטית
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :סמן תיבה זו כדי לזהות את גודל הממשק אוטומטית
+
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :התאם שוליים
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :סמן תיבה זו כדי להתאים את השוליים לפי גודל הממשק
 
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}סקר אוטומטי
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}השתתף בסקר אוטומטי
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}כאשר מופעל, OpenTTD יפתח סקר כשתעזוב משחק
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}אודות סקרים ופרטיות
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}פותח דפדפן עם מידע נוסף לגבי הסקר האוטומטי
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}צפייה מקדימה בתוצאות הסקר
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}הצג את תוצאות הסקר של המשחק הנוכחי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :סקר אוטומטי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :השתתף בסקר אוטומטי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :כאשר מופעל, OpenTTD יפתח סקר כשתעזוב משחק
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :אודות סקרים ופרטיות
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :פותח דפדפן עם מידע נוסף לגבי הסקר האוטומטי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :צפייה מקדימה בתוצאות הסקר
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :הצג את תוצאות הסקר של המשחק הנוכחי
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}גרפיקה
 
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}עדכוני סמך מעל 60Hz עלולים להשפיע על ביצועים.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}ערכת גרפיקה בסיסית
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}בחר בערכת גרפיקה בסיסית לשימוש
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}מידע נוסף אודות ערכת הגרפיקה הבסיסית
+STR_GAME_OPTIONS_BASE_GRF                                       :ערכת גרפיקה בסיסית
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :בחר בערכת גרפיקה בסיסית לשימוש
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :מידע נוסף אודות ערכת הגרפיקה הבסיסית
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}ערכת צלילים בסיסיים
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}בחר את ערכת הצלילים הבסיסיים לשימוש
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}מידע נוסף אודות ערכת הצלילים הבסיסיים
+STR_GAME_OPTIONS_BASE_SFX                                       :ערכת צלילים בסיסיים
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :בחר את ערכת הצלילים הבסיסיים לשימוש
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :מידע נוסף אודות ערכת הצלילים הבסיסיים
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}ערכת מוזיקת בסיס
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}בחר בערכת מוזיקת הבסיס לשימוש
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}מידע נוסף אודות ערכת המוזיקה הבסיסית
+STR_GAME_OPTIONS_BASE_MUSIC                                     :ערכת מוזיקת בסיס
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :בחר בערכת מוזיקת הבסיס לשימוש
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :מידע נוסף אודות ערכת המוזיקה הבסיסית
 
 
 
@@ -1116,12 +1116,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :מתירני
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}אין בינות מלאכותיות מתאימות...{}באפשרותך להוריד בינות מלאכותיות בעזרת מערכת ה'תוכן המקוון'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}הגדרות
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}מחרוזת סינון:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}הרחב הכל
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}צמצם הכל
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}אפס את כל הערכים
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :מחרוזת סינון:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :הרחב הכל
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :צמצם הכל
+STR_CONFIG_SETTING_RESET_ALL                                    :אפס את כל הערכים
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(אין הסבר זמין)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}ערך ברירת מחדל: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}סוג הגדרה: {ORANGE}{STRING}
@@ -1132,9 +1131,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :הגדרת חב
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :הגדרת חברה (מאוחסנת במשחק שמור; משפיעה על החברה הנוכחית בלבד)
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}זהירות!
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}קטגוריה:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}סוג:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}מגביל את הרשימה להלן תוך שימוש בסינון שהוגדר מראש.
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :קטגוריה:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :סוג:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :מגביל את הרשימה להלן תוך שימוש בסינון שהוגדר מראש.
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :הגדרות בסיסיות (הצג רק הגדרות חשובות)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :הגדרות מתקדמות (הצג את רוב ההגדרות)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :הגדרות מומחה (הצג את כל ההגדרות, כולל הגדרות משונות)
@@ -1151,9 +1150,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :הגדרות ח
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- ללא -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}הצג את תוצאות החיפוש בהגדרת {SILVER}הקטגוריה{} {BLACK} ל{WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}הצג את תוצאות החיפוש בהגדרת {SILVER}הסוג{} {BLACK}ל{WHITE}כל סוגי ההגדרות
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}הצג את תוצאות החיפוש בהגדרת{SILVER}הקטגוריה{} {BLACK}ל{WHITE}{STRING} {BLACK}וגם את {SILVER}הסוג {BLACK}ל{WHITE}כל סוגי ההגדרות
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :הצג את תוצאות החיפוש בהגדרת {SILVER}הקטגוריה{} {BLACK} ל{WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :הצג את תוצאות החיפוש בהגדרת {SILVER}הסוג{} {BLACK}ל{WHITE}כל סוגי ההגדרות
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :הצג את תוצאות החיפוש בהגדרת{SILVER}הקטגוריה{} {BLACK}ל{WHITE}{STRING} {BLACK}וגם את {SILVER}הסוג {BLACK}ל{WHITE}כל סוגי ההגדרות
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :כבוי
@@ -1992,7 +1991,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE} הקצ
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... לא נמצא כרטיס מסך תואם, האצת חומרה מושבתת
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}משחק חדש
 STR_INTRO_LOAD_GAME                                             :{BLACK}טען משחק
@@ -2004,11 +2002,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}משחק
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}אפשרויות משחק
 STR_INTRO_HIGHSCORE                                             :{BLACK}טבלת ניקוד מירבי
 STR_INTRO_HELP                                                  :{BLACK}עזרה ומדריכים
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}הגדרות
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}(NewGRF)הגדרות שדרוג גראפי
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK} בדוק תוכן מקוון
-STR_INTRO_AI_SETTINGS                                           :{BLACK}הגדרות בינה מלאכותית
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}הגדרות סקריפטי משחק
 STR_INTRO_QUIT                                                  :{BLACK}יציאה
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}התחל משחק חדש. Ctrl+לחיצה מדלג על תצורת מפה
@@ -2026,11 +2020,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}ארץ 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}הצג הגדרות משחק
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}הצג טבלת ניקוד מירבי
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}קבל גישה לתיעוד ולמשאבים מקוונים
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}פתח הגדרות
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}פתח הגדרות NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK} חפש תוכן חדש/מעודכן להורדה
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}פתח הגדרות בינה מלאכותית
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}פתח הגדרות סקריפטי משחק
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}צא מ-'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}חסרים {NUM} ספרייט עבור גרפיקות הבסיס שנבחרו. אנא בדוק עדכונים לערכה זו.
@@ -2766,6 +2756,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}בחר 
 STR_FOUND_TOWN_CITY                                             :{BLACK}עיר
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}ערים גדלות מהר יותר מאשר עיירות{}כתלות בהגדרות, הן גדולות יותר כאשר הן נוסדות
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}מתווה כביש של עיר:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}בחר מתווה כביש לשימוש עבור עיר זו
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}מקורי
@@ -3172,14 +3163,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}שמור
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}הצג את כל הסביבות הגראפיות, בחר אחת כדי להעתיק את שמה לשמירה
 STR_SAVE_PRESET_TITLE                                           :{BLACK}הכנס שם לסביבה הגראפית
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}השם הנבחר לשמירת הסביבה הגראפית
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}ביטול
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}אל תשנה את הסביבה הגראפית
 STR_SAVE_PRESET_SAVE                                            :{BLACK}שמור
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}שמור את הסביבה הגראפית עם השם שנבחר
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}שנה/י פרמטרים של NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}סגור
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}אתחל
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}הגדר את כל הפרמטרים לערך ברירת המחדל שלהם
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :פרמטר {NUM}
@@ -4297,7 +4285,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}לוח 
 STR_TIMETABLE_NO_TRAVEL                                         :ללא מסע
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :סע (אוטומטי; לוח זמנים נקבע לפי הפקודה הידנית הבאה)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :(מסע (ללא לוח זמנים
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :סע במהירות שהיא לכל היותר {2:VELOCITY} (ללא לוח זמנים)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} ערוך מסע ל
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :סע למשך {STRING} במהירות שהיא לכל היותר {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :מסע (עבור {STRING}, לא מתוזמן)
@@ -4412,8 +4399,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}קיש
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}אשר
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK} בחר בינה מלאכותית שהודגשה
-STR_AI_LIST_CANCEL                                              :{BLACK}בטל
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}אל תשנה את התסריט
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}צלם מסך
 STR_SCREENSHOT_SCREENSHOT                                       :תמונת מסך רגילה
@@ -4422,7 +4407,6 @@ STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}צילו
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :שחקן מחשב
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}סגור
 STR_AI_SETTINGS_RESET                                           :{BLACK}אתחל
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt
index 0195637126..09b9d815a7 100644
--- a/src/lang/hindi.txt
+++ b/src/lang/hindi.txt
@@ -157,7 +157,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :निकास
 
 
 # Settings menu
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :समायोजन
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :पथ-संकेतों के नाम दिखायें
 STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :पारदर्शी संकेत
 
@@ -328,6 +327,7 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}इस 
 
 
 
+
 ###length 45
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :फिनलैंड मार्का
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :आइसलैंडिक क्रोना
@@ -342,11 +342,12 @@ STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}
 
 
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}हार्डवेयर एक्सिलरेशन
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :हार्डवेयर एक्सिलरेशन
 
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}इंटरफ़ेस का आकार
+
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :इंटरफ़ेस का आकार
 
 
 
@@ -397,7 +398,7 @@ STR_DISASTER_NORMAL                                             :सामान
 STR_CITY_APPROVAL_TOLERANT                                      :सहिष्णु
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}डिफ़ॉल्ट मान: {ORANGE}{STRING}
 
 
@@ -930,6 +931,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}लघ
 STR_FOUND_TOWN_CITY                                             :{BLACK}शहर
 
 
+
 # Fund new industry window
 
 # Industry cargoes window
@@ -1022,8 +1024,6 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}प्
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}उपलब्ध प्रीसेट की सूची, इसे नीचे सेव नाम पर कॉपी करने के लिए एक का चयन करें
 STR_SAVE_PRESET_TITLE                                           :{BLACK}प्रीसेट के लिए एक नाम दर्ज करें
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}सहेजने के लिए प्रीसेट के लिए वर्तमान में चयनित नाम
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}रद्द
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}प्रीसेट न बदलें
 STR_SAVE_PRESET_SAVE                                            :{BLACK}सेव
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}प्रीसेट को वर्तमान चयनित नाम पर सहेजें
 
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 3f28f1e469..773a8267e4 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -348,7 +348,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Ablak be
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Ablak címsora - húzd ezt a mozgatáshoz
 STR_TOOLTIP_SHADE                                               :{BLACK}Ablak összecsukása - csak a címsor látszódik
 STR_TOOLTIP_DEBUG                                               :{BLACK}NewGRF nyomonkövetés információ mutatása
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Az alapértelmezett ablakméret visszaállítása. Ctrl+kattintással a jelenlegi méretet alapértelmezett méretként állíthatod be.
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Az alapértelmezett ablakméret visszaállítása. Ctrl+kattintás a jelenlegi méret alapértelmezettként való beállításához. Dupla Ctrl+kattintás a tárolt alapértelmezés visszaállításához.
 STR_TOOLTIP_STICKY                                              :{BLACK}Ez az ablak akkor se záródjon be, ha az "Összes ablak bezárása" gombot megnyomjuk. Ctrl+kattintással ez az állapot alapértelmezettként állítható be.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Fogd és húzd, hogy átméretezd az ablakot
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Kicsi/nagy ablakméret közötti váltás
@@ -445,7 +445,7 @@ STR_GOTO_ORDER_VIEW_TOOLTIP                                     :{BLACK}A járm
 ###length 31
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Játék szüneteltetése
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Játék gyorsítása
-STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Alapbeállítások és beállítások
+STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Beállítások
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Játék mentése vagy játék elhagyása, kilépés
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Térkép, extra látkép, rakományáramlás és feliratlista megnyitása
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Településlista megnyitása
@@ -507,11 +507,10 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Házak elhelyez
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Játékbeállítások
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Beállítások
-STR_SETTINGS_MENU_AI_SETTINGS                                   :MI Beállítások
-STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Játékszkript beállítások
+STR_SETTINGS_MENU_AI_SETTINGS                                   :MI-beállítások
+STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Játékszkript-beállítások
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF beállítások
-STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Homokozó mód beállítások
+STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Homokozó mód beállításai
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Átlátszósági beállítások
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Városnevek mutatása
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Állomásnevek mutatása
@@ -596,17 +595,17 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Előző üzenet
 STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Az összes üzenet törlése
 
 # About menu
-STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Terület-információ
+STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Területinformáció
 STR_ABOUT_MENU_HELP                                             :Súgó és útmutatók
-STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Átváltás konzolra
-STR_ABOUT_MENU_AI_DEBUG                                         :MI / Játékszkript nyomkövetés
+STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Konzol be/ki
+STR_ABOUT_MENU_AI_DEBUG                                         :MI/játékszkript nyomkövetése
 STR_ABOUT_MENU_SCREENSHOT                                       :Képmentés
 STR_ABOUT_MENU_SHOW_FRAMERATE                                   :FPS ablak
-STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Az 'OpenTTD'-ről
+STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Az „OpenTTD” névjegye
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite elhelyező
-STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Befoglaló doboz ki/bekapcsolása
-STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :Koszos épületek színezésének be/kikapcsolása
-STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES                           :Widget körvonalak ki/bekapcsolása
+STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Befoglaló doboz be/ki
+STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :Koszos blokkok színezése be/ki
+STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES                           :Felületi elemek körvonala be/ki
 
 ###length 31
 STR_DAY_NUMBER_1ST                                              :1.
@@ -1023,22 +1022,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}A látk
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Játékbeállítások
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Általános
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Általános beállítások módosítása
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Általános beállítások kiválasztása
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Grafikus beállítások módosítása
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Grafikus beállítások módosítása
 STR_GAME_OPTIONS_TAB_SOUND                                      :Hang effektek
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Hang- és zenebeállítások módosítása
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Hang- és zenebeállítások kiválasztása
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Közösségi
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Közösségi beállítások módosítása
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Közösségi beállítások kiválasztása
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Speciális
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Speciális beállítások módosítása
 
 STR_GAME_OPTIONS_VOLUME                                         :Hangerő
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Hang effektek
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Zene
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Pénznem
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}A használt pénznem kiválasztása
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Pénznem
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Pénznem kiválasztása
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1089,8 +1092,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lett Lat
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugál escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrán hrivnya
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatikus mentés
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Az automatikus mentések közötti időtartam kiválasztása
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatikus mentés
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Az automatikus mentések közötti időtartam kiválasztása
 
 # Autosave dropdown
 ###length 5
@@ -1100,77 +1103,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :30 percenként
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :60 percenként
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :120 percenként
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Nyelv
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Válassz nyelvet
+STR_GAME_OPTIONS_LANGUAGE                                       :Nyelv
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Válaszd ki a felület nyelvét
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% lefordítva)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Teljes képernyő
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Jelöld be ezt, ha teljes képernyős módban szeretnél játszani az OpenTTD-vel
+STR_GAME_OPTIONS_FULLSCREEN                                     :Teljes képernyő
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Jelöld be, hogy teljes képernyős módban játssz az OpenTTD-vel
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Képernyő felbontás
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Játékhoz használt felbontás kiválasztása
+STR_GAME_OPTIONS_RESOLUTION                                     :Képernyőfelbontás
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Használandó képernyőfelbontás kiválasztása
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :egyéb
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardveres gyorsítás
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Bekapcsolásával az OpenTTD hardveres gyorsítást próbál alkalmazni. A beállítás csak a játék újraindítása után lép érvénybe.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardveres gyorsítás
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Jelöld be, hogy az OpenTTD próbáljon meg hardveres gyorsítást használni. A beállítás csak a játék újraindítása után lép érvénybe.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Ez a beállítás csak a játék újraindítása után lép érvénybe
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync (Vertikális Szinkronizáció)
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Jelöld be ezt a négyzetet hogy engedélyezd a v-sync-et. A változtatás csak a játék újraindítása után fog érvényesülni. Kizárólag hardware gyorsítással működik!
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Függőleges szinkronizáció (VSync)
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Jelöld be a függőleges szinkronizációhoz (VSync). A változtatás csak a játék újraindítása után lép érvénybe. Kizárólag hardveres gyorsítással működik!
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Jelenlegi meghajtó: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Jelenlegi illesztőprogram: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Felület mérete
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Használd a csúszkát a felület méretének beállításához. Ctrl+húzás a finom állításhoz
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Méret automatikus felismerése
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Jelöld be ezt, a felület méretének automatikus felismeréséhez
+STR_GAME_OPTIONS_INTERFACE                                      :Felület
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Élek méretezése
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Jelöld be ezt a négyzetet hogy az interfész méretéhez igazítsd az éleket
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Felület mérete
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Használd a csúszkát a felület méretének beállításához. Ctrl+húzás a finom állításhoz.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Méret automatikus felismerése
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Jelöld be a felület méretének automatikus felismeréséhez
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Hagyományos sprite betűtípus használata
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Jelöld be ezt, ha a hagyományos sprite betűtípust akarod használni.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Betűtípusok simítása
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Jelöld be ezt, ha lesimított betűket akarsz.
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Szegélyek méretezése
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Jelöld be a szegélyek a felület méretéhez való igazításához
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Hagyományos sprite betűk használata
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Jelöld be, ha a hagyományos sprite betűket akarod használni.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Betűk élsimítása
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Jelöld be a betűk élsimításához
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automata felmérés
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Részvétel automata felmérésben
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Ha engedélyezve van, az OpenTTD továbbít egy felmérést a játékból kilépéskor
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Felmérésről és titoktartásról
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Ezzel megnyithatsz egy oldalt a böngészőben ahol további információt érhetsz el az automata felmérésről.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Felmérés eredményének előnézete
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mutasd a jelenleg futó játékhoz tartozó felmérés eredményeit.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatizált felmérés
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Részvétel az automatizált felmérésben
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Ha engedélyezve van, az OpenTTD továbbít egy felmérést a játékból való kilépéskor
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :A felmérésről és az adatvédelemről
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ez megnyit egy oldalt a böngészőben, ahol további információ érhető el az automatizált felmérésről
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Felmérés eredményének előnézete
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :A jelenleg futó játék felmérési eredményeinek megjelenítése
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafika
+STR_GAME_OPTIONS_DISPLAY                                        :Megjelenítés
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Képernyőfrissítési frekvencia
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Játékhoz használt képernyőfrissítési frekvencia kiválasztása
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Képernyőfrissítési gyakoriság
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :A játékhoz használt képernyőfrissítési gyakoriság kiválasztása
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}A 60 Hz-nél nagyobb frekvencia befolyással lehet a teljesítményre.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikus alapcsomag
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}A játékhoz használandó grafikus alapcsomag kiválasztása (nem módosítható a játékban, csak a főmenüben)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}További információk a grafikus alapcsomagról
+STR_GAME_OPTIONS_BASE_GRF                                       :Grafikus alapcsomag
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :A játékhoz használandó grafikus alapcsomag kiválasztása (nem módosítható a játékban, csak a főmenüben)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :További információk a grafikus alapcsomagról
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Hang alapcsomag
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Használandó hang alapcsomag kiválasztása (nem módosítható a játékban, csak a főmenüben)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}További információk a hang alapcsomagról
+STR_GAME_OPTIONS_BASE_SFX                                       :Hang alapcsomag
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Használandó hang alapcsomag kiválasztása (nem módosítható a játékban, csak a főmenüben)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :További információk a hang alapcsomagról
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Zenei alapcsomag
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Használandó zenei alapcsomag kiválasztása
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}További információk a zenei alapcsomagról
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Zenei alapcsomag
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Használandó zenei alapcsomag kiválasztása
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :További információk a zenei alapcsomagról
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Tartalom Beszerzése
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Ellenőrízd, hogy letölthető-e új vagy frissített tartalom
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nincs közösségi média integrációhoz szükséges kiegészítő telepítve)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(nincs közösségi médiás integrációhoz való kiegészítő telepítve)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Kiegészítő állapota:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Kiegészítő állapota:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Fut
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Indítás meghiúsult
@@ -1261,10 +1266,10 @@ STR_SUBSIDY_X3                                                  :3x
 STR_SUBSIDY_X4                                                  :4x
 
 ###length 4
-STR_CLIMATE_TEMPERATE_LANDSCAPE                                 :Mérsékelt táj
+STR_CLIMATE_TEMPERATE_LANDSCAPE                                 :Mérsékelt égövi táj
 STR_CLIMATE_SUB_ARCTIC_LANDSCAPE                                :Szubarktikus táj
 STR_CLIMATE_SUB_TROPICAL_LANDSCAPE                              :Szubtrópusi táj
-STR_CLIMATE_TOYLAND_LANDSCAPE                                   :Játékvilág táj
+STR_CLIMATE_TOYLAND_LANDSCAPE                                   :Játékvilági táj
 
 ###length 7
 STR_TERRAIN_TYPE_VERY_FLAT                                      :Nagyon sík
@@ -1283,12 +1288,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Engedékeny (ni
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nincsen megfelelő elérhető MI...{}{}Letölthetsz néhány MI-t a tartalomletöltő rendszeren keresztül
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Beállítások
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Szűrő kifejezés:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Összes szétnyitása
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Összes összecsukása
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Visszaállítja az összes értéket
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Szűrő:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Összes kibontása
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Összes összecsukása
+STR_CONFIG_SETTING_RESET_ALL                                    :Összes érték visszaállítása
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(leírás nem elérhető)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Alapértelmezett érték: {ORANGE}{STRING}
@@ -1301,9 +1305,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Vállalat beál
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Figyelem!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Ez a művelet minden játékbeállítást visszaállít.{}Biztos, hogy folytatni akarja a műveletet?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategória:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Típus:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Leszűkíti a listát a megadott szűrők segítségével
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategória:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Típus:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Leszűkíti a listát az előre megadott szűrők használatával
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Alap (csak a fontos beállítások)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Haladó (majdnem mindegyik beállítás mutatása)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Szakértő (minden beállítás, még az egészen furák is)
@@ -1311,18 +1315,18 @@ STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Beállítások
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Beállítosok amelyeknek a jelenlegi értéke eltér az eredetitől
 
 STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT                       :{BLACK}Lista szűkítése a beállítások szerint
-STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL                            :Minden beállítástípus
-STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT                         :Kliens beállítások (nincs mentésben tárolva; minden játékot érintenek)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU                      :Játék beállítások (mentésben tárolva; csak az új játékokat érintik)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME                    :Játék beállítások (mentésben tárolva; csak a jelenlegi játékot érintik)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU                   :Vállalat beállítások (mentésben tárolva; csak az új játékokat érintik)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Vállalat beállítások (mentésben tárolva; csak a jelenlegi vállalatot érintik)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL                            :Összes beállítástípus
+STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT                         :Kliensbeállítások (nincs mentésben tárolva; az összes játékot érinti)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU                      :Játékbeállítások (mentésben tárolva; csak az új játékokat érinti)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME                    :Játékbeállítások (mentésben tárolva; csak a jelenlegi játékot érinti)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU                   :Vállalatbeállítások (mentésben tárolva; csak az új játékokat érinti)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Vállalatbeállítások (mentésben tárolva; csak a jelenlegi vállalatot érinti)
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nincs találat -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Az összes eredmény mutatása:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Az összes eredmény mutatása:{}A {SILVER}típus {BLACK}legyen {WHITE}Minden beállítástípus
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Az összes eredmény mutatása:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING} {BLACK}, a {SILVER}típus {BLACK}pedig {WHITE}Minden beállítástípus
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Az összes találat megjelenítése:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Az összes találat megjelenítése:{}A {PUSH_COLOUR}{SILVER}típus {POP_COLOUR}legyen {WHITE}Összes beállítástípus
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Az összes találat megjelenítése:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING} {BLACK}, a {SILVER}típus {BLACK}pedig {WHITE}Összes beállítástípus
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ki
@@ -1356,7 +1360,7 @@ STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE                   :{CURRENCY_LONG}
 STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED                :Nincs kölcsön
 
 STR_CONFIG_SETTING_INTEREST_RATE                                :Kamatláb: {STRING}
-STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT                       :Banki hitel kamat; inflációt is szabályozza, ha be van kapcsolva
+STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT                       :Banki hitelkamat; az inflációt is szabályozza, ha be van kapcsolva
 
 STR_CONFIG_SETTING_RUNNING_COSTS                                :Üzemeltetési költségek: {STRING}
 STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT                       :Járművek karbantartási és üzemeltetési költségeinek a szintje
@@ -1433,7 +1437,7 @@ STR_CONFIG_SETTING_PERCENTAGE                                   :{COMMA}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :Emelkedő meredeksége közúti járműveknek: {STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT        :Egy emelkedő mező meredeksége közúti járműveknek. Nagyobb érték esetén a jármű nehezebben mássza meg az emelkedőt
 
-STR_CONFIG_SETTING_FORBID_90_DEG                                :Vonatok nem tehetnek 90 fokos kanyart: {STRING}
+STR_CONFIG_SETTING_FORBID_90_DEG                                :A vonatok nem tehetnek 90 fokos kanyart: {STRING}
 STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :90 fokos kanyarok akkor fordulnak elő, ha egy vízszintes pályaelemet egy függőleges elem követ közvetlenül a következő mezőn, ami által a vonat egy 90 fokos kanyart tesz a szokásos 45 fokos helyett
 
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :Nem közvetlen szomszédos állomások egyesítése: {STRING}
@@ -1516,7 +1520,7 @@ STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT                     :Pénz adományo
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :Pénz küldésének engedélyezése másik vállalatok részére: {STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT                    :Pénzátutalások engedélyezése vállalatok között többjátékos módban
 
-STR_CONFIG_SETTING_FREIGHT_TRAINS                               :Tömegszorzó tehervonatoknak nehéz vonatok szimulációjára: {STRING}
+STR_CONFIG_SETTING_FREIGHT_TRAINS                               :Tömegszorzó a tehervonatokhoz a nehéz vonatok szimulációjához: {STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT                      :Tehervonatok terhelési szorzójának beállítása. Magasabb érték esetén a tehervagonok jobban igénybe veszik a vontatójárművet, főleg dombokon
 
 STR_CONFIG_SETTING_PLANE_SPEED                                  :Repülőgép sebességszorzó: {STRING}
@@ -1610,7 +1614,7 @@ STR_CONFIG_SETTING_HOVER_DELAY                                  :Leírás megjel
 STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Késleltetés, mielőtt megjelenne az eszközleírás az egér fölé húzása után egy felületi elemen. A leírás elérhető még az egér jobb gombjával is, ha ennek értéke 0-ra van állítva.
 STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :{COMMA} ezredmásodperc után
 ###setting-zero-is-special
-STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Jobb klikk
+STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Jobb kattintás
 
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Mutassa a település lakosságát a feliratban: {STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Település lakosságszámának kijelzése a címkéjén
@@ -1626,7 +1630,7 @@ STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS_HELPTEXT                 :Ha be van kapcs
 STR_CONFIG_SETTING_LANDSCAPE                                    :Táj: {STRING}
 STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :A tájak alapvető játékbeállításokat határoznak meg különféle árukkal és településnövekedési tényezőkkel. A NewGRF-ek és a játékszkriptek segítségével ez még tovább hangolható.
 
-STR_CONFIG_SETTING_LAND_GENERATOR                               :Terep generálás: {STRING}
+STR_CONFIG_SETTING_LAND_GENERATOR                               :Térképgenerátor: {STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT                      :Az eredeti térképgenerátor az alap grafikus csomagtól függ, és fix formájú tájakat állít össze. A TerraGenesis egy Perlin zajon alapuló térképgenerátor, nagyobb konfigurálhatósággal.
 ###length 2
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Eredeti
@@ -2051,7 +2055,7 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :megengedett
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :megengedett, egyéni városelrendezés
 
 STR_CONFIG_SETTING_HOUSE_PLACER                                 :Egyedi városi házak elhelyezése: {STRING}
-STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :Ennek a beállításnak az engedélyezése lehetővé teszi a játékosok számára, hogy manuálisan helyezzenek el városi házakat.
+STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :A beállítás engedélyezése lehetővé teszi a játékosok számára, hogy kézileg helyezzenek el városi házakat.
 ###length 3
 STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Tiltott
 STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Engedélyezett
@@ -2084,7 +2088,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Nem zárolt abl
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Nem zárolt ablakok száma mielőtt a régi ablakok bezárásra kerülnek, hogy legyen hely az új ablakok számára
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :kikapcsolva
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Kikapcsolva
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :A nagyítás maximális mértéke: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Maximális nagyítás mértéke. A nagyobb nagyítási mérték több memóriát igényel
@@ -2116,7 +2120,7 @@ STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Nagyon gyors
 
 STR_CONFIG_SETTING_LARGER_TOWNS                                 :Várossá váló települések aránya: {STRING}
 STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT                        :Azon települések mennyisége, melyek várossá fognak válni, így egy település nagyobbként kezd és gyorsabban nő
-STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 a {COMMA}-ból
+STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 / {COMMA}
 ###setting-zero-is-special
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :nincs
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Kezdeti városméret-szorzó: {STRING}
@@ -2255,7 +2259,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nem
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... A videókártya illesztőprogram hibát okozott. Hardveres gyorsítás kikapcsolva
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Új játék
 STR_INTRO_LOAD_GAME                                             :{BLACK}Játék betöltése
@@ -2267,11 +2272,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Hálóza
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Alapbeállítások
 STR_INTRO_HIGHSCORE                                             :{BLACK}Rekord tábla
 STR_INTRO_HELP                                                  :{BLACK}Súgó és útmutatók
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Beállítások
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF beállítások
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Letölthető tartalmak
-STR_INTRO_AI_SETTINGS                                           :{BLACK}MI Beállítások
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Játékszkript beállítások
 STR_INTRO_QUIT                                                  :{BLACK}Kilépés
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Új játék kezdése. Ctrl+kattintással átugorhatod a térkép beállításokat
@@ -2289,11 +2290,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Játékv
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}A játékbeállítások megnyitása
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Rekord tábla megnyitása
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Férj hozzá a dokumentációhoz és az online tartalmakhoz
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}A beállítások megnyitása
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF beállítások megnyitása
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Új és frissített tartalmak megtekintése és letöltése
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}MI beállítások megnyitása
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Játékszkript beállítások megnyitása
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Kilépés az OpenTTD-ből
 
 STR_INTRO_BASESET                                               :{BLACK}A jelenleg kiválasztott grafikus alapcsomagból {NUM} sprite hiányzik. Frissítsd a grafikus alapcsomagot!
@@ -2325,7 +2322,7 @@ STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Hiba jel
 STR_HELP_WINDOW_COMMUNITY                                       :{BLACK}Közösség
 
 # Cheat window
-STR_CHEATS                                                      :{WHITE}Homokozó mód beállítások
+STR_CHEATS                                                      :{WHITE}Homokozó mód beállításai
 STR_CHEAT_MONEY                                                 :{LTBLUE}Tőkeemelés {CURRENCY_LONG}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Irányított vállalat: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Csodabuldózer (lerombol gazdasági épületeket, mozgathatatlan objektumokat): {ORANGE}{STRING}
@@ -2617,7 +2614,7 @@ STR_NETWORK_SPECTATORS                                          :Megfigyelők
 
 # Network company info join/password
 STR_COMPANY_VIEW_JOIN                                           :{BLACK}Csatlakozás
-STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Csatlakozz és vezesd a vállalatot
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Csatlakozás és a vállalat vezetése
 
 # Network chat
 STR_NETWORK_CHAT_SEND                                           :{BLACK}Elküld
@@ -2956,7 +2953,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Kijárat
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinált jelző (fény){}A kombinált jelző voltaképpen egy kijárati- és egy bejárati jelző egybeépítve. Segítségével komoly váltókörzetek építhetőek bejárati jelzőkből
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Irányjelző (fény){}Egy irányjelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. Az irányjelzők mellett hátulról is el lehet haladni
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Egyirányú irányjelző (fény){}Egy irányjelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. Az egyirányú jelzők mellett nem lehet hátulról elhaladni
-STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Jelző átalakítás{}Amikor ki van jelölve, egy meglévő jelzőre való kattintással átalakítja a kiválasztott jelzőtípusra és -változatra, Ctrl+kattintás a változatok között fog váltani. Shift+kattintással megmutatja a becsült átalakítási költséget
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Jelző átalakítása{}Amikor ki van jelölve, egy meglévő jelzőre való kattintással átalakítja a kiválasztott jelzőtípusra és -változatra. A Ctrl+kattintás a változatok között vált. A Shift+kattintás megjeleníti a becsült átalakítási költséget.
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Automata jelzőtelepítés esetén a jelzők távolsága
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Automata jelzőtelepítés esetén a jelzők távolságának csökkentése
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Automata jelzőtelepítés esetén a jelzők távolságának növelése
@@ -2976,7 +2973,7 @@ STR_BRIDGE_NAME_SUSPENSION_CONCRETE                             :Függő, beton
 STR_BRIDGE_NAME_WOODEN                                          :Fa
 STR_BRIDGE_NAME_CONCRETE                                        :Beton
 STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cső, acél
-STR_BRIDGE_TUBULAR_SILICON                                      :Cső, Szilikon
+STR_BRIDGE_TUBULAR_SILICON                                      :Cső, szilícium
 
 
 # Road construction toolbar
@@ -2987,7 +2984,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Villamos
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Közút építése egyszerűsített módon. Ctrl+kattintás az út lerombolásához. Shift+kattintással csak a becsült költséget jeleníti meg
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Villamospálya építése egyszerűsített módon. Ctrl+kattintás a pálya lerombolásához. Shift+kattintással csak a becsült költséget jeleníti meg
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Garázs építése (járművek vételére és karbantartására). Shift+kattintással csak a becsült költséget jeleníti meg
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Villamos remíz építése (járművek megépítésére és javítására). Shift+kattintással csak a becsült költséget jeleníti meg
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Villamosremíz építése (járművek megépítésére és javítására). Shift+kattintással csak a becsült költséget jeleníti meg
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT               :{BLACK}Útpont építése az úton. Ctrl+kattintás másik csatlakozási pont kiválasztásához. Nyomd meg a Shift billentyűt is, ha csak a költségbecslést szeretnéd megjeleníteni
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT               :{BLACK}Útpont építése a villamosvonalon. Ctrl+kattintás másik csatlakozási pont kiválasztásához. Nyomd meg a Shift billentyűt is, ha csak a költségbecslést szeretnéd megjeleníteni
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Buszmegálló építése. Ctrl+kattintással egyesíthető más állomásokkal. Shift+kattintással csak a becsült költséget jeleníti meg
@@ -3065,7 +3062,7 @@ STR_AIRPORT_HELISTATION                                         :Heliállomás
 STR_AIRPORT_CLASS_SMALL                                         :Kis repülőterek
 STR_AIRPORT_CLASS_LARGE                                         :Nagy repülőterek
 STR_AIRPORT_CLASS_HUB                                           :Központi repülőterek
-STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopter-állomások
+STR_AIRPORT_CLASS_HELIPORTS                                     :Helikopterállomások
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Zajtermelés: {GOLD}{COMMA}
 
@@ -3122,7 +3119,7 @@ STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Sok vél
 STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Véletlenszerüen elhelyez a térképen sok települést.
 STR_FOUND_TOWN_LOAD_FROM_FILE                                   :{BLACK}Betöltés fájlból
 STR_FOUND_TOWN_LOAD_FROM_FILE_TOOLTIP                           :{BLACK}Város adat importálása JSON fájlból
-STR_FOUND_TOWN_EXPAND_ALL_TOWNS                                 :{BLACK}Minden város növelése
+STR_FOUND_TOWN_EXPAND_ALL_TOWNS                                 :{BLACK}Összes város növelése
 STR_FOUND_TOWN_EXPAND_ALL_TOWNS_TOOLTIP                         :{BLACK}Minden város enyhe növelése
 
 STR_FOUND_TOWN_NAME_TITLE                                       :{YELLOW}Városnév:
@@ -3140,6 +3137,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}A telep
 STR_FOUND_TOWN_CITY                                             :{BLACK}Város
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Átlagosnál gyorsabban növekedő városok{}Beállítástól függően nagyobbak alapításkor
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Város bővítés:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Épületek
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :A városi épületek növelése
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Utak
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :A városi utak növelése
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Település úthálózat építési mintája:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Válassz úthálózati elrendezést ehhez a városhoz
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Eredeti
@@ -3308,7 +3311,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS                 :Vállalat szék
 STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Vállalat által birtokolt föld
 
 # About OpenTTD window
-STR_ABOUT_OPENTTD                                               :{WHITE}Az OpenTTD-ről
+STR_ABOUT_OPENTTD                                               :{WHITE}Az OpenTTD névjegye
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Eredeti copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD {REV} verzió
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-{STRING} Az OpenTTD csapat
@@ -3436,12 +3439,12 @@ STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Simaság
 STR_MAPGEN_VARIETY                                              :{BLACK}Változatosság eloszlása:
 STR_MAPGEN_GENERATE                                             :{WHITE}Generál
 STR_MAPGEN_GENERATE_TOOLTIP                                     :{BLACK}Készíts egy világot és játssz OpenTTD-t!
-STR_MAPGEN_NEWGRF_SETTINGS                                      :NewGRF Beállítások
-STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP                              :{BLACK}NewGRF beállítások megnyitása
-STR_MAPGEN_AI_SETTINGS                                          :{BLACK}MI Beállítások
-STR_MAPGEN_AI_SETTINGS_TOOLTIP                                  :{BLACK}MI beállítások megnyitása
-STR_MAPGEN_GS_SETTINGS                                          :{BLACK}Játékszkript Beállítások
-STR_MAPGEN_GS_SETTINGS_TOOLTIP                                  :{BLACK}Játékszkript beállítások megnyitása
+STR_MAPGEN_NEWGRF_SETTINGS                                      :{BLACK}NewGRF-beállítások
+STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP                              :{BLACK}NewGRF-beállítások megnyitása
+STR_MAPGEN_AI_SETTINGS                                          :{BLACK}MI-beállítások
+STR_MAPGEN_AI_SETTINGS_TOOLTIP                                  :{BLACK}MI-beállítások megnyitása
+STR_MAPGEN_GS_SETTINGS                                          :{BLACK}Játékszkript-beállítások
+STR_MAPGEN_GS_SETTINGS_TOOLTIP                                  :{BLACK}Játékszkript-beállítások megnyitása
 
 ###length 21
 STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH                           :Angol (Eredeti)
@@ -3532,7 +3535,7 @@ STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}{STRING}
 STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Nem található érvényes hely {NUM} város számára. Táblá{P "" ka}t helyeztünk el a kívánt hely{P "" ek}en
 
 # NewGRF settings
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF beállítások
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-beállítások
 STR_NEWGRF_SETTINGS_INFO_TITLE                                  :{WHITE}Részletes NewGRF információ
 STR_NEWGRF_SETTINGS_ACTIVE_LIST                                 :{WHITE}Aktív NewGRF fájlok
 STR_NEWGRF_SETTINGS_INACTIVE_LIST                               :{WHITE}Inaktív NewGRF fájlok
@@ -3589,15 +3592,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Lista me
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Az elérhető listák, kattints az egyikre, hogy lemásold a lenti mezőbe
 STR_SAVE_PRESET_TITLE                                           :{BLACK}A lista neve
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}A lista mentéséhez kiválasztott név
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Mégse
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ne mentse a listát
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Mentés
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}A lista mentése a megadott névvel
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Alap grafikai paraméterek módosítása
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF paraméterek megváltoztatása
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Bezárás
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Alapértelmezett
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Összes paraméter alapértelmezettre állítása
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paraméter {NUM}
@@ -3699,7 +3699,7 @@ STR_NEWGRF_BROKEN                                               :{WHITE}A NewGRF
 STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Megváltoztattad '{1:ENGINE}' motorkocsi állapotát mikor nem volt bent a járműtelepen
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Megváltoztattad '{1:ENGINE}' jármű hosszát mikor nem volt a járműtelepen
 STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Megváltoztattad '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' jármű kapacitását, amikor az nem a garázsban vagy átalakítás alatt áll
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}'{1:COMPANY}' vállalat '{0:VEHICLE}' jelű vonatának érvénytelen a hossza. Ezt a NewGRF-ek okozhatják. A játék elszállhat vagy lefagyhat
+STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}A(z) „{1:COMPANY}” vállalat „{0:VEHICLE}” jelű vonatának hossza érvénytelen. Ezt valószínűleg NewGRF-ek okozhatják. A játék elszállhat vagy összeomolhat.
 
 STR_NEWGRF_BUGGY                                                :{WHITE}A NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' helytelen információt biztosít
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}A(z) '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' rakomány/átalakítás információja a gyártás után különbözik a vételi listán találhatótól. Ez hibát okozhat az automatikus felújítás/lecserélés során az átalakításban
@@ -3764,8 +3764,12 @@ STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Önkorm
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Az önkormányzat adatainak megmutatása
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}A város nevének megváltoztatása
 
-STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Növel
+STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Növelés
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}A település méretének növelése
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Épületek bővítése
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}A városi épületek növelése
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Utak növelése
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}A városi utak növelése
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Töröl
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}A település teljes eltüntetése
 
@@ -3953,10 +3957,10 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Repülő
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}A fő nézetet az ellenőrző pontra állítja. Ctrl+kattintással új nézet nyílik az ellenőrzőpontnál
-STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Átnevezi az ellenőrző pontot
+STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}A fő nézetet az ellenőrzőpontra állítja. Ctrl+kattintással új nézet nyílik az ellenőrzőpontnál
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Ellenőrzőpont nevének megváltoztatása
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}A fő nézetet a bójára állítja. Ctrl+kattintással új nézet nyílik a bója helyzeténél
-STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Bója átnevezése
+STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Bója nevének megváltoztatása
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ellenőrző pont nevének módosítása
 
@@ -4035,19 +4039,19 @@ STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}SZH áth
 STR_COMPANY_VIEW_RELOCATE_HQ_TOOLTIP                            :{BLACK}A vállalat székházának újraépítése máshol a vállalat értékének 1%-áért. Shift+kattintással csak a becsült költséget jeleníti meg
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Részletek
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Részletes információk megtekintése az infrastruktúráról
-STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Adományozz pénzt
-STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Utalj pénzt ennek a vállalatnak
+STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Pénz adományozása
+STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Pénz adományozása ennek a vállalatnak
 STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON                        :{BLACK}Erőszakos átvétel
-STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}Vedd át erőszakkal a vállalat vezetését
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}A vállalat vezetésének erőszakos átvétele
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Új arc
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Új arc választása az elnöknek
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Színséma
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}A vállalat járműszíneinek megváltoztatása
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Vállalat neve
-STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}A vállalat nevének megváltoztatása
+STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}Vállalat nevének megváltoztatása
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Elnök neve
-STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Az elnök nevének megváltoztatása
+STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Elnök nevének megváltoztatása
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :A vállalat neve
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Elnök neve
@@ -4061,7 +4065,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}{COMPANY
 STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Vasúti elemek:
 STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Vasúti jelzők
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Közúti elemek:
-STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Villamospálya elemek:
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Villamospálya-elemek:
 STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Vízi elemek:
 STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Csatornák
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Állomások:
@@ -4243,15 +4247,15 @@ STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Hajó ki
 STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Repülőgép kiválasztása - kattints egy repülőgépre az adataihoz. Ctrl+kattintással a repülőgéptípus elrejthető/felfedhető
 
 ###length VEHICLE_TYPES
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Megvesz
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Megvétel
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Megvesz
-STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Megvesz
+STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Megvétel
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Megvesz
 
 ###length VEHICLE_TYPES
 STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON                  :{BLACK}Megvesz és átalakít
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}Megvesz és átalakít
-STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Megvesz és átalakít
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Megvétel és átalakítás
 STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Megvesz és átalakít
 
 ###length VEHICLE_TYPES
@@ -4267,9 +4271,9 @@ STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}A kijel
 STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}A kijelölt repülőgép megvétele és átalakítása a kijelölt rakománytípusra. Shift+kattintással csak a becsült költséget jeleníti meg
 
 ###length VEHICLE_TYPES
-STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Átnevez
-STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Átnevez
-STR_BUY_VEHICLE_SHIP_RENAME_BUTTON                              :{BLACK}Átnevez
+STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Átnevezés
+STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Átnevezés
+STR_BUY_VEHICLE_SHIP_RENAME_BUTTON                              :{BLACK}Átnevezés
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON                          :{BLACK}Átnevez
 
 ###length VEHICLE_TYPES
@@ -4327,9 +4331,9 @@ STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Húzz id
 
 ###length VEHICLE_TYPES
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}A járműtelepen tartózkodó összes vonat eladása
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Összes garázsban tartózkodó jármű eladása
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Összes dokkban tartózkodó hajó eladása
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Összes hangárban tartózkodó repülő eladása
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}A garázsban tartózkodó összes jármű eladása
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}A dokkban tartózkodó összes hajó eladása
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}A hangárban tartózkodó összes repülő eladása
 
 ###length VEHICLE_TYPES
 STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}A járműtelepen tartózkodó összes vonat automatikus cseréje
@@ -4395,7 +4399,7 @@ STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Most kés
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :vasúti mozdony
 STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :villamos vasúti mozdony
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :egysínű mozdony
-STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :Maglev mozdony
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev mozdony
 
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :közúti jármű
 STR_ENGINE_PREVIEW_TRAM_VEHICLE                                 :villamos
@@ -4475,7 +4479,7 @@ STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP                            :{BLACK}Közelí
 STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP                        :{BLACK}Közelítés a repülőgép jelenlegi helyzetére. Dupla kattintással a fő nézetben követni fogja a repülőgépet. Ctrl+kattintással új nézet nyílik a repülőgép helyzeténél
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}A járműtelepre küldi a vonatot. Ctrl+kattintással csak javításra
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Járműtelepre küldi a vonatot. Ctrl+kattintással csak javításra
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Garázsba küldi a járművet. Ctrl+kattintással csak javításra
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Dokkba küldi a hajót. Ctrl+kattintással csak javításra
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Hangárba küldi a repülőgépet. Ctrl+kattintással csak javításra
@@ -4504,10 +4508,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}A hajó
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}A repülőgép utasításainak mutatása. Ctrl+kattintás a menetrendet mutatja
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}A vonat adatai
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}A közúti jármű adatai
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}A hajó adatai
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}A repülőgép adatai
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vonat részleteinek megjelenítése. Ctrl+kattintás a vonat csoportjának megjelenítéséhez.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :A jármű adatainak megjelenítése. Ctrl+kattintás a járműcsoport megjelenítéséhez.
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Hajó részleteinek megjelenítése. Ctrl+kattintás a hajó csoportjának megjelenítéséhez.
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Repülőgép részleteinek megjelenítése. Ctrl+kattintás a repülőgép csoportjának megjelenítéséhez.
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Aktuális vonatmozgás - kattints ide a vonat elindításához vagy megállításához.
@@ -4516,7 +4520,7 @@ STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP                 :{BLACK}Aktuáli
 STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP             :{BLACK}Aktuális repülőgépmozgás - kattints ide a repülőgép elindításához vagy megállításához.
 
 # Messages in the start stop button in the vehicle view
-STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Berakodás / Kirakodás
+STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Berakodás/kirakodás
 STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Indul
 STR_VEHICLE_STATUS_WAITING_UNBUNCHING                           :{LTBLUE}Várakozás csoportbontásra
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Balesetet szenvedett!
@@ -4532,12 +4536,12 @@ STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}{VELOCI
 STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}{1:VELOCITY} - Útban {0:WAYPOINT} felé
 STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_VEL                        :{ORANGE}{1:VELOCITY} - Útban {0:DEPOT} felé
 STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL                :{LTBLUE}{1:VELOCITY} - Javítás {0:DEPOT}ban
-STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_UNBUNCH_VEL                :{LTBLUE}{1:VELOCITY} - Csoport bontás és szervizelés itt: {0:DEPOT}
+STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_UNBUNCH_VEL                :{LTBLUE}{1:VELOCITY} - Csoportbontás és szervizelés itt: {0:DEPOT}
 
-STR_VEHICLE_STATUS_CANNOT_REACH_STATION_VEL                     :{LTBLUE}{1:VELOCITY} - {0:STATION} nem elérhető
-STR_VEHICLE_STATUS_CANNOT_REACH_WAYPOINT_VEL                    :{LTBLUE}{1:VELOCITY} - {0:WAYPOINT} nem elérhető,
-STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_VEL                       :{ORANGE}{1:VELOCITY} - {0:DEPOT} nem elérhető
-STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_SERVICE_VEL               :{LTBLUE}{1:VELOCITY} - {0:DEPOT} nem elérhető
+STR_VEHICLE_STATUS_CANNOT_REACH_STATION_VEL                     :{LTBLUE}{1:VELOCITY} - {0:STATION} nem érhető el
+STR_VEHICLE_STATUS_CANNOT_REACH_WAYPOINT_VEL                    :{LTBLUE}{1:VELOCITY} - {0:WAYPOINT} nem érhető el
+STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_VEL                       :{ORANGE}{1:VELOCITY} - {0:DEPOT} nem érhető el
+STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_SERVICE_VEL               :{LTBLUE}{1:VELOCITY} - {0:DEPOT} nem érhető el
 
 # Vehicle stopped/started animations
 STR_VEHICLE_COMMAND_STOPPED                                     :{RED}Megállítva
@@ -4698,9 +4702,9 @@ STR_ORDER_DROP_UNBUNCH                                          :Csoportbontás
 
 # Depot action tooltips, one per vehicle type
 ###length VEHICLE_TYPES
-STR_ORDER_TRAIN_DEPOT_ACTION_TOOLTIP                            :{BLACK}Válaszd ki a vasúti járműtelepre alkalmazni kívánt műveletet
-STR_ORDER_ROAD_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a garázsra alkalmazni kívánt műveletet
-STR_ORDER_SHIP_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a dokkra alkalmazni kívánt műveletet
+STR_ORDER_TRAIN_DEPOT_ACTION_TOOLTIP                            :{BLACK}Válaszd ki a vasúti járműtelepre alkalmazandó műveletet
+STR_ORDER_ROAD_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a garázsra alkalmazandó műveletet
+STR_ORDER_SHIP_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a dokkra alkalmazandó műveletet
 STR_ORDER_HANGAR_ACTION_TOOLTIP                                 :{BLACK}Válaszd ki a hangárra alkalmazni kívánt műveletet
 ###next-name-looks-similar
 
@@ -4831,15 +4835,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Menetren
 STR_TIMETABLE_NO_TRAVEL                                         :Nincs menet
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Menet (automata; menetrend a következő kézi utasítás alapján)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Következő célpontig a menetidő időzítetlen
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Menet {2:VELOCITY} max. sebességgel (nincs menetrend)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Menet {VELOCITY} max. sebességgel (nincs menetrend)
 STR_TIMETABLE_TRAVEL_FOR                                        :Menetidő: {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Menetidő: {STRING} {VELOCITY} max. sebességgel
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Menet ({STRING}ig, időzítetlen)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Menet ({STRING}ig, időzítetlen) {VELOCITY} max. sebességgel
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(ottmarad {STRING}ig, időzítetlen)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(utazás {STRING} városba, időzítetlen)
-STR_TIMETABLE_STAY_FOR                                          :állomásra és maradj ott {STRING}ig
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :és a menetidő: {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}állomásra és maradj ott {STRING}ig
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}és a menetidő: {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :Ez a menetrend körülbelül {STRING} időt vesz igénybe
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}A menetrend teljesítési ideje: {STRING}
@@ -4896,14 +4900,14 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Válassz
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}MI / Játékszkript nyomkövetés
+STR_AI_DEBUG                                                    :{WHITE}MI/játékszkript nyomkövetése
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Szkript neve
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Beállítások
 STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}A szkript beállításainak módosítása
 STR_AI_DEBUG_RELOAD                                             :{BLACK}MI újratöltése
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}MI kilövése, szkript újratöltése, MI újraindítása
-STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Megállítás be/kikapcsolása, ha az AI naplóbejegyzés megegyezik a megállítási sorral
+STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Megállítás be-/kikapcsolása, ha az MI naplóüzenet megegyezik a megállítási sorral
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Megállítás:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Megállítás
 STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Ha egy MI naplóbejegyzés megegyezik ezzel a sorral, a játék szünet módba kapcsol
@@ -4911,17 +4915,17 @@ STR_AI_DEBUG_MATCH_CASE                                         :{BLACK}Kis- és
 STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Kis- és nagybetűk megkülönböztetése az MI naplóbejegyzéseknek a megállítási sorral való összehasonlításánál
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Folytatás
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Játék folytatása és MI visszakapcsolása
-STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}A MI kimeneti nyomonkövetésének megtekintése. Ctrl+Kattintás új ablakban történő megnyitáshoz
+STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}A MI hibakeresési kimenetének megtekintése. Ctrl+kattintás az új ablakban való megnyitáshoz.
 STR_AI_GAME_SCRIPT                                              :{BLACK}Játékszkript
-STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Játékszkript napló ellenőrzése. Ctrl+kattintás új ablakban történő megnyitáshoz
+STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Játékszkriptnapló ellenőrzése. Ctrl+kattintás az új ablakban való megnyitáshoz.
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nincs MI, amit be lehetne tölteni.{}A jelenlegi MI csak dísz és nem fog semmit csinálni.{}MI-k letöltéséhez használd a tartalomletöltő rendszert
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Az egyik futó szkript futása közben hiba történt. Kérjük jelezd ezt a szkript készítőjének az MI / Játékzkript nyomkövetés ablakról készített képernyőmentéssel
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Az MI / Játékszkript nyomkövetés ablak csak a szerver számára elérhető
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION_AI                                        :{WHITE}MI beállítások
-STR_AI_CONFIG_CAPTION_GAMESCRIPT                                :{WHITE}Játékszkript beállítások
+STR_AI_CONFIG_CAPTION_AI                                        :{WHITE}MI-beállítások
+STR_AI_CONFIG_CAPTION_GAMESCRIPT                                :{WHITE}Játékszkript-beállítások
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}A következő játékban betöltődő játékszkript
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}A következő játékban betöltődő MI-k
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Játékos
@@ -4931,9 +4935,9 @@ STR_AI_CONFIG_NAME_VERSION                                      :{STRING} {YELLO
 STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}Ellenfelek száma legfeljebb: {ORANGE}{COMMA}
 STR_AI_CONFIG_COMPETITORS_INTERVAL                              :{LTBLUE}Ellenfelek indítása közötti időtartam: {ORANGE}{COMMA} perc
 
-STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Mozgatás Fel
+STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Mozgatás fel
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Kiválasztott MI mozgatása felfelé a listában
-STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Mozgatás Le
+STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Mozgatás le
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Kiválasztott MI mozgatása lefelé a listában
 
 STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Játékszkript
@@ -4942,7 +4946,7 @@ STR_AI_CONFIG_AI                                                :{SILVER}MI-k
 
 STR_AI_CONFIG_CHANGE_AI                                         :{BLACK}MI kiválasztása
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :{BLACK}Játékszkript kiválasztása
-STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Másik szkript betöltése. Ctrl+kattintás megmutat minden elérhető verziót
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Másik szkript betöltése. Ctrl+kattintás az összes elérhető verzió megjelenítéséhez.
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Beállítások
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}A szkript paramétereinek beállítása
 
@@ -4956,10 +4960,8 @@ STR_AI_LIST_AUTHOR                                              :{LTBLUE}Készí
 STR_AI_LIST_VERSION                                             :{LTBLUE}Verzió: {ORANGE}{NUM}
 STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
-STR_AI_LIST_ACCEPT                                              :{BLACK}Elfogad
+STR_AI_LIST_ACCEPT                                              :{BLACK}Elfogadás
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}A kijelölt szkript kiválasztása
-STR_AI_LIST_CANCEL                                              :{BLACK}Mégsem
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne változtassa a szkriptet
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Képmentés
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normál képernyőkép
@@ -4972,7 +4974,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minitér
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}MI paraméterek
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Játékszkript paraméterek
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Bezárás
 STR_AI_SETTINGS_RESET                                           :{BLACK}Visszaállítás
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5117,13 +5118,13 @@ STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nem ép
 STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nem lehet több települést építeni...
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Nem nevezheted át a várost...
 STR_ERROR_CAN_T_FOUND_TOWN_HERE                                 :{WHITE}Nem építhetsz ide várost...
-STR_ERROR_CAN_T_EXPAND_TOWN                                     :{WHITE}Nem növelhető város...
+STR_ERROR_CAN_T_EXPAND_TOWN                                     :{WHITE}A város nem növelhető...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... túl közel van a térkép határához
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... túl közel van egy másik településhez
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... túl sok a település
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... nincs több hely a térképen
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Útkarbantartás folyamatban
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Nem törölhető ezt a várost...{}{}Egy állomás vagy járműtelep hivatkozik a városra, vagy egy városi tulajdonú mező nem eltávolítható
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}A város nem törölhető...{}{}Egy állomás vagy járműtelep hivatkozik a városra, vagy egy városi tulajdonú mező nem távolítható el
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... nincs megfelelő hely egy szobornak a város központjában
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}A házépítés nem lehetséges
 
@@ -5219,7 +5220,7 @@ STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nem ép
 
 STR_ERROR_CAN_T_RENAME_DEPOT                                    :{WHITE}Nem nevezheted át a járműtelepet...
 
-STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... fűtőhűzban kellene állnia ehhez
+STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... járműtelepen kellene állnia ehhez
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... garázsban kellene állnia ehhez
 STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT                     :{WHITE}... dokkban kellene állnia ehhez
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... hangárban kellene állnia ehhez
@@ -5941,21 +5942,21 @@ STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} {COMMA}.
 STR_FORMAT_BUOY_NAME_SERIAL.ba                                  :{TOWN} {COMMA}. sz. Bóján
 
 ###length 2
-STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Ellenőrző pont
-STR_FORMAT_WAYPOINT_NAME.ba                                     :{TOWN} Ellenőrző ponton
-STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} {COMMA}. sz. Ellenőrző pont
-STR_FORMAT_WAYPOINT_NAME_SERIAL.ba                              :{TOWN} {COMMA}. sz. Ellenőrző ponton
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} ellenőrzőpont
+STR_FORMAT_WAYPOINT_NAME.ba                                     :{TOWN} ellenőrzőponton
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} {COMMA}. sz. ellenőrzőpont
+STR_FORMAT_WAYPOINT_NAME_SERIAL.ba                              :{TOWN} {COMMA}. sz. ellenőrzőponton
 
 ###length 6
-STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Járműtelep
-STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. Vasúti járműtelep
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} Garázs
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{TOWN} {COMMA}. sz. Garázs
+STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} járműtelep
+STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. vasúti járműtelep
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} garázs
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{TOWN} {COMMA}. sz. garázs
 STR_FORMAT_DEPOT_NAME_SHIP                                      :{TOWN} Dokk
-STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} {COMMA}. sz. Dokk
+STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} {COMMA}. sz. dokk
 ###next-name-looks-similar
 
-STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{STATION} Hangár
+STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{STATION} hangár
 # _SERIAL version of AIRACRAFT doesn't exist
 
 STR_UNKNOWN_STATION                                             :ismeretlen állomás
@@ -5991,6 +5992,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP} Milliár
 STR_CURRENCY_SHORT_TERA                                         :{NBSP} billó
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -6030,3 +6032,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Jelvény beállítások megnyitása
+STR_BADGE_CONFIG_RESET                                          :Visszaállítás
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Jelvény ikonok
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Jelvény szűrők
+STR_BADGE_CONFIG_PREVIEW                                        :Előnézet kép
+STR_BADGE_CONFIG_NAME                                           :Név
+STR_BADGE_FILTER_ANY_LABEL                                      :Bármelyik {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} {STRING}
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 166be25a4d..434476b78a 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -821,8 +821,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Stilling
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Gjaldmiðill
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Val á gjaldmiðli
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Gjaldmiðill
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Val á gjaldmiðli
 
 
 ###length 45
@@ -861,21 +862,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Sérsniðinn...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Íranskt ríal
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Sjálfvirk vistun
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Tíðni sjálfvirkra vistana
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Sjálfvirk vistun
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Tíðni sjálfvirkra vistana
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Aldrei
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Tungumál
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Tungumál viðmóts
+STR_GAME_OPTIONS_LANGUAGE                                       :Tungumál
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Tungumál viðmóts
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fylla út í skjá
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Smelltu hér til að OpenTTD fylli út í skjáinn
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fylla út í skjá
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Smelltu hér til að OpenTTD fylli út í skjáinn
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjáupplausn
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Stilla skjáupplausn
+STR_GAME_OPTIONS_RESOLUTION                                     :Skjáupplausn
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Stilla skjáupplausn
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
@@ -888,17 +889,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grunngrafík
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Nota grunngrafíkina
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Frekari upplýsingar um grunngrafíkpakkann
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Grunn hljóðasafn
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Veldu grunn hljóðasafn
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Aukaupplýsingar um grunn hljóðasafnið
+STR_GAME_OPTIONS_BASE_GRF                                       :Grunngrafík
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Nota grunngrafíkina
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Frekari upplýsingar um grunngrafíkpakkann
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Grunntónlistarsafn
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Veld grunntónlistarsafn til að nota
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Auka upplýsingar um grunntónlistarsafnið
+STR_GAME_OPTIONS_BASE_SFX                                       :Grunn hljóðasafn
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Veldu grunn hljóðasafn
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Aukaupplýsingar um grunn hljóðasafnið
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Grunntónlistarsafn
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Veld grunntónlistarsafn til að nota
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Auka upplýsingar um grunntónlistarsafnið
 
 
 
@@ -999,10 +1001,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Eftirgefin
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Engin nothæf gervigreind í boði...{}Þú getur hlaðið niður mörgum gervigreindum í gegnum 'Ná í viðbætur af netinu' viðmótið
 
-# Settings tree window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Sía:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Þenja út
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Draga saman
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Sía:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Þenja út
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Draga saman
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(engin skýring til)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Sjálfgefið gildi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Gerð stillingar: {ORANGE}{STRING}
@@ -1012,7 +1014,7 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Leikjastillinga
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Fyrirtækjastillingar (geymdar í vistunarskrám; hefur bara áhrif á nýja leiki)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Fyrirtækjastillingar (geymdar í vistunarskrám; hefur bara áhrif á núverandi fyrirtæki)
 
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Takmarkar listan hér fyrir neðan við breyttar stillingar
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Takmarkar listan hér fyrir neðan við breyttar stillingar
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grunnstillingar
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Ítarlegar stillingar
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Mjög ítarlegar stillingar / allar stillingar
@@ -1732,7 +1734,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Úthlutu
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nýr leikur
 STR_INTRO_LOAD_GAME                                             :{BLACK}Opna leik
@@ -1743,7 +1744,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Fjölspi
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Stillingar
 STR_INTRO_HIGHSCORE                                             :{BLACK}Stigatafla
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Stillingar
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Ná í viðbætur af netinu
 STR_INTRO_QUIT                                                  :{BLACK}Hætta
 
@@ -1761,7 +1761,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Leikfang
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Stilla OpenTTD
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Birta stigatöflu
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Sýna NewGRF stillingar
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skoða viðbætur sem hægt er að ná í af netinu
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Hætta í OpenTTD
 
@@ -2412,6 +2411,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Velja st
 STR_FOUND_TOWN_CITY                                             :{BLACK}Borg
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Borgir vaxa hraðar en venjulegir bæir{}Möguleiki á aukinni upphafsstærð í stillingum
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Vegaskipulag bæja
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Veldu það skipulag sem þessi bær notar fyrir sína vegi
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Upphaflegt
@@ -2736,7 +2736,6 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Ósamhæft
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Breyta NewGRF stillingum
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Loka
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Endurstilla
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Setja allar stillingar á sjálfvalin gildi.
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Stilling {NUM}
@@ -3721,7 +3720,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Áætlun
 STR_TIMETABLE_NO_TRAVEL                                         :Engin ferðalög
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Ferðalag (sjálfvirkt; áætlað eftir næstu handvirku skipun)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ferðalag (ekki sett í áætlun)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Ferðast með hámarkshraða {2:VELOCITY} (ekki áætlað)
 STR_TIMETABLE_TRAVEL_FOR                                        :Ferðast í {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Ferðast í {STRING} með hámarkshraða {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :og bíða í {STRING}
@@ -3827,13 +3825,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}Vefsló
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Í lagi
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Velja merkta forskrift
-STR_AI_LIST_CANCEL                                              :{BLACK}Hætta við
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Hætta við breytingar forskriftar
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :Gervigreindar
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Loka
 STR_AI_SETTINGS_RESET                                           :{BLACK}Frumstilla
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/ido.txt b/src/lang/ido.txt
index df066b832d..35ea016063 100644
--- a/src/lang/ido.txt
+++ b/src/lang/ido.txt
@@ -466,6 +466,7 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludo Sel
 
 
 
+
 ###length 45
 
 
@@ -494,6 +495,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :altra
 
 
 
+
 
 # Custom currency window
 
@@ -539,7 +541,7 @@ STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Kustumigita ({N
 ###length 4
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 
 
 
@@ -824,7 +826,6 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Violkolora
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova Ludo
 STR_INTRO_LOAD_GAME                                             :{BLACK}Charjas Ludo
@@ -1004,6 +1005,7 @@ STR_OBJECT_BUILD_SIZE                                           :{BLACK}Grandeso
 
 
 
+
 # Fund new industry window
 
 # Industry cargoes window
@@ -1081,7 +1083,6 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Versiono
 # NewGRF save preset window
 
 # NewGRF parameters window
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Klozas
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Nombro di parametri: {ORANGE}{NUM}
 
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 5dcf4f30d7..ad6a675935 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -436,7 +436,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Keluar
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pengaturan permainan
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Pengaturan
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Pengaturan AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Pengaturan Game script
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Pengaturan NewGRF
@@ -925,19 +924,20 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Perlihat
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opsi permainan
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Umum
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Pilih setingan umum
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Pilih setingan umum
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Setingan pilih grafis
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Setingan pilih grafis
 STR_GAME_OPTIONS_TAB_SOUND                                      :Suara
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}\Pilih suara dan setingan musik
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :\Pilih suara dan setingan musik
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efek suara
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Mata uang
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pilih mata uang
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Mata uang
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Pilih mata uang
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -985,8 +985,8 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :India Rupee
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupiah Indonesia
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit Malaysia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Simpan Otomatis
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Pilih selang waktu permainan otomatis disimpan
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Simpan Otomatis
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Pilih selang waktu permainan otomatis disimpan
 
 # Autosave dropdown
 ###length 5
@@ -996,71 +996,71 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Setiap 30 menit
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Setiap 60 menit
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Setiap 120 menit
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Bahasa
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pilih antar muka bahasa yang akan dipergunakan
+STR_GAME_OPTIONS_LANGUAGE                                       :Bahasa
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Pilih antar muka bahasa yang akan dipergunakan
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% selesai)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Layar Penuh
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Klik cek box ini untuk memainkan OpenTTD dalam layar penuh
+STR_GAME_OPTIONS_FULLSCREEN                                     :Layar Penuh
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Klik cek box ini untuk memainkan OpenTTD dalam layar penuh
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolusi Layar
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pilih resolusi layar yang diinginkan
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolusi Layar
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pilih resolusi layar yang diinginkan
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :lainnya
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Akselerasi perangkat keras
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK} Centang kotak ini untuk mengizinkan OpenTTD mencoba menggunakan akselerasi perangkat keras. Pengaturan yang diubah hanya akan diterapkan saat permainan dimulai ulang.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Akselerasi perangkat keras
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     : Centang kotak ini untuk mengizinkan OpenTTD mencoba menggunakan akselerasi perangkat keras. Pengaturan yang diubah hanya akan diterapkan saat permainan dimulai ulang.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Pengaturan hanya akan berlaku setelah game dimulai ulang
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Centang kotak ini untuk melakukan sinkronisasi layar (v-sync). Pengaturan yang diubah hanya akan diterapkan saat game dimulai ulang. Hanya berfungsi dengan akselerasi perangkat keras diaktifkan.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Centang kotak ini untuk melakukan sinkronisasi layar (v-sync). Pengaturan yang diubah hanya akan diterapkan saat game dimulai ulang. Hanya berfungsi dengan akselerasi perangkat keras diaktifkan.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Pengendali piranti: {STRING}
-
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Ukuran antarmuka
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Geser slider untuk mengatur ukuran antarmuka. Tekan tombol Ctrl untuk pengaturan terus menerus
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Otomatis deteksi ukuran
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Pilih kotak ini untuk mendeteksi ukuran antarmuka secara otomatis
-
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skala bevel
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Pilih kotak ini untuk pengaturan perbandingan ukuran bevel dengan ukuran antarmuka
-
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Font anti-alias
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Centang kotak ini untuk font anti-alias yang dapat diubah ukurannya.
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Pengendali piranti: {STRING}
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Survei Otomatis
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Berpartisipasi pada survey otomatis
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Jika diaktifkan, OpenTTD akan mengirimkan survei saat meninggalkan game
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Tentang survei dan privasi
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Ini akan membuka browser dengan informasi lebih lanjut tentang survei otomatis
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Tampilkan hasil survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Tampilkan hasil survey pada game yang berjalan saat ini
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Ukuran antarmuka
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Geser slider untuk mengatur ukuran antarmuka. Tekan tombol Ctrl untuk pengaturan terus menerus
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Otomatis deteksi ukuran
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Pilih kotak ini untuk mendeteksi ukuran antarmuka secara otomatis
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafik
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skala bevel
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Pilih kotak ini untuk pengaturan perbandingan ukuran bevel dengan ukuran antarmuka
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Menampilkan kecepatan refresh
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Pilih laju penyegaran layar yang akan digunakan
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Font anti-alias
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Centang kotak ini untuk font anti-alias yang dapat diubah ukurannya.
+
+
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Survei Otomatis
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Berpartisipasi pada survey otomatis
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Jika diaktifkan, OpenTTD akan mengirimkan survei saat meninggalkan game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Tentang survei dan privasi
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ini akan membuka browser dengan informasi lebih lanjut tentang survei otomatis
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Tampilkan hasil survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Tampilkan hasil survey pada game yang berjalan saat ini
+
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Menampilkan kecepatan refresh
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Pilih laju penyegaran layar yang akan digunakan
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Kecepatan refresh yang lebih tinggi dari 60Hz dapat memengaruhi kinerja.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set Grafik Dasar
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih grafik dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informasi tambahan tentang set grafik dasar
+STR_GAME_OPTIONS_BASE_GRF                                       :Set Grafik Dasar
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Pilih grafik dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informasi tambahan tentang set grafik dasar
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set suara dasar
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Pilih set suara dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informasi tambahan tentang set suara dasar
+STR_GAME_OPTIONS_BASE_SFX                                       :Set suara dasar
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Pilih set suara dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informasi tambahan tentang set suara dasar
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set Musik Dasar
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Pilih musik dasar yang akan digunakan
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informasi tambahan tentang musik dasar
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set Musik Dasar
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Pilih musik dasar yang akan digunakan
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informasi tambahan tentang musik dasar
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(tidak ada plugin untuk diintegrasikan dengan platform sosial yang terpasang)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Status plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Status plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inisiasi gagal
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} tidak dijalankan
@@ -1168,12 +1168,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permisif (tidak
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Tidak terdapat pemain AI ...{}anda dapat mengunduh beberapa macam AI lewat "Cari Konten"
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Pengaturan
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Saring:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Perluas semua
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Persempit semua
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Atur ulang semua pengaturan
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Saring:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Perluas semua
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Persempit semua
+STR_CONFIG_SETTING_RESET_ALL                                    :Atur ulang semua pengaturan
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(penjelasan belum tersedia)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Nilai standar: {ORANGE}{STRING}
@@ -1186,9 +1185,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Setting perusah
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Peringatan!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tindakan ini akan mengembalikan semua pengaturan gim ke nilai awalnya.{} Anda yakin ingin melanjutkan?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Jenis:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Batasi daftar dibawah ini menggunakan filter yang telah ditetapkan
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Jenis:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Batasi daftar dibawah ini menggunakan filter yang telah ditetapkan
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pengaturan dasar (hanya pengaturan yang penting)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Pengaturan lanjut (lebih banyak pengaturan)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Pengaturan mahir (tampilkan semua, termasuk yang tak biasa)
@@ -1205,9 +1204,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Pengaturan peru
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Tidak ada -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Tampilkan semua pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Tampilkan semua hasil pencarian dengan pengaturan{}{SILVER}Jenis {BLACK}ke {WHITE} Semua jenis pengaturan
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Tampilkan semua hasil pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING} {BLACK}dan {SILVER}Jenis {BLACK}sampai {WHITE}Semua jenis pengaturan
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Tampilkan semua pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Tampilkan semua hasil pencarian dengan pengaturan{}{SILVER}Jenis {BLACK}ke {WHITE} Semua jenis pengaturan
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Tampilkan semua hasil pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING} {BLACK}dan {SILVER}Jenis {BLACK}sampai {WHITE}Semua jenis pengaturan
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Tidak
@@ -2114,7 +2113,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... tida
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Driver GPU membuat game crash. Akselerasi perangkat keras dinonaktifkan
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Permainan Baru
 STR_INTRO_LOAD_GAME                                             :{BLACK}Buka Permainan
@@ -2126,11 +2124,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multi Pe
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Pengaturan Permainan
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabel Nilai Tertinggi
 STR_INTRO_HELP                                                  :{BLACK}Bantuan & Panduan
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Pengaturan
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Pengaturan NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Cari Konten Daring
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Pengaturan AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Pengaturan Game Script
 STR_INTRO_QUIT                                                  :{BLACK}Keluar
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Mulai permainan baru. Ctrl-Klik melewatkan konfigurasi peta
@@ -2148,11 +2142,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Pilih ga
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Tampilkan opsi permainan
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Tampilkan tabel nilai tertinggi
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Dapatkan izin dokumentasi dan sumber daya online
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Tampilkan pengaturan
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Tampilkan pengaturan NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Cari konten baru dan pembaruan untuk diunduh
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Tampilkan pengaturan AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Tampilan pengaturan game script
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Keluar OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}Kumpulan grafik dasar yang dipilih saat ini hilang {NUM} sprite {P ..}. Silakan periksa pembaruan untuk baseset.
@@ -2943,6 +2933,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Pilih uk
 STR_FOUND_TOWN_CITY                                             :{BLACK}Kota
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Kota tumbuh lebih cepat daripada biasanya{}Tergantung pengaturan, kota dapat lebih besar ketika di danai.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Tampilan jalan kota:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Pilihlah tampilan jalan yang digunakan utk kota ini
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Asli
@@ -3369,15 +3360,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Menyimpa
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Daftar pengaturan yang tersedia, memilih salah satu untuk menyalin kepada nama penyimpanan di bawah
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Memasukkan nama untuk pengaturan
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nama yang sedang dipilih bagi penyimpanan pengaturan
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Batal
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Jangan mengubah pengaturan awal
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Menyimpan
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Menyimpan presetnya pada nama yang sedang dipilih
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Ubah parameter grafik dasar
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Ubah parameter NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Tutup
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Kembalikan setelan awal parameter
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -4559,7 +4547,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Daftar J
 STR_TIMETABLE_NO_TRAVEL                                         :Tidak berjalan
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Perjalanan (otomatis; akan dijadwalkan pada perintah manual berikutnya)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Perjalanan belum terjadwal
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Bergerak dengan kecepatan maks. {2:VELOCITY} (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Berjalan selama {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Bergerak {STRING} dengan maks. kecepatan {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Berjalan (untuk {STRING}, tidak berjadwal)
@@ -4675,8 +4662,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Terapkan
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Pilih skrip AI yg disorot
-STR_AI_LIST_CANCEL                                              :{BLACK}Batal
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Jangan mengubah skrip AI
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Ambil tangkapan layar
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Tangkapan layar normal
@@ -4689,7 +4674,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Tangkapa
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parameter AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Skrip Permainan
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tutup
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index cc201fe72f..096031a96d 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -399,7 +399,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Scoir
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Roghanna an chluiche
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Socruithe
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Socruithe NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Roghanna trédhearcachta
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Taispeántar ainmneacha bailte
@@ -876,8 +875,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Roghanna
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Aonaid airgeadra
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Aonaid airgeadra a roghnú
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Aonaid airgeadra
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Aonaid airgeadra a roghnú
 
 
 ###length 45
@@ -924,31 +924,31 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúipí na hInd
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupiah na hIndinéise
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit na Malaeisia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Uathshábháil
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Roghnaigh eatramh idir uathshábhálacha an chluiche
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Uathshábháil
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Roghnaigh eatramh idir uathshábhálacha an chluiche
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :As
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Teanga
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Roghnaigh an teanga comhéadain le húsáid
+STR_GAME_OPTIONS_LANGUAGE                                       :Teanga
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Roghnaigh an teanga comhéadain le húsáid
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% críochnaithe)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Lánscáileán
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Cuir tic sa bhosca seo chun OpenTTD a imirt sa mhód lánscáileáin
+STR_GAME_OPTIONS_FULLSCREEN                                     :Lánscáileán
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Cuir tic sa bhosca seo chun OpenTTD a imirt sa mhód lánscáileáin
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Taifeach scáileáin
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Roghnaigh an taifeach scáileáin le húsáid
+STR_GAME_OPTIONS_RESOLUTION                                     :Taifeach scáileáin
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Roghnaigh an taifeach scáileáin le húsáid
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :eile
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Luasghéarú crua-earraí
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Cuir tic sa bhosca seo chun cead a thabhairt do OpenTTD iarracht a dhéanamh luasghéarú crua-earraí a úsáid. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Luasghéarú crua-earraí
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Cuir tic sa bhosca seo chun cead a thabhairt do OpenTTD iarracht a dhéanamh luasghéarú crua-earraí a úsáid. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Ní chuirfear an socrú i bhfeidhm go dtí go ndéanfar an cluiche a atosú
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Cuir tic sa bhosca seo chun v-shioncronú (v-sync) a úsáid ar an scáileán. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú. Ní oibríonn seo ach amháin má tá luasghéarú crua-earraí cumasaithe
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Cuir tic sa bhosca seo chun v-shioncronú (v-sync) a úsáid ar an scáileán. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú. Ní oibríonn seo ach amháin má tá luasghéarú crua-earraí cumasaithe
 
 
 
@@ -956,24 +956,24 @@ STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Cuir tic
 
 
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafaicí
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ráta athnuachana na taispeána
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Roghnaigh ráta athnuachana an scáileán atá le húsáid
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ráta athnuachana na taispeána
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Roghnaigh ráta athnuachana an scáileán atá le húsáid
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}D'fhéadfadh rátaí athnuacha os cionn 60Hz tionchar a bheith acu ar an bhfeidhmíocht.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Sraith graifice bunaidh
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Roghnaigh an sraith grafaice bunaidh le húsáid
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Faisnéis breise faoin sraith grafaice bunaidh
+STR_GAME_OPTIONS_BASE_GRF                                       :Sraith graifice bunaidh
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Roghnaigh an sraith grafaice bunaidh le húsáid
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Faisnéis breise faoin sraith grafaice bunaidh
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Sraith fuaimeanna bunaidh
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Roghnaigh an tsraithe fuaimeanna bunaidh le húsáid
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Faisnéis breise faoin tsraith fuaimeanna bunaidh
+STR_GAME_OPTIONS_BASE_SFX                                       :Sraith fuaimeanna bunaidh
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Roghnaigh an tsraithe fuaimeanna bunaidh le húsáid
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Faisnéis breise faoin tsraith fuaimeanna bunaidh
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Sraith ceoil bunaidh
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Roghnaigh an tsraith ceoil bunaidh le húsáid
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Faisnéis breise faoin tsraith ceoil bunaidh
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Sraith ceoil bunaidh
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Roghnaigh an tsraith ceoil bunaidh le húsáid
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Faisnéis breise faoin tsraith ceoil bunaidh
 
 
 
@@ -1078,12 +1078,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tugtar cead
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Níl aon AI oiriúnach ar fáil...{}Is féidir leat roinnt AI a íoslódáil tríd an gcóras 'Inneachar Ar Líne'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Socruithe
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Teaghrán scagtha:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Fairsingigh gach ceann
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Leacaigh gach ceann
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Athshocraigh gach luach
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Teaghrán scagtha:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Fairsingigh gach ceann
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Leacaigh gach ceann
+STR_CONFIG_SETTING_RESET_ALL                                    :Athshocraigh gach luach
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(níl aon mhíniú ar fáil)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Luach réamhshocraithe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Cineál socrú: {ORANGE}{STRING}
@@ -1095,9 +1094,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Socrú cuideach
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Rabhadh!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Leis an mbeart seo athshocrófar gach socrú cluiche chuig a réamhshocrú.{}An bhfuil tú cinnte gur mhaith leat leanúint ar aghaidh?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Catagóir:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Cineál:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Cuirtear srian ar an liosta thíos ag úsáid scagairí réamhshocraithe
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Catagóir:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Cineál:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Cuirtear srian ar an liosta thíos ag úsáid scagairí réamhshocraithe
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bunúsach (ná taispeáin ach socruithe tábhachtacha)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Ardleibhéil (taispeáin formhór na socruithe)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Saineolaí (taispeáin gach socrú, cinn aisteacha ina measc)
@@ -1114,9 +1113,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Socruithe Cuide
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ceann ar bith -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING} {BLACK}agus {SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING} {BLACK}agus {SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :As
@@ -1968,7 +1967,6 @@ STR_VIDEO_DRIVER_ERROR                                          :{WHITE}Earráid
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... níor aimsaíodh GPU comhoiriúnach. Luasghéarú cura-earraí díchumasaithe
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Cluiche Nua
 STR_INTRO_LOAD_GAME                                             :{BLACK}Lódáil Cluiche
@@ -1979,8 +1977,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Ilimreoi
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Roghanna an Chluiche
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tábla na nArdscór
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Socruithe
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Socruithe NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Seiceáil Inneachar Ar Líne
 STR_INTRO_QUIT                                                  :{BLACK}Scoir
 
@@ -1998,8 +1994,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Roghnaig
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Taispeáin roghanna an chluiche
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Taispeáin tábla na n-ardscór
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Socruithe taispeána
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Taispeáin socruithe NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Seiceáil le haghaidh inneachar nua agus nuashonruithe le híoslódáil
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Téigh amach as 'OpenTTD'
 
@@ -2751,6 +2745,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Roghnaig
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cathair
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Fásann cathracha níos mó ná gnáthbhailte{}Ag brath ar na socruithe, bíonn siad níos mó nuair a bhunaítear iad
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Leagan amach bóithre an bhaile:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Roghnaigh leagan amach na mbóithre don bhaile seo
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Bunaidh
@@ -3166,14 +3161,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Sábhái
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Liosta de na réamhshocraithe atá ar fáil, roghnaigh ceann chun é a chóipeáil chuig an t-ainm sábháilte thíos
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Iontráil ainm don réamhshocrú
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}An t-ainm atá roghnaithe faoi láthair don réamhshocrú a shábhálfar
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cuir ar ceal
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ná hathraigh an réamhshocrú
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Sábháil
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Sábháil an réamhshocrú faoin ainm atá roghnaithe faoi láthair
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Athraigh na paraiméadair NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Dún
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Athshocraigh
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Socraigh go mbeidh a réamhshocrú ag gach paraiméadair
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paraiméadar{NUM}
@@ -4295,7 +4287,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Amchlár
 STR_TIMETABLE_NO_TRAVEL                                         :Ná taisteal
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Taisteal (uathoibríoch; curtha ar an gclár ama ag an chéad ordú de láimh eile)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Taisteal (gan amchlár)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Taisteal (gan amchlár) ag {2:VELOCITY} ar a mhéad
 STR_TIMETABLE_TRAVEL_FOR                                        :Taisteal ar feadh {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Taisteal ar feadh {STRING} le {VELOCITY} ar a mhéad
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Taisteal (ar feadh {STRING}, gan amchlár)
@@ -4405,8 +4396,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Glac leis
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Roghnaigh an AI aibhsithe
-STR_AI_LIST_CANCEL                                              :{BLACK}Cuir ar ceal
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ná hathraigh an AI
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Seat scáileáin a thógáil
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Gnáth-seat scáileáin
@@ -4418,7 +4407,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Seat sc
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Dún
 STR_AI_SETTINGS_RESET                                           :{BLACK}Athshocraigh
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 66dff36729..4cc4203800 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Mette case
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opzioni gioco
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Impostazioni
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Impostazioni IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Impostazioni script di gioco
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Impostazioni NewGRF
@@ -950,21 +949,22 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copia la
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opzioni di gioco
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generale
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Scegliere le impostazioni generali
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Scegliere le impostazioni generali
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafica
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Scegliere le impostazioni grafiche
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Scegliere le impostazioni grafiche
 STR_GAME_OPTIONS_TAB_SOUND                                      :Suono
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Scegliere le impostazioni audio e musicali
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Scegliere le impostazioni audio e musicali
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Scegli le impostazioni di integrazione social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Scegli le impostazioni di integrazione social
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Effetti sonori
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musica
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selezione della valuta
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Selezione della valuta
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1014,8 +1014,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit malaysi
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats lettoni
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portoghese
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvataggi automatici
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Seleziona l'intervallo fra i salvataggi automatici della partita
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Salvataggi automatici
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Seleziona l'intervallo fra i salvataggi automatici della partita
 
 # Autosave dropdown
 ###length 5
@@ -1025,77 +1025,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Ogni 30 minuti
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Ogni 60 minuti
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Ogni 120 minuti
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingua
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Seleziona la lingua da utilizzare per l'interfaccia
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingua
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Seleziona la lingua da utilizzare per l'interfaccia
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completato)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Schermo intero
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Attiva questa casella per giocate a OpenTTD in modalità schermo intero
+STR_GAME_OPTIONS_FULLSCREEN                                     :Schermo intero
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Attiva questa casella per giocate a OpenTTD in modalità schermo intero
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Risoluzione schermo
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Seleziona la risoluzione dello schermo da utilizzare
+STR_GAME_OPTIONS_RESOLUTION                                     :Risoluzione schermo
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Seleziona la risoluzione dello schermo da utilizzare
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Altra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Accelerazione hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Seleziona questa opzione per consentire a OpenTTD di utilizzare l'accelerazione hardware. Eventuali cambiamenti avranno effetto solo dopo un riavvio del gioco
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Accelerazione hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Seleziona questa opzione per consentire a OpenTTD di utilizzare l'accelerazione hardware. Eventuali cambiamenti avranno effetto solo dopo un riavvio del gioco
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Le nuove impostazioni avranno effetto solo dopo un riavvio del gioco
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Seleziona questa casella per abilitare la sincronizzazione verticale dello schermo. Un'impostazione modificata verrà applicata solo al riavvio del gioco. Funziona solo con l'accelerazione hardware abilitata
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Seleziona questa casella per abilitare la sincronizzazione verticale dello schermo. Un'impostazione modificata verrà applicata solo al riavvio del gioco. Funziona solo con l'accelerazione hardware abilitata
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Driver attuale: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Driver attuale: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Dimensione dell'interfaccia
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Trascinare il cursore per impostare le dimensioni dell'interfaccia. Ctrl+trascina per una regolazione continua
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Rileva automaticamente le dimensioni
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Seleziona questa casella per rilevare automaticamente le dimensioni dell'interfaccia
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scala smussature
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Seleziona questa casella per ridimensionare le smussature in base alle dimensioni dell'interfaccia
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Dimensione dell'interfaccia
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Trascinare il cursore per impostare le dimensioni dell'interfaccia. Ctrl+trascina per una regolazione continua
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Rileva automaticamente le dimensioni
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Seleziona questa casella per rilevare automaticamente le dimensioni dell'interfaccia
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usa il carattere sprite tradizionale
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Seleziona questa casella se preferisci utilizzare il tradizionale carattere sprite di dimensioni fisse
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Font anti-aliasing
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Seleziona questa casella per applicare l'anti-aliasing ai caratteri ridimensionabili
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scala smussature
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Seleziona questa casella per ridimensionare le smussature in base alle dimensioni dell'interfaccia
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usa il carattere sprite tradizionale
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Seleziona questa casella se preferisci utilizzare il tradizionale carattere sprite di dimensioni fisse
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Font anti-aliasing
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Seleziona questa casella per applicare l'anti-aliasing ai caratteri ridimensionabili
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Sondaggio automatizzato
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Partecipare al sondaggio automatico
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Se abilitato, OpenTTD trasmette un sondaggio quando si lascia una partita.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Informazioni sul sondaggio e sulla privacy
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Apre un browser con ulteriori informazioni sul sondaggio automatico.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Anteprima del risultato del sondaggio
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostra il risultato del sondaggio della partita in corso
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Sondaggio automatizzato
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Partecipare al sondaggio automatico
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Se abilitato, OpenTTD trasmette un sondaggio quando si lascia una partita.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Informazioni sul sondaggio e sulla privacy
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Apre un browser con ulteriori informazioni sul sondaggio automatico.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Anteprima del risultato del sondaggio
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostra il risultato del sondaggio della partita in corso
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafica
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Frequenza di aggiornameno dello schermo
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Seleziona la frequenza di aggiornamento dello schermo da utilizzare
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Frequenza di aggiornameno dello schermo
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Seleziona la frequenza di aggiornamento dello schermo da utilizzare
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Frequenze di aggiornamento maggiori di 60Hz potrebbero impattare le prestazioni.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pacchetto grafico di base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selezionare il pacchetto grafico di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informazioni aggiuntive sul pacchetto grafico di base
+STR_GAME_OPTIONS_BASE_GRF                                       :Pacchetto grafico di base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selezionare il pacchetto grafico di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informazioni aggiuntive sul pacchetto grafico di base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Pacchetto sonoro di base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selezionare il pacchetto di suoni di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informazioni aggiuntive sul pacchetto sonoro di base
+STR_GAME_OPTIONS_BASE_SFX                                       :Pacchetto sonoro di base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selezionare il pacchetto di suoni di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informazioni aggiuntive sul pacchetto sonoro di base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Pacchetto musicale di base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Seleziona il pacchetto musicale di base da utilizzare
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informazioni aggiuntive sul pacchetto musicale di base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Pacchetto musicale di base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Seleziona il pacchetto musicale di base da utilizzare
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informazioni aggiuntive sul pacchetto musicale di base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Ottieni contenuto
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Cerca contenuti nuovi e aggiornati da scaricare
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nessun plugin installato per integrarsi con le piattaforme social)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Piattaforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stato del plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Piattaforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stato del plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}In esecuzione
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inizializzazione fallita
@@ -1220,12 +1220,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissivo (nes
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nessuna IA adatta disponibile...{}È possibile scaricare numerose IA tramite il sistema 'Contenuti online'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Impostazioni
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtro:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Espandi tutti
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Comprimi tutti
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Resetta tutti i valori
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtro:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Espandi tutti
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Comprimi tutti
+STR_CONFIG_SETTING_RESET_ALL                                    :Resetta tutti i valori
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(descrizione non disponibile)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valore predefinito: {ORANGE}{STRING}
@@ -1238,9 +1237,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Impostazione de
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Attenzione!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Questa azione resetterà tutti i settaggi ai loro valori predefiniti.{}Sei sicuro di voler procedere?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limita la lista sottostante usando i filtri predefiniti
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limita la lista sottostante usando i filtri predefiniti
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Di base (solo le impostazioni principali)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avanzate (la maggior parte delle impostazioni)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Per esperti (tutte le impostazioni, incluse quelle speciali)
@@ -1257,9 +1256,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Impostazioni de
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nessuna -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Per mostrare tutti i risultati impostare il{}{SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING} {BLACK}e il {SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Per mostrare tutti i risultati impostare il{}{SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING} {BLACK}e il {SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :No
@@ -2207,7 +2206,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... non
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Il driver della GPU ha mandato in crash il gioco. Accelerazione hardware disattivata
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nuova partita
 STR_INTRO_LOAD_GAME                                             :{BLACK}Carica partita
@@ -2219,11 +2217,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multigio
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opzioni di gioco
 STR_INTRO_HIGHSCORE                                             :{BLACK}Punteggi migliori
 STR_INTRO_HELP                                                  :{BLACK}Aiuto e manuali
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Impostazioni
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Impostazioni NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenuti online
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Impostazioni IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Impostazioni script di gioco
 STR_INTRO_QUIT                                                  :{BLACK}Esci
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Inizia una nuova partita. Ctrl salta la configurazione della mappa.
@@ -2241,11 +2235,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Selezion
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Apre le opzioni di gioco
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Apre la tabella dei punteggi migliori
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Ottieni l'accesso alla documentazione e alle risorse online
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Apri le impostazioni
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Apre le impostazioni NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Controlla la disponibilità di contenuti nuovi o aggiornati da scaricare
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Apri impostazioni IA
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Apre le impostazioni dello script di gioco
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Esci da OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}Nel pacchetto grafico di base attualmente selezionato mancano {NUM} sprite. È consigliabile controllare gli aggiornamenti del pacchetto.
@@ -3074,6 +3064,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selezion
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropoli
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Le metropoli crescono più rapidamente delle normali città.{}A seconda delle impostazioni, sono più grandi quando vengono fondate.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposizione strade:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Seleziona la disposizione delle strade per questa città
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originale
@@ -3513,15 +3504,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Salva pr
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista dei profili disponibili, selezionarne uno per copiarlo nella casella del nome del salvataggio
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Inserire il nome del profilo
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nome scelto per il profilo da salvare
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Annulla
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Non modifica il profilo
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Salva
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Salva il profilo utilizzando il nome inserito
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Modifica dei parametri grafici di base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Cambia parametri NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Chiudi
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reimposta
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Imposta tutti i parametri al loro valore predefinito
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametro {NUM}
@@ -4741,7 +4729,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tabella
 STR_TIMETABLE_NO_TRAVEL                                         :Nessun viaggio
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viaggia (automatico; orario basato sul successivo ordine manuale)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viaggia (senza orario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaggia (senza orario) a non più di {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaggia per {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaggia per {STRING} a non più di {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viaggia (per {STRING}, senza orario)
@@ -4865,8 +4852,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accetta
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Sceglie lo script selezionato
-STR_AI_LIST_CANCEL                                              :{BLACK}Annulla
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Non modifica lo script utilizzato
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Cattura uno screenshot
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Screenshot normale
@@ -4879,7 +4864,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Screensh
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script di gioco
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Chiudi
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reimposta
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index ff09693a2a..2c25aa13f8 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -431,7 +431,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :OpenTTDを終
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :ゲームオプション設定
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :設定
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI設定
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :ゲームスクリプト設定
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRFの設定
@@ -916,19 +915,20 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}この
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}ゲーム設定
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :一般
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}一般設定を開きます
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :一般設定を開きます
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :グラフィック
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}グラフィック設定を開きます
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :グラフィック設定を開きます
 STR_GAME_OPTIONS_TAB_SOUND                                      :サウンド
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}サウンドと音楽の設定を開きます
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :サウンドと音楽の設定を開きます
 
 STR_GAME_OPTIONS_VOLUME                                         :音量
 STR_GAME_OPTIONS_SFX_VOLUME                                     :効果音
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :音楽
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}通貨単位
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}通貨単位の選択
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :通貨単位
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :通貨単位の選択
 
 
 ###length 45
@@ -975,8 +975,8 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :インド・ル
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :インドネシア・ルピア
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :マレーシア・リンギット
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}オートセーブ
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}自動保存の間隔を選択します
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :オートセーブ
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :自動保存の間隔を選択します
 
 # Autosave dropdown
 ###length 5
@@ -986,56 +986,56 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :30分毎
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :60分毎
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :120分毎
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}言語
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}ゲームの言語を選択します
+STR_GAME_OPTIONS_LANGUAGE                                       :言語
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :ゲームの言語を選択します
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% 完了)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}フルスクリーン
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD をフルスクリーンでプレイするにはチェックします
+STR_GAME_OPTIONS_FULLSCREEN                                     :フルスクリーン
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :OpenTTD をフルスクリーンでプレイするにはチェックします
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}画面解像度
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}ゲーム画面の解像度を選択します
+STR_GAME_OPTIONS_RESOLUTION                                     :画面解像度
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :ゲーム画面の解像度を選択します
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :その他
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}ハードウェアアクセラレーション
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}ここをチェックしてOpenTTDがハードウェアアクセラレーションを利用するようにします。設定はゲームを再起動した後に適用されます。
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :ハードウェアアクセラレーション
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :ここをチェックしてOpenTTDがハードウェアアクセラレーションを利用するようにします。設定はゲームを再起動した後に適用されます。
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE} この設定は再起動後に適用されます。
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK} 垂直同期
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}ここをチェックして垂直同期を有効にします。設定はゲームを再起動した後に適用されます。ハードウェアアクセラレーションが有効な環境でしか機能しません。
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    : 垂直同期
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :ここをチェックして垂直同期を有効にします。設定はゲームを再起動した後に適用されます。ハードウェアアクセラレーションが有効な環境でしか機能しません。
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}現在のドライバー：{STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :現在のドライバー：{STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}インターフェイスのサイズ
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}スライダーをドラッグでインターフェースの大きさを調整できます。Ctrl押しながらで微調整できます。
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}サイズを自動調整
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}ここをチェックしてインタフェースのサイズを自動調整します。
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}ベベルのスケール
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}ここをチェックするとベベルはインタフェースのサイズに比例します
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :インターフェイスのサイズ
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :スライダーをドラッグでインターフェースの大きさを調整できます。Ctrl押しながらで微調整できます。
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :サイズを自動調整
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :ここをチェックしてインタフェースのサイズを自動調整します。
+
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :ベベルのスケール
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :ここをチェックするとベベルはインタフェースのサイズに比例します
 
 
 
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}グラフィクス
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}画面リフレッシュレート
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}使用する画面のリフレッシュレートを選択します
+STR_GAME_OPTIONS_REFRESH_RATE                                   :画面リフレッシュレート
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :使用する画面のリフレッシュレートを選択します
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}60Hzを超えるリフレッシュレートはパフォーマンスに影響を与える可能性があります。
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基本グラフィックセット
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}使用するグラフィックセットを選択します
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}基本グラフィックセットについての追加情報
+STR_GAME_OPTIONS_BASE_GRF                                       :基本グラフィックセット
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :使用するグラフィックセットを選択します
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :基本グラフィックセットについての追加情報
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}基本効果音セット
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}使用する効果音セットを選択します
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}基本効果音セットについての追加情報
+STR_GAME_OPTIONS_BASE_SFX                                       :基本効果音セット
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :使用する効果音セットを選択します
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :基本効果音セットについての追加情報
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}基本音楽セット
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}使用する音楽セットを選択します
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}基本音楽セットについての追加情報
+STR_GAME_OPTIONS_BASE_MUSIC                                     :基本音楽セット
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :使用する音楽セットを選択します
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :基本音楽セットについての追加情報
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :コンテンツを取得
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :新しいコンテンツや更新をチェックする
@@ -1143,12 +1143,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :自由放任（
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}適切なAIがありません...{}AIは「オンライン項目を確認」からダウンロード可能です
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}設定
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}フィルター:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}すべて開く
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}すべて折りたたむ
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}すべての値をリセット
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :フィルター:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :すべて開く
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :すべて折りたたむ
+STR_CONFIG_SETTING_RESET_ALL                                    :すべての値をリセット
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :（説明がありません）
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}デフォルト設定: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}設定の種類: {ORANGE}{STRING}
@@ -1160,9 +1159,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :会社設定(
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}注意!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}この操作によりゲームのすべての設定が初期値にリセットされます。{}続行してもよろしいでしょうか?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}カテゴリ:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}種類:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}定義されたフィルタでリストをフィルタリングします。
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :カテゴリ:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :種類:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :定義されたフィルタでリストをフィルタリングします。
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :基本設定（重要な設定のみ表示）
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :詳細設定（より多くの設定を表示）
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :拡張設定(変なものも含めて全設定を表示)
@@ -1179,9 +1178,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :会社設定(
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- なし -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}設定による検索結果をすべて表示{}{SILVER}種類{BLACK}別{WHITE}すべての設定タイプ
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :設定による検索結果をすべて表示{}{SILVER}種類{BLACK}別{WHITE}すべての設定タイプ
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :無効
@@ -2061,7 +2060,6 @@ STR_VIDEO_DRIVER_ERROR                                          :{WHITE}ビデ
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... 対応する GPU が見つかりません。ハードウェアアクセラレーションは無効になります。
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}新しいゲーム
 STR_INTRO_LOAD_GAME                                             :{BLACK}ロード
@@ -2072,11 +2070,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}マル
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}基本設定
 STR_INTRO_HIGHSCORE                                             :{BLACK}ハイスコア
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}設定
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRFの設定
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}オンラインコンテンツの確認
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI設定
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}ゲームスクリプト設定
 STR_INTRO_QUIT                                                  :{BLACK}終了
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}新規ゲームを開始します。Ctrl＋クリックで地形生成設定をスキップします
@@ -2093,11 +2087,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}地域
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}ゲームの設定を表示します
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}ハイスコアを表示します
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}設定を表示
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRFの有効/無効化、各パラメータの設定ができます
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}公式オンラインコンテンツのデータベースからデータの確認・追加・更新ができます
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}AI設定を表示
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}ゲームスクリプト設定を表示
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}OpenTTD を終了します
 
 STR_INTRO_BASESET                                               :現在選択されているグラフィックのベースセットは {NUM} つのスプライトが欠けています。ベースセットの更新を確認してみてください。
@@ -2871,6 +2861,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}街の
 STR_FOUND_TOWN_CITY                                             :{BLACK}都市
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}都市は街に比べてより早く成長します。{}初期設定によりますが、人口は設立の時点で街よりも多くなります
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}街の道路配置
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}この街の道路配置(区画)を決定します
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}オリジナル
@@ -3294,14 +3285,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}プリ
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}使用可能なプリセットの一覧です。選択すると下のセーブ名のプリセットに内容をコピーします
 STR_SAVE_PRESET_TITLE                                           :{BLACK}プリセット名を入力
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}現在選択している名前をプリセットの保存に使用します
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}キャンセル
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}プリセットを変更しません
 STR_SAVE_PRESET_SAVE                                            :{BLACK}セーブ
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}現在選択している名前でプリセットを保存します
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRFパラメータの変更
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}閉じる
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}リセット
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}全パラメータを標準値に変更する
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :パラメーター {NUM}
@@ -4465,7 +4453,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}ダイ
 STR_TIMETABLE_NO_TRAVEL                                         :運行計画無
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :該当区間を運行 (次の手動指令により自動設定)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :該当区間を運行 (ダイヤ設定無)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :最高速度{2:VELOCITY}で該当区間を運行 (ダイヤ設定無)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}で該当区間を運行
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING}で該当区間を運行(最高速度{VELOCITY})
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :運行({0:STRING}・ダイヤ設定無)
@@ -4580,8 +4567,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}適用
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}選択したスクリプトを使用します
-STR_AI_LIST_CANCEL                                              :{BLACK}キャンセル
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}スクリプトを変更しません
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}スクリーンショットを撮る
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}通常のスクリーンショット
@@ -4594,7 +4579,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}ミニ
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :ゲームスクリプト
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}閉じる
 STR_AI_SETTINGS_RESET                                           :{BLACK}リセット
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 07e4beafea..415a710266 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -286,7 +286,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}창을 
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}창 제목 - 창을 움직이려면 여기를 드래그하세요.
 STR_TOOLTIP_SHADE                                               :{BLACK}창 접기 - 창을 접어 제목만 보여줍니다.
 STR_TOOLTIP_DEBUG                                               :{BLACK}NewGRF 디버그 정보를 보여주기
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}창의 크기를 기본 크기로 되돌립니다. 현재 창 크기를 기본값으로 설정하시려면 CTRL+클릭하십시오.
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}창의 크기를 기본 크기로 되돌립니다. 현재 창 크기를 기본값으로 설정하시려면 CTRL+클릭하세요. 초기값으로 되돌리려면 두 번 CTRL+클릭하세요
 STR_TOOLTIP_STICKY                                              :{BLACK}이 창을 '모든 창 닫기' 단축키로 닫을 수 없게 고정합니다. CTRL+클릭하면 그 상태를 기본으로 설정합니다.
 STR_TOOLTIP_RESIZE                                              :{BLACK}이 창의 크기를 조절하려면 여기를 클릭하고 드래그하세요
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}창 크기를 대형/소형으로 전환합니다.
@@ -441,11 +441,10 @@ STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :게임 종료
 
 STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :도시 생성
-STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :건물 건설
+STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :건물 생성
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :게임 기본 설정
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :설정
 STR_SETTINGS_MENU_AI_SETTINGS                                   :인공지능 설정
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :게임 스크립트 설정
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF 설정
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}외부 
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}게임 설정
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :일반
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}일반 설정을 선택합니다
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :일반 설정을 보여줍니다
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :그래픽
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}그래픽 설정을 선택합니다
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :그래픽 설정을 선택합니다
 STR_GAME_OPTIONS_TAB_SOUND                                      :효과음
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}효과음과 배경음 설정을 선택합니다
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :효과음과 배경음 설정을 보여줍니다
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :소셜
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}소셜 통합 설정을 선택합니다
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :소셜 통합 설정을 보여줍니다
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :고급
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :고급 설정을 변경합니다
 
 STR_GAME_OPTIONS_VOLUME                                         :음량
 STR_GAME_OPTIONS_SFX_VOLUME                                     :효과음
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :배경음
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}화폐 단위
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}화폐 단위 선택
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :화폐 단위
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :화폐 단위 선택
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :라트비아 
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :포르투갈 이스쿠두
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :우크라이나 흐리우냐
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}자동 저장
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}게임 자동 저장 간격을 선택
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :자동 저장
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :게임 자동 저장 간격을 선택
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :매 30분마다
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :매 60분마다
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :매 120분마다
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}언어
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}사용할 언어를 선택하세요
+STR_GAME_OPTIONS_LANGUAGE                                       :언어
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :사용할 언어를 선택하세요
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% 번역됨)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}전체화면
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD를 전체화면으로 플레이하려면 클릭하세요.
+STR_GAME_OPTIONS_FULLSCREEN                                     :전체화면
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :OpenTTD를 전체화면으로 플레이하려면 클릭하세요
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}화면 해상도
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}사용할 화면 해상도를 선택하세요
+STR_GAME_OPTIONS_RESOLUTION                                     :화면 해상도
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :사용할 화면 해상도를 선택하세요
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :기타
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}하드웨어 가속
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}OpenTTD가 하드웨어 가속을 사용하게 하려면 체크하세요. 변경한 설정은 게임을 재시작한 뒤에 적용될 것입니다.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :하드웨어 가속
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :}OpenTTD가 하드웨어 가속을 사용하게 하려면 체크하세요. 변경한 설정은 게임을 재시작한 뒤에 적용될 것입니다
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}이 설정은 게임을 재시작한 뒤에 적용될 것입니다
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}수직 동기화
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}화면과 수직 동기화하려면 체크하세요. 변경한 설정은 게임을 재시작한 뒤에 적용될 것입니다. 하드웨어 가속을 켠 경우에만 작동합니다.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :수직 동기화
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :화면과 수직 동기화하려면 체크하세요. 변경한 설정은 게임을 재시작한 뒤에 적용될 것입니다. 하드웨어 가속을 켠 경우에만 작동합니다
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}현재 드라이버: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :현재 드라이버: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}인터페이스 크기
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}인터페이스 크기를 설정하려면 슬라이더를 드래그하세요. CTRL+드래그하면 미세 조정이 가능합니다
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}크기 자동 탐지
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}인터페이스 크기를 자동으로 탐지하려면 이 박스에 체크하세요
+STR_GAME_OPTIONS_INTERFACE                                      :인터페이스
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}크기 조절
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}인터페이스 크기를 슬라이더로 조절하려면 이 박스에 체크하세요
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :인터페이스 크기
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :인터페이스 크기를 설정하려면 슬라이더를 드래그하세요. CTRL+드래그하면 미세 조정이 가능합니다
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :크기 자동 탐지
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :인터페이스 크기를 자동으로 탐지하려면 이 박스에 체크하세요
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}원본 그래픽 글꼴 사용
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}기존 영어의 고정폭 글꼴을 사용하는 것을 선호하는 경우 이 박스에 체크하세요. 한국어 사용자는 체크하면 안 됩니다
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}글씨체 테두리를 부드럽게
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}크기 조절이 가능한 글씨체에 안티 에일리어싱을 적용하여 테두리를 부드럽게 표현하려면 이 박스에 체크하세요
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :크기 조절
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :인터페이스 크기를 슬라이더로 조절하려면 이 박스에 체크하세요
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :원본 그래픽 글꼴 사용
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :기존 영어의 고정폭 글꼴을 사용하는 것을 선호하는 경우 이 박스에 체크하세요. 한국어 사용자는 체크하면 안 됩니다
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :글씨체 테두리를 부드럽게
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :크기 조절이 가능한 글씨체에 안티 에일리어싱을 적용하여 테두리를 부드럽게 표현하려면 이 박스에 체크하세요
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}자동 설문
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}자동 설문조사 참여
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}이 설정을 켜면, 게임을 종료할 때마다 OpenTTD가 관련 설문 통계를 전송합니다
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}설문조사와 개인정보 보호에 대하여
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}자동 설문조사에 대한 더 많은 정보를 보여주기 위해 브라우저 창을 엽니다
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}설문조사 결과 미리보기
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}현재 진행 중인 게임의 설문조사 결과를 보여줍니다
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :자동 설문
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :자동 설문조사 참여
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :이 설정을 켜면, 게임을 종료할 때마다 OpenTTD가 관련 설문 통계를 전송합니다
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :설문조사와 개인정보 보호에 대하여
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :자동 설문조사에 대한 더 많은 정보를 보여주기 위해 브라우저 창을 엽니다
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :설문조사 결과 미리보기
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :현재 진행 중인 게임의 설문조사 결과를 보여줍니다
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}그래픽
+STR_GAME_OPTIONS_DISPLAY                                        :화면
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}화면 주사율
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}사용할 화면 주사율을 선택하세요
+STR_GAME_OPTIONS_REFRESH_RATE                                   :화면 주사율
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :사용할 화면 주사율을 선택하세요
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}60Hz를 넘는 화면 주사율을 사용하면 성능에 영향이 갈 수도 있습니다.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}기본 그래픽 세트
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}게임에 사용할 기본 그래픽 세트를 선택하세요 (플레이 도중에는 변경할 수 없고 메인 메뉴에서만 변경 가능합니다)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}기본 그래픽 세트에 대한 추가 정보를 봅니다.
+STR_GAME_OPTIONS_BASE_GRF                                       :기본 그래픽 세트
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :게임에 사용할 기본 그래픽 세트를 선택하세요 (플레이 도중에는 변경할 수 없고 메인 메뉴에서만 변경 가능합니다)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :기본 그래픽 세트에 대한 추가 정보를 봅니다
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}기본 효과음 세트
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}게임에 사용할 기본 효과음 세트를 선택하세요 (플레이 도중에는 변경할 수 없고 메인 메뉴에서만 변경 가능합니다)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}기본 효과음 세트에 대한 추가 정보를 봅니다.
+STR_GAME_OPTIONS_BASE_SFX                                       :기본 효과음 세트
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :게임에 사용할 기본 효과음 세트를 선택하세요 (플레이 도중에는 변경할 수 없고 메인 메뉴에서만 변경 가능합니다)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :기본 효과음 세트에 대한 추가 정보를 봅니다
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}기본 배경 음악 세트
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}게임에 사용할 기본 배경 음악 세트를 선택하세요
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}기본 배경 음악 세트에 대한 추가 정보를 봅니다.
+STR_GAME_OPTIONS_BASE_MUSIC                                     :기본 배경 음악 세트
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :게임에 사용할 기본 배경 음악 세트를 선택하세요
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :기본 배경 음악 세트에 대한 추가 정보를 봅니다
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :콘텐츠 다운로드
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :다운로드할 신규 & 업데이트된 콘텐츠를 확인합니다
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(소셜 플랫폼과 연계할 수 있는 플러그인이 없음)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(소셜 플랫폼과 연계할 수 있는 플러그인이 없음)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}플랫폼:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}플러그인 상태:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :플랫폼:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :플러그인 상태:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}실행 중
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}초기화 실패
@@ -1220,12 +1225,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :신경 안 씀
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}사용할 수 있는 인공지능이 없습니다...{}{}'온라인 콘텐츠' 시스템을 통해 인공지능을 다운로드받을 수 있습니다.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}설정
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}검색:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}모두 펼치기
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}모두 접기
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}모든 설정 초기화
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :검색:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :모두 펼치기
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :모두 접기
+STR_CONFIG_SETTING_RESET_ALL                                    :모든 설정 초기화
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(설명이 존재하지 않습니다)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}기본값: {ORANGE}{STRING}
@@ -1238,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :회사 설정 (
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}경고!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}게임의 모든 설정을 기본값으로 되돌립니다.{}정말 모든 설정을 초기화하시겠습니까?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}분류:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}종류:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}미리 지정한 검색어에 해당하는 설정 목록에 표시하도록 할 수 있습니다.
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :분류:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :종류:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :미리 지정한 검색어에 해당하는 설정 목록에 표시하도록 할 수 있습니다.
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :기본 설정 (일부 중요한 설정만 보임)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :고급 설정 (대부분의 설정을 보여줌)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :전문가 설정 / 모든 설정 (모든 설정을 보여줌)
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :회사 설정 (
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- 없음 -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}검색 결과를 전부 보시려면{}{SILVER}분류 {BLACK}설정을 {WHITE}{STRING}{BLACK}으로 바꾸십시오.
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}검색 결과를 전부 보시려면{}{SILVER}종류 {BLACK}설정을 {WHITE}모든 설정{BLACK}으로 바꾸십시오.
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}검색 결과를 전부 보시려면{}{SILVER}분류 {BLACK}설정을 {WHITE}{STRING}{BLACK}으로, {SILVER}종류 {BLACK}설정을 {WHITE}모든 설정{BLACK}으로 바꾸십시오.
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :검색 결과를 전부 보시려면{}{PUSH_COLOUR}{SILVER}분류 {POP_COLOUR}설정을 {PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR}으로 바꾸세요
+STR_CONFIG_SETTING_TYPE_HIDES                                   :검색 결과를 전부 보시려면{}{PUSH_COLOUR}{SILVER}종류 {POP_COLOUR}설정을 {PUSH_COLOUR}{WHITE}모든 설정{POP_COLOUR}으로 바꾸세요
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :검색 결과를 전부 보시려면{}{PUSH_COLOUR}{SILVER}분류 {POP_COLOUR}설정을 {PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR}으로, {PUSH_COLOUR}{SILVER}종류 {POP_COLOUR}설정을 {PUSH_COLOUR}{WHITE}모든 설정{POP_COLOUR}으로 바꾸세요
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :아니요
@@ -1371,7 +1375,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :경사도 설
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT        :자동차/전차에 적용시킬 경사도를 설정합니다. 값이 높을수록 차량이 언덕을 오를 때 더 힘이 듭니다.
 
 STR_CONFIG_SETTING_FORBID_90_DEG                                :열차의 90도 회전을 금지함: {STRING}
-STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :─ 모양의 수평 선로와 │ 모양의 수직 선로가 바로 이어져 만날 때 90도 회전이 발생합니다. 이 설정을 켜면, 열차가 칸 가장자리를 통과할 때 90도로 회전할 수 있도록 허용합니다. 이 설정은 선박의 회전 반경에도 적용됩니다
+STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :─ 모양의 수평 선로와 │ 모양의 수직 선로가 바로 이어져 만날 때 90도 회전이 발생합니다. 이 설정을 켜면, 열차가 칸 가장자리를 통과할 때 90도로 회전할 수 없도록 금지합니다
 
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :역이 같은 방향으로 붙어있지 않아도 같은 이름의 역 짓기 허용: {STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :이미 존재하는 역을 직접 건드리지 않고도 역의 일부분을 새로 추가/확장하는 것을 허용합니다. 인접한 칸에 기존과 다른 새로운 역을 놓을 때에는 CTRL+클릭해야 합니다
@@ -2099,7 +2103,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS_SECS   :게임 단위 (
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_KNOTS            :노트
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :차량의 힘 단위: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :출력할 차량의 힘 단위를 선택합니다.
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :출력할 차량의 힘 단위를 선택합니다
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :야드파운드법 (마력)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :미터법 (마력)
@@ -2113,21 +2117,21 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_METRIC             :미터법 (톤)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_SI                 :국제표준규격 (kg)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME                    :부피 단위: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :부피를 표시할 때 선택한 단위를 사용하여 나타냅니다.
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :부피를 표시할 때 선택한 단위를 사용하여 나타냅니다
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :야드파운드법 (갤런)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :미터법 (리터)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI                 :국제표준규격 (m³)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE                     :견인 효과 단위: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :견인 효과(견인력)를 표시할 때 선택한 단위를 사용하여 나타냅니다.
+STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :견인 효과(견인력)를 표시할 때 선택한 단위를 사용하여 나타냅니다
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL            :야드파운드법 (파운드중)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_METRIC              :미터법 (kgf)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_SI                  :국제표준규격 (kN)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT                    :높이 단위: {STRING}
-STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :높이를 표시할 때 선택한 단위를 사용하여 나타냅니다.
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :높이를 표시할 때 선택한 단위를 사용하여 나타냅니다
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :야드파운드법 (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :미터법 (m)
@@ -2192,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... 호
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU 드라이버가 게임을 종료시켰습니다. 하드웨어 가속이 비활성화됩니다
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}새 게임
 STR_INTRO_LOAD_GAME                                             :{BLACK}불러오기
@@ -2204,11 +2209,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}멀티 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}게임 설정
 STR_INTRO_HIGHSCORE                                             :{BLACK}고득점 순위표
 STR_INTRO_HELP                                                  :{BLACK}도움말 & 매뉴얼
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}설정
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF 설정
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}온라인 콘텐츠
-STR_INTRO_AI_SETTINGS                                           :{BLACK}인공지능 설정
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}게임 스크립트 설정
 STR_INTRO_QUIT                                                  :{BLACK}종료
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}새 게임을 시작합니다.{}CTRL+클릭하시면 지도 설정을 건너뛰고 바로 시작합니다
@@ -2226,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}장난
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}게임 기본 설정 창을 엽니다
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}고득점 순위표를 엽니다
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}각종 문서와 온라인 링크를 확인합니다
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}설정 창을 엽니다
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF 설정 창을 엽니다
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}새로 나왔거나 업데이트된 콘텐츠를 체크하여 다운로드합니다
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}인공지능 설정 창을 엽니다
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}게임 스크립트 설정 창을 엽니다
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD'를 종료합니다.
 
 STR_INTRO_BASESET                                               :{BLACK}현재 선택된 기본 그래픽 세트에는 {NUM}개의 스프라이트가 빠져있습니다. 기본 세트를 업데이트하세요.
@@ -2867,7 +2864,7 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :바깥쪽 시
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :안쪽 시내
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :도시 중심
 
-STR_HOUSE_PICKER_PROTECT_TITLE                                  :도시 발전 방지
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :업그레이드 방지
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :이 건물이 도시가 성장함에 따라 교체되는 것을 막을지 여부를 선택합니다
 STR_HOUSE_PICKER_PROTECT_OFF                                    :끄기
 STR_HOUSE_PICKER_PROTECT_ON                                     :켜기
@@ -3077,6 +3074,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}도시 
 STR_FOUND_TOWN_CITY                                             :{BLACK}대도시로 만듦
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}대도시는 도시보다 빠르게 성장합니다.{}도시를 만들었을 때, 위 설정에 따라 더욱 커집니다
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}도시 확장:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :건물
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :도시의 건물을 확장합니다
+STR_FOUND_TOWN_EXPAND_ROADS                                     :도로
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :도시의 도로를 확장합니다
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}도시 도로 설계:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}이 도시에 사용할 도로 설계를 선택합니다
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}오리지널
@@ -3526,15 +3529,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}프리
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}사용 가능한 프리셋 목록입니다. 아래에 같은 이름을 복사하려면 선택하세요
 STR_SAVE_PRESET_TITLE                                           :{BLACK}프리셋의 이름을 입력하세요
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}저장할 프리셋에 지정할 이름입니다
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}취소
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}프리셋을 바꾸지 않습니다
 STR_SAVE_PRESET_SAVE                                            :{BLACK}저장
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}이 프리셋을 선택한 이름으로 저장합니다
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}기본 그래픽 매개 변수를 변경합니다
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF 매개 변숫값 변경
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}닫기
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}초기화
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}모든 매개 변숫값을 기본값으로 설정합니다
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :매개 변수 {NUM}번
@@ -3703,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}이 도
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}확장
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}도시의 크기를 키웁니다.
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}건물 확장
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}도시의 건물을 확장합니다
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}도로 확장
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}도시의 도로를 확장합니다
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}삭제
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}이 도시를 완전히 삭제
 
@@ -4441,10 +4445,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}선박
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}항공기의 경로를 보여줍니다. CTRL+클릭하면 항공기의 시간표를 보여줍니다
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}열차의 상세정보를 보여줍니다
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}차량의 상세정보를 보여줍니다
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}선박의 상세정보를 보여줍니다
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}항공기의 상세정보를 보여줍니다
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}열차의 상세정보를 보여줍니다. CTRL+클릭하면 열차 그룹 창을 엽니다
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}차량의 상세정보를 보여줍니다. CTRL+클릭하면 차량 그룹 창을 엽니다
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}선박의 상세정보를 보여줍니다. CTRL+클릭하면 선박 그룹 창을 엽니다
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}항공기의 상세정보를 보여줍니다. CTRL+클릭하면 항공기 그룹 창을 엽니다
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}현재 열차 행동 - 열차 운행을 시작/정지하려면 클릭하세요
@@ -4768,15 +4772,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}시간
 STR_TIMETABLE_NO_TRAVEL                                         :운행정보 없음
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :이동 (자동; 다음 경로에 의해 시간표 작성)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :운행 (시간표가 작성되지 않음)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :최대 {2:VELOCITY}의 속력으로 운행 (시간표 작성 안 됨)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :최대 {VELOCITY}의 속력으로 운행 (시간표 작성 안 됨)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}에 걸쳐 운행
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{0:STRING} 동안 최대 {1:VELOCITY}의 속력으로 운행
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :운행 ({STRING} 동안, 시간표 작성 안 됨)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :최대 {1:VELOCITY}의 속력으로 운행 ({0:STRING} 동안, 시간표 작성 안 됨)
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}({STRING} 동안 정차, 시간표 작성 안 됨)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}({STRING} 동안 운행, 시간표 작성 안 됨)
-STR_TIMETABLE_STAY_FOR                                          :& {STRING} 동안 정차
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :& 다음 목적지({STRING})로 이동
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}& {STRING} 동안 정차
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}& 다음 목적지({STRING})로 이동
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}이 시간표는 완주하는데 대략 {0:STRING}{G 0 "이" "가"} 걸립니다
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}이 시간표는 완주하는데 {0:STRING}{G 0 "이" "가"} 걸립니다
@@ -4895,8 +4899,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}주소:
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}적용
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}선택한 스크립트를 적용합니다
-STR_AI_LIST_CANCEL                                              :{BLACK}취소
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}인공지능 스크립트를 바꾸지 않습니다
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}스크린 샷 찍기
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}일반 스크린 샷
@@ -4909,7 +4911,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}미니
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}인공지능 매개 변수
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}게임 스크립트 매개 변수
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}닫기
 STR_AI_SETTINGS_RESET                                           :{BLACK}초기화
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5887,6 +5888,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5926,3 +5928,11 @@ STR_SHIP                                                        :{G=f}{BLACK}{SH
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :배지 설정을 엽니다
+STR_BADGE_CONFIG_RESET                                          :초기화
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}배지 아이콘
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}배지 필터
+STR_BADGE_CONFIG_PREVIEW                                        :미리보기 이미지
+STR_BADGE_CONFIG_NAME                                           :이름
+STR_BADGE_FILTER_ANY_LABEL                                      :모든 {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} = {STRING}
diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index f7301e0bf8..25cf0d98aa 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -574,7 +574,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Exire
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Ludi optiones
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Electiones
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Optiones NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Optiones perluciditatis
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Nomina oppidorum spectabilia
@@ -1046,8 +1045,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludi opt
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unitates nummi
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Electio unitatum nummi
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unitates nummi
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Electio unitatum nummi
 
 
 ###length 45
@@ -1087,21 +1087,21 @@ STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiana
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Regalis Iranica
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novus Rubelus Russicus
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Servare automatice
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Eligere crebritatem automatice ludum servandi
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Servare automatice
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Eligere crebritatem automatice ludum servandi
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Numquam
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingua
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Eligere linguam interfaciei
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingua
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Eligere linguam interfaciei
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cunctum scrinium
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Optione electa, OpenTTD cuncto scrinio ostenditur
+STR_GAME_OPTIONS_FULLSCREEN                                     :Cunctum scrinium
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Optione electa, OpenTTD cuncto scrinio ostenditur
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolutio scrinii
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Eligere resolutio scrinii adhibenda
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolutio scrinii
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Eligere resolutio scrinii adhibenda
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :alia
 
 
@@ -1114,17 +1114,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :alia
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Fundamentum graphicum
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Eligere fundamentum graphicum adhibendum
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Indicia additicia de hoc fundamento graphico
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Fundamentum sonicum
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Eligere fundamentum sonicum adhibendum
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Indicia additicia de hoc fundamento sonico
+STR_GAME_OPTIONS_BASE_GRF                                       :Fundamentum graphicum
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Eligere fundamentum graphicum adhibendum
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Indicia additicia de hoc fundamento graphico
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Fundamentum musicum
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Eligere fundamentum musicum adhibendum
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Indicia additicia de hoc fundamento musico
+STR_GAME_OPTIONS_BASE_SFX                                       :Fundamentum sonicum
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Eligere fundamentum sonicum adhibendum
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Indicia additicia de hoc fundamento sonico
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Fundamentum musicum
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Eligere fundamentum musicum adhibendum
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Indicia additicia de hoc fundamento musico
 
 
 
@@ -1227,11 +1228,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Longe
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nullae IA parabiles sunt...{}Potes arcessere nunullas IA in 'Inventario Interretiale'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Electiones
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Series colans:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Omnia expandere
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Omnia collocare
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Series colans:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Omnia expandere
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Omnia collocare
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(nulla explicatio parabilis)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor solitus: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Electionis typus: {ORANGE}{STRING}
@@ -1241,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Electio ludi (i
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Electio societatis (inclusa in ludis servatis; modo ludos novos afficit)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Electio societatis (inclusa in ludo servato; modo societatem currentem afficit)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typus:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Definit indicem optionum ut solum electiones simplices aut mutatae monstrentur
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typus:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Definit indicem optionum ut solum electiones simplices aut mutatae monstrentur
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Electiones simplices (modo monstrare electiones magni momenti)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Electiones doctae (monstrare pleras electiones)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Electiones peritae (monstrare omnes electiones, etiam insolitas)
@@ -1260,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Electiones soci
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nullae -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Monstrare eventum investigationis optione separatum{}{SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING} {BLACK}et {SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Monstrare eventum investigationis optione separatum{}{SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING} {BLACK}et {SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Non
@@ -2064,7 +2064,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Non potu
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Ludus Novus
 STR_INTRO_LOAD_GAME                                             :{BLACK}Legere Ludum
@@ -2075,8 +2074,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Plurium
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Ludi Optiones
 STR_INTRO_HIGHSCORE                                             :{BLACK}Album Punctorum Supremorum
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Electiones
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Optiones
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Inspicere Inventarium Interretiale
 STR_INTRO_QUIT                                                  :{BLACK}Exire
 
@@ -2094,8 +2091,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Eligere
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Monstrare ludi optiones
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Monstrare album punctorum supremorum
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Monstrare electiones
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Monstrare optiones NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Inspicere inventarium Interretiale in quo res sicut NewGRF, scaenaria, musica, etc. sunt
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Exire OpenTTD
 
@@ -2772,6 +2767,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Eligere
 STR_FOUND_TOWN_CITY                                             :{BLACK}Urbs
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbes crescunt oppidis celerius{}Etiam maiores sunt cum conduntur
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Dispositio viarum oppidi:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Eligere dispositionem viarum huic oppido adhibendam
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalis
@@ -3118,14 +3114,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Servare
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Index rationum. Unam elige ut transcribatur nomini infero
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Inscribe nomen rationis
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nomen electum rationis conservandum
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancellare
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Non mutare rationem
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Servare
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Rationem conservare huic nomini
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Mutare parametra NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Claudere
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Redire
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Facere ut quodque parametrum solito reversum sit
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametrum {NUM}
@@ -4203,7 +4196,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horarius
 STR_TIMETABLE_NO_TRAVEL                                         :(Non est navigandum)
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Iter (horarius curatur a secundo fixo iusso)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Iter (sine horario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Iter cum {2:VELOCITY} velocitas maxima (sine horario)
 STR_TIMETABLE_TRAVEL_FOR                                        :Iter {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Iter {STRING} cum {VELOCITY} velocitas maxima
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Iter ({STRING}, sine horario)
@@ -4313,13 +4305,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accipere
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Eligere scriptum
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancellare
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Non scriptum mutare
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :IA
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Claudere
 STR_AI_SETTINGS_RESET                                           :{BLACK}Revertere
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 14be5c60bc..b97f01f2f5 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -287,7 +287,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Aizvērt
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Loga virsraksts - vilkt to, lai pārvietotu logu
 STR_TOOLTIP_SHADE                                               :{BLACK}Aizēnot logu - rādīt tikai virsrakstu
 STR_TOOLTIP_DEBUG                                               :{BLACK}Rādīt NewGRF atkļūdošanas informāciju
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Mainīt loga izmēru uz tā noklusējuma izmēru. Ctrl+klikšķis, lai saglabātu esošo izmēru kā noklusējuma
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Mainīt loga izmēru uz tā noklusējuma izmēru. Ctrl+klikšķis, lai saglabātu esošo izmēru kā noklusējuma. Divreiz Ctrl+kilkšķis, lai atiestatītu saglabātos noklusējuma iestatījumus
 STR_TOOLTIP_STICKY                                              :{BLACK}Atzīmēt šo logu kā neaizveramu ar "Aizvērt visus logus" taustiņu. Ctrl+klikšķis, lai saglabātu stāvokli kā noklusējumu
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klikšķināt un vilkt, lai mainītu šī loga lielumu
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Pārslēgties starp lielu/mazu loga izmēru
@@ -446,7 +446,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Novietojiet mā
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spēles opcijas
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Iestatījumi
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI iestatījumi
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Spēles skripta iestatījumi
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF iestatījumi
@@ -961,22 +960,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Kopēt 
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spēles opcijas
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Vispārīgi
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Izvēlieties vispārīgos iestatījumus
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Izvēlieties vispārīgos iestatījumus
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Izvēlieties grafikas iestatījumus
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Izvēlieties grafikas iestatījumus
 STR_GAME_OPTIONS_TAB_SOUND                                      :Skaņa
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Izvēlieties skaņas un mūzikas iestatījumus
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Izvēlieties skaņas un mūzikas iestatījumus
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sociālais tīkls
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Izvēlieties sociālās integrācijas iestatījumus
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Izvēlieties sociālās integrācijas iestatījumus
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Papildu
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Mainīt papildu iestatījumus
 
 STR_GAME_OPTIONS_VOLUME                                         :Skaļums
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Skaņas efekti
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Mūzika
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Naudas vienības
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Naudas vienību izvēle
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Naudas vienības
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Naudas vienību izvēle
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1027,8 +1030,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvijas lati
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugāles eskudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainas Grivna
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automātiskā saglabāšana
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Izvēlēties spēles automātiskās saglabāšanas starplaikus
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automātiskā saglabāšana
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Izvēlēties spēles automātiskās saglabāšanas starplaikus
 
 # Autosave dropdown
 ###length 5
@@ -1038,77 +1041,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Ik pēc 30 min
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Ik pēc 60 minūtēm
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Ik pēc 120 minūtēm
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Valoda
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Saskarnes valodas izvēle
+STR_GAME_OPTIONS_LANGUAGE                                       :Valoda
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Saskarnes valodas izvēle
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% pabeigts)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pilnekrāna spēle
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Noklikšķināt uz šīs pogas, lai spēlētu pilnekrāna OpenTTD
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pilnekrāna spēle
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Noklikšķināt uz šīs pogas, lai spēlētu pilnekrāna OpenTTD
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrāna izšķirtspēja
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Ekrāna izšķirtspējas izvēle
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekrāna izšķirtspēja
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Ekrāna izšķirtspējas izvēle
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Cita
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aparatūras pāatrinājums
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK} Atzīmējiet šo izvēlni, lai ļautu OpenTTD izmantot aparatūras paātrinājumu. Mainīts iestatījums tiks piemērots tikai pēc spēles restartēšanas
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aparatūras pāatrinājums
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Atzīmējiet šo izvēlni, lai ļautu OpenTTD izmantot aparatūras paātrinājumu. Mainīts iestatījums tiks piemērots tikai pēc spēles restartēšanas
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Šis iestatījums stāsies spēkā tikai pēc spēles restartēšanas
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Atzīmējiet šo izvēlni, lai sinhronizētu ekrānu. Mainīts iestatījums tiks piemērots tikai pēc spēles restartēšanas. Darbojas tikai ar ieslēgtu aparatūras paātrinājumu
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Atzīmējiet šo izvēlni, lai sinhronizētu ekrānu. Mainīts iestatījums tiks piemērots tikai pēc spēles restartēšanas. Darbojas tikai ar ieslēgtu aparatūras paātrinājumu
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Esošais vadītājs: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Esošais vadītājs: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Saskarnes izmērs
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Velciet slīdni, lai iestatītu saskarnes izmēru. Velciet Ctrl nepārtrauktai pielāgošanai
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automātiski noteikt izmēru
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Atzīmējiet šo izvēlni, lai automātiski noteiktu interfeisa izmēru
+STR_GAME_OPTIONS_INTERFACE                                      :Saskarne
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Mēroga slīpumi
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Atzīmējiet šo izvēlni, lai mērogotu slīpumu pēc saskarnes lieluma
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Saskarnes izmērs
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Velciet slīdni, lai iestatītu saskarnes izmēru. Velciet Ctrl nepārtrauktai pielāgošanai
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automātiski noteikt izmēru
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Atzīmējiet šo izvēlni, lai automātiski noteiktu interfeisa izmēru
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Izmantot tradicionālo sprite fontu
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Atzīmējiet šo izvēli, ja vēlaties izmantot tradicionālo fiksētā izmēra sprite fontu.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fonti
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Atzīmējiet šo izvēli, ja vēlaties mainīt fontus ar anti-alias izmēru.
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Mēroga slīpumi
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Atzīmējiet šo izvēlni, lai mērogotu slīpumu pēc saskarnes lieluma
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Izmantot tradicionālo sprite fontu
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Atzīmējiet šo izvēli, ja vēlaties izmantot tradicionālo fiksētā izmēra sprite fontu.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fonti
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Atzīmējiet šo izvēli, ja vēlaties mainīt fontus ar anti-alias izmēru.
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatizēta aptauja
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Piedalieties automatizētā aptaujā
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Ja ieslēgts, OpenTTD pārsūtīs aptauju, izejot no spēles
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Par aptauju un privātumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Tiek atvērts pārlūks ar plašāku informāciju par automatizēto aptauju
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Priekšskatīt aptaujas rezultātus
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Rādīt pašreizējās spēles aptaujas rezultātus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatizēta aptauja
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Piedalieties automatizētā aptaujā
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Ja ieslēgts, OpenTTD pārsūtīs aptauju, izejot no spēles
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Par aptauju un privātumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Tiek atvērts pārlūks ar plašāku informāciju par automatizēto aptauju
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Priekšskatīt aptaujas rezultātus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Rādīt pašreizējās spēles aptaujas rezultātus
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafika
+STR_GAME_OPTIONS_DISPLAY                                        :Displejs
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ekrāna atsvaidzes intensitāte
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Izvēlieties izmantojamo ekrāna atsvaidzes intensitāti
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ekrāna atsvaidzes intensitāte
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Izvēlieties izmantojamo ekrāna atsvaidzes intensitāti
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Atsvaidzes intensitāte, kas lielāka par 60 Hz, var ietekmēt veiktspēju.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pamata grafikas kopa
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Atlasiet izmantojamo pamata grafiku (to nevar mainīt spēlē, tikai no galvenās izvēlnes)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Papildinformācija par pamata grafikas kopu
+STR_GAME_OPTIONS_BASE_GRF                                       :Pamata grafikas kopa
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Atlasiet izmantojamo pamata grafiku (to nevar mainīt spēlē, tikai no galvenās izvēlnes)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Papildinformācija par pamata grafikas kopu
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Pamata skaņas kopa
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Atlasiet izmantojamās pamata skaņas (nevar mainīt spēlē, tikai galvenajā izvēlnē)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Papildinformācija par pamata skaņas kopu
+STR_GAME_OPTIONS_BASE_SFX                                       :Pamata skaņas kopa
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Atlasiet izmantojamās pamata skaņas (nevar mainīt spēlē, tikai galvenajā izvēlnē)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Papildinformācija par pamata skaņas kopu
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Pamata mūzikas kopa
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Atlasīt lietošanai pamata mūzikas kopu
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Papildinformācija par pamata mūzikas kopu
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Pamata mūzikas kopa
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Atlasīt lietošanai pamata mūzikas kopu
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Papildinformācija par pamata mūzikas kopu
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Iegūt saturu
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Pārbaudīt, jauna satura lejupielādi, vai atjauninājumu
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nav instalētu spraudņu, ko integrēt ar sociālajām platformām)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(nav instalētu spraudņu, ko integrēt ar sociālajām platformām)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Spraudņa stāvoklis:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Spraudņa stāvoklis:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Darbojas
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Neizdevās instalēt
@@ -1221,12 +1226,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Pieļaujoša (n
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nav pieejami derīgi MI...{}{}Jūs varat lejuplādēt dažādus MI, izmantojot pogu 'Tiešsaistes saturs'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Iestatījumi
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrs:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Izvērst visu
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sakļaut visu
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Atiestatīt visas vērtības
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrs:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Izvērst visu
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Sakļaut visu
+STR_CONFIG_SETTING_RESET_ALL                                    :Atiestatīt visas vērtības
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(skaidrojums nav pieejams)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Noklusējuma vērtība: {ORANGE}{STRING}
@@ -1239,9 +1243,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :uzņēmuma iest
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Uzmanību!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE} Šī darbība atjaunos visu spēles iestatījumu noklusējuma vērtības.{} Vai tiešām vēlaties turpināt?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Veids:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Ierobežo turpmāko sarakstu, rādot tikai izmainītos iestatījumus
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Veids:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Ierobežo turpmāko sarakstu, rādot tikai izmainītos iestatījumus
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pamatiestatījumi (parādīt tikai svarīgākos iestatījumus)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Papildu iestatījumi (parādīt iestatījumu vairākumu)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Lietpratēju iestatījumi (parādīt visus iestatījumus, tai skaitā arī nestandarta)
@@ -1258,9 +1262,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Uzņēmuma iest
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}-Nav-
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Rādīt visus meklēšanas rezultātus, iestatot{}{SILVER}Kategoriju {BLACK}uz {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Rādīt visus meklēšanas rezultātus, iestatot{}{SILVER}Veidu {BLACK}uz {WHITE}Visi iestatījumu veidi
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Rādīt visus meklēšanas rezultātus, iestatot{}{SILVER}Kategorija {BLACK}uz {WHITE}{STRING} {BLACK}un {SILVER}Tips {BLACK}uz {WHITE}Visi iestatījumu veidi
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Rādīt visus meklēšanas rezultātus, iestatot kategoriju{}{PUSH_COLOUR}{SILVER} uz {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Rādīt visus meklēšanas rezultātus, iestatot{}{PUSH_COLOUR}{SILVER}Ierakstiet {POP_COLOUR}līdz{WHITE}Visi iestatījumu veidi
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Rādīt visus meklēšanas rezultātus, iestatot kategoriju{}{PUSH_COLOUR}{SILVER} uz {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR} un {PUSH_COLOUR}{SILVER} ierakstiet {POP_COLOUR} uz {WHITE} Visi iestatījumu veidi
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :izslēgts
@@ -2022,7 +2026,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Maksimālais lo
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Atvērtu nepielipušo logu skaits, pirms tie tiek automātiski aizvērti lai atbrīvotu vietu jauniem logiem
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :izslēgts
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Izslēgts
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Maksimālais pietuvinājuma līmenis: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Maksimālais pietuvinājuma līmenis skatvietām. Ir jāievēro ka paaugstinot pietuvinājuma līmeni, pieaug operatīvās atmiņas izlietojums
@@ -2195,7 +2199,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nav
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU dzinulis apturēja spēli. Aparatūras paātrinājums ir izslēgts
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Jauna spēle
 STR_INTRO_LOAD_GAME                                             :{BLACK}Ielādēt spēli
@@ -2207,11 +2212,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Vairāks
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spēles opcijas
 STR_INTRO_HIGHSCORE                                             :{BLACK}Sasniegumu tabula
 STR_INTRO_HELP                                                  :{BLACK}Palīdzība un rokasgrāmatas
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Iestatījumi
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF iestatījumi
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Tiešsaistes saturs
-STR_INTRO_AI_SETTINGS                                           :{BLACK}MI Iestatījumi
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Spēles Skripta Iestatījumi
 STR_INTRO_QUIT                                                  :{BLACK}Iziet
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Sākt jaunu spēli. Ctrl+klikšķis izlaiž kartes konfigurēšanu
@@ -2229,11 +2230,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Izvēlē
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Atvērt spēles opcijas
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Atvērt sasniegumu tabulu
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Piekļūstiet dokumentācijai un tiešsaistes resursiem
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Atvērt iestatījumus
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Atvērt NewGRF iestatījumus
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Pārbaudīt vai lejupielādei nav pieejams jauns un atjaunināts saturs
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Atvērt MI iestatījumus
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Atvērt spēles skripta iestatījumi
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Iziet no 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Pašlaik izvēlētajai bāzes grafikas kopai trūkst  {NUM} sprait{P s i u}. Lūdzu, pārbaudiet, vai bāzes kopai ir atjauninājumi.
@@ -2434,7 +2431,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pievieno
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atsvaidzināt serveri
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atsvaidzināt servera informāciju
 
-STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :Meklēt internetā
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :Meklēt tiešsaistē
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP          :{BLACK}Meklēt publiskos serverus internetā
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN                       :{BLACK}Meklēt LAN
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP               :{BLACK}Meklēt serverus lokālajā tīklā
@@ -3080,6 +3077,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Izvēlē
 STR_FOUND_TOWN_CITY                                             :{BLACK}Pilsēta
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Pilsētas aug straujāk kā parastas apdzīvotās vietas{}Atkarībā no iestatījumiem, dibināšanas brīdī pilsētas ir lielākas
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Pilsētas ceļu izskats:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Atlasīt šajā pilsētā lietojamo ceļu izkārtojumu
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Sākotnēji
@@ -3530,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Iepriek
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Saraksts ar pieejamajiem priekšiestatījumiem, izvēlieties vienu, kuru kopēt uz zemāk esošo nosaukumu
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Ievadiet priekšiestatījuma nosaukumu
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Pašlaik izvēlētā iepriekšiestatījuma nosaukums saglabāšanai
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Atcelt
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Nemainīt iepriekšiestatījumu
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Saglabāt
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}pašreizējos iestatījumus saglābāt kā sākontnējos iestatījumus
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Mainiet pamata grafikas parametrus
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Mainīt NewGRF parametrus
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Aizvērt
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Atjaunot
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Iestatīt visiem parametriem to noklusējuma vērtības
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :{NUM}. parametrs
@@ -3923,14 +3918,14 @@ STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}Būvniec
 STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}Jauni transportlīdzekļi
 STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}Vilcieni
 STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Autotransportlīdzekļi
-STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Lidaparāts
+STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}LidaparātI
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Kuģi
 STR_FINANCES_SECTION_INFRASTRUCTURE                             :{GOLD}Infrastruktūra
 STR_FINANCES_SECTION_TRAIN_REVENUE                              :{GOLD}Vilcieni
 STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE                       :{GOLD}Autotransportlīdzekļi
-STR_FINANCES_SECTION_AIRCRAFT_REVENUE                           :{GOLD}Lidaparāts
+STR_FINANCES_SECTION_AIRCRAFT_REVENUE                           :{GOLD}Lidaparāti
 STR_FINANCES_SECTION_SHIP_REVENUE                               :{GOLD}Kuģi
-STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Aizdevuma procents
+STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Aizdevuma procenti
 STR_FINANCES_SECTION_OTHER                                      :{GOLD}Citi
 
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kopā
@@ -4451,10 +4446,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Rādīt
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Rādīt lidaparātu rīkojumus. Ctrl+klikšķis, lai rādītu lidaparātu lidojumu sarakstu
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rādīt vilciena informāciju
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rādīt autotransporta līdzekļa informāciju
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rādīt kuģa informāciju
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rādīt lidaparāta informāciju
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rādīt vilciena informāciju. Ctrl+klikšķis, lai parādītu vilciena grupu.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rādīt transportlīdzekļa informāciju. Ctrl+klikšķis, lai parādītu transportlīdzekļa grupu
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rādīt kuģa informāciju. Ctrl+klikšķis, lai parādītu kuģa grupu
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rādīt lidaparāta informāciju. Ctrl+klikšķis, lai parādītu lidaparāta grupu.
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Pašreizējā vilciena darbība - noklikšķiniet, lai apturētu/palaist vilcienu
@@ -4778,15 +4773,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Saraksts
 STR_TIMETABLE_NO_TRAVEL                                         :Bez braukšanas
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Ceļot (automātiski; pēc nākamā manuālā rīkojuma saraksta)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Braukšana (nav sarakstā)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Braukt ar ne vairāk kā {2:VELOCITY} (nav sarakstā)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Braukt ar ne vairāk kā {VELOCITY} (nav sarakstā)
 STR_TIMETABLE_TRAVEL_FOR                                        :Braukt līdz {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Braukt uz {STRING} ar ne vairāk kā {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Ceļot (priekš {STRING}, nav sarakstā)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Ceļot (ilgums {STRING}, nav sarakstā) ne ātrāk kā {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(stāvēt {STRING}, nav sarakstā)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(ceļot uz {STRING}, nav sarakstā)
-STR_TIMETABLE_STAY_FOR                                          :un palikt līdz {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :un braukt līdz {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}un palikt līdz {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}un braukt līdz {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Šī saraksta pabeigšana prasīs aptuveni {STRING}.
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Šis saraksts aizņems {STRING}, lai pabeigtu
@@ -4905,8 +4900,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}Tīmek
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Apstiprināt
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Izvēlēties izcelto skriptu
-STR_AI_LIST_CANCEL                                              :{BLACK}Atcelt
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemainīt skriptu
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Uzņemt ekrānuzņēmumu
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Parasts ekrānuzņēmums
@@ -4919,7 +4912,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minikart
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}MI (mākslīgā intelekta) parametri
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Spēles Skripta Parametri
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Aizvērt
 STR_AI_SETTINGS_RESET                                           :{BLACK}Atiestatīt
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5897,6 +5889,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mljrd.
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}trlj.
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5936,3 +5929,7 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Atvērt nozīmītes konfigurāciju
+STR_BADGE_CONFIG_RESET                                          :Atiestatīt
+STR_BADGE_CONFIG_PREVIEW                                        :Priekšskatīt attēlu
+STR_BADGE_CONFIG_NAME                                           :Nosaukums
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index a91e60e54d..95340409bd 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -629,7 +629,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Išeiti
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pagrindinės nuostatos
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Išplėstinės nuostatos
 STR_SETTINGS_MENU_AI_SETTINGS                                   :DI nustatymai
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Žaidimo scenarijaus nustatymai
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Plėtinių nuostatos
@@ -1131,22 +1130,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Įkelti
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pagrindinės nuostatos
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Bendras
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Pasirinkti bendrus nustatymus
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Pasirinkti bendrus nustatymus
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Vaizdas
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Pasirinkti vaizdo nustatymus
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Pasirinkti vaizdo nustatymus
 STR_GAME_OPTIONS_TAB_SOUND                                      :Garsas
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Pasirinkti garso ir muzikos nustatymus
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Pasirinkti garso ir muzikos nustatymus
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Socialumas
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Pasirinkti socialumo integracijos nustatymus
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Pasirinkti socialumo integracijos nustatymus
 
 STR_GAME_OPTIONS_VOLUME                                         :Tūris
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Garso efektai
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muzika
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valiuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valiutos pasirinkimas
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valiuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valiutos pasirinkimas
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1196,8 +1196,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaizijos ring
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvių latas
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalijos eskudai
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatinis išsaugojimas
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Pasirink, kaip dažnai išsaugoti žaidimą
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatinis išsaugojimas
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Pasirink, kaip dažnai išsaugoti žaidimą
 
 # Autosave dropdown
 ###length 5
@@ -1207,77 +1207,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Kas 30 minuči
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Kas 60 minučių
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Kas 120 minučių
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Kalba
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pasirinkite aplinkos kalbą
+STR_GAME_OPTIONS_LANGUAGE                                       :Kalba
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Pasirinkite aplinkos kalbą
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% baigtumas)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Per visą ekraną
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Pažymėkite šį langelį, jeigu norite OpenTTD žaisti visame ekrane
+STR_GAME_OPTIONS_FULLSCREEN                                     :Per visą ekraną
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Pažymėkite šį langelį, jeigu norite OpenTTD žaisti visame ekrane
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrano raiška
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pasirinkite ekrano raišką
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekrano raiška
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pasirinkite ekrano raišką
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Kita
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aparatinis spartinimas
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Pažymėkite šį langelį, jei norite, kad OpenTTD taikytų aparatinį spartinimą. Kad nuostata įsigaliotų, reiks perkrauti OpenTTD
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aparatinis spartinimas
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Pažymėkite šį langelį, jei norite, kad OpenTTD taikytų aparatinį spartinimą. Kad nuostata įsigaliotų, reiks perkrauti OpenTTD
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Kad pakeitimai įsigaliotų, reikia paleisti OpenTTD iš naujo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Vertikalioji sinchronizacija (VSync)
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Pažymėkite šį langelį, norėdami v-sync ekraną. Pakeistas nustatymas bus pritaikytas tik paleidus žaidimą iš naujo. Veikia tik įjungus aparatūros pagreitį
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Vertikalioji sinchronizacija (VSync)
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Pažymėkite šį langelį, norėdami v-sync ekraną. Pakeistas nustatymas bus pritaikytas tik paleidus žaidimą iš naujo. Veikia tik įjungus aparatūros pagreitį
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Dabartinė tvarkyklė: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Dabartinė tvarkyklė: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Sąsajos dydis
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Vilkite slankiklį, kad nustatyti sąsajos dydį. Vilkite laikant nuspaustą Ctrl klavišą nuolatiniam reguliavimui
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automatinis dydžio nustatymas
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Pažymėkite šį langelį, kad automatiškai aptiktumėte sąsajos dydį
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skalės nuožulniai
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Pažymėkite šį langelį, jei norite keisti kampus pagal sąsajos dydį
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Sąsajos dydis
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Vilkite slankiklį, kad nustatyti sąsajos dydį. Vilkite laikant nuspaustą Ctrl klavišą nuolatiniam reguliavimui
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automatinis dydžio nustatymas
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Pažymėkite šį langelį, kad automatiškai aptiktumėte sąsajos dydį
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Naudoti tradicišką spruklių šriftą
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Pažymėkite šį langelį, jeigu teikiate pirmenybę tradiciškui fiksuoto dydžio spruklio raštui
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Išlyginti šriftus
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Pasirinkite šį langelį, kad išlyginti šriftus
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skalės nuožulniai
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Pažymėkite šį langelį, jei norite keisti kampus pagal sąsajos dydį
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Naudoti tradicišką spruklių šriftą
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Pažymėkite šį langelį, jeigu teikiate pirmenybę tradiciškui fiksuoto dydžio spruklio raštui
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Išlyginti šriftus
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Pasirinkite šį langelį, kad išlyginti šriftus
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatinė apklausa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Dalyvauti automatinėje apklausoje
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatinė apklausa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Dalyvauti automatinėje apklausoje
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kai įjungta, OpenTTD išeinant iš žaidimo išsiųs apklausą
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Apie apklausą ir privatumą
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Atidaryti naršyklę su daugiau informacijos apie automatizuotą apklausą
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Peržiūrėti apklausos rezultatus
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Rodyti dabartinio žaidimo apklausos rezultatą
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Apie apklausą ir privatumą
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Atidaryti naršyklę su daugiau informacijos apie automatizuotą apklausą
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Peržiūrėti apklausos rezultatus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Rodyti dabartinio žaidimo apklausos rezultatą
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafika
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ekrano kadrų dažnis
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Pasirinkite pageidaujamą ekrano kadrų dažnį
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ekrano kadrų dažnis
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Pasirinkite pageidaujamą ekrano kadrų dažnį
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Didesnis nei 60Hz kadrų dažnis gali sulėtinti žaidimą.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Bazinis grafikos rinkinys
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pasirinkti naudojimui bazinį grafikos rinkinį (negali būti pakeista žaidime, tik pagrindiniame ekrane)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Papildoma informacija apie bazinės grafikos rinkinį
+STR_GAME_OPTIONS_BASE_GRF                                       :Bazinis grafikos rinkinys
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Pasirinkti naudojimui bazinį grafikos rinkinį (negali būti pakeista žaidime, tik pagrindiniame ekrane)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Papildoma informacija apie bazinės grafikos rinkinį
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Bazinis garsų rinkinys
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Pasirinkite, kurį bazinių garsų rinkinį naudoti (negali būti pakeista žaidime, tik pagrindiniame ekrane)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Papildoma informacija apie bazinių garsų rinkinį
+STR_GAME_OPTIONS_BASE_SFX                                       :Bazinis garsų rinkinys
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Pasirinkite, kurį bazinių garsų rinkinį naudoti (negali būti pakeista žaidime, tik pagrindiniame ekrane)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Papildoma informacija apie bazinių garsų rinkinį
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Bazinis muzikos rinkinys
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Pasirinkti naudojimui bazinę muziką
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Papildoma informacija apie bazinę muziką
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Bazinis muzikos rinkinys
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Pasirinkti naudojimui bazinę muziką
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Papildoma informacija apie bazinę muziką
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Parsisiųsti turinį
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Tikrinti, ar nėra naujo ir atnaujinto turinio atsisiuntimui
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(plėtinių socialinių platformų integravimui nėra įdiegta)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Papildinio būsena:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Papildinio būsena:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Veikia
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Nepavyko inicijuoti
@@ -1386,12 +1386,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Atlaidus (jokio
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nerasta tinkamų DI...{}Galite parsisiųsti keletą DI naudonat 'Turinio internete' sistemą
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Išplėstinės nuostatos
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtras:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Išskleisti viską
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Suskleisti viską
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Iš naujo nustatyti visas vertes
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtras:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Išskleisti viską
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Suskleisti viską
+STR_CONFIG_SETTING_RESET_ALL                                    :Iš naujo nustatyti visas vertes
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(paaiškinimo nėra)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Numatytoji reikšmė: {ORANGE}{STRING}
@@ -1404,9 +1403,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :kompanijos (įr
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Atsargiai!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Šis veiksmas iš naujo nustatys visus žaidimo nustatymus į numatytąsias vertes.{}Ar tikrai norite tęsti?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipas:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Rodyti tik tam tikros rūšies nuostatas
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipas:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Rodyti tik tam tikros rūšies nuostatas
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pagrindinės nuostatos
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Sudėtingesnės nuostatos
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Visos nuostatos
@@ -1423,9 +1422,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Kompanijos (įr
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nėra -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Rodyti visus paeiškos rezultatus nustatant{}{SILVER}kategoriją{BLACK}į {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Rodyti visus paeiškos rezultatus nustatant{}{SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Rodyti visus paieškos rezultatus nustatant{}{SILVER}kategoriją {BLACK}į {WHITE}{STRING} {BLACK}bei {SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Rodyti visus paeiškos rezultatus nustatant{}{SILVER}kategoriją{BLACK}į {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Rodyti visus paeiškos rezultatus nustatant{}{SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Rodyti visus paieškos rezultatus nustatant{}{SILVER}kategoriją {BLACK}į {WHITE}{STRING} {BLACK}bei {SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ne
@@ -2333,7 +2332,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nepa
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}...Vaizdo plokštės tvarkyklė sulaužė žaidimą. Aparatinis spartinimas išjungtas
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Pradėtį naują žaidimą
 STR_INTRO_LOAD_GAME                                             :{BLACK}Įkelti žaidimą
@@ -2345,11 +2343,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Žaisti
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Pagrindinės nuostatos
 STR_INTRO_HIGHSCORE                                             :{BLACK}Nugalėtojų lentelė
 STR_INTRO_HELP                                                  :{BLACK}Pagalba ir vadovai
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Išplėstinės nuostatos
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Plėtiniai
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Interneto turinys
-STR_INTRO_AI_SETTINGS                                           :{BLACK}DI Nustatymai
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Žaidimo scenarijaus nustatymai
 STR_INTRO_QUIT                                                  :{BLACK}Išeiti
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Pradėti naują žaidimą. Spragtelėjus laikant nuspaustą Ctrl klavišą, naujas žemėlapis bus sugeneruotas nedelsiant ir nieko nebeklausiant
@@ -2366,11 +2360,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Žaislin
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Atidaryti pagrindines žaidimo nuostatas
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Atverti nugalėtojų lentelę
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Atidaryti išplėstines nuostatas
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Atidaryti parsisiųstus plėtinius ir jų nuostatas
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tikrinti, ar nėra naujų plėtinių arba atnaujinimų jau atsisiųstiems plėtiniams
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Atidaryti DI nustatymus
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Atidaryti žaidimo scenarijaus nustatymus
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Išeiti iš „OpenTTD“ žaidimo
 
 STR_INTRO_BASESET                                               :{BLACK}Šiuo metu pasirinktame grafikos rinkinyje trūksta {NUM} sprukl{P io ių ių}. Patikrinkite, ar nėra naujinių.
@@ -3162,6 +3152,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Išsirin
 STR_FOUND_TOWN_CITY                                             :{BLACK}Miestas
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Didemiesčiai auga greičiau nei įprasti miestai{}Pagal tam tikras nuostatas, jie didesni, nuo atsiradimo
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Miesto kelių išdėstymas:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Pasirinkti kelio išdėstymą šiam miestui
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalus
@@ -3595,15 +3586,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Išsaugo
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Visų rinkinių sąrašas
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Įveskite rinkinio pavadinimą
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Šiuo metu pasirinktas rinkinio pavadinimas
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Atšaukti
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Nieko nedaryti ir grįžti atgal
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Išsaugoti
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Išsaugoti rinkinį pasiriktu pavadinimu
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Pakeisti bazinius grafikos parametrus
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Plėtinio nuostatos
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Užverti
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Atstatyti
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Atstatyti pradines reikšmes visoms nuostatoms
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Nuostata {NUM}
@@ -4848,7 +4836,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tvarkara
 STR_TIMETABLE_NO_TRAVEL                                         :Nėra kelionių
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Kelionė (automatinė; į tvarkaraštį bus įtraukta kitos užduoties)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Kelionė (nėra tvarkaraštyje)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Vykti ne didesniu, nei {2:VELOCITY} greičiu (kelionės trukmė nenustatyta)
 STR_TIMETABLE_TRAVEL_FOR                                        :Keliauti {STRING.ka}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Vykti {STRING} ne didesniu, nei {VELOCITY} greičiu
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Vykti ({STRING.ka}, neįtraukiant į tvarkaraštį)
@@ -4964,8 +4951,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Priimti
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Pasirinkti pažymėtą scenarijų
-STR_AI_LIST_CANCEL                                              :{BLACK}Atšaukti
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nekeisti scenarijaus
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Padaryti ekrano kopiją
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Įprasta kopija
@@ -4978,7 +4963,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Mini že
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :DI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Žaidimo scenarijus
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Uždaryti
 STR_AI_SETTINGS_RESET                                           :{BLACK}Atstatyti
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 2941add4f2..0697438230 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Haiser plazéir
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spilloptiounen
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Astellungen
 STR_SETTINGS_MENU_AI_SETTINGS                                   :KI Astellungen
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Spillscriptastellungen
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF Astellungen
@@ -452,6 +451,12 @@ STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Sandbox Optioun
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Transparenz Optiounen
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Stiednimm uweisen
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Statiounsnimm uweisen
+STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Garen
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Camionsgaren
+STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Busarrêten
+STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Hafen
+STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Fluchhäfen
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Geescht
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Weepunktnimm uweisen
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Schëlder uweisen
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Géignerschëlder an Nimm uweisen
@@ -953,22 +958,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Setzt d'
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spill Optiounen
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generell
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Wiel generell Astellungen aus
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Wiel generell Astellungen aus
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Wiel Grafik-Astellungen aus
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Wiel Grafik-Astellungen aus
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Wiel Sound- a Musikastellungen aus
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Wiel Sound- a Musikastellungen aus
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Wiel Astellungen déi mat Social Media ze dinn hunn
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Wiel Astellungen déi mat Social Media ze dinn hunn
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Soundeffekter
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Währungseenheet
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währungseenheet wielen
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Währungseenheet
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Währungseenheet wielen
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1017,9 +1023,10 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesesch Rup
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysesche Ringgit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lettesch Lat
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugieseschen Escudo
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainesch Hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autospäicheren
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Wiel den Intervall aus fir d'Autospäicherung
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autospäicheren
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Wiel den Intervall aus fir d'Autospäicherung
 
 # Autosave dropdown
 ###length 5
@@ -1029,77 +1036,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :All 30 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :All 60 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :All 120 Minuten
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Sprooch
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Wielt d'Interfacesprooch aus
+STR_GAME_OPTIONS_LANGUAGE                                       :Sprooch
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Wielt d'Interfacesprooch aus
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% fäerdeg)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Vollbild
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Klick dës Optioun un fir OpenTTD am Vollbild ze spillen
+STR_GAME_OPTIONS_FULLSCREEN                                     :Vollbild
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Klick dës Optioun un fir OpenTTD am Vollbild ze spillen
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Bildopléisung
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Wielt d'Bildopléisung
+STR_GAME_OPTIONS_RESOLUTION                                     :Bildopléisung
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Wielt d'Bildopléisung
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Aaner
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardwarebeschleunegung
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Dës Optioun wielen, dass OpenTTD Hardwarebeschleunigung dierf notzen. Wäert just geännert ginn wann d'Spill nei gestart gëtt
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardwarebeschleunegung
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Dës Optioun wielen, dass OpenTTD Hardwarebeschleunigung dierf notzen. Wäert just geännert ginn wann d'Spill nei gestart gëtt
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}D'Astellung huet réicht en Afloss no engem Neistart vum Spill
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Wiel des Optioun fir de V-Sync unzeman. Des gëtt eréit no engem Neistart benotzt. Funktionéiert nëmmen wann Hardwarebeschleunigung un ass
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Wiel des Optioun fir de V-Sync unzeman. Des gëtt eréit no engem Neistart benotzt. Funktionéiert nëmmen wann Hardwarebeschleunigung un ass
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktuellen Driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktuellen Driver: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interfacegréisst
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}De Slider zéien fir d'Gréisst vum Interface ze änneren. Ctrl+Zéien fir eng kontinuéierlech Ännerung
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Gréisst autom. erkennen
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Klick dës Optioun fir d'Interfacegréisst automatesch anzestellen
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Bevels skaléiren
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Klick dës Optioun fir d'Bevels mat der Gréisst vum Interface ze skaléiren
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interfacegréisst
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :De Slider zéien fir d'Gréisst vum Interface ze änneren. Ctrl+Zéien fir eng kontinuéierlech Ännerung
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Gréisst autom. erkennen
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Klick dës Optioun fir d'Interfacegréisst automatesch anzestellen
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Traditionell Spriteschrëft benotzen
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Klick dës Optioun wanns du déi traditionell fix-Gréisst Spriteschrëft wëlls
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias Schrëften
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Klick dës Optioun fir verännerbar Schrëften ze anti-aliasen
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Bevels skaléiren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Klick dës Optioun fir d'Bevels mat der Gréisst vum Interface ze skaléiren
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Traditionell Spriteschrëft benotzen
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Klick dës Optioun wanns du déi traditionell fix-Gréisst Spriteschrëft wëlls
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias Schrëften
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Klick dës Optioun fir verännerbar Schrëften ze anti-aliasen
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatesch Emfro
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}An enger automatescher Emfro matmaachen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Falls ugeschalt schéckt OpenTTD eng Emfro wann d'Spill ausgemet gëtt
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Iwwert Emfroen an Dateschutz
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dëst start e Browser mat méi Informatiounen iwwert d'automatesch Emfro
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Preview op d'Emfroresultat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Weis d'Resultat vun der Emfro vum aktuelle Spill un
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatesch Emfro
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :An enger automatescher Emfro matmaachen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Falls ugeschalt schéckt OpenTTD eng Emfro wann d'Spill ausgemet gëtt
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Iwwert Emfroen an Dateschutz
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dëst start e Browser mat méi Informatiounen iwwert d'automatesch Emfro
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Preview op d'Emfroresultat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Weis d'Resultat vun der Emfro vum aktuelle Spill un
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafik
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Bildfrequenz
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Wiel d'Frequenz vum Bildschirm aus
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Bildfrequenz
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Wiel d'Frequenz vum Bildschirm aus
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Bildfrequenzen iwwert 60Hz kënnen d'Leeschtung beaflossen
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis Grafikset
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wielt de Basis Grafikset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Méi Infos iwwert de Basis Grafikset
+STR_GAME_OPTIONS_BASE_GRF                                       :Basis Grafikset
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Wielt de Basis Grafikset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Méi Infos iwwert de Basis Grafikset
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis Soundset
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Wiel de Basis Soundset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Méi Informatiounen iwwer d'Basis Soundset
+STR_GAME_OPTIONS_BASE_SFX                                       :Basis Soundset
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Wiel de Basis Soundset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Méi Informatiounen iwwer d'Basis Soundset
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis Musikset
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Wiel de Basis Musikset dee soll benotzt ginn
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Méi Informatiounen iwwer de Basis Musikset
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basis Musikset
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Wiel de Basis Musikset dee soll benotzt ginn
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Méi Informatiounen iwwer de Basis Musikset
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Inhalt eroflueden
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Sich no neiem an geupdateten Inhalt fir erofzelueden
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(keng Plugins déi mat Social Platforms kommunizéiren installéiert)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plattform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Pluginstatus:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plattform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Pluginstatus:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Leeft
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Konnt net initialiséiren
@@ -1210,14 +1217,13 @@ STR_CITY_APPROVAL_TOLERANT                                      :Tolerant
 STR_CITY_APPROVAL_HOSTILE                                       :Feindlech
 STR_CITY_APPROVAL_PERMISSIVE                                    :Fräizügeg (keng Auswierkung op Firmenactiounen)
 
-STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Keng KI fonnt...{}KI kënnen iwwert den 'Online Content' system downgeload ginn
+STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Keng KI fonnt...{}{}KI kënnen iwwert den 'Online Content' system downgeload ginn
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Astellungen
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles erweideren
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles reduzéiren
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}All Wäerter zerécksetzen
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles erweideren
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles reduzéiren
+STR_CONFIG_SETTING_RESET_ALL                                    :All Wäerter zerécksetzen
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(keng Erklärung verfügbar)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standardwäert: {ORANGE}{STRING}
@@ -1230,9 +1236,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firmenastellung
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Opgepasst!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Des Aktioun setzt all Wäerter op hier Standardastellungen zeréck.{}Bass du sécher, fir weiderzefueren?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typ:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limitéiert d'Lëscht mat virdefinéierten Filter
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typ:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limitéiert d'Lëscht mat virdefinéierten Filter
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basis (nëmmen wichteg Astellungen)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Erweidert (weist déi meescht Astellungen)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expertenastellungen (all Astellungen, och komescher)
@@ -1249,9 +1255,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firmenastellung
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Keng -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Weis all Sich-Resultater no der Astellung{}{SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING} {BLACK}an {SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Weis all Sich-Resultater no der Astellung{}{SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING} {BLACK}an {SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Aus
@@ -1923,7 +1929,8 @@ STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nie
 
 STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Wiertschaftstyp: {STRING}
 ###length 2
-STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :"Glaat" suergt fir méi oft a kleng Produktiounsännerungen. "Agefruer" stoppt jeglech Ännerungen an der Wiertschaft an Industrieschléissungen. Dës Astellunge kinnten keen Afloss hunn, wann en NewGRF benotzt gëtt
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :"Glaat" suergt fir méi oft a kleng Produktiounsännerungen. "Agefruer" stoppt jeglech Ännerungen an der Wiertschaft an Industrieschléissungen. Dës Astellunge kinnten keen Afloss hunn, wann en NewGRF benotzt gëtt.{}{}Industrieproduktioun pro Mount kinnt nach emmer variabel ausgesinn wann d'Ekonomie agefruer ass, wëll d'Produktioun a fixen Intervalle ugefrot gëtt an dat net exakt de equivalent zu de Méint ass
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT_PERIOD                 :"Glaat" suergt fir méi oft a kleng Produktiounsännerungen. "Agefruer" stoppt jeglech Ännerungen an der Wiertschaft an Industrieschléissungen. Dës Astellunge kinnten keen Afloss hunn, wann en NewGRF benotzt gëtt.{}{}Industrieproduktioun pro Minut kinnt nach emmer variabel ausgesinn wann d'Ekonomie agefruer ass, wëll d'Produktioun a fixen Intervalle ugefrot gëtt an dat net exakt de equivalent zu Minuten ass
 
 ###length 3
 STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Original
@@ -1966,19 +1973,24 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :Zoufälleg
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :Stied däerfen Stroossen bauen: {STRING}
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT                    :Erlaabt Stied Stroossen ze bauen fir ze wuessen. Ausschalten fir d'Stiedréid dorun ze hënneren fir Stroossen selwer ze bauen
 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :Stied dierfe Barrière bauen: {STRING}
-STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :Wann dës Astellung ugeschalt ass, kënnen Stied Stroossen iwwert Schinne bauen
+STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :Wann dës Astellung ugeschalt ass, kënne Stied Stroossen iwwert Schinne bauen
 
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :Limitéier de Bau vu Fluchhäfen geméiss dem Kaméidisniveau: {STRING}
 STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT                         :Erlaabt de Stied de Bau vu Fluchhäfen opgront vum Kaméidisniveau ze blockéiren, wat sech op d'Gréisst vun der Stad an d'Gréisst an Distanz vum Fluchhafe baséiert. Wann dat ausgeschalt ass, erlaabt d'Stad zwee Fluchhäfen ausser d'Gemengenastellung ass "Fräizügeg"
 
 STR_CONFIG_SETTING_TOWN_FOUNDING                                :Stiedgrënnung am Spill: {STRING}
-STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Wann dës Astellung ugeschalt ass, kënnen Spiller nei Stied am Spill grënnen
+STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Wann dës Astellung ugeschalt ass, kënne Spiller nei Stied am Spill grënnen
 ###length 3
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Verbueden
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Erlaabt
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Erlaabt, eegene Stad-Layout
 
+STR_CONFIG_SETTING_HOUSE_PLACER                                 :Individuell Haiser plazéiren: {STRING}
+STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :Wann des Astellung ugeschalt ass, kënne Spiller Haiser manuell plazéiren
 ###length 3
+STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Verbueden
+STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Erlabt
+STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :Erlabt, fäerdeg gebaut
 
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Duerfwuerengeneratioun: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Wéivill Wuere produzéiert ginn, relativ zur Bevölkerung vum Duerf.{}Quadratesche Wuesstum: En duebel sou grousst Duerf, generéiert véier mol souvill Passagéier.{}Lineare Wuesstum: En duebel sou grousst Duerf, generéiert duebel souvill Passagéier
@@ -2007,7 +2019,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Maximal Unzuel
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Unzuel un net-gepinnten openen Fënster befier al Fënsteren automatesch zougemaach ginn fir nei Plaz ze man fir nei Fënsteren
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :ausgeschalt
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Ausgeschalt
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Maximale Razoom Level: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Maximal Razoomstuf fir Usiichtsfënsteren. Et gëtt méi Späicher gebraucht wann d'Stufen ze grouss ginn
@@ -2178,7 +2190,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... keng
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU driver huet d'Spill gecrasht. Hardwarebeschleunegung ausgeschalt
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Neit Spill
 STR_INTRO_LOAD_GAME                                             :{BLACK}Spill lueden
@@ -2190,11 +2201,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multipla
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spilloptiounen
 STR_INTRO_HIGHSCORE                                             :{BLACK}Beschtelëscht
 STR_INTRO_HELP                                                  :{BLACK}Hëllef & Handbuch
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Astellungen
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Astellungen
-STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Check Online Inhalt
-STR_INTRO_AI_SETTINGS                                           :{BLACK}KI Astellungen
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Spillscriptastellungen
+STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online Content
 STR_INTRO_QUIT                                                  :{BLACK}Eraus
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start en neit Spill. Ctrl+Klick iwwerspréngt Kaartenkonfiguratioun
@@ -2212,11 +2219,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Wielt de
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Spilloptiounen opman
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Beschtelëscht opman
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Hei kritt een Dokumentatiounen an online Ressourcen
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Astellungen opman
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF Astellungen opman
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check op neien Inhalt kann erofgelude ginn
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}KI-Astellungen opman
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Spillscriptastellungen opman
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Aus 'OpenTTD' eraus goen
 
 STR_INTRO_BASESET                                               :{BLACK}Dem grad ausgewielte Basis Grafikset fehlen {NUM} Sprite{P "" s}. W.e.g. no Updates fir dëse Set sichen.
@@ -2241,6 +2244,7 @@ STR_HELP_WINDOW_README                                          :{BLACK}Readme
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Changelog
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Bekannte Bugs
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Lizenz
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Schrëften
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Handbuch / Wiki
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}E Bug melden
@@ -2629,13 +2633,14 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH               :warden op d'Akt
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :verloossen
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ass dem Spill bäigetrueden
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} ass an d'Spill komm (Client #{NUM})
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ass bei d'Firma {STRING} gaang
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ass als Zuschauer do
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} huet eng nei Firma gegrënnt (#{NUM})
 STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} huet d'Spill verlooss ({STRING})
 STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} huet säin Numm op {STRING} gewiesselt
 STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} huet {CURRENCY_LONG} der Firma {STRING} ginn
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}De Server huet d'Sessioun zougemaach
-STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}De Server gëtt nei gestart...{}W.e.g. waarden...
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}De Server gëtt nei gestart...{}{}W.e.g. waarden...
 STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} gouf gekickt. Grond: ({STRING})
 
 STR_NETWORK_ERROR_COORDINATOR_REGISTRATION_FAILED               :{WHITE}Server Registration huet net geklappt
@@ -2644,7 +2649,7 @@ STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}De Serve
 STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL                   :{WHITE}Aner Spiller wäerte sech net op de Server verbanne kënnen
 
 # Content downloading window
-STR_CONTENT_TITLE                                               :{WHITE}Lueden Inhalt erof
+STR_CONTENT_TITLE                                               :{WHITE}Online Content
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Typ
 STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Typ vum Inhalt
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Numm
@@ -2843,6 +2848,7 @@ STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Joer: {O
 STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Joer: {ORANGE}Bis {NUM}
 STR_HOUSE_PICKER_SIZE                                           :{BLACK}Gréisst: {ORANGE}{NUM}x{NUM} Felder
 STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Akzeptéiert Wuer: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Produzéiert Wuer: {ORANGE}{CARGO_LIST}
 
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Rand
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Ausseberäich
@@ -2850,6 +2856,10 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Aner Viruerter
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Bannescht Viruerter
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Stadzentrum
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :Upgrades verhënneren
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Wiel aus ob dëst Haus firun engem Ersetze geschützt gëtt wann d'Stad wiisst
+STR_HOUSE_PICKER_PROTECT_OFF                                    :Aus
+STR_HOUSE_PICKER_PROTECT_ON                                     :Un
 
 STR_STATION_CLASS_DFLT                                          :Standard
 STR_STATION_CLASS_DFLT_STATION                                  :Standardstatioun
@@ -2883,6 +2893,7 @@ STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Stroosse
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Bréckenauswiel - Wiel deng Bréck aus
 STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED                           :{GOLD}{STRING},{} {VELOCITY}
+STR_SELECT_BRIDGE_INFO_NAME_COST                                :{GOLD}{STRING},{} {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST                      :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Stolen Hängebréck
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Stoldréier Bréck
@@ -2941,7 +2952,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Wueren-T
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Waasserstroosse bauen
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Waasserstroossen
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Kanäl bauen. Dréck Shift fir nëmmen déi ongeféier Käschten unzeweisen
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Kanäl bauen. Ctrl+Klick+Zéien fir wielt d'Areal diagonal aus. Dréck Shift fir nëmmen déi ongeféier Käschten unzeweisen
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Schleise bauen. Dréck Shift fir nëmmen déi ongeféier Käschten unzeweisen
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Schëffsschapp bauen (fir Schëffer ze bauen an ze reparéiren). Dréck Shift fir nëmmen déi ongeféier Käschten unzeweisen
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Schëffsdock bauen. Ctrl aktivéiert ubaue vu Statiounen. Shift wiesselt tëscht bauen/ongeféier Käschten uweisen
@@ -3055,6 +3066,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Wiel d'S
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stied wuessen méi schnell wéi Dierfer{}Ofhängeg vun den Astellungen, sinn se méi grouss am Ufank
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Stroosselayout vun der Stad:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Stroosselayout fir des Stad wielen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3126,6 +3138,8 @@ STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Tramtyp:
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Schinne-Geschw.-Limit: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Stroosse-Geschw.-Limit: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Tram-Geschw.-Limit: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}Stad kann upgraden: {LTBLUE}Jo
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}Stad kann upgraden: {LTBLUE}Nee
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Fielsen
@@ -3134,6 +3148,9 @@ STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Eidelt Land
 STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Felder
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Wüst
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :Schnéibedeckt Fielsen
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :Schnéibedeckt knubbelegt Land
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :Schnéibedeckt Gras
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Schinn
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Schinn mat Blocksignaler
@@ -3499,15 +3516,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Preset s
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lëscht vu Presets, wiel een den op den Numm ënnendrënner kopéiert gëtt
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Wiel en Numm fir de Preset
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Grad ausgewielten Numm fir de Preset dee gespäichert soll ginn
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Ofbriechen
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Den Preset net änneren
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Späichern
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Späicher de Preset op dee grad ausgewielten Numm
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Basis Grafikparameter änneren
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF Parameter änneren
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zoumaachen
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Setzt all Paramater op de Standard zréck
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3605,17 +3619,17 @@ STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Kompati
 STR_NEWGRF_LIST_MISSING                                         :{RED}Dateien feelen
 
 # NewGRF 'it's broken' warnings
-STR_NEWGRF_BROKEN                                               :{WHITE}Verhalen vun der NewGRF '{0:STRING}' kann Desyncs oder Crashen verursachen
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Ännert den Zoustand fir '{1:ENGINE}' wann net an engem Schapp
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Ännert d'Gefierlängt fir '{1:ENGINE}' wann net an engem Schapp
-STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Geännerte Gefierkapazitéit vun '{1:ENGINE}' wann net an engem Schapp oder amgaang emgebaut ze ginn
+STR_NEWGRF_BROKEN                                               :{WHITE}Verhalen vun der NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' kann Desyncs oder Crashen verursachen
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Ännert den Zoustand fir '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' wann net an engem Schapp
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Ännert d'Gefierlängt fir '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' wann net an engem Schapp
+STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Geännerte Gefierkapazitéit vun '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' wann net an engem Schapp oder amgaang emgebaut ze ginn
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Zuch'{VEHICLE}' vun der Firma '{COMPANY}' huet eng falsch Längt. Et kënnt wahrscheinlech wéinst den NewGRFs. Spill kann desyncroniséiren oder ofstierzen
 
-STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' huet Fehlinformatiounen
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit Informatioun fir '{1:ENGINE}' ass anescht wéi an der Kaflëscht no der Constructioun. Dëst kann en Autoerneirung/-ersetzen Feeler oprufen
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' huet eng Endlosschläif am Production callback verursaacht
+STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' huet Fehlinformatiounen
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit Informatioun fir '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' ass anescht wéi an der Kaflëscht no der Constructioun. Dëst kann en Autoerneirung/-ersetzen Feeler oprufen
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' huet eng Endlosschläif am Production callback verursaacht
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Callback {1:HEX} huet en onbekannten/invalid Resultat {2:HEX}
-STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' huet en ongültegen Wuerentyp am Production-callback bei {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' huet en ongültegen Wuerentyp am Production-callback bei {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<invalid Wuer>
@@ -4011,6 +4025,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produzé
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Brauch:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} warden{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} warden
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}D'Produktioun änneren (Multipel vun 8, bis op 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Änner de Produktiounslevel (Prozenter, bis zu 800%)
@@ -4668,54 +4686,56 @@ STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Stroossegefier-
 STR_ORDER_SHIP_DEPOT                                            :Schëffswerft
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} den noosten Hangar
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} den noosten {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
-STR_ORDER_REFIT_ORDER                                           :(Ëmbau op {STRING})
-STR_ORDER_REFIT_STOP_ORDER                                      :(Ëmbau op {STRING} an stoppen)
-STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDER_REFIT_ORDER                                           :{SPACE}(Ëmbau op {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Ëmbau op {STRING} an stoppen)
+STR_ORDER_STOP_ORDER                                            :{SPACE}(Stop)
 
-STR_ORDER_WAIT_TO_UNBUNCH                                       :(Warden fir ze verspreeën)
+STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(Warden fir ze verspreeën)
 
 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION}
 STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION                       :{PUSH_COLOUR}{RED}(Statioun kann net benotzt ginn){POP_COLOUR} {STRING} {STATION}
 
-STR_ORDER_IMPLICIT                                              :(Implizit)
+STR_ORDER_IMPLICIT                                              :{SPACE}(Implizit)
 
-STR_ORDER_FULL_LOAD                                             :(Voll lueden)
-STR_ORDER_FULL_LOAD_ANY                                         :(Voll lueden mat all Wuer)
-STR_ORDER_NO_LOAD                                               :(Net lueden)
-STR_ORDER_UNLOAD                                                :(Entlueden an Luedung huelen)
-STR_ORDER_UNLOAD_FULL_LOAD                                      :(Entlueden an erem voll lueden)
-STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Entlueden an mat all Wuer voll lueden)
-STR_ORDER_UNLOAD_NO_LOAD                                        :(Entlueden an eidel loosen)
-STR_ORDER_TRANSFER                                              :(Transferéieren an Lueden)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Transferéieren an voll lueden)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Transferéieren an mat all Wuer voll lueden)
-STR_ORDER_TRANSFER_NO_LOAD                                      :(Transferéieren an eidel loosen)
-STR_ORDER_NO_UNLOAD                                             :(Net entlueden an Wueren lueden)
-STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Net entlueden an op voll Beluedung waarden)
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Net entlueden an op iergendeng voll Beluedung waarden)
-STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Keen Ent- an Belueden)
+STR_ORDER_FULL_LOAD                                             :{SPACE}(Voll lueden)
+STR_ORDER_FULL_LOAD_ANY                                         :{SPACE}(Voll lueden mat all Wuer)
+STR_ORDER_NO_LOAD                                               :{SPACE}(Net lueden)
+STR_ORDER_UNLOAD                                                :{SPACE}(Entlueden an Luedung huelen)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :{SPACE}(Entlueden an erem voll lueden)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :{SPACE}(Entlueden an mat all Wuer voll lueden)
+STR_ORDER_UNLOAD_NO_LOAD                                        :{SPACE}(Entlueden an eidel loosen)
+STR_ORDER_TRANSFER                                              :{SPACE}(Transferéieren an Lueden)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :{SPACE}(Transferéieren an voll lueden)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :{SPACE}(Transferéieren an mat all Wuer voll lueden)
+STR_ORDER_TRANSFER_NO_LOAD                                      :{SPACE}(Transferéieren an eidel loosen)
+STR_ORDER_NO_UNLOAD                                             :{SPACE}(Net entlueden an Wueren lueden)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :{SPACE}(Net entlueden an op voll Beluedung waarden)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :{SPACE}(Net entlueden an op iergendeng voll Beluedung waarden)
+STR_ORDER_NO_UNLOAD_NO_LOAD                                     :{SPACE}(Keen Ent- an Belueden)
 
-STR_ORDER_AUTO_REFIT                                            :(Embauen op {STRING})
-STR_ORDER_FULL_LOAD_REFIT                                       :(Voll lueden mat ëmbauen op {STRING})
-STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(Voll lueden mat all Wueren mat ëmbauen op {STRING})
-STR_ORDER_UNLOAD_REFIT                                          :(Entlueden an Wueren lueden mat Embauen op {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Entlueden an op voll Luedung waarden mat Embauen op {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Entlueden an waard op iergendeng Volluedung mat Embauen op {STRING})
-STR_ORDER_TRANSFER_REFIT                                        :(Transfer an lued Wueren mat Auto-Embauen zu {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Transfer an waard op Vollueden mat Auto-Embauen op {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Transfer an waard op iergendeng Volluedung mat Auto-Embauen op {STRING})
-STR_ORDER_NO_UNLOAD_REFIT                                       :(Keen Entlueden an huel Wueren mat Auto-Embauen op {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(Keen Entlueden an waard op Vollueden mat Auto-Embauen op {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(Keen Entlueden an waard op iergendend Volluedung mat Auto-Embauen op {STRING})
+STR_ORDER_AUTO_REFIT                                            :{SPACE}(Embauen op {STRING})
+STR_ORDER_FULL_LOAD_REFIT                                       :{SPACE}(Voll lueden mat ëmbauen op {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Voll lueden mat all Wueren mat ëmbauen op {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :{SPACE}(Entlueden an Wueren lueden mat Embauen op {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :{SPACE}(Entlueden an op voll Luedung waarden mat Embauen op {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :{SPACE}(Entlueden an waard op iergendeng Volluedung mat Embauen op {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :{SPACE}(Transfer an lued Wueren mat Auto-Embauen zu {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :{SPACE}(Transfer an waard op Vollueden mat Auto-Embauen op {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :{SPACE}(Transfer an waard op iergendeng Volluedung mat Auto-Embauen op {STRING})
+STR_ORDER_NO_UNLOAD_REFIT                                       :{SPACE}(Keen Entlueden an huel Wueren mat Auto-Embauen op {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :{SPACE}(Keen Entlueden an waard op Vollueden mat Auto-Embauen op {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :{SPACE}(Keen Entlueden an waard op iergendend Volluedung mat Auto-Embauen op {STRING})
 
 STR_ORDER_AUTO_REFIT_ANY                                        :verfügbar Wueren
 
 ###length 3
-STR_ORDER_STOP_LOCATION_NEAR_END                                :[noosten Enn]
-STR_ORDER_STOP_LOCATION_MIDDLE                                  :[Mëtt]
-STR_ORDER_STOP_LOCATION_FAR_END                                 :[wäit Enn]
+STR_ORDER_STOP_LOCATION_NEAR_END                                :{SPACE}[no um Enn]
+STR_ORDER_STOP_LOCATION_MIDDLE                                  :{SPACE}[Mëtt]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :{SPACE}[wäit Enn]
 
 STR_ORDER_OUT_OF_RANGE                                          :{RED} (Nächst Destinatioun ass ze wäit fort)
 
@@ -4735,13 +4755,12 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Zäitpla
 STR_TIMETABLE_NO_TRAVEL                                         :Net ënnerwee
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rees (automatesch; Zäitplang durch manuell Opträg)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ënnerwee (ouni Zäitplang)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Fuer maximal {2:VELOCITY} (ouni Zäitplang)
 STR_TIMETABLE_TRAVEL_FOR                                        :Ënnerwee während {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Fiert während {STRING} mat maximal {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Fuer (während {STRING}, ouni Zäitplang)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Fuer (während {STRING}, ouni Zäitplang) mat maximal {VELOCITY}
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(bleif während {STRING}, ouni Zäitplang)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(fuer während {STRING}, ouni Zäitplang)
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(waard {STRING}, ouni Zäitplang)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(fuer während {STRING}, ouni Zäitplang)
 STR_TIMETABLE_STAY_FOR                                          :an bleif fir {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :an ënnerwee während {STRING}
 
@@ -4762,12 +4781,14 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Sekonne bis den
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Zäit wiesselen
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Änner Zäit déi den ugewielten Optrag brauche soll. Ctrl+Klick ännert d'Zäit fir all Opträg
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Zäit änneren
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Zäit läschen
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Läsch Zäit fir de gewielten Optrag. Ctrl+Klick läscht d'Zäite fir all opträg
 
 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Änner de Geschwindegkeetslimit
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Änner d'maximal Reesgeschwindëgkeet fir de gewielten Optrag. Ctrl+Klick ännert d'Geschwindegkeet fir all Opträg
+STR_TIMETABLE_CHANGE_SPEED_QUERY                                :Geschwindegkeetslimit änneren
 
 STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Geschwindegkeetslimit läschen
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Maximal Reesgeschwindegkeet vum gewielten Optrag läschen. Ctrl+Klick läscht d'Geschwindegkeet fir all Opträg
@@ -4860,8 +4881,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Akzeptéiert
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Wiel de markéierten Script
-STR_AI_LIST_CANCEL                                              :{BLACK}Ofbriechen
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Script net änneren
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}E Screenshot maachen
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normale Screenshot
@@ -4873,8 +4892,7 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimap-
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :KI
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Spill-Script
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zoumaachen
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Spill-Script-Parameter
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4934,7 +4952,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<keen do>
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spill gouf an enger Versioun ouni Tram support gesaved. All Tram gouf wechgeholl
 
 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaartenerstellung ofgebrach...{}... keng passend Stadplazen
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaartenerstellung ofgebrach...{}{}... keng passend Stadplazen
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... et ass keng Stad an dësem Szenario
 
 STR_ERROR_PNGMAP                                                :{WHITE}Kann d'Landschaft net vum PNG lueden...
@@ -4963,6 +4981,7 @@ STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screensh
 
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Meldung
+STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Matdeelung vun {COMPANY}
 
 # Generic construction errors
 STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}Ausserhalb vun der Kaart
@@ -4981,6 +5000,7 @@ STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... Limi
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... Limit fir d'Raume vu Felder erreecht
 STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... Limit fir Beem ze planzen erreecht
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Numm muss eenzegarteg sinn
+STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{STRING} am Wee
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Net erlaabt an der Paus
 
 # Local authority errors
@@ -5023,7 +5043,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... ze n
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... ze vill Stied
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... et ass keng Plaz méi op der Kaart
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Stroossenarbeschten amgaangen
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kann des Stad net läschen...{}Eng Statioun oder Schapp huet den Numm vun dëser Stad oder en Stéck dat der Stad gehéiert kann net ewechgeholl ginn
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kann des Stad net läschen...{}{}Eng Statioun oder Schapp huet den Numm vun dëser Stad oder en Stéck dat der Stad gehéiert kann net ewechgeholl ginn
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... et gëtt keng gëeegent Plaz fir eng Statu am Stadzentrum
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}Kann d'Haus net bauen...
 
@@ -5297,8 +5317,16 @@ STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kann Sch
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kann de Fliger net verkafen...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_SELL_ALL_TRAIN                                  :{WHITE}Kann net all Zich verkafen...
+STR_ERROR_CAN_T_SELL_ALL_ROAD_VEHICLE                           :{WHITE}Kann net all Gefierer verkafen...
+STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Kann net all Schëffer verkafen...
+STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Kann all Fligeren net verkafen...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Kann Zich net automatesch ersetzen...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Ka Gefierer net automatesch ersetzen...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Ka Schëffer net automatesch ersetzen...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Ka Fliger net automatesch ersetzen...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Ze vill Gefierer am Spill
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}De Service-Intervall kann net geännert ginn...
@@ -5818,7 +5846,7 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
 STR_SAVEGAME_NAME_SPECTATOR                                     :Zuschauer, {1:STRING}
 
 # Viewport strings
-STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN_POP                                           :{TOWN} ({COMMA})
 STR_VIEWPORT_STATION                                            :{STATION} {STATION_FEATURES}
 
 # Simple strings to get specific types of data
@@ -5880,3 +5908,4 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
+STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt
index be31c10b40..1bbe6e9ed1 100644
--- a/src/lang/macedonian.txt
+++ b/src/lang/macedonian.txt
@@ -763,6 +763,7 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опци
 
 
 
+
 ###length 45
 
 
@@ -789,6 +790,7 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опци
 
 
 
+
 
 
 # Custom currency window
@@ -820,7 +822,7 @@ STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Прилаго
 ###length 4
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 
 
 STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL                            :Сите подесувања
@@ -1152,7 +1154,6 @@ STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}Нема
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Нова Игра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Вчитај Игра
@@ -1371,6 +1372,7 @@ STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Игра
 
 
 
+
 # Fund new industry window
 STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Изгради
 
@@ -1488,7 +1490,6 @@ STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Мин.
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Промена НовGRF параметри
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Затвори
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Ресетирај
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Наместете ги сите параметри на нивните стандардни вредности
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Параметар {NUM}
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index d581c87381..e15af5b53a 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -367,7 +367,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Keluar
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pilihan permainan
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Tetapan
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Tetapan NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Pilihan Ketelusan
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Paparkan nama bandar
@@ -826,8 +825,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pilihan
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unit kewangan
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pilihan unit kewangan
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unit kewangan
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Pilihan unit kewangan
 
 
 ###length 45
@@ -865,21 +865,21 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African R
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Sesuaikan...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Simpanan automatik
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Pilih tempoh untuk simpanan permainan automatik
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Simpanan automatik
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Pilih tempoh untuk simpanan permainan automatik
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Matikan
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Bahasa
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pilih bahasa antaramuka yang ingin digunakan
+STR_GAME_OPTIONS_LANGUAGE                                       :Bahasa
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Pilih bahasa antaramuka yang ingin digunakan
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Skrin Penuh
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Tanda kotak ini untuk bermain OpenTTD dalam mod skrin penuh
+STR_GAME_OPTIONS_FULLSCREEN                                     :Skrin Penuh
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Tanda kotak ini untuk bermain OpenTTD dalam mod skrin penuh
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolusi Skrin
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pilih resolusi skrin untuk digunakan
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolusi Skrin
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pilih resolusi skrin untuk digunakan
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :lain
 
 
@@ -892,17 +892,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :lain
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set grafik asas
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih set grafik asas untuk digunakan
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Maklumat tambahan tentang set grafik asas ini
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set bunyi asas
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Pilih set bunyi asas untuk digunakan
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Maklumat tambahan tentang set bunyi asas ini
+STR_GAME_OPTIONS_BASE_GRF                                       :Set grafik asas
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Pilih set grafik asas untuk digunakan
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Maklumat tambahan tentang set grafik asas ini
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set muzik asas
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Pilih set muzik asas yang akan digunakan
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Maklumat lebih tentang set muzik asas
+STR_GAME_OPTIONS_BASE_SFX                                       :Set bunyi asas
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Pilih set bunyi asas untuk digunakan
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Maklumat tambahan tentang set bunyi asas ini
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set muzik asas
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Pilih set muzik asas yang akan digunakan
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Maklumat lebih tentang set muzik asas
 
 
 
@@ -1005,11 +1006,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Mengizinkan
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Tiada AI yang bersesuaian...{}Anda boleh memuat turun beberapa AI dari sistem 'Kandungan Atas Talian'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Tetapan
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Tapis baris:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Kembangkan semua
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Musnahkan semua
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Tapis baris:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Kembangkan semua
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Musnahkan semua
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(Tiada penjelasan)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Nilai lalai: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Jenis tetapan: {ORANGE}{STRING}
@@ -1019,8 +1019,8 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Tetapan permain
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Tetapan syarikat (disimpan di simpanan; berkesan hanya permainan baru)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Tetapan syarikat (disimpan di penyimpanan; hanya berkesan kepada syarikat semasa)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Hadkan senarai di bawah menggunakan penapis yang telah ditetapkan
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Hadkan senarai di bawah menggunakan penapis yang telah ditetapkan
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Asas (menunjukkan tetapan yang penting sahaja)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Terperinci (tunjukkan kebanyakan tetapan)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (memaparkan semua tetapan, termasuk yang pelik)
@@ -1628,7 +1628,6 @@ STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE} ... aba
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Permainan Baru
 STR_INTRO_LOAD_GAME                                             :{BLACK}Buka Permainan
@@ -1639,8 +1638,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Pemain b
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Pilihan Permainan
 STR_INTRO_HIGHSCORE                                             :{BLACK}Carta mata tertinggi
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Tetapan
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Tetapan NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Periksa Kandungan Atas Talian
 STR_INTRO_QUIT                                                  :{BLACK}Keluar
 
@@ -1658,8 +1655,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Pilih la
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Paparkan pilihan permainan
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Paparan carta mata tertinggi
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Pamerkan pilihan
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Paparkan tetapan NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Periksa kandungan baru atau yang telah dikemaskini untuk dimuat turun
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Keluar 'OpenTTD'
 
@@ -2310,6 +2305,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Pilih sa
 STR_FOUND_TOWN_CITY                                             :{BLACK}Bandar
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Bandaraya membesar dengan lebih cepat daripada bandar{}Bergantung kepada tetapan, bandaraya akan lebih besar sewaktu dibina
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Susunan jalanraya bandar:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Pilih susunan jalanraya untuk bandar ini
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Asal
@@ -2635,12 +2631,10 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Tidak sera
 # NewGRF save preset window
 STR_SAVE_PRESET_CAPTION                                         :{WHITE}Simpan pratetapan
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Masukkan nama untuk pratetapan
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Batal
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Simpan
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Ubah parameter NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Tutup
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Tetapan semula
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Tetapkan semua parameter kepada nilai asal mereka
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3740,13 +3734,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Terima
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Pilih skrip yang diserlahkan
-STR_AI_LIST_CANCEL                                              :{BLACK}Batal
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Jangan ubah skrip
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tutup
 STR_AI_SETTINGS_RESET                                           :{BLACK}Semula
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt
index 68627ff77f..fb42274d46 100644
--- a/src/lang/maltese.txt
+++ b/src/lang/maltese.txt
@@ -400,6 +400,7 @@ STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE
 
 
 
+
 ###length 45
 
 
@@ -428,6 +429,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn
 
 
 
+
 
 # Custom currency window
 
@@ -455,7 +457,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn
 ###length 4
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 
 
 
@@ -756,7 +758,6 @@ STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :Ippermetti l-uz
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 
 
@@ -924,6 +925,7 @@ STR_NETWORK_SERVER_MESSAGE                                      :*** {STRING}
 
 
 
+
 # Fund new industry window
 
 # Industry cargoes window
@@ -1318,7 +1320,6 @@ STR_ORDER_IMPLICIT                                              :(Awtomatiku)
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Skeda - agħfas fuq ordni biex tagħzilha.
 
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Патуваат со најмногу {2:VELOCITY} (не е време-Увезени)
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :патуваат за {STRING} со најмногу {VELOCITY}
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Din l-iskeda ser iddum {STRING} biex titlesta
diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt
index a595ab8fc3..acf0f60ae9 100644
--- a/src/lang/marathi.txt
+++ b/src/lang/marathi.txt
@@ -672,6 +672,7 @@ STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLAC
 
 
 
+
 ###length 45
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :पौंड
 STR_GAME_OPTIONS_CURRENCY_USD                                   :डोल्लर
@@ -703,7 +704,7 @@ STR_GAME_OPTIONS_CURRENCY_SKK                                   :स्लोव
 # Autosave dropdown
 ###length 5
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}भाषा
+STR_GAME_OPTIONS_LANGUAGE                                       :भाषा
 
 
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :अन्य
@@ -726,6 +727,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :अन्य
 
 
 
+
 
 # Custom currency window
 
@@ -757,7 +759,7 @@ STR_SUBSIDY_X4                                                  :x४
 ###length 4
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 
 
 
@@ -1044,7 +1046,6 @@ STR_CONFIG_SETTING_STATUSBAR_POS                                :स्टेट
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}ओपेन टीटीडी {REV}
 
 
 
@@ -1257,6 +1258,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}लह
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}मोठं
 
 
+
 # Fund new industry window
 STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}खर्च: {YELLOW}{CURRENCY_LONG}
 
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index cc728cb0fa..0f912a5e4c 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -287,8 +287,8 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Lukk vin
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vindustittel - dra her for å flytte vindu
 STR_TOOLTIP_SHADE                                               :{BLACK}Skyggevindu - Vis kun tittelfeltet
 STR_TOOLTIP_DEBUG                                               :{BLACK}Vis NewGRF-debuggingsinformasjon
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Gjennopprett vindu til standard størrelse. Ctrl + Klikk for å lagre gjeldende størrelse som standard
-STR_TOOLTIP_STICKY                                              :{BLACK}Beskytt dette vinduet mot 'Lukk alle vinduer'-knappen. Ctrl + Klikk for å lagre tilstanden som standard.
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Gjennopprett vindu til standard størrelse. Ctrl+klikk for å lagre gjeldende størrelse som standard. Dobbelt Ctrl+klikk for å nullstille lagret standard
+STR_TOOLTIP_STICKY                                              :{BLACK}Beskytt dette vinduet mot 'Lukk alle vinduer'-knappen. Ctrl+klikk for å lagre tilstanden som standard
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klikk og dra for å endre størrelsen på vinduet
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Veksle mellom stor/liten vindustørrelse
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullefelt - ruller listen opp/ned
@@ -446,7 +446,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Plasser hus
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spillinnstillinger
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Innstillinger
 STR_SETTINGS_MENU_AI_SETTINGS                                   :KI-innstilinger
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Innstillinger for Game Script
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-innstillinger
@@ -961,22 +960,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}flytt pl
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spillinnstillinger
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generelt
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Velg generelle innstillinger
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Velg generelle innstillinger
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafikk
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Velg grafikkinnstillinger
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Velg grafikkinnstillinger
 STR_GAME_OPTIONS_TAB_SOUND                                      :Lyd
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Velg lyd- og musikkinnstillinger
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Velg lyd- og musikkinnstillinger
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sosial
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Velg sosiale integrasjonsinnstillinger
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Velg sosiale integrasjonsinnstillinger
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanserte
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Endre avanserte innstillinger
 
 STR_GAME_OPTIONS_VOLUME                                         :Volum
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Lydeffekter
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musikk
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaenhet
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Velg valutaenhet som skal brukes
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valutaenhet
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Velg valutaenhet som skal brukes
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1027,8 +1030,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latviske lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugisiske escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainske hryvnja
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisk lagring
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Velg intervall for automatisk lagring
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatisk lagring
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Velg intervall for automatisk lagring
 
 # Autosave dropdown
 ###length 5
@@ -1038,77 +1041,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Hvert 30. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Hvert 60. minutt
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Hvert 120. minutt
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Språk
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Velg språk som skal brukes
+STR_GAME_OPTIONS_LANGUAGE                                       :Språk
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Velg språk som skal brukes
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% fullført)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullskjerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kryss av denne knappen for å spille OpenTTD i fullskjermmodus
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullskjerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Kryss av denne knappen for å spille OpenTTD i fullskjermmodus
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjermoppløsning
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Velg skjermoppløsningen som skal brukes
+STR_GAME_OPTIONS_RESOLUTION                                     :Skjermoppløsning
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Velg skjermoppløsningen som skal brukes
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annet
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Maskinvareakselerasjon
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Merk av i denne boksen for å la OpenTTD prøve å bruke maskinvareakselerasjon. En endret innstilling blir bare brukt ved omstart av spillet
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Maskinvareakselerasjon
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Merk av i denne boksen for å la OpenTTD prøve å bruke maskinvareakselerasjon. En endret innstilling blir bare brukt ved omstart av spillet
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Innstillingen vil ikke tre i kraft før spillet er restartet
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Merk av i denne boksen for å aktivere VSync for skjermen. Endring av innstilling krever omstart av spillet. Fungerer bare med maskinvareakselerasjon aktivert
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Merk av i denne boksen for å aktivere VSync for skjermen. Endring av innstilling krever omstart av spillet. Fungerer bare med maskinvareakselerasjon aktivert
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktiv driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktiv driver: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Grensesnittstørrelse
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Dra for å endre grensesnittstørrelse. Ctrl+dra for kontinuerlig justering
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detekter størrelse automatisk
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Kryss av denne knappen for å detektere grensesnittstørrelsen automatisk
+STR_GAME_OPTIONS_INTERFACE                                      :Grensesnitt
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skaler faser
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Kryss av denne knappen for å skalere faser med størrelsen på grensesnittet
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Grensesnittstørrelse
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Dra for å endre grensesnittstørrelse. Ctrl+dra for kontinuerlig justering
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detekter størrelse automatisk
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Kryss av denne knappen for å detektere grensesnittstørrelsen automatisk
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Bruk tradisjonell sprite-skrift
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Kryss av denne knappen hvis du foretrekker den tradisjonelle sprite-skriften med fast størrelse
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Kantutjevning av skrift
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Kryss av denne knappen for å kantutjevne skalerbar skrift
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skaler faser
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Kryss av denne knappen for å skalere faser med størrelsen på grensesnittet
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Bruk tradisjonell sprite-skrift
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Kryss av denne knappen hvis du foretrekker den tradisjonelle sprite-skriften med fast størrelse
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Kantutjevning av skrift
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Kryss av denne knappen for å kantutjevne skalerbar skrift
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatisert undersøkelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Delta i automatisert undersøkelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Når aktivert, OpenTTD vi sende en undersøkelse når spillet forlates
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Om undersøkelser og personvern
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dette åpner en nettleser med mer informasjon om den automatiserte undersøkelsen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Forhåndsvis undersøkelsesresultater
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Vis undersøkelsesresultatene fra det pågående spillet
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatisert undersøkelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Delta i automatisert undersøkelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Når aktivert, vil OpenTTD sende en undersøkelse når spillet forlates
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Om undersøkelser og personvern
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dette åpner en nettleser med mer informasjon om den automatiserte undersøkelsen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Forhåndsvis undersøkelsesresultater
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Vis undersøkelsesresultatene fra det pågående spillet
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafikk
+STR_GAME_OPTIONS_DISPLAY                                        :Skjerm
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}VIs oppdateringsfrekvens
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Velg oppdateringsfrekvensen på skjermen
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Vis oppdateringsfrekvens
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Velg oppdateringsfrekvensen på skjermen
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Oppdateringsfrekvens høyere enn 60Hz kan påvirke ytelsen.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikksett
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Velg grafikksett som skal brukes (kan ikke endres inne i spillet, kun fra hovedmenyen)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Tilleggsinformasjon om grafikksettet
+STR_GAME_OPTIONS_BASE_GRF                                       :Grafikksett
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Velg grafikksett som skal brukes (kan ikke endres inne i spillet, kun fra hovedmenyen)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Tilleggsinformasjon om grafikksettet
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Lydsett
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Velg lydsett som skal brukes (kan ikke endres inne i spillet, bare fra hovedmenyen)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Tilleggsinformasjon om lydsettet
+STR_GAME_OPTIONS_BASE_SFX                                       :Lydsett
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Velg lydsett som skal brukes (kan ikke endres inne i spillet, bare fra hovedmenyen)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Tilleggsinformasjon om lydsettet
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Musikksett
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Velg musikksett som skal brukes
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Ytterligere informasjon om det originale musikksettet
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Musikksett
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Velg musikksett som skal brukes
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Ytterligere informasjon om det originale musikksettet
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Hent innhold
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Se etter nytt og oppdatert innhold for nedlasting
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(ingen moduler for integrasjon med sosiale plattformer er installert)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(ingen moduler for integrasjon med sosiale plattformer er installert)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plattform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Status for tilleggsmodul:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plattform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Status for tilleggsmodul:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Kjører
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Kunne ikke initialisere
@@ -1221,12 +1226,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tillatende (ing
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ingen egnet KI tilgjengelig...{}{}Du kan laste ned flere KI-er fra nettet med spillets nedlastingssystem.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Innstillinger
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrer:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Vis alle
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Skjul alle
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Tilbakestill alle verdier
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrer:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Vis alle
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Skjul alle
+STR_CONFIG_SETTING_RESET_ALL                                    :Tilbakestill alle verdier
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(ingen forklaring tilgjengelig)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standard verdi: {ORANGE}{STRING}
@@ -1239,9 +1243,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Selskapet innst
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Advarsel!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Denne handlingen vil tilbakestille alle spillinnstillingene til standard verdier.{}Er du sikker på at du vil fortsette?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Begrenser listen nedenfor ved hjelp av forhåndsdefinerte filtre
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Begrenser listen nedenfor ved hjelp av forhåndsdefinerte filtre
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grunnleggende (vis bare viktige innstillinger)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avansert (Vis de fleste innstillinger)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspert (vis alle innstillinger, inkludert merkelige)
@@ -1258,9 +1262,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Selskapsinnstil
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ingen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK} Vis alle søkeresultater ved å sette{} {SILVER} kategori {BLACK} til {WHITE} {STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK} Vis alle søkeresultater ved å sette{} {SILVER} type {BLACK} til {WHITE} alle innstillingstyper
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK} Vis alle søkeresultater ved å sette{} {SILVER} kategori {BLACK} til {WHITE} {STRING} {BLACK} og {SILVER} type {BLACK} til {WHITE} alle innstillingstyper
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Vis alle søkeresultater ved å sette{}{PUSH_COLOUR}{SILVER} kategori {POP_COLOUR}til {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Vis alle søkeresultater ved å sette{}{PUSH_COLOUR}{SILVER}type {POP_COLOUR}til {WHITE} alle innstillingstyper
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Vis alle søkeresultater ved å sette{}{PUSH_COLOUR}{SILVER}Kategori{POP_COLOUR} til {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}og {PUSH_COLOUR}{SILVER}type {POP_COLOUR}til {WHITE} alle innstillingstyper
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Av
@@ -2022,7 +2026,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Største antall
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Antall ikke-klebrige åpne vinduer før gamle vinduer automatisk blir lukket for å gi plass til nye vinduer
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :deaktivert
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Deaktivert
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Største zoom-inn nivå: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Største forstørrelsesnivå for synsfelt. Vær oppmerksom på at aktivering av høyere forstørrelsesnivå øker minnekravet
@@ -2193,7 +2197,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... inge
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU-driveren krasjet spillet. Maskinvareakselerasjon deaktivert
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nytt spill
 STR_INTRO_LOAD_GAME                                             :{BLACK}Last inn spill
@@ -2205,11 +2210,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Flerspil
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spillinnstillinger
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tavle med høyeste poengsummer
 STR_INTRO_HELP                                                  :{BLACK}Hjelp og manualer
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Innstillinger
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-innstillinger
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Innhold på nettet
-STR_INTRO_AI_SETTINGS                                           :{BLACK}KI-innstillinger
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Game Script-innstillinger
 STR_INTRO_QUIT                                                  :{BLACK}Avslutt
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start et nytt spill. Ctrl+klikk hopper over kartkonfigurering
@@ -2227,11 +2228,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Velg lek
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Åpne spillinnstillinger
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Åpne tabell med høyeste poengsummer
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Få tilgang til dokumentasjon og ressurser på nettet
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Åpne innstillinger
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Åpne NewGRF-instillinger
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Se etter nytt og oppdatert innhold for nedlasting
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Åpne KI-innstillinger
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Åpne Game Script-innstillinger
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Avslutt 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Det valgte innebygde grafikksettet mangler {NUM} sprite{P "" r}. Se etter oppdateringer for settet.
@@ -3078,6 +3075,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Velg bys
 STR_FOUND_TOWN_CITY                                             :{BLACK}By
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Storbyer vokser raskere enn vanlige byer{}Avhengig av innstillinger er de større når de blir grunnlagt
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Byutvidelse:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Bygninger
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Øk bygninger i byer
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Veier
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Øk veier i byer
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Byers veiløsning:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Velg veiløsning for denne byen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3527,15 +3530,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Lagre fo
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Liste over tilgjengelige forhåndsinnstillinger. Velg en for å kopiere den til det lagrede navnet nedenfor
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Skriv inn et navn for forhåndsinnstillingen
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Valgt navn for forhåndsinnstillingen som skal lagres
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Avbryt
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ikke forandre forhåndsinnstillingen
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Lagre
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Lagre forhåndsinnstillingen med det valgte navnet
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Endre grunnleggende grafikkparametre
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Endre NewGRF-parametre
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Lukk
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Tilbakestill
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Sett alle parametere til standardverdi
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3704,6 +3704,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Endre na
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Utvid
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Øk bystørrelse
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Utvid bygninger
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Øk bygninger i by
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Utvid veier
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Øk veier i by
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Slett
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Slett denne byen fullstendig
 
@@ -4442,10 +4446,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Vis skip
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Vis luftfartøyets ordreliste. Ctrl+klikk for å vise luftfartøyets rutetabell
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vis detaljer om toget
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Vis detaljer om kjøretøyet
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Vis detaljer om skipet
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Vis detaljer om luftfartøyet
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Vis detaljer om toget. Ctrl+klikk for å vise togets gruppe
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Vis detaljer om kjøretøyet. Ctrl+klikk for å vise kjøretøyets gruppe
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Vis detaljer om skipet. Ctrl+klikk for å vise skipets gruppe
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Vis detaljer om luftfartøyet. Ctrl+klikk for å vise luftfartøyets gruppe
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Valgt tog handling - klikk for å stoppe/starte toget
@@ -4769,15 +4773,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rutetabe
 STR_TIMETABLE_NO_TRAVEL                                         :Ingen reise
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Reis (automatisk; settes på ruteplan med neste manuelle ordre)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reise (uten rutetabell)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis (uten rutetabell) med inntil {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis (uten rutetabell) med inntil {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Reise i {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis i {STRING} med inntil {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Reise (i {STRING}, ikke oppsatt i rutetabell)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Reise (i {STRING}, ikke oppsatt i rutetabell) med høyst {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(opphold i {STRING}, ikke oppsatt i rutetabell)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(reise for {STRING}, ikke oppsatt med rutetabell)
-STR_TIMETABLE_STAY_FOR                                          :og bli værende i {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :og reis i {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}og bli værende i {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}og reis i {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Denne rutetabellen vil ta omtrent {STRING} å fullføre
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Det vil ta {STRING} å fullføre rutetabellen
@@ -4896,8 +4900,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Godta
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Velg det merkede skript
-STR_AI_LIST_CANCEL                                              :{BLACK}Avbryt
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ikke endre skriptet
 
 STR_SCREENSHOT_CAPTION                                          :WHITE}Ta skjermbilde
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normalt skjermbilde
@@ -4910,7 +4912,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Oversikt
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}KI-parametere
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Game Script-parametere
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Lukk
 STR_AI_SETTINGS_RESET                                           :{BLACK}Tilbakestill
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5888,6 +5889,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mrd
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}bn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5927,3 +5929,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Åpne merkeinnstillinger
+STR_BADGE_CONFIG_RESET                                          :Nullstill
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Merkeikoner
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Merkefiltre
+STR_BADGE_CONFIG_PREVIEW                                        :Forhåndsvis bilde
+STR_BADGE_CONFIG_NAME                                           :Navn
+STR_BADGE_FILTER_ANY_LABEL                                      :Vilkårlig {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} er {STRING}
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 69fb096499..cd9195a5aa 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -390,7 +390,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Avslutt
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelinstillingar
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Innstillinger
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF-innstillingar
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Gjennomsiktigheitsinnstillingar
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Syne bynamn
@@ -858,8 +857,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spelinns
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaeining
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Vel valutaeining
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valutaeining
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Vel valutaeining
 
 
 ###length 45
@@ -898,21 +898,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Eigendefinert..
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiske Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranske Rial
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisk lagring
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vel intervall for automatisk lagring
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatisk lagring
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vel intervall for automatisk lagring
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Av
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Språk
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vel språk som skal nyttast
+STR_GAME_OPTIONS_LANGUAGE                                       :Språk
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Vel språk som skal nyttast
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullskjerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kryss av i denne boksen for å spele OpenTTD i fullskjermmodus
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullskjerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Kryss av i denne boksen for å spele OpenTTD i fullskjermmodus
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjermoppløysing
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vel skjermoppløysinga som skal nyttast
+STR_GAME_OPTIONS_RESOLUTION                                     :Skjermoppløysing
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Vel skjermoppløysinga som skal nyttast
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :anna
 
 
@@ -925,17 +925,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :anna
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikksett
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vel grafikksett som skal nyttast
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Tilleggsinformasjon om grafikksettet
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Lydsett
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vel lydsett som skal nyttast
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Tilleggsinformasjon om lydsettet
+STR_GAME_OPTIONS_BASE_GRF                                       :Grafikksett
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vel grafikksett som skal nyttast
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Tilleggsinformasjon om grafikksettet
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Musikksett
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vel musikksett som skal nyttast
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Tilleggsinformasjon om musikksettet
+STR_GAME_OPTIONS_BASE_SFX                                       :Lydsett
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vel lydsett som skal nyttast
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Tilleggsinformasjon om lydsettet
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Musikksett
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vel musikksett som skal nyttast
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Tilleggsinformasjon om musikksettet
 
 
 
@@ -1038,11 +1039,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tillatande
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Inga passande AIer tilgjengeleg...{}Du kan lasta ned fleire AI'ar frå nettet med spelets nedlastingssystem.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Innstillingar
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Søkefilter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Utvid alle
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Skjul alle
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Søkefilter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Utvid alle
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Skjul alle
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(inga forklaring tilgjengeleg)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standarverdi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Type innstilling: {ORANGE}{STRING}
@@ -1052,9 +1052,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Spelinnstilling
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Firmainnstilling (lagra med enkeltspel; påverkar berre nye spel)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firmainnstilling (lagra med enkeltspel; påverkar berre noverande firma)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Gjer at lista under berre viser innstillingar som er gjorde om
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Gjer at lista under berre viser innstillingar som er gjorde om
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grunnlegjande instillingar
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avanserte instillingar
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspertinnstillingar / alle innstillingar
@@ -1071,9 +1071,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firma instillin
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ingen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Syn alle søkeresultat ved å setja{}{SILVER}Kategori {BLACK}til {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Syn alle søkeresultat ved å setja{}{SILVER}Type {BLACK}til {WHITE}Alle innstillingar
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Syn alle resultata ved å setja{}{SILVER}Kategori {BLACK}til {WHITE}{STRING} {BLACK}og {SILVER}Type {BLACK}til {WHITE}Alle innstillingar
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Syn alle søkeresultat ved å setja{}{SILVER}Kategori {BLACK}til {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Syn alle søkeresultat ved å setja{}{SILVER}Type {BLACK}til {WHITE}Alle innstillingar
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Syn alle resultata ved å setja{}{SILVER}Kategori {BLACK}til {WHITE}{STRING} {BLACK}og {SILVER}Type {BLACK}til {WHITE}Alle innstillingar
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Av
@@ -1797,7 +1797,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Fordelin
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nytt spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Last inn spel
@@ -1808,11 +1807,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Fleirspe
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spelinnstillingar
 STR_INTRO_HIGHSCORE                                             :{BLACK}Poengtavle
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Innstillingar
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-innstillingar
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Sjå etter innhald på nett
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI-innstillingar
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Spelscript-innstillingar
 STR_INTRO_QUIT                                                  :{BLACK}Avslutt
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start eit nytt spel. CTRL+klikk hoppar over kartkonfigurasjon
@@ -1829,8 +1824,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Vel leik
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Syne spelinstillingar
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Syn poengtavla
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Skjerminnstillingar
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Syne NewGRF-instillingar
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Sjå etter nytt og oppdatert innhald som kan lastas ned
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Avslutt 'OpenTTD'
 
@@ -2490,6 +2483,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vel stor
 STR_FOUND_TOWN_CITY                                             :{BLACK}By
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Storbyar veks raskare enn vanlege byar{}Instillingane avgjer om dei er større når dei vert grunnlagt
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Byars vegløysing:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vel vegløysing nytta for denne byen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orginal
@@ -2825,14 +2819,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Lagre f
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Liste av tilgjengelege førval, vel ein for å kopiera han til same navn nedanfor
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Skriv inn eit namn for førehandsinnstillinga
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Vald namn for førehandsinnstillinga som skal lagrast
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Avbryt
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ikkje endre førehandsinnstillinga
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Lagre
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Lagra førehandsinnstillingane til valt namn
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Endre NewGRF-parametrar
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Lukk
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Nullstill
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Set alle parametrar til standardverdi
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3881,7 +3872,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rutetabe
 STR_TIMETABLE_NO_TRAVEL                                         :Ingen reise
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Reis (automatisk; blir sett på ruteplan med neste manuelle ordre)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (ikkje på rutetabell)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis med maks {2:VELOCITY} (utan rutetabell)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis i {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis i {STRING} med maks {VELOCITY}
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(reis {STRING}, ikkje på rutetabell)
@@ -3990,13 +3980,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Godta
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Merk utheva AI
-STR_AI_LIST_CANCEL                                              :{BLACK}Avbryt
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ikkje endre AI
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Lukk
 STR_AI_SETTINGS_RESET                                           :{BLACK}Tilbakestill
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/persian.txt b/src/lang/persian.txt
index dcc9f9a558..23207a5e9f 100644
--- a/src/lang/persian.txt
+++ b/src/lang/persian.txt
@@ -169,6 +169,7 @@ STR_LITERS                                                      :{COMMA}{NBSP}ل
 STR_ITEMS                                                       :{COMMA}{NBSP}عدد{P "" s}
 STR_CRATES                                                      :{COMMA}{NBSP}صندوق}
 
+STR_COLOUR_DEFAULT                                              :رنگ پیشفرض
 ###length 17
 STR_COLOUR_DARK_BLUE                                            :آبی تیره
 STR_COLOUR_PALE_GREEN                                           :سبز روشن
@@ -180,14 +181,31 @@ STR_COLOUR_GREEN                                                :سبز
 STR_COLOUR_DARK_GREEN                                           :سبز تیره
 STR_COLOUR_BLUE                                                 :آبی
 STR_COLOUR_CREAM                                                :کرم
-STR_COLOUR_MAUVE                                                :بنفش تیره
+STR_COLOUR_MAUVE                                                :بنفش کمرنگ
 STR_COLOUR_PURPLE                                               :بنفش
 STR_COLOUR_ORANGE                                               :نارنجی
 STR_COLOUR_BROWN                                                :قهوه‌ای
 STR_COLOUR_GREY                                                 :خاکستری
 STR_COLOUR_WHITE                                                :سفید
+STR_COLOUR_RANDOM                                               :تصادفی
 
 ###length 17
+STR_COLOUR_SECONDARY_DARK_BLUE                                  :آبی تیره
+STR_COLOUR_SECONDARY_PALE_GREEN                                 :سبز روشن
+STR_COLOUR_SECONDARY_SECONDARY_PINK                             :صورتی
+STR_COLOUR_SECONDARY_YELLOW                                     :زرد
+STR_COLOUR_SECONDARY_RED                                        :قرمز
+STR_COLOUR_SECONDARY_LIGHT_BLUE                                 :آبی روشن
+STR_COLOUR_SECONDARY_GREEN                                      :سبز
+STR_COLOUR_SECONDARY_DARK_GREEN                                 :سبز تیره
+STR_COLOUR_SECONDARY_BLUE                                       :آبی
+STR_COLOUR_SECONDARY_CREAM                                      :کرم
+STR_COLOUR_SECONDARY_MAUVE                                      :بنفش کمرنگ
+STR_COLOUR_SECONDARY_PURPLE                                     :بنفش
+STR_COLOUR_SECONDARY_ORANGE                                     :نارنجی
+STR_COLOUR_SECONDARY_BROWN                                      :قهوه ای
+STR_COLOUR_SECONDARY_GREY                                       :خاکستری
+STR_COLOUR_SECONDARY_WHITE                                      :سفید
 STR_COLOUR_SECONDARY_SAME_AS_PRIMARY                            :همانند اصلی
 
 
@@ -203,6 +221,9 @@ STR_UNITS_POWER_SI                                              :{DECIMAL}{NBSP}
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL                     :{DECIMAL}{NBSP}hp/t
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC                       :{DECIMAL}{NBSP}hp/t
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_SI                           :{DECIMAL}{NBSP}hp/Mg
+STR_UNITS_POWER_METRIC_TO_WEIGHT_IMPERIAL                       :{DECIMAL}{NBSP}hp/t
+STR_UNITS_POWER_METRIC_TO_WEIGHT_METRIC                         :{DECIMAL}{NBSP}hp/t
+STR_UNITS_POWER_METRIC_TO_WEIGHT_SI                             :{DECIMAL}{NBSP}hp/Mg
 
 STR_UNITS_WEIGHT_SHORT_METRIC                                   :{DECIMAL}{NBSP}تن
 STR_UNITS_WEIGHT_SHORT_SI                                       :{DECIMAL}{NBSP}کیلوگرم
@@ -216,14 +237,21 @@ STR_UNITS_VOLUME_SHORT_SI                                       :{DECIMAL}{NBSP}
 STR_UNITS_VOLUME_LONG_METRIC                                    :{DECIMAL}{NBSP}لیتر{P "" s}
 STR_UNITS_VOLUME_LONG_SI                                        :{DECIMAL}{NBSP}متر مکعب
 
+STR_UNITS_FORCE_IMPERIAL                                        :{DECIMAL}{NBSP}lbf
+STR_UNITS_FORCE_METRIC                                          :{DECIMAL}{NBSP}kgf
 STR_UNITS_FORCE_SI                                              :{DECIMAL}{NBSP}کیلو نیوتن
 
 STR_UNITS_HEIGHT_IMPERIAL                                       :{DECIMAL}{NBSP}پا
+STR_UNITS_HEIGHT_METRIC                                         :{DECIMAL}{NBSP}m
 STR_UNITS_HEIGHT_SI                                             :{DECIMAL}{NBSP}متر
 
 # Time units used in string control characters
+STR_UNITS_DAYS                                                  :{COMMA}{NBSP}روز{P "" s}
 
+STR_UNITS_MONTHS                                                :{NUM}{NBSP}ماه{P "" s}
+STR_UNITS_MINUTES                                               :{NUM}{NBSP}دقیقه{P "" s}
 
+STR_UNITS_PERIODS                                               :{NUM}{NBSP}بازه{P "" s}
 
 
 # Common window strings
@@ -299,6 +327,8 @@ STR_SORT_BY_LENGTH                                              :طول
 STR_SORT_BY_LIFE_TIME                                           :عمر مفید باقی مانده
 STR_SORT_BY_TIMETABLE_DELAY                                     :تاخیر جدول زمانی
 STR_SORT_BY_FACILITY                                            :نوع ایستگاه
+STR_SORT_BY_WAITING_TOTAL                                       :کل بار در انتظار
+STR_SORT_BY_WAITING_AVAILABLE                                   :محموله در انتظار موجود است
 STR_SORT_BY_RATING_MAX                                          :حداکثر نرخ محموله
 STR_SORT_BY_RATING_MIN                                          :کمترین نرخ محموله
 STR_SORT_BY_ENGINE_ID                                           :شناسه موتور
@@ -313,6 +343,9 @@ STR_SORT_BY_RANGE                                               :بازه
 STR_SORT_BY_POPULATION                                          :جمعیت
 STR_SORT_BY_RATING                                              :نرخ
 STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR                            :میانگین سود سال گذشته
+STR_SORT_BY_AVERAGE_PROFIT_LAST_PERIOD                          :میانگین سود دوره گذشته
+STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR                            :میانگین سود امسال
+STR_SORT_BY_AVERAGE_PROFIT_THIS_PERIOD                          :میانگین سود این دوره
 
 # Group by options for vehicle list
 
@@ -380,10 +413,19 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :خروج
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :تنظیمات بازی
+STR_SETTINGS_MENU_AI_SETTINGS                                   :تنظیمات هوش مصنوعی
+STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :تنظیمات اسکریپت بازی
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :تنظیمات NewGRF
+STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :گزینه های Sandbox
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :گزینه های شفافیت
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :نام شهرها نشان داده شود
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :نام ایستگاه ها نشان داده شود
+STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :ایستگاهای قطار
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :ایستگاه کامیون
+STR_SETTINGS_MENU_STATION_NAMES_BUS                             :ایستگاه های اتوبوس
+STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :اسکله ها
+STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :فرودگاه ها
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :روح
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :نام محل های انتخابی نمایش داده شده است
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :علامت ها نشان داده شوند
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :نشانه های رقبا و اسامی نمایش داده شده
@@ -459,6 +501,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :تاریخچه
 
 # About menu
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :اطلاعات زمین ها
+STR_ABOUT_MENU_HELP                                             :راهنما و دفترچه‌های راهنما
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :باز و بسته کردن کنسول
 STR_ABOUT_MENU_AI_DEBUG                                         :خطایابی هوش مصنوعی
 STR_ABOUT_MENU_SCREENSHOT                                       :تصویر از بازی
@@ -467,6 +510,7 @@ STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD' در
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :تراز کردن تصویر گرافیکی
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :باز/بسته کردن محدوده جعبه ها
 STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :نمایش/حذف بلوکهای کثیف
+STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES                           :نمایش/عدم نمایش حاشیه ابزارک‌ها
 
 ###length 31
 STR_DAY_NUMBER_1ST                                              :1
@@ -543,6 +587,7 @@ STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}تعدا
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}رتبه بندی راندمان شرکت (رتبه بیشینه = 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}ارزش نقدی شرکت
 
+STR_GRAPH_LAST_72_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}72 دقیقه گذشته
 
 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}مبلغ پرداختی محموله ها
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}مبلغ پرداختی برای 10 واحد (یا 10000لیتر) به ازای 20 مربع
@@ -826,13 +871,20 @@ STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK} {STRING} جدید هم اکنون قابل دسترسی است!  -  {ENGINE}
 
 
+STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST                         :{WHITE}{STATION} اکنون می‌پذیرد: {CARGO_LIST}
 
 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}پیشنهاد یارانه باطل شد:{}{}{STRING} از {STRING} به {STRING} دیگر یارانه ای به همراه نخواهد داشت
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}یارانه بازپس گرفته شد:{}{}{STRING} خدمات از {STRING} به {STRING} دیگر شامل یارانه نمی باشند
+STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}یارانه خدمات پیشنهاد شد:{}{}اولین {STRING} از {STRING} به {STRING} یک یارانه {UNITS_YEARS_OR_MINUTES} از طرف مقامات محلی دریافت خواهد کرد!
 ###length 4
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}یارانه خدمات هدیه داده شد به {STRING}!{}{}{STRING} از {STRING} به {STRING} دو برابر پرداخت میکند برای {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}یارانه خدمات به {STRING} تعلق گرفت!{}{}{STRING} از {STRING} به {STRING} برای {UNITS_YEARS_OR_MINUTES} آینده ۵۰٪ بیشتر پرداخت خواهد کرد!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}یارانه خدمات به {STRING} تعلق گرفت!{}{}{STRING} از {STRING} به {STRING} برای {UNITS_YEARS_OR_MINUTES} آینده دو برابر نرخ پرداخت خواهد کرد!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}یارانه خدمات به {STRING} تعلق گرفت!{}{}{STRING} از {STRING} به {STRING} برای {UNITS_YEARS_OR_MINUTES} آینده سه برابر نرخ پرداخت خواهد کرد!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}یارانه خدمات به {STRING} تعلق گرفت!{}{}{STRING} از {STRING} به {STRING} برای {UNITS_YEARS_OR_MINUTES} آینده چهار برابر نرخ پرداخت خواهد کرد!
 
 STR_NEWS_EXCLUSIVE_RIGHTS_TITLE                                 :{BIG_FONT}{BLACK}حمل و نقل انحصاری!
+STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION_MONTHS                    :{BIG_FONT}{BLACK}مقامات محلی {TOWN} قراردادی را با {STRING} برای ۱۲ ماه حقوق انحصاری حمل و نقل امضا کردند!
+STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION_MINUTES                   :{BIG_FONT}{BLACK}مقامات محلی {TOWN} قراردادی را با {STRING} برای ۱۲ دقیقه حقوق انحصاری حمل و نقل امضا کردند!
 
 # Extra view window
 STR_EXTRA_VIEWPORT_TITLE                                        :{WHITE}نمای اضافه {COMMA}
@@ -845,19 +897,21 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}موقع
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}تنظیمات بازی
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :عمومی
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}تنظیمات عمومی خود را انتخاب کنید
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :تنظیمات عمومی خود را انتخاب کنید
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :گرافیک
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}تنظیمات گرافیکی خود را انتخاب کنید
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :تنظیمات گرافیکی خود را انتخاب کنید
 STR_GAME_OPTIONS_TAB_SOUND                                      :صدا
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}تنظیمات صدا و موسیقی خود را انتخاب کنید
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :تنظیمات صدا و موسیقی خود را انتخاب کنید
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :اجتماعی
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}تنظیمات ادغام اجتماعی خود را انتخاب کنید
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :تنظیمات ادغام اجتماعی خود را انتخاب کنید
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}واحد پول
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}انتخب واحد پول
 
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :واحد های پول
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :انتخاب واحدهای ارزی
+
+STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
 ###length 45
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :پوند
@@ -879,7 +933,7 @@ STR_GAME_OPTIONS_CURRENCY_ISK                                   :کرون ایس
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :لیره ایتالیا
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :گیلدر هلندی
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :کرون نروژ
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :زلتای لهستانی
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :زلوتی لهستان
 STR_GAME_OPTIONS_CURRENCY_RON                                   :لئو رومانیایی
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :روبل روسیه
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :تولار اسلونی
@@ -894,49 +948,75 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :رند آفری
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :دلخواه...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :لیره گرجستان
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :ریال ایران
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :روبل جدید روسیه
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :پزو مکزیک
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :دلار جدید تایوان
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :رنمینبی چینی
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :دلار هنگ کنگ
+STR_GAME_OPTIONS_CURRENCY_INR                                   :روپیه هند
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :روپیه اندونزی
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :رینگیت مالزی
+STR_GAME_OPTIONS_CURRENCY_LVL                                   :لات های لیتوانی
+STR_GAME_OPTIONS_CURRENCY_PTE                                   :اسکودوی پرتغال
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :گریونای اوکراین
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK} ذخیره اتوماتیک
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK} انتخاب فاصله زمانی بین ذخیره کردن های اتوماتیک
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 : ذخیره اتوماتیک
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      : انتخاب فاصله زمانی بین ذخیره کردن های اتوماتیک
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :خاموش
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}زبان
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}زبان واسط کاربری را برای استفاده انتخاب کنید
+STR_GAME_OPTIONS_LANGUAGE                                       :زبان
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :زبان واسط کاربری را برای استفاده انتخاب کنید
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}تمام صفحه
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}برای بازی کردن OpenTTD در حالت تمام صفحه این جعبه را انتخاب کنید
+STR_GAME_OPTIONS_FULLSCREEN                                     :تمام صفحه
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :برای بازی کردن OpenTTD در حالت تمام صفحه این جعبه را انتخاب کنید
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}وضوح تصویر
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}وضوح تصویر دلخواه را انتخاب کنید
+STR_GAME_OPTIONS_RESOLUTION                                     :وضوح تصویر
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :وضوح تصویر دلخواه را انتخاب کنید
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :دیگر
 
 
 
 
 
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :اندازه رابط کاربری
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :لغزنده را بکشید تا اندازه رابط کاربری تنظیم شود. برای تنظیم مداوم، Ctrl+Drag کنید.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :تشخیص خودکار اندازه
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :برای تشخیص خودکار اندازه رابط، این کادر را علامت بزنید
+
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :مقیاس لبه‌ها
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :برای تغییر مقیاس لبه‌ها با اندازه رابط کاربری، این کادر را علامت بزنید.
+
+
+STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
 
 
 
+STR_GAME_OPTIONS_BASE_GRF                                       :بسته گرافیک پایه
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :بسته گرافیک پایه را انتخاب کنید
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   : اطلاعات اضافه در مورد بسته ی گرافیکی پایه
+
+STR_GAME_OPTIONS_BASE_SFX                                       :بسته صدای پایه را انتخاب کنید
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :بسته صدای پایه را انتخاب کنید
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :اطلاعات اضافه درباره بسته ی صدای پایه
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :بسته موسیقی پایه
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :بسته موسیقی پایه را انتخاب کنید
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :اطلاعات اضافه درباره بسته ی موسیقی پایه
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}بسته گرافیک پایه
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}بسته گرافیک پایه را انتخاب کنید
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK} اطلاعات اضافه در مورد بسته ی گرافیکی پایه
-
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}بسته صدای پایه را انتخاب کنید
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}بسته صدای پایه را انتخاب کنید
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}اطلاعات اضافه درباره بسته ی صدای پایه
-
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}بسته موسیقی پایه
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}بسته موسیقی پایه را انتخاب کنید
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}اطلاعات اضافه درباره بسته ی موسیقی پایه
-
-
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(هیچ افزونه‌ای برای ادغام با پلتفرم‌های اجتماعی نصب نشده است)
 
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :پلتفرم:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :وضعیت افزونه:
 
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}مقداردهی اولیه ناموفق بود
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} اجرا نشده
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}افزونه تکراری.
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_INVALID_SIGNATURE          :{RED}امضای نامعتبر
 
 
 STR_ERROR_RESOLUTION_LIST_FAILED                                :{WHITE}ناتوان در گرفتن تنظیمات نمایش
@@ -950,6 +1030,7 @@ STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}کم ک
 STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}زیاد کردن ارزش واحد پول در ازای یک پوند (£)
 STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}نرخ ارز واحد پول را در ازای یک پوند تنظیم کنید (£)
 
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}جداکننده را برای واحد پول خود تنظیم کنید
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}پیشوند: {ORANGE}{STRING}
 STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}پیشوند واحد پولتان را انتخاب کنید
@@ -1026,6 +1107,9 @@ STR_TERRAIN_TYPE_VERY_FLAT                                      :بسیار یک
 STR_TERRAIN_TYPE_FLAT                                           :یکدست
 STR_TERRAIN_TYPE_HILLY                                          :تپه مانند
 STR_TERRAIN_TYPE_MOUNTAINOUS                                    :کوه مانند
+STR_TERRAIN_TYPE_ALPINIST                                       :فوق کوهستانی ( alpinist )
+STR_TERRAIN_TYPE_CUSTOM                                         :ارتفاع سفارشی
+STR_TERRAIN_TYPE_CUSTOM_VALUE                                   :ارتفاع سفارشی  ({NUM})
 
 ###length 4
 STR_CITY_APPROVAL_TOLERANT                                      :سخت گیر
@@ -1034,10 +1118,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :آسان گیر
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}هیچ بسته هوش مصنوعی موجود نیست...{}شما می توانید چندین بسته هوش مصنوعی(AI) را از قسمت محتویات برخط بارگیری کنید
 
-# Settings tree window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}متن فیلتر:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}نمایش همه
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}جمع کردن همه
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :متن فیلتر:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :نمایش همه
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :جمع کردن همه
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(بدون شرح)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}مقدار پیش فرض: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}نوع تنظیمات: {ORANGE}{STRING}
@@ -1045,9 +1129,10 @@ STR_CONFIG_SETTING_TYPE_CLIENT                                  :تنظیمات
 STR_CONFIG_SETTING_TYPE_GAME_MENU                               :تنظیمات بازی ( در ذخیره سازیها اعمال میشود و بر بازیهای جدید موثر است)
 STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :تنظیمات بازی ( در ذخیره سازی اعمال میشود و فقط در بازی فعلی تاثیر دارد)
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :تنظیمات شرکت ( در ذخیره سازی ها اعمال میشود و در بازی فعلی موثر است)
+STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}این عمل تمام تنظیمات بازی را به مقادیر پیش‌فرض بازنشانی می‌کند.{}آیا مطمئن هستید که می‌خواهید ادامه دهید؟
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}دسته بندی:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}نوع:
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :دسته بندی:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :نوع:
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :تنظیمات پایه
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :تنظیمات پیشرفته
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :تنظیمات حرفه ای/ همه تنظیمات
@@ -1058,9 +1143,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL                            :تمام انو
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- هیچ -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}نمایش تمام نتایج با تنظیم{}{SILVER}دسته بندی {BLACK}به {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}نمایش تمام نتایج با تنظیم{}{SILVER}نوع{BLACK}به {WHITE}تمام انواع تنظیم
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}نمایش تمام نتایج با تنظیم{}{SILVER}دسته بندی {BLACK}به {WHITE}{STRING} {BLACK}و {SILVER}نوع {BLACK}به {WHITE}تمام انواع
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :نمایش تمام نتایج با تنظیم{}{SILVER}دسته بندی {BLACK}به {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :نمایش تمام نتایج با تنظیم{}{SILVER}نوع{BLACK}به {WHITE}تمام انواع تنظیم
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :نمایش تمام نتایج با تنظیم{}{SILVER}دسته بندی {BLACK}به {WHITE}{STRING} {BLACK}و {SILVER}نوع {BLACK}به {WHITE}تمام انواع
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :خاموش
@@ -1114,6 +1199,8 @@ STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :اجازه مح
 
 STR_CONFIG_SETTING_CATCHMENT                                    :واقع بینانه تر شدن اندازه حوضه آبریز: {STRING}
 
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :ایستگاه‌های شرکتی می‌توانند به صنایعی که ایستگاه‌های خنثی متصل دارند، خدمات ارائه دهند: {STRING}
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :وقتی فعال باشد، صنایع دارای ایستگاه‌های متصل (مانند سکوهای نفتی) ممکن است توسط ایستگاه‌های متعلق به شرکت که در نزدیکی ساخته شده‌اند نیز سرویس‌دهی شوند. وقتی غیرفعال باشد، این صنایع فقط توسط ایستگاه‌های متصل خود سرویس‌دهی می‌شوند. هیچ ایستگاه شرکتی مجاور قادر به سرویس‌دهی به آن‌ها نخواهد بود، و همچنین ایستگاه متصل به هیچ چیز دیگری غیر از صنعت سرویس‌دهی نخواهد کرد.
 
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :اجازه برای داشتن قابلیت بیشتر ازبین بردن راه ها،پلها و تونل های شهر: {STRING}
 
@@ -1136,7 +1223,10 @@ STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :قابلیت ا
 STR_CONFIG_SETTING_INFLATION                                    :تورم: {STRING}
 
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :حداکثر طول پل: {STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :حداکثر طول برای ساخت پل
 
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :حداکثر ارتفاع پل: {STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT                   :حداکثر ارتفاع برای ساخت پل
 
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :حداکثر طول تونل: {STRING}
 
@@ -1158,8 +1248,11 @@ STR_CONFIG_SETTING_SIGNALSIDE_RIGHT                             :به سمت ر
 
 ###length 2
 STR_CONFIG_SETTING_SHOWFINANCES                                 :نمایش پنجره مالی در پایان سال: {STRING}
+STR_CONFIG_SETTING_SHOWFINANCES_PERIOD                          :نمایش پنجره امور مالی در پایان دوره: {STRING}
 
 ###length 2
+STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :اگر فعال شود، پنجره‌ی مالی در پایان هر سال برای بررسی آسان وضعیت مالی شرکت باز خواهد شد.
+STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT_PERIOD                 :اگر فعال شود، پنجره‌ی مالی در پایان هر دوره برای بررسی آسان وضعیت مالی شرکت باز خواهد شد.
 
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :برنامه های حرکت به طور پیش فرض «بدون توقف» باشند: {STRING}
 
@@ -1177,18 +1270,26 @@ STR_CONFIG_SETTING_BRIBE                                        :قابلیت ر
 
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :قابلیت انحصاری کردن حقوق حمل و نقل: {STRING}
 ###length 2
-STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT                     :اگز یک شرکت حقوق انحصاری حمل و نقل یک شهر را بخرد، ایستگاه های دیگر بازیکنان(از جمله مسافربری و باربری) دیگر هیچگونه باری را طی یکسال قبول نمی کنند
+STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT                     :اگر شرکتی حقوق انحصاری حمل و نقل برای یک شهر را بخرد، ایستگاه‌های (مسافری و باری) رقبای آن به مدت دوازده ماه هیچ باری دریافت نخواهند کرد.
+STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT_MINUTES             :اگر شرکتی حقوق انحصاری حمل و نقل برای یک شهر را بخرد، ایستگاه‌های (مسافری و باری) رقبای آن به مدت دوازده دقیقه هیچ باری دریافت نخواهند کرد.
 
 STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :اجازه ساخت و ساز ساختمان: {STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT                :اجازه دادن به شرکت‌ها برای دادن پول به شهرها جهت تأمین مالی خانه‌های جدید.
 
 STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :قابلیت بازسازی خیابان‌های شهر: {STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT                     :اجازه دادن به شرکت‌ها برای دادن پول به شهرها جهت بازسازی جاده‌ها برای خرابکاری در خدمات مبتنی بر جاده در شهر.
 
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :قابلیت فرستادن پول به بقیه شرکت‌ها: {STRING}
+STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT                    :اجازه دادن به انتقال پول بین شرکت‌ها در حالت چندنفره.
 
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :مضرب برای بار قطار تا حس قطار سنگین به وجود آید: {STRING}
 
+STR_CONFIG_SETTING_PLANE_SPEED                                  :ضریب سرعت هواپیما: {STRING}
+STR_CONFIG_SETTING_PLANE_SPEED_HELPTEXT                         :سرعت نسبی هواپیماها را در مقایسه با سایر وسایل نقلیه تنظیم کنید تا میزان درآمد حاصل از حمل و نقل هوایی کاهش یابد.
+STR_CONFIG_SETTING_PLANE_SPEED_VALUE                            :1 / {COMMA}
 
 STR_CONFIG_SETTING_PLANE_CRASHES                                :تعداد سوانح هوایی: {STRING}
+STR_CONFIG_SETTING_PLANE_CRASHES_HELPTEXT                       :احتمال وقوع تصادف تصادفی هواپیما را تنظیم کنید.{}* هواپیماهای بزرگ همیشه هنگام فرود در فرودگاه‌های کوچک خطر سقوط دارند.
 ###length 3
 STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :هیچکدام
 STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :کاهش
@@ -1222,11 +1323,17 @@ STR_CONFIG_SETTING_WARN_INCOME_LESS                             :هشدار هن
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :وسایل نقلیه هیچگاه از بین نروند: {STRING}
 
+STR_CONFIG_SETTING_TIMEKEEPING_UNITS                            :زمان سنجی: {STRING}
+STR_CONFIG_SETTING_TIMEKEEPING_UNITS_HELPTEXT                   :واحدهای زمان‌بندی بازی را انتخاب کنید. این مورد بعداً قابل تغییر نیست.حالت مبتنی بر تقویم، تجربه‌ی کلاسیک OpenTTD است، با سالی متشکل از 12 ماه، و هر ماه دارای 28 تا 31 روز.در زمان‌بندی مبتنی بر ساعت دیواری، تولید بار و امور مالی به جای آن بر اساس افزایش‌های یک دقیقه‌ای است، که تقریباً به اندازه‌ی یک ماه 30 روزه در حالت مبتنی بر تقویم طول می‌کشد. این‌ها در دوره‌های 12 دقیقه‌ای گروه‌بندی می‌شوند، که معادل یک سال در حالت مبتنی بر تقویم است.در هر دو حالت، همیشه یک تقویم کلاسیک وجود دارد که برای تاریخ‌های معرفی وسایل نقلیه، خانه‌ها و سایر زیرساخت‌ها استفاده می‌شود.
 ###length 2
+STR_CONFIG_SETTING_TIMEKEEPING_UNITS_CALENDAR                   :تقویم
+STR_CONFIG_SETTING_TIMEKEEPING_UNITS_WALLCLOCK                  :ساعت دیواری
 
 
 ###setting-zero-is-special
 
+STR_CONFIG_SETTING_TOWN_CARGO_SCALE                             :مقیاس تولید بار شهر: {STRING}
+STR_CONFIG_SETTING_TOWN_CARGO_SCALE_HELPTEXT                    :تولید بار شهرها را با این درصد مقیاس کنید.
 
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :نوکردن خودکار وسایل نقلیه کهنه شده: {STRING}
 
@@ -1315,7 +1422,11 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :سبز
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :سبز تیره
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :بنفش
 
+STR_CONFIG_SETTING_LINKGRAPH_COLOURS                            :رنگ‌های پوشش جریان بار: {STRING}
 ###length 4
+STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED               :سبز به قرمز (اصلی)
+STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE              :سبز به آبی
+STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE                  :مقیاس خاکستری
 
 ###length 4
 
@@ -1331,6 +1442,7 @@ STR_CONFIG_SETTING_LIVERIES_OWN                                 :شرکت خود
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :همه شرکت‌ها
 
 STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :ترجیح برای چت با تیمِ «Enter»: {STRING}
+STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT                     :ارتباط داخلی شرکت و چت عمومی را به <ENTER> و <Ctrl+ENTER> به ترتیب تغییر دهید.
 
 STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :سرعت حرکت نقشه با چرخاندن غلطک ماوس: {STRING}
 
@@ -1350,7 +1462,12 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :دستور+کل
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :کنترل+کلیک
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :خاموش
 
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE                        :بستن پنجره با کلیک راست: {STRING}
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :با کلیک راست در داخل پنجره، آن را می‌بندد. راهنمای ابزار را با کلیک راست غیرفعال می‌کند!
 ###length 3
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_NO                     :نه
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES                    :بله
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES_EXCEPT_STICKY      :بله، به جز چسبناک
 
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :از این {STRING} برای نام فایل‌های ذخیره استفاده کن
 ###length 3
@@ -1417,14 +1534,19 @@ STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :بیشترین
 STR_CONFIG_SETTING_MAX_SHIPS                                    :بیشترین تعداد کشتی یک شرکت : {STRING}
 
 STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :غیرفعال بودن قطار برای رایانه: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT                    :فعال کردن این تنظیم، ساخت قطارها را برای بازیکن رایانه غیرممکن می‌کند.
 
 STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :غیر فعال بودن خودروی‌جاده‌ای برای رایانه: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT             :فعال کردن این تنظیم، ساخت وسایل نقلیه جاده‌ای را برای یک بازیکن کامپیوتری غیرممکن می‌کند.
 
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :غیر‌فعال بودن هواپیما برای رایانه: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT                  :فعال کردن این تنظیم، ساخت هواپیما را برای بازیکن کامپیوتری غیرممکن می‌کند.
 
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :غیر فعال بودن کشتی برای رایانه: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT                     :فعال کردن این تنظیم، ساخت کشتی‌ها را برای بازیکن رایانه غیرممکن می‌کند.
 
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :امکان حضور هوش مصنوعی در بازی چندنفره: {STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :اجازه دادن به بازیکنان رایانه‌ای هوش مصنوعی برای شرکت در بازی‌های چندنفره.
 
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :#opcodes before scripts are suspended: {STRING}
 
@@ -1506,6 +1628,7 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :اتفاقی
 
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :قابلیت ساخت راه‌ توسط شهرها: {STRING}
 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :امکان ساخته شدن شهر در محل ناهموار: {STRING}
+STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :فعال کردن این تنظیم به شهرها اجازه می‌دهد تا گذرگاه‌های همسطح بسازند.
 
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :قابلیت کنترل سطح صدای فرودگاه‌ها توسط شهر: {STRING}
 
@@ -1517,7 +1640,11 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :آزاد و ب
 
 ###length 3
 
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :تولید بار شهری: {STRING}
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :میزان تولید بار توسط خانه‌ها در شهرها، نسبت به کل جمعیت شهر.{}رشد درجه دوم: شهری با دو برابر اندازه، چهار برابر مسافر تولید می‌کند.{}رشد خطی: شهری با دو برابر اندازه، دو برابر مسافر تولید می‌کند.
 ###length 2
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :درجه دوم (اصلی)
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :خطی
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :محل قرارگرفتن درخت‌ها: {STRING}
 ###length 4
@@ -1529,7 +1656,9 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :بیشترین
 ###setting-zero-is-special
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :بیشترین حد زوم به درون: {STRING}
+STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :حداکثر سطح بزرگنمایی برای نمایه‌ها. توجه داشته باشید که فعال کردن سطوح بزرگنمایی بالاتر، نیاز به حافظه را افزایش می‌دهد.
 STR_CONFIG_SETTING_ZOOM_MAX                                     :بیشترین حد زوم به بیرون: {STRING}
+STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT                            :حداکثر سطح بزرگنمایی برای نمایه‌ها. سطوح بزرگنمایی بالاتر ممکن است هنگام استفاده باعث تأخیر شوند.
 ###length 6
 STR_CONFIG_SETTING_ZOOM_LVL_MIN                                 :4x
 STR_CONFIG_SETTING_ZOOM_LVL_IN_2X                               :2x
@@ -1548,12 +1677,17 @@ STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :عادی
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :تند
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :بسیار تند
 
+STR_CONFIG_SETTING_LARGER_TOWNS                                 :نسبت شهرهایی که شهر بزرگ خواهند شد: {STRING}
+STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT                        :میزان شهرهایی که به شهر بزرگ تبدیل خواهند شد، بنابراین شهری که بزرگتر شروع می‌کند و سریعتر رشد می‌کند.
 ###setting-zero-is-special
+STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :هیچکدام
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :مضرب ابتدایی اندازه شهرستان: {STRING}
 
 
 ###length 3
 
+STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :دقت توزیع: {STRING}
+STR_CONFIG_SETTING_LINKGRAPH_ACCURACY_HELPTEXT                  :هرچه این مقدار را بالاتر تنظیم کنید، زمان CPU بیشتری برای محاسبه نمودار پیوند صرف خواهد شد. اگر این فرآیند خیلی طول بکشد، ممکن است متوجه تأخیر شوید. با این حال، اگر آن را روی مقدار پایینی تنظیم کنید، توزیع نادرست خواهد بود و ممکن است متوجه شوید که بار به مکان‌هایی که انتظار دارید نمی‌رود.
 
 
 
@@ -1594,10 +1728,14 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :متریک (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :متر (m)
 
 STR_CONFIG_SETTING_LOCALISATION                                 :بومی سازی
+STR_CONFIG_SETTING_SOUND                                        :صدا
 STR_CONFIG_SETTING_INTERFACE                                    :واسط کاربری
 STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :ساخت و ساز
+STR_CONFIG_SETTING_ADVISORS                                     :اخبار / مشاوران
+STR_CONFIG_SETTING_ACCOUNTING                                   :حسابداری
 STR_CONFIG_SETTING_VEHICLES                                     :وسایل نقلیه
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :مسیریابی
+STR_CONFIG_SETTING_ACCIDENTS                                    :بلایا / حوادث
 STR_CONFIG_SETTING_ENVIRONMENT                                  :محیط زیست
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :مقامات
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :شهرها
@@ -1607,6 +1745,7 @@ STR_CONFIG_SETTING_AI                                           :رقیبان
 STR_CONFIG_SETTING_AI_NPC                                       :بازیگران رایانه
 
 STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :برگشت خودکار با رسیدن به نشانه ها: {STRING}
+STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT                  :اگر قطارها مدت زیادی منتظر مانده باشند، اجازه دهید با علامت دنده عقب بروند
 
 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}تغییر مقدار
 
@@ -1628,7 +1767,7 @@ STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... قا
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
 
 STR_INTRO_NEW_GAME                                              :{BLACK}بازی جدید
 STR_INTRO_LOAD_GAME                                             :{BLACK}بارگذاری بازی های ذخیره شده
@@ -1638,7 +1777,6 @@ STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}ساخت
 STR_INTRO_MULTIPLAYER                                           :{BLACK}بازی چند نفره
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}تنضیمات بازی
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}تنظیمات NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}چک کردن محتوی آنلاین
 STR_INTRO_QUIT                                                  :{BLACK}خروج
 
@@ -1656,7 +1794,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}انتخ
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}نشان دادن تنظیمات بازی
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}نمایش جدول بالاترین امتیازات
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}نمایش تنظیمات NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}بررسی وجود مجموعه ها و به روز رسانی های جدید در اینترنت
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK} خروج از 'OpenTTD'
 
@@ -1693,9 +1830,11 @@ STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}نمای
 STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}نمایش طرح رنگهای خودروی جاده ای
 STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}نمایش طرح رنگهای کشتی
 STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}نمایش طرح رنگهای هواپیما
+STR_LIVERY_AIRCRAFT_GROUP_TOOLTIP                               :{BLACK}نمایش رنگ گروه‌های هواپیما
 STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}انتخاب رنگ اولیه برای طرح انتخابی، Ctrl+Click این رنگ را برای تمام طرح ها تغییر می دهد.
 STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}انتخاب رنگ دوم برای طرح انتخابی، Ctrl+Click رنگ را برای تمام طرح ها تغییر می دهد.
 STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}طرح رنگ را تغییر دهید ، یا طرح های متعدد را با کنترل + کلیک انتخاب کنید.استفاده از طرح را با کلیک بر روی جعبه انتخاب مشخص کنید
+STR_LIVERY_AIRCRAFT_GROUP_EMPTY                                 :هیچ گروه هواپیمایی تنظیم نشده است.
 
 ###length 23
 STR_LIVERY_DEFAULT                                              :طرح استاندارد
@@ -1836,6 +1975,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}بازی
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}ثبت رمز
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}اگر بازی برای استفاده همگان نیست، بازی خود را با رمز محافظت کنید
 
+STR_NETWORK_START_SERVER_VISIBILITY_LABEL                       :{BLACK}قابلیت مشاهده:
+STR_NETWORK_START_SERVER_VISIBILITY_TOOLTIP                     :{BLACK}اینکه آیا افراد دیگر می‌توانند سرور شما را در فهرست عمومی ببینند یا خیر.
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} سرویس گیرنده
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}بیشترین تعداد سرویس گیرنده:
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}بیشترین تعداد سرویس گیرنده را مشخص کنید.لازم نیست دقیقا به تعداد نفرات باشد
@@ -1870,16 +2011,42 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}سروی
 STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}لیست سرویس گیرنده ها
 
 # Network client list
+STR_NETWORK_CLIENT_LIST_SERVER                                  :{BLACK}سرور
+STR_NETWORK_CLIENT_LIST_SERVER_NAME                             :{BLACK}اسم
+STR_NETWORK_CLIENT_LIST_SERVER_INVITE_CODE                      :{BLACK}کد دعوت
+STR_NETWORK_CLIENT_LIST_SERVER_INVITE_CODE_TOOLTIP              :{BLACK}کد دعوتی که سایر بازیکنان می‌توانند برای پیوستن به این سرور استفاده کنند
+STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP                    :{BLACK}اقدامات مدیریتی که باید برای این مشتری انجام شود.
+STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP                   :{BLACK}اقدامات مدیریتی که باید برای این شرکت انجام شود.
+STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP                     :{BLACK}یک پیام به این بازیکن بده
+STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP                    :{BLACK}ارسال پیام به تمام بازیکنان این شرکت
+STR_NETWORK_CLIENT_LIST_CHAT_SPECTATOR_TOOLTIP                  :{BLACK} ارسال پیام به همه تماشاگران
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP                :{BLACK}این شمایید
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_HOST_TOOLTIP                :{BLACK}این شخص میزبان بازی است
 
 # Matches ConnectionType
 ###length 5
 
+STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_KICK                       :اخراج
+STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_BAN                        :مسدود کنید
+STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_RESET                     :حذف کردن
 
+STR_NETWORK_CLIENT_LIST_ASK_CAPTION                             :{WHITE}اقدام مدیر
+STR_NETWORK_CLIENT_LIST_ASK_CLIENT_KICK                         :{YELLOW}آیا مطمئنید که می‌خواهید بازیکن '{STRING}' را اخراج کنید؟
+STR_NETWORK_CLIENT_LIST_ASK_CLIENT_BAN                          :{YELLOW}آیا مطمئنید که می‌خواهید بازیکن '{STRING}' را مسدود کنید؟
 STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET                       :{YELLOW}آیا از حذف شرکت «{COMPANY}» مطمئنید؟
 
+STR_NETWORK_ASK_RELAY_CAPTION                                   :{WHITE} از رله استفاده می‌کنید؟
+STR_NETWORK_ASK_RELAY_TEXT                                      :{YELLOW}برقراری ارتباط بین شما و سرور '{STRING}' با شکست مواجه شد.{}آیا می‌خواهید این جلسه را از طریق '{STRING}' رله کنید؟
+STR_NETWORK_ASK_RELAY_NO                                        :{BLACK}نه
+STR_NETWORK_ASK_RELAY_YES_ONCE                                  :{BLACK}بله، همین یک بار
+STR_NETWORK_ASK_RELAY_YES_ALWAYS                                :{BLACK}بله، دوباره نپرس
 
+STR_NETWORK_ASK_SURVEY_CAPTION                                  :در نظرسنجی خودکار شرکت کنید؟
+STR_NETWORK_ASK_SURVEY_TEXT                                     :آیا مایل به شرکت در نظرسنجی خودکار هستید؟{}OpenTTD هنگام خروج از بازی یک نظرسنجی ارسال خواهد کرد.{}شما می‌توانید این تنظیمات را در هر زمان در بخش "گزینه‌های بازی" تغییر دهید.
+STR_NETWORK_ASK_SURVEY_PREVIEW                                  :پیش‌نمایش نتیجه نظرسنجی
+STR_NETWORK_ASK_SURVEY_LINK                                     :درباره نظرسنجی و حریم خصوصی
+STR_NETWORK_ASK_SURVEY_NO                                       :نه
+STR_NETWORK_ASK_SURVEY_YES                                      :بله
 
 STR_NETWORK_SPECTATORS                                          :تماشاگران
 
@@ -1946,6 +2113,7 @@ STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :هیچ گذرو
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :خطای کلی طول کشیدن زمان بیش از حد
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :بارگیری نقشه بیش از حد طول کشید
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :پردازش نقشه بیش از حد طول کشید
+STR_NETWORK_ERROR_CLIENT_INVALID_CLIENT_NAME                    :نام کاربری نامعتبر است.
 
 # Network related errors
 STR_NETWORK_SERVER_MESSAGE                                      :*** {STRING}
@@ -1965,6 +2133,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT              :کد بازی
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :می رود
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} به بازی پیوست
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} به بازی پیوست (سرویس گیرنده #{NUM})
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} به {STRING} پیوست.
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} به تماشاچیان پیوست
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} یک شرکت جدید آغاز کرد (#{NUM})
 STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} از بازی بیرون رفت ({STRING})
@@ -2128,10 +2297,35 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}انتخ
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}بکشید و بیاندازید
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}ساخت ایستگاه با استفاده از کشیدن و انداختن
 
+STR_PICKER_MODE_ALL                                             :همه
+STR_PICKER_MODE_ALL_TOOLTIP                                     :نمایش موارد از تمام کلاس‌ها را تغییر دهید.
+STR_PICKER_MODE_USED                                            :استفاده شده
+STR_PICKER_MODE_USED_TOOLTIP                                    :فعال / غیرفعال کردن نمایش فقط موارد موجود
+STR_PICKER_MODE_SAVED                                           :ذخیره شده
+STR_PICKER_MODE_SAVED_TOOLTIP                                   :فعال / غیرفعال کردن نمایش فقط موارد ذخیر شده
 
 
+STR_HOUSE_PICKER_CAPTION                                        :انتخاب خانه
+STR_HOUSE_PICKER_NAME                                           :{BLACK}نام: {ORANGE}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}جمعیت: {ORANGE}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}سال ها: {ORANGE}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}سال‌ها: {ORANGE}هر سالی
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}سال‌ها: {ORANGE}از {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}سال‌ها: {ORANGE}تا {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}اندازه: {ORANGE}{NUM}x{NUM} کاشی
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}محموله پذیرفته شد: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}محموله تولید شده: {ORANGE}{CARGO_LIST}
 
+STR_HOUSE_PICKER_CLASS_ZONE1                                    :لبه
+STR_HOUSE_PICKER_CLASS_ZONE2                                    :حومه شهر
+STR_HOUSE_PICKER_CLASS_ZONE3                                    :حومه‌های بیرونی
+STR_HOUSE_PICKER_CLASS_ZONE4                                    :حومه‌های داخلی
+STR_HOUSE_PICKER_CLASS_ZONE5                                    :مرکز شهر
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :جلوگیری از ارتقا
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :انتخاب کنید که آیا این خانه با رشد شهر از جایگزینی در امان خواهد بود یا خیر
+STR_HOUSE_PICKER_PROTECT_OFF                                    :خاموش
+STR_HOUSE_PICKER_PROTECT_ON                                     :روشن
 
 STR_STATION_CLASS_DFLT                                          :ایستگاه پیش فرض
 STR_STATION_CLASS_WAYP                                          :نقطه مسیر ها
@@ -2159,6 +2353,10 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}زیاد
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}انتخب پل راه آهن
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}ساخت پل ماشین رو
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK} ساخت پل - بر روی پل مورد نظر خود کلیک کنید تا ساخته شود
+STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
+STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED                           :{GOLD}{STRING},{} {VELOCITY}
+STR_SELECT_BRIDGE_INFO_NAME_COST                                :{GOLD}{STRING},{} {WHITE}{CURRENCY_LONG}
+STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST                      :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :معلق، فولادی
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :پیوسته، فولادی
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :پایه دار، فولادی
@@ -2178,6 +2376,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}بخش 
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}بخش ساخت ریل تراموا با روش ریل خودکار.گرفتن دکمه کنترل برای حذف ریل. گرفتن دکمه شیفت برآورد هزینه را نمایش می دهد
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}ساخت گاراژ خودرو (برای خرید و بازبینی خودروها). گرفتن دکمه شیفت برآورد هزینه را نمایش می دهد
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}ساخت گاراژ تراموا (برای خرید و بازبینی تراموا). گرفتن دکمه شیفت برآورد هزینه را نمایش می دهد
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT               :{BLACK}ساختن نقطه میانی روی جاده. Ctrl+Click برای انتخاب نقطه میانی دیگر جهت اتصال. همچنین برای نمایش فقط تخمین هزینه، کلید Shift را فشار دهید.
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}ساخت ایستگاه اتوبوس. دکمه ctrl اجازه ساخت ایستگاه پراکنده را میدهد و دکمه shift هزینه تقریبی ساخت را نمایش میدهد
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}ساخت ایستگاه تراموای مسافربری.گرفتن دکمه کنترل ایستگاه ها را به هم می پیوندد. گرفتن دکمه شیفت برآورد هزینه را نمایش می دهد
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}ساخت ایستگاه بارگیری/تخلیه بار کامیون. دکمه ctrl اجازه ساخت ایستگاه پراکنده را میدهد و دکمه shift هزینه تقریبی ساخت را نمایش میدهد.
@@ -2189,6 +2388,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}ساخت
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}ساخت تونل تراموا.دکمه شیفت برآورد قیمت را نشان می دهد
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK} تغییر بین ساخت/حذف جاده
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}تغییر حالت بین ساخت/جذف برای ساخت و ساز تراموا
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}تغییر نوع/ارتقاء نوع جاده. همچنین برای نمایش فقط تخمین هزینه، کلید Shift را فشار دهید.
 
 
 # Road depot construction window
@@ -2320,6 +2520,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}انتخ
 STR_FOUND_TOWN_CITY                                             :{BLACK}شهر
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}شهرها از شهرستان های معمولی سریعتر رشد می کنند{}بسته به تنظیمات، موقع ساختن بزرگتر از شهرستان ها هستند
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}نمای خیابان های شهر:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}نمای خیابان ها را برای این شهر انتخاب کنید
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}اصلی
@@ -2353,9 +2554,11 @@ STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP                    :{BLACK}انتخ
 STR_INDUSTRY_CARGOES_SELECT_CARGO                               :{BLACK}محموله را انتخاب کنید
 STR_INDUSTRY_CARGOES_SELECT_CARGO_TOOLTIP                       :{BLACK}محموله ای که میخواهید نشان داده شود را انتخاب کنید
 STR_INDUSTRY_CARGOES_SELECT_INDUSTRY                            :{BLACK}صنعت موردنظر را انتخاب کنید
+STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP                    :{BLACK}صنعتی را که می‌خواهید نمایش دهید انتخاب کنید
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}اطلاعات زمین
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP                      :{BLACK}نمای اصلی را در موقعیت کاشی متمرکز کنید. برای باز کردن یک نمای جدید در موقعیت کاشی، Ctrl+Click کنید.
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}هزینه پاک کردن: {LTBLUE}0
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}هزینه پاک کردن: {RED}{CURRENCY_LONG}
 STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}درآمد زمان پاکسازی: {LTBLUE}{CURRENCY_LONG}
@@ -2367,6 +2570,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}مالک
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}فرماندار محلی: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :هیچکدام
 STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordinates: {LTBLUE}{NUM} x {NUM} x {NUM}
+STR_LAND_AREA_INFORMATION_LANDINFO_INDEX                        :{BLACK}شناسه کاشی (قطعه) : {LTBLUE}{NUM} ({HEX})
 STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}ساخته شده در: {LTBLUE}{DATE_LONG}
 STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}کلاس ایستگاه: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}نوع ایستگاه: {LTBLUE}{STRING}
@@ -2378,6 +2582,8 @@ STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}محمو
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}حد سرعت ریل: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}حداکثر سرعت جاده ای: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}شهر می‌تواند ارتقا پیدا کند: {LTBLUE}بله
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}شهر می‌تواند ارتقا پیدا کند: {LTBLUE}خیر
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :صخره
@@ -2476,12 +2682,48 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-{STRING} The OpenTTD team
 
 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :{WHITE}نرخ فریم
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}نرخ شبیه‌سازی: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}تعداد تیک‌های بازی شبیه‌سازی شده در هر ثانیه
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}نرخ فریم گرافیک: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}تعداد فریم‌های ویدیویی رندر شده در هر ثانیه
+STR_FRAMERATE_CURRENT                                           :{WHITE}فعلی
+STR_FRAMERATE_AVERAGE                                           :{WHITE}میانگین
 STR_FRAMERATE_MEMORYUSE                                         :{WHITE}حافظه
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}داده‌ها بر اساس {COMMA} اندازه‌گیری‌ها
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
 STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} فریم در ثانیه
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} فریم در ثانیه
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} فریم در ثانیه
+STR_FRAMERATE_BYTES_GOOD                                        :{LTBLUE}{BYTES}
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
+STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 
 ###length 15
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}مجموع حلقه بازی:
+STR_FRAMERATE_GL_ECONOMY                                        :{BLACK}  جابجایی بار:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  تیک قطار ها:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  تیک وسایل نقلیه جاده ای:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  تیک کشتی ها:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}تیک‌های هواپیما:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}تیک‌های جهان:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}تأخیر گراف پیوند:
+STR_FRAMERATE_DRAWING                                           :{BLACK}پردازش گرافیکی:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK} ویو پورت های جهان:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK} مجموع GS/AI:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK} اسکریپت بازی:
+STR_FRAMERATE_AI                                                :{BLACK} هوش مصنوعی {NUM} {STRING}
 
 ###length 15
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :حلقه بازی
+STR_FRAMETIME_CAPTION_DRAWING                                   :پردازش گرافیکی
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :رندرینگ نمای جهانی
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :مجموع اسکریپت‌های GS/AI
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :اسکریپت بازی
+STR_FRAMETIME_CAPTION_AI                                        :هوش مصنوعی {NUM} {STRING}
 
 
 # Save/load game/scenario
@@ -2572,6 +2814,7 @@ STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}زمین
 STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}یک زمین تخت بساز
 STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}زمین تصادفی
 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}ارتفاع زمین تخت:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_TOOLTIP                         :{BLACK}ارتفاع زمین بالاتر از سطح دریا را انتخاب کنید.
 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN_TOOLTIP                    :{BLACK}کم کردن بک واحد از ارتفاع زمین تخت
 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP_TOOLTIP                      :{BLACK}اضافه کردن بک واحد به ارتفاع زمین تخت
 
@@ -2594,7 +2837,9 @@ STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}اجرا
 STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}کدهای در حال اجرا
 STR_GENERATION_PREPARING_GAME                                   :{BLACK}آماده سازی بازی
 
+STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}فرمت مختصات {STRING} نادرست است، باید عددی بین 0 تا 1 به عنوان نسبتی از ابعاد کل ارتفاع‌نگاشت باشد.
 
+STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}مکان معتبری برای تأسیس {NUM} شهر پیدا نشد. به جای آن، در مکان مورد نظر  {P "a " ""} تابلو{P "" s} ایجاد شد.
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}تنظیمات NewGRF
@@ -2649,14 +2894,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}ذخیر
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}لیست های موجود،برای کپی یکی را انتخاب کنید
 STR_SAVE_PRESET_TITLE                                           :{BLACK}یک نام برای لیست وارد کنید
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}لیست انتخاب شده برای ذخیره
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}لغو
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}تغییر ندادن لیست
 STR_SAVE_PRESET_SAVE                                            :{BLACK}ذخیره
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}ذخیره لیست در نام انتخاب شده
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}تغییر پارامترهای NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}بسته
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}برگرداندن تغییرات
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}ثبت مقدار پیش فرض برای همه پارامترها
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :پارامتر{NUM}
@@ -2769,9 +3011,11 @@ STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}برو 
 STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}برای نشانه یک نام وارد کنید
 
 # Town directory window
+STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}شهرها ({COMMA} از {COMMA})
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- هیچکدام -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}نام شهرها - کلیک روی نام شهر آن را در وسط صفحه نمایش می دهد. کنترل + کلیک یک نمای اضافه از مکان شهر باز می کند
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}نام شهرها - برای مرکز قرار دادن نمای اصلی روی شهر، روی نام کلیک کنید. Ctrl+Click برای باز کردن یک نمای جدید در موقعیت شهر.
 STR_TOWN_POPULATION                                             :{BLACK}جمعیت جهان: {COMMA}
 
 # Town view window
@@ -2784,6 +3028,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} دریافت گردید
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (هنوز نیاز است)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (دریافت گردیده)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}شهر هر {ORANGE}{UNITS_DAYS_OR_SECONDS} رشد می‌کند.
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}شهر هر {ORANGE}{UNITS_DAYS_OR_SECONDS} رشد می‌کند (تأمین مالی شده).
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}شهر رشد {RED}نمی {BLACK} کند
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}حد سروصدا در شهر: {ORANGE}{COMMA}{BLACK}  بیشینه: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}نمایش شهر در وسط صفحه نمایش. کنترل+کلیک یک نمای اضافه از شهر باز می کند
@@ -2828,6 +3074,10 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}رشو
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} اهداف
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}اهداف جهانی
+STR_GOALS_GLOBAL_BUTTON                                         :{BLACK}جهانی
+STR_GOALS_GLOBAL_BUTTON_HELPTEXT                                :{BLACK}نمایش اهداف سراسری
+STR_GOALS_COMPANY_BUTTON                                        :{BLACK}شرکت
+STR_GOALS_COMPANY_BUTTON_HELPTEXT                               :{BLACK}نمایش اهداف شرکت
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- هیچکدام -
 STR_GOALS_PROGRESS                                              :{ORANGE}{STRING}
@@ -2836,7 +3086,9 @@ STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}روی 
 
 # Goal question window
 STR_GOAL_QUESTION_CAPTION_QUESTION                              :{BLACK}سوال
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :{BLACK}اطلاعات
 STR_GOAL_QUESTION_CAPTION_WARNING                               :هشدار
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :{YELLOW}خطا
 
 # Goal Question button list
 ###length 18
@@ -2862,13 +3114,18 @@ STR_GOAL_QUESTION_BUTTON_CLOSE                                  :بستن
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}یارانه ها
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}یارانه های پیشنهادی برای انجام سرویس های:
+STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING} از {STRING} به {STRING}{YELLOW} ({STRING})
 STR_SUBSIDIES_NONE                                              :{ORANGE}- هیچکدام-
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}سرویس هایی که قبلا یارانه ای بوده:
+STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} از {STRING} به {STRING}{YELLOW} ({COMPANY}{YELLOW}، {STRING})
 STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}روی سرویس کلیک کنید تا آن شهر/صنایع در مرکز صفحه نمایش نشان داده شود. کنترل+کلیک یک صفحه نمایش تازه برای محل شهر/صنایع باز خواهد کرد
+STR_SUBSIDIES_SUBSIDISED_EXPIRY_DATE                            :تا {DATE_SHORT}
 
 # Story book window
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}کتابچه راهنمای عمومی
 STR_STORY_BOOK_SPECTATOR                                        :کتاب داستان جهانی
+STR_STORY_BOOK_NEXT_PAGE                                        :{BLACK}بعدی
+STR_STORY_BOOK_NEXT_PAGE_TOOLTIP                                :{BLACK}برو به صفحه بعدی
 STR_STORY_BOOK_INVALID_GOAL_REF                                 :{RED}رجوع به هدف نامعتبر
 
 # Station list window
@@ -2908,6 +3165,8 @@ STR_STATION_VIEW_VIA_HERE                                       :{GREEN}{CARGO_S
 STR_STATION_VIEW_TO_HERE                                        :{GREEN}{CARGO_SHORT} به این ایستگاه
 STR_STATION_VIEW_NONSTOP                                        :{YELLOW}{CARGO_SHORT} بدون توقف
 
+STR_STATION_VIEW_GROUP_S_V_D                                    :منبع-از طریق-مقصد
+STR_STATION_VIEW_GROUP_S_D_V                                    :منبع-مقصد-از طریق
 STR_STATION_VIEW_GROUP_D_V_S                                    :مقصد با منبع
 
 ###length 8
@@ -2930,6 +3189,8 @@ STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}همه 
 
 STR_STATION_VIEW_RENAME_STATION_CAPTION                         :نام گذاری محوطه ایستگاه/بارگیری
 
+STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}بستن (یا نزدیک) فرودگاه
+STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}جلوگیری از فرود هواپیما در این فرودگاه
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
@@ -2942,20 +3203,24 @@ STR_EDIT_WAYPOINT_NAME                                          :{WHITE}ویرا
 STR_FINANCES_YEAR                                               :{WHITE}{NUM}
 
 ###length 3
+STR_FINANCES_CAPITAL_EXPENSES_TITLE                             :{WHITE}هزینه‌های سرمایه‌ای
 
 
 ###length 13
 STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}ساخت و ساز
 STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}خودرو های جدید
 STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}هزینه های نگهداری قطار
-STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}هزینه های نگهداری خودروهای جاده
+STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}هزینه های نگهداری وسایل نقلیه جاده
 STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}هزینه های نگهداری هواپیما
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}هزینه های نگهداری کشتی
+STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE                       :{GOLD}وسایل نقلیه جاده‌ای
 
 STR_FINANCES_NEGATIVE_INCOME                                    :{BLACK}-{CURRENCY_LONG}
 STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURRENCY_LONG}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}تراز بانکی
 STR_FINANCES_BANK_BALANCE                                       :{WHITE}{CURRENCY_LONG}
+STR_FINANCES_BORROW_BUTTON                                      :{BLACK}قرض گرفتن{CURRENCY_LONG}
+STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}افزایش مبلغ وام. Ctrl+Click برای گرفتن وام تا حد امکان
 STR_FINANCES_INFRASTRUCTURE_BUTTON                              :{BLACK}زیرساخت
 
 # Company view
@@ -2975,12 +3240,16 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}هیچک
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}ساخت ساختمان مرکزی
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}ساخت پایگاه شرکت
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}دیدن ساختمان مرکزی
+STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}مشاهده دفتر مرکزی شرکت
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}جزییات
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}مشاهده جزییات تعداد زیرساخت ها
 
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}پالت رنگی
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}تغییر رنگ سازمانی خودرو های شرکت
+STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}اسم شرکت
+STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}نام شرکت را تغییر دهید.
 
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :اسم شرکت
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :مدیر عامل
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}ما به دنبال یک شرکت حمل و نقل هستیم که مایل باشد مالکیت شرکت ما را بصورت یکجا در اختیار بگیرد.{}{}آیا شما مایل به خرید شرکت {COMPANY} به مبلغ {CURRENCY_LONG} هستید؟
@@ -2999,8 +3268,13 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}فرود
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}کارخانجات ({COMMA} of {COMMA})
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- هیچ -
+STR_INDUSTRY_DIRECTORY_ITEM_INFO                                :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transported){BLACK}
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD1                               :{ORANGE}{INDUSTRY} {STRING}
 STR_INDUSTRY_DIRECTORY_ITEM_PROD2                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD3                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE                            :{ORANGE}{INDUSTRY} {STRING}، {STRING}، {STRING} و {NUM} مورد بیشتر...
+STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER                    :{BLACK}بار پذیرفته‌شده: {SILVER}{STRING}
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -3010,6 +3284,10 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}مرکز
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}این کارخانه اعلام کرده است که به زودی بسته خواهد شد!
 
 
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} منتظر است{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} منتظر است.
 
 
 # Vehicle lists
@@ -3069,10 +3347,33 @@ STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :وسایل ری
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :کشتی های جدید
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :هواپیمای جدید
 
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}هزینه: {GOLD}{CURRENCY_LONG}{BLACK} وزن: {GOLD}{WEIGHT_SHORT}
+STR_PURCHASE_INFO_COST_REFIT_WEIGHT                             :{BLACK}هزینه: {GOLD}{CURRENCY_LONG}{BLACK} (هزینه بازسازی: {GOLD}{CURRENCY_LONG}{BLACK}) وزن: {GOLD}{WEIGHT_SHORT}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}سرعت: {GOLD}{VELOCITY}{BLACK} توان: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED                                         :{BLACK}سرعت: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}سرعت در اقیانوس: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}سرعت در کانال/رودخانه: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_RUNNINGCOST_YEAR                              :{BLACK}هزینه جاری: {GOLD}{CURRENCY_LONG}/سال
+STR_PURCHASE_INFO_RUNNINGCOST_PERIOD                            :{BLACK}هزینه جاری: {GOLD}{CURRENCY_LONG}/دوره
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}ظرفیت: {GOLD}{CARGO_LONG} {STRING}
 STR_PURCHASE_INFO_REFITTABLE                                    :(قابل تعمیر)
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}طراحی شده: {GOLD}{NUM}{BLACK} عمر: {GOLD}{COMMA} سال  {P "" s}
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}حداکثر قابلیت اطمینان: {GOLD}{COMMA}%
+STR_PURCHASE_INFO_COST                                          :{BLACK}هزینه: {GOLD}{CURRENCY_LONG}
+STR_PURCHASE_INFO_COST_REFIT                                    :{BLACK}هزینه: {GOLD}{CURRENCY_LONG}{BLACK} (هزینه بازسازی: {GOLD}{CURRENCY_LONG}{BLACK})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}وزن: {GOLD}{WEIGHT_SHORT} ({WEIGHT_SHORT})
+STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}هزینه: {GOLD}{CURRENCY_LONG}{BLACK} سرعت: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}هزینه: {GOLD}{CURRENCY_LONG}{BLACK} (هزینه بازسازی: {GOLD}{CURRENCY_LONG}{BLACK}) سرعت: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}ظرفیت: {GOLD}{CARGO_LONG}، {CARGO_LONG}
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}واگن‌های موتوری: {GOLD}+{POWER}{BLACK} وزن: {GOLD}+{WEIGHT_SHORT}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}قابل تغییر به: {GOLD}{STRING}
+STR_PURCHASE_INFO_ALL_TYPES                                     :همه انواع بار
+STR_PURCHASE_INFO_NONE                                          :هیچکدام
+STR_PURCHASE_INFO_ENGINES_ONLY                                  :فقط موتور ها
+STR_PURCHASE_INFO_ALL_BUT                                       :همه بجز {CARGO_LIST}
+STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}حداکثر نیروی کشش: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}برد: {GOLD}{COMMA} قطعه
+STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}نوع هواپیما: {GOLD}{STRING}
 
 ###length 3
 
@@ -3088,6 +3389,7 @@ STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}خرید
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}خرید هواپیما
 
 ###length VEHICLE_TYPES
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON                  :{BLACK}خرید و تعمیر خودرو
 
 ###length VEHICLE_TYPES
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}خرید قطار مشخص شده. Shift+Click کنید تا قبل از خرید، مبلغ تقریبی آنرا نمایش دهد
@@ -3153,6 +3455,8 @@ STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}برای
 ###length VEHICLE_TYPES
 
 ###length VEHICLE_TYPES
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}تمام وسایل نقلیه جاده‌ای موجود در انبار را به صورت خودکار جایگزین کنید
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}تمام هواپیماهای موجود در آشیانه را به طور خودکار جایگزین کنید
 
 ###length VEHICLE_TYPES
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}وسیله ی جدید
@@ -3165,8 +3469,14 @@ STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}خرید
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}خرید هواپیمای تازه
 
 ###length VEHICLE_TYPES
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}کپی از سیله نقلیه
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}کپی از کشتی
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}کپی از هواپیما
 
 ###length VEHICLE_TYPES
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_TOOLTIP                      :{BLACK}خرید یک نسخه از وسیله نقلیه جاده‌ای. روی این دکمه و سپس روی یک وسیله نقلیه جاده‌ای در داخل یا خارج از انبار کلیک کنید. برای به اشتراک گذاشتن دستورات، Ctrl+Click کنید. همچنین برای نمایش تخمین هزینه فقط Shift را فشار دهید.
+STR_DEPOT_CLONE_SHIP_DEPOT_TOOLTIP                              :{BLACK}خرید یک نسخه از کشتی. روی این دکمه و سپس روی یک کشتی در داخل یا خارج از اسکله کلیک کنید. برای به اشتراک گذاشتن دستورات، Ctrl+Click کنید. همچنین برای نمایش تخمین هزینه فقط Shift را فشار دهید.
+STR_DEPOT_CLONE_AIRCRAFT_HANGAR_TOOLTIP                         :{BLACK}خرید یک کپی از هواپیما. روی این دکمه و سپس روی یک هواپیما در داخل یا خارج از آشیانه کلیک کنید. برای به اشتراک گذاشتن دستورات، Ctrl+Click کنید. همچنین برای نمایش تخمین هزینه فقط Shift را فشار دهید.
 
 ###length VEHICLE_TYPES
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}انتقال نمای اصلی را به جایگاه ایستگاه قطار.Ctrl+Click یک نمای جدید از جایگاه ایستگاه می سازد.
@@ -3187,6 +3497,7 @@ STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}پیغا
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}ما به تازگی {STRING} را طراحی کرده ایم- آیا مایلید در یک سال اولان را به شگل انحصاری مورد تست قرار دهید تا نحوه عملکرد وسیله را قبل از عرضه ی جهانی مورد بررسی قرار دهیم؟
 
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :لوکوموتیو راه آهن
+STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :لوکوموتیو راه آهن برقی
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :لوکوموتیو مونوریل
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :لوکوموتیو ریل مغناطیسی
 
@@ -3195,6 +3506,13 @@ STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :ماشین جا
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :هواپیما
 STR_ENGINE_PREVIEW_SHIP                                         :کشتی
 
+STR_ENGINE_PREVIEW_COST_WEIGHT                                  :هزینه: {CURRENCY_LONG} وزن : {WEIGHT_SHORT}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED                               :هزینه: {CURRENCY_LONG} حداکثر سرعت: {VELOCITY}
+STR_ENGINE_PREVIEW_SPEED_POWER                                  :سرعت: {VELOCITY}  توان: {POWER}
+STR_ENGINE_PREVIEW_SPEED_POWER_MAX_TE                           :سرعت: {VELOCITY}  توان: {POWER}  حداکثر نیروی کشش: {FORCE}
+STR_ENGINE_PREVIEW_RUNCOST_PERIOD                               :هزینه جاری: {CURRENCY_LONG}/دوره
+STR_ENGINE_PREVIEW_CAPACITY                                     :ظرفیت: {CARGO_LONG}
+STR_ENGINE_PREVIEW_CAPACITY_2                                   :ظرفیت: {CARGO_LONG}، {CARGO_LONG}
 
 # Autoreplace window
 
@@ -3277,11 +3595,19 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}نامگ
 STR_VEHICLE_INFO_AGE                                            :{COMMA}سال ({COMMA})
 STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} سال ({COMMA})
 
+STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}حداکثر سرعت: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE                                 :{BLACK}حداکثر سرعت: {LTBLUE}{VELOCITY} {BLACK}نوع هواپیما: {LTBLUE}{STRING}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE                           :{BLACK}حداکثر سرعت: {LTBLUE}{VELOCITY} {BLACK}نوع هواپیما: {LTBLUE}{STRING} {BLACK}برد: {LTBLUE}{COMMA} واحد
 
 
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}ظرفیت: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
 
 
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}فاصله سرویس: {LTBLUE}{COMMA}{NBSP}روز{BLACK} {STRING}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_MINUTES                  :{BLACK}فاصله سرویس: {LTBLUE}{COMMA}{NBSP}دقیقه{P "" s}{BLACK} {STRING}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}فاصله سرویس: {LTBLUE}{COMMA}%{BLACK} {STRING}
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP_DAYS    :{BLACK}فاصله زمانی سرویس را 10 روز افزایش دهید. برای افزایش فاصله زمانی سرویس به میزان 5 روز، Ctrl+Click را نگه دارید.
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP_MINUTES :{BLACK}فاصله‌ی زمانی سرویس‌دهی را 5 دقیقه افزایش دهید. برای افزایش فاصله‌ی زمانی سرویس‌دهی به میزان 1 دقیقه، Ctrl+Click کنید.
 
 
 ###length VEHICLE_TYPES
@@ -3337,16 +3663,24 @@ STR_ORDERS_END_OF_ORDERS                                        :- - پایان
 STR_ORDERS_END_OF_SHARED_ORDERS                                 :- - پایان دستورات مشترک - -
 
 # Order bottom buttons
+STR_ORDER_GO_NON_STOP_TO                                        :بدون توقف برو به
+STR_ORDER_GO_NON_STOP_VIA                                       :بدون توقف بروید از طریق
 
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :تمام بار را کاملاً پر کنید
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :هر محموله‌ای را کاملاً بارگیری کنید
 
 STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :درصورت پذیرش تخلیه کن
 
 STR_ORDER_REFIT                                                 :{BLACK}تعمیر
 STR_ORDER_REFIT_AUTO                                            :{BLACK}تعمیر در ایستگاه
+STR_ORDER_DROP_REFIT_AUTO                                       :محموله ثابت
+STR_ORDER_DROP_REFIT_AUTO_ANY                                   :محموله موجود
 
+STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :همیشه برو
 
 # Depot action tooltips, one per vehicle type
 ###length VEHICLE_TYPES
+STR_ORDER_TRAIN_DEPOT_ACTION_TOOLTIP                            :ایستگاه قطار
 ###next-name-looks-similar
 
 
@@ -3365,17 +3699,25 @@ STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}لغو 
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}پاک کردن
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}پاک کردن دستور مشخص شده
 STR_ORDERS_DELETE_ALL_TOOLTIP                                   :{BLACK}همگی دستورات را پاک کن
+STR_ORDERS_STOP_SHARING_BUTTON                                  :{BLACK}اشتراک‌گذاری را متوقف کنید
+STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}توقف به اشتراک‌گذاری لیست دستورات. برای حذف تمام دستورات این وسیله نقلیه، Ctrl+Click کنید.
 
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}برو به
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :به نزدیکترین انبار بروید
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :به نزدیکترین آشیانه بروید
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}وارد کردن دستور جدید قبل از دستور مشخص شده. یا اضافه کردن آن به آخر لیست. فرستادن به مرکز تعمیر، دستور سرویس خودکار را غیرفعال می کند
 
 
 # String parts to build the order string
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :بدون توقف از طریق {WAYPOINT} بروید
 
 
 ###length 3
+STR_ORDER_TRAIN_DEPOT                                           : ایستگاه راه اهن
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} نزدیکترین آشیانه
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} نزدیک‌ترین {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
 
@@ -3394,6 +3736,7 @@ STR_ORDER_AUTO_REFIT_ANY                                        :بار موجو
 STR_ORDER_OUT_OF_RANGE                                          :{RED} (مقصد بعدی خارج از دسترس است)
 
 
+STR_INVALID_ORDER                                               :{RED} (Invalid Order)
 
 # Time table window
 
@@ -3404,19 +3747,33 @@ STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(توقف بر
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(دستور کار {STRING}, برنامه ریزی نشده است)
 
 
+STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK} این وسیله نقلیه در حال حاضر طبق برنامه حرکت می‌کند.
+STR_TIMETABLE_STATUS_LATE                                       :{BLACK}این وسیله در حال حاضر با تاخیر {STRING} در حال حرکت است
+STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}این وسیله نقلیه در حال حاضر {STRING} زودتر در حال اجرا است
+STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK} این برنامه زمانی هنوز شروع نشده است.
+STR_TIMETABLE_STATUS_START_AT_DATE                              :{BLACK}این برنامه زمانی از {STRING} شروع خواهد شد.
+STR_TIMETABLE_STATUS_START_IN_SECONDS                           :{BLACK}این برنامه زمانی در {COMMA} ثانیه شروع خواهد شد.
 
 
+STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}مدت زمان انجام دستور برجسته شده را تغییر دهید. برای تنظیم زمان برای تمام دستورات، Ctrl+Click کنید.
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}پاک کردن زمان
 
 
 
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}بازنشانی شمارنده تاخیر
+STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}شمارنده تاخیر را بازنشانی کنید تا وسیله نقلیه به موقع برسد. Ctrl+Click کنید تا کل گروه بازنشانی شود، به طوری که آخرین وسیله نقلیه به موقع برسد و بقیه زودتر برسند.
 
 
 
 
 
 # Date window (for timetable)
+STR_DATE_CAPTION                                                :{WHITE}تاریخ را تنظیم کنید
+STR_DATE_SET_DATE                                               :{BLACK}تنظیم تاریخ
+STR_DATE_SET_DATE_TOOLTIP                                       :{BLACK}از تاریخ انتخاب شده به عنوان تاریخ شروع جدول زمانی استفاده کنید.
+STR_DATE_DAY_TOOLTIP                                            :{BLACK}انتخاب روز
+STR_DATE_MONTH_TOOLTIP                                          :{BLACK}انتخاب ماه
 
 
 # AI debug window
@@ -3429,19 +3786,27 @@ STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}فعال
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}توقف روشن:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}توقف روشن
 STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}هنگامی که گزارش یک هوش مصنوعی با این کد تطابق کند، بازی متوقف میگردد
+STR_AI_DEBUG_MATCH_CASE                                         :{BLACK}تطابق حالت
+STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}تغییر وضعیت تطابق حروف بزرگ و کوچک هنگام مقایسه پیام‌های گزارش هوش مصنوعی با رشته‌ی شکست.
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}ادامه
+STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}از حالت توقف درآمده و هوش مصنوعی را ادامه دهید.
+STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}مشاهده‌ی خروجی اشکال‌زدایی این هوش مصنوعی. Ctrl+Click برای باز کردن در پنجره‌ی جدید.
 STR_AI_GAME_SCRIPT                                              :{BLACK}کدبازی
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}دیدن گزارش های کد بازی
 
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}پنجره رفع اشکال کد فقط برای سرور قابل دسترس است
 
 # AI configuration window
+STR_AI_CONFIG_CAPTION_AI                                        :{WHITE}تنظیمات هوش مصنوعی
+STR_AI_CONFIG_CAPTION_GAMESCRIPT                                :{WHITE}تنظیمات اسکریپت بازی
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}کد بازی که در بازی بعدی بارگذاری می شود
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}هوش مصنوعی که در بازی بعدی بارگذاری می شود
 STR_AI_CONFIG_HUMAN_PLAYER                                      :بازیکن آدمیزاد
 STR_AI_CONFIG_RANDOM_AI                                         :انتخاب هوش مصنوعی به صورت اتفاقی
 STR_AI_CONFIG_NONE                                              :(هیچکدام)
+STR_AI_CONFIG_NAME_VERSION                                      :{STRING} {YELLOW}v{NUM}
 STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}حد اکثر تعداد رقبا :{ORANGE}{COMMA}
+STR_AI_CONFIG_COMPETITORS_INTERVAL                              :{LTBLUE}فاصله بین شروع رقبا: {ORANGE}{COMMA} دقیقه{P "" s}
 
 STR_AI_CONFIG_MOVE_UP                                           :حرکت به بالا
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}حرکت دادن AI انتخاب شده به سمت بالا در لیست
@@ -3449,11 +3814,12 @@ STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}حرکت
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}حرکت دادن AI انتخاب شده به سمت پایین در لیست
 
 STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}کدبازی
+STR_AI_CONFIG_GAMESCRIPT_PARAM                                  :{SILVER}پارامترها
 STR_AI_CONFIG_AI                                                :{SILVER}هوشهای مصنوعی
 
-STR_AI_CONFIG_CHANGE_AI                                         :هوش مصنوعی(AI)
-STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :کد بازی
-STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}بارگزاری کد دیگر
+STR_AI_CONFIG_CHANGE_AI                                         :{BLACK}انتخاب هوش مصنوعی
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :{BLACK}اسکریپت بازی را انتخاب کنید
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}بارگیری اسکریپت دیگر. Ctrl+Click برای نمایش تمام نسخه‌های موجود.
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}تنظیم
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}تنظبم پارامتر های مربوط به کد
 
@@ -3468,17 +3834,15 @@ STR_AI_LIST_URL                                                 :{LTBLUE}آدر
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}قبول
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}انتخاب کد مشخص شده
-STR_AI_LIST_CANCEL                                              :{BLACK}لغو
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}کد را تغییر نده
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :هوش مصنوعی(AI)
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}بستن
 STR_AI_SETTINGS_RESET                                           :{BLACK}بازنشاندن
 
 
 # Textfile window
+STR_TEXTFILE_JUMPLIST                                           :{WHITE}فهرست مطالب
 STR_TEXTFILE_WRAP_TEXT                                          :{WHITE}شکستن متن
 STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}متن درون پنجره را میشکند بطوری که تمام متن بدون اسکرول کردن قابل مشاهده می باشد
 STR_TEXTFILE_VIEW_README                                        :{BLACK}مشاهده راهنما
@@ -3488,6 +3852,7 @@ STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}گواه
 STR_TEXTFILE_README_CAPTION                                     :{WHITE}راهنمای {STRING} {STRING}
 STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} گزارش تغییرات {STRING}
 STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} گواهی {STRING}
+STR_TEXTFILE_GAME_MANUAL_CAPTION                                :{WHITE}سند (OpenTTD) '{STRING}'
 
 
 # Vehicle loading indicators
@@ -3510,6 +3875,8 @@ STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}بازی
 
 STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}تصویر بسیار بزرگ است...
 
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}هشدار مقیاس
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}تغییر اندازه‌ی بیش از حد نقشه‌ی مبدأ توصیه نمی‌شود. آیا با تولید ادامه می‌دهید؟
 
 # Soundset messages
 
@@ -3521,6 +3888,7 @@ STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}تصوی
 
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}پیام
+STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}پیامی از طرف {COMPANY}
 
 # Generic construction errors
 STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}خارج از نقشه
@@ -3546,6 +3914,8 @@ STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}قبلا
 STR_ERROR_TOO_HIGH                                              :{WHITE}بیش از اندازه ارتفاع دارد
 
 # Company related errors
+STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}نمی‌توان نام شرکت را تغییر داد...
+STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}اسم مدیر رو نمیشه عوض کرد...
 
 STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}نمیشود پول بیشتری قرض گرفت...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}ساختمان مرکزی را نمی شود اینجا ساخت ...
@@ -3596,6 +3966,7 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}اول 
 # Waypoint related errors
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}نمیتوان اینجا شناوری قرار داد
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}امکان تغییر نام نقطه میانی ( Waypoint ) وجود ندارد...
 
 STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}ابتدا باید مقصد ریل حذف شود
 
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 2eff348cd4..29f28ff522 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -664,7 +664,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zamknij
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Tytuł okna - przeciągnij, aby przesunąć okno
 STR_TOOLTIP_SHADE                                               :{BLACK}Zwiń okno - pokaż tylko nagłówek
 STR_TOOLTIP_DEBUG                                               :{BLACK}Pokaż informacje debugerra NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Zmień rozmiar okna na domyślny. Użyj Ctrl, aby zapamiętać obecny rozmiar jako domyślny
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Zmień rozmiar okna na domyślny. Użyj Ctrl, aby zapamiętać obecny rozmiar jako domyślny. Kliknij dwukrotnie z użyciem Ctrl, aby zresetować zapamiętany rozmiar
 STR_TOOLTIP_STICKY                                              :{BLACK}Oznacz to okno jako niezamykalne przyciskiem „Zamknij Wszystkie Okna”. Użyj Ctrl, aby zapamiętać to ustawienie jako domyślne
 STR_TOOLTIP_RESIZE                                              :{BLACK}Kliknij i przeciągnij, by zmienić rozmiar okna
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Przełącz na duży/mały rozmiar okna
@@ -823,7 +823,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Stawianie budyn
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcje gry
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Ustawienia
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Ustawienia SI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Ustawienia Game Script
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Ustawienia NewGRF
@@ -1209,7 +1208,7 @@ STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Pokaż o
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- - {COMPANY} - -
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* * PAUZA * *
 STR_STATUSBAR_PAUSED_LINK_GRAPH                                 :{ORANGE}* * PAUZA (aktualizowanie grafu połączeń) * *
-STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOZAPIS
+STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOMATYCZNY ZAPIS
 STR_STATUSBAR_SAVING_GAME                                       :{RED}* * ZAPISYWANIE GRY * *
 
 STR_STATUSBAR_SPECTATOR                                         :{WHITE}(obserwator)
@@ -1339,22 +1338,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Kopiuj p
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcje gry
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Ogólne
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Wybierz opcje ogólne
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Wybierz opcje ogólne
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Wybierz opcje grafiki
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Wybierz opcje grafiki
 STR_GAME_OPTIONS_TAB_SOUND                                      :Dźwięk
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Wybierz opcje dźwięku i muzyki
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Wybierz opcje dźwięku i muzyki
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Społeczność
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Wybierz opcje integracji sieci społecznościowych
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Wybierz opcje integracji z sieciami społecznościowymi
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Zaawansowane
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Zmień ustawienia zaawansowane
 
 STR_GAME_OPTIONS_VOLUME                                         :Głośność
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efekty dźwiękowe
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muzyka
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Waluta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Wybór waluty
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Waluta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Wybór jednostek waluty
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1405,8 +1408,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Łat łotewski
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portugalskie
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hrywna ukraińska
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autozapis
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Częstotliwość automatycznego zapisu stanu gry
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatyczny zapis
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Wybierz częstotliwość automatycznego zapisu stanu gry
 
 # Autosave dropdown
 ###length 5
@@ -1416,81 +1419,83 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Co 30 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Co 60 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Co 120 minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Język
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Wybierz język interfejsu
+STR_GAME_OPTIONS_LANGUAGE                                       :Język
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Wybierz język interfejsu
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} (ukończono {NUM}%)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pełny ekran
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaznacz to pole, jeśli chcesz grać w OpenTTD w trybie pełnoekranowym
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pełny ekran
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Zaznacz to pole, jeśli chcesz grać w OpenTTD w trybie pełnoekranowym
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozdzielczość ekranu
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Wybierz rozdzielczość ekranu
+STR_GAME_OPTIONS_RESOLUTION                                     :Rozdzielczość ekranu
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Wybierz rozdzielczość ekranu
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :inna
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Przyspieszenie sprzętowe
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Zaznacz to pole, aby zezwolić OpenTTD na użycie przyspieszenia sprzętowego. Ustawienia zostaną zastosowane dopiero po ponownym uruchomieniu gry.
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Ustawienie to zacznie obowiązywać dopiero po ponownym uruchomieniu gry.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Przyspieszenie sprzętowe
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Zaznacz to pole, aby zezwolić OpenTTD na użycie przyspieszenia sprzętowego. Zmiana zostanie zastosowana dopiero po ponownym uruchomieniu gry
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Ustawienie zostanie zastosowane dopiero po ponownym uruchomieniu gry
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Synchronizacja pionowa
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Zaznacz to pole aby włączyć synchronizację pionową. Zmiany zostaną zastosowane po restarcie gry. Działa tylko z włączonym przyspieszeniem sprzętowym.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Synchronizacja pionowa
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Zaznacz to pole, aby włączyć synchronizację pionową. Zmiana zostanie zastosowana dopiero po ponownym uruchomieniu gry. Działa tylko z włączonym przyspieszeniem sprzętowym
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Bieżący sterownik: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Bieżący sterownik: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Rozmiar interfejsu
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Przeciągnij suwak, aby ustawić rozmiar interfejsu. Przeciągnij z użyciem Ctrl, aby uzyskać płynną regulację
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Wykryj rozmiar automatycznie
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Zaznacz to pole, aby rozmiar interfejsu był wykrywany automatycznie
+STR_GAME_OPTIONS_INTERFACE                                      :Interfejs
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skaluj fazy krawędzi
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Zaznacz to pole, aby skalować fazy krawędzi zgodnie z rozmiarem interfejsu
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Rozmiar interfejsu
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Przeciągnij suwak, aby ustawić rozmiar interfejsu. Przeciągnij z użyciem Ctrl, aby uzyskać płynną regulację
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Wykryj rozmiar automatycznie
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Zaznacz to pole, aby rozmiar interfejsu był wykrywany automatycznie
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Użyj tradycyjnego fonta typu sprite
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Zaznacz to pole, jeśli wolisz używać tradycyjnego fonta typu sprite o stałym rozmiarze
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Antyaliasing fontów
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Zaznacz to pole, aby wygładzać fonty o zmiennym rozmiarze
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skaluj fazy krawędzi
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Zaznacz to pole, aby skalować fazy krawędzi zgodnie z rozmiarem interfejsu
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Użyj tradycyjnego fonta typu sprite
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Zaznacz to pole, jeśli wolisz używać tradycyjnego fonta typu sprite o stałym rozmiarze
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Wygładzanie fontów
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Zaznacz to pole, aby wygładzać fonty o zmiennym rozmiarze
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatyczna ankieta
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Udział w automatycznej ankiecie
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kiedy włączone, OpenTTD prześle ankietę przy opuszczaniu gry
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}O ankiecie i prywatności
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Spowoduje to otwarcie przeglądarki z dodatkowymi informacjami na temat automatycznej ankiety
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Podejrzyj wynik ankiety
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Pokaż wynik ankiety dotyczącej bieżącej gry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatyczna ankieta
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Udział w automatycznej ankiecie
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Kiedy włączone, OpenTTD prześle ankietę przy opuszczaniu gry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :O ankiecie i prywatności
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Spowoduje to otworzenie przeglądarki z dodatkowymi informacjami na temat automatycznej ankiety
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Podejrzyj wynik ankiety
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Pokaż wynik ankiety dotyczącej uruchomionej gry
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafika
+STR_GAME_OPTIONS_DISPLAY                                        :Wyświetlanie
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Częstotliwość odświeżania obrazu
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Wybierz częstotliwość odświeżania ekranu
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Częstotliwość odświeżania obrazu
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Wybierz częstotliwość odświeżania ekranu
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Częstotliwość odświeżania wyższa niż 60Hz może mieć wpływ na wydajność.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Podstawowy zestaw grafik
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wybierz podstawowy zestaw grafik (nie można tego zmienić w trakcie gry, jedynie w menu głównym)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatkowe informacje o grafice
+STR_GAME_OPTIONS_BASE_GRF                                       :Podstawowy zestaw grafik
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Wybierz podstawowy zestaw grafik (nie można tego zmienić w trakcie gry, jedynie w menu głównym)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Dodatkowe informacje o podstawowym zestawie grafik
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Podstawowy zestaw dźwięków
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Wybierz podstawowy zestaw dźwięków (nie można tego zmienić w trakcie gry, jedynie w menu głównym)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatkowe informacje o zestawie podstawowych dźwięków
+STR_GAME_OPTIONS_BASE_SFX                                       :Podstawowy zestaw dźwięków
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Wybierz podstawowy zestaw dźwięków (nie można tego zmienić w trakcie gry, jedynie w menu głównym)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Dodatkowe informacje o podstawowym zestawie dźwięków
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Podstawowy zestaw muzyki
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Wybierz podstawowy zestaw muzyki do użycia
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatkowe informacje o muzyce podstawowej
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Podstawowy zestaw muzyki
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Wybierz podstawowy zestaw muzyki
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Dodatkowe informacje o podstawowym zestawie muzyki
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Pobierz
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Wyszukaj nową lub zaktualizowaną zawartość do pobrania
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(brak zainstalowanych wtyczek do integracji z platformami społecznościowymi)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(brak zainstalowanych wtyczek do integracji z platformami społecznościowymi)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stan wtyczki:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stan wtyczki:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Uruchomiona
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inicjalizacja nie powiodła się
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} nie uruchomiona
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} nie został uruchomiony
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNLOADED                   :{RED}Niezaładowana
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}Zdublowana wtyczka
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNSUPPORTED_API            :{RED}Wersja nieobsługiwana
@@ -1577,9 +1582,9 @@ STR_SUBSIDY_X3                                                  :x3
 STR_SUBSIDY_X4                                                  :x4
 
 ###length 4
-STR_CLIMATE_TEMPERATE_LANDSCAPE                                 :Klimat umiarkowany
-STR_CLIMATE_SUB_ARCTIC_LANDSCAPE                                :Klimat arktyczny
-STR_CLIMATE_SUB_TROPICAL_LANDSCAPE                              :Klimat tropikalny
+STR_CLIMATE_TEMPERATE_LANDSCAPE                                 :Krajobraz umiarkowany
+STR_CLIMATE_SUB_ARCTIC_LANDSCAPE                                :Krajobraz arktyczny
+STR_CLIMATE_SUB_TROPICAL_LANDSCAPE                              :Krajobraz tropikalny
 STR_CLIMATE_TOYLAND_LANDSCAPE                                   :Krajobraz zabawkowy
 
 ###length 7
@@ -1599,12 +1604,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Przyjazne (bez
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Brak odpowiednich SI...{}{}Możesz pobrać różne SI przez „Przeglądarkę Dodatków”
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Ustawienia
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtr:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Otwórz wszystko
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Zamknij wszystko
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Zresetuj wszystkie ustawienia
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtr:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Rozwiń wszystkie
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Zwiń wszystkie
+STR_CONFIG_SETTING_RESET_ALL                                    :Przywróć wszystkie ustawienia
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(wyjaśnienie niedostępne)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Domyślna wartość: {ORANGE}{STRING}
@@ -1617,9 +1621,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Ustawienie firm
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Uwaga!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Ta czynność spowoduje przywrócenie wszystkich ustawień gry do wartości domyślnych.{}Czy na pewno chcesz kontynuować?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typ:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Ogranicza poniższą listę, używając określonych filtrów
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typ:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Ogranicza poniższą listę, używając określonych filtrów
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Podstawowe (pokaż tylko ważne opcje)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Zaawansowane (pokaż większość opcji)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspert (pokaż wszystkie opcje, włącznie z dziwnymi)
@@ -1636,9 +1640,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Ustawienia firm
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Żadne -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Zobacz wszystkie wyniki wyszukiwania, ustawiając{}{SILVER}Kategorię {BLACK}na {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Zobacz wszystkie wyniki wyszukiwania, ustawiając{}{SILVER}Typ {BLACK}na {WHITE}Wszystkie typy ustawień
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Zobacz wszystkie wyniki wyszukiwania, ustawiając{}{SILVER}Kategorię {BLACK}na {WHITE}{STRING} {BLACK}oraz {SILVER} Typ {BLACK}na {WHITE}Wszystkie typy ustawień
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Zobacz wszystkie wyniki wyszukiwania, ustawiając{}{PUSH_COLOUR}{SILVER}Kategorię {POP_COLOUR}na {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Zobacz wszystkie wyniki wyszukiwania, ustawiając{}{PUSH_COLOUR}{SILVER}Typ {POP_COLOUR}na {WHITE}Wszystkie typy ustawień
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Zobacz wszystkie wyniki wyszukiwania, ustawiając{}{PUSH_COLOUR}{SILVER}Kategorię {POP_COLOUR}na {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}oraz {PUSH_COLOUR}{SILVER} Typ {POP_COLOUR}na {WHITE}Wszystkie typy ustawień
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Wył.
@@ -2382,10 +2386,10 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Liniowy
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Rozmieszczenie drzew w grze: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Losowe pojawianie się drzew podczas gry. Może mieć to wpływ na przedsiębiorstwa opierające się na wyrastaniu drzew, np. tartaki
 ###length 4
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD               :Rosną, ale nie rozprzestrzeniają się {RED}(Klimat tropikalny: Tartaki nie działają)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD               :Rosną, ale nie rozprzestrzeniają się {RED}(krajobraz tropikalny: tartaki nie działają)
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST       :Rosną, ale rozprzestrzeniają się tylko w lasach deszczowych
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL              :Rosną i rozprzestrzeniają się wszędzie
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD     :Nie rosną, nie rozprzestrzeniają się {RED}(Klimat tropikalny: Tartaki nie działają)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD     :Nie rosną, nie rozprzestrzeniają się {RED}(krajobraz tropikalny: tartaki nie działają)
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Pozycja głównego paska narzędzi: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Pozioma pozycja głównego paska narzędzi na górze ekranu
@@ -2448,7 +2452,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :Tryb „symetry
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Tryb dystrybucji dla poczty: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :Tryb „symetryczny” oznacza, że mniej więcej taka sama ilość poczty zostanie wysłana ze stacji A do stacji B, co z B do A. Tryb „asymetryczny” oznacza, że w obu kierunkach może być wysyłana różna ilość poczty. Tryb „ręczny” oznacza, że dla poczty nie będzie przeprowadzana dystrybucja automatyczna
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Tryb dystrybucji dla klasy ładunków CHRONIONYCH: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :Klasa ładunków CHRONIONYCH zawiera kosztowności w klimacie umiarkowanym, diamenty w tropikalnym lub złoto w klimacie arktycznym. NewGRF-y mogą to zmienić. Tryb „symetryczny” oznacza, że mniej więcej taka sama ilość danego ładunku zostanie wysłana ze stacji A do stacji B, co z B do A. Tryb „asymetryczny” oznacza, że w obu kierunkach mogą być wysyłane różne ilości danego ładunku. Tryb „ręczny” oznacza, że dla danego ładunku nie będzie przeprowadzana dystrybucja automatyczna. Zaleca się ustawienie tej opcji na asymetryczną lub ręczną w klimacie arktycznym lub tropikalnym, ponieważ tam banki jedynie odbierają ładunek. Dla klimatu umiarkowanego możesz wybrać symetryczny, aby banki odsyłały kosztowności do pierwotnego banku
+STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :Klasa ładunków CHRONIONYCH zawiera kosztowności w krajobrazie umiarkowanym, diamenty w tropikalnym lub złoto w krajobrazie arktycznym. NewGRF-y mogą to zmienić. Tryb „symetryczny” oznacza, że mniej więcej taka sama ilość danego ładunku zostanie wysłana ze stacji A do stacji B, co z B do A. Tryb „asymetryczny” oznacza, że w obu kierunkach mogą być wysyłane różne ilości danego ładunku. Tryb „ręczny” oznacza, że dla danego ładunku nie będzie przeprowadzana dystrybucja automatyczna. Zaleca się ustawienie tej opcji na asymetryczną lub ręczną w krajobrazie arktycznym lub tropikalnym, ponieważ tam banki jedynie odbierają ładunek. Dla krajobrazu umiarkowanego można wybrać symetryczny, aby banki odsyłały kosztowności do pierwotnego banku
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :Tryb dystrybucji dla pozostałych klas ładunków: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :Tryb „asymetryczny” oznacza, że w obu kierunkach mogą być wysyłane różne ilości ładunków. Tryb „ręczny” oznacza, że dla takich ładunków nie będzie przeprowadzana dystrybucja automatyczna
 ###length 3
@@ -2571,7 +2575,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nie
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Sterownik GPU spowodował awarię gry. Wyłączono przyspieszenie sprzętowe
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nowa Gra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Wczytaj Grę
@@ -2583,11 +2588,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Gra Wiel
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opcje Gry
 STR_INTRO_HIGHSCORE                                             :{BLACK}Najwyższe Wyniki
 STR_INTRO_HELP                                                  :{BLACK}Pomoc i Instrukcje
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Ustawienia
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Ustawienia NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Przeglądarka Dodatków
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Ustawienia SI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Ustawienia Skryptu
 STR_INTRO_QUIT                                                  :{BLACK}Wyjście
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Rozpocznij nową rozgrywkę. Użyj Ctrl, aby pominąć konfigurowanie mapy
@@ -2605,11 +2606,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Wybierz
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Otwórz opcje gry
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Otwórz tabelę najwyższych wyników
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Skorzystaj z dokumentacji i zasobów online
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Otwórz ustawienia rozgrywki
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Otwórz ustawienia dodatków NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Poszukaj nowych dodatków lub aktualizacji do pobrania
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Otwórz ustawienia SI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Otwórz ustawienia Game Script
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Wyjdź z „OpenTTD”
 
 STR_INTRO_BASESET                                               :{BLACK}W aktualnie wybranym podstawowym zestawie grafik brakuje {NUM} sprite{P 'a 'ów 'ów}. Sprawdź dostępność aktualizacji dla tego zestawu.
@@ -3456,6 +3453,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Wybierz
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropolia
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Metropolie rozwijają się szybciej od zwykłych miast{}W zależności od ustawień, są one większe przy zakładaniu
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Powiększanie miast:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Budynki
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Zwiększ liczbę budynków w miastach
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Drogi
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Rozbuduj drogi w miastach
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Układ dróg miasta:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Wybierz układ dróg dla tego miasta
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Oryginalnie
@@ -3905,15 +3908,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Zapis sc
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista dostępnych schematów. Wybierz jeden z nich, aby wykonać zapis z taką nazwą
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Wpisz nazwę schematu
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Aktualna nazwa dla zapisywanego schematu
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Anuluj
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Nie wprowadzaj zmian
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Zapisz
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Zapisz schemat z wybraną nazwą
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Zmień parametry podstawowych grafik
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Zmień parametry NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zamknij
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Resetuj
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Przywróć domyślne wartości parametrów
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametr {NUM}
@@ -4082,6 +4082,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Zmień n
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Rozszerz
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Zwiększ rozmiar miasta
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Dodaj budynki
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Zwiększ liczbę budynków w mieście
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Dodaj drogi
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Rozbuduj drogi w mieście
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Skasuj
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Skasuj to miasto
 
@@ -4826,10 +4830,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Pokaż p
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Pokaż polecenia samolotu. Użyj Ctrl, aby pokazać rozkład lotów samolotu
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaż szczegóły pociągu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Pokaż szczegóły pojazdu
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Pokaż szczegóły statku
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pokaż szczegóły samolotu
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Pokaż szczegóły pociągu. Użyj Ctrl, aby pokazać jego grupę
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Pokaż szczegóły pojazdu. Użyj Ctrl, aby pokazać jego grupę
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Pokaż szczegóły statku. Użyj Ctrl, aby pokazać jego grupę
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Pokaż szczegóły samolotu. Użyj Ctrl, aby pokazać jego grupę
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Obecny stan pociągu - kliknij, aby zatrzymać/ruszyć pociąg
@@ -5097,7 +5101,7 @@ STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(Czekaj
 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION}
 STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION                       :{PUSH_COLOUR}{RED}(Nie może korzystać ze stacji){POP_COLOUR} {STRING} {STATION}
 
-STR_ORDER_IMPLICIT                                              :{SPACE}(Sugerowany)
+STR_ORDER_IMPLICIT                                              :{SPACE}(Sugerowane)
 
 STR_ORDER_FULL_LOAD                                             :{SPACE}(Pełny załadunek)
 STR_ORDER_FULL_LOAD_ANY                                         :{SPACE}(Pełny załadunek czegokolwiek)
@@ -5151,21 +5155,21 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Przełą
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rozkład jazdy - kliknij na polecenie, aby je zaznaczyć
 
 STR_TIMETABLE_NO_TRAVEL                                         :Nie podróżuje
-STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Podróż (automatycznie; zaplanowana przez następne ręczne polecenie)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Przejazd (bez ustalonego czasu)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Podróżuj (poza rozkładem) z maksymalną prędkością {2:VELOCITY}
+STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Przejazd (dodany automatycznie)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Przejazd (nieustalony)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Przejazd (nieustalony) z maksymalną prędkością {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Przejazd przez {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Podróżuj przez {STRING} z maksymalną prędkością {VELOCITY}
-STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Przejazd przez {STRING} (poza rozkładem)
-STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Podróżuj przez {STRING} z prędkością {VELOCITY} maks. (poza rozkładem)
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(postój przez {STRING}, poza rozkładem)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(przejazd przez {STRING}, poza rozkładem)
-STR_TIMETABLE_STAY_FOR                                          :i zostań tam przez {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :i podróżuje przez{STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Przejazd przez {STRING} z maksymalną prędkością {VELOCITY}
+STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Przejazd (przez {STRING}, nieustalony)
+STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Przejazd (przez {STRING}, nieustalony) z maksymalną prędkością {VELOCITY}
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(postój przez {STRING}, nieustalony)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(przejazd przez {STRING}, nieustalony)
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}i pozostań tam przez {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}i podróżuj przez {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Ten rozkład jazdy zajmie około {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Ten rozkład jazdy zajmie {STRING}
-STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Ten rozkład jazdy zajmie co najmniej {STRING} (nie wszystko jest zaplanowane)
+STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Ten rozkład jazdy zajmie co najmniej {STRING} (rozkład jest niepełny)
 
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Ten pojazd podróżuje teraz zgodnie z rozkładem jazdy
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Ten pojazd jest teraz spóźniony o {STRING}
@@ -5280,8 +5284,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}Adres:
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Zaakceptuj
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Wybierz zaznaczony skrypt
-STR_AI_LIST_CANCEL                                              :{BLACK}Anuluj
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nie zmieniaj skryptu
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Zrób zrzut obrazu
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normalny zrzut obrazu
@@ -5294,7 +5296,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Zrzut ob
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parametry SI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parametry Game Script
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zamknij
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetuj
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5338,7 +5339,7 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Szacowan
 
 # Saveload messages
 STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Zapisywanie trwa,{}proszę zaczekać do zakończenia!
-STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Błąd autozapisu
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Błąd automatycznego zapisu gry
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Nie można odczytać napędu
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Nie można zapisać gry...
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Nie można usunąć pliku
@@ -6327,6 +6328,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mld
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}bln
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -6366,3 +6368,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Otwórz ustawienia znaczników
+STR_BADGE_CONFIG_RESET                                          :Przywróć
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Ikony Znaczników
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtry Znaczników
+STR_BADGE_CONFIG_PREVIEW                                        :Podgląd Obrazka
+STR_BADGE_CONFIG_NAME                                           :Nazwa
+STR_BADGE_FILTER_ANY_LABEL                                      :Wszystkie {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} to {STRING}
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index da91178f13..41b8887d16 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -26,79 +26,79 @@ STR_JUST_NOTHING                                                :Nada
 # Cargo related strings
 # Plural cargo name
 STR_CARGO_PLURAL_NOTHING                                        :
-STR_CARGO_PLURAL_PASSENGERS                                     :Passageiros
-STR_CARGO_PLURAL_COAL                                           :Carvão
-STR_CARGO_PLURAL_MAIL                                           :Correio
-STR_CARGO_PLURAL_OIL                                            :Petróleo
-STR_CARGO_PLURAL_LIVESTOCK                                      :Gado
-STR_CARGO_PLURAL_GOODS                                          :Bens
-STR_CARGO_PLURAL_GRAIN                                          :Cereais
-STR_CARGO_PLURAL_WOOD                                           :Madeira
-STR_CARGO_PLURAL_IRON_ORE                                       :Minério de Ferro
-STR_CARGO_PLURAL_STEEL                                          :Aço
-STR_CARGO_PLURAL_VALUABLES                                      :Valores
-STR_CARGO_PLURAL_COPPER_ORE                                     :Minério de Cobre
-STR_CARGO_PLURAL_MAIZE                                          :Milho
-STR_CARGO_PLURAL_FRUIT                                          :Fruta
-STR_CARGO_PLURAL_DIAMONDS                                       :Diamantes
-STR_CARGO_PLURAL_FOOD                                           :Alimentos
-STR_CARGO_PLURAL_PAPER                                          :Papel
-STR_CARGO_PLURAL_GOLD                                           :Ouro
-STR_CARGO_PLURAL_WATER                                          :Água
-STR_CARGO_PLURAL_WHEAT                                          :Trigo
-STR_CARGO_PLURAL_RUBBER                                         :Borracha
-STR_CARGO_PLURAL_SUGAR                                          :Açúcar
-STR_CARGO_PLURAL_TOYS                                           :Brinquedos
-STR_CARGO_PLURAL_SWEETS                                         :Doces
-STR_CARGO_PLURAL_COLA                                           :Bebida de cola
-STR_CARGO_PLURAL_CANDYFLOSS                                     :Algodão Doce
-STR_CARGO_PLURAL_BUBBLES                                        :Bolhas
-STR_CARGO_PLURAL_TOFFEE                                         :Caramelo
-STR_CARGO_PLURAL_BATTERIES                                      :Baterias
-STR_CARGO_PLURAL_PLASTIC                                        :Plástico
-STR_CARGO_PLURAL_FIZZY_DRINKS                                   :Refrigerantes
+STR_CARGO_PLURAL_PASSENGERS                                     :{G=mp}Passageiros
+STR_CARGO_PLURAL_COAL                                           :{G=m}Carvão
+STR_CARGO_PLURAL_MAIL                                           :{G=m}Correio
+STR_CARGO_PLURAL_OIL                                            :{G=m}Petróleo
+STR_CARGO_PLURAL_LIVESTOCK                                      :{G=m}Gado
+STR_CARGO_PLURAL_GOODS                                          :{G=mp}Bens
+STR_CARGO_PLURAL_GRAIN                                          :{G=mp}Cereais
+STR_CARGO_PLURAL_WOOD                                           :{G=f}Madeira
+STR_CARGO_PLURAL_IRON_ORE                                       :{G=m}Minério de Ferro
+STR_CARGO_PLURAL_STEEL                                          :{G=m}Aço
+STR_CARGO_PLURAL_VALUABLES                                      :{G=mp}Valores
+STR_CARGO_PLURAL_COPPER_ORE                                     :{G=m}Minério de Cobre
+STR_CARGO_PLURAL_MAIZE                                          :{G=m}Milho
+STR_CARGO_PLURAL_FRUIT                                          :{G=f}Fruta
+STR_CARGO_PLURAL_DIAMONDS                                       :{G=mp}Diamantes
+STR_CARGO_PLURAL_FOOD                                           :{G=mp}Alimentos
+STR_CARGO_PLURAL_PAPER                                          :{G=m}Papel
+STR_CARGO_PLURAL_GOLD                                           :{G=m}Ouro
+STR_CARGO_PLURAL_WATER                                          :{G=f}Água
+STR_CARGO_PLURAL_WHEAT                                          :{G=m}Trigo
+STR_CARGO_PLURAL_RUBBER                                         :{G=f}Borracha
+STR_CARGO_PLURAL_SUGAR                                          :{G=m}Açúcar
+STR_CARGO_PLURAL_TOYS                                           :{G=mp}Brinquedos
+STR_CARGO_PLURAL_SWEETS                                         :{G=mp}Doces
+STR_CARGO_PLURAL_COLA                                           :{G=m}Xarope de Cola
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=m}Algodão Doce
+STR_CARGO_PLURAL_BUBBLES                                        :{G=fp}Bolhas
+STR_CARGO_PLURAL_TOFFEE                                         :{G=m}Caramelo
+STR_CARGO_PLURAL_BATTERIES                                      :{G=fp}Baterias
+STR_CARGO_PLURAL_PLASTIC                                        :{G=m}Plástico
+STR_CARGO_PLURAL_FIZZY_DRINKS                                   :{G=mp}Refrigerantes
 
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
-STR_CARGO_SINGULAR_PASSENGER                                    :Passageiros
-STR_CARGO_SINGULAR_COAL                                         :Carvão
-STR_CARGO_SINGULAR_MAIL                                         :Correio
-STR_CARGO_SINGULAR_OIL                                          :Petróleo
-STR_CARGO_SINGULAR_LIVESTOCK                                    :Gado
-STR_CARGO_SINGULAR_GOODS                                        :Bens
-STR_CARGO_SINGULAR_GRAIN                                        :Cereais
-STR_CARGO_SINGULAR_WOOD                                         :Madeira
-STR_CARGO_SINGULAR_IRON_ORE                                     :Minério de Ferro
-STR_CARGO_SINGULAR_STEEL                                        :Aço
-STR_CARGO_SINGULAR_VALUABLES                                    :Valores
-STR_CARGO_SINGULAR_COPPER_ORE                                   :Minério de Cobre
-STR_CARGO_SINGULAR_MAIZE                                        :Milho
-STR_CARGO_SINGULAR_FRUIT                                        :Fruta
-STR_CARGO_SINGULAR_DIAMOND                                      :Diamantes
-STR_CARGO_SINGULAR_FOOD                                         :Alimento
-STR_CARGO_SINGULAR_PAPER                                        :Papel
-STR_CARGO_SINGULAR_GOLD                                         :Ouro
-STR_CARGO_SINGULAR_WATER                                        :Água
-STR_CARGO_SINGULAR_WHEAT                                        :Trigo
-STR_CARGO_SINGULAR_RUBBER                                       :Borracha
-STR_CARGO_SINGULAR_SUGAR                                        :Açúcar
-STR_CARGO_SINGULAR_TOY                                          :Brinquedos
-STR_CARGO_SINGULAR_SWEETS                                       :Doces
-STR_CARGO_SINGULAR_COLA                                         :Bebida de cola
-STR_CARGO_SINGULAR_CANDYFLOSS                                   :Algodão Doce
-STR_CARGO_SINGULAR_BUBBLE                                       :Bolhas
-STR_CARGO_SINGULAR_TOFFEE                                       :Caramelo
-STR_CARGO_SINGULAR_BATTERY                                      :Baterias
-STR_CARGO_SINGULAR_PLASTIC                                      :Plástico
-STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Refrigerantes
+STR_CARGO_SINGULAR_PASSENGER                                    :{G=m}Passageiro
+STR_CARGO_SINGULAR_COAL                                         :{G=m}Carvão
+STR_CARGO_SINGULAR_MAIL                                         :{G=m}Correio
+STR_CARGO_SINGULAR_OIL                                          :{G=m}Petróleo
+STR_CARGO_SINGULAR_LIVESTOCK                                    :{G=m}Gado
+STR_CARGO_SINGULAR_GOODS                                        :{G=m}Bem
+STR_CARGO_SINGULAR_GRAIN                                        :{G=m}Cereal
+STR_CARGO_SINGULAR_WOOD                                         :{G=f}Madeira
+STR_CARGO_SINGULAR_IRON_ORE                                     :{G=m}Minério de Ferro
+STR_CARGO_SINGULAR_STEEL                                        :{G=m}Aço
+STR_CARGO_SINGULAR_VALUABLES                                    :{G=m}Valor
+STR_CARGO_SINGULAR_COPPER_ORE                                   :{G=m}Minério de Cobre
+STR_CARGO_SINGULAR_MAIZE                                        :{G=m}Milho
+STR_CARGO_SINGULAR_FRUIT                                        :{G=f}Fruta
+STR_CARGO_SINGULAR_DIAMOND                                      :{G=m}Diamante
+STR_CARGO_SINGULAR_FOOD                                         :{G=m}Alimento
+STR_CARGO_SINGULAR_PAPER                                        :{G=m}Papel
+STR_CARGO_SINGULAR_GOLD                                         :{G=m}Ouro
+STR_CARGO_SINGULAR_WATER                                        :{G=f}Água
+STR_CARGO_SINGULAR_WHEAT                                        :{G=m}Trigo
+STR_CARGO_SINGULAR_RUBBER                                       :{G=f}Borracha
+STR_CARGO_SINGULAR_SUGAR                                        :{G=m}Açúcar
+STR_CARGO_SINGULAR_TOY                                          :{G=m}Brinquedo
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}Doce
+STR_CARGO_SINGULAR_COLA                                         :{G=m}Xarope de Cola
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=m}Algodão Doce
+STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Bolha
+STR_CARGO_SINGULAR_TOFFEE                                       :{G=m}Caramelo
+STR_CARGO_SINGULAR_BATTERY                                      :{G=f}Bateria
+STR_CARGO_SINGULAR_PLASTIC                                      :{G=m}Plástico
+STR_CARGO_SINGULAR_FIZZY_DRINK                                  :{G=m}Refrigerante
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}passageiro{P "" s}
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} de carvão
-STR_QUANTITY_MAIL                                               :{COMMA} saco{P "" s} de correio
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP}saco{P "" s} de correio
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} de petróleo
-STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}ite{P m ns} de gado
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}cabeça{P "" s} de gado
 STR_QUANTITY_GOODS                                              :{COMMA}{NBSP}caixa{P "" s} de bens
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} de cereais
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} de madeira
@@ -117,8 +117,8 @@ STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} d
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} de borracha
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} de açúcar
 STR_QUANTITY_TOYS                                               :{COMMA}{NBSP}brinquedo{P "" s}
-STR_QUANTITY_SWEETS                                             :{COMMA} saco{P "" s} de doces
-STR_QUANTITY_COLA                                               :{VOLUME_LONG} de bebida de cola
+STR_QUANTITY_SWEETS                                             :{COMMA}{NBSP}saco{P "" s} de doces
+STR_QUANTITY_COLA                                               :{VOLUME_LONG} de xarope de cola
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} de algodão doce
 STR_QUANTITY_BUBBLES                                            :{COMMA} bolha{P "" s}
 STR_QUANTITY_TOFFEE                                             :{WEIGHT_LONG} de caramelo
@@ -216,7 +216,7 @@ STR_UNITS_VELOCITY_METRIC                                       :{DECIMAL}{NBSP}
 STR_UNITS_VELOCITY_SI                                           :{DECIMAL}{NBSP}m/s
 STR_UNITS_VELOCITY_GAMEUNITS_DAY                                :{DECIMAL}{NBSP}mosaicos/dia
 STR_UNITS_VELOCITY_GAMEUNITS_SEC                                :{DECIMAL}{NBSP}mosaicos/seg
-STR_UNITS_VELOCITY_KNOTS                                        :{DECIMAL}{NBSP}nós
+STR_UNITS_VELOCITY_KNOTS                                        :{DECIMAL}{NBSP}nó{P 0 "" s}
 
 STR_UNITS_POWER_IMPERIAL                                        :{DECIMAL}cv
 STR_UNITS_POWER_METRIC                                          :{DECIMAL}cv
@@ -261,7 +261,7 @@ STR_UNITS_DAYS                                                  :{COMMA}{NBSP}di
 STR_UNITS_SECONDS                                               :{COMMA}{NBSP}segundo{P "" s}
 STR_UNITS_TICKS                                                 :{COMMA}{NBSP}tique{P "" s}
 
-STR_UNITS_MONTHS                                                :{NUM}{NBSP}{P "mês" "meses"}
+STR_UNITS_MONTHS                                                :{NUM}{NBSP}m{P ês eses}
 STR_UNITS_MINUTES                                               :{NUM}{NBSP}minuto{P "" s}
 
 STR_UNITS_YEARS                                                 :{NUM}{NBSP}ano{P "" s}
@@ -275,7 +275,7 @@ STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Insira u
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Insira uma ou mais palavras-chave para filtrar a lista
 
 STR_TOOLTIP_GROUP_ORDER                                         :{BLACK}Seleccionar ordem de agrupamento
-STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Seleccione forma de ordenação (descendente/ascendente)
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selecione a direção de ordenação (descendente/ascendente)
 STR_TOOLTIP_SORT_CRITERIA                                       :{BLACK}Seleccione critério de ordenação
 STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Seleccione o critério de filtragem/procura
 STR_BUTTON_SORT_BY                                              :{BLACK}Ordenar por
@@ -286,7 +286,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fechar j
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título da janela - arraste isto para mover a janela
 STR_TOOLTIP_SHADE                                               :{BLACK}Encolher janela - apenas mostra a barra de título
 STR_TOOLTIP_DEBUG                                               :{BLACK}Mostrar informação de depuração de NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar a janela para o tamanho padrão. Ctrl+Clique para guardar o tamanho atual como padrão
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar a janela para o tamanho padrão. Ctrl+Clique para guardar o tamanho atual como padrão. Duplo Ctrl+Clique para redefinir o padrão armazenado
 STR_TOOLTIP_STICKY                                              :{BLACK}Marcar esta janela como não-encerrável pela tecla 'Fechar Todas as Janelas'. Ctrl+Clique também guarda o estado como padrão.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Clique e arraste para reajustar janela
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alternar entre janela grande/pequena
@@ -445,11 +445,10 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Colocar casas
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opções do Jogo
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Definições
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Definições de IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Definições de script de jogo
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Definições NewGRF
-STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Opções da "sandbox"
+STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Opções da 'sandbox'
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opções de Transparência
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Mostrar nomes de localidades
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Mostrar nomes de estações
@@ -535,16 +534,16 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Apagar todas as
 
 # About menu
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informações do terreno
-STR_ABOUT_MENU_HELP                                             :Ajuda & manuais
+STR_ABOUT_MENU_HELP                                             :Ajuda e manuais
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Mostrar/Ocultar consola
 STR_ABOUT_MENU_AI_DEBUG                                         :Depuração da IA/Scripts de jogo
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de ecrã
 STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Mostrar taxa de fotogramas
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Sobre o 'OpenTTD'
-STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alinhador de gráficos
+STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alinhador de elementos visuais
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Alternar as caixas envolventes
-STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :Ativar coloração de blocos sujos
-STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES                           :Alternar contornos de "widget"
+STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :Ativar coloração dos blocos sujos
+STR_ABOUT_MENU_TOGGLE_WIDGET_OUTLINES                           :Alternar contornos dos grupos de botões
 
 ###length 31
 STR_DAY_NUMBER_1ST                                              :1
@@ -689,12 +688,12 @@ STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Dinheiro
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais altos dos últimos 12 trimestres
 STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unidades de carga entregues nos últimos 4 trimestres.
 STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipos de carga entregues no último trimestre.
-STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Dinheiro 'em mãos'
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Quantia de dinheiro que esta empresa tem no banco
 STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Tem um empréstimo muito elevado?
 STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total de pontos sobre o máximo de pontos
 
 # Music window
-STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jukebox de Jazz
+STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Leitor de música Jazz
 STR_MUSIC_PLAYLIST_ALL                                          :{TINY_FONT}{BLACK}Todos
 STR_MUSIC_PLAYLIST_OLD_STYLE                                    :{TINY_FONT}{BLACK}Antigo
 STR_MUSIC_PLAYLIST_NEW_STYLE                                    :{TINY_FONT}{BLACK}Moderno
@@ -830,7 +829,7 @@ STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Mostrar
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  EM PAUSA  *  *
 STR_STATUSBAR_PAUSED_LINK_GRAPH                                 :{ORANGE}*  *  EM PAUSA (em espera pela atualização do gráfico de ligações) *  *
-STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOGUARDADO
+STR_STATUSBAR_AUTOSAVE                                          :{RED}A GUARDAR AUTOMATICAMENTE
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  A GUARDAR JOGO *  *
 
 STR_STATUSBAR_SPECTATOR                                         :{WHITE}(espectador)
@@ -851,26 +850,26 @@ STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BIG_FONT}{BLAC
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIG_FONT}{BLACK}Cidadãos celebram . . .{}Primeiro navio chega a {STATION}!
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIG_FONT}{BLACK}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
 
-STR_NEWS_TRAIN_CRASH                                            :{BIG_FONT}{BLACK}Acidente de Comboios!{}{COMMA} morrem numa explosão após a colisão!
+STR_NEWS_TRAIN_CRASH                                            :{BIG_FONT}{BLACK}Acidente de Comboios!{}{COMMA} pessoa{P "" s} morre{P u ram} na explosão após a colisão!
 STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BIG_FONT}{BLACK}Acidente com Veículo Rodoviário!{}Condutor morre na explosão após a colisão com um comboio!
-STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BIG_FONT}{BLACK}Acidente com Veículo Rodoviário{}{COMMA} morrem na explosão após a colisão com um comboio!
-STR_NEWS_AIRCRAFT_CRASH                                         :{BIG_FONT}{BLACK}Acidente de Aeronave!{}{COMMA} morrem na explosão em {STATION}!
-STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIG_FONT}{BLACK}Acidente de Aeronave!{}Avião ficou sem combustível, {COMMA} morrem no incêndio!
+STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BIG_FONT}{BLACK}Acidente com Veículo Rodoviário{}{COMMA} pessoa{P "" s} morre{P u ram} na explosão após a colisão com um comboio!
+STR_NEWS_AIRCRAFT_CRASH                                         :{BIG_FONT}{BLACK}Acidente de Aeronave!{}{COMMA} pessoa{P "" s} morre{P u ram} na explosão em {STATION}!
+STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIG_FONT}{BLACK}Acidente de Aeronave!{}Avião ficou sem combustível, {COMMA} pessoa{P "" s} morre{P u ram} no incêndio!
 
 STR_NEWS_DISASTER_ZEPPELIN                                      :{BIG_FONT}{BLACK}Acidente de Zepelim em {STATION}!
 STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLACK}Veículo rodoviário destruído em colisão com OVNI!
-STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIG_FONT}{BLACK}Explosão da Refinaria de Petróleo em {TOWN}!
-STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIG_FONT}{BLACK}Fábrica destruída em circunstâncias suspeitas em {TOWN}!
+STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIG_FONT}{BLACK}Explosão em refinaria de petróleo perto de {TOWN}!
+STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIG_FONT}{BLACK}Fábrica perto de {TOWN} foi destruída em circunstâncias suspeitas!
 STR_NEWS_DISASTER_BIG_UFO                                       :{BIG_FONT}{BLACK}OVNI pousa em {TOWN}!
-STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIG_FONT}{BLACK}Subsidência da Mina de Carvão deixa um rasto de destruição em {TOWN}!
-STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIG_FONT}{BLACK}Inundações!{}Pelo menos {COMMA} perdidos ou mortos após terríveis inundações!
+STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIG_FONT}{BLACK}Afundamento em mina de carvão perto de {TOWN} causa rasto de destruição!
+STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIG_FONT}{BLACK}Inundações!{}Pelo menos {COMMA} pessoa{P 0 "" s} desaparecida{P 0 "" s} ou morta{P 0 "" s} após terrível desastre!
 
 STR_NEWS_COMPANY_IN_TROUBLE_TITLE                               :{BIG_FONT}{BLACK}Empresa de transportes em dificuldades!
 STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION                         :{BIG_FONT}{BLACK}{STRING} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve!
 STR_NEWS_COMPANY_MERGER_TITLE                                   :{BIG_FONT}{BLACK}Fusão de empresa de transportes!
 STR_NEWS_COMPANY_MERGER_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} foi vendida a {STRING} por {CURRENCY_LONG}!
-STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLACK}Falida!
-STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} foi fechada pelos credores e todos os seus bens foram vendidos!
+STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLACK}Faliu!
+STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} foi encerrada por credores e todos os ativos foram vendidos!
 STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}Nova empresa de transportes!
 STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} inicia construção em {TOWN}!
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} foi comprada por {STRING} por um valor não revelado!
@@ -879,8 +878,8 @@ STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDE
 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} subsidiou a construção da nova localidade de {TOWN}!
 STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}Uma nova localidade chamada {TOWN} foi fundada!
 
-STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}Nov{G 0 o o a os as} {STRING} em construção em {TOWN}!
-STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}Nov{G 0 o o a os as} {STRING} est{G 0 á á á ão ão} a ser plantad{G 0 o o a os as} em {TOWN}!
+STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}Est{G 0 á á á ão ão} a ser construid{G 0 o o a os as} {G 0 "um " "um " "uma " "" ""}nov{G 0 o o a os as} {STRING} perto de {TOWN}!
+STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}Est{G 0 á á á ão ão} a ser feit{G 0 o o a os as} {G 0 "um " "um " "uma " "" ""}nov{G 0 o o a os as} {STRING} perto de {TOWN}!
 
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIG_FONT}{BLACK}{G 0 "" "O " "A " "Os " "As "}{STRING} anuncia{G 0 "" "" "" m m} fecho iminente!
 STR_NEWS_INDUSTRY_CLOSURE_SUPPLY_PROBLEMS                       :{BIG_FONT}{BLACK}Problemas de abastecimento levam{G 0 "" " o" " a" " os" " as"} {STRING} a anunciar{G 0 "" "" "" em em} fecho iminente!
@@ -888,15 +887,15 @@ STR_NEWS_INDUSTRY_CLOSURE_LACK_OF_TREES                         :{BIG_FONT}{BLAC
 
 STR_NEWS_EURO_INTRODUCTION                                      :{BIG_FONT}{BLACK}União Monetária Europeia!{}{}O Euro é introduzido como moeda única para todas as transacções no seu país!
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIG_FONT}{BLACK}Recessão Mundial!{}{}Especialistas financeiros temem crise económica!
-STR_NEWS_END_OF_RECESSION                                       :{BIG_FONT}{BLACK}Fim da recessão!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece!
+STR_NEWS_END_OF_RECESSION                                       :{BIG_FONT}{BLACK}Fim da recessão!{}{}Melhorias no comércio inspiram confiança nas indústrias enquanto a economia recupera!
 
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL                   :{BIG_FONT}{BLACK}{G 0 "" "O " "A " "Os " "As "}{INDUSTRY} aumenta{G 0 "" "" "" m m} a produção!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL                      :{BIG_FONT}{BLACK}Nova camada de Carvão encontrada {G 0 em no na nos nas} {INDUSTRY}!{}Produção deverá duplicar!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL                       :{BIG_FONT}{BLACK}Novas reservas de Petróleo encontradas {G 0 em no na nos nas} {INDUSTRY}!{}Produção deverá duplicar!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIG_FONT}{BLACK}Nova prática de agricultura duplica a produção {G 0 em no na nos nas} {INDUSTRY}!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL                      :{BIG_FONT}{BLACK}Foi descoberto um novo estrato de carvão {G 0 em no na nos nas} {INDUSTRY}!{}Espera-se duplicar a produção!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL                       :{BIG_FONT}{BLACK}Novas reservas de petróleo encontradas {G 0 em no na nos nas} {INDUSTRY}!{}Espera-se duplicar a produção!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIG_FONT}{BLACK}Nova técnica de cultivo leva à duplicação da produção {G 0 em no na nos nas} {INDUSTRY}!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH                    :{BIG_FONT}{BLACK}Produção de {STRING} {G 1 em no na nos nas} {INDUSTRY} aumenta {COMMA}%!
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BIG_FONT}{BLACK}Produção d{G 0 e o a os as} {INDUSTRY} reduzida em 50%!
-STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM                      :{BIG_FONT}{BLACK}Praga de insectos {G 0 em no na nos nas} {INDUSTRY}!{}Produção diminui 50%!
+STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM                      :{BIG_FONT}{BLACK}Praga de insetos causa estragos {G 0 em no na nos nas} {INDUSTRY}!{}A produção diminui 50%!
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIG_FONT}{BLACK}Produção de {STRING} {G 1 em no na nos nas} {INDUSTRY} diminui {COMMA}%!
 
 ###length VEHICLE_TYPES
@@ -914,8 +913,8 @@ STR_NEWS_VEHICLE_HAS_INVALID_ENTRY                              :{WHITE}{VEHICLE
 STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY                            :{WHITE}{VEHICLE} tem um aeroporto nas ordens cuja pista de aterragem é muito curta
 
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} está a ficar velho
-STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} está a ficar muito velho
-STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} está a ficar muito velho e urgentemente necessita de substituição
+STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} está a ficar demasiado velho
+STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} está a ficar demasiado velho e necessita de ser substituído urgentemente
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} não consegue encontrar um caminho para continuar
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} está perdido
 STR_NEWS_VEHICLE_UNPROFITABLE_YEAR                              :O lucro de {WHITE}{VEHICLE} no último ano foi {CURRENCY_LONG}
@@ -923,7 +922,7 @@ STR_NEWS_VEHICLE_UNPROFITABLE_PERIOD                            :O lucro de {WHI
 STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE} não consegue chegar ao próximo destino pois está fora de alcance
 
 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} parou porque a ordem de adaptação falhou
-STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Auto-renovação falhou para {VEHICLE}{}{STRING}
+STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Renovação automática falhou para {VEHICLE}{}{STRING}
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLACK}Novo modelo de {STRING} agora disponível!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
@@ -931,21 +930,21 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Novo mod
 
 STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Abrir a janela de grupo focada no grupo do veículo
 
-STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST                   :{WHITE}{STATION} já não aceita: {CARGO_LIST}
-STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST                         :{WHITE}{STATION} agora aceita: {CARGO_LIST}
+STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST                   :{WHITE}{STATION} já não aceita{G 0 "" "" "" m m}: {CARGO_LIST}
+STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST                         :{WHITE}{STATION} agora aceita{G 0 "" "" "" m m}: {CARGO_LIST}
 
-STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Oferta de subsídio expirou:{}{}Serviço de {STRING} de {STRING} para {STRING} já não é subsidiado.
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subsídio retirado:{}{} serviço de {STRING} de {STRING} para {STRING} já não é subsidiado
-STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Subsídio de serviço oferecido:{}{}Primeiro {STRING} de {STRING} para {STRING} irá receber {UNITS_YEARS_OR_MINUTES} de subsídio pela autoridade local!
+STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Oferta de subsídio expirou:{}{}Transporte de {STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} deixou de ser subsidiado
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subsídio retirado:{}{}Transporte de {STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} já não é subsidiado
+STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Oferta de subsídio de serviço:{}{}Primeiro transporte de {STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} irá receber subsídio da autoridade local durante {UNITS_YEARS_OR_MINUTES}!
 ###length 4
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} de {STRING} para {STRING} será pago a 150% durante {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} de {STRING} para {STRING} será pago a 200% durante {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} de {STRING} para {STRING} será pago a 300% durante {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} de {STRING} para {STRING} será pago a 400% durante {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} será pago a 150% durante {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} será pago a 200% durante {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} será pago a 300% durante {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}Subsídio de serviço concedido a {STRING}!{}{}{STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING} será pago a 400% durante {UNITS_YEARS_OR_MINUTES}!
 
-STR_NEWS_ROAD_REBUILDING_MONTHS                                 :{BIG_FONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução das estradas financiado por {STRING} provoca 6 meses de sofrimento aos motoristas!
-STR_NEWS_ROAD_REBUILDING_MINUTES                                :{BIG_FONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução das estradas financiado por {STRING} provoca 6 minutos de sofrimento aos motoristas!
-STR_NEWS_EXCLUSIVE_RIGHTS_TITLE                                 :{BIG_FONT}{BLACK}Monopólio de Transporte!
+STR_NEWS_ROAD_REBUILDING_MONTHS                                 :{BIG_FONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Iniciativa de reconstrução das estradas financiado por {STRING} provoca 6 meses de sofrimento aos motoristas!
+STR_NEWS_ROAD_REBUILDING_MINUTES                                :{BIG_FONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Iniciativa de reconstrução das estradas financiado por {STRING} provoca 6 minutos de sofrimento aos motoristas!
+STR_NEWS_EXCLUSIVE_RIGHTS_TITLE                                 :{BIG_FONT}{BLACK}Monopólio dos Transportes!
 STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION_MONTHS                    :{BIG_FONT}{BLACK}A autoridade local de {TOWN} assinou um contrato com {STRING} por 12 meses de direitos exclusivos de transporte!
 STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION_MINUTES                   :{BIG_FONT}{BLACK}A autoridade local de {TOWN} assinou um contrato com {STRING} por 12 minutos de direitos exclusivos de transporte!
 
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copiar a
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opções do Jogo
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Geral
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Escolher definições gerais
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Escolher definições gerais
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gráficos
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Escolher definições gráficas
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Escolher as definições gráficas
 STR_GAME_OPTIONS_TAB_SOUND                                      :Som
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Escolher definições de sons e música
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Escolher as definições de sons e música
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Escolher as definições de integração social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Escolher as definições de integração social
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avançado
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Alterar definições avançadas
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efeitos sonoros
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidades monetárias
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecção de unidades monetárias
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unidades monetárias
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Seleção de unidades monetárias
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -983,7 +986,7 @@ STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRI
 STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra Britânica
 STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar dos E.U.A.
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yen Japonês
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Iene Japonês
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Xelim Austríaco
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco Belga
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco Suíço
@@ -991,13 +994,13 @@ STR_GAME_OPTIONS_CURRENCY_CZK                                   :Coroa Checa
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco Alemão
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Coroa Dinamarquesa
 STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta Espanhola
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marco Finlandês
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marca Finlandesa
 STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco Francês
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma Grego
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florim Húngaro
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Coroa Islandesa
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiana
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Florim Holandês
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Florim Neerlandês
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Coroa Norueguesa
 STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zlóti Polaco
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu Romeno
@@ -1009,10 +1012,10 @@ STR_GAME_OPTIONS_CURRENCY_SKK                                   :Coroa Eslovaca
 STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real Brasileiro
 STR_GAME_OPTIONS_CURRENCY_EEK                                   :Coroa Estoniana
 STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas Lituanias
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won Sul Coreano
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rand Sul Africano
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Uone Sul-Coreano
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rande Sul-Africano
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalizado...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiano
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lári Georgiano
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniano
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novo Rublo Russo
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso Mexicano
@@ -1021,13 +1024,13 @@ STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi chinê
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar de Hong Kong
 STR_GAME_OPTIONS_CURRENCY_INR                                   :Rupia Indiana
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia Indonésia
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit da Malásia
-STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats da Letónia
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringuite Malaio
+STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latse Letão
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo Português
-STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia Ucraniana
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :Grívnia Ucraniana
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Guardar automaticamente
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Seleccionar o intervalo para guardar automático
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Guardar automaticamente
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selecionar o intervalo para guardar o jogo automaticamente
 
 # Autosave dropdown
 ###length 5
@@ -1037,83 +1040,85 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :A cada 30 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :A cada 60 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :A cada 120 minutos
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Idioma
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Seleccionar o idioma da interface do jogo
+STR_GAME_OPTIONS_LANGUAGE                                       :Língua
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selecionar a Língua da interface do jogo
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% concluído)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Ecrã Inteiro
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Seleccione esta opção para jogar o OpenTTD em modo de ecrã inteiro
+STR_GAME_OPTIONS_FULLSCREEN                                     :Ecrã Inteiro
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Seleccione esta opção para jogar o OpenTTD em modo de ecrã inteiro
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolução do ecrã
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Seleccione a resolução do ecrã que deseja utilizar
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolução do ecrã
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecione a resolução do ecrã que deseja utilizar
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :outra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aceleração por hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Marque esta caixa para permitir que o OpenTTD tente usar a aceleração por hardware. Uma configuração alterada só será aplicada após reiniciar o jogo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aceleração por hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marque esta opção para permitir que o OpenTTD tente usar a aceleração por hardware. Uma definição alterada só será aplicada após reiniciar o jogo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}A definição só terá efeito após reiniciar o jogo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Marque esta caixa para ativar "V-Sync" no ecrã. Uma configuração alterada só terá efeito quando reiniciar o jogo. Só funciona com a aceleração por hardware ativada
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Marque esta opção para ativar v-sync no ecrã. Uma definição alterada só terá efeito quando reiniciar o jogo. Só funciona com a aceleração por hardware ativada
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}"Driver" atual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador atual: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Tamanho do interface
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arrastar o controlo deslizante para definir o tamanho do interface. Ctrl+Arrastar para um ajuste contínuo
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Auto-detetar o tamanho
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marque esta caixa para detetar automaticamente o tamanho do interface
+STR_GAME_OPTIONS_INTERFACE                                      :Interface
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Escalar chanfros
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marque esta caixa para dimensionar os chanfros por tamanho de interface
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Tamanho da interface
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arrastar o controlo deslizante para definir o tamanho da interface. Ctrl+Arrastar para um ajuste contínuo
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detetar automaticamente o tamanho
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marque esta opção para detetar automaticamente o tamanho do interface
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usar a fonte "sprite" tradicional
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marque esta caixa se prefere usar o tipo de fonte tradicional de tamanho fixo
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Fontes anti-alias
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marque esta caixa para fontes redimensionáveis com anti-alias
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escalar chanfros
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marque esta opção para dimensionar os chanfros por tamanho de interface
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usar o tipo de letra com gráficos tradicionais
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marque esta opção se prefere usar o tipo de letra tradicional de tamanho fixo
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Tipos de letra com contornos suaves
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marque esta opção para tipos de letra redimensionáveis com contornos suaves
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Sondagem automatizada
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participar numa sondagem automatizada
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Quando ativo, o OpenTTD transmitirá uma sondagem ao deixar um jogo
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Sobre sondagem e privacidade
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Isto abre um navegador com mais informações sobre a pesquisa automatizada
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Pré-visualizar resultado da sondagem
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostrar o resultado da sondagem do jogo atual a decorrer
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Sondagem automatizada
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participar numa sondagem automatizada
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Quando ativo, o OpenTTD transmitirá uma sondagem ao deixar um jogo
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Sobre sondagem e privacidade
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Isto abre um navegador com mais informações sobre a sondagem automatizada
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Pré-visualizar resultado da sondagem
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostrar o resultado da sondagem do jogo atual a decorrer
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Gráficos
+STR_GAME_OPTIONS_DISPLAY                                        :Ecrã
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Exibir taxa de atualização
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Selecione a taxa de atualização do ecrã para usar
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Taxa de atualização do Ecrã
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Selecione a taxa de atualização do ecrã para usar
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Taxas de atualização maiores que 60Hz podem interferir no desempenho.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecione o conjunto de gráficos base a usar (não pode ser alterado no jogo, só a partir do menu principal)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informação adicional sobre o conjunto de gráficos base
+STR_GAME_OPTIONS_BASE_GRF                                       :Conjunto de gráficos base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecione o conjunto de gráficos base a usar (não pode ser alterado no jogo, só a partir do menu principal)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informação adicional sobre o conjunto de gráficos base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Conjunto de sons base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selecione o conjunto de sons base a usar (não pode ser alterado no jogo, só a partir do menu principal)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informação adicional sobre o conjunto de sons base
+STR_GAME_OPTIONS_BASE_SFX                                       :Conjunto de sons base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selecione o conjunto de sons base a usar (não pode ser alterado no jogo, só a partir do menu principal)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informação adicional sobre o conjunto de sons base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Conjunto de música base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Seleccione o conjunto de música base a usar
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informação adicional sobre o conjunto de música base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Conjunto de música base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Seleccione o conjunto de música base a usar
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informação adicional sobre o conjunto de música base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Obter Conteúdo
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Verificar se há conteúdo novo e atualizado para descarga
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(não existem "plugins" para integrar com as plataformas sociais instaladas)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(não existem extensões para integrar com as plataformas sociais instaladas)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estado do plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estado da extensão:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}A correr
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Falha ao inicializar
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} não está a correr
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNLOADED                   :{RED}Descarregado
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}Plugin duplicado
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}Extensão duplicada
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNSUPPORTED_API            :{RED}Versão não suportada
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_INVALID_SIGNATURE          :{RED}Assinatura inválida
 
@@ -1126,9 +1131,9 @@ STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Modo de
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda personalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de conversão: {ORANGE}{CURRENCY_LONG} = £ {COMMA}
-STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Diminuir a quantidade da sua moeda para uma Libra (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Diminuir o valor da sua moeda em relação a uma Libra Britânica (£)
 STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Aumentar a quantidade da sua moeda para uma Libra (£)
-STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Definir a taxa de câmbio da sua moeda para uma Libra (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Definir a taxa de conversão da sua moeda para uma Libra Britânica (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador: {ORANGE}{STRING}
 STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Define o separador para a sua moeda
@@ -1138,9 +1143,9 @@ STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Definir
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo: {ORANGE}{STRING}
 STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Definir o sufixo para a sua moeda
 
-STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar para Euro: {ORANGE}{NUM}
-STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mudar para Euro: {ORANGE}nunca
-STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Definir o ano para mudar para Euro
+STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar para o Euro: {ORANGE}{NUM}
+STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mudar para o Euro: {ORANGE}Nunca
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Definir o ano para mudar para o Euro
 STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mudar para Euro mais cedo
 STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mudar para Euro mais tarde
 
@@ -1220,12 +1225,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissivo (sem
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Não existem IAs disponíveis...{}{}Pode descarregar várias IAs através do sistema de 'Conteúdo Online'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Definições
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtro:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expandir todas
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Colapsar todas
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Repor todos os valores
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtro:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expandir todas
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Colapsar todas
+STR_CONFIG_SETTING_RESET_ALL                                    :Repor todos os valores
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(sem explicação disponível)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor por omissão: {ORANGE}{STRING}
@@ -1238,12 +1242,12 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Configurações
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Cuidado!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Esta ação vai repor todas as configurações do jogo para os seus valores padrão.{}Tem a certeza que deseja continuar?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restringe a lista abaixo para mostrar apenas opções modificadas
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restringe a lista abaixo para mostrar apenas opções modificadas
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Opções básicas (mostrar apenas definições importantes)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avançado (mostra grande parte das definições)
-STR_CONFIG_SETTING_RESTRICT_ALL                                 :Avançado (mostrar todas as definições, incluindo as estranhas)
+STR_CONFIG_SETTING_RESTRICT_ALL                                 :Avançado (mostrar todas as definições, incluindo as que são estranhas)
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Opções com um valor diferente das de origem
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Preferências com um valor diferente das preferências para novos jogos
 
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Configurações
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nenhum -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Mostrar todos os resultados de pesquisa por configuração{}{SILVER}Categoria {BLACK}para {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Mostrar todos os resultados de pesquisa por configuração{}{SILVER}Tipo {BLACK}para {WHITE}Todos os tipos de configuração
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Mostrar todos os resultados de pesquisa por configuração{}{SILVER}Categoria {BLACK}para {WHITE}{STRING} {BLACK}e {SILVER}Tipo {BLACK}para {WHITE}Todos os tipos de configuração
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Mostrar todos os resultados da pesquisa definindo{}{PUSH_COLOUR}{SILVER}Categoria {POP_COLOUR}para {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Mostrar todos os resultados da pesquisa por definição{}{PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}para {WHITE}Todos os tipos de definição
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Mostrar todos os resultados da pesquisa por configuração{}{PUSH_COLOUR}{SILVER}Categoria {POP_COLOUR}para {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}e {PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}para {WHITE}Todos os tipos de definições
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Desligado
@@ -1332,13 +1336,13 @@ STR_CONFIG_SETTING_CITY_APPROVAL                                :Atitude da auto
 STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :Escolha de que forma o ruído e os danos ambientais causados pelas empresas afetam a classificação da sua localidade e futuras ações de construção na localidade
 
 STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT                             :Limite de altura do mapa: {STRING}
-STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT                    :Define a altura máxima do terreno do mapa. Com "(auto)" um bom valor será escolhido após a geração do terreno
+STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT                    :Define a altura máxima do terreno do mapa. Com "(automático)" um valor adequado será escolhido após a geração do terreno
 STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_VALUE                       :{NUM}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_AUTO                        :(auto)
+STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_AUTO                        :(automático)
 STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE}Não pode definir o limite de altura do mapa para este valor. Pelo menos uma montanha no mapa é mais alta
 
-STR_CONFIG_SETTING_AUTOSLOPE                                    :Permite alteração de terra sob edifícios, vias, etc. (auto-declive): {STRING}
+STR_CONFIG_SETTING_AUTOSLOPE                                    :Permitir desníveis de terra sob edifícios, vias, etc.: {STRING}
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Permite alteração de terra sob edifícios e vias sem os remover
 
 STR_CONFIG_SETTING_CATCHMENT                                    :Dimensionamento mais realista de áreas de abrangência: {STRING}
@@ -1347,15 +1351,15 @@ STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Haver diferente
 STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :Estações da empresa podem servir indústrias com estações neutras anexadas: {STRING}
 STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Quando ativo, indústrias com estações incluídas (com as Petrolíferas) podem ser servidas por estações-da-empresa construídas nas redondezas. Quando inativo, estas indústrias só podem ser servidas pela sua própria estação. Qualquer estação da empresa não poderá servir a indústria, nem a estação incluída pode servir outra entidade senão a própria indústria
 
-STR_CONFIG_SETTING_EXTRADYNAMITE                                :Permite remover mais estradas, pontes e túneis detidos pela cidade: {STRING}
+STR_CONFIG_SETTING_EXTRADYNAMITE                                :Permitir remover mais estradas, pontes e túneis detidos pela cidade: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :Facilitar a remoçar de edifícios e infraestruturas detidas pela localidade
 
-STR_CONFIG_SETTING_TRAIN_LENGTH                                 :Tamanho máximo de comboios: {STRING}
-STR_CONFIG_SETTING_TRAIN_LENGTH_HELPTEXT                        :Assignar o tamanho máximo dos comboios
+STR_CONFIG_SETTING_TRAIN_LENGTH                                 :Comprimento máximo dos comboios: {STRING}
+STR_CONFIG_SETTING_TRAIN_LENGTH_HELPTEXT                        :Definir o comprimento máximo dos comboios
 STR_CONFIG_SETTING_TILE_LENGTH                                  :{COMMA} mosaico{P 0 "" s}
 
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :Quantidade de fumo/faíscas de veículos: {STRING}
-STR_CONFIG_SETTING_SMOKE_AMOUNT_HELPTEXT                        :Assignar quanto fumo ou quantas faíscas são emitidas pelos veículos
+STR_CONFIG_SETTING_SMOKE_AMOUNT_HELPTEXT                        :Definir a quantidade de fumo ou quantas faíscas são emitidas pelos veículos
 
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :Modelo de aceleração de comboios: {STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_HELPTEXT            :Escolha o modelo de física para a aceleração de comboios. O modelo "original" penaliza as inclinações para todos os veículos. O modelo "realista" penaliza as curvas e inclinações tendo em conta várias propriedades do comboio, tais como o comprimento e o esforço de tração
@@ -1379,13 +1383,13 @@ STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :Permite acresce
 STR_CONFIG_SETTING_INFLATION                                    :Inflação: {STRING}
 STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Ativar inflação na economia, para que os preços subam ligeiramente mais rápido do que os pagamentos
 
-STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Tamanho máximo de ponte: {STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Tamanho máximo das pontes: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Tamanho máximo para construção de pontes
 
 STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Altura máxima de ponte: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT                   :Altura máxima para construir pontes
 
-STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Tamanho máximo de túneis: {STRING}
+STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Comprimento máximo dos túneis: {STRING}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT                   :Tamanho máximo para construção de túneis
 
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :Método de financiamento de indústrias primárias: {STRING}
@@ -1419,12 +1423,12 @@ STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT_PERIOD                 :Se ativado, a j
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :Novas ordens são 'sem parar' por predefinição: {STRING}
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT                  :Normalmente, um veículo para em cada estação por onde passa. Ao ativar esta configuração, um veículo irá passar por todas as estações no seu percurso, parando apenas no destino final. Esta opção só tem efeito para novas rotas, mas as rotas existentes podem ser alteradas para funcionarem de forma igual.
 
-STR_CONFIG_SETTING_STOP_LOCATION                                :Ordens novas do comboio param {STRING} da plataforma
-STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT                       :Local de paragem do comboio nas plataformas por omissão. A opção 'extremo mais próximo' significa perto do ponto de entrada, 'meio' significa no meio da plataforma e 'extremo mais distante' significa o mais distante possível do ponto de entrada. Esta opção apenas afeta o valor por omissão para novas ordens. Ordens individuais podem ter o local de paragem definido clicando no texto da ordem
+STR_CONFIG_SETTING_STOP_LOCATION                                :Novas ordens do comboio, por padrão, param n{G 0 o o a os as} {STRING} da plataforma
+STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT                       :Local de paragem do comboio nas plataformas por omissão. A opção 'extremo inical' significa perto do ponto de entrada, 'meio' significa no meio da plataforma e 'extremo oposto' significa o mais distante possível do ponto de entrada. Esta opção apenas afeta o valor por omissão para novas ordens. Ordens individuais podem ter o local de paragem definido clicando no texto da ordem
 ###length 3
-STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :no extremo perto
-STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :no meio
-STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :no extremo longe
+STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :{G=m}extremo inicial
+STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :{G=m}meio
+STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :{G=m}extremo oposto
 
 STR_CONFIG_SETTING_AUTOSCROLL                                   :Deslocar janela quando o rato está na borda do mapa: {STRING}
 STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT                          :Quando ativo, os visualizadores começam a deslocar-se logo que o rato esteja no extremo da janela
@@ -1434,7 +1438,7 @@ STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT_FULLSCREEN          :Visualizador pr
 STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT                     :Visualizador principal
 STR_CONFIG_SETTING_AUTOSCROLL_EVERY_VIEWPORT                    :Todos os visualizadores
 
-STR_CONFIG_SETTING_BRIBE                                        :Permite o suborno da autoridade local: {STRING}
+STR_CONFIG_SETTING_BRIBE                                        :Permitir o suborno da autoridade local: {STRING}
 ###length 2
 STR_CONFIG_SETTING_BRIBE_HELPTEXT                               :Permite que as empresas tentem subornar a autoridade local. Se o suborno for descoberto por um inspetor, a empresa não poderá atuar nessa localidade durante seis meses
 STR_CONFIG_SETTING_BRIBE_HELPTEXT_MINUTES                       :Permite que as empresas tentem subornar a autoridade local. Se o suborno for descoberto por um inspetor, a empresa não poderá atuar nessa localidade durante seis minutos
@@ -1444,13 +1448,13 @@ STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :Permite comprar
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT                     :Se uma empresa comprar direitos exclusivos de transporte para uma localidade, as estações dos concorrentes (passageiros e carga) não receberão carga durante 12 meses
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT_MINUTES             :Se uma empresa comprar direitos exclusivos de transporte para uma localidade, as estações dos concorrentes (passageiros e carga) não receberão carga durante 12 minutos
 
-STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :Permite investir em edifícios: {STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :Permitir financiar novos edifícios: {STRING}
 STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT                :Permite que empresas doem dinheiro às localidades para financiar novas casas
 
-STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :Permite financiar a reconstrução de estradas locais:{STRING}
-STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT                     :Permite que as empresas financiem reconstruções de estradas para sabotar o tráfego rodoviário na localidade.
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :Permitir financiar a reconstrução de estradas locais:{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT                     :Permitir que as empresas financiem reconstruções de estradas para sabotar o tráfego rodoviário na localidade.
 
-STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :Permite enviar dinheiro para outras empresas: {STRING}
+STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :Permitir enviar dinheiro para outras empresas: {STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT                    :Permite transferências de dinheiro entre empresas em modo multi-jogador
 
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :Multiplicador de peso para simular comboios pesados: {STRING}
@@ -1470,7 +1474,7 @@ STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :Normal
 STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR                     :Permitir passagens de nível com estradas ou carris de outras empresas: {STRING}
 STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR_HELPTEXT            :Permite a construção de passagens de nível nas estradas ou carris pertencentes a outras empresas
 
-STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :Permite estações de passagem nas estradas pertencentes às localidades: {STRING}
+STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :Permitir estações de passagem nas estradas pertencentes às localidades: {STRING}
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :Permite a construção de estações de passagem nas ruas pertencentes a localidades.
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :Permitir estações de passagem nas estradas detidas pelos competidores: {STRING}
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :Permite a construção de estações de passagem nas estradas que são de outras empresas
@@ -1520,7 +1524,7 @@ STR_CONFIG_SETTING_MINUTES_PER_YEAR_HELPTEXT                    :Escolher o núm
 
 STR_CONFIG_SETTING_MINUTES_PER_YEAR_VALUE                       :{NUM}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_MINUTES_PER_YEAR_FROZEN                      :0 (tempo do calendário congelado)
+STR_CONFIG_SETTING_MINUTES_PER_YEAR_FROZEN                      :0 (tempo do calendário fica congelado)
 
 STR_CONFIG_SETTING_TOWN_CARGO_SCALE                             :Escalar a produção de carga da localidade: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGO_SCALE_HELPTEXT                    :Escalar a produção de carga das localidades nesta percentagem
@@ -1528,17 +1532,17 @@ STR_CONFIG_SETTING_INDUSTRY_CARGO_SCALE                         :Escalar a produ
 STR_CONFIG_SETTING_INDUSTRY_CARGO_SCALE_HELPTEXT                :Escalar a produção de carga das indústrias nesta percentagem
 STR_CONFIG_SETTING_CARGO_SCALE_VALUE                            :{NUM}%
 
-STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :Auto-renovação de veículos quando ficam velhos: {STRING}
+STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :Renovar automaticamente os veículos quando estão a ficar velhos: {STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE_HELPTEXT                   :Quando ativo, um veículo a chegar ao fim de vida é automaticamente substituído quando as condições de renovação estão reunidas
 
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :Renovar automaticamente quando um veículo chega a {STRING} a idade máxima
-STR_CONFIG_SETTING_AUTORENEW_MONTHS_HELPTEXT                    :Idade relativa a partir da qual um veículo deva ser indicado para auto-renovação
+STR_CONFIG_SETTING_AUTORENEW_MONTHS_HELPTEXT                    :Idade relativa a partir da qual um veículo deva ser indicado para a renovação automática
 ###length 2
-STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_BEFORE                :{COMMA} {P "mês" "meses"} antes
-STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_AFTER                 :{COMMA} {P "mês" "meses"} após
+STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_BEFORE                :{COMMA} m{P 0 ês eses} antes
+STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_AFTER                 :{COMMA} m{P 0 ês eses} depois
 
-STR_CONFIG_SETTING_AUTORENEW_MONEY                              :Dinheiro mínimo para fazer auto-renovação: {STRING}
-STR_CONFIG_SETTING_AUTORENEW_MONEY_HELPTEXT                     :Quantidade mínima de dinheiro que tem que estar no banco para auto-renovação de veículos ser considerada
+STR_CONFIG_SETTING_AUTORENEW_MONEY                              :Dinheiro mínimo para fazer renovação automática: {STRING}
+STR_CONFIG_SETTING_AUTORENEW_MONEY_HELPTEXT                     :Quantidade mínima de dinheiro que tem que estar no banco para a renovação automática de veículos ser considerada
 
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :Duração da mensagem de erro: {STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT                     :Duração da visualização de mensagens de erro em janela vermelha. Note que algumas mensagens de erro (críticas) não são fechadas após este tempo e têm que ser fechadas manualmente
@@ -1552,7 +1556,7 @@ STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Clique com bot
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Mostra população da localidade na identificação da mesma: {STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Mostrar a população das localidades na sua etiqueta no mapa
 
-STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Grossura das linhas nos gráficos: {STRING}
+STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Espessura das linhas nos gráficos: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Largura da linha nos gráficos. Uma linha mais estreita é de leitura mais precisa, enquanto uma linha mais espessa é mais fácil de ver e as cores distinguem-se melhor.
 
 STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :Exibir o nome do "NewGRF" na janela de compra de veículos: {STRING}
@@ -1561,7 +1565,7 @@ STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS                          :Mostrar as carg
 STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS_HELPTEXT                 :Quando ativo, a carga transportável do veículo aparecerá acima nas listas de veículos
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :Cenário: {STRING}
-STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Os climas definem a jogabilidade base dos cenários com diferentes cargas e requisitos de crescimento das localidades. Os "NewGRF" e "Scripts" de Jogo permitem um controlo mais preciso.
+STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Os climas definem a jogabilidade base dos cenários com diferentes cargas e requisitos de crescimento das localidades. Os NewGRF e Scripts de Jogo permitem um controlo mais preciso.
 
 STR_CONFIG_SETTING_LAND_GENERATOR                               :Gerador de terreno: {STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT                      :O gerador original é dependente do conjunto gráfico base, e compõe formas de terreno já afixadas. TerraGenesis é um gerador baseado no algoritmo de ruído de Perlin que permite definições mais refinadas
@@ -1589,7 +1593,7 @@ STR_CONFIG_SETTING_DESERT_COVERAGE                              :Cobertura do de
 STR_CONFIG_SETTING_DESERT_COVERAGE_HELPTEXT                     :Escolher a quantidade aproximada de deserto na paisagem tropical. O deserto também afeta a geração de indústrias e os requisitos de crescimento das localidades. Usado apenas durante a geração do mapa
 STR_CONFIG_SETTING_DESERT_COVERAGE_VALUE                        :{NUM}%
 
-STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :Rudeza do terreno: {STRING}
+STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :Irregularidade do terreno: {STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT                :Escolher a forma e o número de colinas. As paisagens suaves têm poucas colinas, largas, enquanto as paisagens acidentadas possuem mais, colinas pequenas
 ###length 4
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Muito suave
@@ -1670,7 +1674,7 @@ STR_CONFIG_SETTING_LIVERIES                                     :Mostrar estampa
 STR_CONFIG_SETTING_LIVERIES_HELPTEXT                            :Controla a utilização de decorações específicas por tipo de veículo (em vez de decorações por empresa)
 ###length 3
 STR_CONFIG_SETTING_LIVERIES_NONE                                :Nenhum
-STR_CONFIG_SETTING_LIVERIES_OWN                                 :Própria empresa
+STR_CONFIG_SETTING_LIVERIES_OWN                                 :Só da própria empresa
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :Todas as empresas
 
 STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :Escolher chat de equipa com <ENTER>: {STRING}
@@ -1715,10 +1719,10 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_NO                     :Não
 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES                    :Sim
 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES_EXCEPT_STICKY      :Sim, exceto coladas
 
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :Usar formato de data {STRING} para jogos gravados.
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT           :Formato da data nos ficheiros de jogos gravados
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :Usar formato de data {STRING} para jogos guardados.
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT           :Formato da data nos ficheiros de jogos guardados
 ###length 3
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :longo (31 Dez 2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :longo (31 de Dez. de 2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :curto (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
 
@@ -1876,8 +1880,8 @@ STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER_HELPTEXT    :Mostrar um jorn
 STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS                     :Acidentes / desastres: {STRING}
 STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS_HELPTEXT            :Mostrar um jornal quando ocorrem acidentes ou desastres
 
-STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER                          :Acidentes de veículos dos concorrentes: {STRING}
-STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER_HELPTEXT                 :Mostrar um jornal sobre veículos acidentados para concorrentes
+STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER                          :Acidentes de veículos da concorrência: {STRING}
+STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER_HELPTEXT                 :Mostrar um jornal sobre veículos acidentados da concorrência
 
 STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION                     :Informações da empresa: {STRING}
 STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION_HELPTEXT            :Mostrar um jornal quando uma empresa nova é criada, ou quando uma empresa está à beira da falência
@@ -1923,7 +1927,7 @@ STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Noticias a core
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Ano em que os anúncios de jornal começam a ser mostrados a cores. Antes deste ano, serão mostrados a preto e branco.
 STR_CONFIG_SETTING_STARTING_YEAR                                :Data de início: {STRING}
 
-STR_CONFIG_SETTING_ENDING_YEAR                                  :Ano final de pontuação: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR                                  :Contagem da pontuação final no ano: {STRING}
 STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Ano em que o jogo termina para fins de pontuação. No final deste ano, a pontuação da empresa é registada e a tabela de pontuação máxima é exibida, mas os jogadores podem continuar a jogar depois disso.{} Se isto for antes do ano inicial, a tabela de pontuação máxima nunca será exibida
 STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
 ###setting-zero-is-special
@@ -1951,7 +1955,7 @@ STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE_HELPTEXT         :Selecionar o co
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :Usar automaticamente sinais clássicos antes de: {STRING}
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE_HELPTEXT         :Configurar o ano em que sinais eléctricos podem ser usados para os carris. Antes deste ano, sinais não-eléctricos serão usados (que têm a mesma funcionalidade, mas aspecto diferente)
 
-STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :Trocar tipos de faróis: {STRING}
+STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :Alternar entre tipos de sinais: {STRING}
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT                  :Selecione os tipos de sinais a percorrer com a ferramenta de sinais ao usar Ctrl+Clique num sinal já construído
 ###length 2
 STR_CONFIG_SETTING_CYCLE_SIGNAL_GROUP                           :Apenas grupo atual
@@ -1968,8 +1972,8 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_HELPTEXT                         :Disposição da
 ###length 5
 STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :Original
 STR_CONFIG_SETTING_TOWN_LAYOUT_BETTER_ROADS                     :Estradas melhores
-STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :grelha 2x2
-STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :grelha 3x3
+STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :Grelha 2x2
+STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :Grelha 3x3
 STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :Aleatório
 
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :As localidades têm permissão para construir estradas: {STRING}
@@ -1994,7 +1998,7 @@ STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Proibido
 STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Permitido
 STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :Permitido, totalmente construído
 
-STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Geração de carga citadina: {STRING}
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Geração de carga da localidade: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Quantidade de carga produzida por casas em localidades, relativa à população total da mesma.{}Crescimento quadrático: Uma localidade do dobro do tamanho gera quatro vezes mais passageiros.{}Crescimento linear: Uma localidade do dobro do tamanho gera duas vezes a quantidade de passageiros
 ###length 2
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :Quadrático (original)
@@ -2006,7 +2010,7 @@ STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controlar o apa
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD               :Crescer mas não espalhar {RED}(inutiliza a serração)
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST       :Crescer mas espalhar apenas nas florestas tropicais
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL              :Crescer e espalhar por todo o lado
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD     :Não cresça, não espalhe {RED} (quebra a serraria)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD     :Não crescem e não espalham {RED}(inutiliza a serração)
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posição da barra de ferramentas principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posição horizontal da barra de ferramentas principal no topo do ecrã
@@ -2014,7 +2018,7 @@ STR_CONFIG_SETTING_STATUSBAR_POS                                :Posição da ba
 STR_CONFIG_SETTING_STATUSBAR_POS_HELPTEXT                       :Posição horizontal da barra de estado no fundo do ecrã
 STR_CONFIG_SETTING_SNAP_RADIUS                                  :Raio de alinhamento automático de janelas: {STRING}
 STR_CONFIG_SETTING_SNAP_RADIUS_HELPTEXT                         :Distância entre janelas até que a janela que está a ser movimentada se alinhe automaticamente pelas janelas mais próximas
-STR_CONFIG_SETTING_SNAP_RADIUS_VALUE                            :{COMMA} pixel{P 0 "" s}
+STR_CONFIG_SETTING_SNAP_RADIUS_VALUE                            :{COMMA} píxe{P 0 l is}
 ###setting-zero-is-special
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :Desligado
 STR_CONFIG_SETTING_SOFT_LIMIT                                   :Número máximo de janelas não-coladas: {STRING}
@@ -2035,8 +2039,8 @@ STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X                              :2x
 STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X                              :4x
 STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X                              :8x
 
-STR_CONFIG_SETTING_SPRITE_ZOOM_MIN                              :Resolução máxima de "sprites" a usar: {STRING}
-STR_CONFIG_SETTING_SPRITE_ZOOM_MIN_HELPTEXT                     :Limita a resolução máxima a ser usada para sprites. Limitar a resolução dos sprites evitará o uso de gráficos de alta resolução, mesmo quando disponíveis. Isto pode ajudar a manter a aparência do jogo unificada ao usar uma combinação de ficheiros GRF com e sem gráficos de alta resolução
+STR_CONFIG_SETTING_SPRITE_ZOOM_MIN                              :Resolução máxima de gráficos a usar: {STRING}
+STR_CONFIG_SETTING_SPRITE_ZOOM_MIN_HELPTEXT                     :Limita a resolução máxima a ser usada para os elementos visuais. Limitar a resolução dos elementos visuais evitará o uso de gráficos de alta resolução, mesmo quando disponíveis. Isto pode ajudar a manter a aparência do jogo consistente ao usar uma combinação de ficheiros GRF com e sem gráficos de alta resolução
 ###length 3
 STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_MIN                          :4x
 STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_IN_2X                        :2x
@@ -2051,7 +2055,7 @@ STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :Normal
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :Rápido
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Muito Rápido
 
-STR_CONFIG_SETTING_LARGER_TOWNS                                 :Proporção de localidades que chegarão a cidades: {STRING}
+STR_CONFIG_SETTING_LARGER_TOWNS                                 :Proporção de localidades que se tornarão cidades: {STRING}
 STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT                        :Quantidade de localidades que se tornarão cidades, ou seja uma localidade que começa maior e crescerá mais depressa.
 STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 em {COMMA}
 ###setting-zero-is-special
@@ -2068,7 +2072,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_PAX                             :Modo de distrib
 STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :"Simétrico" significa que aproximadamente o mesmo numero de passageiros irá de uma estação A para uma estação B e de B para A. "Assimétrico" significa que um numero arbitrário de passageiros poderá seguir em qualquer direção. "Manual" significa que nenhuma distribuição automática terá lugar para passageiros
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Modo de distribuição para o correio: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :"Simétrico" significa que aproximadamente a mesma quantidade de correio será enviada de uma estação A para a estação B assim como de B para A. "Assimétrico" significa que uma quantidade arbitrária de correio poderá ser enviada em qualquer direção. "Manual" significa que nenhuma distribuição automática terá lugar para o correio
-STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Modo de distribuição para a classe de carga ARMOURED: {STRING}
+STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Modo de distribuição para a classe de carga BLINDADA: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :A classe de carga BLINDADA contém valores no clima temperado, diamantes no tropical ou ouro no ártico. Os NewGRFs podem mudar isto. "Simétrico" significa que aproximadamente a mesma quantidade de carga será enviada da estação A para a estação B assim como da B para a A. "Assimétrico" significa que quantidades arbitrárias dessa carga podem ser enviadas em qualquer direção. "Manual" significa que nenhuma distribuição automática ocorrerá para essa carga. Recomenda-se que seja definido para assimétrico ou manual quando a jogar no ártico ou no tropical, pois os bancos nesses climas só recebem mercadorias. Para o temperado pode ser também escolhido simétrico pois os bancos irão remeter valores ao banco de origem
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :Modo de distribuição para outras classes de carga: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"Assimétrico" significa que quantidades arbitrárias de carga podem ser enviadas em qualquer direção. "Manual" significa que nenhuma distribuição automática ocorrerá para essas cargas
@@ -2098,7 +2102,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS_DAYS   :Unidades do jog
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS_SECS   :Unidades do jogo (mosaicos/seg)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_KNOTS            :Nós
 
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Unidades de potência de veículos: {STRING}
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Unidades de potência dos veículos: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Quando a potência de um veículo é mostrada no interface de utilizador, mostrar na unidade seleccionada
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :Imperial (hp)
@@ -2184,15 +2188,16 @@ STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... a ig
 STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... a ignorar conjunto Base de Sons '{STRING}': não encontrado
 STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... a ignorar conjunto Musica Base '{STRING}': não encontrado
 STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}Falta de memória
-STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Falha a alocar {BYTES} da cache de sprites. a cache de sprites foi reduzida para {BYTES}. Isto irá reduzir a performance do OpenTTD. Para baixar os requisitos de memória poderá desabilitar gráficos de 32bpp e/ou niveis de zoom
+STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Falha a alocar {BYTES} da cache de elementos visuais. Esta cache foi reduzida para {BYTES}. Isto irá reduzir a performance do OpenTTD. Para baixar os requisitos de memória poderá desabilitar gráficos de 32bpp e/ou níveis de zoom
 
 # Video initalization errors
 STR_VIDEO_DRIVER_ERROR                                          :{WHITE}Erro com as definições gráficas...
-STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... Não foi encontrado um GPU compatível. Aceleração por hardware desativada
-STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... O driver gráfico (GPU) interrompeu o jogo. Aceleração por hardware desativada
+STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... Não foi encontrada uma placa gráfica compatível. Aceleração por hardware desativada
+STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... O controlador gráfico interrompeu o jogo. Aceleração por hardware desativada
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Novo jogo
 STR_INTRO_LOAD_GAME                                             :{BLACK}Carregar jogo
@@ -2203,12 +2208,8 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multi-jo
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opções de jogo
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabela de classificações
-STR_INTRO_HELP                                                  :{BLACK}Ajuda & Manuais
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Definições
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Definições de NewGRF
+STR_INTRO_HELP                                                  :{BLACK}Ajuda e Manuais
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Conteúdo Online
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Definições de IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Definições de Script de Jogo
 STR_INTRO_QUIT                                                  :{BLACK}Sair
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Iniciar um novo jogo. Ctrl+Clique salta a configuração do mapa
@@ -2226,15 +2227,11 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Selecion
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Abrir opções de jogo
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Abrir tabela de classificações
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Obter acesso a documentação e recursos online
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Abrir definições
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Abrir definições de NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Verificar conteúdo novo e actualizado para descarga
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Abrir definições de IA
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Abrir definições de Script de Jogo
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair de 'OpenTTD'
 
-STR_INTRO_BASESET                                               :{BLACK}O conjunto de gráficos base seleccionado tem {NUM} sprite{P "" s} em falta. Por favor verifique se existem atualizações para o conjunto.
-STR_INTRO_TRANSLATION                                           :{BLACK}Faltam {NUM} string{P "" s} nesta tradução. Ajude o OpenTTD em inscrever-se como tradutor. Leia readme.txt para mais detalhes.
+STR_INTRO_BASESET                                               :{BLACK}O conjunto de gráficos base selecionado tem {NUM} elemento{P "" s} visua{P l is} em falta. Por favor, verifique se existem atualizações para este conjunto.
+STR_INTRO_TRANSLATION                                           :{BLACK}Falta{P 0 "" m} traduzir {NUM} linha{P "" s} neste idioma. Por favor, ajude o OpenTTD em inscrever-se como tradutor. Leia readme.txt para mais detalhes.
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Sair
@@ -2248,21 +2245,21 @@ STR_ABANDON_GAME_QUERY                                          :{YELLOW}Tem a c
 STR_ABANDON_SCENARIO_QUERY                                      :{YELLOW}Tem a certeza que deseja abandonar este cenário?
 
 # Help window
-STR_HELP_WINDOW_CAPTION                                         :{WHITE}Ajuda & Manuais
+STR_HELP_WINDOW_CAPTION                                         :{WHITE}Ajuda e Manuais
 STR_HELP_WINDOW_WEBSITES                                        :{BLACK}Páginas de Internet
 STR_HELP_WINDOW_DOCUMENTS                                       :{BLACK}Documentos
 STR_HELP_WINDOW_README                                          :{BLACK}Leia-me
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Registo de alterações
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Erros Conhecidos
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Licença
-STR_HELP_WINDOW_FONTS                                           :{BLACK}Fontes
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Tipos de letra
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Manual / Wiki
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Reportar um erro
 STR_HELP_WINDOW_COMMUNITY                                       :{BLACK}Comunidade
 
 # Cheat window
-STR_CHEATS                                                      :{WHITE}Opções da "sandbox"
+STR_CHEATS                                                      :{WHITE}Opções da 'sandbox'
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY_LONG}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jogando como empresa: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Escavadora mágica (remove indústrias, objetos imóveis): {ORANGE}{STRING}
@@ -2382,7 +2379,7 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Mudar gr
 ###length 3
 STR_NETWORK_SERVER_VISIBILITY_LOCAL                             :Local
 STR_NETWORK_SERVER_VISIBILITY_PUBLIC                            :Público
-STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY                       :Apenas convites
+STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY                       :Apenas por convite
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multi-jogador
@@ -2423,7 +2420,7 @@ STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protegi
 STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR DESLIGADO
 STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR CHEIO
 STR_NETWORK_SERVER_LIST_SERVER_BANNED                           :{SILVER}FOI BANIDO PELO SERVIDOR
-STR_NETWORK_SERVER_LIST_SERVER_TOO_OLD                          :{SILVER}SERVIDOR MUITO ANTIGO
+STR_NETWORK_SERVER_LIST_SERVER_TOO_OLD                          :{SILVER}SERVIDOR DEMASIADO ANTIGO
 STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSÃO INCOMPATÍVEL
 STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF INCOMPATÍVEL
 
@@ -2484,11 +2481,11 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desligar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introduza palavra-chave
 
 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Jogadores "online"
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Jogadores em linha
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :Assistir
 
 # Network client list
-STR_NETWORK_CLIENT_LIST_CAPTION                                 :{WHITE}Jogadores "Online"
+STR_NETWORK_CLIENT_LIST_CAPTION                                 :{WHITE}Jogadores em linha
 STR_NETWORK_CLIENT_LIST_SERVER                                  :{BLACK}Servidor
 STR_NETWORK_CLIENT_LIST_SERVER_NAME                             :{BLACK}Nome
 STR_NETWORK_CLIENT_LIST_SERVER_NAME_TOOLTIP                     :{BLACK}Nome do servidor onde está a jogar
@@ -2514,7 +2511,7 @@ STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP                    :{BLACK}Enviar u
 STR_NETWORK_CLIENT_LIST_CHAT_SPECTATOR_TOOLTIP                  :{BLACK}Enviar uma mensagem a todos os espectadores
 STR_NETWORK_CLIENT_LIST_SPECTATORS                              :Espectadores
 STR_NETWORK_CLIENT_LIST_NEW_COMPANY                             :(Nova empresa)
-STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP                     :{BLACK}Criar uma nova empresa e juntar-se a ela
+STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP                     :{BLACK}Criar uma nova empresa e aderir à mesma
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP                :{BLACK}Este é você
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_HOST_TOOLTIP                :{BLACK}Este é o anfitrião do jogo
 STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT                    :{BLACK}{NUM} cliente{P "" s} - {NUM}/{NUM} companhi{P a as}
@@ -2543,7 +2540,7 @@ STR_NETWORK_ASK_RELAY_NO                                        :{BLACK}Não
 STR_NETWORK_ASK_RELAY_YES_ONCE                                  :{BLACK}Sim, desta vez
 STR_NETWORK_ASK_RELAY_YES_ALWAYS                                :{BLACK}Sim, não perguntar novamente
 
-STR_NETWORK_ASK_SURVEY_CAPTION                                  :Participar na sondagem automatizada ?
+STR_NETWORK_ASK_SURVEY_CAPTION                                  :Participar na sondagem automatizada?
 STR_NETWORK_ASK_SURVEY_TEXT                                     :Pretende participar numa sondagem automatizada?{}OpenTTD irá transmitir uma sondagem ao deixar um jogo.{}Pode alterar isto em qualquer altura nas "Opções de Jogo".
 STR_NETWORK_ASK_SURVEY_PREVIEW                                  :Pré-visualizar resultado da sondagem
 STR_NETWORK_ASK_SURVEY_LINK                                     :Sobre sondagem e privacidade
@@ -2615,7 +2612,7 @@ STR_NETWORK_ERROR_CLIENT_NOT_ON_ALLOW_LIST                      :não está na l
 STR_NETWORK_ERROR_CLIENT_NO_AUTHENTICATION_METHOD_AVAILABLE     :nenhum dos métodos de autenticação solicitados está disponível
 STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :ID da empresa errado na aplicação de rede
 STR_NETWORK_ERROR_CLIENT_KICKED                                 :avisado pelo servidor
-STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava a tentar usar batota
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava a tentar fazer batota
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheio
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :estava a enviar demasiados comandos
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :não foi recebida palavra-chave a tempo
@@ -2656,7 +2653,7 @@ STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} fo
 
 STR_NETWORK_ERROR_COORDINATOR_REGISTRATION_FAILED               :{WHITE}Falha ao registar o servidor
 STR_NETWORK_ERROR_COORDINATOR_REUSE_OF_INVITE_CODE              :{WHITE}Já foi registado um servidor com o mesmo código de convite. A mudar o tipo de jogo para "local".
-STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}O seu servidor não permite conexões remotas
+STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}O seu servidor não permite ligações remotas
 STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL                   :{WHITE}Outros jogadores não conseguirão conetar ao seu servidor
 
 # Content downloading window
@@ -2672,13 +2669,13 @@ STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Sel. act
 STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marcar todo o conteúdo que seja actualização ao conteúdo existente a ser descarregado
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Desseleccionar tudo
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marcar todo o conteúdo que não deva ser descarregado
-STR_CONTENT_SEARCH_EXTERNAL                                     :{BLACK}Pesquisar "sites" externos
-STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP                             :{BLACK}Escolher conteudo não disponivel no serviço de conteúdo do OpenTTD em sites não associados ao OpenTTD
+STR_CONTENT_SEARCH_EXTERNAL                                     :{BLACK}Pesquisar em páginas externas
+STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP                             :{BLACK}Escolher conteúdo não disponível no serviço de conteúdo do OpenTTD em páginas não associadas ao OpenTTD
 STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION                  :{WHITE}Está a sair do OpenTTD!
-STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER                          :{WHITE}Os termos e condições para o download de conteúdo de sites externos variam.{}Terá que se referir aos sites externos para instruções em como instalar o conteúdo no OpenTTD.{}Pretende continuar?
+STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER                          :{WHITE}Os termos e condições para o carregamento de conteúdo de páginas externas variam.{}Terá que se referir às páginas externas para instruções em como instalar o conteúdo no OpenTTD.{}Pretende continuar?
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtrar por etiqueta/nome:
-STR_CONTENT_OPEN_URL                                            :{BLACK}Website
-STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}Visitar a página web para este conteúdo
+STR_CONTENT_OPEN_URL                                            :{BLACK}Página da Internet
+STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}Visitar a página de Internet para este conteúdo
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Descarregar
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Iniciar a descarga do conteúdo seleccionado
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Tamanho total da descarga: {WHITE}{BYTES}
@@ -2701,20 +2698,20 @@ STR_CONTENT_DETAIL_FILESIZE                                     :{SILVER}Tamanho
 STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF                          :{SILVER}Seleccionado devido a: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DEPENDENCIES                                 :{SILVER}Dependências: {WHITE}{STRING}
 STR_CONTENT_DETAIL_TAGS                                         :{SILVER}Etiquetas: {WHITE}{STRING}
-STR_CONTENT_NO_ZLIB                                             :{WHITE}OpenTTD está compilado sem suporte "zlib"...
-STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... não é possível o descarregamento de conteúdo!
+STR_CONTENT_NO_ZLIB                                             :{WHITE}OpenTTD foi compilado sem suporte de "zlib"...
+STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... não é possível fazer o descarregamento de conteúdo!
 
 # Order of these is important!
 STR_CONTENT_TYPE_BASE_GRAPHICS                                  :Gráficos base
 STR_CONTENT_TYPE_NEWGRF                                         :NewGRF
 STR_CONTENT_TYPE_AI                                             :IA
-STR_CONTENT_TYPE_AI_LIBRARY                                     :Biblioteca IA
+STR_CONTENT_TYPE_AI_LIBRARY                                     :Biblioteca de IA
 STR_CONTENT_TYPE_SCENARIO                                       :Cenário
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa de alturas
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Sons base
 STR_CONTENT_TYPE_BASE_MUSIC                                     :Música base
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :Script de jogo
-STR_CONTENT_TYPE_GS_LIBRARY                                     :Biblioteca GS
+STR_CONTENT_TYPE_GS_LIBRARY                                     :Biblioteca de SJ
 
 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}A descarregar conteúdo...
@@ -2731,7 +2728,7 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Não foi
 
 STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}Gráficos em falta
 STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}O OpenTTD requer gráficos para funcionar mas nenhum foi encontrado. Deseja permitir ao OpenTTD transferir e instalar estes gráficos?
-STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Sim, obter os gráficos pela rede
+STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Sim, descarregar os gráficos pela rede
 STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Não, sair do OpenTTD
 
 STR_MISSING_GRAPHICS_ERROR_TITLE                                :{WHITE}A descarga falhou
@@ -2764,8 +2761,8 @@ STR_LINKGRAPH_LEGEND_SATURATED                                  :{TINY_FONT}{BLA
 STR_LINKGRAPH_LEGEND_OVERLOADED                                 :{TINY_FONT}{BLACK}sobrecarregado
 
 # Linkgraph tooltip
-STR_LINKGRAPH_STATS_TOOLTIP_MONTH                               :{BLACK}{CARGO_LONG} para ser transportado por mês de {STATION} para {STATION} ({COMMA}% de capacidade){STRING}
-STR_LINKGRAPH_STATS_TOOLTIP_MINUTE                              :{BLACK}{CARGO_LONG} para ser transportado por minuto de {STATION} para {STATION} ({COMMA}% de capacidade){STRING}
+STR_LINKGRAPH_STATS_TOOLTIP_MONTH                               :{BLACK}{CARGO_LONG} para ser transportado por mês de {STATION} para {STATION} ({COMMA}% da capacidade){STRING}
+STR_LINKGRAPH_STATS_TOOLTIP_MINUTE                              :{BLACK}{CARGO_LONG} para ser transportado por minuto de {STATION} para {STATION} ({COMMA}% da capacidade){STRING}
 STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION                    :{}{CARGO_LONG} a ser transportado de volta ({COMMA}% da capacidade)
 STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION                      :{}Tempo médio de viagem: {UNITS_DAYS_OR_SECONDS}
 
@@ -3077,12 +3074,18 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cidades crescem mais depressa do que as localidades normais{}Dependendo da configuração, são maiores aquando da sua fundação
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansão da cidade:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Edifícios
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumentar os edifícios das cidades
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Estradas
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumentar as estradas das localidades
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposição de estradas na localidade:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Seleccione disposição das estradas utilizada para esta localidade
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
 STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Estradas melhores
-STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}grelha 2x2
-STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}grelha 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Grelha 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Grelha 3x3
 STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aleatório
 
 # Fund new industry window
@@ -3105,7 +3108,7 @@ STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_QUERY                   :{YELLOW}Tem a c
 STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION                           :{WHITE}Cadeia da Indústria - {STRING}
 STR_INDUSTRY_CARGOES_CARGO_CAPTION                              :{WHITE}Cadeia de Carga - {STRING}
 STR_INDUSTRY_CARGOES_PRODUCERS                                  :{WHITE}Indústrias produtoras
-STR_INDUSTRY_CARGOES_CUSTOMERS                                  :{WHITE}Indústrias que aceitam
+STR_INDUSTRY_CARGOES_CUSTOMERS                                  :{WHITE}Indústrias receptoras
 STR_INDUSTRY_CARGOES_HOUSES                                     :{WHITE}Casas
 STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP                           :{BLACK}Clique na indústria para ver os seus fornecedores e clientes
 STR_INDUSTRY_CARGOES_CARGO_TOOLTIP                              :{BLACK}{STRING}{}Clique na mercadoria para ver os seus fornecedores e clientes
@@ -3266,9 +3269,9 @@ STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Dados ba
 STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
 STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
 STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
-STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} fotograma/s
-STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} fotograma/s
-STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} fotograma/s
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} fotogramas/s
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} fotogramas/s
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} fotogramas/s
 STR_FRAMERATE_BYTES_GOOD                                        :{LTBLUE}{BYTES}
 STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
 STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
@@ -3291,7 +3294,7 @@ STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Scrip
 STR_FRAMERATE_AI                                                :{BLACK} IA {NUM} {STRING}
 
 ###length 15
-STR_FRAMETIME_CAPTION_GAMELOOP                                  :Loop de jogo
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Ciclo de jogo
 STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Movimentação de carga
 STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Quantidade de atraso no percurso do Comboio
 STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Quantidade de atraso no percurso do veículo rodoviário
@@ -3303,7 +3306,7 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Renderização
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Renderização de visualizador do mundo
 STR_FRAMETIME_CAPTION_VIDEO                                     :Saída de video
 STR_FRAMETIME_CAPTION_SOUND                                     :Mistura de Som
-STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :total scripts GS/AI
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Total de scripts SJ/IA
 STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Script de jogo
 STR_FRAMETIME_CAPTION_AI                                        :IA {NUM} {STRING}
 
@@ -3318,7 +3321,7 @@ STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}Guardar
 STR_SAVELOAD_LOAD_TOWN_DATA                                     :{WHITE}Carregar Dados da Localidade
 STR_SAVELOAD_HOME_BUTTON_TOOLTIP                                :{BLACK}Clique aqui para saltar para o diretório atual de gravação/carregamento padrão
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} livres
-STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de unidades, directorias e ficheiros de jogos guardados
+STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de unidades, diretórios e ficheiros de jogos guardados
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nome escolhido para guardar o jogo
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Eliminar
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Eliminar o jogo guardado seleccionado
@@ -3336,7 +3339,7 @@ STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filtro:
 STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Substituir Ficheiro
 STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Tem a certeza que deseja substituir o ficheiro existente?
 STR_SAVELOAD_DIRECTORY                                          :{STRING} (Diretório)
-STR_SAVELOAD_PARENT_DIRECTORY                                   :{STRING} (Diretório parente)
+STR_SAVELOAD_PARENT_DIRECTORY                                   :{STRING} (Diretório pai)
 
 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Introduza um nome para o jogo gravado
 
@@ -3388,7 +3391,7 @@ STR_MAPGEN_TOWN_NAME_ADDITIONAL_ENGLISH                         :Inglês (Adicio
 STR_MAPGEN_TOWN_NAME_LATIN_AMERICAN                             :Latino-Americano
 STR_MAPGEN_TOWN_NAME_SILLY                                      :Absurdo
 STR_MAPGEN_TOWN_NAME_SWEDISH                                    :Sueco
-STR_MAPGEN_TOWN_NAME_DUTCH                                      :Holandês
+STR_MAPGEN_TOWN_NAME_DUTCH                                      :Neerlandês
 STR_MAPGEN_TOWN_NAME_FINNISH                                    :Finlandês
 STR_MAPGEN_TOWN_NAME_POLISH                                     :Polaco
 STR_MAPGEN_TOWN_NAME_SLOVAK                                     :Eslovaco
@@ -3466,7 +3469,7 @@ STR_TOWN_DATA_ERROR_JSON_FORMATTED_INCORRECTLY                  :{WHITE}Ficheiro
 STR_TOWN_DATA_ERROR_TOWN_FORMATTED_INCORRECTLY                  :{WHITE}Dados de {STRING} formatados incorretamente
 STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}{STRING} coordenadas mal formatadas, devem ser de 0 a 1 como uma proporção da dimensão total do mapa de alturas
 
-STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Não foi possível encontrar um local válido para fundar {NUM} localidade{P "" s}. Uma placa foi colocada no{P "" s} loca{P l is} desejado{P "" s}
+STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Não foi possível encontrar um local válido para fundar {NUM} localidade{P "" s}. Em vez disso, fo{P i ram} colocado{P "" s} {P "um " ""}letreiro{P "" s} no{P "" s} loca{P l is} desejado{P "" s}
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Definições NewGRF
@@ -3526,15 +3529,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Gravar p
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista de predefinições disponíveis, selecciona uma para a copiar para o nome da gravação abaixo
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Intriduza um nome para a predefinição
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nome seleccionado actualmente para gravação da predefinição
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancelar
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Não mudar a predefinição
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Grava
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Grava a predefinição com o nome seleccionado
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Alterar os parâmetros dos gráficos base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Alterar parâmetros de NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Fechar
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Repor
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Retorna todos os parâmetros ao seu valor padrão
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parâmetro {NUM}
@@ -3554,22 +3554,22 @@ STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_ROAD_TYPE                  :Tipo de estrada
 STR_NEWGRF_INSPECT_QUERY_CAPTION                                :{WHITE}Parâmetro da variável 60+x do NewGRF (hexadecimal)
 
 # Sprite aligner window
-STR_SPRITE_ALIGNER_CAPTION_NO_ACTION                            :{WHITE}Alinhando sprite: ({STRING}:{NUM})
+STR_SPRITE_ALIGNER_CAPTION_NO_ACTION                            :{WHITE}Alinhando elemento visual: ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_CAPTION_ACTIONA                              :{WHITE}Alinhando sprite: Ação 0xA, {COMMA} ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_CAPTION_ACTION5                              :{WHITE}Alinhando sprite: Ação 0x5, tipo {HEX}, {COMMA} ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Gráfico seguinte
-STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Proceder ao gráfico normal seguinte, ignorando quaisquer gráficos pseudo/recolorir/tipo-de-letra e dando a volta no fim
+STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Proceder ao elemento visual normal seguinte, ignorando quaisquer elemento visual pseudo/recolorido/tipo-de-letra e dando a volta no fim
 STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Ir para o gráfico
 STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Ir para o gráfico seguinte. Se o gráfico não for um gráfico normal, proceder ao gráfico normal seguinte
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Gráfico anterior
-STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Proceder ao gráfico normal anterior, ignorando quaisquer gráficos pseudo/recolorir/tipo-de-letra e dando a volta no início
+STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Proceder ao elemento visual normal anterior, ignorando quaisquer elemento visual  pseudo/recolorido/tipo-de-letra e dando a volta no início
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Representação do gráfico seleccionado actualmente. O alinhamento é ignorado a desenhar este gráfico
 STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Desloca o gráfico, alterando os intervalos  X e Y. Ctrl+Clique desloca o gráfico 8 unidades de uma só vez
 STR_SPRITE_ALIGNER_SPRITE                                       :{STRING}:{NUM}
 
 ###length 2
 STR_SPRITE_ALIGNER_CENTRE_OFFSET                                :{BLACK}Deslocamento centrado
-STR_SPRITE_ALIGNER_CENTRE_SPRITE                                :{BLACK}Sprite centrado
+STR_SPRITE_ALIGNER_CENTRE_SPRITE                                :{BLACK}Elemento visual centrado
 
 STR_SPRITE_ALIGNER_CROSSHAIR                                    :{BLACK}Mira
 
@@ -3588,7 +3588,7 @@ STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Aviso: {SI
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Erro: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{STRING}
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}O NewGRF "{STRING}" retornou um erro fatal:{}{STRING}
-STR_NEWGRF_ERROR_POPUP                                          :{WHITE}O NewGRF "{STRING}" retornou um erro fatal:{}{STRING}
+STR_NEWGRF_ERROR_POPUP                                          :{WHITE}O NewGRF "{STRING}" devolveu um erro fatal:{}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} não funciona com a versão do TTDPatch reportada por OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} é para a versão {2:STRING} do TTD
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} foi concebido para ser usado com {2:STRING}
@@ -3602,7 +3602,7 @@ STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {1:STR
 STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Gráfico inválido (sprite {3:NUM})
 STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propriedade de Ação 0 desconhecida {4:HEX} (sprite {3:NUM})
 STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de uso de ID Inválido (sprite {3:NUM})
-STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um objecto gráfico corrompido. Todos os objectos gráficos corrompidos serão apresentados como um ponto de interrogação (?) vermelho.
+STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um elemento visual corrompido. Todos os elementos visuais corrompidos serão apresentados como um ponto de interrogação (?) vermelho.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém múltiplas entradas Ação 8 - (sprite {3:NUM})
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leitura além dos limites do pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF pedidos não disponíveis (sprite {3:NUM})
@@ -3666,7 +3666,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Ligar/de
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editar texto do letreiro
-STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Centrar a visualização na localização do letreiro. Ctrl+Clique para abrir um novo visualizador na localização do letreiro
+STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Centrar a vista principal na localização do letreiro. Ctrl+Clique para abrir um novo visualizador na localização do letreiro
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ir para o próximo letreiro
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ir para o letreiro anterior
 
@@ -3684,12 +3684,12 @@ STR_TOWN_POPULATION                                             :{BLACK}Populaç
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Cidade)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}População: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} ultimo mês: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CARGO_LAST_MINUTE_MAX                             :{BLACK}{CARGO_LIST} último minuto: {ORANGE}{COMMA}{BLACK} máx: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Mercadoria necessária para o seu desenvolvimento:
-STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{RED}É necessário {ORANGE}{STRING}
-STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{BLACK}No inverno, é necessário {ORANGE}{STRING}
-STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} entregue
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} no último mês: {ORANGE}{COMMA}{BLACK} máx.: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MINUTE_MAX                             :{BLACK}{CARGO_LIST} no último minuto: {ORANGE}{COMMA}{BLACK} máx.: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Mercadoria necessária para o desenvolvimento da localidade:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{RED}{G 0 É É É São São} necessári{G 0 o o o os as} {ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{BLACK}No inverno, {G 0 é é é são são} necessári{G 0 o o o os as} {ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} fo{G 0 i i i ram ram} entregue{G 0 "" "" "" s s}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (ainda necessário)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (entregue)
 STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Localidade cresce a cada {ORANGE}{UNITS_DAYS_OR_SECONDS}
@@ -3703,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Alterar
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar o tamanho da cidade
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expandir edifícios
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumentar os edifícios da localidade
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expandir estradas
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumentar as estradas da localidade
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Apagar
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Apagar completamente esta localidade
 
@@ -3720,9 +3724,9 @@ STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Aplicar
 STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Realizar a ação destacada na lista acima
 
 ###length 8
-STR_LOCAL_AUTHORITY_ACTION_SMALL_ADVERTISING_CAMPAIGN           :Pequena campanha publicitária
-STR_LOCAL_AUTHORITY_ACTION_MEDIUM_ADVERTISING_CAMPAIGN          :Média campanha publicitária
-STR_LOCAL_AUTHORITY_ACTION_LARGE_ADVERTISING_CAMPAIGN           :Grande campanha publicitária
+STR_LOCAL_AUTHORITY_ACTION_SMALL_ADVERTISING_CAMPAIGN           :Fazer uma campanha publicitária pequena
+STR_LOCAL_AUTHORITY_ACTION_MEDIUM_ADVERTISING_CAMPAIGN          :Fazer uma campanha publicitária média
+STR_LOCAL_AUTHORITY_ACTION_LARGE_ADVERTISING_CAMPAIGN           :Fazer uma campanha publicitária grande
 STR_LOCAL_AUTHORITY_ACTION_ROAD_RECONSTRUCTION                  :Financiar a reconstrução das estradas locais
 STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY                    :Construir estátua do proprietário da empresa
 STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS                        :Financiar novos edifícios
@@ -3779,16 +3783,16 @@ STR_GOAL_QUESTION_BUTTON_GO                                     :Partir
 STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Continuar
 STR_GOAL_QUESTION_BUTTON_RESTART                                :Reiniciar
 STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Adiar
-STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Render-se
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Desistir
 STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Fechar
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsídios
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Oferta de subsídios para os serviços:
-STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING} de {STRING} para {STRING}{YELLOW} ({STRING})
+STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING}{YELLOW} ({STRING})
 STR_SUBSIDIES_NONE                                              :{ORANGE}- Nenhum -
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Serviços já subsidiados:
-STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} de {STRING} para {STRING}{YELLOW} ({COMPANY}{YELLOW}, {STRING})
+STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} d{G e o a os as} {STRING} para {G "" "o " "a " "os " "as "}{STRING}{YELLOW} ({COMPANY}{YELLOW}, {STRING})
 STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clique num serviço para centrar a visualização numa indústria/localidade. Ctrl+Clique para abrir um novo visualizador na localização da indústria/localidade
 STR_SUBSIDIES_OFFERED_EXPIRY_DATE                               :em {DATE_SHORT}
 STR_SUBSIDIES_OFFERED_EXPIRY_TIME                               :dentro de {UNITS_MONTHS_OR_MINUTES}
@@ -3845,8 +3849,8 @@ STR_STATION_VIEW_CARGO_SUPPLY_RATING                            :{WHITE}{STRING}
 STR_STATION_VIEW_GROUP                                          :{BLACK}Agrupar por
 STR_STATION_VIEW_WAITING_STATION                                :Estação: A aguardar
 STR_STATION_VIEW_WAITING_AMOUNT                                 :Quantidade: A aguardar
-STR_STATION_VIEW_PLANNED_STATION                                :Estação: Planeado
-STR_STATION_VIEW_PLANNED_AMOUNT                                 :Quantidade: Planeado
+STR_STATION_VIEW_PLANNED_STATION                                :Estação: Planeada
+STR_STATION_VIEW_PLANNED_AMOUNT                                 :Quantidade: Planeada
 STR_STATION_VIEW_FROM                                           :{YELLOW}{CARGO_SHORT} de {STATION}
 STR_STATION_VIEW_VIA                                            :{YELLOW}{CARGO_SHORT} via {STATION}
 STR_STATION_VIEW_TO                                             :{YELLOW}{CARGO_SHORT} para {STATION}
@@ -3957,12 +3961,12 @@ STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nenhum
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da empresa: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraestrutura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} {P "secção" "secções" } de caminho-de-ferro
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} {P "secção" "secções"} de estrada
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} secç{P ão ões} de caminho-de-ferro
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} secç{P ão ões} de estrada
 STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} mosaico{P "" s} com água
 STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} mosaico{P "" s} de estação
 STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroporto{P "" s}
-STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nenhum
+STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nenhuma
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir sede
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construir sede da empresa
@@ -4075,9 +4079,9 @@ STR_VEHICLE_LIST_PROFIT_THIS_PERIOD_LAST_PERIOD                 :{TINY_FONT}{BLA
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING} {STRING}
 
-STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Mandar para o depósito
-STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Mandar para a garagem
-STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Mandar para o estaleiro
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar para o depósito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar para a garagem
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar para o estaleiro
 STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar para hangar
 
 STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos na lista
@@ -4269,10 +4273,10 @@ STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vender t
 STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vender todas as aeronaves no hangar
 
 ###length VEHICLE_TYPES
-STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Auto-substituir todos os comboios no depósito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Auto-substituir todos os veículos rodoviários na garagem
-STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Auto-substituir todos os navios no estaleiro naval
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Auto-substituir todas as aeronaves no hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Substituir automaticamente todos os comboios no depósito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Substituir automaticamente todos os veículos rodoviários na garagem
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Substituir automaticamente todos os navios no estaleiro naval
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Substituir automaticamente todas as aeronaves no hangar
 
 ###length VEHICLE_TYPES
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
@@ -4441,10 +4445,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostrar
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostrar ordens da aeronave. Ctrl+Clique para mostrar o horário da aeronave
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do comboio
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo rodoviário
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes do navio
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do comboio. Ctrl+Clique para mostrar o grupo do comboio
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo. Ctrl+Clique para mostrar o grupo do veículo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes do navio. Ctrl+Clique para mostrar o grupo do navio
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave. Ctrl+Clique para mostrar o grupo da aeronave
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Ação do comboio atual - clique para parar / iniciar o comboio
@@ -4462,7 +4466,7 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
 STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}{VELOCITY} - A parar
 STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sem energia
 STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Esperando por caminho livre
-STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR                             :{ORANGE}Longe de mais ao próximo destino
+STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR                             :{ORANGE}Longe de mais do próximo destino
 
 STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}{1:VELOCITY} - Dirige-se para {0:STATION}
 STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}{VELOCITY} - Sem ordens
@@ -4623,7 +4627,7 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Mudar o
 
 STR_ORDER_REFIT                                                 :{BLACK}Adaptar
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Seleccionar o tipo de carga a adaptar nesta ordem. Pressionar Ctrl e botão-esquerdo do rato para remover a instrução de adaptação
-STR_ORDER_REFIT_AUTO                                            :{BLACK}Auto-adaptar
+STR_ORDER_REFIT_AUTO                                            :{BLACK}Adaptar na estação
 STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Selecione qual o tipo de mercadoria para o qual auto-adaptar nesta ordem. Ctrl+Clique para remover ordem de adaptação. Auto-adaptação só será realizada se o veículo a aceitar
 STR_ORDER_DROP_REFIT_AUTO                                       :Mercadoria fixa
 STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Mercadoria disponível
@@ -4652,7 +4656,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Idade (anos)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Requer manutenção
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Tempo de vida restante (anos)
-STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Máxima fiabilidade
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Fiabilidade máxima
 ###next-name-looks-similar
 
 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Como comparar os dados do veículo com o parâmetro passado
@@ -4703,8 +4707,8 @@ STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} o Hang
 STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} o mais próximo {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
-STR_ORDER_REFIT_ORDER                                           :{SPACE}(Adaptar para {STRING})
-STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Adaptar para {STRING} e parar)
+STR_ORDER_REFIT_ORDER                                           :{SPACE}(Adaptar para transportar {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Adaptar para transportar {STRING} e parar)
 STR_ORDER_STOP_ORDER                                            :{SPACE}(Parar)
 
 STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(Esperar por desagrupar)
@@ -4730,7 +4734,7 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :{SPACE}(Não de
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :{SPACE}(Não descarregar e aguardar até encher com qualquer carga)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :{SPACE}(Sem carregar e descarregar)
 
-STR_ORDER_AUTO_REFIT                                            :{SPACE}(Adaptar para {STRING})
+STR_ORDER_AUTO_REFIT                                            :{SPACE}(Adaptar para transportar {STRING})
 STR_ORDER_FULL_LOAD_REFIT                                       :{SPACE}(Carga completa com adaptação para {STRING})
 STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Encher com qualquer carga com adaptação para {STRING})
 STR_ORDER_UNLOAD_REFIT                                          :{SPACE}(Descarregar e tomar carga com adaptação para {STRING})
@@ -4768,15 +4772,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horário
 STR_TIMETABLE_NO_TRAVEL                                         :Não viaja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viagem (automático; calendarizadas por próxima ordem manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viagem (sem programação)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar no máximo a {2:VELOCITY} (sem programação)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar no máximo a {VELOCITY} (sem programação)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar por {STRING} no máximo a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajar (durante {STRING}, sem programação)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajar (por {STRING}, sem programação) no máximo a {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(permanecer por {STRING}, sem horário)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viajar durante {STRING}, sem horário)
-STR_TIMETABLE_STAY_FOR                                          :e ficar durante {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaja para {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}e ficar por {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}e viajar durante {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Este horário levará aproximadamente {STRING} para concluir
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Este horário vai levar {STRING} a concluir
@@ -4810,7 +4814,7 @@ STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Limpar a
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Apagar Contador Atraso
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reiniciar o contador de atraso, para que o veículo esteja pontual. Ctrl+Clique para reiniciar o grupo todo, para que o último veículo esteja pontual e todos os outros estejam adiantados.
 
-STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto preencher
+STR_TIMETABLE_AUTOFILL                                          :{BLACK}Preencher automaticamente
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Preencher o horário automaticamente com os valores da próxima viagem. Ctrl+Clique para tentar manter os tempos de espera.
 
 STR_TIMETABLE_EXPECTED                                          :{BLACK}Esperado
@@ -4843,9 +4847,9 @@ STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Termina
 STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Ativar/Desativar paragem quando o registo da IA for igual à string de paragem
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Parar em:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Parar em
-STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Quando a mensagem do registo da IA for igual a esta string, o jogo é posto em pausa
+STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Quando a mensagem do registo da IA for igual a esta cadeia de caracteres, o jogo é pausado
 STR_AI_DEBUG_MATCH_CASE                                         :{BLACK}Caso de igualdade
-STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Alternar o caso de igualdade quando se compara o resgisto da IA contra a string de paragem
+STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Alternar o caso de igualdade quando se compara o registo da IA contra a cadeia de caracteres de paragem
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Continuar
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Sair da pausa e continuar a IA
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Ver saída de depuração desta IA. Ctrl+Clique para abrir numa nova janela
@@ -4895,8 +4899,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceitar
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Seleccionar script marcado
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar o script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Tirar uma captura de ecrã
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura de ecrã normal
@@ -4909,7 +4911,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parâmetros da IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parâmetros do Script de Jogo
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fechar
 STR_AI_SETTINGS_RESET                                           :{BLACK}Repor
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4923,9 +4924,9 @@ STR_TEXTFILE_NAVFORWARD_TOOLTIP                                 :{BLACK}Avançar
 STR_TEXTFILE_WRAP_TEXT                                          :{WHITE}Envolver o texto
 STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}Envolve o texto da janela de forma que não é necessário deslizar listagem
 STR_TEXTFILE_VIEW_README                                        :{BLACK}Leia-me
-STR_TEXTFILE_VIEW_README_TOOLTIP                                :Ver "readme" para este conteúdo
+STR_TEXTFILE_VIEW_README_TOOLTIP                                :Ver 'Leia-me' para este conteúdo
 STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Lista de alterações
-STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP                             :Ver o "log" de alterações para este conteúdo
+STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP                             :Ver o registo de alterações para este conteúdo
 STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licença
 STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :Ver a licença para este conteúdo
 ###length 5
@@ -4983,13 +4984,13 @@ STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... não
 STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... a imagem é demasiado grande
 
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Aviso de redimensionamento
-STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Redimensionar muito o mapa não é recomendado. Continuar com a criação?
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Redimensionar muito o mapa não é recomendado. Continuar com o processo de geração?
 
 # Soundset messages
 STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Só foi encontrado um conjunto de sons de reserva. Se deseja sons, instale um conjunto de sons através do sistema de descarregamento de conteúdo.
 
 # Screenshot related messages
-STR_WARNING_SCREENSHOT_SIZE_CAPTION                             :{WHITE}Captura enorme
+STR_WARNING_SCREENSHOT_SIZE_CAPTION                             :{WHITE}Captura de ecrã enorme
 STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}A captura vai ter uma resolução de {COMMA} x {COMMA} pixeis. Pode demorar um bocado para realizar a captura. Deseja continuar?
 
 STR_MESSAGE_HEIGHTMAP_SUCCESSFULLY                              :{WHITE}Mapa de alturas guardado com sucesso como '{STRING}'. O pico mais alto é {NUM}
@@ -5003,15 +5004,15 @@ STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mensage
 # Generic construction errors
 STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}Fora dos limites do mapa
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP                              :{WHITE}Muito perto dos limites do mapa
-STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY                     :{WHITE}Dinheiro insuficiente - necessário {CURRENCY_LONG}
+STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY                     :{WHITE}Dinheiro insuficiente - é necessário {CURRENCY_LONG}
 STR_ERROR_FLAT_LAND_REQUIRED                                    :{WHITE}É necessário terreno plano
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Terreno inclinado na direcção incorrecta
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Não é possível fazer isto...
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}O edifício deve ser demolido primeiro
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Não é possível limpar esta área...
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... sítio inadequado
-STR_ERROR_ALREADY_BUILT                                         :{WHITE}... já construído
-STR_ERROR_OWNED_BY                                              :{WHITE}... propriedade de {STRING}
+STR_ERROR_ALREADY_BUILT                                         :{WHITE}... já está construído
+STR_ERROR_OWNED_BY                                              :{WHITE}... é propriedade de {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... a área é propriedade de outra empresa
 STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... atingido o limite para terraformação
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... limite para limpeza de mosaicos atingido
@@ -5033,7 +5034,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Não é
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}A escavação estragaria o túnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... já está ao nível do mar
 STR_ERROR_TOO_HIGH                                              :{WHITE}... demasiado alto
-STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... já plano
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... já está nivelado
 STR_ERROR_BRIDGE_TOO_HIGH_AFTER_LOWER_LAND                      :{WHITE}Ponte acima seria demasiado alta.
 
 # Company related errors
@@ -5233,7 +5234,7 @@ STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Precisa
 STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Não é possível construir o canal aqui...
 
 # Tree related errors
-STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... árvore já plantada aqui
+STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... árvore já está plantada aqui
 STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... terreno não indicado para este tipo de árvore
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Impossível plantar árvore aqui...
 
@@ -5256,7 +5257,7 @@ STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Deverá
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Há outro túnel no caminho
 STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}O túnel terminaria fora do mapa
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Não é possível escavar o terreno para o outro lado do túnel
-STR_ERROR_TUNNEL_TOO_LONG                                       :{WHITE}... túnel muito longo
+STR_ERROR_TUNNEL_TOO_LONG                                       :{WHITE}... túnel demasiado longo
 
 # Object related errors
 STR_ERROR_TOO_MANY_OBJECTS                                      :{WHITE}... demasiados objectos
@@ -5264,7 +5265,7 @@ STR_ERROR_CAN_T_BUILD_OBJECT                                    :{WHITE}Não é
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objecto no caminho
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}... sede de empresa no caminho
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Não é possível comprar esta área de terreno...
-STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... já a possui!
+STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... já lhe pertence!
 STR_ERROR_BUILD_OBJECT_LIMIT_REACHED                            :{WHITE}... atingido o limite de construção de objeto
 
 # Group related errors
@@ -5340,15 +5341,15 @@ STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Não é
 STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Não é possível vender todas as aeronaves...
 
 ###length VEHICLE_TYPES
-STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Não é possível auto-substituir veículos ferroviários...
-STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Não é possível auto-substituir veículos rodoviários...
-STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Não é possível auto-substituir navios...
-STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Não é possível auto-substituir aeronave...
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Não é possível substituir automaticamente veículos ferroviários...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Não é possível substituir automaticamente veículos rodoviários...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Não é possível substituir automaticamente navios...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Não é possível substituir automaticamente aeronaves...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Existem demasiados veículos em jogo
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Não é possível alterar o intervalo manutenção...
 
-STR_ERROR_VEHICLE_IS_DESTROYED                                  :{WHITE}... o veículo está destruido
+STR_ERROR_VEHICLE_IS_DESTROYED                                  :{WHITE}... o veículo foi destruído
 
 STR_ERROR_CAN_T_CLONE_VEHICLE_LIST                              :{WHITE}... nem todos os veículos são idênticos
 
@@ -5488,7 +5489,7 @@ STR_INDUSTRY_NAME_FARM                                          :{G=f}Quinta
 STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :{G=f}Mina de Cobre
 STR_INDUSTRY_NAME_OIL_WELLS                                     :{G=mp}Poços de Petróleo
 STR_INDUSTRY_NAME_BANK                                          :{G=m}Banco
-STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=f}Indústria Alimentar
+STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :{G=f}Central de Produção Alimentar
 STR_INDUSTRY_NAME_PAPER_MILL                                    :{G=f}Fábrica de Papel
 STR_INDUSTRY_NAME_GOLD_MINE                                     :{G=f}Mina de Ouro
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :{G=m}Banco
@@ -5504,13 +5505,13 @@ STR_INDUSTRY_NAME_LUMBER_MILL                                   :{G=f}Serração
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :{G=f}Floresta de Algodão Doce
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :{G=f}Fábrica de Doces
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :{G=m}Campo de Baterias
-STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=mp}Poços de bebida de cola
+STR_INDUSTRY_NAME_COLA_WELLS                                    :{G=mp}Poços de Xarope de Cola
 STR_INDUSTRY_NAME_TOY_SHOP                                      :{G=f}Loja de Brinquedos
 STR_INDUSTRY_NAME_TOY_FACTORY                                   :{G=f}Fábrica de Brinquedos
 STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :{G=fp}Fontes de Plástico
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=f}Fábrica de refrigerantes
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=m}Produtor de Bolhas
-STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=f}Exploração de Caramelo
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :{G=f}Fábrica de Refrigerantes
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :{G=m}Gerador de Bolhas
+STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :{G=f}Pedreira de Caramelo
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=f}Mina de Açúcar
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
@@ -5531,28 +5532,28 @@ STR_SV_STNAME_SOUTH                                             :{STRING} Sul
 STR_SV_STNAME_EAST                                              :{STRING} Este
 STR_SV_STNAME_WEST                                              :{STRING} Oeste
 STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Transporte
-STR_SV_STNAME_HALT                                              :Paragem de {STRING}
-STR_SV_STNAME_VALLEY                                            :Vale de {STRING}
-STR_SV_STNAME_HEIGHTS                                           :Montes de {STRING}
-STR_SV_STNAME_WOODS                                             :Bosque de {STRING}
-STR_SV_STNAME_LAKESIDE                                          :Lago de {STRING}
-STR_SV_STNAME_EXCHANGE                                          :Intercâmbio de {STRING}
-STR_SV_STNAME_AIRPORT                                           :Aeroporto de {STRING}
-STR_SV_STNAME_OILFIELD                                          :Petrolífera de {STRING}
-STR_SV_STNAME_MINES                                             :Minas de {STRING}
-STR_SV_STNAME_DOCKS                                             :Docas de {STRING}
+STR_SV_STNAME_TRANSFER                                          :{G=m}Ponto de Transbordo de {STRING}
+STR_SV_STNAME_HALT                                              :{G=f}Paragem de {STRING}
+STR_SV_STNAME_VALLEY                                            :{G=m}Vale de {STRING}
+STR_SV_STNAME_HEIGHTS                                           :{G=mp}Montes de {STRING}
+STR_SV_STNAME_WOODS                                             :{G=m}Bosque de {STRING}
+STR_SV_STNAME_LAKESIDE                                          :{G=m}Lago de {STRING}
+STR_SV_STNAME_EXCHANGE                                          :{G=m}Ponto de intercâmbio de {STRING}
+STR_SV_STNAME_AIRPORT                                           :{G=m}Aeroporto de {STRING}
+STR_SV_STNAME_OILFIELD                                          :{G=f}Petrolífera de {STRING}
+STR_SV_STNAME_MINES                                             :{G=fp}Minas de {STRING}
+STR_SV_STNAME_DOCKS                                             :{G=fp}Docas de {STRING}
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
-STR_SV_STNAME_ANNEXE                                            :Anexo de {STRING}
-STR_SV_STNAME_SIDINGS                                           :Desvio de {STRING}
-STR_SV_STNAME_BRANCH                                            :Ramal de {STRING}
+STR_SV_STNAME_ANNEXE                                            :{G=m}Anexo de {STRING}
+STR_SV_STNAME_SIDINGS                                           :{G=m}Desvio de {STRING}
+STR_SV_STNAME_BRANCH                                            :{G=m}Ramal de {STRING}
 STR_SV_STNAME_UPPER                                             :{STRING} de Cima
 STR_SV_STNAME_LOWER                                             :{STRING} de Baixo
-STR_SV_STNAME_HELIPORT                                          :Heliporto de {STRING}
-STR_SV_STNAME_FOREST                                            :Floresta de {STRING}
-STR_SV_STNAME_FALLBACK                                          :Estação de {STRING} #{NUM}
+STR_SV_STNAME_HELIPORT                                          :{G=m}Heliporto de {STRING}
+STR_SV_STNAME_FOREST                                            :{G=f}Floresta de {STRING}
+STR_SV_STNAME_FALLBACK                                          :{G=f}Estação de {STRING} #{NUM}
 
 ############ end of savegame specific region!
 
@@ -5607,11 +5608,11 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK                   :Vagão de açú
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER           :Vagão de Algodão Doce
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER                 :Vagão de caramelo
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN                    :Vagão de Bolhas
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER                   :Cisterna de bebida de cola
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER                   :Cisterna de Xarope de Cola
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN                     :Vagão de Doces
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :Vagão de Brinquedos
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Vagão de Baterias
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Vagão de refrigerantes
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Vagão de Refrigerantes
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Vagão de plástico
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :'X2001' (Eléctrico)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :'Millennium Z1' (Eléctrico)
@@ -5637,11 +5638,11 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK               :Vagão de Açú
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER       :Vagão de Algodão Doce
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER             :Vagão de Caramelo
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN                :Vagão de Bolhas
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER               :Cisterna de beibda de cola
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER               :Cisterna de Xarope de Cola
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN                 :Vagão de Doces
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN                   :Vagão de Brinquedos
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK             :Vagão de Baterias
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK         :Vagão de refrigerantes
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK         :Vagão de Refrigerantes
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK             :Vagão de Plástico
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC    :Lev1 'Leviathan' (Eléctrico)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 'Cyclops' (Eléctrico)
@@ -5669,11 +5670,11 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK                 :Vagão de Açú
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER         :Vagão de Algodão Doce
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER               :Vagão de Caramelo
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN                  :Vagão de Bolhas
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER                 :Cisterna de bebida de cola
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER                 :Cisterna de Xarope de Cola
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN                   :Vagão de Doces
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN                     :Vagão de Brinquedos
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK               :Vagão de Baterias
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :Vagão de refrigerantes
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :Vagão de Refrigerantes
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :Vagão de Plástico
 
 ###length 88
@@ -5693,9 +5694,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :Camião de Corr
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK            :Camião de Correio MightyMover
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :Camião de Correio Powernaught
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK               :Camião de Correio Wizzowow
-STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER               :Cisterna de Petróleo Witcombe
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER                 :Cisterna de Petróleo Foster
-STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_OIL_TANKER                  :Cisterna de Petróleo Perry
+STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER               :Camião-cisterna de Petróleo Witcombe
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER                 :Camião-cisterna de Petróleo Foster
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_OIL_TANKER                  :Camião-cisterna de Petróleo Perry
 STR_VEHICLE_NAME_ROAD_VEHICLE_TALBOTT_LIVESTOCK_VAN             :Camião de Gado Talbott
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_LIVESTOCK_VAN                 :Camião de Gado Uhl
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_LIVESTOCK_VAN              :Camião de Gado Foster
@@ -5726,9 +5727,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_PAPER_TRUCK                   :Camião de Pape
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_COPPER_ORE_TRUCK              :Camião de Minério de Cobre MPS
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COPPER_ORE_TRUCK              :Camião de Minério de Cobre Uhl
 STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :Camião de Minério de Cobre Goss
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_WATER_TANKER                  :Cisterna de Água Uhl
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_WATER_TANKER               :Cisterna de Água Balogh
-STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER                  :Cisterna de Água MPS
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_WATER_TANKER                  :Camião-cisterna de Água Uhl
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_WATER_TANKER               :Camião-cisterna de Água Balogh
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER                  :Camião-cisterna de Água MPS
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK                :Camião de Fruta Balogh
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK                   :Camião de Fruta Uhl
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK               :Camião de Fruta Kelling
@@ -5738,9 +5739,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK                  :Camião de Borr
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :Camião de Açúcar MightyMover
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK           :Camião de Açúcar Powernaught
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK              :Camião de Açúcar Wizzowow
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK            :Camião de bebida de cola MightyMover
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COLA_TRUCK            :Camião de bebida de cola Powernaught
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK               :Camião de bebida de cola Wizzowow
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK            :Camião de Xarope de Cola MightyMover
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COLA_TRUCK            :Camião de Xarope de Cola Powernaught
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK               :Camião de Xarope de Cola Wizzowow
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY          :Camião de Algodão Doce MightyMover
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY          :Camião de Algodão Doce Powernaught
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK       :Camião de Algodão Doce Wizzowow
@@ -5756,9 +5757,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK              :Camião de Doce
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK         :Camião de Baterias MightyMover
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK         :Camião de Baterias Powernaught
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK            :Camião de Baterias Wizzowow
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :Camião de refrigerantes MightyMover
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :Camião de refrigerantes Powernaught
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :Camião de refrigerantes Wizzowow
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :Camião de Refrigerantes MightyMover
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :Camião de Refrigerantes Powernaught
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :Camião de Refrigerantes Wizzowow
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :Camião de Plástico MightyMover
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK         :Camião de Plástico Powernaught
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK            :Camião de Plástico Wizzowow
@@ -5767,11 +5768,11 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BUBBLE_TRUCK          :Camião de Bolh
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK             :Camião de Bolhas Wizzowow
 
 ###length 11
-STR_VEHICLE_NAME_SHIP_MPS_OIL_TANKER                            :Cisterna de Petróleo MPS
-STR_VEHICLE_NAME_SHIP_CS_INC_OIL_TANKER                         :Cisterna de Petróleo CS-Inc.
+STR_VEHICLE_NAME_SHIP_MPS_OIL_TANKER                            :Petroleiro MPS
+STR_VEHICLE_NAME_SHIP_CS_INC_OIL_TANKER                         :Petroleiro CS-Inc.
 STR_VEHICLE_NAME_SHIP_MPS_PASSENGER_FERRY                       :Navio de passageiros MPS
 STR_VEHICLE_NAME_SHIP_FFP_PASSENGER_FERRY                       :Navio de passageiros FFP
-STR_VEHICLE_NAME_SHIP_BAKEWELL_300_HOVERCRAFT                   :Hovercraft Bakewell 300
+STR_VEHICLE_NAME_SHIP_BAKEWELL_300_HOVERCRAFT                   :Hidroflutuador Bakewell 300
 STR_VEHICLE_NAME_SHIP_CHUGGER_CHUG_PASSENGER                    :Navio de passageiros Chugger-Chug
 STR_VEHICLE_NAME_SHIP_SHIVERSHAKE_PASSENGER_FERRY               :Navio de passageiros Shivershake
 STR_VEHICLE_NAME_SHIP_YATE_CARGO_SHIP                           :Navio de mercadorias Yate
@@ -5825,8 +5826,8 @@ STR_VEHICLE_NAME_AIRCRAFT_POWERNAUT_HELICOPTER                  :Helicóptero Po
 ##id 0x8800
 # Formatting of some strings
 STR_FORMAT_DATE_TINY                                            :{ZEROFILL_NUM}-{ZEROFILL_NUM}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} de {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} de {STRING}. de {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:ZEROFILL_NUM}-{0:ZEROFILL_NUM}
 
 STR_FORMAT_COMPANY_NUM                                          :(Empresa {COMMA})
@@ -5860,7 +5861,7 @@ STR_COMPANY_SOMEONE                                             :alguém
 
 STR_SAVEGAME_DURATION_REALTIME                                  :{NUM}h {NUM}m
 STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
-STR_SAVEGAME_NAME_SPECTATOR                                     :Espetador, {1:STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {1:STRING}
 
 # Viewport strings
 STR_VIEWPORT_TOWN_POP                                           :{TOWN} ({COMMA})
@@ -5887,6 +5888,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}G
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5926,3 +5928,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abrir configuração de crachá
+STR_BADGE_CONFIG_RESET                                          :Repor
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Ícones de Crachá
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtros de Crachá
+STR_BADGE_CONFIG_PREVIEW                                        :Pré-visualizar imagem
+STR_BADGE_CONFIG_NAME                                           :Nome
+STR_BADGE_FILTER_ANY_LABEL                                      :Qua{G 0 l l l is is}quer {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} {G 0 é é é são são} {STRING}
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index e6ca2a67ca..f368a91ad0 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -443,7 +443,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Plasează case
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opțiunile jocului
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Setări
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Setările AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Setări pentru scriptul jocului
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Setări NewGRF
@@ -451,6 +450,12 @@ STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Opțiuni Sandbo
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opțiuni transparență
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Afișează numele orașelor
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Afișează numele stațiilor
+STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Stații de tren
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Stații de camion
+STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Stații de autobuz
+STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Docuri
+STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Aeroporturi
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Fantomă
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Afișează numele punctelor de tranzit
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Afișează semnele de pe hartă
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Afișează numele și semnele competitorilor
@@ -948,21 +953,24 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copiază
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opțiuni
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Alege setările generale
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Alege setările generale
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafică
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Alege setările grafice
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Alege setările grafice
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sunet
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Alegeți setările de sunet și muzică
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Alegeți setările de sunet și muzică
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Alegeți setările de integrare socială
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Alegeți setările de integrare socială
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avansat
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Modificați setările avansate
 
 STR_GAME_OPTIONS_VOLUME                                         :Volum
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efecte sonore
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muzică
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unitate monetară
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Alege unitatea monetară
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unitate monetară
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Alege unitatea monetară
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1011,9 +1019,10 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia indonezia
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit Malaysian
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats leton
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portughez
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia ucraineană
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvare automată
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Alege intervalul de timp dintre salvările automate
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Salvare automată
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Alege intervalul de timp dintre salvările automate
 
 # Autosave dropdown
 ###length 5
@@ -1023,77 +1032,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :La fiecare 30 d
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :La fiecare 60 de minute
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :La fiecare 120 de minute
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Limba
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Alege limba în care dorești afișată interfața
+STR_GAME_OPTIONS_LANGUAGE                                       :Limba
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Alege limba în care dorești afișată interfața
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% finalizat)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Ecran întreg
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Bifează această căsuță pentru a juca pe tot ecranul
+STR_GAME_OPTIONS_FULLSCREEN                                     :Ecran întreg
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Bifează această căsuță pentru a juca pe tot ecranul
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rezoluția ecranului
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Alege rezoluția dorită pentru joc
+STR_GAME_OPTIONS_RESOLUTION                                     :Rezoluția ecranului
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Alege rezoluția dorită pentru joc
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :(alta/nespecificată)
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Accelerare hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Bifați căsuța ca OpenTTD să încerce utilizarea accelerației hardware. Modificarea setării va avea efect după repornirea jocului
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Accelerare hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Bifați căsuța ca OpenTTD să încerce utilizarea accelerației hardware. Modificarea setării va avea efect după repornirea jocului
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Setarea va avea efect doar după repornirea jocului
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Bifați această căsuță pentru sincronizarea verticală a imaginii. Modificarea setării va fi aplicată doar după repornirea jocului și funcționează doar cu accelerarea hardware activată
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Bifați această căsuță pentru sincronizarea verticală a imaginii. Modificarea setării va fi aplicată doar după repornirea jocului și funcționează doar cu accelerarea hardware activată
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Driver curent: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Driver curent: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Dimensiune interfață
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Trageți glisorul pentru a seta dimensiunea interfeței. Ctrl+Tras pentru ajustare continuă
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detectează automat dimensiunea
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Bifați această căsuță pentru a detecta automat dimensiunea interfeței
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scalează marginile
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Bifați această casetă pentru a scala marginile în funcție de dimensiunea interfeței
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Dimensiune interfață
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Trageți glisorul pentru a seta dimensiunea interfeței. Ctrl+Tras pentru ajustare continuă
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detectează automat dimensiunea
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Bifați această căsuță pentru a detecta automat dimensiunea interfeței
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Folosiți fontul tradițional al sprite-ului
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Bifați această casetă dacă preferați să utilizați fontul sprite tradițional cu dimensiune fixă.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Fonturi anti-alias
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Bifați această casetă pentru a aplica anti-alias fonturilor redimensionabile.
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scalează marginile
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Bifați această casetă pentru a scala marginile în funcție de dimensiunea interfeței
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Folosiți fontul tradițional al sprite-ului
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Bifați această casetă dacă preferați să utilizați fontul sprite tradițional cu dimensiune fixă.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Fonturi anti-alias
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Bifați această casetă pentru a aplica anti-alias fonturilor redimensionabile.
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Sondaj automat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participă în sondaje automate
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Când este activat, OpenTTD va transmite un sondaj la ieșirea din joc
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Despre sondaj și intimitate
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Asta va deschide un navigator cu mai multe informații despre sondajul automat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Previzualizare rezultat sondaj
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Arată rezultatul sondajului pentru jocul curent
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Sondaj automat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participă în sondaje automate
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Când este activat, OpenTTD va transmite un sondaj la ieșirea din joc
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Despre sondaj și intimitate
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Asta va deschide un navigator cu mai multe informații despre sondajul automat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Previzualizare rezultat sondaj
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Arată rezultatul sondajului pentru jocul curent
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafică
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Afișează rata de reîmprospătare
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Alegeți rata de reîmprospătare dorită
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Afișează rata de reîmprospătare
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Alegeți rata de reîmprospătare dorită
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Ratele de împrospătare de peste 60Hz ar putea afecta performanța.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set grafic de bază
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selectați setul de grafică de bază pe care să îl utilizați (nu poate fi schimbat în joc, doar din meniul principal)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informații adiționale despre setul grafic de bază
+STR_GAME_OPTIONS_BASE_GRF                                       :Set grafic de bază
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selectați setul de grafică de bază pe care să îl utilizați (nu poate fi schimbat în joc, doar din meniul principal)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informații adiționale despre setul grafic de bază
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set sunete de bază
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selectați sunetele de bază setate pentru a fi utilizate (nu pot fi modificate în joc, doar din meniul principal)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informații adiționale despre setul de sunete de bază
+STR_GAME_OPTIONS_BASE_SFX                                       :Set sunete de bază
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selectați sunetele de bază setate pentru a fi utilizate (nu pot fi modificate în joc, doar din meniul principal)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informații adiționale despre setul de sunete de bază
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Setul de muzică de bază
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selectați setul de muzică de bază
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informații adiționale despre setul de muzică de bază
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Setul de muzică de bază
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selectați setul de muzică de bază
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informații adiționale despre setul de muzică de bază
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Obțineți conținut
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Verificați daca există conținut de actualizat
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(fără pluginuri care să fie integrate cu platformele sociale instalate)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platformă:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Starea pluginului:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platformă:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Starea pluginului:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Rulează
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inițializarea eșuată
@@ -1206,12 +1215,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permisivă (far
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nu este disponibil nici un modul de Inteligență Artificială...{}Puteți descărca diferite module de Inteligență Artificială prin sistemul de 'Resurse Online'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Setări
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtru:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Extinde toate
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Colapsează toate
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Resetează toate valorile
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtru:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Extinde toate
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Colapsează toate
+STR_CONFIG_SETTING_RESET_ALL                                    :Resetează toate valorile
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(descrierea nu este disponibilă)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valoare implicită: {ORANGE}{STRING}
@@ -1224,9 +1232,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Setări compani
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Atenție!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Această acțiune va reface toate setările jocului la valorile implicite.{}Sigur vrei să continui?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tip:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limitează lista de mai jos doar la setările modificate
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tip:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limitează lista de mai jos doar la setările modificate
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Setări de bază (afișează numai setări importante)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Setări avansate (afișează majoritatea setărilor)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Setări expert (afișează toate setările)
@@ -1239,13 +1247,13 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT                         :Setări client
 STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU                      :Setări joc (stocate în salvări; afectează doar jocurile noi)
 STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME                    :Setări joc (stocate în salvări; afectează doar jocul curent)
 STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU                   :Setări companie (stocate în salvări; afectează doar jocurile noi)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Setări compenia (stocate în salvări; afectează doar compania curentă)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Setări companie (stocate în salvări; afectează doar compania curentă)
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nespecificat -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Arată toate rezultatele de căutare setând{}{SILVER}Categoria {BLACK}în {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Arată toate rezultatele de căutare setând{}{SILVER}Tipul {BLACK}în {WHITE}Toate tipurile de setări
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Arată toate rezultatele de căutare setând{}{SILVER}Categoria {BLACK}în {WHITE}{STRING} {BLACK}și {SILVER}Tipul {BLACK}ca {WHITE}Toate tipurile de setări
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Arată toate rezultatele de căutare setând{}{SILVER}Categoria {BLACK}în {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Arată toate rezultatele de căutare setând{}{SILVER}Tipul {BLACK}în {WHITE}Toate tipurile de setări
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Arată toate rezultatele de căutare setând{}{SILVER}Categoria {BLACK}în {WHITE}{STRING} {BLACK}și {SILVER}Tipul {BLACK}ca {WHITE}Toate tipurile de setări
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Inactiv
@@ -1917,7 +1925,7 @@ STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Niciodată
 
 STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Tipul economiei: {STRING}
 ###length 2
-STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Economia lină face mai des modificări de producție, în pași mai mici. Economia înghețată previne modificările de producție și închiderile industriilor. Setarea ar putea să nu aibă efect dacă tipurile de industrii sunt furnizate de un NewGRF
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Economia lină face mai des modificări de producție, în pași mai mici. Economia înghețată previne modificările de producție și închiderile industriilor. Setarea ar putea să nu aibă efect dacă tipurile de industrii sunt furnizate de un NewGRF.{}{}Producția unei industrii pe lună tot poate apărea că variază chiar de economia este Înghețată, pentru că producția este declanșată la intervale fixe care nu corespund exact cu lunile.
 
 ###length 3
 STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Original
@@ -1972,7 +1980,12 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :nepermis
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :permis
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :permis, aspect particularizat al orașului
 
+STR_CONFIG_SETTING_HOUSE_PLACER                                 :Plasarea individuala a caselor de oraș: {STRING}
+STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :Activarea acestei setări permite jucătorilor să plaseze manual casele din oraș
 ###length 3
+STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Interzis
+STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Permis
+STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :Permis, complet construit
 
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Modalitatea de generare a cargoului dintr-un oraș: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Câtă marfa este produsă de casele dintr-un oraș, relativ la populația totală a orașului.{}Creștere pătratică: Un oraș de 2 ori mai mare generează de 4 ori mai mulți pasageri.{}Creștere liniară: Un oraș de 2 ori mai mare generează de 4 ori mai mulți pasageri.
@@ -2172,7 +2185,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... GPU
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Driverul GPU a dus la prăbușirea jocului. Accelerarea hardware a fost dezactivată
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Joc nou
 STR_INTRO_LOAD_GAME                                             :{BLACK}Încarcă joc
@@ -2184,11 +2196,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multipla
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opțiuni
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabela cu scoruri maxime
 STR_INTRO_HELP                                                  :{BLACK}Ajutor și manuale
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Setări
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Setări NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Resurse online
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Setări AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Setări pentru scriptul jocului
 STR_INTRO_QUIT                                                  :{BLACK}Ieșire
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Începere joc nou. Ctrl+Click pentru a sări peste fereastra de configurație a harții
@@ -2206,11 +2214,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Alege pe
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Afișează opțiunile jocului
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Afișează tabela cu scoruri maxime
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Obțineți acces la documentație și resurse online
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Deschide setările
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Afișează setările NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Verifică dacă există resurse noi sau actualizate pentru descărcare
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Afișează setările AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Afișează setările scriptului de joc
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ieși din 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Setul grafic actual are lipsă {NUM} {P sprite spriteuri "de spriteuri"}. Verificați actualizările pentru setul de bază.
@@ -2829,6 +2833,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Selectați o zo
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Selectați un tip de casă de construit. Ctrl+Click pentru a adăuga sau elimina elementele salvate
 
 STR_HOUSE_PICKER_CAPTION                                        :Selectia caselor
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Nume: {ORANGE}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Populație: {ORANGE}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Ani: {ORANGE}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Ani: {ORANGE}Oricare
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Ani: {ORANGE}Din {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Ani: {ORANGE}Până {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Mărime: {ORANGE}{NUM}x{NUM} pătrățele
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Marfă acceptată: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Marfă produsă: {ORANGE}{CARGO_LIST}
 
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Margine
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Periferie
@@ -2836,6 +2849,10 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbiile peri
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbiile urbane
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centrul orașului
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :Preveniți upgrade-urile
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Alege dacă această casă va fi protejată împotriva înlocuirii pe măsură ce orașul crește
+STR_HOUSE_PICKER_PROTECT_OFF                                    :Oprit
+STR_HOUSE_PICKER_PROTECT_ON                                     :Pornit
 
 STR_STATION_CLASS_DFLT                                          :Implicită
 STR_STATION_CLASS_DFLT_STATION                                  :Stație implicită
@@ -3039,6 +3056,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Alege m
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropolă
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Metropolele cresc mai repede decât orașele{}În funcție de setări, sunt mai mari când sunt fondate
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Modelul drumului în oraș:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Alege modelul de drum folosit pentru acest oraș
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3110,6 +3128,8 @@ STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Tip de t
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Limită viteză pe calea ferată: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Viteza limită a drumului: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Limită de viteză tramvai: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}Orașul poate face upgrade: {LTBLUE}Da
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}Orașul poate face upgrade: {LTBLUE}Nu
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Stânci
@@ -3118,6 +3138,9 @@ STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Teren viran
 STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Verdeață
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Teren agricol
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deșert
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :Pietre acoperite de zăpadă
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :Teren accidentat acoperit de zăpadă
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :Iarbă acoperită de zăpadă
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Cale ferată cale ferată
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Cale ferată cale ferată cu semafoare
@@ -3272,6 +3295,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Salveaz
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Încarcă scenariu
 STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Încarcă harta înălțimilor
 STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}Salvează harta înălțimilor
+STR_SAVELOAD_LOAD_TOWN_DATA                                     :{WHITE}Încărcați datele orașului
 STR_SAVELOAD_HOME_BUTTON_TOOLTIP                                :{BLACK}Click aici pentru a ajunge la directorul predefinit pentru salvări
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} liberi
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de discuri, directoare și fișiere cu jocuri salvate
@@ -3283,6 +3307,7 @@ STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Salveaz
 STR_SAVELOAD_LOAD_BUTTON                                        :{BLACK}Încarcă
 STR_SAVELOAD_LOAD_TOOLTIP                                       :{BLACK}Încarcă salvarea selectată
 STR_SAVELOAD_LOAD_HEIGHTMAP_TOOLTIP                             :{BLACK}Încarcă harta selectată
+STR_SAVELOAD_LOAD_TOWN_DATA_TOOLTIP                             :{BLACK}Încărcați datele orașului selectat
 STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Detalii joc
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Nicio informație disponibilă
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
@@ -3416,6 +3441,8 @@ STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Initiali
 STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}Se rulează script-ul
 STR_GENERATION_PREPARING_GAME                                   :{BLACK}Pregătesc jocul
 
+STR_TOWN_DATA_ERROR_JSON_FORMATTED_INCORRECTLY                  :{WHITE}JSON formatat incorect
+STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}{STRING} coordonate formatate incorect, trebuie să fie de la 0 la 1 ca proporție din dimensiunea totală a hărții de înălțime
 
 
 # NewGRF settings
@@ -3476,15 +3503,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Salveaz
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista presetărilor disponibile; alegeți una pentru salvare cu numele de mai jos
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Adaugă denumire presetare
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Numele selectat pentru salvarea presetării
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Anulează
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Nu schimba setarea implicită
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Salvează
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Salvează setarea pe numele selectat
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Schimbați parametrii grafici de bază
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Schimbă parametrii NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Închide
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Resetează
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Setează toții parametrii la valorile implicite
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametru {NUM}
@@ -3973,6 +3997,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Producț
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE                  :{BLACK}Producție în ultimul minut:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transportat)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrează imaginea pe locația industriei. Ctrl+Click pentru a deshide o fereastra cu locația industriei
+STR_INDUSTRY_VIEW_PRODUCTION_GRAPH                              :{BLACK}Grafic de producție
+STR_INDUSTRY_VIEW_PRODUCTION_GRAPH_TOOLTIP                      :{BLACK}Arată graficul de producție istoric al industriei
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Nivelul producției: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}Industria a anunțat închiderea iminentă!
 
@@ -3981,6 +4007,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produce:
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Necesită:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} așteptând{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} aștepând
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Schimba productia (multiplu de 8, până la 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Modifică nivelul producției (procent, până la 800%)
@@ -4705,7 +4735,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Orar - c
 STR_TIMETABLE_NO_TRAVEL                                         :NU este calatorie
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Călătorie (automat; programată după următoarea comandă manuală)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Calatorie (fara orar)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Călătoriți (neplanificat) cu maxim {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Călătorii pentru {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Mergi către {STRING} cu maxim {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Călătorie (pentru {STRING}, neplanificată)
@@ -4731,12 +4760,14 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Secunde până
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Modifică timpul
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modificați timpul pe care ar trebui să o dureze comanda evidențiată. Ctrl+Click pentru a seta ora pentru toate comenzile
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Schimbă timpul
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Curata timp
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Ștergeți perioada de timp pentru comanda evidențiată. Ctrl+Click pentru a șterge ora pentru toate comenzile
 
 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Schimbă limita de viteză
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Modificați viteza maximă de deplasare a comenzii evidențiate. Ctrl+Click pentru a seta viteza pentru toate comenzile
+STR_TIMETABLE_CHANGE_SPEED_QUERY                                :Schimbă limita de viteză
 
 STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}șterge limita de viteză
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Ștergeți viteza maximă de deplasare a comenzii evidențiate. Ctrl+Click pentru a șterge viteza pentru toate comenzile
@@ -4829,8 +4860,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Acceptă
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Alege scriptul marcat
-STR_AI_LIST_CANCEL                                              :{BLACK}Anulează
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nu schimba scriptul
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Capturează ecranul
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captură de ecran obișnuită
@@ -4843,7 +4872,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captură
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script de joc
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Închide
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetează
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4950,6 +4978,7 @@ STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... a fo
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... a fost atinsă limita numarului de zone pe care le poti curăța
 STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... limita de plantare a copacilor a fost atinsă
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Numele trebuie să fie unic
+STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{STRING} în cale
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Nepermis când jocul este în pauză
 
 # Local authority errors
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 0a5e6791ad..cc701f82dd 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -411,7 +411,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Закр
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Окна можно перетаскивать, схватив за заголовок
 STR_TOOLTIP_SHADE                                               :{BLACK}Свернуть окно, оставив заголовок
 STR_TOOLTIP_DEBUG                                               :{BLACK}Показать отладочную информацию NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Изменить размеры окна на значения по умолчанию. Ctrl+щелчок сохранит текущий размер как значение по умолчанию.
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Изменить размеры окна на значения по умолчанию. Ctrl+щелчок сохранит текущий размер как значение по умолчанию. Ctrl+двойной щелчок сбросит сохранённое значение по умолчанию.
 STR_TOOLTIP_STICKY                                              :{BLACK}Игнорировать нажатия клавиши «Закрыть все окна». Ctrl+щелчок установит такое поведение по умолчанию.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Нажмите и тащите для изменения размера окна
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Большое/маленькое окно
@@ -520,7 +520,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK                          :{BLACK}Исто
 STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}Список задач
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Графики различных показателей деятельности компаний и оплаты грузоперевозок
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Рейтинги компаний
-STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Открыть промышленный каталог, производственную цепочку или финансировать строительство новой промышленности
+STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Показать список предприятий и производственные цепочки; профинансировать строительство нового предприятия
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Списки поездов по компаниям. Ctrl+щелчок - показать/скрыть группы.
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Списки автомобильного транспорта по компаниям. Ctrl+щелчок - показать/скрыть группы.
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Списки судов по компаниям. Ctrl+щелчок - показать/скрыть группы.
@@ -569,8 +569,7 @@ STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :Создани
 STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Размещение зданий
 
 # Settings menu
-STR_SETTINGS_MENU_GAME_OPTIONS                                  :Основные настройки
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Расширенные настройки
+STR_SETTINGS_MENU_GAME_OPTIONS                                  :Настройки игры
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Настройки ИИ
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Настройки игровых скриптов
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Настройки NewGRF
@@ -583,7 +582,7 @@ STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Грузовы
 STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Остановки автобусов
 STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Пристани
 STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Аэропорты
-STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Удалённые станции
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Закрытые станции
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Показывать названия маршрутных точек
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Показывать метки
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Показывать названия станций конкурентов
@@ -769,7 +768,7 @@ STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLA
 STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Ничего
 STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Показать все виды грузов на графике
 STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Скрыть все виды грузов на графике
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Включить/выключить отображение груза на графике
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Включить/отключить отображение груза на графике
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}
 
 STR_GRAPH_INDUSTRY_PRODUCTION_CAPTION                           :{WHITE}График производительности: {INDUSTRY}
@@ -780,7 +779,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Пока
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Легенда
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Включить/выключить отображение компании на графике
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Включить/отключить отображение компании на графике
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Сравнительная таблица компаний
@@ -909,16 +908,16 @@ STR_SMALLMAP_TYPE_ROUTES                                        :Маршрут
 STR_SMALLMAP_TYPE_VEGETATION                                    :Растительность
 STR_SMALLMAP_TYPE_OWNERS                                        :Владельцы
 
-STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Показать контуры земли на карте
-STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}Показать транспорт на карте
-STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Показать предприятия на карте
+STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Показать на карте ландшафт
+STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}Показать на карте транспортные средства
+STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Показать на карте предприятия
 STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP                     :{BLACK}Показать на карте грузовые потоки
-STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Показать маршруты на карте
-STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Показать растительность на карте
-STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Показать владельцев земли на карте
+STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Показать на карте транспортную инфраструктуру
+STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Показать на карте растительность
+STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Показать на карте участки земли, находящиеся во владении компаний
 STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Щелчок по типу предприятия переключает отображение его на карте. Ctrl+щелчок отключает все типы, кроме выбранного. Повторный Ctrl+щелчок включает все типы предприятий.
 STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Щелчок по названию компании переключает отображение её собственности на карте. Ctrl+щелчок отключает отображение всех компаний, кроме выбранной. Повторный Ctrl+щелчок включает отображение всех компаний.
-STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Щелчок по названию груза переключает видимость этого груза. Ctrl+щелчок прячет все грузы кроме выбранного. Повторный Ctrl+щелчок отображает все грузы.
+STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Щелчок по названию груза переключает отображение этого груза. Ctrl+щелчок прячет все грузы кроме выбранного. Повторный Ctrl+щелчок отображает все грузы.
 
 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINY_FONT}{BLACK}Автодороги
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINY_FONT}{BLACK}Железные дороги
@@ -929,7 +928,7 @@ STR_SMALLMAP_LEGENDA_TRAINS                                     :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_ROAD_VEHICLES                              :{TINY_FONT}{BLACK}Автотранспорт
 STR_SMALLMAP_LEGENDA_SHIPS                                      :{TINY_FONT}{BLACK}Водный транспорт
 STR_SMALLMAP_LEGENDA_AIRCRAFT                                   :{TINY_FONT}{BLACK}Авиатранспорт
-STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLACK}Маршруты транспорта
+STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLACK}Транспортная инфраструктура
 STR_SMALLMAP_LEGENDA_FOREST                                     :{TINY_FONT}{BLACK}Лес
 STR_SMALLMAP_LEGENDA_RAILROAD_STATION                           :{TINY_FONT}{BLACK}Ж/д станция
 STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY                          :{TINY_FONT}{BLACK}Грузовой терминал
@@ -950,7 +949,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINY_FONT}{BLACK}Пустыня
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINY_FONT}{BLACK}Снег
 
-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Включить/выключить названия городов
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Показать/убрать названия городов
 STR_SMALLMAP_CENTER_TOOLTIP                                     :{BLACK}Центрировать миникарту по этой позиции
 STR_SMALLMAP_INDUSTRY                                           :{TINY_FONT}{STRING} ({NUM})
 STR_SMALLMAP_LINKSTATS                                          :{TINY_FONT}{STRING}
@@ -1104,22 +1103,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Пока
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Настройки
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Основные
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Основные настройки игры
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Основные настройки
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Графика
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Настройки графики
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Настройки графики
 STR_GAME_OPTIONS_TAB_SOUND                                      :Звук
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Настройки звука и музыки
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Настройки звука и музыки
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Социальные
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Настройки социальной интеграции
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Настройки интеграции с социальными платформами
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Расширенные
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Расширенные настройки
 
 STR_GAME_OPTIONS_VOLUME                                         :Громкость
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Звуковые эффекты
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Музыка
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Валюта
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Смена используемой в игре валюты
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Валюта
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Выбор используемой в игре валюты
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1170,8 +1173,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Латвийс
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Португальский эскудо
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Украинская гривна
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Автосохранение
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Интервал автосохранения игры
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Автосохранение
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Интервал между автоматическим сохранением игры
 
 # Autosave dropdown
 ###length 5
@@ -1181,77 +1184,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :каждые 30
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :каждые 60 минут
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :каждые 120 минут
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Язык
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Язык пользовательского интерфейса
+STR_GAME_OPTIONS_LANGUAGE                                       :Язык
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Язык пользовательского интерфейса
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% перевед{P ён ено ено})
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Полноэкранный режим
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Включить/выключить полноэкранный режим
+STR_GAME_OPTIONS_FULLSCREEN                                     :Полноэкранный режим
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Включить/отключить полноэкранный режим
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Разрешение экрана
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Выбор разрешения экрана
+STR_GAME_OPTIONS_RESOLUTION                                     :Разрешение экрана
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Выбор разрешения экрана
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Другое
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Аппаратное ускорение
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Включить/выключить аппаратное ускорение. После этого игру потребуется перезапустить.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Аппаратное ускорение
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Включить/отключить аппаратное ускорение. После изменения настройки игру потребуется перезапустить.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Эта настройка будет применена только после перезапуска игры
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Вертикальная синхронизация
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Включить/выключить вертикальную синхронизацию. После этого игру потребуется перезапустить. Работает только при включённом аппаратном ускорении.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Вертикальная синхронизация
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Включить/отключить вертикальную синхронизацию. После изменения настройки игру потребуется перезапустить. Работает только при включённом аппаратном ускорении.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Видеодрайвер: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Видеодрайвер: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Масштаб интерфейса
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Изменяйте масштаб интерфейса с помощью ползунка. Удерживайте Ctrl для точной настройки.
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Автоопределение
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Нажмите для автоматической установки масштаба интерфейса
+STR_GAME_OPTIONS_INTERFACE                                      :Интерфейс
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Рельефные элементы
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Масштабировать рельефные элементы интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Масштаб интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Изменяйте масштаб интерфейса с помощью ползунка. Удерживайте Ctrl для плавной настройки.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Автоопределение
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Нажмите для автоматической установки масштаба интерфейса
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Использовать растровый шрифт
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Поставьте отметку, чтобы использовать классический растровый шрифт фиксированного размера
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Сглаживание шрифтов
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Поставьте отметку, чтобы включить сглаживание масштабируемых шрифтов
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Рельефные элементы
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Масштабировать рельефные элементы интерфейса
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Использовать растровый шрифт
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Включить/отключить использование классического растрового шрифта фиксированного размера
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Сглаживание шрифтов
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Включить/отключить сглаживание масштабируемых шрифтов
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Автоматический сбор данных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Разрешить сбор и отправку данных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Разрешить автоматический сбор данных о ваших настройках игры и используемых модулях. OpenTTD отправит эти данные при закрытии игры.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}О сборе данных и приватности
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Открыть ссылку с информацией об автоматическом сборе данных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Просмотр собранных данных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Показать данные, собранные в текущем сеансе и подготовленные к отправке
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Автоматический сбор данных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Разрешить сбор и отправку данных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Разрешить автоматическую отправку собранных данных при выходе из игры
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :О сборе данных и приватности
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Открыть страницу с информацией об автоматическом сборе данных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Просмотр собранных данных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Показать данные, собранные в текущем сеансе и подготовленные к отправке
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Настройки графики
+STR_GAME_OPTIONS_DISPLAY                                        :Экран
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Частота обновления экрана
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Выбор частоты обновления экрана
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Частота обновления экрана
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Выбор частоты обновления экрана
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}{NBSP}Гц
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Частота обновления выше 60{NBSP}Гц может отрицательно сказаться на производительности.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Основной графический пакет
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Выбор основного графического пакета (его нельзя сменить в игре; только в главном меню)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Дополнительная информация о выбранном графическом пакете
+STR_GAME_OPTIONS_BASE_GRF                                       :Основной графический пакет
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Выбор основного графического пакета (его нельзя сменить в игре; только в главном меню)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Дополнительная информация о выбранном графическом пакете
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Основной звуковой пакет
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Выбор основного пакета звуковых эффектов (его нельзя сменить в игре; только в главном меню)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Дополнительная информация о выбранном пакете звуковых эффектов
+STR_GAME_OPTIONS_BASE_SFX                                       :Основной звуковой пакет
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Выбор основного пакета звуковых эффектов (его нельзя сменить в игре; только в главном меню)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Дополнительная информация о выбранном пакете звуковых эффектов
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Основной музыкальный пакет
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Выбор основного музыкального пакета
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Дополнительная информация о выбранном музыкальном пакете
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Основной музыкальный пакет
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Выбор основного музыкального пакета
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Дополнительная информация о выбранном музыкальном пакете
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Загрузка контента
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Получить список контента для установки и обновления
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(модули взаимодействия с социальными платформами не установлены)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(модули взаимодействия с социальными платформами не установлены)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Платформа:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Состояние модуля:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Платформа:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Состояние модуля:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Запущен
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Не удалось инициализировать
@@ -1368,12 +1373,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :дозволя
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Модули ИИ отсутствуют.{}{}Их можно скачать через систему онлайн-контента.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Расширенные настройки
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Фильтр:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Развернуть всё
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Свернуть всё
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Сбросить все значения
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Фильтр:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Развернуть всё
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Свернуть всё
+STR_CONFIG_SETTING_RESET_ALL                                    :Сбросить все значения
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(нет описания)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Значение по умолчанию: {ORANGE}{STRING}
@@ -1386,9 +1390,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Настрой
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Внимание!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Вы уверены, что хотите сбросить все настройки игры к значениям по умолчанию?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Категория:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Тип:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Отображать в списке только настройки, соответствующие выбранной категории
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Категория:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Тип:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Отображать в списке только настройки, соответствующие выбранной категории
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Основные настройки (только самые важные)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Расширенные настройки (практически все)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Все настройки (включая самые непонятные)
@@ -1405,9 +1409,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Настрой
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Нет -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Чтобы показать все результаты поиска, выберите{}{SILVER}категорию{BLACK}: {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Чтобы показать все результаты поиска, выберите{}{SILVER}тип{BLACK}: {WHITE}Все настройки
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Чтобы показать все результаты поиска, выберите{}{SILVER}категорию{BLACK}: {WHITE}{STRING} {BLACK}и {SILVER}тип{BLACK}: {WHITE}Все настройки
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Чтобы показать все результаты поиска, выберите{}{PUSH_COLOUR}{SILVER}категорию{POP_COLOUR}: {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Чтобы показать все результаты поиска, выберите{}{PUSH_COLOUR}{SILVER}тип{POP_COLOUR}: {WHITE}Все настройки
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Чтобы показать все результаты поиска, выберите{}{PUSH_COLOUR}{SILVER}категорию{POP_COLOUR}: {PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR} и {PUSH_COLOUR}{SILVER}тип{POP_COLOUR}: {WHITE}Все настройки
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :нет
@@ -2014,7 +2018,7 @@ STR_CONFIG_SETTING_STATION_LENGTH_LOADING_PENALTY_HELPTEXT      :При вклю
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :Учитывать ограничение скорости у вагонов: {STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT                    :При наличии в составе вагонов с ограничением скорости учитывать это ограничение при определении максимальной скорости состава
 
-STR_CONFIG_SETTING_DISABLE_ELRAILS                              :Выключить электрифицированную железную дорогу: {STRING}
+STR_CONFIG_SETTING_DISABLE_ELRAILS                              :Не требовать электрификации железной дороги: {STRING}
 STR_CONFIG_SETTING_DISABLE_ELRAILS_HELPTEXT                     :При включении этой настройки электровозы смогут ездить по неэлектрифицированной железной дороге
 
 STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OWN               :Первое транспортное средство игрока на станции: {STRING}
@@ -2342,7 +2346,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... не
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... драйвер видеокарты вызвал критическую ошибку. Аппаратное ускорение отключено.
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Новая игра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Загрузить игру
@@ -2351,14 +2356,10 @@ STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Загр
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Редактор сценариев
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Сетевая игра
 
-STR_INTRO_GAME_OPTIONS                                          :{BLACK}Основные настройки
+STR_INTRO_GAME_OPTIONS                                          :{BLACK}Настройки игры
 STR_INTRO_HIGHSCORE                                             :{BLACK}Таблица рекордов
 STR_INTRO_HELP                                                  :{BLACK}Помощь и документация
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Расширенные настройки
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Настройки NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Онлайн-контент
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Настройки ИИ
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Настройки игровых скриптов
 STR_INTRO_QUIT                                                  :{BLACK}Выход
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Начать новую игру. Ctrl+щелчок пропускает этап настройки карты.
@@ -2376,11 +2377,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Детс
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Открыть окно с основными настройками игры
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Показать таблицу рекордов
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Ссылки на документацию и интернет-ресурсы
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Расширенные настройки игры
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Открыть настройки NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Найти новый и обновлённый контент для загрузки
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Открыть настройки ИИ
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Открыть настройки игровых скриптов
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Выйти из OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}В выбранном наборе базовой графики отсутству{P 0 е ю ю}т {NUM} спрайт{P "" а ов}. Пожалуйста, обновите набор графики.
@@ -3251,6 +3248,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Выбо
 STR_FOUND_TOWN_CITY                                             :{BLACK}Мегаполис
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Большие города растут быстрее, чем маленькие.{}В зависимости от настроек, они при создании имеют больший размер.
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Расширение города:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Здания
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Строительство новых зданий в городе
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Дороги
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Строительство новых дорог в городе
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Сеть городских дорог:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Тип сети городских дорог
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Стандартная
@@ -3700,15 +3703,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Сохр
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Список доступных наборов. Выберите один из них, чтобы скопировать его название в строку имени.
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Введите имя набора
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Текущее имя для сохранения набора
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Отмена
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Не делать никаких изменений
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Сохранить
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Сохранить набор под выбранным именем
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Изменение параметров графического пакета
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Изменить параметры NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Закрыть
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Сброс
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Сбросить значения всех параметров
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Параметр {NUM}
@@ -3877,6 +3877,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Пере
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Расширить
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Увеличить размер города
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Больше зданий
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Увеличить количество зданий в городе
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Больше дорог
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Расширить дорожную сеть
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Уничтожить
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Полностью уничтожить этот город
 
@@ -4169,14 +4173,14 @@ STR_BUY_COMPANY_HOSTILE_TAKEOVER                                :{WHITE}Посл
 
 # Company infrastructure window
 STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Инфраструктура «{COMPANY}»
-STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Ж/д участки:
+STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Железнодорожная инфраструктура:
 STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Сигналы
-STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Дорожные участки:
-STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Трамвайные участки:
-STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Водные поля:
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Автомобильная инфраструктура:
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Трамвайные пути:
+STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Водная инфраструктура:
 STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Каналы
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Станции:
-STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}Площадь станций
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}Занимаемая площадь
 STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}Аэропорты
 STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR                      :{WHITE}{CURRENCY_LONG}/год
 STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD                    :{WHITE}{CURRENCY_LONG}/цикл
@@ -4627,10 +4631,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Пока
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Показать маршрут воздушного судна. Ctrl+щелчок - показать график движения.
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показать информацию о поезде
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показать информацию об автомобиле
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показать информацию о судне
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показать сведения об авиатранспорте.
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показать информацию о поезде. Ctrl+щелчок - показать группу, в которой состоит транспортное средство.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показать информацию об автомобиле. Ctrl+щелчок - показать группу, в которой состоит транспортное средство.
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показать информацию о судне. Ctrl+щелчок - показать группу, в которой состоит транспортное средство.
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показать сведения о воздушном судне. Ctrl+щелчок - показать группу, в которой состоит транспортное средство.
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Текущее состояние поезда. Нажмите, чтобы остановить/запустить его.
@@ -4954,15 +4958,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Граф
 STR_TIMETABLE_NO_TRAVEL                                         :Нет назначения
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :В пути (время учтено в ближайшем не автоматическом задании)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :В пути (график не составлен)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Идти со скоростью не более {2:VELOCITY} (график не составлен)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Идти со скоростью не более {VELOCITY} (график не составлен)
 STR_TIMETABLE_TRAVEL_FOR                                        :В пути {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Идти {STRING} со скоростью не более {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :В пути примерно {STRING} (график не составлен)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Идти примерно {STRING} со скоростью не более {VELOCITY} (график не составлен)
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(ждать {STRING}; график не составлен)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(в пути {STRING}; график не составлен)
-STR_TIMETABLE_STAY_FOR                                          :и ждать {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :и идти в {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}и ждать {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}и идти в {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Прохождение этого маршрут займёт примерно {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Весь маршрут займёт {STRING}
@@ -5081,8 +5085,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Выбрать
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Выбрать подсвеченный скрипт
-STR_AI_LIST_CANCEL                                              :{BLACK}Отмена
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Не менять скрипт
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Снимок экрана
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Обычный снимок
@@ -5095,7 +5097,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Сним
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Настройки ИИ
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Настройки игровых скриптов
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Закрыть
 STR_AI_SETTINGS_RESET                                           :{BLACK}Сброс
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -6147,6 +6148,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}млрд
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}трлн
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -6186,3 +6188,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Открыть настройки значков
+STR_BADGE_CONFIG_RESET                                          :Сброс
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Иконки значков
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Фильтры значков
+STR_BADGE_CONFIG_PREVIEW                                        :Предпросмотр
+STR_BADGE_CONFIG_NAME                                           :Название
+STR_BADGE_FILTER_ANY_LABEL                                      :Любой {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} равен {STRING}
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 62eb1bf31e..34b245bae9 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -624,7 +624,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Izađi
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcije
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Podešavanja
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Podešavanja VI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Podešavanja skripte
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Podešavanja NewGRF
@@ -1121,21 +1120,22 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Kopiraj
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcije
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Opšte
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Odabir opštih podešavanja
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Odabir opštih podešavanja
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grrafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Odabir grafičkih podešavanja
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Odabir grafičkih podešavanja
 STR_GAME_OPTIONS_TAB_SOUND                                      :Zvuk
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Odabir podešavanja zvuka i muzike
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Odabir podešavanja zvuka i muzike
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Društveno
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Odabir društvenih podešavanja
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Odabir društvenih podešavanja
 
 STR_GAME_OPTIONS_VOLUME                                         :Jačina zvuka
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Zvučni efekti
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muzika
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor valute
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Izbor valute
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1184,8 +1184,8 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonezijska ru
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malezijski ringit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Letonski lat
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Auto čuvanje pozicije
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Izbor vremenskog intervala između dve automatski sačuvane pozicije
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Auto čuvanje pozicije
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Izbor vremenskog intervala između dve automatski sačuvane pozicije
 
 # Autosave dropdown
 ###length 5
@@ -1195,73 +1195,73 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Svakih 30 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Svakih 60 minuta
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Svakih 120 minuta
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jezik
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Odaberi jezik za interfejs
+STR_GAME_OPTIONS_LANGUAGE                                       :Jezik
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Odaberi jezik za interfejs
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% završeno)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Ceo ekran
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Označi ovde za igranje OpenTTD preko celog ekrana
+STR_GAME_OPTIONS_FULLSCREEN                                     :Ceo ekran
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Označi ovde za igranje OpenTTD preko celog ekrana
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Veličina ekrana
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Odaberi željenu veličinu ekrana
+STR_GAME_OPTIONS_RESOLUTION                                     :Veličina ekrana
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Odaberi željenu veličinu ekrana
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :drugo
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardversko ubrzanje
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Označi ovde da OpenTTD pokuša da koristi hardversko ubrzanje. Promena ovog podešavanja će imati efekta tek nakon ponvnog pokretanja igre
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardversko ubrzanje
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Označi ovde da OpenTTD pokuša da koristi hardversko ubrzanje. Promena ovog podešavanja će imati efekta tek nakon ponvnog pokretanja igre
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Podešavanje će imati efekta tek nakon ponovnog pokretanja igre
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Označi ovde da uključiš v-sync. Promena ovog podešavanja će biti vidljiva tek nakon ponovnog pokretanja igre. Radi jedino sa uključenim hardverskim ubrzanjem.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Označi ovde da uključiš v-sync. Promena ovog podešavanja će biti vidljiva tek nakon ponovnog pokretanja igre. Radi jedino sa uključenim hardverskim ubrzanjem.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Trenutni pokretač: {STRING}
-
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Veličina interfejsa
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Povuci klizač da podesiš veličinu interfejsa. Držanjem Ctrl podešavanje se vrši kontinualno
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automatski detektuj veličinu
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Označi ovde za automatsko prepoznavanje veličine interfejsa
-
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Povećanje okvira
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Označi ovde da veličina okvira povećava sa veličinom prozora
-
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Koristi tradicionalni font
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Označi ovde ako više voliš tradicionalni font fiksirane veličine.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fontova
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Označi ovde za anti-alias fontova promenljive veličine
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Trenutni pokretač: {STRING}
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatizovana anketa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Učestvuj u automatizovanoj anketi
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kada je uključeno, OpenTTD će poslati rezultate ankete prilikom napuštanja igre
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}O anketi i privatnosti
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Ovo otvara pretraživač sa više informacija o automatizovanim anketama
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Pregledaj rezultate anketa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Pogledaj rezultate ankete za trenutnu igru
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Veličina interfejsa
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Povuci klizač da podesiš veličinu interfejsa. Držanjem Ctrl podešavanje se vrši kontinualno
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automatski detektuj veličinu
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Označi ovde za automatsko prepoznavanje veličine interfejsa
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafike
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Povećanje okvira
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Označi ovde da veličina okvira povećava sa veličinom prozora
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Frekvencija osvežavanja ekrana
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Odaberi frekvenciju osvežavanja ekrana
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Koristi tradicionalni font
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Označi ovde ako više voliš tradicionalni font fiksirane veličine.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fontova
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Označi ovde za anti-alias fontova promenljive veličine
+
+
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatizovana anketa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Učestvuj u automatizovanoj anketi
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Kada je uključeno, OpenTTD će poslati rezultate ankete prilikom napuštanja igre
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :O anketi i privatnosti
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ovo otvara pretraživač sa više informacija o automatizovanim anketama
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Pregledaj rezultate anketa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Pogledaj rezultate ankete za trenutnu igru
+
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Frekvencija osvežavanja ekrana
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Odaberi frekvenciju osvežavanja ekrana
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Frekvencije osvežavanja veće od 60Hz mogu uticati na performanse.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni skup grafika
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberi željeni skup osnovnih grafika
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatni podaci o osnovnom skupu grafika
+STR_GAME_OPTIONS_BASE_GRF                                       :Osnovni skup grafika
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Odaberi željeni skup osnovnih grafika
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Dodatni podaci o osnovnom skupu grafika
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Osnovni skup zvukova
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Odaberi željeni skup osnovnih zvukova
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatni podaci o osnovnom skupu zvukova
+STR_GAME_OPTIONS_BASE_SFX                                       :Osnovni skup zvukova
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Odaberi željeni skup osnovnih zvukova
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Dodatni podaci o osnovnom skupu zvukova
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Osnovni skup muzike
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Odaberi željeni skup osnovne muzike
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatni podaci o osnovnom skupu muzike
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Osnovni skup muzike
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Odaberi željeni skup osnovne muzike
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Dodatni podaci o osnovnom skupu muzike
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nema instaliranih dodataka za integraciju sa drušvenim platformama)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stanje dodatka:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stanje dodatka:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Neuspešno pokretanje
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} nije u funkciji
@@ -1369,12 +1369,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Popustljivo (be
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nisu dostupne odgovarajuće VI...{}Možete preuzeti nekoliko VI preko sistema za preuzimanje dodataka
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Podešavanja
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Pretraga:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Proširi sve
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Skupi sve
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Resetuj sve vrednosti
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Pretraga:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Proširi sve
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Skupi sve
+STR_CONFIG_SETTING_RESET_ALL                                    :Resetuj sve vrednosti
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(nema objašnjenja)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Podrazumevana vrednost: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Vrsta podešavanja: {ORANGE}{STRING}
@@ -1386,9 +1385,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Podešavanja pr
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Oprez!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Ovo će resetovati sva podešavanja igre na početne vrednosti{}Da li sigurno želiš da nastaviš?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Vrsta:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Ograničava donju listu tako da prikazuje samo promenjena podešavanja
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Vrsta:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Ograničava donju listu tako da prikazuje samo promenjena podešavanja
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Osnovna podešavanja
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Napredna podešavanja
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspertska / sva podešavanja
@@ -1405,9 +1404,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Podešavanja pr
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nema -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Pokaži sve rezultate pretrage prema postavkama{}{SILVER}Tip {BLACK}do {WHITE} Svi tipovi postavki
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}i {SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Pokaži sve rezultate pretrage prema postavkama{}{SILVER}Tip {BLACK}do {WHITE} Svi tipovi postavki
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}i {SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ne
@@ -2308,7 +2307,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... komp
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU drajver je oborio igru. Hardversko ubrzanje je onemogućeno
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova igra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Učitavanje igre
@@ -2320,11 +2318,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Mrežna
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opcije
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabela najboljih rezultata
 STR_INTRO_HELP                                                  :{BLACK}Pomoć i priručnici
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Podešavanja
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Podešavanja NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Proveri dodatke na mreži
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Podešavanja VI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Podešavanja skripte
 STR_INTRO_QUIT                                                  :{BLACK}Napusti
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Započinje novu igru. Ctrl+klik preskače konfiguraciju mape
@@ -2342,11 +2336,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Izbor ze
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Prikaži opcije igre
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Prikaži tabelu najboljih rezultata
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Pristupi dokumentaciji i resursima na internetu
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Otvori podešavanja
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži podešavanja NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Pregled novih i ažuriranih dodatka za preuzimanje
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Otvori podešavanja VI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Otvori podešavanja skripte
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Napušta 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Trenutno odabranom skupu osnovne grafike nedostaje {NUM} sprajt{P "" "ova" "ova"}. Proveri da li postoje izmene za ovaj skup.
@@ -3135,6 +3125,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Izbor ve
 STR_FOUND_TOWN_CITY                                             :{BLACK}Grad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Gradovi se razvijaju brže nego uobičajena naselja{}U zavisnosti od podešavanja, veći su prilikom osnivanja
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Mreža puteva u naselju:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Izbor plana mreže puteva u naselju
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalno
@@ -3559,14 +3550,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Sačuvaj
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista dostupnih postavki, odaberi jednu za kopiranje pod imenom ispod
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Unesi ime postavke
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Trenutno izabrani naziv za snimanje početnih postavki
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Otkaži
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ne manjati odabrane postavke
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Sačuvaj
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK} Sačuvaj trenutnu postavku odabranog imena
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Promena NewGRF parametara
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zatvori
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Poništi
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Postavlja parametre na njihove početne vrednosti
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametar {NUM}
@@ -4774,7 +4762,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Raspored
 STR_TIMETABLE_NO_TRAVEL                                         :Nema putovanja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Putovanje (automatski; raspored po redu naredbi)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Putovanje (bez rasporeda)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Putovanje sa najviše {2:VELOCITY} (bez rasporeda)
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Putovanje do {STRING} sa najviše {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Putovanje (za{STRING}, bez rasporeda)
@@ -4895,8 +4882,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Prihvati
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Bira označenu skriptu
-STR_AI_LIST_CANCEL                                              :{BLACK}Otkaži
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne menja skriptu
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Snimi sliku ekrana
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normalna slika ekrana
@@ -4909,7 +4894,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Slika um
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Skripta igre
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zatvori
 STR_AI_SETTINGS_RESET                                           :{BLACK}Poništi
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 793bfbdeb0..60c06d7d56 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -124,7 +124,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT_LONG}
 STR_QUANTITY_BATTERIES                                          :{COMMA}{NBSP}箱电池
 STR_QUANTITY_PLASTIC                                            :{VOLUME_LONG}塑料
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA}{NBSP}瓶汽水
-STR_QUANTITY_N_A                                                :N/A
+STR_QUANTITY_N_A                                                :不适用
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -276,7 +276,7 @@ STR_LIST_FILTER_TOOLTIP                                         :{BLACK}输入
 STR_TOOLTIP_GROUP_ORDER                                         :{BLACK}选择分组次序
 STR_TOOLTIP_SORT_ORDER                                          :{BLACK}选择排序方法（降序/升序）
 STR_TOOLTIP_SORT_CRITERIA                                       :{BLACK}选择排序标准
-STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}选择过滤标准
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}选择过滤条件
 STR_BUTTON_SORT_BY                                              :{BLACK}排序
 STR_BUTTON_CATCHMENT                                            :{BLACK}覆盖范围
 STR_TOOLTIP_CATCHMENT                                           :{BLACK}显示覆盖范围
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}关闭
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}窗口标题 - 拖动这里可以移动该窗口
 STR_TOOLTIP_SHADE                                               :{BLACK}阴影窗口 - 仅显示标题栏
 STR_TOOLTIP_DEBUG                                               :{BLACK}显示 NewGRF 纠错信息
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}将窗口调整到默认大小。按住 <Ctrl> 键点击以将当前大小存为默认大小
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}将窗口调整到默认大小。按住 <Ctrl> 键单击以将当前大小存为默认大小。按住 <Ctrl> 键双击以重置大小。
 STR_TOOLTIP_STICKY                                              :{BLACK}标记此窗口，使其不受“关闭所有窗口”快捷键影晌。按住 <Ctrl> 键单击将当前状态设为默认状态
 STR_TOOLTIP_RESIZE                                              :{BLACK}点击并拖动这里可以缩放窗口
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}切换窗口大小
@@ -338,7 +338,7 @@ STR_SORT_BY_PROFIT_THIS_PERIOD                                  :本期损益
 STR_SORT_BY_AGE                                                 :年龄
 STR_SORT_BY_RELIABILITY                                         :可靠性
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :总容量，依货物种类排序
-STR_SORT_BY_MAX_SPEED                                           :最大速度
+STR_SORT_BY_MAX_SPEED                                           :最高速度
 STR_SORT_BY_MODEL                                               :型号
 STR_SORT_BY_VALUE                                               :价值
 STR_SORT_BY_LENGTH                                              :长度
@@ -389,7 +389,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}显示
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}显示财政补贴项目
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS            :{BLACK}显示公司车站列表
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}显示公司财务信息
-STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}显示公司一般信息
+STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}显示公司基本信息
 STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK                          :{BLACK}显示公司历史纪录
 STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}显示游戏目标列表
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}显示公司图表和货物运费表
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :放置房屋
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :游戏选项
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :设置
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI 设置
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :游戏脚本设置
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF 设置
@@ -623,7 +622,7 @@ STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}公司
 STR_GRAPH_LAST_24_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}最近 24 分
 STR_GRAPH_LAST_72_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}最近 72 分
 
-STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}货物运输价格
+STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}货物运费表
 STR_GRAPH_CARGO_PAYMENT_RATES_DAYS                              :{TINY_FONT}{BLACK}运输所用天数
 STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS                           :{TINY_FONT}{BLACK}运输所用秒数
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}将 10 单位（或 10,000 升）货物运输 20 个方格
@@ -870,7 +869,7 @@ STR_NEWS_COMPANY_MERGER_TITLE                                   :{BIG_FONT}{BLAC
 STR_NEWS_COMPANY_MERGER_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} 被 {STRING} 以 {CURRENCY_LONG} 收购！
 STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLACK}破产！
 STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} 已经宣布破产，所有资产均已抵债！
-STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}新的运输公司开业大吉！
+STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}运输公司开业大吉！
 STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} 在 {TOWN} 附近开工建设！
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} 被 {STRING} 以未知的价格收购！
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}（总裁）
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}将主
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}游戏选项
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :通用
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}通用设置
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :修改通用设置
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :图像
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}图像设置
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :修改图像设置
 STR_GAME_OPTIONS_TAB_SOUND                                      :音效
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}声音设置
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :修改音乐与音效设置
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :社交
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}选择社交插件设置
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :修改社交插件设置
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :高级
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :修改高级设置
 
 STR_GAME_OPTIONS_VOLUME                                         :音量
 STR_GAME_OPTIONS_SFX_VOLUME                                     :音效
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :音乐
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}：{ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}货币单位
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}货币单位选择
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :货币单位
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :选择货币单位
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING}（{STRING}）
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :拉脱维亚拉
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :葡萄牙埃斯库多
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :乌克兰格里夫纳
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}自动保存
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}选择自动保存的周期
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :自动保存
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :选择自动保存周期
 
 # Autosave dropdown
 ###length 5
@@ -1036,84 +1039,86 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :每 30 分钟
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :每 60 分钟
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :每 120 分钟
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}语言
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}选择界面语言
+STR_GAME_OPTIONS_LANGUAGE                                       :语言
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :选择界面语言
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING}（已完成 {NUM}%）
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}全屏幕
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}选择此项可以在全屏幕模式下进行 OpenTTD 游戏
+STR_GAME_OPTIONS_FULLSCREEN                                     :全屏幕
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :勾选此框可以在全屏幕模式下游玩 OpenTTD
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}屏幕分辨率
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}选择要使用的屏幕分辨率
+STR_GAME_OPTIONS_RESOLUTION                                     :屏幕分辨率
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :选择屏幕分辨率
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :其他
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}×{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}硬件加速
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}点击该复选框，让 OpenTTD 尝试使用硬件加速。修改后的设置将在游戏重启后生效
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :硬件加速
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :勾选此框以让 OpenTTD 尝试使用硬件加速。修改后的设置将在游戏重启后生效
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}修改后的设置将在游戏重启后生效
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}垂直同步
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}点击该复选框开启垂直同步（V-sync）。修改后的设置将在游戏重启后生效。仅于开启硬件加速时有效
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :垂直同步
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :勾选此框以开启垂直同步（V-sync）。修改后的设置将在游戏重启后生效。仅于开启硬件加速时可用
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}驱动程序：{STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :驱动程序：{STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}界面大小
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}拖动滑块以设置界面大小。按住 <Ctrl> 键以精准调整
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}自动检测大小
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}选中此框可自动检测界面大小
+STR_GAME_OPTIONS_INTERFACE                                      :界面
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}适应边框大小
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}选中此框使边框大小随界面大小而缩放
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :界面大小
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :拖动滑块以设置界面大小。按住 <Ctrl> 键以精准调整
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :自动检测大小
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :勾选此框以自动检测界面大小
+
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :缩放边框
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :勾选此框使边框随界面大小而缩放
 
 STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :使用位图字体
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}如果您想使用固定大小的传统位图字体，请勾选此框
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}字体抗锯齿
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}勾选此框以对游戏字体应用抗锯齿
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :勾选此框以使用固定大小的传统位图字体
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :字体抗锯齿
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :勾选此框以对游戏字体应用抗锯齿
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}×
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}自动体验调查
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}参与自动体验调查
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}“打开”时，OpenTTD 会在结束游戏时传输调查结果
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}关于体验调查和隐私
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}这会提供更多自动体验调查的信息（打开浏览器）
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}预览调查结果
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}展示正在运行的存档的调查结果
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :自动体验调查
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :参与自动体验调查
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :启用后，OpenTTD 会在结束游戏时传输调查结果
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :关于调查与隐私
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :在浏览器中显示关于自动体验调查的更多信息
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :预览调查结果
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :显示当前游戏的结果
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}图像
+STR_GAME_OPTIONS_DISPLAY                                        :显示
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}显示刷新率
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}选择需要的屏幕刷新率
+STR_GAME_OPTIONS_REFRESH_RATE                                   :显示刷新率
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :选择显示刷新率
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}高于 60Hz 的刷新率可能会影响性能。
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基础图形组
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}选择要使用的基础图形组（只能在主菜单更改，不能在游戏中更改）
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}关于基本图组的额外信息
+STR_GAME_OPTIONS_BASE_GRF                                       :基础图形组
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :选择使用的基础图形组（无法在游戏中更改，只能在主菜单更改）
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :关于基础图形组的额外信息
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}基础音效组
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}选择要使用的基础音效组（只能在主菜单更改，不能在游戏中更改）
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}有关基础音效组的附加信息
+STR_GAME_OPTIONS_BASE_SFX                                       :基础音效组
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :选择使用的基础音效组（无法在游戏中更改，只能在主菜单更改）
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :关于基础音效组的额外信息
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}基础音乐组
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}选择要使用的基础音乐组
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}有关基础音乐组的附加信息
+STR_GAME_OPTIONS_BASE_MUSIC                                     :基础音乐组
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :选择使用的基础音乐组
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :关于基础音乐组的额外信息
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :获取内容
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :查询并下载最新内容
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}（未安装社交平台插件）
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :（未安装社交平台插件）
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING}（{STRING}）
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}平台：
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}插件状态：
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING}（{STRING}）
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :平台：
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :插件状态：
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}正在运行
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}初始化失败
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} 未在运行
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNLOADED                   :{RED}未加载
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}重复插件
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNSUPPORTED_API            :{RED}不受支持的版本
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_UNSUPPORTED_API            :{RED}不支持的版本
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_INVALID_SIGNATURE          :{RED}无效签名
 
 STR_BASESET_STATUS                                              :{STRING} {RED}（共有 {NUM} 份缺失或损坏的文件）
@@ -1148,42 +1153,42 @@ STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}改变当前的货币参数
 
 STR_NONE                                                        :无
-STR_FUNDING_ONLY                                                :不生成
+STR_FUNDING_ONLY                                                :无
 STR_MINIMAL                                                     :每种仅一个
-STR_NUM_VERY_LOW                                                :非常低
-STR_NUM_LOW                                                     :低
-STR_NUM_NORMAL                                                  :一般
-STR_NUM_HIGH                                                    :高
+STR_NUM_VERY_LOW                                                :极少
+STR_NUM_LOW                                                     :较少
+STR_NUM_NORMAL                                                  :适中
+STR_NUM_HIGH                                                    :较多
 STR_NUM_CUSTOM                                                  :自定义
 STR_NUM_CUSTOM_NUMBER                                           :自定义（{NUM}）
 
 STR_VARIETY_NONE                                                :无
-STR_VARIETY_VERY_LOW                                            :非常低
-STR_VARIETY_LOW                                                 :低
-STR_VARIETY_MEDIUM                                              :中
-STR_VARIETY_HIGH                                                :高
-STR_VARIETY_VERY_HIGH                                           :非常高
+STR_VARIETY_VERY_LOW                                            :极少
+STR_VARIETY_LOW                                                 :较少
+STR_VARIETY_MEDIUM                                              :适中
+STR_VARIETY_HIGH                                                :较多
+STR_VARIETY_VERY_HIGH                                           :极多
 
 ###length 5
-STR_AI_SPEED_VERY_SLOW                                          :非常慢
+STR_AI_SPEED_VERY_SLOW                                          :极慢
 STR_AI_SPEED_SLOW                                               :慢
 STR_AI_SPEED_MEDIUM                                             :适中
 STR_AI_SPEED_FAST                                               :快
-STR_AI_SPEED_VERY_FAST                                          :非常快
+STR_AI_SPEED_VERY_FAST                                          :极快
 
 ###length 6
-STR_SEA_LEVEL_VERY_LOW                                          :非常低
-STR_SEA_LEVEL_LOW                                               :低
+STR_SEA_LEVEL_VERY_LOW                                          :极小
+STR_SEA_LEVEL_LOW                                               :较小
 STR_SEA_LEVEL_MEDIUM                                            :适中
-STR_SEA_LEVEL_HIGH                                              :高
+STR_SEA_LEVEL_HIGH                                              :较大
 STR_SEA_LEVEL_CUSTOM                                            :自定义
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :自定义（{NUM}%）
 
 ###length 4
-STR_RIVERS_NONE                                                 :没有
+STR_RIVERS_NONE                                                 :无
 STR_RIVERS_FEW                                                  :较少
-STR_RIVERS_MODERATE                                             :一些
-STR_RIVERS_LOT                                                  :布满
+STR_RIVERS_MODERATE                                             :适中
+STR_RIVERS_LOT                                                  :较多
 
 ###length 3
 STR_DISASTER_NONE                                               :没有
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :放任（所有
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}无合适的 AI 可用……{}{}可以使用“线上拓展内容”功能下载新的 AI
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}设置
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}搜索条目：
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}展开全部
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}关闭全部
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}重置所有值
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :搜索：
+STR_CONFIG_SETTING_EXPAND_ALL                                   :展开全部
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :折叠全部
+STR_CONFIG_SETTING_RESET_ALL                                    :重置所有数值
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :（没有可用的提示）
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}默认值：{ORANGE}{STRING}
@@ -1237,11 +1241,11 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :当前公司设
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}注意！
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}该操作将重置所有游戏设置为默认值。{}确认继续？
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}筛选设定：
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}适用范围：
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}仅显示修改过的选项
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :筛选设定：
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :适用范围：
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :仅显示修改过的选项
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :基本（仅显示重要设置）
-STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :高级（显示大部份设置）
+STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :高级（显示大部分设置）
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :专业（显示所有设置）
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :修改默认值
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :设置一个与当前游戏设置不同的值
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :当前公司设
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- 无 -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}在 {SILVER}筛选设定 {BLACK}一栏选择 {WHITE}{STRING} {BLACK}以显示所有搜寻结果
-STR_CONFIG_SETTING_TYPE_HIDES                                   :在 {SILVER}适用范围 {BLACK}一栏选择 {WHITE}所有适用范围 {BLACK}以显示所有搜寻结果
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}在 {SILVER}筛选设定 {BLACK}一栏选择 {WHITE}{STRING} 并在 {SILVER}适用范围 {BLACK}一栏选择 {WHITE}所有适用范围 {BLACK}以显示所有搜寻结果
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :在{PUSH_COLOUR}{SILVER}筛选设定{POP_COLOUR}一栏选择{PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR}以显示所有结果
+STR_CONFIG_SETTING_TYPE_HIDES                                   :在{PUSH_COLOUR}{SILVER}适用范围{POP_COLOUR}一栏选择{PUSH_COLOUR}{WHITE}所有设置种类{POP_COLOUR}以显示所有结果
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :在{PUSH_COLOUR}{SILVER}筛选设定{POP_COLOUR}一栏选择{PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR}并在{PUSH_COLOUR}{SILVER}适用范围{POP_COLOUR}一栏选择{PUSH_COLOUR}{WHITE}所有设置种类{POP_COLOUR}以显示所有结果
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :关闭
@@ -1304,7 +1308,7 @@ STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS                           :载具损坏：
 STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT                  :设置维护不足的载具的故障频率
 
 STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER                           :财政补贴系数：{STRING}
-STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT                  :设置获得财政补贴的线路的利润倍数
+STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT                  :设置获得财政补贴的线路的利润系数
 
 STR_CONFIG_SETTING_SUBSIDY_DURATION                             :财政补贴时长：{STRING}
 ###length 2
@@ -1372,11 +1376,11 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT        :设置对汽车
 STR_CONFIG_SETTING_FORBID_90_DEG                                :禁止列车直角转向：{STRING}
 STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :常见的转角均为 45 度，而相邻的两个方块上互相垂直的两条轨道相接会形成一个 90 度弯，从而使列车在穿越两方块边界时进行 90 度转向。如启用此设定，所有列车均不会进行 90 度转向
 
-STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :允许非毗邻站台合并：{STRING}
+STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :允许合并互不相邻的车站：{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :启用时允许玩家用 <Ctrl> 键操作以合并不相邻的站台与车站
 
 STR_CONFIG_SETTING_INFLATION                                    :通货膨胀：{STRING}
-STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :“打开”通货膨胀时，支出比收入增长得稍快
+STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :启用通货膨胀；启用时支出比收入增长得稍快
 
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :桥梁的最大长度：{STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :建设桥梁时允许的最大长度
@@ -1398,7 +1402,7 @@ STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :工厂周边空
 STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT                   :设置工厂周边预留区域数量，这些预留区域用来建设铁路及其它
 
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :允许在一个城镇中建设多个同类工业设施：{STRING}
-STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT                       :通常，城市不希望有多个相同类型工业，本设置“打开”时允许多个同类型工厂在同一个城市
+STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT                       :在正常情况下，一座城镇只会有一座同类型的工业。启用本选项时，可以在一座城镇建设多座同类型的工业
 
 STR_CONFIG_SETTING_SIGNALSIDE                                   :铁路信号位置：{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE_HELPTEXT                          :选择在铁路的哪一侧放置信号
@@ -1412,7 +1416,7 @@ STR_CONFIG_SETTING_SHOWFINANCES                                 :在年终显示
 STR_CONFIG_SETTING_SHOWFINANCES_PERIOD                          :在周期末显示财务报表：{STRING}
 
 ###length 2
-STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :“打开”时，在年底显示财务报表窗口，方便查看公司财务状况
+STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :启用时，在年底显示财务报表窗口，方便查看公司财务状况
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT_PERIOD                 :如果启用，财务窗口会在每期结束时弹出，以便于检查公司的财务状况
 
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :设定命令时默认选择“直达”命令：{STRING}
@@ -1444,18 +1448,18 @@ STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT                     :如果一家公
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT_MINUTES             :如果一家公司购买一座城镇的独家经营权，其他公司在此城镇的车站在 12 分钟之内将不会收到任何货物与旅客
 
 STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :允许资助城镇建设：{STRING}
-STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT                :“打开”时，允许公司提供资助新建房屋
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT                :启用时允许公司资助城镇建设
 
 STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :允许资助道路重建：{STRING}
-STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT                     :“打开”时，允许公司资助地方修整道路
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT                     :启用时允许公司资助修整道路以干扰城镇道路交通
 
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :允许向其他公司转移资金：{STRING}
-STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT                    :“打开”时，允许联机游戏模式下公司之间转移资金
+STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT                    :启用时在多人游戏中允许公司之间汇款
 
-STR_CONFIG_SETTING_FREIGHT_TRAINS                               :货物重量倍数：{STRING}
-STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT                      :设置列车所载货物的重量倍数。设定的数值越高，货物对列车而言越重，并影响其加速、转弯及上坡的效率
+STR_CONFIG_SETTING_FREIGHT_TRAINS                               :货物重量系数，以模拟较重列车：{STRING}
+STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT                      :设置列车所载货物的重量系数。设定的数值越高，货物对列车而言越重，并影响其加速、转弯及上坡的效率
 
-STR_CONFIG_SETTING_PLANE_SPEED                                  :飞机速度因子：{STRING}
+STR_CONFIG_SETTING_PLANE_SPEED                                  :飞机速度系数：{STRING}
 STR_CONFIG_SETTING_PLANE_SPEED_HELPTEXT                         :设置飞机与其它载具类型的相对速率以减少飞机运输收入
 STR_CONFIG_SETTING_PLANE_SPEED_VALUE                            :1 / {COMMA}
 
@@ -1467,12 +1471,12 @@ STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :较少出现
 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :正常
 
 STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR                     :允许在竞争对手所属的道路或铁路上建平交道口：{STRING}
-STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR_HELPTEXT            :“打开”时，允许在竞争对手所属的道路上建平交道口
+STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR_HELPTEXT            :启用时允许在竞争对手所属的道路上建平交道口
 
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :允许在城镇所属的道路上建通过式车站：{STRING}
-STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :“打开”时允许在城市所属的道路上建设通过式车站
+STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :启用时，允许在城市所属的道路上建设通过式车站
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :允许在竞争对手所属的道路上建通过式车站：{STRING}
-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :“打开”时，允许在其它公司所属的道路上建设通过式车站
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :启用时，允许在其它公司所属的道路上建设通过式车站
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}当有载具时不能更改此设定
 
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :基础设施维护：{STRING}
@@ -1485,9 +1489,9 @@ STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_SECONDARY            :公司初始副
 STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_SECONDARY_HELPTEXT   :选择公司初始副色调，需要使用支持副色调的 NewGRF
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :总允许建设小型机场：{STRING}
-STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :“打开”此选项，每种类型机场出现后一直是可用的
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :启用时，每种机场一经面世，就永远可以选择建设
 
-STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :当列车无法找到路线时提示：{STRING}
+STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :列车无法找到路线时提示：{STRING}
 STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT                   :启用时将在载具无法到达命令目的地时提示
 
 STR_CONFIG_SETTING_ORDER_REVIEW                                 :检查载具调度计划：{STRING}
@@ -1497,12 +1501,12 @@ STR_CONFIG_SETTING_ORDER_REVIEW_OFF                             :不检查
 STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :检查，除停运载具外
 STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :检查所有载具
 
-STR_CONFIG_SETTING_WARN_INCOME_LESS                             :若线路亏损时发出提示：{STRING}
+STR_CONFIG_SETTING_WARN_INCOME_LESS                             :载具亏损时提示：{STRING}
 ###length 2
 STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT                    :启用时，若某载具在一年内总体亏损，发出提示
 STR_CONFIG_SETTING_WARN_INCOME_LESS_HELPTEXT_PERIOD             :启用时，若某载具在一周期内总体亏损，发出提示
 
-STR_CONFIG_SETTING_WARN_OLD_VEHICLE                             :载具老化时发出提示：{STRING}
+STR_CONFIG_SETTING_WARN_OLD_VEHICLE                             :载具老化时提示：{STRING}
 STR_CONFIG_SETTING_WARN_OLD_VEHICLE_HELPTEXT                    :启用时后将会在载具老化时发出提示
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :载具永不过期：{STRING}
@@ -1521,9 +1525,9 @@ STR_CONFIG_SETTING_MINUTES_PER_YEAR_VALUE                       :{NUM}
 ###setting-zero-is-special
 STR_CONFIG_SETTING_MINUTES_PER_YEAR_FROZEN                      :0（日期停止）
 
-STR_CONFIG_SETTING_TOWN_CARGO_SCALE                             :城镇货物产出倍数：{STRING}
+STR_CONFIG_SETTING_TOWN_CARGO_SCALE                             :城镇货物产出系数：{STRING}
 STR_CONFIG_SETTING_TOWN_CARGO_SCALE_HELPTEXT                    :按此比例扩大城镇的货物生产规模
-STR_CONFIG_SETTING_INDUSTRY_CARGO_SCALE                         :工业货物产出倍数：{STRING}
+STR_CONFIG_SETTING_INDUSTRY_CARGO_SCALE                         :工业货物产出系数：{STRING}
 STR_CONFIG_SETTING_INDUSTRY_CARGO_SCALE_HELPTEXT                :按此比例扩大工业的货物生产规模
 STR_CONFIG_SETTING_CARGO_SCALE_VALUE                            :{NUM}%
 
@@ -1633,7 +1637,7 @@ STR_CONFIG_SETTING_STATION_SPREAD_HELPTEXT                      :设置车站的
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :直升机在降落平台自动维护：{STRING}
 STR_CONFIG_SETTING_SERVICEATHELIPAD_HELPTEXT                    :直升飞机在降落平台自动维护，即使机场没有机库
 
-STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :链接地形工具栏与铁路、公路、船只、机场工具栏：{STRING}
+STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :链接地形工具栏与建设工具栏：{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR_HELPTEXT              :设定否在开启建设交通设施的工具栏时同时开启地形工具栏
 
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :缩略地图颜色选择：{STRING}
@@ -1652,7 +1656,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED                :灰色到红色
 STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE                  :灰度
 
 STR_CONFIG_SETTING_SCROLLMODE                                   :视点滚动方式：{STRING}
-STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :用鼠标拖动地图时的行为。“鼠标位置锁定”选项并不在任何平台上适用，如基于网页的版本、触屏、Linux 上的 Wayland 等
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :卷动地图的行为。“鼠标指针不跟随移动”选项不适用于所有平台，如网页版、触控屏、Linux Wayland 等
 ###length 4
 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :鼠标右键移动视角，鼠标指针不跟随移动
 STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :鼠标右键移动地图，鼠标指针不跟随移动
@@ -1660,7 +1664,7 @@ STR_CONFIG_SETTING_SCROLLMODE_RMB                               :鼠标右键移
 STR_CONFIG_SETTING_SCROLLMODE_LMB                               :鼠标左键移动地图
 
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :平滑视角滚动：{STRING}
-STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :设置在缩略图上点击或者发出转到特定目标的命令时主视角的转换方式，如果“打开”本选项，视角平缓滚动，“关闭”时直接跳转到目标位置
+STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :设置在缩略图上点击或者发出转到特定目标的命令时主视角的转换方式。启用时，视角平缓滚动，否则直接跳转到目标位置
 
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :建设时显示测量数据：{STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT                     :建设时显示距离格数和地形高差
@@ -1694,11 +1698,11 @@ STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK_FOCUS            :单击（当前
 STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK                  :单击（立即）
 
 STR_CONFIG_SETTING_USE_RELAY_SERVICE                            :使用中继服务：{STRING}
-STR_CONFIG_SETTING_USE_RELAY_SERVICE_HELPTEXT                   :连接服务器失败时，玩家可以使用中继服务来建立连接。“关闭”禁止中继服务，“询问”先进行询问，“打开”直接使用中继
+STR_CONFIG_SETTING_USE_RELAY_SERVICE_HELPTEXT                   :连接服务器失败时，玩家可以使用中继服务来建立连接。“关闭”禁止中继服务，“询问”先进行询问，“允许”直接使用中继
 ###length 3
 STR_CONFIG_SETTING_USE_RELAY_SERVICE_NEVER                      :关闭
 STR_CONFIG_SETTING_USE_RELAY_SERVICE_ASK                        :询问
-STR_CONFIG_SETTING_USE_RELAY_SERVICE_ALLOW                      :打开
+STR_CONFIG_SETTING_USE_RELAY_SERVICE_ALLOW                      :允许
 
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU                          :右键模拟：{STRING}
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT                 :选择模拟鼠标右键的方式
@@ -1733,7 +1737,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :除景观操作
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :所有操作
 
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :使用高级载具列表：{STRING}
-STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :允许使用高级载具列表，方便进行分组操作
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :启用高级载具列表，方便为载具分组
 
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :使用装载进度指示：{STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT                  :选择是否在载具上方显示装卸货物进度
@@ -1745,8 +1749,8 @@ STR_CONFIG_SETTING_TIMETABLE_MODE_DAYS                          :日
 STR_CONFIG_SETTING_TIMETABLE_MODE_SECONDS                       :秒
 STR_CONFIG_SETTING_TIMETABLE_MODE_TICKS                         :刻
 
-STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :在时刻表中显示到达时间和出发时间：{STRING}
-STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT    :在时刻表中显示预期的到达和出发时间
+STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :在时刻表中显示出发和到达时间：{STRING}
+STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT    :在时刻表中显示预定的出发和到达时间
 
 STR_CONFIG_SETTING_QUICKGOTO                                    :快捷载具调度计划创建：{STRING}
 STR_CONFIG_SETTING_QUICKGOTO_HELPTEXT                           :启用时，打开调度计划窗口时预先选定“前往”命令
@@ -1762,16 +1766,16 @@ STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :显示预留的
 STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION_HELPTEXT              :让预留的铁路轨道显示不同的颜色，以帮助查找列车拒绝进入路径轨道的原因
 
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :建造工具使用后仍选中：{STRING}
-STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT            :“打开”时在桥梁、隧道等建造工具使用后保持选中，方便继续使用
+STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT            :启用时在桥梁、隧道等建造工具使用后保持选中，方便继续使用
 
 STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS                          :建造铁路时自动移除信号灯：{STRING}
 STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT                 :自动移除轨道铺设路径上的信号。请注意，移除信号可能导致列车事故
 
 STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT                     :快进速度上限：{STRING}
-STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_HELPTEXT            :限制快进时的最大速度。0 = 无限制（即电脑性能允许的最快速度）。低于 100% 的值将使游戏变慢。游戏速度上限取决于计算机的配置，并可能随游戏当前状态浮动
+STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_HELPTEXT            :限制快进时的最高速度。0 = 无限制（以计算机可行的最快速度）。低于 100% 的值将使游戏变慢。游戏速度上限取决于计算机的配置，并可能随游戏当前状态浮动
 STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_VAL                 :{NUM}% 正常游戏速度
 ###setting-zero-is-special
-STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_ZERO                :无限制（在您计算机允许的范围内）
+STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_ZERO                :无限制（以计算机可行的最快速度）
 
 STR_CONFIG_SETTING_SOUND_TICKER                                 :产业新闻：{STRING}
 STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT                        :每月初产业新闻音效
@@ -1793,7 +1797,7 @@ STR_CONFIG_SETTING_SOUND_CONFIRM_HELPTEXT                       :播放成功建
 STR_CONFIG_SETTING_SOUND_CLICK                                  :点击按钮：{STRING}
 STR_CONFIG_SETTING_SOUND_CLICK_HELPTEXT                         :按一下按钮时发出蜂鸣声
 
-STR_CONFIG_SETTING_SOUND_DISASTER                               :灾难/事故：{STRING}
+STR_CONFIG_SETTING_SOUND_DISASTER                               :灾难与事故：{STRING}
 STR_CONFIG_SETTING_SOUND_DISASTER_HELPTEXT                      :播放灾难和事故音效
 
 STR_CONFIG_SETTING_SOUND_VEHICLE                                :载具：{STRING}
@@ -1802,32 +1806,32 @@ STR_CONFIG_SETTING_SOUND_VEHICLE_HELPTEXT                       :播放载具音
 STR_CONFIG_SETTING_SOUND_AMBIENT                                :音效：{STRING}
 STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT                       :播放与地貌、工业设施和城镇有关的环境音效
 
-STR_CONFIG_SETTING_MAX_TRAINS                                   :每间公司最大火车数量：{STRING}
+STR_CONFIG_SETTING_MAX_TRAINS                                   :公司火车数量上限：{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT                          :每间公司最多能够拥有的火车数量
 
-STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :每间公司最大汽车数量：{STRING}
+STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :公司汽车数量上限：{STRING}
 STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT                   :每间公司最多能够拥有的汽车数量
 
-STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :每间公司最大飞机数量：{STRING}
+STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :公司飞机数量上限：{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT                        :每间公司最多能够拥有的飞机数量
 
-STR_CONFIG_SETTING_MAX_SHIPS                                    :每间公司最大船只数量：{STRING}
+STR_CONFIG_SETTING_MAX_SHIPS                                    :公司船只数量上限：{STRING}
 STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT                           :每间公司最多能够拥有的船只数量
 
-STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :禁止电脑使用火车：{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT                    :“打开”本选项将禁止电脑使用火车
+STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :禁止 AI 使用火车：{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT                    :启用时将禁止 AI 使用火车
 
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :禁止电脑使用汽车：{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT             :“打开”本选项将禁止电脑使用汽车
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :禁止 AI 使用汽车：{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT             :启用时将禁止 AI 使用汽车
 
-STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :禁止电脑使用飞机：{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT                  :“打开”本选项将禁止电脑使用飞机
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :禁止 AI 使用飞机：{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT                  :启用时将禁止 AI 使用飞机
 
-STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :禁止电脑使用船只：{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT                     :“打开”本选项将禁止电脑使用船只
+STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :禁止 AI 使用船只：{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT                     :启用时将禁止 AI 使用船只
 
-STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :允许电脑玩家加入联机游戏：{STRING}
-STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :“打开”时联机游戏允许电脑玩家
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :允许 AI 玩家加入联机游戏：{STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :允许 AI 玩家参加多人游戏
 
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :不令脚本停运的最大代码数量：{STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT                  :设定在每个计算循环中，脚本（AI 与游戏脚本）的每一句代码最多可进行多少个计算步骤
@@ -1872,7 +1876,7 @@ STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OWN_HELPTEXT      :当玩家设立
 STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER             :对手车站的剪彩仪式：{STRING}
 STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER_HELPTEXT    :当对手设立的车站首次有载具停靠时显示讯息
 
-STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS                     :事故/灾难：{STRING}
+STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS                     :灾难与事故：{STRING}
 STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS_HELPTEXT            :报纸报道事故或灾难发生情况
 
 STR_CONFIG_SETTING_NEWS_ACCIDENT_OTHER                          :竞争对手的载具事故：{STRING}
@@ -1916,7 +1920,7 @@ STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION_HELPTEXT            :显示普通事
 ###length 3
 STR_CONFIG_SETTING_NEWS_MESSAGES_OFF                            :关闭
 STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY                        :摘要
-STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :完全
+STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :详细
 
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :彩色新闻出现在 {STRING} 年以后
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :从这一年开始，报纸采用彩色印刷，在此之前，报纸是采用黑白单色印刷的
@@ -1944,13 +1948,13 @@ STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :设定进行转
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :拖动时每隔 {STRING} 设置一个信号
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT                :设置以拖动的方式建设时，自动放置信号灯时的间距，将以该间距放置信号灯，直到碰到障碍（信号灯，分支）
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE                   :{COMMA}格
-STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE                  :拖动方式建设时，保持固定的间距放置信号灯：{STRING}
+STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE                  :拖动建设信号灯时在信号灯之间保持相同距离：{STRING}
 STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE_HELPTEXT         :选择在使用 <Ctrl> 键拖动建设信号灯时的行为。停用时，系统将围绕桥梁与隧道放置信号灯，以避免信号间间距过大。启用时，系统将每隔一段固定距离设置信号灯，方便对齐轨道上信号灯的位置。
 
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :在 {STRING} 年前自动设置悬臂信号
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE_HELPTEXT         :设置电子信号灯出现的时间，在此之前，使用悬臂信号灯（功能相同，外观不同）
 
-STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :在以下信号类型中循环：{STRING}
+STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :按住 <Ctrl> 键点选信号时切换的信号种类：{STRING}
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT                  :选择按 <Ctrl> 键操作以切换信号灯类型时使用的信号备选类型
 ###length 2
 STR_CONFIG_SETTING_CYCLE_SIGNAL_GROUP                           :仅当前信号组
@@ -1972,15 +1976,15 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :3×3 网格
 STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :随机
 
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :允许城镇建设道路：{STRING}
-STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT                    :“打开”时允许成长时建设道路，“关闭”时禁止城镇自行建设道路
+STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT                    :启用时允许成长时建设道路，否则禁止城镇自行建设道路
 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :允许城镇建设平交道：{STRING}
-STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :“打开”时允许城镇建设平交道口
+STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :启用时允许城镇建设平交道口
 
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :允许城镇限制机场噪音：{STRING}
 STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT                         :允许城镇基于城镇人口、机场大小和距离控制机场噪音。禁用此设置时，每座城镇只允许建设两座机场，除非将地方政府态度设为“放任”
 
 STR_CONFIG_SETTING_TOWN_FOUNDING                                :在游戏中建立城镇：{STRING}
-STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :“打开”本选项时，允许玩家在游戏中创建新城镇
+STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :启用时，允许玩家在游戏中建设新城镇
 ###length 3
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :禁止
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :允许
@@ -2054,11 +2058,11 @@ STR_CONFIG_SETTING_LARGER_TOWNS                                 :都市比例：
 STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT                        :设定生成城镇时，城镇中都市的比例。都市的起始人口和增长速度均较一般城镇而言高
 STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 / {COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :没有
-STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :初始都市规模因子：{STRING}
+STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :无
+STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :初始都市规模系数：{STRING}
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :游戏开局时，城市的平均规模相对于普通城镇的比值
 
-STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL                    :每 {STRING}更新客货流
+STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL                    :客货流更新周期：{STRING}
 STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL_HELPTEXT           :重新计算客货流的周期。由于重新计算时仅会计算部分客货流，此处设定的数值并不代表所有客货流会按照此周期更新。设定赋值越小，重新计算客货流所需的 CPU 时间越多；设定赋值越大，线路改变时货物再分配所需时间越长
 STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME                        :客货流计算限时：{STRING}
 STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME_HELPTEXT               :重新计算客货流的时间上限。开始计算时，游戏会产生一个线程。产生的线程至多允许运行设定的秒数。设定赋值越小，线程无法按时结束的可能性越大，从而导致游戏运行延迟。设定赋值越大，则在线路改变时货物再分配所需时间会变长
@@ -2084,7 +2088,7 @@ STR_CONFIG_SETTING_DEMAND_DISTANCE_HELPTEXT                     :如果此设定
 STR_CONFIG_SETTING_DEMAND_SIZE                                  :在对称模式下产生的返程货物比例：{STRING}
 STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT                         :将本设置定于 100% 以下时，到达某站的货物不会全部被送回始发站。{}“对称”与“不对称”模式在本设置为 0% 时表现一致
 
-STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :如果最短路径的饱和度超过{STRING}，把货物改派往容量较大的路径
+STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :如果最短路径的饱和度超过 {STRING}，把货物改派往容量较大的路径
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :在两个给定的站点之间常会有多条不同的路径。货物分配算法会优先使用最短的路径，在其饱和后再使用第二短的路径，依此类推。路径的饱和度是用运载容量和计划使用量估算的。在所有路径都饱和的时候，算法会向所有路径超额装载货物，优先使用容量较高的路径。但是在多数场合算法无法准确计算容量。此设定允许您设定在较短的路径的饱和度达到设定值之后再装载下一条路径。将此值设定为小于 100%，就可避免因过量估算容量而导致的站点超载
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY                  :陆地速度单位：{STRING}
@@ -2139,7 +2143,7 @@ STR_CONFIG_SETTING_INTERFACE                                    :界面
 STR_CONFIG_SETTING_INTERFACE_GENERAL                            :通用
 STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :视点
 STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :建设
-STR_CONFIG_SETTING_ADVISORS                                     :消息/新闻
+STR_CONFIG_SETTING_ADVISORS                                     :新闻与提示
 STR_CONFIG_SETTING_COMPANY                                      :公司
 STR_CONFIG_SETTING_ACCOUNTING                                   :财务管理
 STR_CONFIG_SETTING_VEHICLES                                     :载具
@@ -2147,7 +2151,7 @@ STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :物理
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :经由
 STR_CONFIG_SETTING_VEHICLES_ORDERS                              :调度计划
 STR_CONFIG_SETTING_LIMITATIONS                                  :限制
-STR_CONFIG_SETTING_ACCIDENTS                                    :灾难/事故
+STR_CONFIG_SETTING_ACCIDENTS                                    :灾难与事故
 STR_CONFIG_SETTING_GENWORLD                                     :地图生成
 STR_CONFIG_SETTING_ENVIRONMENT                                  :环境
 STR_CONFIG_SETTING_ENVIRONMENT_TIME                             :时间
@@ -2157,10 +2161,10 @@ STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :工业设施
 STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :货物分配
 STR_CONFIG_SETTING_ENVIRONMENT_TREES                            :树木
 STR_CONFIG_SETTING_AI                                           :竞争
-STR_CONFIG_SETTING_AI_NPC                                       :电脑玩家
+STR_CONFIG_SETTING_AI_NPC                                       :AI 玩家
 STR_CONFIG_SETTING_NETWORK                                      :网络
 
-STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :遇到红灯时自动掉头 {STRING}
+STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :在信号灯前掉头：{STRING}
 STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT                  :当列车在信号灯前长时间等待时，允许掉头
 
 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}改变设置值
@@ -2179,11 +2183,11 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :与当前版本
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :未知
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}……压缩等级“{STRING}”无效
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}……本版本不支持存档格式“{STRING}”，现改用“{STRING}”格式
-STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}……禁用基础图形设置“{STRING}”：未找到
-STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}……禁用基础音效设置“{STRING}”：未找到
-STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}……禁用基础音乐设置“{STRING}”：未找到
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}……正忽略基础图形组“{STRING}”：未找到
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}……正忽略基础音效组“{STRING}”：未找到
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}……正忽略基础音乐组“{STRING}”：未找到
 STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}内存不足
-STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}无法分配 {BYTES} 的 Sprite 缓存。Sprite 缓存的大小已降至 {BYTES}。OpenTTD 的性能将受到影响。请尝试停用 32bpp 图形及／或减少放大倍数，以降低内存需求
+STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}无法分配 {BYTES} 的 Sprite 缓存。Sprite 缓存的大小已降至 {BYTES}。OpenTTD 的性能将受到影响。请尝试停用 32bpp 图形、减少放大倍数，以降低内存需求
 
 # Video initalization errors
 STR_VIDEO_DRIVER_ERROR                                          :{WHITE}图形设置错误……
@@ -2191,23 +2195,20 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}……
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}……GPU 驱动程序导致游戏崩溃。硬件加速已禁用
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}新游戏
 STR_INTRO_LOAD_GAME                                             :{BLACK}读取存档
-STR_INTRO_PLAY_SCENARIO                                         :{BLACK}以场景开始游戏
-STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}以高度图开始游戏
+STR_INTRO_PLAY_SCENARIO                                         :{BLACK}游玩场景
+STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}游玩高度图
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}场景编辑器
 STR_INTRO_MULTIPLAYER                                           :{BLACK}联机游戏
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}游戏选项
 STR_INTRO_HIGHSCORE                                             :{BLACK}高分榜
 STR_INTRO_HELP                                                  :{BLACK}帮助和指南
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}设置
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF 设置
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}线上拓展内容
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI 设置
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}游戏脚本设置
 STR_INTRO_QUIT                                                  :{BLACK}退出
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}开始新游戏。按住 <Ctrl> 键点选以跳过地图设置界面
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}选择
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}显示游戏选项
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}显示高分榜
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}获取说明和在线资源
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}显示设置
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}显示 NewGRF 设定
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}检查有无最新或可更新的内容可供下载
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}显示 AI 设置
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}显示游戏脚本设置
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}退出 OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}当前选定的基础图形组缺少 {NUM} 个贴图。请检查基础图形组有无更新。
@@ -2288,7 +2285,7 @@ STR_LIVERY_SHIP_GROUP_TOOLTIP                                   :{BLACK}显示
 STR_LIVERY_AIRCRAFT_GROUP_TOOLTIP                               :{BLACK}显示飞机分组配色
 STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}选择配色方案的主色调。按住 <Ctrl> 操作以对所有方案应用选定的颜色
 STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}选择配色方案的副色调。按住 <Ctrl> 操作以对所有方案应用选定的颜色
-STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}选择要修改的配色方案。按住 <Ctrl> 键点击以选中多种配色方案。勾选方框以切换是否使用配色方案
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}选择修改的配色方案。按住 <Ctrl> 键点击以选中多种配色方案。勾选方框以切换是否使用配色方案
 STR_LIVERY_TRAIN_GROUP_EMPTY                                    :尚未为列车分组
 STR_LIVERY_ROAD_VEHICLE_GROUP_EMPTY                             :尚未为汽车分组
 STR_LIVERY_SHIP_GROUP_EMPTY                                     :尚未为船只分组
@@ -2465,8 +2462,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}为您
 STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}正在连接……
 
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}您前面还有 {NUM} 个客户端
-STR_NETWORK_CONNECTING_DOWNLOADING_1                            :{BLACK}{BYTES} 已下载
-STR_NETWORK_CONNECTING_DOWNLOADING_2                            :{BLACK}{BYTES} / {BYTES} 已下载
+STR_NETWORK_CONNECTING_DOWNLOADING_1                            :{BLACK}已下载 {BYTES}
+STR_NETWORK_CONNECTING_DOWNLOADING_2                            :{BLACK}已下载 {BYTES}，共 {BYTES}
 
 ###length 8
 STR_NETWORK_CONNECTING_1                                        :{BLACK}（1/6）正在连接……
@@ -2532,9 +2529,9 @@ STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_BAN                        :封禁
 STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_RESET                     :删除
 
 STR_NETWORK_CLIENT_LIST_ASK_CAPTION                             :{WHITE}管理命令
-STR_NETWORK_CLIENT_LIST_ASK_CLIENT_KICK                         :{YELLOW}你确定要踢出名为 {STRING} 的玩家吗？
-STR_NETWORK_CLIENT_LIST_ASK_CLIENT_BAN                          :{YELLOW}你确定要封禁名为 {STRING} 的玩家吗？
-STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET                       :{YELLOW}你确定要删除 {COMPANY} 公司吗？
+STR_NETWORK_CLIENT_LIST_ASK_CLIENT_KICK                         :{YELLOW}确定踢出“{STRING}”吗？
+STR_NETWORK_CLIENT_LIST_ASK_CLIENT_BAN                          :{YELLOW}确定封禁“{STRING}”吗？
+STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET                       :{YELLOW}确定删除“{COMPANY}”吗？
 
 STR_NETWORK_ASK_RELAY_CAPTION                                   :{WHITE}使用中继？
 STR_NETWORK_ASK_RELAY_TEXT                                      :{YELLOW} 无法建立你与服务器 {STRING} 的连接。{}你是否想通过 {STRING} 中继此次会话？
@@ -2542,7 +2539,7 @@ STR_NETWORK_ASK_RELAY_NO                                        :{BLACK}否
 STR_NETWORK_ASK_RELAY_YES_ONCE                                  :{BLACK}是，本次请求
 STR_NETWORK_ASK_RELAY_YES_ALWAYS                                :{BLACK}是，不要再次询问
 
-STR_NETWORK_ASK_SURVEY_CAPTION                                  :是否参与自动调查？
+STR_NETWORK_ASK_SURVEY_CAPTION                                  :是否参与自动体验调查？
 STR_NETWORK_ASK_SURVEY_TEXT                                     :您是否愿意参与自动体验调查？{} OpenTTD 会在结束游戏时传输调查结果。{}您可以在任意时刻在“游戏选项”菜单修改本选项。
 STR_NETWORK_ASK_SURVEY_PREVIEW                                  :预览调查结果
 STR_NETWORK_ASK_SURVEY_LINK                                     :关于体验调查和隐私
@@ -2599,7 +2596,7 @@ STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}连接
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION                    :{WHITE}已经有 {NUM} 秒没有从服务器收到任何数据
 
 ###length 23
-STR_NETWORK_ERROR_CLIENT_GENERAL                                :一般错误
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :基本错误
 STR_NETWORK_ERROR_CLIENT_DESYNC                                 :同步错误
 STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :不能读取地图
 STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :连接丢失
@@ -2674,8 +2671,8 @@ STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}取消
 STR_CONTENT_SEARCH_EXTERNAL                                     :{BLACK}在外部网站搜索
 STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP                             :{BLACK}在与 OpenTTD 没有联系的网站搜索没有纳入 OpenTTD 内容服务的内容
 STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION                  :{WHITE}正在离开游戏！
-STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER                          :{WHITE}在外部网站下载内容的规则及条款可能跟 OpenTTD 引用的规则及条款不同。{}您需要参照有关网站以取得在 OpenTTD 安装有关内容的资讯。{}您要继续吗？
-STR_CONTENT_FILTER_TITLE                                        :{BLACK}标签/名称过滤器
+STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER                          :{WHITE}内容下载的规则和条款依网站而定。{}请参照相关网站以了解在 OpenTTD 中使用相关内容的规则与其他信息。{}是否继续？
+STR_CONTENT_FILTER_TITLE                                        :{BLACK}搜索标签与名称：
 STR_CONTENT_OPEN_URL                                            :{BLACK}主页
 STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}访问此项目的网站
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}下载
@@ -2693,7 +2690,7 @@ STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}此未
 STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}这是现有 {STRING} 的替代版本
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}名称：{WHITE}{STRING}
 STR_CONTENT_DETAIL_VERSION                                      :{SILVER}版本：{WHITE}{STRING}
-STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}描述：{WHITE}{STRING}
+STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}简介：{WHITE}{STRING}
 STR_CONTENT_DETAIL_URL                                          :{SILVER}链接：{WHITE}{STRING}
 STR_CONTENT_DETAIL_TYPE                                         :{SILVER}类型：{WHITE}{STRING}
 STR_CONTENT_DETAIL_FILESIZE                                     :{SILVER}大小：{WHITE}{BYTES}
@@ -2720,7 +2717,7 @@ STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}下载
 STR_CONTENT_DOWNLOAD_INITIALISE                                 :{WHITE}正在发送请求……
 STR_CONTENT_DOWNLOAD_FILE                                       :{WHITE}正在下载 {STRING}（{NUM} / {NUM}）
 STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}下载完毕
-STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}已下载 {BYTES} / {BYTES}（{NUM}%）
+STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}已下载 {BYTES}，共 {BYTES}（{NUM}%）
 
 # Content downloading error messages
 STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}无法链接到下载服务器……
@@ -2754,7 +2751,7 @@ STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}选择
 STR_LINKGRAPH_LEGEND_CAPTION                                    :{BLACK}客货流图表
 STR_LINKGRAPH_LEGEND_ALL                                        :{BLACK}全部
 STR_LINKGRAPH_LEGEND_NONE                                       :{BLACK}无
-STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}选择要查看的公司
+STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}选择查看的公司
 STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP                            :{BLACK}{STRING}{}{COMPANY}
 
 # Linkgraph legend window and linkgraph legend in smallmap
@@ -2839,7 +2836,7 @@ STR_PICKER_MODE_SAVED_TOOLTIP                                   :切换为仅显
 STR_PICKER_STATION_CLASS_TOOLTIP                                :选择显示的车站类别
 STR_PICKER_STATION_TYPE_TOOLTIP                                 :选择建造的车站类型。按住 <Ctrl> 键操作以保存或删除当前项目
 STR_PICKER_WAYPOINT_CLASS_TOOLTIP                               :选择显示的路点类别
-STR_PICKER_WAYPOINT_TYPE_TOOLTIP                                :选择要建造的路点类型。按住<Ctrl>键以添加或删除已保存的项目
+STR_PICKER_WAYPOINT_TYPE_TOOLTIP                                :选择建造的路点类型。按住<Ctrl>键以添加或删除已保存的项目
 STR_PICKER_ROADSTOP_BUS_CLASS_TOOLTIP                           :选择显示的公共汽车站类别
 STR_PICKER_ROADSTOP_BUS_TYPE_TOOLTIP                            :选择建造的公共汽车站类型。按住 <Ctrl> 键操作以保存或删除当前项目
 STR_PICKER_ROADSTOP_TRUCK_CLASS_TOOLTIP                         :选择显示的汽车货场类别
@@ -3022,7 +3019,7 @@ STR_OBJECT_CLASS_TRNS                                           :发射机
 
 # Tree planting window (last eight for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}树木
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}选择要种植的树木类型。如果格子内已经有树木，将种植随机类型的树木
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}选择种植的树木类型。如果格子内已经有树木，将种植随机类型的树木
 STR_TREES_RANDOM_TYPE                                           :{BLACK}随机类型的树木
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}种植随机类型的树木。按 <Ctrl> 键操作以沿对角线建造，按住 <Shift> 键以显示预计费用
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}随机树木
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}选择
 STR_FOUND_TOWN_CITY                                             :{BLACK}都市
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}都市增长速度高于一般城镇{}它们建立时规模更大
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}城镇发展：
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :建筑物
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :增建城镇建筑
+STR_FOUND_TOWN_EXPAND_ROADS                                     :道路
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :延展城镇道路
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}城镇道路布局：
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}为此城镇选择使用的道路布局
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}原版
@@ -3090,7 +3093,7 @@ STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}请选
 STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :{BLACK}生成随机工业
 STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}在地图上创建大量随机的工业设施
 STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_CAPTION                :{WHITE}生成随机工业
-STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_QUERY                  :{YELLOW}你确定要生成大量随机工业吗？
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_QUERY                  :{YELLOW}确定生成大量随机工业吗？
 STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}费用：{YELLOW}{CURRENCY_LONG}
 STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}勘探
 STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}建设
@@ -3098,7 +3101,7 @@ STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}建设
 STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES                         :{BLACK}移除所有工业
 STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_TOOLTIP                 :{BLACK}移除当前地图上所有工业
 STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_CAPTION                 :{WHITE}移除所有工业
-STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_QUERY                   :{YELLOW}你确定要清除所有工业吗？
+STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_QUERY                   :{YELLOW}确定清除所有工业吗？
 
 # Industry cargoes window
 STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION                           :{WHITE}产业链 - {STRING}
@@ -3120,10 +3123,10 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP                    :{BLACK}选择
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}地块信息
 STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP                      :{BLACK}将屏幕中心移动到地块所在的位置。单击的同时按住 <Ctrl> 会在新视点中显示地块位置
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}清除费用：{LTBLUE}N/A 不能清除
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}清除费用：{LTBLUE}不适用
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}清除费用：{RED}{CURRENCY_LONG}
 STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}清除收入：{LTBLUE}{CURRENCY_LONG}
-STR_LAND_AREA_INFORMATION_OWNER_N_A                             :无
+STR_LAND_AREA_INFORMATION_OWNER_N_A                             :不适用
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}产权所属：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}道路所属：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}有轨电车道路所属：{LTBLUE}{STRING}
@@ -3316,8 +3319,8 @@ STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}读取
 STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}保存高度图
 STR_SAVELOAD_LOAD_TOWN_DATA                                     :{WHITE}加载城镇数据
 STR_SAVELOAD_HOME_BUTTON_TOOLTIP                                :{BLACK}点击这里返回默认的游戏存档目录
-STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} 可用
-STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}驱动器、目录和游戏存档列表
+STR_SAVELOAD_BYTES_FREE                                         :{BLACK}剩余空间：{BYTES}
+STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}硬盘、目录和游戏存档列表
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}保存当前游戏用的存档名字
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}删除
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}删除选定的游戏存档
@@ -3331,9 +3334,9 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}游戏
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}无可用信息
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}：{WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF：{WHITE}{STRING}
-STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}关键字词：
+STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}搜索：
 STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}覆盖文件
-STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}你确定要覆盖已有文件吗？
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}确定覆盖已有文件吗？
 STR_SAVELOAD_DIRECTORY                                          :{STRING}（目录）
 STR_SAVELOAD_PARENT_DIRECTORY                                   :{STRING}（上级目录）
 
@@ -3341,7 +3344,7 @@ STR_SAVELOAD_OSKTITLE                                           :{BLACK}为存
 
 # World generation
 STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}地图生成器
-STR_MAPGEN_MAPSIZE                                              :{BLACK}地图规模：
+STR_MAPGEN_MAPSIZE                                              :{BLACK}地图大小：
 STR_MAPGEN_MAPSIZE_TOOLTIP                                      :{BLACK}选择地图尺寸（单位：格）。可用的数值会略小
 STR_MAPGEN_BY                                                   :{BLACK}×
 STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}城镇数量：
@@ -3444,7 +3447,7 @@ STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}改变
 STR_GENERATION_WORLD                                            :{WHITE}正在生成地图……
 STR_GENERATION_ABORT                                            :{BLACK}放弃
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}放弃生成地图
-STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}确定要放弃正在生成的地图吗？
+STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}确定放弃地图生成吗？
 STR_GENERATION_PROGRESS                                         :{WHITE}已完成 {NUM}%
 STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
 STR_GENERATION_WORLD_GENERATION                                 :{BLACK}地图生成
@@ -3525,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}保存
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}可用的预设名称，请选择一个来复制到存档列表中
 STR_SAVE_PRESET_TITLE                                           :{BLACK}输入预设名称
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}保存预设值到当前选定的名称
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}取消
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}不修改默认设置
 STR_SAVE_PRESET_SAVE                                            :{BLACK}保存
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}以当前选定的名称保存预设
 
 # NewGRF parameters window
-STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}改变基本图形组参数
+STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}改变基础图形组参数
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}调整 NewGRF 参数
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}关闭
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}重置
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}全部参数恢复默认
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :参数 {NUM}
@@ -3612,7 +3612,7 @@ STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :无效的生产
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注意！
-STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}此操作将要改变一个进行中的游戏，{}操作可能导致游戏崩溃，{}确定继续？
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}此操作将改变一个进行中的游戏，可能导致游戏崩溃或破坏游戏资料。修改后遇到错误时请不要向开发者报告。{}真的确定继续吗？
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}不能添加文件：重复的 GRF ID
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}未找到匹配的文件（已载入兼容的 GRF）
@@ -3621,10 +3621,10 @@ STR_NEWGRF_TOO_MANY_NEWGRFS                                     :{WHITE}加入
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}已为缺失的文件载入兼容的 GRF
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}已禁用缺失的 GRF 文件
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}无法找到 GRF 文件
-STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}取消暂停可能造成 OpenTTD 游戏错误，请不要将向开发人员报告接下来可能出现的错误情形。{}确定要取消暂停吗？
+STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}取消暂停可能造成 OpenTTD 游戏错误，请不要将向开发人员报告接下来可能出现的错误情形。{}真的确定取消暂停吗？
 
 # NewGRF status
-STR_NEWGRF_LIST_NONE                                            :空
+STR_NEWGRF_LIST_NONE                                            :无
 ###length 3
 STR_NEWGRF_LIST_ALL_FOUND                                       :目前所有文件
 STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}找到兼容文件
@@ -3655,7 +3655,7 @@ STR_INVALID_VEHICLE                                             :<无效载具>
 
 # NewGRF scanning window
 STR_NEWGRF_SCAN_CAPTION                                         :{WHITE}正在扫描 NewGRF
-STR_NEWGRF_SCAN_MESSAGE                                         :{BLACK}正在扫描 NewGRF。这可能需要一些时间，取决于其数量……
+STR_NEWGRF_SCAN_MESSAGE                                         :{BLACK}正在扫描 NewGRF。若 NewGRF 数量较多，可能需要较长时间完成……
 STR_NEWGRF_SCAN_STATUS                                          :{BLACK}已扫描 {NUM} 个 NewGRF，预计 NewGRF 总数为 {NUM}
 
 # Sign list window
@@ -3673,7 +3673,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}为标
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}城镇（{COMMA} 座，共 {COMMA}座）
-STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- 没有 -
+STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- 无 -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK}（{COMMA}）
 STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW}（都市）{BLACK}（{COMMA}）
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK} 城镇名称 - 点击名称可以将屏幕中心{}移动到城镇所在的位置。按住 <Ctrl> 点选将会在新视点中显示城镇位置
@@ -3682,9 +3682,9 @@ STR_TOWN_POPULATION                                             :{BLACK}地图
 # Town view window
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN}（都市）
-STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}人口：{ORANGE}{COMMA}{BLACK}  房屋：{ORANGE}{COMMA}
-STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}上月产出的{CARGO_LIST}：{ORANGE}{COMMA}{BLACK}  最大产量：{ORANGE}{COMMA}
-STR_TOWN_VIEW_CARGO_LAST_MINUTE_MAX                             :{BLACK}上分钟产出的{CARGO_LIST}：{ORANGE}{COMMA}{BLACK} 最大产量：{ORANGE}{COMMA}
+STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}人口：{ORANGE}{COMMA}{BLACK}　房屋：{ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}上月产出的{CARGO_LIST}：{ORANGE}{COMMA}{BLACK}　最大产量：{ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MINUTE_MAX                             :{BLACK}上分钟产出的{CARGO_LIST}：{ORANGE}{COMMA}{BLACK}　最大产量：{ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}城镇发展所必需的货物：
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{RED} 需要：{ORANGE}{STRING}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} 冬季的需求
@@ -3694,7 +3694,7 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_
 STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}城镇每 {ORANGE}{UNITS_DAYS_OR_SECONDS}{BLACK}成长一次
 STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}城镇每 {ORANGE}{UNITS_DAYS_OR_SECONDS}{BLACK}成长一次（正接受资助）
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}城镇发展已{RED}停滞
-STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}当前城镇噪音：{ORANGE}{COMMA}{BLACK}  最大：{ORANGE}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}当前城镇噪音：{ORANGE}{COMMA}{BLACK}　最大：{ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}将屏幕中心移动到城镇的位置。按住 <Ctrl> 键点选会在新视点中显示目标位置
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}地方政府
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}显示地方政府的信息
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}城镇
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}扩展
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}增加城镇人口和面积
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}扩展建成区
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}增建城镇建筑
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}延展道路
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}延展城镇道路
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}删除
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}完全删除这座城镇
 
@@ -3842,27 +3846,27 @@ STR_STATION_VIEW_SUPPLY_RATINGS_TITLE_MINUTE                    :{BLACK}每分
 STR_STATION_VIEW_CARGO_SUPPLY_RATING                            :{WHITE}{STRING}：{YELLOW}{COMMA} / {STRING}（{COMMA}%）
 
 STR_STATION_VIEW_GROUP                                          :{BLACK}群组方式
-STR_STATION_VIEW_WAITING_STATION                                :车站名称：等候中
-STR_STATION_VIEW_WAITING_AMOUNT                                 :货物总量：等候中
-STR_STATION_VIEW_PLANNED_STATION                                :车站名称：已计划
-STR_STATION_VIEW_PLANNED_AMOUNT                                 :货物总量：已计划
+STR_STATION_VIEW_WAITING_STATION                                :等候装载的货物，按站名排序
+STR_STATION_VIEW_WAITING_AMOUNT                                 :等候装载的货物，按总量排序
+STR_STATION_VIEW_PLANNED_STATION                                :计划发出的货物，按站名排序
+STR_STATION_VIEW_PLANNED_AMOUNT                                 :计划发出的货物，按总量排序
 STR_STATION_VIEW_FROM                                           :{YELLOW}{CARGO_SHORT}来自 {STATION}
 STR_STATION_VIEW_VIA                                            :{YELLOW}{CARGO_SHORT}途经 {STATION}
 STR_STATION_VIEW_TO                                             :{YELLOW}{CARGO_SHORT}前往 {STATION}
-STR_STATION_VIEW_FROM_ANY                                       :{RED}{CARGO_SHORT}来自不明车站
+STR_STATION_VIEW_FROM_ANY                                       :{RED}{CARGO_SHORT}来自未知车站
 STR_STATION_VIEW_TO_ANY                                         :{RED}{CARGO_SHORT}前往任何车站
 STR_STATION_VIEW_VIA_ANY                                        :{RED}{CARGO_SHORT}途经任何车站
 STR_STATION_VIEW_FROM_HERE                                      :{GREEN}{CARGO_SHORT}来自本站
 STR_STATION_VIEW_VIA_HERE                                       :{GREEN}{CARGO_SHORT}途经本站
 STR_STATION_VIEW_TO_HERE                                        :{GREEN}{CARGO_SHORT}前往本站
-STR_STATION_VIEW_NONSTOP                                        :{YELLOW}{CARGO_SHORT} 直达该站
+STR_STATION_VIEW_NONSTOP                                        :{YELLOW}{CARGO_SHORT}直达该站
 
-STR_STATION_VIEW_GROUP_S_V_D                                    :来源 - 途经 - 目的地
-STR_STATION_VIEW_GROUP_S_D_V                                    :来源 - 目的地 - 途经
-STR_STATION_VIEW_GROUP_V_S_D                                    :途经 - 来源 - 目的地
-STR_STATION_VIEW_GROUP_V_D_S                                    :途经 - 目的地 - 来源
-STR_STATION_VIEW_GROUP_D_S_V                                    :目的地 - 来源 - 途经
-STR_STATION_VIEW_GROUP_D_V_S                                    :目的地 - 途经 - 来源
+STR_STATION_VIEW_GROUP_S_V_D                                    :来源地 - 途经地 - 目的地
+STR_STATION_VIEW_GROUP_S_D_V                                    :来源地 - 目的地 - 途经地
+STR_STATION_VIEW_GROUP_V_S_D                                    :途经地 - 来源地 - 目的地
+STR_STATION_VIEW_GROUP_V_D_S                                    :途经地 - 目的地 - 来源地
+STR_STATION_VIEW_GROUP_D_S_V                                    :目的地 - 来源地 - 途经地
+STR_STATION_VIEW_GROUP_D_V_S                                    :目的地 - 途经地 - 来源地
 
 ###length 8
 STR_CARGO_RATING_APPALLING                                      :垃圾（最差评价）
@@ -4108,7 +4112,7 @@ STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}改变
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}点击以将本组排除在全局替换范围之外。按住 <Ctrl> 键点击以套用至所有子分组
 
 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}删除分组
-STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}你确定要删除这个分组及其子分组吗？
+STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}确定删除此分组及其子分组吗？
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :添加共享计划的载具
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :移除所有载具
@@ -4139,25 +4143,25 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION                        :新汽车
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :购买船只
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :购买飞机
 
-STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK} 重量：{GOLD}{WEIGHT_SHORT}
+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK}　重量：{GOLD}{WEIGHT_SHORT}
 STR_PURCHASE_INFO_COST_REFIT_WEIGHT                             :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK}（改装花费：{GOLD}{CURRENCY_LONG}{BLACK}）重量：{GOLD}{WEIGHT_SHORT}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}速度：{GOLD}{VELOCITY}{BLACK} 功率：{GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}速度：{GOLD}{VELOCITY}{BLACK}　功率：{GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}速度：{GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}海上速度：{GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}运河、河流速度：{GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST_YEAR                              :{BLACK}运行费用：{GOLD}{CURRENCY_LONG}/年
 STR_PURCHASE_INFO_RUNNINGCOST_PERIOD                            :{BLACK}运行费用：{GOLD}{CURRENCY_LONG}/周期
-STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}容量：{GOLD}{CARGO_LONG} {STRING}
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}容量：{GOLD}{CARGO_LONG}{STRING}
 STR_PURCHASE_INFO_REFITTABLE                                    :（可改装）
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}设计日期：{GOLD}{NUM}{BLACK} 寿命：{GOLD}{COMMA} 年
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}设计日期：{GOLD}{NUM}{BLACK}　寿命：{GOLD}{COMMA} 年
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}最大可靠性：{GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}售价：{GOLD}{CURRENCY_LONG}
 STR_PURCHASE_INFO_COST_REFIT                                    :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK}（改装费用：{GOLD}{CURRENCY_LONG}{BLACK}）
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}重量：{GOLD}{WEIGHT_SHORT}（{WEIGHT_SHORT}）
-STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK} 速度：{GOLD}{VELOCITY}
+STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK}　速度：{GOLD}{VELOCITY}
 STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}售价：{GOLD}{CURRENCY_LONG}{BLACK}（改装费用：{GOLD}{CURRENCY_LONG}{BLACK}）速度：{GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}容量：{GOLD}{CARGO_LONG}、{CARGO_LONG}
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}功率：{GOLD}+{POWER}{BLACK} 重量：{GOLD}+{WEIGHT_SHORT}
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}功率：{GOLD}+{POWER}{BLACK}　重量：{GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}可改装为：{GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :所有类型
 STR_PURCHASE_INFO_NONE                                          :无
@@ -4170,7 +4174,7 @@ STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}飞机
 ###length 3
 STR_CARGO_TYPE_FILTER_ALL                                       :所有货物类型
 STR_CARGO_TYPE_FILTER_FREIGHT                                   :货运
-STR_CARGO_TYPE_FILTER_NONE                                      :没有
+STR_CARGO_TYPE_FILTER_NONE                                      :无
 
 ###length VEHICLE_TYPES
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}列车选择列表。点击载具以展示信息。按住 <Ctrl> 键点选以显示 / 隐藏当前载具
@@ -4286,10 +4290,10 @@ STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}购买
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}购买飞机
 
 ###length VEHICLE_TYPES
-STR_DEPOT_CLONE_TRAIN                                           :{BLACK}克隆列车
-STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}克隆汽车
-STR_DEPOT_CLONE_SHIP                                            :{BLACK}克隆船只
-STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}克隆飞机
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}复制列车
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}复制汽车
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}复制船只
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}复制飞机
 
 ###length VEHICLE_TYPES
 STR_DEPOT_CLONE_TRAIN_DEPOT_TOOLTIP                             :{BLACK}复制火车。点击此按钮然后再点击任意一列在车库内或车库外的火车以复制购买。按住 <Ctrl> 键单击以共享调度计划。按住 <Shift> 键单击以显示预计费用
@@ -4322,7 +4326,7 @@ STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}点击
 STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}点击这里可以启动机库的所有飞机
 
 STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}将车头拖到这里可以出售整列火车
-STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}你将要出售车库中的所有载具，确定吗？
+STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}将出售车库中的所有载具。是否确定？
 
 # Engine preview window
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}来自供货商的消息
@@ -4339,12 +4343,12 @@ STR_ENGINE_PREVIEW_TRAM_VEHICLE                                 :电车
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :飞机
 STR_ENGINE_PREVIEW_SHIP                                         :船舶
 
-STR_ENGINE_PREVIEW_COST_WEIGHT                                  :售价：{CURRENCY_LONG} 重量：{WEIGHT_SHORT}
-STR_ENGINE_PREVIEW_COST_MAX_SPEED                               :售价：{CURRENCY_LONG}  最大速度：{VELOCITY}
-STR_ENGINE_PREVIEW_SPEED_POWER                                  :速度：{VELOCITY} 功率：{POWER}
-STR_ENGINE_PREVIEW_SPEED_POWER_MAX_TE                           :速度：{VELOCITY}  功率：{POWER}  最大牵引力：{FORCE}
+STR_ENGINE_PREVIEW_COST_WEIGHT                                  :售价：{CURRENCY_LONG}　重量：{WEIGHT_SHORT}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED                               :售价：{CURRENCY_LONG}　最高速度：{VELOCITY}
+STR_ENGINE_PREVIEW_SPEED_POWER                                  :速度：{VELOCITY}　功率：{POWER}
+STR_ENGINE_PREVIEW_SPEED_POWER_MAX_TE                           :速度：{VELOCITY}　功率：{POWER}　最大牵引力：{FORCE}
 STR_ENGINE_PREVIEW_TYPE                                         :飞机类型：{STRING}
-STR_ENGINE_PREVIEW_TYPE_RANGE                                   :飞机类别：{STRING}   航程：{COMMA} 格
+STR_ENGINE_PREVIEW_TYPE_RANGE                                   :飞机类别：{STRING}　航程：{COMMA} 格
 STR_ENGINE_PREVIEW_RUNCOST_YEAR                                 :运行费用：{CURRENCY_LONG}/年
 STR_ENGINE_PREVIEW_RUNCOST_PERIOD                               :运行费用：{CURRENCY_LONG}/周期
 STR_ENGINE_PREVIEW_CAPACITY                                     :容量：{CARGO_LONG}
@@ -4364,7 +4368,7 @@ STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :汽车
 STR_REPLACE_VEHICLE_SHIP                                        :船只
 STR_REPLACE_VEHICLE_AIRCRAFT                                    :飞机
 
-STR_REPLACE_LEFT_ARRAY_TOOLTIP                                  :{BLACK}选择要替换的载具类型
+STR_REPLACE_LEFT_ARRAY_TOOLTIP                                  :{BLACK}选择替换的载具类型
 STR_REPLACE_RIGHT_ARRAY_TOOLTIP                                 :{BLACK}选择用来替换左侧选定载具的新载具
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}开始更新
@@ -4372,7 +4376,7 @@ STR_REPLACE_VEHICLES_NOW                                        :立刻替换所
 STR_REPLACE_VEHICLES_WHEN_OLD                                   :只替换旧的
 STR_REPLACE_START_BUTTON_TOOLTIP                                :{BLACK}按下以开始将左侧选定的载具替换为右侧指定的载具
 STR_REPLACE_NOT_REPLACING                                       :{BLACK}没有更新
-STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}请选择要更新的对象
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}尚未选择任何载具
 STR_REPLACE_REPLACING_WHEN_OLD                                  :{ENGINE} 变老旧时
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}停止更新
 STR_REPLACE_STOP_BUTTON_TOOLTIP                                 :{BLACK}按下以停止替换左侧指定的载具
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}显示
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}显示飞机的调度计划。按住 <Ctrl> 键单击以显示飞机的时刻表
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}显示列车的详细信息
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}显示汽车的详细信息
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}显示船只的详情
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}显示飞机的详情
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}显示列车详情。按住 <Ctrl> 键点选以显示列车载具组
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}显示汽车详情。按住 <Ctrl> 键点选以显示汽车载具组
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}显示船只详情。按住 <Ctrl> 键点选以显示船只载具组
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}显示飞机详情。按住 <Ctrl> 键点选以显示飞机载具组
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}当前列车状态 - 点击以停止或启动列车
@@ -4459,7 +4463,7 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}已撞毁
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}抛锚
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}停运
 STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}{VELOCITY} - 正在停止
-STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}没有电力
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}没有动力
 STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}等待空余轨道
 STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR                             :{ORANGE}距离下一目的地过远
 
@@ -4493,19 +4497,19 @@ STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}年龄：{LTBLUE}{STRING}{BLACK}   运行成本：{LTBLUE}{CURRENCY_LONG}/年
 STR_VEHICLE_INFO_AGE_RUNNING_COST_PERIOD                        :{BLACK}年龄：{LTBLUE}{STRING}{BLACK}   运行费用：{LTBLUE}{CURRENCY_LONG}/周期
 
-STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}最大速度：{LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_MAX_SPEED_TYPE                                 :{BLACK}最高速度：{LTBLUE}{VELOCITY} {BLACK}飞机种类：{LTBLUE}{STRING}
-STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE                           :{BLACK}最大速度：{LTBLUE}{VELOCITY} {BLACK}飞机类型：{LTBLUE}{STRING} {BLACK}续航里程：{LTBLUE}{COMMA} 格
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}重量：{LTBLUE}{WEIGHT_SHORT} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 最大速度：{LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}重量：{LTBLUE}{WEIGHT_SHORT} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 最大速度：{LTBLUE}{VELOCITY} {BLACK}最大牵引力：{LTBLUE}{FORCE}
+STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}最高速度：{LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE                                 :{BLACK}最高速度：{LTBLUE}{VELOCITY}　{BLACK}飞机种类：{LTBLUE}{STRING}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE                           :{BLACK}最高速度：{LTBLUE}{VELOCITY}　{BLACK}飞机类型：{LTBLUE}{STRING}　{BLACK}航程：{LTBLUE}{COMMA} 格
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}重量：{LTBLUE}{WEIGHT_SHORT}　{BLACK}功率：{LTBLUE}{POWER}{BLACK}　最高速度：{LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}重量：{LTBLUE}{WEIGHT_SHORT}　{BLACK}功率：{LTBLUE}{POWER}{BLACK}　最高速度：{LTBLUE}{VELOCITY}　{BLACK}最大牵引力：{LTBLUE}{FORCE}
 
 STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}今年损益：{LTBLUE}{CURRENCY_LONG}（去年损益：{CURRENCY_LONG}）
 STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_MIN_PERFORMANCE     :{BLACK}今年损益：{LTBLUE}{CURRENCY_LONG}（去年损益：{CURRENCY_LONG}）{BLACK}最小功率：{LTBLUE}{POWER_TO_WEIGHT}
 STR_VEHICLE_INFO_PROFIT_THIS_PERIOD_LAST_PERIOD                 :{BLACK}本期损益：{LTBLUE}{CURRENCY_LONG}（上期损益：{CURRENCY_LONG}）
 STR_VEHICLE_INFO_PROFIT_THIS_PERIOD_LAST_PERIOD_MIN_PERFORMANCE :{BLACK}本期损益：{LTBLUE}{CURRENCY_LONG}（上期损益：{CURRENCY_LONG}）{BLACK}最小功率：{LTBLUE}{POWER_TO_WEIGHT}
-STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}可靠性：{LTBLUE}{COMMA}%  {BLACK}上次维护后抛锚的次数：{LTBLUE}{COMMA}
+STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}可靠性：{LTBLUE}{COMMA}%　{BLACK}上次维护后抛锚的次数：{LTBLUE}{COMMA}
 
-STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}建造年份：{LTBLUE}{NUM}{BLACK} 价值：{LTBLUE}{CURRENCY_LONG}
+STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE}　{BLACK}购置于：{LTBLUE}{NUM}{BLACK}　价值：{LTBLUE}{CURRENCY_LONG}
 STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}容量：{LTBLUE}无{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}容量：{LTBLUE}{CARGO_LONG}{STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}容量：{LTBLUE}{CARGO_LONG}{STRING}（×{NUM}）
@@ -4513,17 +4517,17 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}容量
 
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}转运账面收入：{LTBLUE}{CURRENCY_LONG}
 
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}每 {LTBLUE}{COMMA}{NBSP}天进行维护{BLACK}   上次维护日期：{LTBLUE}{STRING}
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_MINUTES                  :{BLACK}维护间隔：{LTBLUE}{COMMA}{NBSP}分钟{BLACK} {STRING}
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}维护间隔：{LTBLUE}{COMMA}%{BLACK} {STRING}
-STR_VEHICLE_DETAILS_LAST_SERVICE_DATE                           :最近维护：{LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_LAST_SERVICE_MINUTES_AGO                    :最近维护：{LTBLUE}{NUM} 分钟前
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}每 {LTBLUE}{COMMA}{NBSP}天{BLACK}维护一次　{STRING}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_MINUTES                  :{BLACK}每 {LTBLUE}{COMMA}{NBSP}分钟{BLACK}维护一次　{STRING}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}可靠性降低了 {LTBLUE}{COMMA}%{BLACK} 时维护　{STRING}
+STR_VEHICLE_DETAILS_LAST_SERVICE_DATE                           :上次维护：{LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_LAST_SERVICE_MINUTES_AGO                    :上次维护：{LTBLUE}{NUM} 分钟前
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP_DAYS    :{BLACK}将维护间隔增加 10 天。按住 <Ctrl> 点击可将维护间隔增加 5 天
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP_MINUTES :{BLACK}将维护间隔增加 5 分。按住 <Ctrl> 点击可将维护间隔增加 1 分
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP_PERCENT :{BLACK}将维护间隔增加 10%。按住 <Ctrl> 点击可将维护间隔增加 5%
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP_PERCENT :{BLACK}将维护阈值增加 10%。按住 <Ctrl> 点击可将维护阈值增加 5%
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP_DAYS    :{BLACK}将维护间隔缩短 10 天。按住 <Ctrl> 点击可将维护间隔缩短 5 天
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP_MINUTES :{BLACK}将维护间隔缩短 5 分。按住 <Ctrl> 点击可将维护间隔缩短 1 分
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP_PERCENT :{BLACK}将维护间隔缩短 10%。按住 <Ctrl> 点击可将维护间隔缩短 5%
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP_PERCENT :{BLACK}将维护阈值减少 10%。按住 <Ctrl> 点击可将维护阈值减少 5%
 
 STR_SERVICE_INTERVAL_DROPDOWN_TOOLTIP                           :{BLACK}更改服务时间间隔类型
 STR_VEHICLE_DETAILS_DEFAULT                                     :默认
@@ -4538,12 +4542,12 @@ STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}命名
 STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}命名飞机
 
 # Extra buttons for train details windows
-STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   建造年份：{LTBLUE}{NUM}{BLACK} 价值：{LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   价值：{LTBLUE}{CURRENCY_LONG}
+STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}　购置于：{LTBLUE}{NUM}{BLACK}　价值：{LTBLUE}{CURRENCY_LONG}
+STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}　价值：{LTBLUE}{CURRENCY_LONG}
 
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}列车总容量：
-STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}{CARGO_LONG}（{CARGO_SHORT}）
-STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}{CARGO_LONG}（{CARGO_SHORT}）（×{NUM}）
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}{CARGO_LONG}（最大容量：{CARGO_SHORT}）
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}{CARGO_LONG}（最大容量：{CARGO_SHORT}，重量系数：×{NUM}）
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO_LONG}（来自 {STATION}）
@@ -4562,7 +4566,7 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}容量
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE}（改装）
-STR_REFIT_TITLE                                                 :{GOLD}选择要运输的货物类型：
+STR_REFIT_TITLE                                                 :{GOLD}选择运输的货物类型：
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}新容量：{GOLD}{CARGO_LONG}{}{BLACK}改装费用：{RED}{CURRENCY_LONG}
 STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}新容量：{GOLD}{CARGO_LONG}{}{BLACK}改装后收入：{GREEN}{CURRENCY_LONG}
 STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}新的运载类型：{GOLD}{CARGO_LONG}，{GOLD}{CARGO_LONG}{}{BLACK}改装所需：{RED}{CURRENCY_LONG}
@@ -4570,10 +4574,10 @@ STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}新容
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}选择改装的车厢。按 <Ctrl> 键拖曳以选择多节车厢。点选空白的区域以选择整列列车。按 <Ctrl> 键选择车厢以选择该车厢及其之后的车厢
 
 ###length VEHICLE_TYPES
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}选择希望列车装载的货物类型
-STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}选择要运输的货物类型：
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}选择希望船只装载的货物类型
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}选择希望飞机装载的货物类型
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}选择列车运输的货物类型
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}选择汽车运输的货物类型
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}选择船只运输的货物类型
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}选择飞机运输的货物类型
 
 ###length VEHICLE_TYPES
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改装列车
@@ -4646,7 +4650,7 @@ STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}条件
 ###length 8
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :装载进度
 STR_ORDER_CONDITIONAL_RELIABILITY                               :可靠性
-STR_ORDER_CONDITIONAL_MAX_SPEED                                 :最大速度
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :最高速度
 STR_ORDER_CONDITIONAL_AGE                                       :年龄（年）
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :需要维护
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :总是
@@ -4665,7 +4669,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :为是
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :为否
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}此栏指定的数值将与载具的指定数据比对
-STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}请输入要比较的值
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}输入比较的数值
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳过
 STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}跳过当前命令并执行下一条命令。按 <Ctrl> 键操作以直接跳至选定的命令
@@ -4759,7 +4763,7 @@ STR_INVALID_ORDER                                               :{RED}（无效
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE}（时刻表）
-STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}命令
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}调度计划
 STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}切换到调度计划视图
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}时刻表 - 单击选择一条命令
@@ -4767,33 +4771,33 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}时刻
 STR_TIMETABLE_NO_TRAVEL                                         :原地待命
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :行驶（自动；由下个手动命令指定时间）
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :行驶（未指定时间）
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :限速 {2:VELOCITY}（未指定时间）
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :限速 {VELOCITY}（未指定时间）
 STR_TIMETABLE_TRAVEL_FOR                                        :行驶 {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :行驶 {STRING}，限速 {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :行驶（{STRING}，未指定时间）
-STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :前往 {STRING}，以最大速度 {VELOCITY}
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :（等候 {STRING}，未指定时间）
+STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :行驶（{STRING}，未指定时间），限速 {VELOCITY}
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :（等待 {STRING}，未指定时间）
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :（驶往 {STRING}，未指定时间）
-STR_TIMETABLE_STAY_FOR                                          :，停留 {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :并行驶{STRING}
+STR_TIMETABLE_STAY_FOR                                          :，等待 {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :并行驶 {STRING}
 
-STR_TIMETABLE_APPROX_TIME                                       :{BLACK}完成该时刻表大约需要 {STRING}
-STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}完成该时刻表需要 {STRING}
-STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}完成该时刻表至少需要 {STRING} （时刻表尚未完成）
+STR_TIMETABLE_APPROX_TIME                                       :{BLACK}全程运行大约需要 {STRING}
+STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}全程运行需要 {STRING}
+STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}全程运行至少需要 {STRING} （尚未完成编排）
 
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}载具目前准点运行
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}载具目前晚点 {STRING}
 STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}载具目前早点 {STRING}
-STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK}此时刻表尚未开始
-STR_TIMETABLE_STATUS_START_AT_DATE                              :{BLACK}本时刻表将在 {STRING} 开始
-STR_TIMETABLE_STATUS_START_IN_SECONDS                           :{BLACK}本时刻表将会在 {COMMA} 秒内开始
+STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK}尚未按时刻表运行
+STR_TIMETABLE_STATUS_START_AT_DATE                              :{BLACK}将在 {STRING} 按时刻表运行
+STR_TIMETABLE_STATUS_START_IN_SECONDS                           :{BLACK}将在 {COMMA} 秒后按时刻表运行
 
-STR_TIMETABLE_START                                             :{BLACK}开始时刻表
-STR_TIMETABLE_START_TOOLTIP                                     :{BLACK}选择此时刻表开始的时间。如果调度计划有完善的时刻表，则按住 <Ctrl> 键单击会根据它们的相对顺序均匀分配共享此调度计划的所有载具的出发时间
-STR_TIMETABLE_START_SECONDS_QUERY                               :直至时刻表开始的秒数
+STR_TIMETABLE_START                                             :{BLACK}按时刻表运行
+STR_TIMETABLE_START_TOOLTIP                                     :{BLACK}选择此时刻表开始的时间。如果已完成时刻表编排，则按住 <Ctrl> 键单击会根据它们的相对顺序均匀分配共享此调度计划的所有载具的出发时间
+STR_TIMETABLE_START_SECONDS_QUERY                               :距离开始按时刻表运行的秒数
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}修改时间
-STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}修改选定命令设定的时间。按住 <Ctrl> 键操作以修改所有命令的限时
+STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}修改选定命令设定的时间。按住 <Ctrl> 键操作以修改所有命令的时间
 STR_TIMETABLE_CHANGE_TIME_QUERY                                 :修改时间
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}清除时间
@@ -4806,15 +4810,15 @@ STR_TIMETABLE_CHANGE_SPEED_QUERY                                :修改限速
 STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}取消限速
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}清除选定命令设定的限速。按住 <Ctrl> 键操作以清除所有命令的限速
 
-STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}清除晚点计数器
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}归零晚点时间
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}将记录的晚点时间归零，以使载具准点。按 <Ctrl> 键操作以重置全组时间，使晚点最多的载具被视为准点，而其他被视为早点
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}自动填充
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}根据下一次运行的时间自动填充时刻表。按住 <Ctrl> 键单击可保持等候时间
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}根据下一次运行的时间自动填充时刻表。按住 <Ctrl> 键单击可保持等待时间
 
-STR_TIMETABLE_EXPECTED                                          :{BLACK}预期时间
+STR_TIMETABLE_EXPECTED                                          :{BLACK}预计时间
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}表定时间
-STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}切换显示（根据实际情况计算的）预期时间或表定时间
+STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}在根据实际情况计算的预计时间与表定时间间切换
 
 STR_TIMETABLE_ARRIVAL_DATE                                      :抵：{COLOUR}{DATE_TINY}
 STR_TIMETABLE_DEPARTURE_DATE                                    :发：{COLOUR}{DATE_TINY}
@@ -4825,7 +4829,7 @@ STR_TIMETABLE_DEPARTURE_SECONDS_IN_FUTURE                       :发：{COLOUR}{
 # Date window (for timetable)
 STR_DATE_CAPTION                                                :{WHITE}设置日期
 STR_DATE_SET_DATE                                               :{BLACK}设置日期
-STR_DATE_SET_DATE_TOOLTIP                                       :{BLACK}使用选择的日期作为此时刻表的起始日期
+STR_DATE_SET_DATE_TOOLTIP                                       :{BLACK}在所选的日期开始实施时刻表
 STR_DATE_DAY_TOOLTIP                                            :{BLACK}选择日子
 STR_DATE_MONTH_TOOLTIP                                          :{BLACK}选择月份
 STR_DATE_YEAR_TOOLTIP                                           :{BLACK}选择年份
@@ -4864,8 +4868,8 @@ STR_AI_CONFIG_HUMAN_PLAYER                                      :玩家
 STR_AI_CONFIG_RANDOM_AI                                         :随机 AI
 STR_AI_CONFIG_NONE                                              :（无）
 STR_AI_CONFIG_NAME_VERSION                                      :{STRING} {YELLOW}v{NUM}
-STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}电脑玩家数量上限：{ORANGE}{COMMA}
-STR_AI_CONFIG_COMPETITORS_INTERVAL                              :{LTBLUE}电脑公司建立间隔：{ORANGE}{COMMA} 分钟
+STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}竞争对手数量上限：{ORANGE}{COMMA}
+STR_AI_CONFIG_COMPETITORS_INTERVAL                              :{LTBLUE}竞争公司建立间隔：{ORANGE}{COMMA} 分钟
 
 STR_AI_CONFIG_MOVE_UP                                           :{BLACK}上移
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}在列表中将选择的 AI 上移
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}链接
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}接受
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}选择高亮的 AI
-STR_AI_LIST_CANCEL                                              :{BLACK}取消
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}不修改本 AI
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}进行截图
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}普通截图
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}小地
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI 参数
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}游戏脚本参数
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}关闭
 STR_AI_SETTINGS_RESET                                           :{BLACK}重设
 STR_AI_SETTINGS_SETTING                                         :{STRING}：{ORANGE}{STRING}
 
@@ -4953,9 +4954,9 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}预计
 # Saveload messages
 STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}保存仍在继续{}请耐心等待！
 STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}自动保存失败
-STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}不能读取驱动器
+STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}无法读取硬盘
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}保存游戏失败……
-STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}不能删除文件
+STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}无法删除文件
 STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}读取游戏失败……
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :内部错误：{STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :无法识别的存档 - {STRING}
@@ -5168,8 +5169,8 @@ STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :铁路类型不
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}无法移动载具……
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}后端车头一定要跟着前端车头
-STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}找不到附近的车库
-STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}在附近找不到车库
+STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}无法找到前往附近车库的路径
+STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}无法在附近找到车库
 
 STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :车库类型错误
 
@@ -5254,7 +5255,7 @@ STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}此处
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}必须先拆除隧道
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}规划位置中有另一条隧道
 STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}隧道出口将超出地图边界
-STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}隧道出口的地形无法处理
+STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}无法挖掘隧道出口
 STR_ERROR_TUNNEL_TOO_LONG                                       :{WHITE}……隧道过长
 
 # Object related errors
@@ -5399,7 +5400,7 @@ STR_ERROR_NO_DOCK                                               :{WHITE}这里
 STR_ERROR_NO_AIRPORT                                            :{WHITE}没有机场/直升机场
 STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE                          :{WHITE}没有兼容载具对应道路类型的站点
 STR_ERROR_NO_STOP_COMPATIBLE_TRAM_TYPE                          :{WHITE}没有兼容此有轨电车道路类型的站点
-STR_ERROR_NO_STOP_ARTICULATED_VEHICLE                           :{WHITE}没有适合铰接式道路车辆的站点。{}铰接式道路车辆需要通过式车站，而不是港湾式车站
+STR_ERROR_NO_STOP_ARTICULATED_VEHICLE                           :{WHITE}铰接式车辆无站点可停靠。{}铰接式车辆仅可停靠于通过式车站，不可停靠于港湾式车站
 STR_ERROR_AIRPORT_NO_PLANES                                     :{WHITE}这架飞机不能降落在这个直升机场
 STR_ERROR_AIRPORT_NO_HELICOPTERS                                :{WHITE}这架直升机不能降落在这个机场
 STR_ERROR_NO_RAIL_WAYPOINT                                      :{WHITE}没有铁路路点
@@ -5408,10 +5409,10 @@ STR_ERROR_NO_BUOY                                               :{WHITE}没有
 
 # Timetable related errors
 STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}无法为载具编制时刻表……
-STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}载具只能在车站停靠等候
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}载具只能在车站停靠等待
 STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}此载具将不停靠本站
-STR_ERROR_TIMETABLE_INCOMPLETE                                  :{WHITE}……时刻表不完整
-STR_ERROR_TIMETABLE_NOT_STARTED                                 :{WHITE}……时刻表尚未开始
+STR_ERROR_TIMETABLE_INCOMPLETE                                  :{WHITE}……尚未完成时刻表编排
+STR_ERROR_TIMETABLE_NOT_STARTED                                 :{WHITE}……尚未按时刻表运行
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}……已有太多标志
@@ -5449,7 +5450,7 @@ STR_TOWN_BUILDING_NAME_STATUE_1                                 :雕像
 STR_TOWN_BUILDING_NAME_FOUNTAIN_1                               :喷泉
 STR_TOWN_BUILDING_NAME_PARK_1                                   :公园
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_2                           :写字楼
-STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1                      :商场与写字楼
+STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1                      :商店与办公室
 STR_TOWN_BUILDING_NAME_MODERN_OFFICE_BUILDING_1                 :现代写字楼
 STR_TOWN_BUILDING_NAME_WAREHOUSE_1                              :仓库
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_3                           :写字楼
@@ -5459,8 +5460,8 @@ STR_TOWN_BUILDING_NAME_COTTAGES_1                               :农舍
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :住宅
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :公寓
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_2                      :高层写字楼
-STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_2                      :商场和写字楼
-STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_3                      :商场和写字楼
+STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_2                      :商店与办公室
+STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_3                      :商店与办公室
 STR_TOWN_BUILDING_NAME_THEATER_1                                :剧院
 STR_TOWN_BUILDING_NAME_STADIUM_2                                :体育场
 STR_TOWN_BUILDING_NAME_OFFICES_1                                :写字楼
@@ -5518,7 +5519,7 @@ STR_INDUSTRY_NAME_SUGAR_MINE                                    :蔗糖矿
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :未命名
-STR_SV_TRAIN_NAME                                               :列车 {COMMA}
+STR_SV_TRAIN_NAME                                               :列车 #{COMMA}
 STR_SV_ROAD_VEHICLE_NAME                                        :汽车 {COMMA}
 STR_SV_SHIP_NAME                                                :船只 {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :飞机 {COMMA}
@@ -5529,74 +5530,74 @@ STR_SV_STNAME_NORTH                                             :{STRING} 北站
 STR_SV_STNAME_SOUTH                                             :{STRING} 南站
 STR_SV_STNAME_EAST                                              :{STRING} 东站
 STR_SV_STNAME_WEST                                              :{STRING} 西站
-STR_SV_STNAME_CENTRAL                                           :{STRING} 中心站
-STR_SV_STNAME_TRANSFER                                          :{STRING} 广场
-STR_SV_STNAME_HALT                                              :{STRING} 店
-STR_SV_STNAME_VALLEY                                            :{STRING} 谷
-STR_SV_STNAME_HEIGHTS                                           :{STRING} 台
-STR_SV_STNAME_WOODS                                             :{STRING} 林
-STR_SV_STNAME_LAKESIDE                                          :{STRING} 滨
-STR_SV_STNAME_EXCHANGE                                          :{STRING} 庄
+STR_SV_STNAME_CENTRAL                                           :{STRING} 中央
+STR_SV_STNAME_TRANSFER                                          :{STRING} 交流站
+STR_SV_STNAME_HALT                                              :{STRING} 停车处
+STR_SV_STNAME_VALLEY                                            :{STRING} 山谷
+STR_SV_STNAME_HEIGHTS                                           :{STRING} 高地
+STR_SV_STNAME_WOODS                                             :{STRING} 林场
+STR_SV_STNAME_LAKESIDE                                          :{STRING} 湖畔
+STR_SV_STNAME_EXCHANGE                                          :{STRING} 转运站
 STR_SV_STNAME_AIRPORT                                           :{STRING} 机场
 STR_SV_STNAME_OILFIELD                                          :{STRING} 油田
-STR_SV_STNAME_MINES                                             :{STRING} 矿
+STR_SV_STNAME_MINES                                             :{STRING} 矿场
 STR_SV_STNAME_DOCKS                                             :{STRING} 码头
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
-STR_SV_STNAME_ANNEXE                                            :{STRING} 村
-STR_SV_STNAME_SIDINGS                                           :{STRING} 坝
-STR_SV_STNAME_BRANCH                                            :{STRING} 岔口
-STR_SV_STNAME_UPPER                                             :前 {STRING}
-STR_SV_STNAME_LOWER                                             :后 {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} 停机楼
+STR_SV_STNAME_ANNEXE                                            :{STRING} 辅助站
+STR_SV_STNAME_SIDINGS                                           :{STRING} 侧站
+STR_SV_STNAME_BRANCH                                            :{STRING} 分站
+STR_SV_STNAME_UPPER                                             :{STRING} 台地
+STR_SV_STNAME_LOWER                                             :{STRING} 盆地
+STR_SV_STNAME_HELIPORT                                          :{STRING} 停机坪
 STR_SV_STNAME_FOREST                                            :{STRING} 林场
-STR_SV_STNAME_FALLBACK                                          :{STRING} {NUM} 号站
+STR_SV_STNAME_FALLBACK                                          :{STRING} 车站 #{NUM}
 
 ############ end of savegame specific region!
 
 ##id 0x8000
 ###length 116
 # Vehicle names
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank（蒸汽机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :柯比保罗机车（蒸汽机）
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MJS_250_DIESEL               :MJS 250（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_CHOO_CHOO         :Ploddyphut Choo-Choo
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_CHOO_CHOO          :Powernaut Choo-Choo
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :MightyMover Choo-Choo
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_DIESEL            :Ploddyphut 内燃机车
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_DIESEL             :Powernaut 内燃机车
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_WILLS_2_8_0_STEAM            :Wills 2-8-0（蒸汽机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CHANEY_JUBILEE_STEAM         :Chaney 'Jubilee'（蒸汽机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_GINZU_A4_STEAM               :Ginzu 'A4'（蒸汽机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_8P_STEAM                  :SH '8P'（蒸汽机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MANLEY_MOREL_DMU_DIESEL      :Manley-Morel DMU（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_DASH_DIESEL                  :'Dash'（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_HENDRY_25_DIESEL          :SH/Hendry '25'（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_UU_37_DIESEL                 :UU '37'（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_FLOSS_47_DIESEL              :Floss '47'（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_CHOO_CHOO         :咔哒扑哧呜呜车
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_CHOO_CHOO          :探险动力呜呜车
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :大力移动呜呜车
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_DIESEL            :咔哒扑哧内燃机车
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_DIESEL             :探险动力内燃机车
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_WILLS_2_8_0_STEAM            :威尔斯 2-8-0（蒸汽机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CHANEY_JUBILEE_STEAM         :钱尼银禧（蒸汽机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_GINZU_A4_STEAM               :金苏 A4（蒸汽机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_8P_STEAM                  :SH 8P（蒸汽机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MANLEY_MOREL_DMU_DIESEL      :曼利-莫雷尔内燃动车组（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_DASH_DIESEL                  :冲刺（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_HENDRY_25_DIESEL          :SH/亨德利 25（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_UU_37_DIESEL                 :UU 37（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_FLOSS_47_DIESEL              :弗洛丝 47（内燃机）
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CS_4000_DIESEL               :CS 4000（内燃机）
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CS_2400_DIESEL               :CS 2400（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CENTENNIAL_DIESEL            :Centennial（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KELLING_3100_DIESEL          :Kelling 3100（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_TURNER_TURBO_DIESEL          :Turner Turbo（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CENTENNIAL_DIESEL            :世纪纪念（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KELLING_3100_DIESEL          :凯林 3100（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_TURNER_TURBO_DIESEL          :速倾涡轮（内燃机）
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MJS_1000_DIESEL              :MJS 1000（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_125_DIESEL                :SH '125'（内燃机）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_30_ELECTRIC               :SH '30'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_40_ELECTRIC               :SH '40'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_T_I_M_ELECTRIC               :'T.I.M.'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_ASIASTAR_ELECTRIC            :'亚洲之星'（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_125_DIESEL                :SH 125（内燃机）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_30_ELECTRIC               :SH 30（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_40_ELECTRIC               :SH 40（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_T_I_M_ELECTRIC               :T.I.M.（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_ASIASTAR_ELECTRIC            :亚洲之星（电力）
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PASSENGER_CAR                 :旅客车厢
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_MAIL_VAN                      :邮政车厢
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_MAIL_VAN                      :邮政棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COAL_CAR                      :煤炭挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_OIL_TANKER                    :油罐车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_LIVESTOCK_VAN                 :牲畜棚车
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GOODS_VAN                     :货物篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GOODS_VAN                     :货物棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GRAIN_HOPPER                  :谷物槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WOOD_TRUCK                    :木材挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_IRON_ORE_HOPPER               :铁矿石槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_STEEL_TRUCK                   :钢材挂车
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN                   :装甲挂车
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN                      :食品槽车
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN                   :装甲棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN                      :食品棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PAPER_TRUCK                   :纸张挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER             :铜矿石挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WATER_TANKER                  :水罐车
@@ -5605,28 +5606,28 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK                  :橡胶挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK                   :蔗糖挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER           :棉花糖槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER                 :太妃糖槽车
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN                    :泡泡罐车
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN                    :泡泡棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER                   :可乐罐车
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN                     :糖果篷车
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :玩具篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN                     :糖果棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :玩具棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :电池挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :汽水挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :塑料挂车
-STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :'X2001'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :'Millennium Z1'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
+STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :X2001（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :千禧年 Z1（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :威滋哇 Z99
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PASSENGER_CAR             :旅客车厢
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_MAIL_VAN                  :邮政车厢
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_MAIL_VAN                  :邮政棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COAL_CAR                  :煤炭挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_OIL_TANKER                :油罐车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_LIVESTOCK_VAN             :牲畜篷车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GOODS_VAN                 :货物篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_LIVESTOCK_VAN             :牲畜棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GOODS_VAN                 :货物棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GRAIN_HOPPER              :谷物槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK                :木材挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER           :铁矿石槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK               :钢材挂车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :装甲挂车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :食品篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :装甲棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :食品棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK               :纸张挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER         :铜矿石槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER              :水罐车
@@ -5635,30 +5636,30 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK              :橡胶挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK               :蔗糖挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER       :棉花糖槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER             :太妃糖槽车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN                :泡泡篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN                :泡泡棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER               :可乐罐车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN                 :糖果篷车
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN                   :玩具篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN                 :糖果棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN                   :玩具棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK             :电池卡车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK         :跳跳汁挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK             :塑料挂车
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC    :Lev1 'Leviathan'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 'Cyclops'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC      :Lev3 'Pegasus'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV4_CHIMAERA_ELECTRIC     :Lev4 'Chimaera'（电力）
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_WIZZOWOW_ROCKETEER         :Wizzowow 火箭
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC    :Lev1 利维坦（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 独眼巨人（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC      :Lev3 飞马（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV4_CHIMAERA_ELECTRIC     :Lev4 奇美拉（电力）
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_WIZZOWOW_ROCKETEER         :威滋哇火箭人
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR               :旅客车厢
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_MAIL_VAN                    :邮政车厢
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_MAIL_VAN                    :邮政棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COAL_CAR                    :煤炭挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_OIL_TANKER                  :油罐车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_LIVESTOCK_VAN               :牲畜篷车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :货物挂车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_LIVESTOCK_VAN               :牲畜棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :货物棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GRAIN_HOPPER                :谷物槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK                  :木材挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER             :铁矿石挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK                 :钢材挂车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :装甲挂车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :食品篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :装甲棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :食品棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK                 :纸张挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER           :铜矿石槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER                :水罐车
@@ -5667,163 +5668,163 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK                :橡胶挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK                 :蔗糖挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER         :棉花糖槽车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER               :太妃糖槽车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN                  :泡泡篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN                  :泡泡棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER                 :可乐罐车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN                   :糖果蓬车
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN                     :玩具篷车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN                   :糖果棚车
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN                     :玩具棚车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK               :电池挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :跳跳汁挂车
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :塑料挂车
 
 ###length 88
-STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_REGAL_BUS                     :MPS Regal 巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_LEOPARD_BUS              :Hereford Leopard 巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_BUS                        :Foster 巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_MKII_SUPERBUS              :Foster MkII 超级巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKI_BUS                :Ploddyphut MkI 巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKII_BUS               :Ploddyphut MkII 巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKIII_BUS              :Ploddyphut MkIII 巴士
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_COAL_TRUCK                 :Balogh 煤炭卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COAL_TRUCK                    :Uhl 煤炭卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_REGAL_BUS                     :MPS 富豪巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_LEOPARD_BUS              :赫里福德猎豹巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_BUS                        :福斯特巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_MKII_SUPERBUS              :福斯特二代超级巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKI_BUS                :咔哒扑哧初代巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKII_BUS               :咔哒扑哧二代巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKIII_BUS              :咔哒扑哧三代巴士
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_COAL_TRUCK                 :巴洛格煤炭卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COAL_TRUCK                    :乌尔煤炭卡车
 STR_VEHICLE_NAME_ROAD_VEHICLE_DW_COAL_TRUCK                     :DW 煤炭卡车
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_MAIL_TRUCK                    :MPS 邮政卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK                :Reynard 邮政卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :Perry 邮政卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK            :MightyMover 邮政卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :Powernaught 邮政卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK               :Wizzowow 邮政卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER               :Witcombe 油罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER                 :Foster 油罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_OIL_TANKER                  :Perry 油罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_TALBOTT_LIVESTOCK_VAN             :Talbott 牲畜蓬车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_LIVESTOCK_VAN                 :Uhl 牲畜蓬车
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_LIVESTOCK_VAN              :Foster 牲畜蓬车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_GOODS_TRUCK                :Balogh 货物卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_CRAIGHEAD_GOODS_TRUCK             :Craighead 货物卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GOODS_TRUCK                  :Goss 货物卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_GRAIN_TRUCK              :Hereford 谷物卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_THOMAS_GRAIN_TRUCK                :Thomas 谷物卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GRAIN_TRUCK                  :Goss 谷物卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_WOOD_TRUCK               :Witcombe 木材卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_WOOD_TRUCK                 :Foster 木材卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK               :Moreland 木材卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK                :雷纳德邮政卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :佩里邮政卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK            :大力移动邮政卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :微小动力邮政卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK               :威滋哇邮政卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER               :威特科姆油罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER                 :福斯特油罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_OIL_TANKER                  :佩里油罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_TALBOTT_LIVESTOCK_VAN             :塔尔博特牲畜面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_LIVESTOCK_VAN                 :乌尔牲畜面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_LIVESTOCK_VAN              :福斯特牲畜面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_GOODS_TRUCK                :巴洛格货物卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_CRAIGHEAD_GOODS_TRUCK             :克雷格黑德货物卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GOODS_TRUCK                  :戈斯货物卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_GRAIN_TRUCK              :赫里福德谷物卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_THOMAS_GRAIN_TRUCK                :托马斯谷物卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GRAIN_TRUCK                  :戈斯谷物卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_WOOD_TRUCK               :威特科姆木材卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_WOOD_TRUCK                 :福斯特木材卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK               :莫兰德木材卡车
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_IRON_ORE_TRUCK                :MPS 铁矿石卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_IRON_ORE_TRUCK                :Uhl 铁矿石卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Chippy 铁矿石卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Balogh 钢材卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl 钢材卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling 钢材卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Balogh 运钞车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Uhl 运钞车
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster 运钞车
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :Foster 食品篷车
-STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :Perry 食品篷车
-STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Chippy 食品篷车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_PAPER_TRUCK                   :Uhl 纸张卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_PAPER_TRUCK                :Balogh 纸张卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_IRON_ORE_TRUCK                :乌尔铁矿石卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :奇皮铁矿石卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :巴洛格钢材卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :乌尔钢材卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :凯林钢材卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :巴洛格运钞车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :乌尔运钞车
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :福斯特运钞车
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :福斯特食品面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :佩里食品面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :奇皮食品面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_PAPER_TRUCK                   :乌尔纸张卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_PAPER_TRUCK                :巴洛格纸张卡车
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_PAPER_TRUCK                   :MPS 纸张卡车
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_COPPER_ORE_TRUCK              :MPS 铜矿石卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COPPER_ORE_TRUCK              :Uhl 铜矿石卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :Goss 铜矿石卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_WATER_TANKER                  :Uhl 水罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_WATER_TANKER               :Balogh 水罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COPPER_ORE_TRUCK              :乌尔铜矿石卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :戈斯铜矿石卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_WATER_TANKER                  :乌尔水罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_WATER_TANKER               :巴洛格水罐车
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER                  :MPS 水罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK                :Balogh 水果卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK                   :Uhl 水果卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK               :Kelling 水果卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK               :Balogh 橡胶卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK                  :Uhl 橡胶卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK                :巴洛格水果卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK                   :乌尔水果卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK               :凯林水果卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK               :巴洛格橡胶卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK                  :乌尔橡胶卡车
 STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK                  :RMT 橡胶卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :MightyMover 蔗糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK           :Powernaught 蔗糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK              :Wizzowow 蔗糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK            :MightyMover 可乐罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COLA_TRUCK            :Powernaught 可乐罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK               :Wizzowow 可乐罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY          :MightyMover 棉花糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY          :Powernaught 棉花糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK       :Wizzowow 棉花糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK          :MightyMover 太妃糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK          :Powernaught 太妃糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK             :Wizzowow 太妃糖卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN               :MightyMover 玩具篷车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOY_VAN               :Powernaught 玩具篷车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN                  :Wizzowow 玩具篷车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK           :MightyMover 糖果卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK           :Powernaught 糖果卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK              :Wizzowow 糖果卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK         :MightyMover 电池卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK         :Powernaught 电池卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK            :Wizzowow 电池卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :MightyMover 跳跳汁罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :Powernaught 跳跳汁罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :Wizzowow 跳跳汁罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :MightyMover 塑料卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK         :Powernaught 塑料卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK            :Wizzowow 塑料卡车
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BUBBLE_TRUCK          :MightyMover 泡泡罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BUBBLE_TRUCK          :Powernaught 泡泡罐车
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK             :Wizzowow 泡泡罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :大力移动蔗糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK           :微小动力蔗糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK              :威滋哇蔗糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK            :大力移动可乐罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COLA_TRUCK            :微小动力可乐罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK               :威滋哇可乐罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY          :大力移动棉花糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY          :微小动力棉花糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK       :威滋哇棉花糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK          :大力移动太妃糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK          :微小动力太妃糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK             :威滋哇太妃糖卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN               :大力移动玩具面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOY_VAN               :微小动力玩具面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN                  :威滋哇玩具面包车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK           :大力移动糖果卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK           :微小动力糖果卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK              :威滋哇糖果卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK         :大力移动电池卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK         :微小动力电池卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK            :威滋哇电池卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :大力移动跳跳汁罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :微小动力跳跳汁罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :威滋哇跳跳汁罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :大力移动塑料卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK         :微小动力塑料卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK            :威滋哇塑料卡车
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BUBBLE_TRUCK          :大力移动泡泡罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BUBBLE_TRUCK          :微小动力泡泡罐车
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK             :威滋哇泡泡罐车
 
 ###length 11
 STR_VEHICLE_NAME_SHIP_MPS_OIL_TANKER                            :MPS 油轮
-STR_VEHICLE_NAME_SHIP_CS_INC_OIL_TANKER                         :CS-Inc 油轮
-STR_VEHICLE_NAME_SHIP_MPS_PASSENGER_FERRY                       :MPS Passenger 渡船
-STR_VEHICLE_NAME_SHIP_FFP_PASSENGER_FERRY                       :FFP Passenger 渡船
-STR_VEHICLE_NAME_SHIP_BAKEWELL_300_HOVERCRAFT                   :Bakewell 300 气垫船
-STR_VEHICLE_NAME_SHIP_CHUGGER_CHUG_PASSENGER                    :Chugger-Chug 客轮
-STR_VEHICLE_NAME_SHIP_SHIVERSHAKE_PASSENGER_FERRY               :Shivershake 客轮
-STR_VEHICLE_NAME_SHIP_YATE_CARGO_SHIP                           :Yate 货轮
-STR_VEHICLE_NAME_SHIP_BAKEWELL_CARGO_SHIP                       :Bakewell 货轮
-STR_VEHICLE_NAME_SHIP_MIGHTYMOVER_CARGO_SHIP                    :MightyMover 货轮
-STR_VEHICLE_NAME_SHIP_POWERNAUT_CARGO_SHIP                      :Powernaut 货轮
+STR_VEHICLE_NAME_SHIP_CS_INC_OIL_TANKER                         :CS 公司油轮
+STR_VEHICLE_NAME_SHIP_MPS_PASSENGER_FERRY                       :MPS 客轮
+STR_VEHICLE_NAME_SHIP_FFP_PASSENGER_FERRY                       :FFP 客轮
+STR_VEHICLE_NAME_SHIP_BAKEWELL_300_HOVERCRAFT                   :贝克威尔 300 气垫船
+STR_VEHICLE_NAME_SHIP_CHUGGER_CHUG_PASSENGER                    :轰隆轰隆客轮
+STR_VEHICLE_NAME_SHIP_SHIVERSHAKE_PASSENGER_FERRY               :摇摇晃晃客轮
+STR_VEHICLE_NAME_SHIP_YATE_CARGO_SHIP                           :耶特货轮
+STR_VEHICLE_NAME_SHIP_BAKEWELL_CARGO_SHIP                       :贝克威尔货轮
+STR_VEHICLE_NAME_SHIP_MIGHTYMOVER_CARGO_SHIP                    :大力移动货轮
+STR_VEHICLE_NAME_SHIP_POWERNAUT_CARGO_SHIP                      :探险动力货轮
 
 ###length 41
-STR_VEHICLE_NAME_AIRCRAFT_SAMPSON_U52                           :Sampson U52
-STR_VEHICLE_NAME_AIRCRAFT_COLEMAN_COUNT                         :Coleman Count
-STR_VEHICLE_NAME_AIRCRAFT_FFP_DART                              :FFP Dart
-STR_VEHICLE_NAME_AIRCRAFT_YATE_HAUGAN                           :Yate Haugan 协和客机
-STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_COTSWALD_LB_3                :Bakewell Cotswald LB-3
-STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_8                 :Bakewell Luckett LB-8
-STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_9                 :Bakewell Luckett LB-9
-STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB80                 :Bakewell Luckett LB80
-STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_10                :Bakewell Luckett LB-10
-STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_11                :Bakewell Luckett LB-11
-STR_VEHICLE_NAME_AIRCRAFT_YATE_AEROSPACE_YAC_1_11               :Yate Aerospace YAC 1-11
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_100                            :Darwin 100
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_200                            :Darwin 200
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_300                            :Darwin 300
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_400                            :Darwin 400
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_500                            :Darwin 500
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_600                            :Darwin 600
-STR_VEHICLE_NAME_AIRCRAFT_GURU_GALAXY                           :Guru Galaxy
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A21                           :Airtaxi A21
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A31                           :Airtaxi A31
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A32                           :Airtaxi A32
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A33                           :Airtaxi A33
-STR_VEHICLE_NAME_AIRCRAFT_YATE_AEROSPACE_YAE46                  :Yate Aerospace YAe46
-STR_VEHICLE_NAME_AIRCRAFT_DINGER_100                            :Dinger 100
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A34_1000                      :AirTaxi A34-1000
-STR_VEHICLE_NAME_AIRCRAFT_YATE_Z_SHUTTLE                        :Yate Z-Shuttle
-STR_VEHICLE_NAME_AIRCRAFT_KELLING_K1                            :Kelling K1
-STR_VEHICLE_NAME_AIRCRAFT_KELLING_K6                            :Kelling K6
-STR_VEHICLE_NAME_AIRCRAFT_KELLING_K7                            :Kelling K7
-STR_VEHICLE_NAME_AIRCRAFT_DARWIN_700                            :Darwin 700
-STR_VEHICLE_NAME_AIRCRAFT_FFP_HYPERDART_2                       :FFP Hyperdart 2
-STR_VEHICLE_NAME_AIRCRAFT_DINGER_200                            :Dinger 200
-STR_VEHICLE_NAME_AIRCRAFT_DINGER_1000                           :Dinger 1000
-STR_VEHICLE_NAME_AIRCRAFT_PLODDYPHUT_100                        :Ploddyphut 100
-STR_VEHICLE_NAME_AIRCRAFT_PLODDYPHUT_500                        :Ploddyphut 500
-STR_VEHICLE_NAME_AIRCRAFT_FLASHBANG_X1                          :Flashbang X1
-STR_VEHICLE_NAME_AIRCRAFT_JUGGERPLANE_M1                        :Juggerplane M1
-STR_VEHICLE_NAME_AIRCRAFT_FLASHBANG_WIZZER                      :Flashbang Wizzer
-STR_VEHICLE_NAME_AIRCRAFT_TRICARIO_HELICOPTER                   :Tricario 直升机
-STR_VEHICLE_NAME_AIRCRAFT_GURU_X2_HELICOPTER                    :Guru X2 直升机
-STR_VEHICLE_NAME_AIRCRAFT_POWERNAUT_HELICOPTER                  :Powernaut 直升机
+STR_VEHICLE_NAME_AIRCRAFT_SAMPSON_U52                           :桑普森 U52
+STR_VEHICLE_NAME_AIRCRAFT_COLEMAN_COUNT                         :科尔曼伯爵
+STR_VEHICLE_NAME_AIRCRAFT_FFP_DART                              :FFP 飞镖
+STR_VEHICLE_NAME_AIRCRAFT_YATE_HAUGAN                           :耶特豪根客机
+STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_COTSWALD_LB_3                :贝克威尔-科茨沃尔德 LB-3
+STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_8                 :贝克威尔-拉凯特 LB-8
+STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_9                 :贝克威尔-拉凯特 LB-9
+STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB80                 :贝克威尔-拉凯特 LB80
+STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_10                :贝克威尔-拉凯特 LB-10
+STR_VEHICLE_NAME_AIRCRAFT_BAKEWELL_LUCKETT_LB_11                :贝克威尔-拉凯特 LB-11
+STR_VEHICLE_NAME_AIRCRAFT_YATE_AEROSPACE_YAC_1_11               :耶特宇航 YAC 1-11
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_100                            :达尔文 100
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_200                            :达尔文 200
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_300                            :达尔文 300
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_400                            :达尔文 400
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_500                            :达尔文 500
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_600                            :达尔文 600
+STR_VEHICLE_NAME_AIRCRAFT_GURU_GALAXY                           :大师星系
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A21                           :空中的士 A21
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A31                           :空中的士 A31
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A32                           :空中的士 A32
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A33                           :空中的士 A33
+STR_VEHICLE_NAME_AIRCRAFT_YATE_AEROSPACE_YAE46                  :耶特宇航 YAe46
+STR_VEHICLE_NAME_AIRCRAFT_DINGER_100                            :丁格 100
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A34_1000                      :空中的士 A34-1000
+STR_VEHICLE_NAME_AIRCRAFT_YATE_Z_SHUTTLE                        :耶特 Z-穿梭机
+STR_VEHICLE_NAME_AIRCRAFT_KELLING_K1                            :凯林 K1
+STR_VEHICLE_NAME_AIRCRAFT_KELLING_K6                            :凯林 K6
+STR_VEHICLE_NAME_AIRCRAFT_KELLING_K7                            :凯林 K7
+STR_VEHICLE_NAME_AIRCRAFT_DARWIN_700                            :达尔文 700
+STR_VEHICLE_NAME_AIRCRAFT_FFP_HYPERDART_2                       :FFP 超级飞镖 2
+STR_VEHICLE_NAME_AIRCRAFT_DINGER_200                            :丁格 200
+STR_VEHICLE_NAME_AIRCRAFT_DINGER_1000                           :丁格 1000
+STR_VEHICLE_NAME_AIRCRAFT_PLODDYPHUT_100                        :咔哒扑哧 100
+STR_VEHICLE_NAME_AIRCRAFT_PLODDYPHUT_500                        :咔哒扑哧 500
+STR_VEHICLE_NAME_AIRCRAFT_FLASHBANG_X1                          :闪光弹 X1
+STR_VEHICLE_NAME_AIRCRAFT_JUGGERPLANE_M1                        :伟航 M1
+STR_VEHICLE_NAME_AIRCRAFT_FLASHBANG_WIZZER                      :闪光弹咻咻机
+STR_VEHICLE_NAME_AIRCRAFT_TRICARIO_HELICOPTER                   :特里卡里奥直升机
+STR_VEHICLE_NAME_AIRCRAFT_GURU_X2_HELICOPTER                    :大师 X2 直升机
+STR_VEHICLE_NAME_AIRCRAFT_POWERNAUT_HELICOPTER                  :探险动力直升机
 
 ##id 0x8800
 # Formatting of some strings
-STR_FORMAT_DATE_TINY                                            :{ZEROFILL_NUM}-{ZEROFILL_NUM}-{NUM}
+STR_FORMAT_DATE_TINY                                            :{2:NUM}-{1:ZEROFILL_NUM}-{0:ZEROFILL_NUM}
 STR_FORMAT_DATE_SHORT                                           :{1:NUM} 年 {0:STRING} 月
 STR_FORMAT_DATE_LONG                                            :{2:NUM} 年 {1:STRING} 月 {0:STRING} 日
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:ZEROFILL_NUM}-{0:ZEROFILL_NUM}
@@ -5853,7 +5854,7 @@ STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} 船坞 #
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{STATION} 机库
 # _SERIAL version of AIRACRAFT doesn't exist
 
-STR_UNKNOWN_STATION                                             :未知车站（目的地）
+STR_UNKNOWN_STATION                                             :未知车站
 STR_DEFAULT_SIGN_NAME                                           :标志
 STR_COMPANY_SOMEONE                                             :某人
 
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}B
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING}（{VELOCITY}）
 
 STR_BADGE_NAME_LIST                                             :{STRING}：{GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :开启徽章设定
+STR_BADGE_CONFIG_RESET                                          :重置
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}徽章图标
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}筛选徽章
+STR_BADGE_CONFIG_PREVIEW                                        :预览图
+STR_BADGE_CONFIG_NAME                                           :名称
+STR_BADGE_FILTER_ANY_LABEL                                      :{STRING}：所有
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING}：{STRING}
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 7bca3f45a3..03a6642218 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -505,7 +505,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Ukončiť
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti hry
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Nastavenia
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Nastavenia AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Nastavenia skriptu
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Nastavenia NewGRF
@@ -1012,22 +1011,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Nastavi
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnosti hry
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Všeobecné
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Vyberte všeobecné nastavenia
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Vyberte všeobecné nastavenia
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Vyberte nastavenia grafiky
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Vyberte nastavenia grafiky
 STR_GAME_OPTIONS_TAB_SOUND                                      :Zvuk
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Vyberte nastavenia zvuku a hudby
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Vyberte nastavenia zvuku a hudby
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sociálne
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Vyberte nastavenia sociálnej integrácie
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Vyberte nastavenia sociálnej integrácie
 
 STR_GAME_OPTIONS_VOLUME                                         :Hlasitosť
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Zvukové efekty
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Hudba
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}% hlasitosť
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Mena
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výber menovej jednotky
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Mena
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Výber menovej jednotky
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1077,8 +1077,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajzijský ri
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lotyšské Laty
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalské Escudo
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatické ukladanie
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Výber intervalu automatického ukladania
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatické ukladanie
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Výber intervalu automatického ukladania
 
 # Autosave dropdown
 ###length 5
@@ -1088,76 +1088,76 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Každých 30 mi
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Každých 60 minút
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Každých 120 minút
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jazyk
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Výber jazyka rozhrania
+STR_GAME_OPTIONS_LANGUAGE                                       :Jazyk
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Výber jazyka rozhrania
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% hotovo)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Celá obrazovka
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaškrtnite, ak chcete hrať OpenTTD na celej obrazovke
+STR_GAME_OPTIONS_FULLSCREEN                                     :Celá obrazovka
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Zaškrtnite, ak chcete hrať OpenTTD na celej obrazovke
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozlíšenie obrazovky
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Výber rozlíšenia obrazovky
+STR_GAME_OPTIONS_RESOLUTION                                     :Rozlíšenie obrazovky
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Výber rozlíšenia obrazovky
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :iné
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardvérové zrýchlenie
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Zaškrtnutím políčka dovolíte, aby sa OpenTTD pokúsilo použiť hardvérové zrýchlenie. Zmena nastavenia sa uplatní až po reštartovaní hry
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardvérové zrýchlenie
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Zaškrtnutím políčka dovolíte, aby sa OpenTTD pokúsilo použiť hardvérové zrýchlenie. Zmena nastavenia sa uplatní až po reštartovaní hry
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Nastavenie sa uplatní až po reštartovaní hry
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Zaškrtnite toto políčko, aby ste povolili vertikálnu synchronizáciu. Zmeny budú uplatnené až po reštarte hry. Funguje iba ak je zapnutá hardvérová akcelerácia.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Zaškrtnite toto políčko, aby ste povolili vertikálnu synchronizáciu. Zmeny budú uplatnené až po reštarte hry. Funguje iba ak je zapnutá hardvérová akcelerácia.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktuálny ovládač: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktuálny ovládač: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Veľkosť rozhrania
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Potiahnutím posúvača nastavte veľkosť rozhrania. Pre plynulé nastavenie podržte Ctrl
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detekovať rozmery automaticky
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Začiarknutím tohto políčka automaticky zistiť veľkosť rozhrania
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Mierkové úkosy
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Začiarknutím tohto políčka zmeníte úkosy podľa veľkosti rozhrania
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Veľkosť rozhrania
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Potiahnutím posúvača nastavte veľkosť rozhrania. Pre plynulé nastavenie podržte Ctrl
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detekovať rozmery automaticky
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Začiarknutím tohto políčka automaticky zistiť veľkosť rozhrania
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Použiť tradičné "Sprite" písmo
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Začiarknite toto políčko, ak uprednostňujete použitie tradičného písma sprite s pevnou veľkosťou
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Vyhladzovacie písma
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Začiarknite toto políčko, ak chcete vyhladiť písma s meniteľnou veľkosťou
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Mierkové úkosy
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Začiarknutím tohto políčka zmeníte úkosy podľa veľkosti rozhrania
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Použiť tradičné "Sprite" písmo
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Začiarknite toto políčko, ak uprednostňujete použitie tradičného písma sprite s pevnou veľkosťou
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Vyhladzovacie písma
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Začiarknite toto políčko, ak chcete vyhladiť písma s meniteľnou veľkosťou
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatizovaný prieskum
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Zúčastniť sa automatizovaného prieskumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Ak je zapnuté, OpenTTD odošle výsledky prieskumu pri ukončení hry
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}O prieskume a súkromí
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Otvorí prehliadač s viacero informáciami o automatickom prieskume
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Náhľad výsledkov prieskumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Zobraziť výsledky prieskumu aktuálnej hry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatizovaný prieskum
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Zúčastniť sa automatizovaného prieskumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Ak je zapnuté, OpenTTD odošle výsledky prieskumu pri ukončení hry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :O prieskume a súkromí
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Otvorí prehliadač s viacero informáciami o automatickom prieskume
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Náhľad výsledkov prieskumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Zobraziť výsledky prieskumu aktuálnej hry
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafika
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Obnovovacia frekvencia obrazovky
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Výber používanej obnovovacej frekvencie obrazu
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Obnovovacia frekvencia obrazovky
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Výber používanej obnovovacej frekvencie obrazu
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Obnovovacia frekvencia vyššia ako 60Hz môže znížiť výkon.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Základná sada grafiky
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Výber sady grafiky, ktorá má byť použitá (nie je možné zmeniť v hre, iba z hlavného menu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatočné informácie o základnej sade grafiky
+STR_GAME_OPTIONS_BASE_GRF                                       :Základná sada grafiky
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Výber sady grafiky, ktorá má byť použitá (nie je možné zmeniť v hre, iba z hlavného menu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Dodatočné informácie o základnej sade grafiky
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Základná sada zvukov
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Výber sady zvukov, ktorá má byť použitá (nie je možné zmeniť v hre, iba z hlavného menu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatočné informácie o základnej sade zvukov
+STR_GAME_OPTIONS_BASE_SFX                                       :Základná sada zvukov
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Výber sady zvukov, ktorá má byť použitá (nie je možné zmeniť v hre, iba z hlavného menu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Dodatočné informácie o základnej sade zvukov
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Základná sada hudby
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Výber sady hudby, ktorá má byť použitá
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatočné informácie o základnej sade hudby
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Základná sada hudby
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Výber sady hudby, ktorá má byť použitá
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Dodatočné informácie o základnej sade hudby
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Získať Obsah
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(žiadne nainštalované doplnky na integráciu so sociálnymi platformami)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stav pluginu:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stav pluginu:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Beží
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Nepodarilo sa inicializovať
@@ -1270,11 +1270,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Povoľný (nem
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nieje dostupné žiadne použiteľné AI...{}Niekoľko AI je možné stiahnuť cez 'Online obsah'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Nastavenia
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Rozbaliť všetko
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Zabaliť všetko
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Rozbaliť všetko
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Zabaliť všetko
 STR_CONFIG_SETTING_RESET_ALL                                    :Resetovať všetky hodnoty
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(nie je dostupné vysvetlenie)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
@@ -1288,9 +1287,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Nastavenie spol
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Pozor!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Táto akcia vráti všetky nastavenia hry do pôvodného stavu.{}Chcete naozaj pokračovať?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategória:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typ:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Obmedzuje zoznam nižšie podľa definovaných nastavení
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategória:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typ:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Obmedzuje zoznam nižšie podľa definovaných nastavení
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Základné (zobrazí iba dôležité nastavenia)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Pokročilé (zobrazí väčšinu nastavení)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Odborné (zobrazí všetky nastavenia, vrátane podivných)
@@ -1307,9 +1306,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Nastavenia spol
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Žiadne -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Nie
@@ -2231,7 +2230,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nena
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Hra spadla kvôli ovládaču GPU. Hardvérová akcelerácia je vypnutá
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nová hra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Nahrať hru
@@ -2243,11 +2241,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Viacero
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Možnosti hry
 STR_INTRO_HIGHSCORE                                             :{BLACK}Najvyššie skóre
 STR_INTRO_HELP                                                  :{BLACK}Nápoveda a manuály
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Nastavenia
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavenia NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Skontrolovať online obsah
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Nastavenia AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Nastavenia skriptu
 STR_INTRO_QUIT                                                  :{BLACK}Ukončiť
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Spustiť novú hru. Ctrl+klik preskočí nastavenie mapy
@@ -2265,11 +2259,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Vybrať
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Otvoriť možnosti hry
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Otvoriť tabuľku hráčov s najvyšším skóre
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Získajte prístup k dokumentácií a on-line zdrojom
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Otvoriť nastavenia
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Otvoriť nastavenia NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skontrolovať nový a aktualizovaný obsah pre stiahnutie
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Otvoriť nastavenia AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Otvoriť nastavenia skriptu
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ukončiť 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Vo vybranej základnej sade grafiky chýba {NUM} prv{P ok ky kov}. Prosím skontrolujte aktualizácie sady grafiky.
@@ -3075,6 +3065,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vyber ve
 STR_FOUND_TOWN_CITY                                             :{BLACK}Veľkomesto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Veľkomestá sa rozrastajú rýchlejšie než obyčajné mestá{}Záleží na nastaveniach, sú väčšie keď sú dotované
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Návrh ciest mesta:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vyberte plán ciest používaných v tomto meste
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originál
@@ -3512,15 +3503,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Uložiť
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Zoznam dostupných predvolieb, zvoľte jednu na kopírovanie a uložte menom nižšie
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Zadajte názov pre predvoľby
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Aktuálne vybraný názov pre uloženie predvolieb
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Zrušiť
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Nemeniť predvoľby
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Uložiť
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Uložiť predvoľby do práve vybraného názvu
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Zmeniť parametre základnej grafiky
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Zmeniť NewGRF parametre
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zatvoriť
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Resetovať
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Nastaviť predvolené hodnoty parametrov
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -4739,7 +4727,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Cestovn
 STR_TIMETABLE_NO_TRAVEL                                         :Necestuj
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Cestuj (automaticky; nastavené po ďalšom zadaní príkazu)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Cesta (neurčený čas)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Cestovanie (bez cestovného plánu) s najviac {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Cesta {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Cesta {STRING} s najviac {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Cesta ({STRING}, nerozvrhnuté)
@@ -4863,8 +4850,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Potvrdiť
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrať vyznačený skript
-STR_AI_LIST_CANCEL                                              :{BLACK}Zrušiť
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemeniť skript
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Vytvoriť snímku obrazovky
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normálna snímka
@@ -4877,7 +4862,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Snímka
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Herný skript
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zavrieť
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetovať
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 234ebf3c73..ed3571eb6c 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -538,7 +538,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Izhod
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti igre
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Nastavitve
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF nastavitve
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Nastavitve prozornega pogleda
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Imena mest prikazana
@@ -1006,8 +1005,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnost
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valute
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbira valut
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valute
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Izbira valut
 
 
 ###length 45
@@ -1047,21 +1047,21 @@ STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruzijski Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranski Rial
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kongški dolar
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Samodejno shrani
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Izberi časovni interval samodejnega shranjevanja igre
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Samodejno shrani
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Izberi časovni interval samodejnega shranjevanja igre
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Izključeno
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jezik
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Izberi jezik vmesnika
+STR_GAME_OPTIONS_LANGUAGE                                       :Jezik
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Izberi jezik vmesnika
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cel zaslon
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Označi to okno za igro v celozaslonskem načinu
+STR_GAME_OPTIONS_FULLSCREEN                                     :Cel zaslon
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Označi to okno za igro v celozaslonskem načinu
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ločljivost
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Izberi ločljivost zaslona
+STR_GAME_OPTIONS_RESOLUTION                                     :Ločljivost
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Izberi ločljivost zaslona
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :drugo
 
 
@@ -1074,17 +1074,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :drugo
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni komplet grafik
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Izberi osnovni komplet grafik za uporabo
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o osnovnem kompletu grafik
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Osnovni komplet zvokov
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Izberi osnovni komplet zvokov za uporabo
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o osnovnem kompletu zvokov
+STR_GAME_OPTIONS_BASE_GRF                                       :Osnovni komplet grafik
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Izberi osnovni komplet grafik za uporabo
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Dodatne informacije o osnovnem kompletu grafik
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Osnovni komplet glasbe
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Izberi osnovni komplet glasbe za uporabo
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatne informacije o osnovnem kompletu glasbe
+STR_GAME_OPTIONS_BASE_SFX                                       :Osnovni komplet zvokov
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Izberi osnovni komplet zvokov za uporabo
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Dodatne informacije o osnovnem kompletu zvokov
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Osnovni komplet glasbe
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Izberi osnovni komplet glasbe za uporabo
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Dodatne informacije o osnovnem kompletu glasbe
 
 
 
@@ -1187,11 +1188,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Dopustno
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ni na voljo nobene uporabne UI.{}UI so na voljo preko 'Prenosa vsebin'.
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Nastavitve
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtriraj niz:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Razširi vse
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Skrči vse
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtriraj niz:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Razširi vse
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Skrči vse
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(ni razpoložljive razlage)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Privzeta vrednost: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Vrsta nastavitve: {ORANGE}{STRING}
@@ -1201,9 +1201,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Nastavitve igre
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Nastavitve podjetja (shranjeno v igrah, vpliva samo na nove igre)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Nastavitve podjetja (shranjeno v igrah, vpliva samo na trenutno podjetje)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tip:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Omeji seznam na prikaz le spremenjenih nastavitev
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tip:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Omeji seznam na prikaz le spremenjenih nastavitev
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Osnovne nastavitve
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Napredne nastavitve
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Strokovne nastavitve / vse nastavitve
@@ -1220,9 +1220,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Nastavitve podj
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Brez -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Prikaži vse rezultate iskanja z nastavitvijo{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Prikaži vse rezultate iskanja z nastavitvijo{}{SILVER}Tip {BLACK}do {WHITE}Vsi tipi nastavitev
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Prikaži vse rezultate iskanja z nastavitvijo{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}in {SILVER}Tip {BLACK}do {WHITE}Vsi tipi nastavitev
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Prikaži vse rezultate iskanja z nastavitvijo{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Prikaži vse rezultate iskanja z nastavitvijo{}{SILVER}Tip {BLACK}do {WHITE}Vsi tipi nastavitev
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Prikaži vse rezultate iskanja z nastavitvijo{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}in {SILVER}Tip {BLACK}do {WHITE}Vsi tipi nastavitev
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Izklopi
@@ -2013,7 +2013,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Priprava
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova igra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Naloži igro
@@ -2024,8 +2023,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Več igr
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Možnosti
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabela najboljših rezultatov
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Nastavitve
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF nastavitve
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Preveri razpoložljive vsebine
 STR_INTRO_QUIT                                                  :{BLACK}Izhod
 
@@ -2043,8 +2040,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Izberi o
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Prikaži možnosti igre
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Prikaži tabelo najboljših rezultatov
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Nastavitve zaslona
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži nastavitve NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Preveri posodobljene vsebine na strežniku,{} ki so na voljo za prenos
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Izhod iz 'OpenTTD'
 
@@ -2712,6 +2707,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Izberi v
 STR_FOUND_TOWN_CITY                                             :{BLACK}Mesto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Mesta rastejo hitreje kot navadna naselja{}Odvisno od nastavitev, so večja, ko so ustanovljena
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Oblika mestnih cest:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Izberi obliko cest za to mesto
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3043,14 +3039,11 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Shrani p
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Seznam prednastavitev na voljo, izberi eno, da jo skopiraš kot ime za shranjevanje spodaj
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Vpiši ime za prednastavitev
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Trenutno izbrano ime za shranjevanje prednastavitev
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Prekliči
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ne spremeni prednastavitve
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Shrani
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Shrani prednastavitev k trenutno izbranemu imenu
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Spremeni NewGRF parametre
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zapri
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Ponastavi
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Ponastavi vse nastavitve na privzeto
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -4098,7 +4091,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Urnik -
 STR_TIMETABLE_NO_TRAVEL                                         :Brez potovanja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Potovanje (avtomatično; urnik z naslednjim ukazom)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Potovanje (brez urnika)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Potuj z največ {2:VELOCITY} (brez časovne tabele)
 STR_TIMETABLE_TRAVEL_FOR                                        :Potuj za {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Pozuj proti {STRING} z najvišjo hitrostjo {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Potuj (za {STRING}, brez časovne tabele)
@@ -4208,13 +4200,10 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Potrdi
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Izberi označeno skripto
-STR_AI_LIST_CANCEL                                              :{BLACK}Prekliči
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne spremeni skripte
 
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :UI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zapri
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetiraj
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 0b1b39c029..bea23da2a8 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -160,7 +160,7 @@ STR_ABBREV_TOFFEE                                               :TF
 STR_ABBREV_BATTERIES                                            :PI
 STR_ABBREV_PLASTIC                                              :PL
 STR_ABBREV_FIZZY_DRINKS                                         :RF
-STR_ABBREV_ALL                                                  :TOD
+STR_ABBREV_ALL                                                  :TODO
 
 # 'Mode' of transport for cargoes
 STR_PASSENGERS                                                  :{COMMA}{NBSP}pasajero{P "" s}
@@ -286,7 +286,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Cierra l
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título de la ventana - arrastra para moverla
 STR_TOOLTIP_SHADE                                               :{BLACK}Oculta la ventana - muestra sólo el título de la ventana
 STR_TOOLTIP_DEBUG                                               :{BLACK}Muestra la información de depuración NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar ventana al tamaño por defecto. Ctrl+clic permite almacenar el tamaño actual como tamaño por defecto
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar ventana al tamaño por defecto. Ctrl+Clic permite almacenar el tamaño actual como tamaño por defecto
 STR_TOOLTIP_STICKY                                              :{BLACK}Esta ventana no se cerrará tras usar el comando 'Cerrar Todas las Ventanas'. Ctrl+clic permite guardar el estado como estado por defecto
 STR_TOOLTIP_RESIZE                                              :{BLACK}Clica y arrastra para redimensionar la ventana
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alterna el tamaño de ventana entre grande/pequeño
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Colocar edifici
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opciones de juego
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Configuración
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Configuración de IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Configuración de script de juego
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Configuración NewGRF
@@ -453,6 +452,12 @@ STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Opciones sandbo
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opciones de transparencia
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Ver nombres de municipios
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Ver nombres de estaciones
+STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Estaciones de tren
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Estaciones de camión
+STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Estaciones de autobús
+STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Muelles
+STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Aeropuertos
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Vestigios
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Ver puntos de ruta
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Ver letreros
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Letreros y nombres de competidor mostrados
@@ -928,7 +933,7 @@ STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Abre la
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST                   :{WHITE}{STATION} ya no acepta: {CARGO_LIST}
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST                         :{WHITE}{STATION} ahora acepta: {CARGO_LIST}
 
-STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Oferta de subvención terminada:{}{}{STRING} de {STRING} a {STRING} ya no conlleva una subvención
+STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Oferta de subvención vencida:{}{}{STRING} de {STRING} a {STRING} ya no conlleva una subvención
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subvención retirada:{}{}El servicio de {STRING} desde {STRING} a {STRING} ya no está subvencionado
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Se ofrece subvención:{}{}¡Al primer servicio de {STRING} que cubra la línea desde {STRING} a {STRING} se le otorgará una subvención durante {UNITS_YEARS_OR_MINUTES} por parte de las autoridades locales!
 ###length 4
@@ -954,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copia la
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opciones del juego
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Selecciona los ajustes generales
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Selecciona los ajustes generales
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gráficos
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Selecciona los ajustes gráficos
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Selecciona los ajustes gráficos
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sonido
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Selecciona los ajustes de sonido y música
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Selecciona los ajustes de sonido y música
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Selecciona los ajustes de integración social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Selecciona los ajustes de integración social
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanzado
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Cambiar ajustes avanzados
 
 STR_GAME_OPTIONS_VOLUME                                         :Volumen
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efectos de sonido
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidad monetaria
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecciona la nnidad monetaria
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unidad monetaria
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Selecciona la nnidad monetaria
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1018,9 +1027,10 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia indonesia
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit malasio
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letón
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portugués
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :Grivna ucraniana
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autoguardado
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selección del intervalo entre guardados automáticos del juego
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autoguardado
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selección del intervalo entre guardados automáticos del juego
 
 # Autosave dropdown
 ###length 5
@@ -1030,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Cada 30 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Cada 60 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Cada 120 minutos
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Idioma
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selecciona el idioma a emplear en interfaz del juego
+STR_GAME_OPTIONS_LANGUAGE                                       :Idioma
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selecciona el idioma a emplear en interfaz del juego
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completado)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantalla completa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marca esta casilla para jugar OpenTTD a pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marca esta casilla para jugar OpenTTD a pantalla completa
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolución de pantalla
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecciona la resolución de pantalla a usar
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolución de pantalla
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecciona la resolución de pantalla a usar
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Otras
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aceleración por hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Marca esta casilla para permitir que OpenTTD intente usar aceleración por hardware. El cambio de configuración sólo tendrá efecto después de reiniciar el juego
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aceleración por hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marca esta casilla para permitir que OpenTTD intente usar aceleración por hardware. El cambio de configuración sólo tendrá efecto después de reiniciar el juego
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}El ajuste sólo tendrá efecto después de reiniciar el juego
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Sincronización vertical
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Marca esta casilla para activar la sincronización vertical en la pantalla. El cambio sólo se aplicará después de reiniciar el juego. Sólo funciona si la aceleración por hardware está activada.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Sincronización vertical
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Marca esta casilla para activar la sincronización vertical en la pantalla. El cambio sólo se aplicará después de reiniciar el juego. Sólo funciona si la aceleración por hardware está activada.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Controlador actual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador actual: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Tamaño de la interfaz
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Mueve el control deslizante para seleccionar el tamaño de la interfaz. Ctrl+deslizar para ajustar de forma continua
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Autodetectar tamaño
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marca esta casilla para detectar automáticamente el tamaño de la interfaz
+STR_GAME_OPTIONS_INTERFACE                                      :Interfaz
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Escalar bordes
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marca esta casilla para escalar los bordes según el tamaño de la interfaz
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Tamaño de la interfaz
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Mueve el control deslizante para seleccionar el tamaño de la interfaz. Ctrl+deslizar para ajustar de forma continua
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Autodetectar tamaño
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marca esta casilla para detectar automáticamente el tamaño de la interfaz
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usar el tipo de letra tradicional de sprite
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marca esta casilla si prefieres usar el tipo de letra tradicional de tamaño fijo
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Tipos de letra suavizadas
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marca esta casilla para suavizar los tipos de letra escalables
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escalar bordes
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marca esta casilla para escalar los bordes según el tamaño de la interfaz
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usar el tipo de letra tradicional de sprite
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marca esta casilla si prefieres usar el tipo de letra tradicional de tamaño fijo
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Tipos de letra suavizadas
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marca esta casilla para suavizar los tipos de letra escalables
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Encuesta automática
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participar en la encuesta automática
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Si está activado, OpenTTD enviará una encuesta al salir el juego
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Acerca de la encuesta y la privacidad
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Se abrirá el navegador web con más información sobre la encuesta automática
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Vista previa del resultado
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Muestra el resultado de la encuesta para el juego actual
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Encuesta automática
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participar en la encuesta automática
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Si está activado, OpenTTD enviará una encuesta al salir el juego
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Acerca de la encuesta y la privacidad
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Se abrirá el navegador web con más información sobre la encuesta automática
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Vista previa del resultado
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Muestra el resultado de la encuesta para el juego actual
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Gráficos
+STR_GAME_OPTIONS_DISPLAY                                        :Mostrar
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Mostrar frecuencia de actualización
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Selecciona la frecuencia de actualización de la pantalla
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Mostrar frecuencia de actualización
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Selecciona la frecuencia de actualización de la pantalla
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM} Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Las frecuencias de actualización superiores a 60 Hz pueden afectar al rendimiento.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona el conjunto de gráficos base a usar (no pueden cambiarse durante la partida, sólo desde el menú principal)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre el set de gráficos base
+STR_GAME_OPTIONS_BASE_GRF                                       :Conjunto de gráficos base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecciona el conjunto de gráficos base a usar (no pueden cambiarse durante la partida, sólo desde el menú principal)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Información adicional sobre el set de gráficos base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Conjunto de sonidos base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Seleccionar conjunto de sonidos base a emplear (no pueden cambiarse durante la partida, sólo desde el menú principal)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre el conjunto de sonidos base
+STR_GAME_OPTIONS_BASE_SFX                                       :Conjunto de sonidos base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Seleccionar conjunto de sonidos base a emplear (no pueden cambiarse durante la partida, sólo desde el menú principal)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Información adicional sobre el conjunto de sonidos base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Conjunto de música base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Seleccionar conjunto de música base a usar
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Información adicional sobre el conjunto de música base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Conjunto de música base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Seleccionar conjunto de música base a usar
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Información adicional sobre el conjunto de música base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Conseguir contenido
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Comprueba si hay contenido nuevo y actualizado para descargar
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no se han instalado "plugins" para integrar plataformas sociales)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(no se han instalado "plugins" para integrar plataformas sociales)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estado del "plugin":
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estado del "plugin":
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}En ejecución
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}No se ha podido inicializar
@@ -1211,14 +1223,13 @@ STR_CITY_APPROVAL_TOLERANT                                      :Tolerante
 STR_CITY_APPROVAL_HOSTILE                                       :Hostil
 STR_CITY_APPROVAL_PERMISSIVE                                    :Permisiva (sin efecto sobre las acciones de las compañías)
 
-STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No se han encontrado IA apropiadas...{}Puedes descargar IA a través del sistema de 'Contenido Online'
+STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No se han encontrado IA apropiadas...{}Puedes descargar IA a través del sistema de 'Contenido en línea'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Configuración
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtro:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Expandir todo
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Contraer todo
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restablecer valores
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtro:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Expandir todo
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Contraer todo
+STR_CONFIG_SETTING_RESET_ALL                                    :Restablecer valores
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(no hay explicación disponible)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor por defecto: {ORANGE}{STRING}
@@ -1231,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Opción de empr
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}¡Advertencia!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Esta acción restablecerá todos los ajustes del juego a sus valores por defecto.{}¿Deseas proceder?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoría:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Muestra solamente las opciones modificadas en la lista
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoría:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Muestra solamente las opciones modificadas en la lista
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Opciones básicas (solo muestra los ajustes de configuración más importantes)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avanzado (muestra la mayoría de las opciones)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Experto (muestra todas las opciones, incluidas las más extrañas)
@@ -1250,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Opciones de emp
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ninguno -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Mostrar todos los resultados por opción de configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Mostrar todos los resultados por opción de configuración{}{SILVER}Tipo {BLACK}a {WHITE}Todos los tipos de opción
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Mostrar todos los resultados por opción de configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING} {BLACK}y {SILVER}Tipo {BLACK}a {WHITE}Todos los tipos de opción
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Mostrar todos los resultados por opción de configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Mostrar todos los resultados por opción de configuración{}{SILVER}Tipo {BLACK}a {WHITE}Todos los tipos de opción
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Mostrar todos los resultados por opción de configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING} {BLACK}y {SILVER}Tipo {BLACK}a {WHITE}Todos los tipos de opción
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :No
@@ -1980,7 +1991,12 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Prohibido
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Permitido
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Permitido, patrón de carreteras personalizado
 
+STR_CONFIG_SETTING_HOUSE_PLACER                                 :Colocación individual de casas: {STRING}
+STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :Activar esta opción permite a los jugadores colocar casas manualmente
 ###length 3
+STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Prohibido
+STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Permitido
+STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :Permitido, construcción completa
 
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Generación de carga en municipios: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Cantidad de carga que es producida por las casas del municipio, en relación a la población total del municipio.{}Crecimiento cuadrático: Un municipio de doble tamaño genera el cuádruple de pasajeros.{}Crecimiento lineal: Un municipio de doble tamaño genera el doble de pasajeros
@@ -2009,7 +2025,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Máximo número
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Número máximo de ventanas sin anclar que pueden estar abiertas antes de que las más antiguas se cierren automáticamente para dejar paso a las nuevas
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :deshabilitado
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Deshabilitado
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Máximo acercamiento: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Nivel máximo de acercamiento para las ventanas de vista y la vista principal. Los niveles altos de acercamiento incrementan el consumo de memoria del juego
@@ -2180,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no s
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... el controlador de GPU ha hecho fallar el juego. Se ha deshabilitado la aceleración por hardware
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nueva Partida
 STR_INTRO_LOAD_GAME                                             :{BLACK}Cargar Partida
@@ -2192,11 +2209,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijug
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opciones de Juego
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabla de Puntuaciones
 STR_INTRO_HELP                                                  :{BLACK}Ayuda y Manuales
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Configuración
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configuración NewGRF
-STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenido Online
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Configuración de IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Scripts de Juego
+STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenido en línea
 STR_INTRO_QUIT                                                  :{BLACK}Salir
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comienza una partida nueva. Ctrl+clic omite la configuración del mapa
@@ -2214,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Seleccio
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Abrir las opciones de juego
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Abre la tabla de puntuaciones
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Proporciona acceso a documentación y recursos en línea
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Abre la configuración
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Abre la configuración de NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Comprueba si hay contenidos nuevos y actualizados para descargar
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Abre la configuración de IA
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Abre la configuración de Script de juego
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Salir de 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}El conjunto de gráficos base actualmente seleccionado no encuentra {NUM} sprite{P "" s}. Comprueba si hay actualizaciones para el conjunto base, o usa otro totalmente actualizado.
@@ -2243,6 +2252,7 @@ STR_HELP_WINDOW_README                                          :{BLACK}Léeme
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Registro de cambios
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Fallos conocidos
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Licencia
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Fuentes
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Manual / Wiki
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Informar de un problema
@@ -2631,13 +2641,14 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH               :esperando actua
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :abandonando
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} se ha unido a la partida
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} se ha unido a la partida (Cliente #{NUM})
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} se ha unido a {STRING}
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} se ha unido como espectador
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ha creado una empresa nueva (#{NUM})
 STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ha abandonado el juego ({STRING})
 STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ha cambiado su nombre a {STRING}
 STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} ha transferido {CURRENCY_LONG} a {STRING}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}El servidor ha cerrado la sesión
-STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}El servidor está reiniciando...{}Espera por favor...
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}El servidor se está reiniciando...{}{}Espera por favor...
 STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} ha sido expulsado. Razón: ({STRING})
 
 STR_NETWORK_ERROR_COORDINATOR_REGISTRATION_FAILED               :{WHITE}El registro del servidor ha fallado
@@ -2646,7 +2657,7 @@ STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}Tu servi
 STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL                   :{WHITE}Los demás jugadores no podrán conectarse a tu servidor
 
 # Content downloading window
-STR_CONTENT_TITLE                                               :{WHITE}Descarga de contenido
+STR_CONTENT_TITLE                                               :{WHITE}Contenido en línea
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipo
 STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipo de contenido
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nombre
@@ -2845,6 +2856,7 @@ STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Años: {
 STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Años: {ORANGE}Hasta {NUM}
 STR_HOUSE_PICKER_SIZE                                           :{BLACK}Tamaño: {ORANGE}{NUM}x{NUM} casillas
 STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Carga aceptada: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Carga producida: {ORANGE}{CARGO_LIST}
 
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Afueras
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Periferia
@@ -2852,6 +2864,10 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbios exter
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbios interiores
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro urbano
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :Evitar mejoras
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Selecciona si esta casa estará protegida de reemplazos cuando el municipio crezca
+STR_HOUSE_PICKER_PROTECT_OFF                                    :No
+STR_HOUSE_PICKER_PROTECT_ON                                     :Sí
 
 STR_STATION_CLASS_DFLT                                          :Por defecto
 STR_STATION_CLASS_DFLT_STATION                                  :Estación por defecto
@@ -2885,6 +2901,7 @@ STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecci
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selección de puente - Clica en el puente elegido para construirlo
 STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED                           :{GOLD}{STRING},{} {VELOCITY}
+STR_SELECT_BRIDGE_INFO_NAME_COST                                :{GOLD}{STRING},{} {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST                      :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Colgante, Acero
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Tirantes, Acero
@@ -2943,7 +2960,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Seleccio
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construcción de Canales
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Canales
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construye canales. Con Mayús sólo muestra una estimación del coste
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construye canales. Ctrl+clic+arrastrar permite seleccionar un área diagonalmente. Con Mayús sólo muestra una estimación del coste
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Construye esclusas. Con Mayús sólo muestra una estimación del coste
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Contruye un astillero (para comprar y dar mantenimiento a barcos). Con Mayús sólo muestra una estimación del coste
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construye muelles. Ctrl+clic para seleccionar otra estación a la que unirlo. Con Mayús sólo muestra una estimación del coste
@@ -3057,6 +3074,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciudad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Las ciudades crecen más rápido que los municipios{}Dependiendo de los ajustes, son mayores al ser fundadas
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansión del pueblo:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Edificios
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumentar edificios de los pueblos
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Carreteras
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumentar carreteras de los pueblos
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Patrón de carretera:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Seleccionar patrón de carreteras para este municipio
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3128,6 +3151,8 @@ STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Tipo de
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Límite de velocidad de ferrocarril: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Límite de velocidad de carretera: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Límite de velocidad de tranvía: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}El municipio puede reemplazarlo: {LTBLUE}Sí
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}El municipio puede reemplazarlo: {LTBLUE}No
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rocas
@@ -3136,6 +3161,9 @@ STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terreno desnudo
 STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Pastos
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campos
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Desierto
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :Rocas cubiertas con nieve
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :Terreno irregular cubierto con nieve
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :Hierba cubierta de nieve
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Vía de ferrocarril
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Vía de ferrocarril con señales de bloque
@@ -3501,15 +3529,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Guardar
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista de perfiles disponibles; selecciona uno para copiar el nombre del perfil abajo
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Introduce un nombre para el perfil
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nombre actualmente seleccionado del perfil a guardar
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancelar
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}No modificar el perfil
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Guardar
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Guarda el perfil con el nombre elegido
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Cambiar los parámetros gráficos base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Cambiar parámetros NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Cerrar
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reiniciar
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Fija todos los parámetros a su valor por defecto
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parámetro {NUM}
@@ -3607,17 +3632,17 @@ STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Archivo
 STR_NEWGRF_LIST_MISSING                                         :{RED}Faltan archivos
 
 # NewGRF 'it's broken' warnings
-STR_NEWGRF_BROKEN                                               :{WHITE}Es probable que el funcionamiento del NewGRF '{0:STRING}' cause desincronizaciones o fallos
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Ha cambiado el estado 'vagón motorizado' '{1:ENGINE}' cuando no estaba dentro de un depósito
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Ha cambiado la longitud del vehículo '{1:ENGINE}' cuando no estaba dentro de un depósito
-STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Ha cambiado la capacidad del vehículo '{1:ENGINE}' fuera de un depósito o mientras no se estaba reformando
+STR_NEWGRF_BROKEN                                               :{WHITE}Es probable que el funcionamiento del NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' cause desincronizaciones o fallos
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Ha cambiado el estado 'vagón motorizado' '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' cuando no estaba dentro de un depósito
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Ha cambiado la longitud del vehículo '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' cuando no estaba dentro de un depósito
+STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Ha cambiado la capacidad del vehículo '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' cuando no estaba dentro de un depósito o mientras no se estaba reformando
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}El tren '{VEHICLE}' perteneciente a '{COMPANY}' tiene una longitud incorrecta. Esto puede deberse a problemas con los NewGRF. El juego puede desincronizarse o fallar por completo
 
-STR_NEWGRF_BUGGY                                                :{WHITE}El NewGRF '{0:STRING}' da información incorrecta
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}La información de carga/reforma para '{1:ENGINE}' difiere de la de lista de compra después de la construcción. Esto puede causar que la renovación/reemplazo automático no haga la reforma correcta
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' ha causado un bucle sin fin en la 'callback' de producción
+STR_NEWGRF_BUGGY                                                :{WHITE}El NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' da información incorrecta
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}La información de carga/reforma para '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' difiere de la de lista de compra después de la construcción. Esto puede causar que la renovación/reemplazo automático no haga la reforma correcta
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' ha causado un bucle sin fin en la 'callback' de producción
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}'Callback' {1:HEX} ha devuelto el resultado desconocido o inválido {2:HEX}
-STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' ha devuelto tipo de carga inválida en el 'callback' de producción en {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' ha devuelto tipo de carga inválida en el 'callback' de producción en {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<carga incorrecta>
@@ -3678,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Cambia e
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Aumentar
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar la población del municipio
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expandir edificios
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumentar edificios de los pueblos
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expandir carreteras
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumentar carreteras de los pueblos
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Borrar
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Borrar completamente este municipio
 
@@ -4013,6 +4042,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produce:
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Necesita:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} esperando{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} en espera
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar producción (múltiplos de 8, máximo 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Cambiar nivel de producción (porcentaje, hasta un máximo de 800%)
@@ -4412,9 +4445,9 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Ver órd
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Ver órdenes de la aeronave. Ctrl+clic muestra su horario
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Muestra los detalles del tren
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Muestra los detalles del vehículo
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Muesta los detalles del barco
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Muestra los detalles del tren. Ctrl + Click muestra su grupo
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Ver detalles del vehículo. Ctrl+Clic muestra su grupo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Muestra los detalles del barco. Ctrl + Clic para mostrar su grupo
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Muesta los detalles de la aeronave
 
 ###length VEHICLE_TYPES
@@ -4670,54 +4703,56 @@ STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de ve
 STR_ORDER_SHIP_DEPOT                                            :Astillero de barcos
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING}l hangar más cercano
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING}l {STRING} más cercano
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
-STR_ORDER_REFIT_ORDER                                           :(Reformar a {STRING})
-STR_ORDER_REFIT_STOP_ORDER                                      :(Reformar a {STRING} y detenerse)
-STR_ORDER_STOP_ORDER                                            :(Detenerse)
+STR_ORDER_REFIT_ORDER                                           :{SPACE}(Reformar a {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Reformar a {STRING} y detenerse)
+STR_ORDER_STOP_ORDER                                            :{SPACE}(Detenerse)
 
-STR_ORDER_WAIT_TO_UNBUNCH                                       :(Esperar para distanciarse)
+STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(Esperar para distanciarse)
 
 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION}
 STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION                       :{PUSH_COLOUR}{RED}(No puede usar la estación){POP_COLOUR} {STRING} {STATION}
 
-STR_ORDER_IMPLICIT                                              :(Implícita)
+STR_ORDER_IMPLICIT                                              :{SPACE}(Implícita)
 
-STR_ORDER_FULL_LOAD                                             :(Carga completa)
-STR_ORDER_FULL_LOAD_ANY                                         :(Carga completa cualquier carga)
-STR_ORDER_NO_LOAD                                               :(Sin carga)
-STR_ORDER_UNLOAD                                                :(Descargar y tomar carga)
-STR_ORDER_UNLOAD_FULL_LOAD                                      :(Descargar y esperar a carga completa)
-STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Descargar y esperar a cualquier carga completa)
-STR_ORDER_UNLOAD_NO_LOAD                                        :(Descargar y dejar vacío)
-STR_ORDER_TRANSFER                                              :(Transferir y tomar carga)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Transferir y esperar a carga completa)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Transferir y esperar a cualquier carga completa)
-STR_ORDER_TRANSFER_NO_LOAD                                      :(Transferir y dejar vacío)
-STR_ORDER_NO_UNLOAD                                             :(No descargar y tomar carga)
-STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(No descargar y esperar a carga completa)
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(No descargar y esperar a cualquier carga completa)
-STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(No descargar y no cargar)
+STR_ORDER_FULL_LOAD                                             :{SPACE}(Carga completa)
+STR_ORDER_FULL_LOAD_ANY                                         :{SPACE}(Carga completa cualquier carga)
+STR_ORDER_NO_LOAD                                               :{SPACE}(Sin carga)
+STR_ORDER_UNLOAD                                                :{SPACE}(Descargar y tomar carga)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :{SPACE}(Descargar y esperar a carga completa)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :{SPACE}(Descargar y esperar a cualquier carga completa)
+STR_ORDER_UNLOAD_NO_LOAD                                        :{SPACE}(Descargar y dejar vacío)
+STR_ORDER_TRANSFER                                              :{SPACE}(Transferir y cargar)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :{SPACE}(Transferir y esperar a carga completa)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :{SPACE}(Transferir y esperar a cualquier carga completa)
+STR_ORDER_TRANSFER_NO_LOAD                                      :{SPACE}(Transferir y dejar vacío)
+STR_ORDER_NO_UNLOAD                                             :{SPACE}(No descargar y tomar carga)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :{SPACE}(No descargar y esperar a carga completa)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :{SPACE}(No descargar y esperar a cualquier carga completa)
+STR_ORDER_NO_UNLOAD_NO_LOAD                                     :{SPACE}(No descargar y no cargar)
 
-STR_ORDER_AUTO_REFIT                                            :(Reforma a {STRING})
-STR_ORDER_FULL_LOAD_REFIT                                       :(Carga completa con reforma a {STRING})
-STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(Cualquier carga completa con reforma a {STRING})
-STR_ORDER_UNLOAD_REFIT                                          :(Descargar y tomar carga con reforma a {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Descargar y esperar carga completa con reforma a {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Descargar y esperar a cualquier carga completa con reforma a {STRING})
-STR_ORDER_TRANSFER_REFIT                                        :(Transferir y tomar carga con reforma a {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Transferir y esperar a carga completa con reforma a {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Transferir y esperar a cualquier carga completa con reforma a {STRING})
-STR_ORDER_NO_UNLOAD_REFIT                                       :(No descargar y tomar carga con reforma a {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(No descargar y esperar a carga completa con reforma a {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(No descargar y esperar a cualquier carga completa con reforma a {STRING})
+STR_ORDER_AUTO_REFIT                                            :{SPACE}(Reforma a {STRING})
+STR_ORDER_FULL_LOAD_REFIT                                       :{SPACE}(Carga completa con reforma a {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Cualquier carga completa con reforma a {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :{SPACE}(Descargar y tomar carga con reforma a {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :{SPACE}(Descargar y esperar carga completa con reforma a {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :{SPACE}(Descargar y esperar a cualquier carga completa con reforma a {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :{SPACE}(Transferir y cargar con reforma a {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :{SPACE}(Transferir y esperar a carga completa con reforma a {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :{SPACE}(Transferir y esperar a cualquier carga completa con reforma a {STRING})
+STR_ORDER_NO_UNLOAD_REFIT                                       :{SPACE}(No descargar y tomar carga con reforma a {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :{SPACE}(No descargar y esperar a carga completa con reforma a {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :{SPACE}(No descargar y esperar a cualquier carga completa con reforma a {STRING})
 
 STR_ORDER_AUTO_REFIT_ANY                                        :carga disponible
 
 ###length 3
-STR_ORDER_STOP_LOCATION_NEAR_END                                :[extremo cercano]
-STR_ORDER_STOP_LOCATION_MIDDLE                                  :[centro]
-STR_ORDER_STOP_LOCATION_FAR_END                                 :[extremo lejano]
+STR_ORDER_STOP_LOCATION_NEAR_END                                :{SPACE}[extremo cercano]
+STR_ORDER_STOP_LOCATION_MIDDLE                                  :{SPACE}[centro]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :{SPACE}[extremo lejano]
 
 STR_ORDER_OUT_OF_RANGE                                          :{RED} (El próximo destino está fuera de alcance)
 
@@ -4737,15 +4772,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horario
 STR_TIMETABLE_NO_TRAVEL                                         :No viajar
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viajar (automático; programado por la próxima orden manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (sin programar)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (sin programar) a {2:VELOCITY} como máximo
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (sin programar) a {VELOCITY} como máximo
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar durante {STRING} a {VELOCITY} como máximo
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajar (durante {STRING}, sin programar)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajar (durante {STRING}, sin programar) a {VELOCITY} como máximo
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(permanecer {STRING}, sin programar)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(viajar durante {STRING}, sin programar)
-STR_TIMETABLE_STAY_FOR                                          :y permanecer {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :y viajar durante {STRING}
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(permanecer {STRING}, sin programar)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viajar durante {STRING}, sin programar)
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}y permanecer {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}y viajar durante {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}El horario tardará aproximadamente {STRING} en recorrerse
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}El horario tardará {STRING} en recorrerse
@@ -4764,12 +4799,14 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Segundos hasta
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Modificar duración
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modifica la duración esperada de la orden seleccionada. Ctrl+clic establece la duración para todas las órdenes
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Cambiar duración
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Borrar duración
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Borra la duración de la orden resaltada.Ctrl+clic borra la duración de todas las órdenes
 
 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Modificar límite de velocidad
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Cambia el límite de velocidad de la orden resaltada. Ctrl+clic establece el límite para todas las órdenes
+STR_TIMETABLE_CHANGE_SPEED_QUERY                                :Cambiar límite de velocidad
 
 STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Borrar límite de velocidad
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Borra el límite de velocidad de la orden resaltada. Ctrl+clic borra el límite de todas las órdenes
@@ -4807,7 +4844,7 @@ STR_AI_DEBUG_SETTINGS                                           :{BLACK}Configur
 STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Cambiar la configuración del script
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recargar IA
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Elimina la IA, recarga el código y reinicia la IA
-STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Activa/desactiva la pausa automática cuando un mensaje de log de la IA coincide con la cadena de parada
+STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Activa/desactiva la pausa automática cuando un ,mensaje de registro de registro de la IA coincide con la cadena de parada
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Pausar con:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Pausar cuando el script registre esta cadena
 STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Cuando un mensaje de log de una IA coincide con esta cadena, el juego se pausa
@@ -4819,7 +4856,7 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Muestra
 STR_AI_GAME_SCRIPT                                              :{BLACK}Script de Juego
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Analizar el registro del script de juego. Ctrl+click para abrir en una nueva ventana
 
-STR_ERROR_AI_NO_AI_FOUND                                        :No se encontró ninguna IA apropiada para cargar.{}Ésta es una IA por defecto que no realiza acción alguna.{}Puedes descargar nuevas IA mediante el sistema de 'Contenido Online'
+STR_ERROR_AI_NO_AI_FOUND                                        :No se encontró ninguna IA apropiada para cargar.{}Ésta es una IA por defecto que no realiza acción alguna.{}Puedes descargar nuevas IA mediante el sistema de 'Contenido en línea'
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Uno de los scripts ejecutados ha fallado. Por favor, informa del fallo al autor del script con una captura de la ventana de depuración de script/IA
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}La ventana de depuración de scripts solo está disponible para el servidor
 
@@ -4862,8 +4899,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceptar
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Seleccionar el script resaltado
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No cambiar de script
 
 STR_SCREENSHOT_CAPTION                                          :Realizar captura de pantalla
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal
@@ -4874,9 +4909,8 @@ STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Mapa de
 STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimapa
 
 # Script Parameters
-STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}IA
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script de juego
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Cerrar
+STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parámetros de IA
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parámetros del script de juego
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reiniciar
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4936,7 +4970,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<no disponible>
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}La partida se guardó en una versión sin soporte para tranvías. Todos los tranvías han sido eliminados
 
 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generación de mapa abortada...{}... no hay localizaciones apropiadas para municipios
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generación de mapa abortada...{}{}... no hay localizaciones apropiadas para municipios
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... no hay municipios en el escenario
 
 STR_ERROR_PNGMAP                                                :{WHITE}No se pudo cargar mapa de alturas PNG...
@@ -4965,6 +4999,7 @@ STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}¡Captur
 
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Mensaje
+STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mensaje de {COMPANY}
 
 # Generic construction errors
 STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}Fuera del borde del mapa
@@ -4983,6 +5018,7 @@ STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... lím
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... límite de casillas despejadas alcanzado
 STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... limite de plantación de árboles alcanzado
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}El nombre debe ser único
+STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{STRING} en medio
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}No permitido en pausa
 
 # Local authority errors
@@ -5025,7 +5061,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... dema
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... demasiados municipios
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... no hay más espacio en el mapa
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Obras de carretera en progreso
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}No se puede borrar este municipio...{}Quedan estaciones o depósitos relacionados con él, o una propiedad suya no puede ser retirada
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}No se puede borrar este municipio...{}{}Quedan estaciones o depósitos relacionados con él, o una propiedad suya no puede ser retirada
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... no existe un lugar apropiado para una estatua en el centro de este municipio
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}No se puede construir edificio...
 
@@ -5299,8 +5335,16 @@ STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No se pu
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}No se puede vender la aeronave...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_SELL_ALL_TRAIN                                  :{WHITE}No se pueden vender todos los trenes...
+STR_ERROR_CAN_T_SELL_ALL_ROAD_VEHICLE                           :{WHITE}No se pueden vender todos los vehículos de carretera...
+STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}No se pueden vender todos los barcos...
+STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}No se pueden vender todas las aeronaves...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}No se pueden reemplazar automáticamente los trenes...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}No se pueden reemplazar automáticamente los vehículos de carretera...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}No se pueden reemplazar automáticamente los barcos...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}No se pueden reemplazar automáticamente las aeronaves...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Demasiados vehículos en el juego
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}No se puede cambiar intervalo de mantenimiento...
@@ -5844,6 +5888,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}kM
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}MM
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5882,3 +5927,12 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
+STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abrir la configuración de insignias
+STR_BADGE_CONFIG_RESET                                          :Restablecer
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Iconos de insignias
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtros de insignias
+STR_BADGE_CONFIG_PREVIEW                                        :Vista previa de imagen
+STR_BADGE_CONFIG_NAME                                           :Nombre
+STR_BADGE_FILTER_ANY_LABEL                                      :Cualquier {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} es {STRING}
diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt
index 70586b1c2f..0db8471bb6 100644
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -286,7 +286,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Cerrar v
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título de la ventana (arrastrar para mover)
 STR_TOOLTIP_SHADE                                               :{BLACK}Ocultar ventana (mostrar solo título)
 STR_TOOLTIP_DEBUG                                               :{BLACK}Mostrar información de depuración de NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Cambiar al tamaño por defecto de la ventana. Ctrl+Clic guarda el tamaño actual como nuevo tamaño por defecto
+STR_TOOLTIP_DEFSIZE                                             :Cambiar al tamaño por defecto de la ventana. Ctrl+Clic guarda el tamaño actual como nuevo tamaño por defecto
 STR_TOOLTIP_STICKY                                              :{BLACK}Excluir esta ventana de la función de la tecla "Cerrar todas las ventanas". Ctrl+Clic guarda esta preferencia como opción por defecto
 STR_TOOLTIP_RESIZE                                              :{BLACK}Arrastrar para cambiar el tamaño de esta ventana
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Cambiar entre tamaño de ventana grande o pequeño
@@ -445,7 +445,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Colocar edifici
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opciones de juego
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Configuración
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Configuración de IA
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Configuración de script de juego
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Configuración de NewGRF
@@ -960,22 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copiar u
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opciones de juego
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Elegir ajustes generales
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Elegir ajustes generales
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gráficos
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Elegir ajustes de gráficos
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Elegir ajustes de gráficos
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sonido
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Elegir ajustes de sonido y música
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Elegir ajustes de sonido y música
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Elegir ajustes de integración social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Elegir ajustes de integración social
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanzado
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Cambiar ajustes avanzados
 
 STR_GAME_OPTIONS_VOLUME                                         :Volumen
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efectos de sonido
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Divisa
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elegir divisa
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Divisas
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Elegir divisa
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letón
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portugués
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Grivna ucraniana
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Guardado automático
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Elegir el intervalo de guardados automáticos
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Guardado automático
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Elegir el intervalo de guardados automáticos
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Cada 30 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Cada 60 minutos
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Cada 120 minutos
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Idioma
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Elegir el idioma de la interfaz
+STR_GAME_OPTIONS_LANGUAGE                                       :Idioma
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Elegir el idioma de la interfaz
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completado)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantalla completa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Jugar OpenTTD en pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Jugar OpenTTD en pantalla completa
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolución de pantalla
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Elegir la resolución de pantalla
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolución de pantalla
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Elegir la resolución de pantalla
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Otra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}×{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aceleración por hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Intentar usar la aceleración por hardware. Se debe reiniciar el juego para que el cambio surta efecto
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aceleración por hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Intentar usar la aceleración por hardware. Se debe reiniciar el juego para que el cambio surta efecto
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Esta configuración solo tendrá efecto después de reiniciar el juego
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Sincronización vertical
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Activar la sincronización vertical de pantalla (v-sync). Se debe activar la aceleración por hardware y reiniciar el juego para que el cambio surta efecto
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Sincronización vertical
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Activar la sincronización vertical de pantalla (v-sync). Se debe activar la aceleración por hardware y reiniciar el juego para que el cambio surta efecto
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Controlador actual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador actual: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Tamaño de la interfaz
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arrastrar la barra para cambiar el tamaño de la interfaz. Ctrl y arrastrar para un ajuste más fino
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detectar automáticamente
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Detectar el tamaño de la interfaz automáticamente
+STR_GAME_OPTIONS_INTERFACE                                      :Interfaz
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Ajustar biseles
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Ajustar el tamaño de los biseles respecto a la interfaz
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Tamaño de la interfaz
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arrastrar la barra para cambiar el tamaño de la interfaz. Ctrl y arrastrar para un ajuste más fino
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detectar automáticamente
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Detectar el tamaño de la interfaz automáticamente
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usar la fuente sprite tradicional
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Preferir usar la fuente tradicional de sprite de tamaño fijo
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Fuentes suavizadas
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Suavizar las fuentes de tamaño adaptable
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Ajustar biseles
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Ajustar el tamaño de los biseles respecto a la interfaz
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usar la fuente sprite tradicional
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Preferir usar la fuente tradicional de sprite de tamaño fijo
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Fuentes suavizadas
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Suavizar las fuentes de tamaño adaptable
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Recopilación de datos
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Permitir recopilar datos
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Al activarse, OpenTTD enviará datos recopilados automáticamente al salir del juego
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Detalles e información de privacidad
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Ir a la página web con más información sobre la recopilación de datos automática (en inglés)
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Ver qué datos se enviarán
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostrar los datos recopilados del juego actual que se enviarán
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Recopilación de datos
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Permitir recopilar datos
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Al activarse, OpenTTD enviará datos recopilados automáticamente al salir del juego
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Detalles e información de privacidad
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ir a la página web con más información sobre la recopilación de datos automática (en inglés)
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Ver qué datos se enviarán
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostrar los datos recopilados del juego actual que se enviarán
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Gráficos
+STR_GAME_OPTIONS_DISPLAY                                        :Mostrar
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Frecuencia de actualización
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Elegir la frecuencia de actualización de la pantalla
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Frecuencia de actualización
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Elegir la frecuencia de actualización de la pantalla
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM} Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Las frecuencias mayores a 60 Hz pueden alterar el rendimiento.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Gráficos base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Elegir el paquete de gráficos base. Solo pueden cambiarse desde el menú principal
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre los gráficos base
+STR_GAME_OPTIONS_BASE_GRF                                       :Gráficos base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Elegir el paquete de gráficos base. Solo pueden cambiarse desde el menú principal
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Información adicional sobre los gráficos base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Sonidos base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Elegir el paquete de sonidos base. Solo pueden cambiarse desde el menú principal
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre los sonidos base
+STR_GAME_OPTIONS_BASE_SFX                                       :Sonidos base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Elegir el paquete de sonidos base. Solo pueden cambiarse desde el menú principal
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Información adicional sobre los sonidos base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Música base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Elegir música base
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Información adicional sobre música base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Música base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Elegir música base
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Información adicional sobre música base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Buscar contenido
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Revisar si hay contenido nuevo y actualizado para descargar
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no se han instalado plugins para integrar plataformas sociales)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(no se han instalado plugins para integrar plataformas sociales)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estado del plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estado del plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}En ejecución
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}No se pudo inicializar
@@ -1220,12 +1225,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permisiva (no a
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No se encontraron archivos de IA apropiados...{}{}Se pueden descargar por medio del sistema de 'Contenido en línea'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Configuración
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrar:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Desplegar todo
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Contraer todo
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restablecer todos los ajustes
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrar:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Desplegar todo
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Contraer todo
+STR_CONFIG_SETTING_RESET_ALL                                    :Restablecer todos los ajustes
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(sin explicación disponible)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor por defecto: {ORANGE}{STRING}
@@ -1238,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Opción de empr
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}¡Advertencia!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Esta acción restablecerá todos los ajustes del juego a sus valores originales.{}¿Deseas proceder?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoría:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restringir lista de opciones a los filtros predefinidos
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoría:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restringir lista de opciones a los filtros predefinidos
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Básico (mostrar solo las opciones más esenciales)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avanzado (mostrar la mayoría de las opciones)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Experto (mostrar todas las opciones, incluso las avanzadas)
@@ -1257,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Opciones de emp
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ninguno -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Mostrar todos los resultados por opción de configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Mostrar todos los resultados por opción de configuración{}{SILVER}Tipo {BLACK}a {WHITE}Todos los tipos de opción
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Mostrar todos los resultados por opción de configuración{}{SILVER}Categoría {BLACK}a {WHITE}{STRING} {BLACK}y {SILVER}Tipo {BLACK}a {WHITE}Todos los tipos de opción
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Mostrar todos los resultados por opción de configuración{}{PUSH_COLOUR}{SILVER}Categoría {POP_COLOUR}a {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Mostrar todos los resultados por opción de configuración{}{PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}a {WHITE}Todos los tipos de opción
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Mostrar todos los resultados por opción de configuración{}{PUSH_COLOUR}{SILVER}Categoría {POP_COLOUR}a {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}y {PUSH_COLOUR}{SILVER}Tipo {POP_COLOUR}a {WHITE}Todos los tipos de opción
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :No
@@ -2192,7 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no s
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... el controlador de GPU provocó una falla total en el juego. Se desactivó la aceleración por hardware
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nueva partida
 STR_INTRO_LOAD_GAME                                             :{BLACK}Cargar partida
@@ -2204,11 +2209,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijug
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opciones de juego
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabla de puntuaciones
 STR_INTRO_HELP                                                  :{BLACK}Ayuda y manuales
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Configuración
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configuración de NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenido en línea
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Configuración de IA
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Configuración de script de juego
 STR_INTRO_QUIT                                                  :{BLACK}Salir
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comenzar una nueva partida. Ctrl+Clic omite la configuración del mapa
@@ -2226,11 +2227,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Elegir m
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Abrir las opciones de juego
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Abrir tabla de puntuaciones
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Acceder a documentación y recursos en línea
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Abrir configuración
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Abrir configuración de NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Revisar si hay nuevos contenidos actualizados para descargar
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Abrir configuración de IA
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Abrir configuración de script de juego
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Salir de 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Los gráficos base elegidos necesitan {NUM} spirte{P "" s}. Revisa si hay actualizaciones para el paquete base.
@@ -3077,6 +3074,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Elegir e
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciudad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Las ciudades crecen más rápido que los pueblos{}Según la configuración del juego, al ser fundadas son más grandes
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansión del pueblo:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Edificios
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumentar edificios de los pueblos
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Carreteras
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumentar carreteras de los pueblos
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Diseño urbano:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Elegir el patrón de carreteras de este pueblo
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3526,15 +3529,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Guardar
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista de perfiles disponibles (elegir uno para copiar el nombre en el perfil inferior)
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Indicar un nombre para el perfil
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nombre del perfil a guardar
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Cancelar
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}No modificar el perfil
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Guardar
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Guardar el perfil con el nombre elegido
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Cambiar parámetros de gráficos base
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Cambiar parámetros de NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Cerrar
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Restablecer
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Restablecer todos los parámetros a sus valores predeterminados
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parámetro {NUM}
@@ -3703,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Cambiar
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Aumentar
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar la población del pueblo
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expandir edificios
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumentar edificios de los pueblos
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expandir carreteras
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumentar carreteras de los pueblos
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Eliminar
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Eliminar este pueblo completamente
 
@@ -4441,10 +4445,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Ver órd
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Ver órdenes de la aeronave. Ctrl+Clic muestra su horario
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Ver detalles del tren
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Ver detalles del vehículo
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Ver detalles del barco
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Ver detalles de la aeronave
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Ver detalles del tren. Ctrl+Clic muestra su grupo
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Ver detalles del vehículo. Ctrl+Clic muestra su grupo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Ver detalles del barco. Ctrl+Clic muestra su grupo
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Ver detalles de la aeronave. Ctrl+Clic muestra su grupo
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Acción actual del tren. Clic para arrancar o detener
@@ -4768,15 +4772,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horario.
 STR_TIMETABLE_NO_TRAVEL                                         :No viajar
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viajar (automático; programado según la siguiente instrucción manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (no programado)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (no programado) a {2:VELOCITY} como máximo
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (no programado) a {VELOCITY} como máximo
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar durante {STRING} a {VELOCITY} como máximo
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajar (durante {STRING}, no programado)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajar (durante {STRING}, no programado) a {VELOCITY} como máximo
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(esperar {STRING}, no programado)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viajar {STRING}, no programado)
-STR_TIMETABLE_STAY_FOR                                          :y esperar {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :y viajar {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}y esperar {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}y viajar {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}El horario tardará aproximadamente {STRING} en completarse
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}El horario tardará {STRING} en completarse
@@ -4895,8 +4899,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceptar
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Elegir el script marcado
-STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No cambiar de script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Tomar captura de pantalla
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura normal
@@ -4909,7 +4911,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parámetros de IA
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parámetros de script de juego
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Cerrar
 STR_AI_SETTINGS_RESET                                           :{BLACK}Restablecer parámetros
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5887,6 +5888,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mil mill.
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}bill.
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5926,3 +5928,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abrir la configuración de insignias
+STR_BADGE_CONFIG_RESET                                          :Restablecer
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Iconos de insignias
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtros de insignias
+STR_BADGE_CONFIG_PREVIEW                                        :Vista previa de imagen
+STR_BADGE_CONFIG_NAME                                           :Nombre
+STR_BADGE_FILTER_ANY_LABEL                                      :Cualquier {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} es {STRING}
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 6edc151078..b86abac9a4 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Stäng f
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Fönstertitel - dra för att flytta fönstret
 STR_TOOLTIP_SHADE                                               :{BLACK}Dölj fönster - Visa bara namnlisten
 STR_TOOLTIP_DEBUG                                               :{BLACK}Visa NewGRF felsökningsinformation
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Återställ fönstret till standardstorlek. Ctrl+Klick för att sätta nuvarande storlek som ny standard
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Återställ fönstret till standardstorlek. Ctrl+Klick för att sätta nuvarande storlek som ny standard. Dubbelklicka Ctrl+Klick för att återställa till sparad standard
 STR_TOOLTIP_STICKY                                              :{BLACK}Markera att fönstret ska lämnas öppet när 'Stäng alla fönster'-knappen används. Ctrl+klick för att spara som standardinställning
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klicka och dra för att förstora fönstret
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Växla stor/liten fönsterstorlek
@@ -349,7 +349,7 @@ STR_SORT_BY_WAITING_TOTAL                                       :Väntande gods
 STR_SORT_BY_WAITING_AVAILABLE                                   :Väntande gods tillgängligt
 STR_SORT_BY_RATING_MAX                                          :Högsta godsvärdering
 STR_SORT_BY_RATING_MIN                                          :Lägsta godsvärdering
-STR_SORT_BY_ENGINE_ID                                           :MotorID (klassisk sortering)
+STR_SORT_BY_ENGINE_ID                                           :FordonsID (klassisk sortering)
 STR_SORT_BY_COST                                                :Kostnad
 STR_SORT_BY_POWER                                               :Kraft
 STR_SORT_BY_TRACTIVE_EFFORT                                     :Dragkraft
@@ -443,19 +443,20 @@ STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :Generera städe
 STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Placera ut hus
 
 # Settings menu
-STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelinställningar
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Inställningar
-STR_SETTINGS_MENU_AI_SETTINGS                                   :Inställningar för AI
+STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelalternativ
+STR_SETTINGS_MENU_AI_SETTINGS                                   :AI-inställningar
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Spelskriptinställningar
-STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Inställningar för NewGRF
-STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Sandbox-inställningar
-STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Inställningar för genomskinlighet
+STR_SETTINGS_MENU_NEWGRF_SETTINGS                               : NewGRF-inställningar
+STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Sandlådealternativ
+STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Genomskinlighetsalternativ
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Stadsnamn visas
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Stationsnamn visas
 STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Tågstationer
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Lastbilshållplatser
 STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Busshållplatser
 STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Hamnar
 STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Flygplatser
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Spökstationer
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Riktmärken visas
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Skyltar visas
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Motståndarnas skyltar och namn visas
@@ -931,8 +932,8 @@ STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Öppna g
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_LIST                   :{WHITE}{STATION} accepterar inte längre: {CARGO_LIST}
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST                         :{WHITE}{STATION} accepterar nu: {CARGO_LIST}
 
-STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Subventionen har gått ut:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subventionen gäller inte längre:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad
+STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Erbjudanden subvention har gått ut:{}{}{STRING} från {STRING} till {STRING} kommer nu inte attrahera en subvention
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subventionen återkallad:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Subvention erbjuden:{}{}Första {STRING} från {STRING} till {STRING} kommer tilldelas en {UNITS_YEARS_OR_MINUTES}s subvention från de lokala myndigheterna!
 ###length 4
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Subvention tilldelad {STRING}!{}{}{STRING} från {STRING} till {STRING} kommer ge 50% extra utdelning nästkommande {UNITS_YEARS_OR_MINUTES}!
@@ -954,25 +955,29 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Byt huvu
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Kopiera denna vys position till huvudvyn
 
 # Game options window
-STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spelinställningar
+STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spelalternativ
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Allmänt
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Välj generella inställningar
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Välj generella inställningar
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Välj grafikinställningar
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Välj grafikinställningar
 STR_GAME_OPTIONS_TAB_SOUND                                      :Ljud
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Välj ljud- och musikinställningar
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Välj ljud- och musikinställningar
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Socialt
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Välj inställningar för social integration
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Välj socialintegrationsinställningar
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avancerade
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Ändra avancerade inställningar
 
 STR_GAME_OPTIONS_VOLUME                                         :Volym
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Ljudeffekter
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaenheter
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Välj valutaenhet
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valutaenheter
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Välj valutaenhet
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1023,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lettiska Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugisisk escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainsk hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Spara automatiskt
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Välj intervall mellan automatiskt sparande
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autospara
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Välj intervall för automatiskt sparande av spelet
 
 # Autosave dropdown
 ###length 5
@@ -1034,75 +1039,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Var 30:e minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Var 60:e minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Var 120:e minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Språk
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Välj vilket språk som ska användas
+STR_GAME_OPTIONS_LANGUAGE                                       :Språk
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Välj vilket språk som ska användas i gränssnittet.
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% färdigt)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Helskärm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kryssa i den här rutan för att spela OpenTTD i helskärmsläge
+STR_GAME_OPTIONS_FULLSCREEN                                     :Helskärm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Kryssa i den här rutan för att spela OpenTTD i helskärmsläge
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skärmupplösning
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Välj vilken skärmupplösning som ska användas
+STR_GAME_OPTIONS_RESOLUTION                                     :Skärmupplösning
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Välj vilken skärmupplösning som ska användas
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annan
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hårdvaruacceleration
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Markera denna rutan för att tillåta OpenTTD att försöka använda hårdvaruacceleration. Ändrad inställning kommer bara att gälla efter omstart.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hårdvaruacceleration
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Markera denna rutan för att tillåta OpenTTD att försöka använda hårdvaruacceleration. Ändrad inställning kommer bara att gälla efter omstart.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Inställningen kommer bara att gälla efter omstart av spelet
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Markera den här rutan för att v-synka skärmen. Ändringar i den här inställningen kommer bara att tillämpas vid omstart av spelet. Fungerar bara med hårdvaruacceleration aktiverad.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Markera den här rutan för att v-synka skärmen. Ändringar i den här inställningen kommer bara att tillämpas vid omstart av spelet. Fungerar bara med hårdvaruacceleration aktiverad.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nuvarande drivrutin: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Nuvarande drivrutin: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Gränssnittets storlek
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Dra i reglaget för att ställa in gränssnittets storlek. Ctrl+Drag för steglös justering
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Känn av storleken automatiskt
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Kryssa i den här rutan för automatisk inställning av gränssnittets storlek
+STR_GAME_OPTIONS_INTERFACE                                      :Gränssnitt
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skala bården
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Kryssa i den här rutan för att skala bården efter gränssnittets storlek
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Gränssnittets storlek
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Dra i reglaget för att ställa in gränssnittets storlek. Ctrl+Drag för steglös justering
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Känn av storleken automatiskt
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Kryssa i den här rutan för automatisk inställning av gränssnittets storlek
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Använd traditionellt sprite-typsnitt
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Kryssa i den här rutan om du föredrar att använda det traditionella sprite-typsnittet med fast storlek
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias-typsnitt
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Kryssa i den här rutan för anti-aliasing av typsnitt med justerbar storlek
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skala bården
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Kryssa i den här rutan för att skala bården efter gränssnittets storlek
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Använd traditionellt sprite-typsnitt
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Kryssa i den här rutan om du föredrar att använda det traditionella sprite-typsnittet med fast storlek
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias-typsnitt
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Kryssa i den här rutan för anti-aliasing av typsnitt med justerbar storlek
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatisk undersökning
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Delta i en automatisk undersökning
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Om aktiverat, kommer OpenTTD att skicka en enkät när du lämnar ett spel
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Om undersökning och integritet
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Detta öppnar en länk i webbläsaren med mer information om den automatiska undersökningen.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Förhandsgranska enkätresultat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Visa enkätresultatet från det nu pågående spelet
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatisk undersökning
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Delta i en automatisk undersökning
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Om aktiverat, kommer OpenTTD att skicka en enkät när du lämnar ett spel
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Om undersökning och integritet
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Detta öppnar en länk i webbläsaren med mer information om den automatiska undersökningen.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Förhandsgranska enkätresultat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Visa enkätresultatet från det nu pågående spelet
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafik
+STR_GAME_OPTIONS_DISPLAY                                        :Skärm
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Visa uppdateringsfrekvens
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Välj skärmens uppdateringsfrekvens
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Visa uppdateringsfrekvens
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Välj skärmens uppdateringsfrekvens
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}uppdateringsfrekvenser högre än 60Hz kan påverka prestandan.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikpaket som standard
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Välj vilket grafikpaket som ska användas som standard (kan ej ändras under spel, utan endast från huvudmenyn)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Ytterligare information om basgrafik-settet
+STR_GAME_OPTIONS_BASE_GRF                                       :Grundgrafikpaket
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Välj vilket grafikpaket som ska användas som standard (kan ej ändras under spel, utan endast från huvudmenyn)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Ytterligare information om grafikpaketet
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Grundljudspaket
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Välj vilket grundljudspaket som ska användas (kan inte ändras under spel, utan endast från huvudmenyn)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Ytterligare information om grundljudpaketet
+STR_GAME_OPTIONS_BASE_SFX                                       :Grundljudpaket
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Välj vilket ljudpaket som ska användas (kan inte ändras under spel, utan endast från huvudmenyn)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Ytterligare information om ljudpaketet
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Musikpaket valt
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Välj vilket musikpaket som ska användas
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Yttligare information om musikpaketet
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Grundmusikpaket
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Välj vilket musikpaket som ska användas
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Ytterligare information om musikpaketet
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Hämta innehåll
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Kontrollera om det finns nytt och uppdaterat innehåll att ladda ned
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(inga tillägg för att integrera med sociala plattformar installerade)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(inga tillägg för att integrera med sociala plattformar installerade)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plattform:
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Tilläggsstatus:
 
@@ -1217,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tillåtande (in
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ingen passande datorspelare finns tillgänglig...{}{}Du kan ladda ner ett flertal datorspelare via systemet för 'online-innehåll'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Inställningar
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Sökfilter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Utöka alla
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Stäng alla
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Återställ alla värden
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Sökfilter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Utöka alla
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Stäng alla
+STR_CONFIG_SETTING_RESET_ALL                                    :Återställ alla värden
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(ingen förklaring tillgänglig)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standardvärde: {ORANGE}{STRING}
@@ -1235,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Företagsinstä
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Varning!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Detta kommer att återställa alla spelinställningar till deras standardvärden.{}Är du säker på att du vill fortsätta?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typ:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Begränsar listan nedan med fördefinierade filter
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typ:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Begränsar listan nedan med fördefinierade filter
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grundläggande (visa endast viktiga inställningar)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avancerat (visa de flesta inställningarna)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (visa alla inställningar, inklusive de konstiga)
@@ -1254,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Företagsinstä
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Inga -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Visa alla sökresultat genom att sätta{}{SILVER}Kategori {BLACK}till {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Visa alla sökresultat genom att sätta{}{SILVER}Typ {BLACK}till {WHITE}Alla typer av inställningar
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Visa alla sökresultat genom att sätta{}{SILVER}Kategori {BLACK}till {WHITE}{STRING} {BLACK}och {SILVER}Typ {BLACK}till {WHITE}Alla typer av inställningar
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Visa alla sökresultat genom att sätta{}{PUSH_COLOUR}{SILVER}Kategori {POP_COLOUR}till {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Visa alla sökresultat genom att sätta{}{PUSH_COLOUR}{SILVER}Typ {POP_COLOUR}till {WHITE}Alla typer av inställningar
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Visa alla sökresultat genom att sätta{}{PUSH_COLOUR}{SILVER}Kategori {POP_COLOUR}till {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}och {PUSH_COLOUR}{SILVER}Typ {POP_COLOUR}till {WHITE}Alla typer av inställningar
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Av
@@ -2018,7 +2024,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Maximalt antal
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Antal icke-klistrade fönster som kan vara öppna innan gamla fönster börjar stängas automatiskt för att ge plats åt nya
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :avstängd
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Avstängd
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Maximal inzoomning: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Den maximala inzoomningsnivån för vyer. Tänk på att högre möjliga inzoomningsnivåer kräver högre minneskapacitet
@@ -2177,9 +2183,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :inkompatibel me
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :okänd
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... kompressionsnivån '{STRING}' är inte giltig
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... filformatet '{STRING}' är inte tillgängligt. Återgår till '{STRING}'
-STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignorerar grafikpaketet '{STRING}': hittades ej
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignorerar grundgrafikpaketet '{STRING}': hittades ej
 STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... ignorerar grundljudpaketet '{STRING}': hittades ej
-STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignorerar musikpaket '{STRING}': hittades ej
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignorerar grundmusikpaket '{STRING}': hittades ej
 STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}Slut på minne
 STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Allokerandet av {BYTES} till spritecachen misslyckades. Spritecachen begränsades till {BYTES}. Detta kommer att begränsa OpenTTD:s prestanda. För att minska minneskraven kan du försöka att inaktivera 32bpp-grafik och/eller antalet inzoomningsnivåer
 
@@ -2189,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... Inge
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU-drivrutinen kraschade spelet. Maskinvaruacceleration inaktiverad
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nytt spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Ladda spel
@@ -2198,14 +2205,10 @@ STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spela h
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scenarioeditor
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Flera spelare
 
-STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spelinställningar
+STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spelalternativ
 STR_INTRO_HIGHSCORE                                             :{BLACK}Bästa spelresultat
 STR_INTRO_HELP                                                  :Hjälp & Manualer
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Inställningar
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-inställningar
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online-innehåll
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI-inställningar
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Spelskriptinställningar
 STR_INTRO_QUIT                                                  :{BLACK}Avsluta
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Starta ett nytt spel. Ctrl+klick hoppar över landskapskonfigurationen
@@ -2220,17 +2223,13 @@ STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE                          :{BLACK}Välj 's
 STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE                        :{BLACK}Välj 'sub-tropiskt' som typ av landskap
 STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Välj 'leksaksland' som typ av landskap
 
-STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Öppna spelinställningar
+STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Öppna spelalternativ
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Öppna topplistan över de bästa spelresultaten
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Inhämta dokumentation och onlineresurser
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Öppna inställningar
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Öppna inställningar för NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Kolla efter nytt och nyuppdaterat innehåll för nedladdning
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Öppna inställningar för AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Öppna inställningar för spelskript
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Avsluta 'OpenTTD'
 
-STR_INTRO_BASESET                                               :{BLACK}Det grafikpaket som för närvarande är valt som standard saknar {NUM} sprite{P "" s}. Vänligen kontrollera om det finns en uppdatering till paketet.
+STR_INTRO_BASESET                                               :{BLACK}Det nuvarande valda grundgrafikpaketet saknar {NUM} sprite{P "" s}. Vänligen kontrollera om det finns en uppdatering till paketet.
 STR_INTRO_TRANSLATION                                           :{BLACK}Den här översättningen saknar {NUM} sträng{P "" ar}. Hjälp gärna till att förbättra OpenTTD genom att bli översättare. Se readme.txt för mer info.
 
 # Quit window
@@ -2259,7 +2258,7 @@ STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Rapporte
 STR_HELP_WINDOW_COMMUNITY                                       :{BLACK}Gemenskap
 
 # Cheat window
-STR_CHEATS                                                      :{WHITE}Sandbox-inställningar
+STR_CHEATS                                                      :{WHITE}Sandlådealternativ
 STR_CHEAT_MONEY                                                 :{LTBLUE}Öka pengar med {CURRENCY_LONG}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spelar som företag:: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldozer (ta bort industrier, oflyttbara objekt etc.): {ORANGE}{STRING}
@@ -2736,7 +2735,7 @@ STR_MISSING_GRAPHICS_ERROR                                      :{BLACK}Nedladdn
 STR_MISSING_GRAPHICS_ERROR_QUIT                                 :{BLACK}Avsluta OpenTTD
 
 # Transparency settings window
-STR_TRANSPARENCY_CAPTION                                        :{WHITE}Genomskinlighetsinställningar
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Genomskinlighetsalternativ
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Växla genomskinlighet för skyltar. Ctrl+klick för att låsa
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Växla genomskinlighet för träd. Ctrl+klick för att låsa
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Växla genomskinlighet för byggnader. Ctrl+klick för att låsa
@@ -2856,6 +2855,7 @@ STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}År: {OR
 STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}År: {ORANGE}Till {NUM}
 STR_HOUSE_PICKER_SIZE                                           :{BLACK}Storlek: {ORANGE}{NUM}x{NUM} rutor
 STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Accepterat gods: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Fraktgods producerat: {ORANGE}{CARGO_LIST}
 
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Gräns
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Utkanter
@@ -3073,6 +3073,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Välj st
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Storstäder växer snabbare än vanliga städer{}Beroende på inställningarna så är de större när de grundas
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Utformning av stadens vägnät:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Välj vägnätets utformning för denna stad
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3155,6 +3156,7 @@ STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gräs
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Fält
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Öken
 STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :Snötäckta stenblock
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :Snötäckt ojämn mark
 STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :Snötäckt gräs
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Järnvägsspår
@@ -3369,11 +3371,11 @@ STR_MAPGEN_VARIETY                                              :{BLACK}Varierad
 STR_MAPGEN_GENERATE                                             :{WHITE}Generera
 STR_MAPGEN_GENERATE_TOOLTIP                                     :{BLACK}Skapa världen och spela OpenTTD!
 STR_MAPGEN_NEWGRF_SETTINGS                                      :{BLACK}NewGRF-inställningar
-STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP                              :{BLACK}Öppna inställningar för NewGRF
-STR_MAPGEN_AI_SETTINGS                                          :{BLACK}Inställningar för AI
-STR_MAPGEN_AI_SETTINGS_TOOLTIP                                  :{BLACK}Öppna inställningar för AI
-STR_MAPGEN_GS_SETTINGS                                          :{BLACK}Inställningar för spelskript
-STR_MAPGEN_GS_SETTINGS_TOOLTIP                                  :{BLACK}Öppna inställningar för spelskript
+STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP                              :{BLACK}Öppna NewGRF-inställningar
+STR_MAPGEN_AI_SETTINGS                                          :{BLACK}AI-inställningar
+STR_MAPGEN_AI_SETTINGS_TOOLTIP                                  :{BLACK}Öppna AI-inställningar
+STR_MAPGEN_GS_SETTINGS                                          :{BLACK}SpelskriptInställningar
+STR_MAPGEN_GS_SETTINGS_TOOLTIP                                  :{BLACK}Öppna spelskriptinställningar
 
 ###length 21
 STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH                           :Engelska (Original)
@@ -3521,15 +3523,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Spara f
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Lista över tillgängliga förinställningar, väljer man att kopiera den till spara namn nedan
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Skriv in ett namn
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Nuvarande valt namn för förinställningen att spara
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Avbryt
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ändra inte det förinställda
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Spara
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Spara den inställda till den nuvarande valda namnet
 
 # NewGRF parameters window
-STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Ändra parametrar för standardgrafiken
+STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Ändra parametrar för grafikpaketet
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Ändra NewGRF-parametrar
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Stäng
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Återställ
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Återställ alla parametrar till deras standardvärden
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -3628,16 +3627,16 @@ STR_NEWGRF_LIST_MISSING                                         :{RED}Saknade fi
 
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Beteendet hos NewGRF:en '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' kommer troligen orsaka desynkronisering och/eller krascher
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Power wagon-tillstånd för '{1:ENGINE}' ändrades utanför en depå
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Fordonslängd för '{1:ENGINE}' ändrades utanför en depå
-STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Kapaciteten ändrades för '{1:ENGINE}' utan att vara i depå eller anpassning
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Kraftförsörjning-vagn-tillstånd för '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' ändrades utanför en depå
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Fordonslängd för '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' ändrades utanför en depå
+STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Kapaciteten ändrades för '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' utan att vara i depå eller anpassning
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tåget '{VEHICLE}' som tillhör '{COMPANY}' har ogiltig längd. Detta orsakas förmodligen av problem med en NewGRF. Spelet kan desynkroniseras eller krascha
 
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' ger felaktig information
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Last-/återställningsinformationen för '{1:ENGINE}' skiljer sig från köplistan efter konstruktion. Detta kan leda till att automatisk förnyelse/uppgradering misslyckas med att anpassa fordonen/vagnarna korrekt
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' skapade en oändlig loop i en produktions-callback-funktion
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Last-/återställningsinformationen för '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' skiljer sig från köplistan efter konstruktion. Detta kan leda till att automatisk förnyelse/uppgradering misslyckas med att anpassa fordonen/vagnarna korrekt
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' skapade en oändlig loop i produktions-callback-funktionen
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Callback-funktion {1:HEX} returnerade ett okänt/ogiltligt resultat {2:HEX}
-STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' returnerade ogiltig lasttyp i produktions-callback vid {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' returnerade ogiltig lasttyp i produktions-callback vid {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<invalid cargo>
@@ -4414,9 +4413,9 @@ STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Skicka f
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Köp en kopia av tåget inklusive alla vagnar. Ctrl+Klick för att dela ordrar. Håll även in Shift för att endast visa uppskattad kostnad
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Köp en kopia av vägfordonet. Ctrl+Klick för att dela ordrar. Håll även in Shift för att endast visa uppskattad kostnad
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Köp en kopia av vägfordonet. Ctrl+klicka för att dela ordrar. Håll även in Shift för att endast visa uppskattad kostnad
 STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Köp en kopia av skeppet. Ctrl+Klick för att dela ordrar. Håll även in Shift för att endast visa uppskattad kostnad
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Köp en kopia av en flygfarkost. Ctrl+Klick för att dela ordrar. Håll även in Shift för att endast visa uppskattad kostnad
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Köp en kopia av en flygfarkost. Ctrl+klicka för att dela ordrar. Håll även in Shift för att endast visa uppskattad kostnad
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Tvinga tåg att fortsätta utan att vänta på signal
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Byt tågets riktning
@@ -4436,10 +4435,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Visa ske
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Visa flygplanets order. Ctrl+klick visar flygplanets tidtabell
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Visa tågdetaljer
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Visa vägfordonsdetaljer
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Visa skeppdetaljer
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Visa flygplan detaljer
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Visa tågdetaljer. Ctrl+klicka för att visa tågets grupp
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Visa vägfordonsdetaljer. Ctrl+klicka för att visa fordonets grupp
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Visa skeppsdetaljer. Ctrl+klicka för att visa skeppets grupp
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Visa flygplansdetaljer. Ctrl+klicka för att visa flygplanets grupp
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Aktuell tågåtgärd - Tryck för att stoppa/starta tåget
@@ -4763,15 +4762,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tidtabel
 STR_TIMETABLE_NO_TRAVEL                                         :Ingen resa
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Restid (automatisk; tidtabellen baseras på nästa manuella order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Restid (inte angiven)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Res (utan tidtabell) högst i {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Res (utan tidtabell) i högst {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Res i {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Res i {STRING} med högsta hastighet {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Resor (för {STRING}, ej schemalagd)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Resor (för {STRING}, ej schemalagd) med högst {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(stanna {STRING}, ej schemalagd)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(resor för {STRING}, ej schemalagd)
-STR_TIMETABLE_STAY_FOR                                          :och stanna i {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :och res i {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}och stanna i {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}och res i {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Den här tidtabellen kommer att ta ungefär {STRING} att slutföra
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Den här tidtabellen kommer att ta {STRING} att slutföra
@@ -4852,8 +4851,8 @@ STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ett av s
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Felsökning av datorspelare / spelskript är bara tillgänglig för servern
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION_AI                                        :{WHITE}Inställningar för AI
-STR_AI_CONFIG_CAPTION_GAMESCRIPT                                :{WHITE}Inställningar för spelskript
+STR_AI_CONFIG_CAPTION_AI                                        :{WHITE}AI-inställningar
+STR_AI_CONFIG_CAPTION_GAMESCRIPT                                :{WHITE}Spelskriptinställningar
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Spelskriptet som kommer att läsas in i nästa spel
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}Datorspelare som kommer att läsas in i nästa spel
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Mänsklig spelare
@@ -4890,8 +4889,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Acceptera
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Välj markerad datorspelare
-STR_AI_LIST_CANCEL                                              :{BLACK}Avbryt
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ändra inte datorspelare
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Ta en skärmdump
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Vanlig skärmdump
@@ -4904,7 +4901,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Skärmdu
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Parametrar för datorspelare
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Parametrar för spelskript
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Stäng
 STR_AI_SETTINGS_RESET                                           :{BLACK}Återställ
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4964,7 +4960,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<not available>
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spelet sparades i en version som ej stöder spårvagn. Alla spårvagnar har tagits bort
 
 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generering av kartan avbruten...{}... ingen lämplig plats för någon stad
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generering av kartan avbruten...{}{}... inga lämpliga platser för någon stad
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... det finns ingen stad i detta scenario
 
 STR_ERROR_PNGMAP                                                :{WHITE}Kan inte ladda landskap från PNG...
@@ -5055,7 +5051,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... för
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... för många städer
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... det finns ingen plats kvar på kartan
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vägarbete pågår
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kan inte ta bort den här staden...{}En station eller depå refererar till staden eller så kan inte en stadsägd ruta tas bort.
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kan inte ta bort den här staden...{}{}En station eller depå refererar till staden eller så kan inte en stadsägd ruta tas bort.
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... det finns ingen lämplig plats för en staty i stadens centrum
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}Kan inte bygga hus...
 
@@ -5335,6 +5331,10 @@ STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Kan inte
 STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Kan inte sälja alla flygplan...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Kan inte bytta ut järnvägsfordon...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Kan inte bytta ut vägfordon...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Kan inte bytta ut skepp...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Kan inte byta ut flygplan...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}För många fordon i spelet
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan inte ändra service-intervall...
@@ -5878,6 +5878,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}md
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}bn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index e65a5479a6..5ba32eb125 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -439,7 +439,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :வெளிய
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :விளையாட்டு விருப்ப பேரம்
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :அமைப்புகள்
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI அமைப்புகள்
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :விளையாட்டு ஸ்கிரிப்ட் அமைப்புகள்
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF அமைப்புகள்
@@ -916,21 +915,22 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}பி
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}ஆட்டத்தின் அமைப்புகள்
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :பொது
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}பொது அமைப்புகளைத் தேர்ந்தெடு
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :பொது அமைப்புகளைத் தேர்ந்தெடு
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :அசைவூட்டங்கள்
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}அசைவூட்ட அமைப்புகளைத் தேர்ந்தெடு
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :அசைவூட்ட அமைப்புகளைத் தேர்ந்தெடு
 STR_GAME_OPTIONS_TAB_SOUND                                      :ஒலி
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}ஒலி மற்றும் இசை அமைப்புகளைத் தேர்ந்தெடு
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :ஒலி மற்றும் இசை அமைப்புகளைத் தேர்ந்தெடு
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :சமூக
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}சமூக இணைப்பு அமைப்புகளைத் தேர்ந்தெடு
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :சமூக இணைப்பு அமைப்புகளைத் தேர்ந்தெடு
 
 STR_GAME_OPTIONS_VOLUME                                         :ஒலி அளவு
 STR_GAME_OPTIONS_SFX_VOLUME                                     :ஒலி விளைவுகள்
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :இசை
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}நாணய பிரிவுகள்
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}நாணய பிரிவு தேர்ந்தெடுத்தல்
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :நாணய பிரிவுகள்
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :நாணய பிரிவு தேர்ந்தெடுத்தல்
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -979,8 +979,8 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :இந்தோ
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :மலேசிய ரிங்கிட்டு
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :லாட்வியன் லாட்ஸ்
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}தானாக சேமி
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}தானியங்கி விளையாட்டு சேமிப்பு இடைவெளியைத் தேர்ந்தெடுக்கவும்
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :தானாக சேமி
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :தானியங்கி விளையாட்டு சேமிப்பு இடைவெளியைத் தேர்ந்தெடுக்கவும்
 
 # Autosave dropdown
 ###length 5
@@ -990,68 +990,68 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :ஒவ்வொ
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :ஒவ்வொரு 60 நிமிடத்திற்கும்
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :ஒவ்வொரு 120 நிமிடத்திற்கும்
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}மொழி
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}பயன்படுத்தப்போகும் மொழியினை தேர்ந்தெடு
+STR_GAME_OPTIONS_LANGUAGE                                       :மொழி
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :பயன்படுத்தப்போகும் மொழியினை தேர்ந்தெடு
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% நிறைவுற்றது)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}முழு படம்
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD-ஐ முழுத்திரையில் விளையாட இந்த கட்டத்தினை சொடுக்கவும்
+STR_GAME_OPTIONS_FULLSCREEN                                     :முழு படம்
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :OpenTTD-ஐ முழுத்திரையில் விளையாட இந்த கட்டத்தினை சொடுக்கவும்
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}திரையின் அளவு
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}திரை அளவினைத் தேர்ந்தெடுக்கவும்
+STR_GAME_OPTIONS_RESOLUTION                                     :திரையின் அளவு
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :திரை அளவினைத் தேர்ந்தெடுக்கவும்
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :மற்றவை
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}வன்பொருள் முடுக்கம்
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :வன்பொருள் முடுக்கம்
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}விளையாட்டு மறுதொடக்கம் செய்யப்பட்ட பிறகு மட்டுமே இந்த அமைப்பு நடைமுறைக்கு வரும்
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK} திரையை v-sync செய்ய இந்த சதுரத்தை குறிக்கவும். விளையாட்டு மறுதொடக்கம் செய்யப்பட்ட பிறகு மட்டுமே இந்த அமைப்பின் மாற்றம் பொருந்தும். வன்பொருள் முடுக்கமுடன் மட்டும் செயல்படும்.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            : திரையை v-sync செய்ய இந்த சதுரத்தை குறிக்கவும். விளையாட்டு மறுதொடக்கம் செய்யப்பட்ட பிறகு மட்டுமே இந்த அமைப்பின் மாற்றம் பொருந்தும். வன்பொருள் முடுக்கமுடன் மட்டும் செயல்படும்.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}தற்போதைய driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :தற்போதைய driver: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}அளவை தானாகக் கண்டறி
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scale bevels
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :அளவை தானாகக் கண்டறி
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}வழக்கப்பட்ட ஸ்ப்ரைட் எழுத்துருக்களை பயன்படுத்து
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}மாற்றுப்பெயர் எதிர்ப்பு எழுத்துருக்கள்
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}மறுஅளவிடக்கூடிய மாற்றுப்பெயர் எதிர்ப்பு எழுத்துருக்களுக்கு இந்தப் பெட்டியைத் தேர்வு செய்யவும்.
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scale bevels
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :வழக்கப்பட்ட ஸ்ப்ரைட் எழுத்துருக்களை பயன்படுத்து
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :மாற்றுப்பெயர் எதிர்ப்பு எழுத்துருக்கள்
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :மறுஅளவிடக்கூடிய மாற்றுப்பெயர் எதிர்ப்பு எழுத்துருக்களுக்கு இந்தப் பெட்டியைத் தேர்வு செய்யவும்.
 
 
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}தானியங்கி கணக்கெடுப்பு
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}தானியங்கி கணக்கெடுப்பில் சேர்
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}செயற்படுத்தினால், ஒரு ஆட்டத்தினை விட்டு வெளியேறும்போது OpenTTD ஒரு கணக்கெடுப்பினை அனுப்பும்
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}கணக்கெடுப்பு மற்றும் தனியுரிமை பற்றி தெரிந்து கொள்ள
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}இது, தானியக்க கணக்கெடுப்பின் கூடுதல் தகவல்களை ஒரு உலாவியில் திறக்கும்
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}கருத்துக்கணிப்பு முடிவினை முன்னோட்டமிடு
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}தற்போது ஓடிக்கொண்டிருக்கும் ஆட்டத்தின் கருத்துக்கணிப்பு முடிவினை காட்டு
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :செயற்படுத்தினால், ஒரு ஆட்டத்தினை விட்டு வெளியேறும்போது OpenTTD ஒரு கணக்கெடுப்பினை அனுப்பும்
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :கணக்கெடுப்பு மற்றும் தனியுரிமை பற்றி தெரிந்து கொள்ள
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :இது, தானியக்க கணக்கெடுப்பின் கூடுதல் தகவல்களை ஒரு உலாவியில் திறக்கும்
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :கருத்துக்கணிப்பு முடிவினை முன்னோட்டமிடு
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :தற்போது ஓடிக்கொண்டிருக்கும் ஆட்டத்தின் கருத்துக்கணிப்பு முடிவினை காட்டு
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}அசைவூட்டங்கள்
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}காட்சி புதுப்பிப்பு விகிதம்
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}காட்சி புதுப்பிப்பு விகிதத்தினைத் தேர்ந்திடு
+STR_GAME_OPTIONS_REFRESH_RATE                                   :காட்சி புதுப்பிப்பு விகிதம்
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :காட்சி புதுப்பிப்பு விகிதத்தினைத் தேர்ந்திடு
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}60Hz ஐ விட அதிகமான புதுப்பிப்பு விகிதங்கள் செயல்திறனை பாதிக்கலாம்.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}அடிப்படை அசைவூட்டம்
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}பயன்படுத்தப்போகும் அடிப்படை அசைவூட்டத்தினை தேர்ந்தெடுக்கவும்
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}அடிப்படை அசைவூட்டத்தினை பற்றிய கூடுதல் தகவல்
+STR_GAME_OPTIONS_BASE_GRF                                       :அடிப்படை அசைவூட்டம்
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :பயன்படுத்தப்போகும் அடிப்படை அசைவூட்டத்தினை தேர்ந்தெடுக்கவும்
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :அடிப்படை அசைவூட்டத்தினை பற்றிய கூடுதல் தகவல்
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}அடிப்படை ஒலிகள் தொகுப்பு
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}பயன்படுத்தப்போகும் அடிப்படை ஒலிகள் தொகுப்பினைத் தேர்ந்தெடுக்கவும்
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}அடிப்படை ஒலிகள் தொகுப்பு பற்றிய கூடுதல் தகவல்
+STR_GAME_OPTIONS_BASE_SFX                                       :அடிப்படை ஒலிகள் தொகுப்பு
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :பயன்படுத்தப்போகும் அடிப்படை ஒலிகள் தொகுப்பினைத் தேர்ந்தெடுக்கவும்
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :அடிப்படை ஒலிகள் தொகுப்பு பற்றிய கூடுதல் தகவல்
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}அடிப்படை இசைத் தொகுப்பு
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}பயன்படுத்தப்போகும் அடிப்படை இசைத் தொகுப்பினைத் தேர்ந்தெடுக்கவும்
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}அடிப்படை இசைத் தொகுப்பு பற்றிய கூடுதல் தகவல்கள்
+STR_GAME_OPTIONS_BASE_MUSIC                                     :அடிப்படை இசைத் தொகுப்பு
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :பயன்படுத்தப்போகும் அடிப்படை இசைத் தொகுப்பினைத் தேர்ந்தெடுக்கவும்
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :அடிப்படை இசைத் தொகுப்பு பற்றிய கூடுதல் தகவல்கள்
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no plugins to integrate with social platforms installed)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}மேடை:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin நிலை:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :மேடை:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Plugin நிலை:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}ஓடிக்கொண்டிருக்கிறது
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}தொடங்குவதில் தோல்வியடைந்தது
@@ -1163,12 +1163,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :அனுமத
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}பொருத்தமான AI கிடைக்கவில்லை...{}'ஆன்லைன் உள்ளடக்கம்' அமைப்பு வழியாக பல AIகளை தாங்கள் பதிவிறக்கம் செய்யலாம்
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}அமைப்புகள்
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}வடிகட்டி:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}அனைத்தையும் விரிவாக்கு
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}அனைத்தையும் மூடு
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}முன்னிருந்தமாதிரி அனைத்தையும் மாற்று
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :வடிகட்டி:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :அனைத்தையும் விரிவாக்கு
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :அனைத்தையும் மூடு
+STR_CONFIG_SETTING_RESET_ALL                                    :முன்னிருந்தமாதிரி அனைத்தையும் மாற்று
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(எந்த விவரமும் இல்லை)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}இயல்பான மதிப்பு: {ORANGE}{STRING}
@@ -1180,8 +1179,8 @@ STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :நிறுவ
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :நிறுவன அமைப்புகள் (பதிவு செய்யப்பட்டது; தற்போதைய நிறுவனத்தை மட்டுமே மாற்றும்)
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}இந்த செயல் அனைத்து விளையாட்டு அமைப்புகளையும் அவற்றின் இயல்புநிலை மதிப்புகளுக்கு மீட்டமைக்கும்.{}நீங்கள் நிச்சயமாக தொடர விரும்புகிறீர்களா??
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}பகுப்பு:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}வகை:
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :பகுப்பு:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :வகை:
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :அடிப்படை அமைப்புகளை மட்டுமே காட்டு
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :சிறப்பு அமைப்புகள்
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :அதிக / அனைத்து அமைப்புகள்
@@ -1968,7 +1967,6 @@ STR_VIDEO_DRIVER_ERROR                                          :{WHITE}வீ
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... இணைவொத்த GPU கிடைக்கவில்லை. வன்பொருள் முடுக்கம் செயலிழக்கப்பட்டுள்ளது
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}புதிய ஆட்டம்
 STR_INTRO_LOAD_GAME                                             :{BLACK}பழைய ஆட்டத்தினை ஏற்று
@@ -1980,11 +1978,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}பல
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}ஆட்டத்தின் அமைப்புகள்
 STR_INTRO_HIGHSCORE                                             :{BLACK}புள்ளிகள் பட்டியல்
 STR_INTRO_HELP                                                  :{BLACK}உதவி & கையேடுகள்
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}அமைப்புகள்
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF அமைப்புகள்
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}கோப்புகளை இணையத்தில் தேடு
-STR_INTRO_AI_SETTINGS                                           :{BLACK}செயற்கை நுண்ணறிவு அமைப்புகள்
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}விளையாட்டு ஸ்கிரிப்ட் அமைப்புகள்
 STR_INTRO_QUIT                                                  :{BLACK}வெளியேறு
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}புதிய ஆட்டத்தினைத் தொடங்கும். Ctrl+Click அழுத்தினால் வரைபட அமைப்புவடிவாக்கம் தவிர்க்கப்படும்
@@ -2002,11 +1996,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}'பொ
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}ஆட்ட அமைப்புகளைத் திற
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}புள்ளிகள் பட்டியலினைத் திற
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}ஆவணங்கள் மற்றும் இணைய ஆதாரங்களுக்கான அணுகலைப் பெறுங்கள்
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}அமைப்புகளைத் திற
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF அமைப்புகளைத் திற
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}பதிவிறக்கம் செய்ய புதிய மற்றும் புதுப்பிக்கப்பட்ட உள்ளடக்கத்தை பார்க்கவும்
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}AI அமைப்புகளைத் திற
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}விளையாட்டு ஸ்கிரிப்ட் அமைப்புகளைத் திற
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK} 'OpenTTD'ஐ விட்டு வெளியேறு
 
 STR_INTRO_BASESET                                               :{BLACK}தேர்ந்தெடுக்கப்பட்ட அடிப்படை வரைகலை தொகுப்பில் {NUM}{P படம் படங்கள்} காணவில்லை. தயவுசெய்து அடிப்படை வரைகலை தொகுப்பிற்கான மேம்படுத்தல்களுக்கு தேடவும்.
@@ -2738,6 +2728,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}நக
 STR_FOUND_TOWN_CITY                                             :{BLACK}மாநகரம்
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}மாநகரங்கள் சாதாரண நகரங்களைவிட வேகமாக வளரும்{}அமைப்புகளைப் பொருத்து அவை பெரியதாக அமையும்
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}நகரத்தின் சாலை அமைப்பு:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}இந்த நகரத்திற்கான சாலை அமைப்பினை தேர்ந்தெடு
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}அசல்
@@ -3145,13 +3136,10 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}இந்
 # NewGRF save preset window
 STR_SAVE_PRESET_CAPTION                                         :{WHITE}Preset-ஐ பதிவுசெய்
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Preset இற்கு ஒரு பெயரினை இடு
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}இரத்து செய்
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}முன்னமைக்கப்பட்டவற்றை மாற்றாதே
 STR_SAVE_PRESET_SAVE                                            :{BLACK}சேமி
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF குணாதிசயங்களை மாற்று
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}மூடு
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}முன்னிருந்தமை மாற்று
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}எல்லா குணாதிசயங்களையும் அதன் முதன்நிலையாக்கு
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :குணாதிசயம் {NUM}
@@ -4278,7 +4266,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}கா
 STR_TIMETABLE_NO_TRAVEL                                         :எந்த பயணமும் இல்லை
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :பயணம் (தானியங்கி; அடுத்த கால அட்டவணையில் மனிதனால் இயக்க)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :பயணம் (நேர அட்டவணை இடப்படாதது)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :அதிகபட்சமாக {2:VELOCITY} உடன் பயணிக்கவும் (கால அட்டவணையிடப்படவில்லை)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} காலத்திற்கு பயணி
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING} காலத்திற்கு பயணி, அதிகபட்ச வேகம் {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :பயணம் ({STRING}, நேர அட்டவணை இடப்படாதது)
@@ -4392,8 +4379,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}ஏற்றுக்கொள்
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}குறிக்கப்பட்ட வரிவடிவத்தினை தேர்ந்தெடு
-STR_AI_LIST_CANCEL                                              :{BLACK}இரத்து செய்
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}வரிவடிவத்தினை மாற்றாதே
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}ஒரு திரைப்பிடிப்பினை எடுக்கவும்
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}சாதாரண திரைப்பிடிப்பு
@@ -4406,7 +4391,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}சி
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :விளையாட்டு ஸ்கிரிப்ட்
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}மூடு
 STR_AI_SETTINGS_RESET                                           :{BLACK}முன்னிருந்தமாதிரி மாற்று
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/thai.txt b/src/lang/thai.txt
index 9ca6c250c1..dd630a1845 100644
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -389,7 +389,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :ออก
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :ตัวเลือกเกม
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :การตั้งค่า
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :กำหนดค่า NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :แถบเมนูตั้งค่าวัตถุโปร่งใส
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :แสดงชื่อเมือง
@@ -860,8 +859,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}ตั
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}หน่วยสกุลเงิน
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}การเลือกสกุลเงิน
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :หน่วยสกุลเงิน
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :การเลือกสกุลเงิน
 
 
 ###length 45
@@ -902,21 +902,21 @@ STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :ดอลลาร์ฮ่องกง
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :ริงกิตมาเลเซีย
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}บันทึกเกมอัตโนมัติ
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}เลือกระยะห่างระหว่างการบันทึกเกมอัตโนมัติแต่ละครั้ง
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :บันทึกเกมอัตโนมัติ
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :เลือกระยะห่างระหว่างการบันทึกเกมอัตโนมัติแต่ละครั้ง
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :ปิด
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}ภาษา
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}เลือกภาษาที่จะใช้
+STR_GAME_OPTIONS_LANGUAGE                                       :ภาษา
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :เลือกภาษาที่จะใช้
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}เต็มหน้าจอ
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}ทำเครื่องหมายที่ช่องนี้เพื่อเล่น OpenTTD fullscreen โหมด
+STR_GAME_OPTIONS_FULLSCREEN                                     :เต็มหน้าจอ
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :ทำเครื่องหมายที่ช่องนี้เพื่อเล่น OpenTTD fullscreen โหมด
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}ความละเอียดของหน้าจอ
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}เลือกความละเอียดของหน้าจอที่จะใช้
+STR_GAME_OPTIONS_RESOLUTION                                     :ความละเอียดของหน้าจอ
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :เลือกความละเอียดของหน้าจอที่จะใช้
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :อื่นๆ
 
 
@@ -928,20 +928,21 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :อื่นๆ
 
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}รีเฟรชเรทของหน้าจอ
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :รีเฟรชเรทของหน้าจอ
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}หากตั้งรีเฟรชเรทไว้มากกว่า 60Hz ขึ้นไป อาจมีผลต่อประสิทธิภาพของเกมได้
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}ตั้งค่า Graphic พื้นฐาน
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}เลือกและตั้งค่าฐานกราฟิกที่จะใช้
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}ข้อมูลเพิ่มเติมเกี่ยวกับชุดกราฟฟิคพื้นฐาน
+STR_GAME_OPTIONS_BASE_GRF                                       :ตั้งค่า Graphic พื้นฐาน
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :เลือกและตั้งค่าฐานกราฟิกที่จะใช้
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :ข้อมูลเพิ่มเติมเกี่ยวกับชุดกราฟฟิคพื้นฐาน
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}เลือกชุด Effect เสียงประกอบ
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}ปรับและเลือกเสียงที่จะใช้
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}ปรับข้อมูลเพิ่มเติมเกี่ยวกับโหมดเสียง
+STR_GAME_OPTIONS_BASE_SFX                                       :เลือกชุด Effect เสียงประกอบ
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :ปรับและเลือกเสียงที่จะใช้
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :ปรับข้อมูลเพิ่มเติมเกี่ยวกับโหมดเสียง
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}ชุดเพลงประกอบพื้นฐาน
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}เลือกเพลงประกอบพื้นฐานเพื่อใช้งาน
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}ข้อมูลเพิ่มเติมเกี่ยวกับชุดเพลงประกอบพื้นฐาน
+STR_GAME_OPTIONS_BASE_MUSIC                                     :ชุดเพลงประกอบพื้นฐาน
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :เลือกเพลงประกอบพื้นฐานเพื่อใช้งาน
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :ข้อมูลเพิ่มเติมเกี่ยวกับชุดเพลงประกอบพื้นฐาน
 
 
 
@@ -1044,11 +1045,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :อนุญา
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}ไม่มี AI ที่เหมาะสมปรากฎ...{}คุณสามารถดาวน์โหลด AI จากระบบ 'Online Content'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}การตั้งค่าในเกม
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}เติม string:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}ขยายทั้งหมด
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}ยุบลงทั้งหมด
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :เติม string:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :ขยายทั้งหมด
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :ยุบลงทั้งหมด
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(ไม่สามารถขยายได้)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}ค่าเริ่มต้น: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}ประเภทการตั้งค่า: {ORANGE}{STRING}
@@ -1060,9 +1060,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :ตั้งค
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}คำเตือน!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}การกระทำนี้จะล้างการตั้งค่าเกมเดิมของคุณ{} คุณแน่ใจหรือไม่ที่จะกระทำแบบนี้?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}หมวดหมู่:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}ชนิด:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}จำกัดรายการด้านล่างให้แสดงเฉพาะการตั้งค่าที่มีการเปลี่ยนแปลง
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :หมวดหมู่:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :ชนิด:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :จำกัดรายการด้านล่างให้แสดงเฉพาะการตั้งค่าที่มีการเปลี่ยนแปลง
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :ตั้งค่าพื้นฐาน
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :ตั้งค่าขั้นสูง
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :การตั้งค่าแบบผู้เชี่ยวชาญ / การตั้งค่าทั้งหมด
@@ -1875,7 +1875,6 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}กา
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... ไม่พบ GPU ที่รองรับ การเร่งฮาร์ดแวร์ถูกยกเลิกแล้ว
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}เริ่มเกมใหม่
 STR_INTRO_LOAD_GAME                                             :{BLACK}โหลดเกม
@@ -1886,8 +1885,6 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}เล
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}ตัวเลือกเกม
 STR_INTRO_HIGHSCORE                                             :{BLACK}ตารางคะแนนสูงสุด
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}ตั้งค่า
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}การตั้งค่า NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}ตรวจสอบเนื้อหาออนไลน์
 STR_INTRO_QUIT                                                  :{BLACK}ออก
 
@@ -1905,8 +1902,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}เล
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}แสดงตัวเลือกเกม
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}แสดงตารางคะแนนสูงสุด
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}การตั้งค่า หน้าจอ
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}แสดงการกำหนดค่า NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}ตรวจสอบเนื้อหาใหม่และการปรับปรุงสำหรับดาวโหลด
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}ออกจากเกม OpenTTD
 
@@ -2604,6 +2599,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}เล
 STR_FOUND_TOWN_CITY                                             :{BLACK}เมืองใหญ่
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}เมืองใหญ่ขยายตัวเร็วกว่าเมืองเล็ก{}เลือกค่านี้ เมืองที่สร้างจะใหญ่ขึ้นเมื่อสร้างใหม่
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}รูปแบบถนนของเมือง:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}เลือกรูปแบบถนนสำหรับเมืองนี้
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}ดั้งเดิม
@@ -2981,7 +2977,6 @@ STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}บั
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}เปลี่ยนแปลง NewGRF parameters
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}ปิด
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}ตั้งค่าใหม่
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}ตั้งค่าพารามิเตอร์ทุกตัวให้เป็นแบบค่าดั้งเดิม
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -4052,7 +4047,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}ตา
 STR_TIMETABLE_NO_TRAVEL                                         :ไม่มีการเดินทาง
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :เดินทาง (อัตโนมัติ; ตามตารางเวลาต่อไปที่ตั้งไว้)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :>>>ไปยังที่หมายถัดไป(ไม่ได้กำหนดเวลา)<<<
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :>>>ความเร็วไม่เกิน {2:VELOCITY} (ไม่มีกำหนดเวลา)<<<
 STR_TIMETABLE_TRAVEL_FOR                                        :เวลาในการเดินทางคือ {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :เวลาในการเดินทางคือ {STRING} ความเร็วสูงสุดไม่เกิน {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :ตารางการเดินทาง (ของ {STRING}, ไม่ได้ถูกกำหนดเวลาไว้)
@@ -4161,15 +4155,12 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}ยืนยัน
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}เลือก script ที่ไฮไลท์ไว้
-STR_AI_LIST_CANCEL                                              :{BLACK}ยกเลิก
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}ไม่สามารถเปลี่ยน script
 
 STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}บันทึกหน้าจอของ Heightmap
 STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}จับภาพหน้าจอ มินิแมพ
 
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}ปิด
 STR_AI_SETTINGS_RESET                                           :{BLACK}เริ่มใหม่
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 8c849dc228..bea43ed6a3 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}關閉
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}視窗標題 - 點此拖曳可移動視窗
 STR_TOOLTIP_SHADE                                               :{BLACK}陰影視窗 - 只顯示標題列
 STR_TOOLTIP_DEBUG                                               :{BLACK}顯示 NewGRF 除錯資訊
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}將視窗改回預設大小。按下 Ctrl 鍵點選此掣則將視窗現時大小定為預設
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}將視窗改回預設大小。按住 <Ctrl> 鍵單擊點選此按鈕可將視窗現時大小設為預設。按住 <Ctrl> 鍵雙擊點選則可重設預設大小
 STR_TOOLTIP_STICKY                                              :{BLACK}標記此視窗使其不受「關閉所有視窗」掣影響。按住 Ctrl 鍵點選此掣以將選項定為常態
 STR_TOOLTIP_RESIZE                                              :{BLACK}點選並拖曳可縮放視窗大小
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}切換大／小視窗
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :設置房屋
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :遊戲選項
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :設定
 STR_SETTINGS_MENU_AI_SETTINGS                                   :AI 設定
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :遊戲腳本設定
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF 設定
@@ -715,7 +714,7 @@ STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK                        :{BLACK}跳至
 STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION               :{BLACK}跳至所選的下一首樂軌
 STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC                            :{BLACK}停止播放音樂
 STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC                           :{BLACK}開始播放音樂
-STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC                     :{BLACK}拖曳捲軸以設定背景音樂和音效的音量
+STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC                     :{BLACK}拖曳滑動以設定背景音樂和音效的音量
 STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM                     :{BLACK}選擇「全部音軌」播放清單
 STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC                        :{BLACK}選擇「舊格調」播放清單
 STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}選擇「新格調」播放清單
@@ -959,22 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}將主
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}遊戲選項
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :基本
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}選擇基本設定
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :選擇基本設定
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :圖形集
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}選擇圖形設定
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :選擇圖形設定
 STR_GAME_OPTIONS_TAB_SOUND                                      :音效
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}選擇音效及音樂設定
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :選擇音效及音樂設定
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :社交
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}選擇社交插件設定
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :選擇社交插件設定
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :進階
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :變更進階設定
 
 STR_GAME_OPTIONS_VOLUME                                         :音量
 STR_GAME_OPTIONS_SFX_VOLUME                                     :音效
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :音樂
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}：{ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}幣值單位
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}選擇幣值單位
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :幣值單位
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :選擇幣值單位
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1028,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :拉脫維亞勒
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :葡萄牙埃斯庫多
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :烏克蘭赫里夫尼亞
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}自動存檔
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}選擇自動存檔頻率
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :自動存檔
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :選擇自動存檔頻率
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :每30分鐘
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :每60分鐘
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :每120分鐘
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}語言
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}選擇要用的介面語言
+STR_GAME_OPTIONS_LANGUAGE                                       :語言
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :選擇界面語言
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING}（已完成 {NUM} ％）
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}全螢幕
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}勾選即可在全螢幕下玩 OpenTTD
+STR_GAME_OPTIONS_FULLSCREEN                                     :全螢幕
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :啟用後，即可在全螢幕下遊玩 OpenTTD
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}螢幕解析度
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}選擇螢幕解析度
+STR_GAME_OPTIONS_RESOLUTION                                     :螢幕解析度
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :選擇螢幕解析度
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :其他
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}硬體加速
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}勾選此方框以允許OpenTTD嘗試使用硬體加速。設定將會在遊戲重新啟動後套用
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :硬體加速
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :啟用後，允許 OpenTTD 嘗試使用硬體加速。設定將會在遊戲重新啟動後套用
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}修改的設定將會在遊戲重啟後生效
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}垂直同步
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}勾選此方框以啟用垂直同步 (V-SYNC)。此項設定將會在遊戲重啟後套用。只有在硬體加速存在時可用
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :垂直同步
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :啟用後，使用垂直同步 (V-SYNC)。此項設定將會在遊戲重啟後套用。只在使用硬體加速時可用
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}使用中的驅動程式：{STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :使用中的驅動程式：{STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}界面大小
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}拖曳滑動以設定界面大小。 按住 <Ctrl> 以調整至非整數之倍數
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}自動選取大小
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}勾選此方框以自動選取界面大小
+STR_GAME_OPTIONS_INTERFACE                                      :界面
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}縮放邊框
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}勾選此方框以令邊框隨界面大小而縮放
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :界面大小
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :拖曳滑動以設定界面大小。 按住 <Ctrl> 鍵以精準細緻調整
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :自動選取大小
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :啟用後，自動選取界面大小
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}使用傳統點陣式字體
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}勾選此方框以使用固定大小的傳統點陣式字體
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}反鋸齒字體
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}勾選此方框以使用反鋸齒字體
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :縮放邊框
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :啟用後，使邊框隨界面大小而縮放
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :使用傳統點陣式字體
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :啟用後，使用固定大小的傳統點陣式字體
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :反鋸齒字體
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :啟用後，使用反鋸齒字體
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}自動問卷
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}參與自動問卷
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}在啟用後，OpenTTD 將在離開遊戲時傳送調查資訊
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}關於問卷和隱私
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}這將會開啟瀏覽器給提供更多自動調查的資訊
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}預覽調查結果
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}顯示現正執行的遊戲調查結果
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :自動問卷調查
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :參與遊戲體驗自動問卷調查
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :啟用後，OpenTTD 將在離開遊戲時傳送問卷調查資訊
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :關於問卷和隱私
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :開啟瀏覽器以顯示更多有關遊戲體驗自動問卷調查的資訊
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :預覽調查結果
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :顯示現正執行的遊戲體驗問卷調查結果
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}圖形
+STR_GAME_OPTIONS_DISPLAY                                        :顯示
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}顯示畫面更新率
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}選擇畫面更新率
+STR_GAME_OPTIONS_REFRESH_RATE                                   :顯示畫面更新率
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :選擇畫面更新率
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}高於60Hz的畫面更新率可能會影響遊戲性能
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基本圖形集
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}選擇要使用的基本圖形集（無法在遊戲中更改，只能從主選單中更改）
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}關於基本圖形集的額外資訊
+STR_GAME_OPTIONS_BASE_GRF                                       :基本圖形集
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :選擇要使用的基本圖形集（無法在遊戲中更改，只能從主選單中更改）
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :關於基本圖形集的額外資訊
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}基本音效集
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}選擇要使用的基本音效集（無法在遊戲中更改，只能從主選單中更改）
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}關於基本音效集的額外資訊
+STR_GAME_OPTIONS_BASE_SFX                                       :基本音效集
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :選擇要使用的基本音效集（無法在遊戲中更改，只能從主選單中更改）
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :關於基本音效集的額外資訊
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}基本音樂集
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}選擇要使用的基本音樂集
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}關於基本音樂集的額外資訊
+STR_GAME_OPTIONS_BASE_MUSIC                                     :基本音樂集
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :選擇要使用的基本音樂集
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :關於基本音樂集的額外資訊
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :取得內容
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :檢查及下載最新內容
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}（沒有安裝社交平台擴充功能）
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :（沒有安裝社交平台擴充功能）
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}平台︰
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}擴充功能狀態︰
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING}（{STRING}）
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :平台：
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :擴充功能狀態：
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}正在執行
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}初始化失敗
@@ -1219,12 +1224,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :放任（所有
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}無適合的 AI 可供使用……{}{}您可以使用「線上擴充內容」功能下載更多的 AI
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}顯示設定
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}篩選：
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}展開所有選項
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}折疊所有選項
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}重設所有數值
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :篩選：
+STR_CONFIG_SETTING_EXPAND_ALL                                   :展開所有選項
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :折疊所有選項
+STR_CONFIG_SETTING_RESET_ALL                                    :重設所有數值
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(沒有適用的解釋)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}預設值：{ORANGE}{STRING}
@@ -1237,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :公司設定 (
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}注意！
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}此操作將會還原所有遊戲設定至預設狀態{}你確定要進行此操作嗎?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}篩選設定：
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}適用範圍：
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}限制以下列表僅顯示曾被更改的設定。
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :篩選設定：
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :適用範圍：
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :僅顯示所選擇的適用設定
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :基本 (僅顯示重要設定)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :進階 (顯示大部份設定)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :專業 (顯示所有設定)
@@ -1256,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :公司設定 (
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- 無 -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}在 {SILVER}篩選設定 {BLACK}一欄選擇 {WHITE}{STRING} {BLACK}以顯示所有搜尋結果
-STR_CONFIG_SETTING_TYPE_HIDES                                   :在 {SILVER}適用範圍 {BLACK}一欄選擇 {WHITE}所有適用範圍 {BLACK}以顯示所有搜尋結果
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}在 {SILVER}篩選設定 {BLACK}一欄選擇 {WHITE}{STRING} 並在 {SILVER}適用範圍 {BLACK}一欄選擇 {WHITE}所有適用範圍 {BLACK}以顯示所有搜尋結果
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :在{PUSH_COLOUR}{SILVER}篩選設定{POP_COLOUR}一欄選擇{PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR}以顯示所有搜尋結果
+STR_CONFIG_SETTING_TYPE_HIDES                                   :在{PUSH_COLOUR}{SILVER}適用範圍{POP_COLOUR}一欄選擇{PUSH_COLOUR}{WHITE}所有適用範圍{POP_COLOUR}以顯示所有搜尋結果
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :在{PUSH_COLOUR}{SILVER}篩選設定{POP_COLOUR}一欄選擇{PUSH_COLOUR}{WHITE}{STRING}{POP_COLOUR}並在{PUSH_COLOUR}{SILVER}適用範圍{POP_COLOUR}一欄選擇{PUSH_COLOUR}{WHITE}所有適用範圍{POP_COLOUR}以顯示所有搜尋結果
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :關
@@ -1485,7 +1489,7 @@ STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_SECONDARY            :初始公司副
 STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_SECONDARY_HELPTEXT   :選擇初始公司副色調，需使用支援副色調的 NewGRF
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :機場永不過期：{STRING}
-STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :如啟用此選項，所有機場一經面世，就永遠可以選擇建設。
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :啟用時，所有機場一經面世，即可永久地能夠選擇興建
 
 STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :當車輛走失時發出警告：{STRING}
 STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT                   :在車輛無法到達指令的目的地時觸發訊息。
@@ -1660,7 +1664,7 @@ STR_CONFIG_SETTING_SCROLLMODE_RMB                               :使用右鍵移
 STR_CONFIG_SETTING_SCROLLMODE_LMB                               :使用左鍵移動地圖
 
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :畫面平滑移動：{STRING}
-STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :設定在小地圖中點選一個位置時，主畫面的顯示反應。如啟用此選項，影像會移動直至到達點選的位置；否則影像會直接跳到點選的位置。
+STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :設定在小地圖中點選一個位置時，主畫面的顯示方式。啟用時，畫面會平緩移動到所點選的位置；否則畫面會直接跳到所點選的位置
 
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :使用某些建設工具時顯示度量提示：{STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT                     :當點選建造工具後拖曳滑鼠時，是否顯示兩端的方格距離及高度差異。
@@ -1694,7 +1698,7 @@ STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK_FOCUS            :單撳 (選定
 STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK                  :單撳 (立刻)
 
 STR_CONFIG_SETTING_USE_RELAY_SERVICE                            :使用中繼服務：{STRING}
-STR_CONFIG_SETTING_USE_RELAY_SERVICE_HELPTEXT                   :嘗試連結伺服器失敗時，玩家可以使用中繼伺服以建立連結。"關閉"禁止使用中繼伺服，"詢問"使用中繼伺服前先詢問，"打開"直接使用中繼伺服。
+STR_CONFIG_SETTING_USE_RELAY_SERVICE_HELPTEXT                   :嘗試連結伺服器失敗時，玩家可以使用中繼伺服以建立連結。「關閉」禁止使用中繼伺服，「詢問」使用中繼伺服前先詢問，「允許」直接使用中繼伺服
 ###length 3
 STR_CONFIG_SETTING_USE_RELAY_SERVICE_NEVER                      :永不
 STR_CONFIG_SETTING_USE_RELAY_SERVICE_ASK                        :詢問
@@ -1733,7 +1737,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :所有，除了
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :所有動作
 
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :使用進階車輛清單：{STRING}
-STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :啟用可以為車輛分組的進階車輛清單。
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :啟用進階車輛清單，以便為車輛分組
 
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :使用裝載進度指示：{STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT                  :選擇是否在車輛裝卸的時候顯示裝載狀況。
@@ -1974,13 +1978,13 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :隨機
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :市鎮可以興建道路：{STRING}
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT                    :此選項決定是否容許市鎮自行興建道路。
 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :允許市鎮建設平交道：{STRING}
-STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :啟用此選項以容許市鎮自行興建平交道。
+STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :啟用時允許市鎮興建平交道
 
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :根據噪音水平限制機場建造︰{STRING}
 STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT                         :允許市鎮根據其噪音接受水平限制機場興建，噪音接受程度取決於市鎮的人口以及機場的規模和距離。如果禁用此設置時，每座市鎮僅允許興建兩個機場，除非地方政府態度設置為「放任」
 
 STR_CONFIG_SETTING_TOWN_FOUNDING                                :於遊戲中興建新市鎮：{STRING}
-STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :如啟用此選項，玩家可自行興建新市鎮。
+STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :啟用時，允許玩家在遊戲中興建新市鎮
 ###length 3
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :禁止
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :允許
@@ -2084,7 +2088,7 @@ STR_CONFIG_SETTING_DEMAND_DISTANCE_HELPTEXT                     :如果您對此
 STR_CONFIG_SETTING_DEMAND_SIZE                                  :在對稱模式下產生的返程貨物比例：{STRING}
 STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT                         :如果把此值定於100%以下，到達一站的貨物不會全部被送回始發站。如果此設定的值為0%，則「對稱」分配模式的表現跟「不對稱」分配模式完全一樣
 
-STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :如果最短路徑的飽和度超過{STRING}，把貨物改派往容量較大的路徑
+STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :如果最短路徑的飽和度超過 {STRING}，把貨物改派往容量較大的路徑
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :貨物分配功能在派送貨物時，會優先使用最短路徑，至其飽和後改用第二短的路徑，如此類推。當所有路徑皆飽和但仍未滿足需求，系統會由容量較大的路徑開始繼續加載貨物。由於路徑飽和度難以準確估算，此設定容許您定義一值，使短路徑達至該飽和度後，系統便開始加載容量較大的路徑。如果此設定的值少於100%，即使系統高估路徑容量，也不會使過多的貨物滯留車站
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY                  :速度單位（陸地）：{STRING}
@@ -2191,7 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}……
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}……GPU 驅動程式導致遊戲崩潰。硬體加速已被停用
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}開新遊戲
 STR_INTRO_LOAD_GAME                                             :{BLACK}載入遊戲
@@ -2203,11 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}多人
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}遊戲選項
 STR_INTRO_HIGHSCORE                                             :{BLACK}積分排行榜
 STR_INTRO_HELP                                                  :{BLACK}幫助和手冊
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}設定
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF 設定
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}線上擴充內容
-STR_INTRO_AI_SETTINGS                                           :{BLACK}AI 設定
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}遊戲腳本設定
 STR_INTRO_QUIT                                                  :{BLACK}離開
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}開始新遊戲。按住 Ctrl 點選可跳過地圖設定畫面
@@ -2225,11 +2226,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}選擇
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}開啟遊戲選項
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}開啟積分排行榜
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}取得說明和線上資源
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}開啟設定
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}開啟 NewGRF 設定
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}檢查有無最新或可更新的內容可下載
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}開啟 AI 設定
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}開啟遊戲腳本設定
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}離開「OpenTTD」
 
 STR_INTRO_BASESET                                               :{BLACK}目前所選的基本圖形集缺少了 {NUM} 張貼圖。請確認基本圖形集是否有更新。
@@ -2253,7 +2250,7 @@ STR_HELP_WINDOW_DOCUMENTS                                       :{BLACK}文檔
 STR_HELP_WINDOW_README                                          :{BLACK}Readme
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}修訂紀錄
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}已知漏洞
-STR_HELP_WINDOW_LICENSE                                         :{BLACK}許可協議
+STR_HELP_WINDOW_LICENSE                                         :{BLACK}授權條款
 STR_HELP_WINDOW_FONTS                                           :{BLACK}字體
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}手冊／維基
@@ -2542,8 +2539,8 @@ STR_NETWORK_ASK_RELAY_NO                                        :{BLACK}否
 STR_NETWORK_ASK_RELAY_YES_ONCE                                  :{BLACK}是，僅此一次
 STR_NETWORK_ASK_RELAY_YES_ALWAYS                                :{BLACK}是，且不再詢問
 
-STR_NETWORK_ASK_SURVEY_CAPTION                                  :是否參與自動問卷？
-STR_NETWORK_ASK_SURVEY_TEXT                                     :您是否願意參加自動調查？{} OpenTTD 會在離開遊戲時傳送調查資訊。{}您可在任何時候於「遊戲選項」選單裡修改此項設定。
+STR_NETWORK_ASK_SURVEY_CAPTION                                  :是否參與遊戲體驗自動問卷調查？
+STR_NETWORK_ASK_SURVEY_TEXT                                     :您是否願意參加遊戲體驗自動問卷調查？{} OpenTTD 會在離開遊戲時傳送調查資訊。{}您可在任何時候於「遊戲選項」選單裡更改此項設定。
 STR_NETWORK_ASK_SURVEY_PREVIEW                                  :預覽調查結果
 STR_NETWORK_ASK_SURVEY_LINK                                     :關於問卷和隱私
 STR_NETWORK_ASK_SURVEY_NO                                       :否
@@ -3076,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}選擇
 STR_FOUND_TOWN_CITY                                             :{BLACK}城市
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}城市比普通城鎮成長的更快{}你可以從進階設定中調整城市的初始規模
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}市鎮擴展：
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :建築物
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :增建市鎮建築
+STR_FOUND_TOWN_EXPAND_ROADS                                     :道路
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :擴展市鎮道路
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}市鎮道路配置：
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}選擇這個市鎮使用的道路配置
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}原版
@@ -3525,15 +3528,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}儲存
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}現有的預設值名稱。點選一個預設值名稱，它會被複製到下方的輸入欄
 STR_SAVE_PRESET_TITLE                                           :{BLACK}輸入預設值名稱
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}預設值會儲存成現時選定的名稱
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}取消
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}請勿修改預設值
 STR_SAVE_PRESET_SAVE                                            :{BLACK}存檔
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}儲存預設值到選擇的名稱
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}變更基本圖形集參數
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}變更 NewGRF 參數
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}關閉
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}重設
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}將所有參數設為預設值
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :參數 {NUM}
@@ -3702,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}修改
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}擴展
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}擴大市鎮大小
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}擴展已發展區域
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}增建市鎮建築
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}擴展道路
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}擴展市鎮道路
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}刪除
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}完全刪除這個市鎮
 
@@ -4440,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}顯示
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}顯示飛機指令。 按住 Ctrl 點選可顯示飛機時刻表
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}顯示列車詳細資料
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}顯示車輛詳細資訊
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}顯示船舶詳細資料
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}顯示飛機詳細資料
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}顯示列車詳細資料。按住 <Ctrl> 點選可顯示列車群組
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}顯示車輛詳細資訊。按住 <Ctrl> 點選可顯示車輛群組
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}顯示船舶詳細資料。按住 <Ctrl> 點選可顯示船舶群組
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}顯示飛機詳細資料。按住 <Ctrl> 點選可顯示飛機群組
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}目前列車狀態 - 點擊以停止／起動列車
@@ -4766,20 +4770,20 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}時刻
 
 STR_TIMETABLE_NO_TRAVEL                                         :原地待命
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :行駛（自動；由下個手動指令排程）
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :行駛（無時刻表）
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :限速 {2:VELOCITY} 行駛（無時刻表）
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :行駛（未排程）
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :限速 {VELOCITY}（未排程）
 STR_TIMETABLE_TRAVEL_FOR                                        :行駛需時 {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :行駛 {STRING} ，限速 {VELOCITY}
-STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :開往（{STRING} ，無時刻表）
-STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :開往（{STRING} ，無時刻表）以最高速度 {VELOCITY}
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :（等候 {STRING} ，無時刻表）
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :（開往 {STRING} ，無時刻表）
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :行駛 {STRING}，限速 {VELOCITY}
+STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :行駛（{STRING}，未排程）
+STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :行駛（{STRING}，未排程），限速 {VELOCITY}
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :（等候 {STRING}，未排程）
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :（開往 {STRING} ，未排程）
 STR_TIMETABLE_STAY_FOR                                          :並等待 {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :並開往 {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :並行駛 {STRING}
 
-STR_TIMETABLE_APPROX_TIME                                       :{BLACK}此時刻表跑完全程大約需時 {STRING}
-STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}此時刻表跑完全程需時 {STRING}
-STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}此時刻表跑完全程至少需時 {STRING} (此表尚未完成)
+STR_TIMETABLE_APPROX_TIME                                       :{BLACK}完成此時刻表大約需時 {STRING}
+STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}完成此時刻表需時 {STRING}
+STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}完成此時刻表至少需時 {STRING} （時刻表尚未完成）
 
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}此車輛目前準點
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}此車輛目前比表定時間遲 {STRING}
@@ -4894,8 +4898,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL：{
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}接受
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}選擇標示到的腳本
-STR_AI_LIST_CANCEL                                              :{BLACK}取消
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}不改變腳本
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}螢幕截圖
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}普通截圖
@@ -4908,7 +4910,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}小地
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}AI 參數
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}遊戲腳本參數
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}關閉
 STR_AI_SETTINGS_RESET                                           :{BLACK}重設
 STR_AI_SETTINGS_SETTING                                         :{STRING}：{ORANGE}{STRING}
 
@@ -4926,7 +4927,7 @@ STR_TEXTFILE_VIEW_README_TOOLTIP                                :檢視此項目
 STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}修訂紀錄
 STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP                             :檢視此項目的更新日誌
 STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}授權條款
-STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :檢視此項目的許可證
+STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :檢視此項目的授權條款
 ###length 5
 STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING}{STRING}的 Readme
 STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING}{STRING}的修訂紀錄
@@ -5886,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}B
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5925,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}：{GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :開啟徽章設定
+STR_BADGE_CONFIG_RESET                                          :重設
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}徽章圖示
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}篩選徽章
+STR_BADGE_CONFIG_PREVIEW                                        :預覽圖
+STR_BADGE_CONFIG_NAME                                           :名稱
+STR_BADGE_FILTER_ANY_LABEL                                      :任何{STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING}：{STRING}
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index ed630e5de5..6068b4783d 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -267,6 +267,7 @@ STR_UNITS_MINUTES                                               :{NUM}{NBSP}daki
 STR_UNITS_YEARS                                                 :{NUM}{NBSP}yıl
 STR_UNITS_PERIODS                                               :{NUM}{NBSP}dönem{P "ler"}
 
+STR_LIST_SEPARATOR                                              :,{SPACE}
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}Filtre:
@@ -439,10 +440,11 @@ STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Editörden çı
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Oyundan Çık
 
+STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :Kasabalar Oluştur
+STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Ev Yerleştir
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Seçenekler
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Ayarlar
 STR_SETTINGS_MENU_AI_SETTINGS                                   :YZ ayarları
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Oyun betiği ayarları
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF ayarları
@@ -946,21 +948,22 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Bu gör
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Seçenekler
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Genel
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Genel ayarları seçin
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Genel ayarları seçin
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafikler
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Grafik ayarlarını seçin
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Grafik ayarlarını seçin
 STR_GAME_OPTIONS_TAB_SOUND                                      :Ses
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Ses ve müzik ayarlarını seçin
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Ses ve müzik ayarlarını seçin
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sosyal
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Sosyal entegre ayarlarını seçin
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Sosyal entegre ayarlarını seçin
 
 STR_GAME_OPTIONS_VOLUME                                         :Ses seviyesi
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Ses efektleri
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Müzik
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Para birimleri
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Para birimi seçimi
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Para birimleri
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Para birimi seçimi
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1010,8 +1013,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malezya Ringgit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Letonya Latsı
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portekiz Esküdosu
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Otomatik Kaydet
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Otomatik kaydetme sıklığını seçin
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Otomatik Kaydet
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Otomatik kaydetme sıklığını seçin
 
 # Autosave dropdown
 ###length 5
@@ -1021,74 +1024,74 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Her 30 dakikada
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Her 60 dakikada
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Her 120 dakikada
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Dil
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Görünen dili seçin
+STR_GAME_OPTIONS_LANGUAGE                                       :Dil
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Görünen dili seçin
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} (%{NUM} tamamlandı)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Tam ekran
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Tam ekran oynamak için bunu isaretleyin
+STR_GAME_OPTIONS_FULLSCREEN                                     :Tam ekran
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Tam ekran oynamak için bunu isaretleyin
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekran Çözünürlüğü
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Kullanılacak ekran çözünürlüğünü seçin
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekran Çözünürlüğü
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Kullanılacak ekran çözünürlüğünü seçin
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :diğer
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Donanım hızlandırma
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}OpenTTD'nin donanım ivmesini kullanmayı denemesine izin vermek için bu kutuyu işaretleyin. Değiştirilmiş bir ayar sadece oyun yeniden başlatıldığında uygulanır
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Donanım hızlandırma
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :OpenTTD'nin donanım ivmesini kullanmayı denemesine izin vermek için bu kutuyu işaretleyin. Değiştirilmiş bir ayar sadece oyun yeniden başlatıldığında uygulanır
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Ayar sadece oyun yeniden başlatıldığında uygulanır
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Dikey senkronizasyon'u aktif etmek için bu kutuyu işaretleyin. Değiştirilmiş bir ayar sadece oyun yeniden başlatıldığında uygulanır. Yalnızca donanım ivmesi aktifken çalışır
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Dikey senkronizasyon'u aktif etmek için bu kutuyu işaretleyin. Değiştirilmiş bir ayar sadece oyun yeniden başlatıldığında uygulanır. Yalnızca donanım ivmesi aktifken çalışır
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Geçerli sürücü: {STRING}
-
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Arayüz büyüklüğü
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arayüz büyüklüğünü ayarlamak için kaydırın. Sürekli ayarlama için Ctrl tuşunu basılı tutun
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Büyüklüğü otomatik algıla
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Arayüz boyutunu otomatik ayarlamak için bu kutucuğu işaretleyin
-
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Eğimi ayarla
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Eğimi arayüz boyutuna göre ayarlamak için bu kutucuğu işaretleyin
-
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK} Geleneksel yazı tipini kullan
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Yazı tipini geleneksel sabit boyutlu haline döndürmek için bu kutucuğu işaretleyin
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Yazı tipi kenarlarını yumuşatma
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Yeniden boyutlandırılabilir yazı tiplerinin kenarlarını yumuşatmak için bu kutuyu işaretleyin
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Geçerli sürücü: {STRING}
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Otomatik anket
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Otomatik ankete katılın
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Etkinleştirildiğinde, OpenTTD bir oyundan çıkarken bir anket gönderir
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Anket ve gizlilik hakkında
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Bu, otomatik anket hakkında daha fazla bilgi içeren bir tarayıcı açar
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Anket sonucunu önizleyin
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mevcut çalışan oyunun anket sonucunu göster
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Arayüz büyüklüğü
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arayüz büyüklüğünü ayarlamak için kaydırın. Sürekli ayarlama için Ctrl tuşunu basılı tutun
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Büyüklüğü otomatik algıla
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Arayüz boyutunu otomatik ayarlamak için bu kutucuğu işaretleyin
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafikler
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Eğimi ayarla
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Eğimi arayüz boyutuna göre ayarlamak için bu kutucuğu işaretleyin
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Tazeleme oranını görüntüle
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Kullanılacak tazeleme oranını seç
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                : Geleneksel yazı tipini kullan
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Yazı tipini geleneksel sabit boyutlu haline döndürmek için bu kutucuğu işaretleyin
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Yazı tipi kenarlarını yumuşatma
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Yeniden boyutlandırılabilir yazı tiplerinin kenarlarını yumuşatmak için bu kutuyu işaretleyin
+
+
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Otomatik anket
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Otomatik ankete katılın
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Etkinleştirildiğinde, OpenTTD bir oyundan çıkarken bir anket gönderir
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Anket ve gizlilik hakkında
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Bu, otomatik anket hakkında daha fazla bilgi içeren bir tarayıcı açar
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Anket sonucunu önizleyin
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mevcut çalışan oyunun anket sonucunu göster
+
+
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Tazeleme oranını görüntüle
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Kullanılacak tazeleme oranını seç
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}60Hz'den yüksek tazeleme oranları performansı etkileyebilir.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Temel grafik kümesi
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kullanılacak temel grafik kümesini seçin  (oyun içinde değiştirlemez sadece ana menüde değiştirebilinir)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Temel grafik setiyle ilgili ilave bilgiler
+STR_GAME_OPTIONS_BASE_GRF                                       :Temel grafik kümesi
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Kullanılacak temel grafik kümesini seçin  (oyun içinde değiştirlemez sadece ana menüde değiştirebilinir)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Temel grafik setiyle ilgili ilave bilgiler
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Temel ses kümesi
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Kullanılacak temel ses kümesini seçin (oyun içinde değiştirlemez sadece ana menüde değiştirebilinir)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Temel ses kümesiyle ilgili ilave bilgiler
+STR_GAME_OPTIONS_BASE_SFX                                       :Temel ses kümesi
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Kullanılacak temel ses kümesini seçin (oyun içinde değiştirlemez sadece ana menüde değiştirebilinir)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Temel ses kümesiyle ilgili ilave bilgiler
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Temel müzik kümesi
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Kullanılacak temel müzik kümesini seçin
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Temel müzik hakkında daha fazla bilgi
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Temel müzik kümesi
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Kullanılacak temel müzik kümesini seçin
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Temel müzik hakkında daha fazla bilgi
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(yüklü sosyal platformlarla entegre edilecek eklenti yok)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Eklenti statüsü:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Eklenti statüsü:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Çalışıyor
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Başlatılamadı
@@ -1201,12 +1204,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :İzin verici (
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Uygun YZ'ler yok...{}'Çevrimiçi içerik' sistemiyle pek çok YZ indirebilirsiniz
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Ayarlar
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtre:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Tümünü genişlet
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Tümünü kısalt
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Tüm değerleri sıfırla
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtre:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Tümünü genişlet
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Tümünü kısalt
+STR_CONFIG_SETTING_RESET_ALL                                    :Tüm değerleri sıfırla
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(açıklama bulunmamaktadır)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Varsayılan değer: {ORANGE}{STRING}
@@ -1219,9 +1221,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Şirket ayarlar
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Dikkat!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Bu eylem tüm oyun ayarlarını varsayılan değerlerine sıfırlayacaktır.{}Devam etmek istediğine emin misin?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tür:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Aşağıdaki listeyi önceden tanımlı filtreler kullanarak sınırlandırır
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tür:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Aşağıdaki listeyi önceden tanımlı filtreler kullanarak sınırlandırır
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Temel (sadece önemli ayarları göster)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Gelişmiş (çoğu ayarı göster)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Uzman (garip olanlar dahil tüm ayarları göster)
@@ -1238,9 +1240,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Şirket ayarlar
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Hiçbiri -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Tüm arama sonuçlarını{}{SILVER}Kategoriyi {BLACK}{WHITE}{STRING} ayarlayarak göster
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Tüm arama sonuçlarını{}{SILVER}Türü {BLACK} {WHITE}Tüm ayar türleri olarak ayarlayarak göster
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Tüm arama sonuçlarını{}{SILVER}Kategoriyi {BLACK} {WHITE}{STRING} {BLACK}ve {SILVER}Türü {BLACK} {WHITE}Tüm ayar türleri olarak ayarlayarak göster
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Tüm arama sonuçlarını{}{SILVER}Kategoriyi {BLACK}{WHITE}{STRING} ayarlayarak göster
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Tüm arama sonuçlarını{}{SILVER}Türü {BLACK} {WHITE}Tüm ayar türleri olarak ayarlayarak göster
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Tüm arama sonuçlarını{}{SILVER}Kategoriyi {BLACK} {WHITE}{STRING} {BLACK}ve {SILVER}Türü {BLACK} {WHITE}Tüm ayar türleri olarak ayarlayarak göster
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Kapalı
@@ -2162,7 +2164,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... uyum
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU sürücüsü oyunu çökertti. Donanım hızlandırma devre dışı bırakıldı
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Yeni Oyun
 STR_INTRO_LOAD_GAME                                             :{BLACK}Oyun Yükle
@@ -2174,11 +2175,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Çok Oyu
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Seçenekler
 STR_INTRO_HIGHSCORE                                             :{BLACK}Puan Tablosu
 STR_INTRO_HELP                                                  :{BLACK}Yardım ve Kılavuzlar
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Ayarlar
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Ayarları
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Çevrimiçi İçeriği Kontrol Et
-STR_INTRO_AI_SETTINGS                                           :{BLACK}YZ Ayarları
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Oyun Betiği Ayarları
 STR_INTRO_QUIT                                                  :{BLACK}Çıkış
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Yeni oyuna başla. Ctrl+Tıklama harita ayarlamasını atlar.
@@ -2196,11 +2193,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}'Oyuncak
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Oyun ayarlarını aç
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Puan tablosunu aç
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Belgelere ve çevrimiçi kaynaklara erişin
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Ayarları aç
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF ayarlarını aç
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}İndirilecek yeni ve güncellenmiş içeriği kontrol et
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Yapay Zeka ayarlarını göster
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Oyun skripti (betiği) ayarlarını aç
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD' den çık
 
 STR_INTRO_BASESET                                               :{BLACK}Geçerli seçimdeki temel grafik setinin {NUM} örneği eksik. Lütfen temel setin güncellemelerini kontrol edin.
@@ -2800,12 +2793,14 @@ STR_PICKER_MODE_ALL                                             :Tümü
 STR_PICKER_MODE_ALL_TOOLTIP                                     :Tüm kategorilerdeki öğelerin görüntülenmesini aç/kapat
 STR_PICKER_MODE_USED                                            :Kullanılmış
 STR_PICKER_MODE_USED_TOOLTIP                                    :Yalnızca mevcut öğeleri göstermeyi aç/kapat
-STR_PICKER_MODE_SAVED                                           :Kaydedildi
+STR_PICKER_MODE_SAVED                                           :Kaydedilen
 STR_PICKER_MODE_SAVED_TOOLTIP                                   :Yalnızca kaydedilen öğeleri göstermeyi aç/kapat
 
 STR_PICKER_WAYPOINT_CLASS_TOOLTIP                               :Görüntülenecek bir yol noktası türünü seçin
 STR_PICKER_ROADSTOP_TRUCK_CLASS_TOOLTIP                         :Görüntülenecek bir kamyon istasyonu türünü seçin
 STR_PICKER_ROADSTOP_TRUCK_TYPE_TOOLTIP                          :İnşa edilecek bir tür kamyon istasyonu seçin. Kaydedilen öğelerde eklemek veya kaldırmak istiyorsanız Ctrl+Tık ile yapabilirsiniz.
+STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Görüntülemek için bir şehir bölgesi seçin
+STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Bir konut türü seçin. Kaydedilmiş öğelere eklemek veya kaldırmak için Ctrl+Tıklayın
 
 STR_HOUSE_PICKER_CAPTION                                        :Ev Seçimi
 STR_HOUSE_PICKER_NAME                                           :{BLACK}İsim: {ORANGE}{STRING}
@@ -3026,6 +3021,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Şehir b
 STR_FOUND_TOWN_CITY                                             :{BLACK}Şehir
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Şehirler normal kasabalardan daha hızlı büyürler{}Ayarlara göre değişmekle birlikte, ilk kurulduklarında daha büyük olurlar.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Kasaba yol yerleşimi:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Bu kasaba için kullanılacak yol yerleşimini seç
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Özgün
@@ -3097,6 +3093,8 @@ STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Tramvay
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Ray hız sınırı: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Yol hız sınırı: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Tramvay hız limiti: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}Kasaba yükseltilebilir: {LTBLUE}Evet
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}Kasaba yükseltilebilir: {LTBLUE}Hayır
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kayalar
@@ -3465,15 +3463,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Ön ayar
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Kullanılabilir ön ayarların listesi, aşağıdaki isimle kaydetmek üzere kopyalamak için birini seçin
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Ön ayar için bir isim girin
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Geçerli seçimdeki ön ayarın kaydedilmek için adı
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}İptal
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Ön ayarı değiştirme
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Kaydet
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Ön ayarı geçerli seçili isimle kaydet
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Temel grafik parametrelerini değiştirin
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}NewGRF parametrelerini değiştir
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Kapat
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Sıfırla
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Tüm parametreleri varsayılan değerlerine ata
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametre {NUM}
@@ -4697,7 +4692,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Zaman ç
 STR_TIMETABLE_NO_TRAVEL                                         :Sefer yok
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Yolculuk (otomatik; bir sonraki elle verilmiş talimat tarafından zamanlanır)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Gezi (zamanlı değil)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :En çok {2:VELOCITY} hız ile git (zaman tablosu yok)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} boyunca yol al
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING} boyunca en çok {VELOCITY} hız ile git
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Seyahat et ({STRING} için, hareket planı yok)
@@ -4821,8 +4815,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Kabul et
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vurgulanan betiği seç
-STR_AI_LIST_CANCEL                                              :{BLACK}İptal
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Betiği değiştirme
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Ekran görüntüsü al
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal ekran görüntüsü
@@ -4835,7 +4827,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Küçük
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :YZ
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Oyun Betiği
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Kapat
 STR_AI_SETTINGS_RESET                                           :{BLACK}Yeniden başlat
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -4984,6 +4975,7 @@ STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... hari
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Yol çalışmaları
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Bu kasaba silinemiyor...{}Bir istasyon veya garaj kasabaya atıfta bulunuyor ya da bir kasaba karesi kaldırılamıyor
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... bu şehrin merkezinde heykel için uygun bir yer yok
+STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}Bina inşa edilemez...
 
 # Industry related errors
 STR_ERROR_TOO_MANY_INDUSTRIES                                   :{WHITE}... çok fazla fabrika var
@@ -5060,6 +5052,7 @@ STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Buraya 
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Yerimi adı değiştirilemedi...
 
 STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Tren yerimi kaldırılamaz...
+STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}yol yerimi kaldırılamaz....
 STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Önce demiryolu yerimi kaldırılmalı
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... yolda şamandıra var
 STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... şamandıra başka bir şirket tarafından kullanılıyor!
@@ -5250,8 +5243,16 @@ STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Gemi sat
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Uçak satılamıyor...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_SELL_ALL_TRAIN                                  :{WHITE}Tüm demiryolu araçları satılamaz...
+STR_ERROR_CAN_T_SELL_ALL_ROAD_VEHICLE                           :{WHITE}Tüm Karayolu Araçları satılamaz...
+STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Tüm gemiler satılamaz...
+STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :Tüm uçaklar satılamıyor...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Demiryolu araçları otomatik olarak değiştirilemiyor...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Karayolu araçları otomatik olarak değiştirilemiyor...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Gemiler otomatik olarak değiştirilemiyor...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Uçaklar otomatik değiştirılemiyor...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Oyunda çok fazla araç var
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Servis aralığı değiştirilemiyor...
@@ -5267,6 +5268,8 @@ STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION                 :{WHITE}{DATE_SH
 
 STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL                    :{WHITE}Kasabada inşa edilebilir yol türleri mevcut değil
 STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL_EXPLANATION        :{WHITE}NewGRF Yapılandırma Ayarlarını Değiştir
+STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET                       :{WHITE}Henüz inşa edilebilir şehir yol türü mevcut değil
+STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET_EXPLANATION           :{WHITE}Yeni oyuna başladıktan sonra {DATE_SHORT} veya önceden şehir inşa edilebilir yol türleri sağlayan bir NewGRF kullanın
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Tehlikedeki tren sinyali geçemez...
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 8be15c4433..5f26a2817c 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -400,6 +400,7 @@ STR_UNITS_PERIODS                                               :{NUM}{NBSP}пе
 STR_UNITS_PERIODS.d                                             :{NUM}{NBSP}періоди
 STR_UNITS_PERIODS.z                                             :{NUM}{NBSP}періодів
 
+STR_LIST_SEPARATOR                                              :,{SPACE}
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}Фільтр:
@@ -577,7 +578,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Розміще
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Налаштування гри
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Налаштування
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Налаштування ШІ
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Налаштування ігрового скрипту
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Налаштування NewGRF
@@ -756,14 +756,15 @@ STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Кіль
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Рейтинг продуктивності компанії (найбільший рейтинг=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Графік вартості компанії
 
+STR_GRAPH_LAST_24_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Останні 24 хвилини
 STR_GRAPH_LAST_72_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Останні 72 хвилини
 
 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Тарифи доставки вантажів
 STR_GRAPH_CARGO_PAYMENT_RATES_DAYS                              :{TINY_FONT}{BLACK}Днів у русі
 STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS                           :{TINY_FONT}{BLACK}Секунд у русі
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Плата за доставку 10 одиниць (або 10,000 літрів) вантажу на відстань 20 квадратів
-STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Включити всі
-STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Відключити усі
+STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Усі
+STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Нічого
 STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Показувати всі види вантажів на графіку
 STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Не показувати ніякі типи вантажів на графіку
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Ввімк/вимик графік типів вантажу
@@ -946,8 +947,8 @@ STR_SMALLMAP_INDUSTRY                                           :{TINY_FONT}{STR
 STR_SMALLMAP_LINKSTATS                                          :{TINY_FONT}{STRING}
 STR_SMALLMAP_COMPANY                                            :{TINY_FONT}{COMPANY}
 STR_SMALLMAP_TOWN                                               :{TINY_FONT}{WHITE}{TOWN}
-STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Вимкнути всі
-STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Показувати всі
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Нічого
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Усі
 STR_SMALLMAP_SHOW_HEIGHT                                        :{BLACK}Показати рельєф
 STR_SMALLMAP_SHOW_INDUSTRY_NAMES                                :{BLACK}Показати назви заводів
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES                     :{BLACK}Не показувати жодного виду підприємств на карті
@@ -1006,7 +1007,7 @@ STR_NEWS_COMPANY_MERGER_DESCRIPTION                             :{BIG_FONT}{BLAC
 STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLACK}БАНКРУТ!
 STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} була закрита кредиторами і все майно продане!
 STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}Засновано нову компанію!
-STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} починає звудення біля {TOWN}!
+STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} починає будувати біля {TOWN}!
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :Компанію {BIG_FONT}{BLACK}{STRING} агресивно захоплено компанією {STRING} з нерозголошеними витратами!
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Керівник)
 
@@ -1070,12 +1071,12 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST                         :{WHITE}{STATION
 
 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Субсидія більше не пропонується:{}{}Перевезення {STRING.r} з {STRING} до {STRING}
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Субсидію скасовано:{}{}Перевезення {STRING.r} з {STRING.r} до {STRING.r}
-STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Пропонується субсидія:{}{}компанії, яка першою привезе {STRING.z} з {STRING} до {STRING} платитимуть субсидію впродовж {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Пропонується субсидія:{}{}компанії, яка першою привезе {STRING.z} з {STRING} до {STRING} платитимуть субсидію {UNITS_YEARS_OR_MINUTES}!
 ###length 4
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Компанія {STRING} отримала субсидію!{}{}Перевезення {STRING.r} з {STRING} до {STRING} принесе додатково 50% впродовж {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Субсидію надано {STRING}!{}{}Перевезення {STRING.r} з {STRING} до {STRING} принесе вдвічі більше прибутків впродовж {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Компанія {STRING} отримала субсидію!{}{}Перевезення {STRING.r} з {STRING} до {STRING} принесе втричі більше прибутків впродовж {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}Компанія {STRING} отримала субсидію!{}{}Перевезення {STRING.r} з {STRING} до {STRING} принесе вчетверо більше прибутків впродовж {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Субсидію надано компанії {STRING}!{}{}Перевезення {STRING.r} з {STRING} до {STRING} принесе вдвічі більше прибутків впродовж {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Компанія {STRING} отримала субсидію!{}{}Перевезення {STRING.r} з {STRING} до {STRING} даватиме втричі більше прибутків {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}Компанія {STRING} отримала субсидію!{}{}Перевезення {STRING.r} з {STRING} до {STRING} даватиме вчетверо більше прибутків {UNITS_YEARS_OR_MINUTES}!
 
 STR_NEWS_ROAD_REBUILDING_MONTHS                                 :{BIG_FONT}{BLACK}Дорожній хаос у місті {TOWN}!{}{}Програма реконструкції міських доріг, яку профінансувала компанія {STRING}, спричинила 6 місяців страждань для автомобілістів!
 STR_NEWS_ROAD_REBUILDING_MINUTES                                :{BIG_FONT}{BLACK}Дорожній хаос у місті {TOWN}!{}{}Програма реконструкції міських доріг, яку профінансувала компанія {STRING}, спричинила 6 хвилин страждань для автомобілістів!
@@ -1094,22 +1095,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Пере
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Налаштування гри
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Загальні
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Виберіть загальні налаштування
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Виберіть загальні налаштування
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Графіка
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Виберіть налаштування графіки
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Виберіть налаштування графіки
 STR_GAME_OPTIONS_TAB_SOUND                                      :Звук
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Виберіть налаштування звуку та музики
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Виберіть налаштування звуку та музики
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Соціальні платформи
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Оберіть налаштування інтеграції соціальних мереж
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Оберіть налаштування інтеграції соціальних мереж
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Розширені
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Змінювати розширені налаштування
 
 STR_GAME_OPTIONS_VOLUME                                         :Гучність
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Звукові ефекти
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Музика
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Грошова одиниця
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Виберіть грошову одиницю
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Грошова одиниця
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Виберіть грошову одиницю
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1160,8 +1165,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Латвійс
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Португальське ескудо
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Українська гривня
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Автозбереження
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Виберіть інтервал автозбереження
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Автозбереження
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Виберіть інтервал автозбереження
 
 # Autosave dropdown
 ###length 5
@@ -1171,77 +1176,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Кожні 30 
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Кожні 60 хвилин
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Кожні 120 хвилин
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Мова
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Виберіть мову інтерфейса користувача
+STR_GAME_OPTIONS_LANGUAGE                                       :Мова
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Виберіть мову інтерфейса користувача
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% виконано)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Повноекранний режим
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Позначте цей прапорець для використання повноекранного режиму
+STR_GAME_OPTIONS_FULLSCREEN                                     :Повноекранний режим
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Позначте цей прапорець для використання повноекранного режиму
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Роздільна здатність екрана
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Виберіть, яку роздільну здатність екрана використовувати
+STR_GAME_OPTIONS_RESOLUTION                                     :Роздільна здатність екрана
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Виберіть, яку роздільну здатність екрана використовувати
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :інша
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Апаратне прискорення
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Позначте цей прапорець для використання апаратного прискорення. Зміни застосуються тільки після перезапуску гри
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Апаратне прискорення
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Позначте цей прапорець для використання апаратного прискорення. Зміни застосуються тільки після перезапуску гри
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Налаштування запрацює тільки після перезапуску гри
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Вертикальна синхронізація
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Позначте цей прапорець для використання вертикальної синхронізації. Зміни застосуються тільки після перезапуску гри. Працює лише за увімкненого апаратного прискорення
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Вертикальна синхронізація
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Позначте цей прапорець для використання вертикальної синхронізації. Зміни застосуються тільки після перезапуску гри. Працює лише за увімкненого апаратного прискорення
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Використовуваний драйвер: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Використовуваний драйвер: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Розмір інтерфейсу
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Потягніть повзунок для зміни розміру інтерфейсу. Ctrl+протягування для точнішого коригування
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Визначати розмір автоматично
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Позначте цей прапорець для того, щоби визначати розмір інтерфейсу автоматично
+STR_GAME_OPTIONS_INTERFACE                                      :Інтерфейс
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Масштабування рельєфних елементів
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Позначте цей прапорець для того, щоби масштабувати рельєфні елементи інтерфейсу
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Розмір інтерфейсу
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Потягніть повзунок для зміни розміру інтерфейсу. Ctrl+протягування для точнішого коригування
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Визначати розмір автоматично
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Позначте цей прапорець для того, щоби визначати розмір інтерфейсу автоматично
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Використовувати стандартний растровий шрифт
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Позначте цей прапорець для використання стандартних растрових шрифтів фіксованого розміру
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Згладжування шрифтів
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Позначте цей прапорець для того, щоби згладжувати шрифти змінних розмірів
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Масштабування рельєфних елементів
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Позначте цей прапорець для того, щоби масштабувати рельєфні елементи інтерфейсу
+
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Використовувати стандартний растровий шрифт
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Позначте цей прапорець для використання стандартних растрових шрифтів фіксованого розміру
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Згладжування шрифтів
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Позначте цей прапорець для того, щоби згладжувати шрифти змінних розмірів
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Автоматизований збір даних
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Брати участь в автоматизованому зборі даних
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Якщо увімкнено, OpenTTD передаватиме зібрані дані при виході з гри
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Про збір даних і приватність
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Відкриє переглядач з детальнішою інформацією про автоматичний збір даних
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Попередній перегляд збору даних
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Перегляд збору даних поточної гри
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Автоматизований збір даних
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Брати участь в автоматизованому зборі даних
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Якщо увімкнено, OpenTTD передаватиме зібрані дані при виході з гри
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Про збір даних і приватність
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Відкриє переглядач з детальнішою інформацією про автоматичний збір даних
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Попередній перегляд збору даних
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Перегляд збору даних поточної гри
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Графіка
+STR_GAME_OPTIONS_DISPLAY                                        :Показати
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Частота оновлення екрана
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Оберіть, яку частоту оновлення екрана використовувати
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Частота оновлення екрана
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Оберіть, яку частоту оновлення екрана використовувати
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Гц
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Частота оновлення екрана вища за 75 Гц може вплинути на швидкодію
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базовий набір графіки
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Оберіть, яку основну графіку використовувати (неможливо змінити у грі, тільки з головного меню)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Додаткова інформація про базовий набір графіки
+STR_GAME_OPTIONS_BASE_GRF                                       :Базовий набір графіки
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Оберіть, яку основну графіку використовувати (неможливо змінити у грі, тільки з головного меню)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Додаткова інформація про базовий набір графіки
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Базовий набір звуків
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Оберіть базовий набір звуків для використання (неможливо змінити у грі, тільки з головного меню)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Додаткова інформація про базовий набір звуків
+STR_GAME_OPTIONS_BASE_SFX                                       :Базовий набір звуків
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Оберіть базовий набір звуків для використання (неможливо змінити у грі, тільки з головного меню)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Додаткова інформація про базовий набір звуків
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Базовий музичний набір
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Оберіть базовий музичний набір для використання
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Допоміжна інформація про базовий музичний набір
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Базовий музичний набір
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Оберіть базовий музичний набір для використання
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Допоміжна інформація про базовий музичний набір
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Отримати контент
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Перевірте наявність нового та оновленого контенту для завантаження
 
-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(не встановлено додатків для інтеграції з соціальними платформами)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(не встановлено додатків для інтеграції з соціальними платформами)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Платформа:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Стан додатка:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Платформа:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Стан додатка:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Працює
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Не вдалося з'єднатися
@@ -1354,12 +1361,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :допусти
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Немає підходящих модулів ШІ...{}Ви можете завантажити різноманітні модулі ШІ через 'Додатковий контент'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Налаштування
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Фільтр:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Розгорнути всі
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Згорнути всі
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Скинути усі значення
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Фільтр:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Розгорнути всі
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Згорнути всі
+STR_CONFIG_SETTING_RESET_ALL                                    :Скинути усі значення
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(пояснення відсутнє)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Стандартне значення: {ORANGE}{STRING}
@@ -1372,9 +1378,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Налашту
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Обережно!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Це скине усі налаштування гри до базових значень.{}Дійсно продовжити?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Категорія:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Тип:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Показати лише відфільтровані налаштування
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Категорія:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Тип:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Показати лише відфільтровані налаштування
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Основні (показує лише найважливіші налаштування)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Розширені (показати основні налаштування)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Експертні / (показати всі налаштування, в тому числі незвичні)
@@ -1391,9 +1397,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Налашту
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- немає -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Показати всі результати пошуку встановивши{}{SILVER}Категорію {BLACK}на {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Показати всі результати пошуку встановивши{}{SILVER}Тип {BLACK}на {WHITE}Всі типи налаштувань
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Показати всі результати пошуку встановивши{}{SILVER}Категорію {BLACK}на {WHITE}{STRING} {BLACK}і {SILVER}Тип {BLACK}на {WHITE}Всі типи налаштувань
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Показати всі результати пошуку встановивши{}{SILVER}Категорію {BLACK}на {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Показати всі результати пошуку встановивши{}{SILVER}Тип {BLACK}на {WHITE}Всі типи налаштувань
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Показати всі результати пошуку встановивши{}{SILVER}Категорію {BLACK}на {WHITE}{STRING} {BLACK}і {SILVER}Тип {BLACK}на {WHITE}Всі типи налаштувань
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :ні
@@ -2064,7 +2070,8 @@ STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Ніколи
 
 STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Тип економіки: {STRING}
 ###length 2
-STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Плавна економіка здійснює часті зміни обсягів виробництва малими порціями. Заморожена економіка не допускає зміни обсягів виробництва і закриття підприємств. Це налаштування може не працювати, якщо використовуються підприємства з NewGRF.
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Плавна економіка здійснює часті зміни обсягів виробництва малими порціями. Заморожена економіка не допускає зміни обсягів виробництва і закриття підприємств. Це налаштування може не працювати, якщо використовуються підприємства з NewGRF.{}{}У замороженій економіці можлива зміна виробництва підприємствами за місяць, оскільки виробництво відбувається за фіксованими проміжками, не прив'язаними до місяців
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT_PERIOD                 :Плавна економіка здійснює часті зміни обсягів виробництва малими порціями. Заморожена економіка не допускає зміни обсягів виробництва і закриття підприємств. Це налаштування може не працювати, якщо використовуються підприємства з NewGRF.{}{}У замороженій економіці можлива зміна виробництва підприємствами за хвилину, оскільки виробництво відбувається за фіксованими проміжками, не прив'язаними до хвилин
 
 ###length 3
 STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Оригінальна
@@ -2153,7 +2160,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Максима
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Максимально допустима кількість незакріплених вікон. При відкритті нових вікон зверх вказаної кількості старі вікна будуть закриватися.
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :відключено
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Вимкнено
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Максимальний рівень наближення: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Максимальний рівень наближення. Зауважте, що більш високі рівні наближення потребують більше оперативної пам'яті.
@@ -2324,7 +2331,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... не
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... драйвер графічного процесора спричинив виліт гри. Відключено прискорення апаратного забезпечення
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Нова гра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Завантажити гру
@@ -2336,11 +2344,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Мере
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Налаштування гри
 STR_INTRO_HIGHSCORE                                             :{BLACK}Таблиця рекордів
 STR_INTRO_HELP                                                  :{BLACK}Допомога й довідка
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Налаштування
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Налаштування NewGRF
-STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Додатковий контент
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Налаштування ШІ
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Налаштування ігрового скрипту
+STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Мережевий вміст
 STR_INTRO_QUIT                                                  :{BLACK}Вихід
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Почати нову гру. Ctrl+клац мишею пропускає конфігурацію карти
@@ -2358,11 +2362,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Вибр
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Відкрити налаштування гри
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Відкрити таблицю рекордів
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Отримати доступ до довідки й мережевих ресурсів
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Показати налаштування
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Відкрити налаштування NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Перевірити доступний для завантаження додатковий контент
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Показати налаштування ШІ
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Відкрити налаштування ігрового скрипту
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Вийти з OpenTTD
 
 STR_INTRO_BASESET                                               :{BLACK}В обраному наборі базової графіки немає {NUM} спрайт{P а ів ів}. Будь ласка, оновіть набір графіки.
@@ -2387,6 +2387,7 @@ STR_HELP_WINDOW_README                                          :{BLACK}Інст
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Зміни
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Відомі збої
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Ліцензія
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Шрифти
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Довідка / Вікі
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Повідомити про помилку
@@ -2775,6 +2776,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH               :зачекай
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :виходжу...
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} приєднався до гри
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :{G=m}*** {STRING} приєднався до гри (Клієнт #{NUM})
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} приєднався до компанії {STRING}
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} став спостерігачем
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} заснував нову компанію (№{NUM})
 STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} покинув гру ({STRING})
@@ -2790,7 +2792,7 @@ STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}Серв
 STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL                   :{WHITE}Інші гравці не можуть приєднатися до твого сервера
 
 # Content downloading window
-STR_CONTENT_TITLE                                               :{WHITE}Завантаження вмісту
+STR_CONTENT_TITLE                                               :{WHITE}Мережевий вміст
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Тип
 STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Тип вмісту
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Назва
@@ -2979,7 +2981,7 @@ STR_PICKER_ROADSTOP_BUS_TYPE_TOOLTIP                            :Виберіт
 STR_PICKER_ROADSTOP_TRUCK_CLASS_TOOLTIP                         :Виберіть клас вантажної станції для відображення
 STR_PICKER_ROADSTOP_TRUCK_TYPE_TOOLTIP                          :Виберіть тип вантажної станції для побудови. Клацніть Ctrl+Клік, щоб додати або видалити зі списку збереженого
 STR_PICKER_OBJECT_CLASS_TOOLTIP                                 :Виберіть тип об’єкта для його відображення
-STR_PICKER_OBJECT_TYPE_TOOLTIP                                  :Виберіть тип об’єкта для побудови. Клацніть Ctrl+Клік, щоб додати або видалити зі списку збереженого. Ctrl+Клік+Протягніть, аби вибрати область по діагоналі. Утримуйте Shift для показу очікуваних витрат
+STR_PICKER_OBJECT_TYPE_TOOLTIP                                  :Виберіть тип об’єкта для побудови. Ctrl+клац, щоб додати або видалити зі списку збереженого. Ctrl+клац+протягування для виділення діагональної ділянки. Утримуйте Shift для показу очікуваних витрат
 STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Виберіть зону міста для відображення
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Виберіть тип споруди для побудови. Клацніть Ctrl+Клік, щоб додати або видалити зі списку збереженого
 
@@ -3037,6 +3039,7 @@ STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Вибе
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Вибір мосту - натисніть на міст, який бажаєте збудувати
 STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED                           :{GOLD}{STRING},{} {VELOCITY}
+STR_SELECT_BRIDGE_INFO_NAME_COST                                :{GOLD}{STRING},{} {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_INFO_NAME_MAX_SPEED_COST                      :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Підвісний сталевий
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Балочний сталевий
@@ -3095,7 +3098,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Вибе
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Спорудження водяної інфраструктури
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Водні шляхи
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Будування каналів. Утримуйте Shift для показу очікуваних витрат
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Будування каналів. Ctrl+клац+протягування для виділення клітинок по діагоналі. Утримання Shift покаже очікувані витрати
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Будування шлюзів. Утримуйте Shift для показу очікуваних витрат
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Побудова корабельних елінгів (для придбання та обслуговування кораблів). Утримуйте Shift для показу очікуваних витрат
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Будування доку. Ctrl+клац для приєднання додаткових доків. Утримуйте Shift для показу очікуваних витрат
@@ -3209,6 +3212,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Вибі
 STR_FOUND_TOWN_CITY                                             :{BLACK}Мегаполіс
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Мегаполіси ростуть швидше за звичайні міста{}Вони більші при заснуванні, якщо вказано у настройках
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Розширення міста:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Будівлі
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Збільшує кількість будівель у містах
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Дороги
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Збільшує кількість доріг у містах
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Тип сітки міських доріг:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Оберіть тип сітки доріг для цього міста:
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Стандартний
@@ -3447,6 +3456,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Збер
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Завантажити сценарій
 STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Завантажити ландшафт
 STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}Зберегти карту висот
+STR_SAVELOAD_LOAD_TOWN_DATA                                     :{WHITE}Завантажити налаштування міста
 STR_SAVELOAD_HOME_BUTTON_TOOLTIP                                :{BLACK}Натисніть для переходу до поточного каталогу збереження/завантаження
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} вільно
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Список пристроїв, каталогів і збережених файлів гри
@@ -3458,6 +3468,7 @@ STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Збер
 STR_SAVELOAD_LOAD_BUTTON                                        :{BLACK}Завантажити
 STR_SAVELOAD_LOAD_TOOLTIP                                       :{BLACK}Завантажити обрану гру
 STR_SAVELOAD_LOAD_HEIGHTMAP_TOOLTIP                             :{BLACK}Завантажити вибрану карту висот
+STR_SAVELOAD_LOAD_TOWN_DATA_TOOLTIP                             :{BLACK}Завантажує обрані налаштування міста
 STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Деталі гри
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Інформація відсутня
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
@@ -3653,15 +3664,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Збер
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Список доступних шаблонів, скопіюйте один для збереження імені нижче
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Введіть ім'я для шаблону
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Обране поточне ім'я для збереження в шаблоні
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Скасувати
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Не змінювати шаблон
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Зберегти
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Зберегти шаблон для поточного обраного імені
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Змінити параметри базового набору графіки
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Змінити параметри NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Закрити
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Очистити
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Встановити всім параметрам стандартні значення
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Параметр {NUM}
@@ -3759,17 +3767,17 @@ STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Зна
 STR_NEWGRF_LIST_MISSING                                         :{RED}Відсутні файли
 
 # NewGRF 'it's broken' warnings
-STR_NEWGRF_BROKEN                                               :{WHITE}Поведінка NewGRF '{0:STRING}' може спричинити розсинхронізацію та/або аварійне завершення
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Це змінило стан локомотиву '{1:ENGINE}', коли він не у депо
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Це змінило довжину транспорту для '{1:ENGINE}', якщо він не в депо
-STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Було змінено вантажомісткість транспорту для '{1:ENGINE}' поза гаражом чи рембазою
+STR_NEWGRF_BROKEN                                               :{WHITE}Поведінка NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}' може спричинити розсинхронізацію та/або аварійне завершення
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}Змінено стан моторвагону '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}', коли він не у депо
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Змінено довжину транспорту для '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}', якщо він не в депо
+STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}Вантажність транспорту змінено для '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' поза гаражем чи рембазою
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Потяг '{VEHICLE}', який належить '{COMPANY}', має неправильну довжину. Можливо, це спричинено проблемами з NewGRFs. Гра може розсинхронізуватись або аварійно завершитись
 
-STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' надає невірну інформацію
+STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{PUSH_COLOUR}{0:STRING}{POP_COLOUR}'  надає хибну інформацію
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Інформація про вантаж/переобладнання для '{1:ENGINE}' відрізняється від списку покупки після побудови. Це може спричинити невідповідності під час автооновлення/заміни
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' спричинив нескінченний цикл у виклику виробництва
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' спричинив нескінченний цикл у виклику виробництва
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Виклик {1:HEX} повернув невідомий/неправильний результат {2:HEX}
-STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}'повернув недійсний тип вантажу у виробничому зворотному режимі о {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' використовує недійсний тип вантажу на виклик виробництва у {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<невідомий вантаж>
@@ -3830,6 +3838,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Пере
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Розширити
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Збільшити розмір міста
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Додати будівель
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Збільшує кількість будівель у містах
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Розширити дороги
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Збільшує кількість доріг у місті
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Видалити
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Видалити місто повністю
 
@@ -4181,10 +4193,10 @@ STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} літак{P "" и ів}
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Поїзди - клацніть на поїзд для детальної інформації
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Авто - натисніть на авто для інформації
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Кораблі - натисніть для інформації
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Літаки - натисніть на літак для інформації
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Поїзди - клацніть на поїзд для детальної інформації. Утримання Ctrl+Shift додасть тип вантажу
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Авто - натисніть на авто для інформації. Утримання Ctrl+Shift додасть тип вантажу
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Кораблі - натисніть для інформації. Утримання Ctrl+Shift додасть тип вантажу
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Літаки - тицьніть на літак для інформації. Утримання Ctrl+Shift додасть тип вантажу
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :Доступні поїзди
@@ -4286,7 +4298,7 @@ STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Ціна
 STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}Ціна: {GOLD}{CURRENCY_LONG}{BLACK} (Вартість переобладнання: {GOLD}{CURRENCY_LONG}{BLACK}) Швидкість: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Місткість: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Потужність: {GOLD}+{POWER}{BLACK} Вага: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Може бути переобладнаним на: {GOLD}{STRING}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Можна переобладнати на: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Всі типи вантажів
 STR_PURCHASE_INFO_NONE                                          :Нема
 STR_PURCHASE_INFO_ENGINES_ONLY                                  :Тільки локомотиви
@@ -4568,10 +4580,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Пока
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Показати завдання літака. Ctrl+клац показує розклад літака
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показати детальну інформацію
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Показує детальну інформацію. Ctrl+клац показує групу потяга
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Показати авто детально
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показати корабель детально
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показати літак детально
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показує корабель детально. Ctrl+клац показує групу корабля
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показує докладний звіт про літак. Ctrl+клац показує групу літака
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Поточні дії потяга - натисніть для руху/зупинки потяга
@@ -4826,54 +4838,56 @@ STR_ORDER_ROAD_VEHICLE_DEPOT                                    :гараж
 STR_ORDER_SHIP_DEPOT                                            :док
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} в найближчий ангар
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} до найближчого {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
-STR_ORDER_REFIT_ORDER                                           :(Переобладнати до {STRING})
-STR_ORDER_REFIT_STOP_ORDER                                      :(Переобладнати на {STRING} і зупинити)
-STR_ORDER_STOP_ORDER                                            :(зупинити)
+STR_ORDER_REFIT_ORDER                                           :{SPACE}(Переобладнати на {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Переобладнати на {STRING} і зупинити)
+STR_ORDER_STOP_ORDER                                            :{SPACE}(зупинити)
 
-STR_ORDER_WAIT_TO_UNBUNCH                                       :(чекати на розподілення за інтервалом)
+STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(чекати на розподілення за інтервалом)
 
 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION}
 STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION                       :{PUSH_COLOUR}{RED}(Неможливо використати станцію){POP_COLOUR} {STRING} {STATION}
 
-STR_ORDER_IMPLICIT                                              :(Автоматично)
+STR_ORDER_IMPLICIT                                              :{SPACE}(Автоматично)
 
-STR_ORDER_FULL_LOAD                                             :(Завантажити все)
-STR_ORDER_FULL_LOAD_ANY                                         :(Повністю завантажити будь-який вид вантажу)
-STR_ORDER_NO_LOAD                                               :(Не завантажуватись)
-STR_ORDER_UNLOAD                                                :(Розвантажити і взяти вантаж)
-STR_ORDER_UNLOAD_FULL_LOAD                                      :(Розвантажитись і чекати повного завантаження)
-STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Розвантажитись і чекати повного завантаження будь-якого виду)
-STR_ORDER_UNLOAD_NO_LOAD                                        :(Розвантажитись і залишитись пустим)
-STR_ORDER_TRANSFER                                              :(Передати і взяти вантаж)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Передати і чекати повного завантаження)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Передати і чекати повного завантаження будь-якого виду)
-STR_ORDER_TRANSFER_NO_LOAD                                      :(Передати і залишитись пустим)
-STR_ORDER_NO_UNLOAD                                             :(Не розвантажуватись і взяти вантаж)
-STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Не розвантажуватись і чекати повного завантаження)
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Не розвантажуватись і чекати повного завантаження будь-якого виду)
-STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Не розвантажуватись і не завантажуватись)
+STR_ORDER_FULL_LOAD                                             :{SPACE}(Завантажити все)
+STR_ORDER_FULL_LOAD_ANY                                         :{SPACE}(Повністю завантажити будь-який вантаж)
+STR_ORDER_NO_LOAD                                               :{SPACE}(Не завантажуватись)
+STR_ORDER_UNLOAD                                                :{SPACE}(Розвантажити і взяти вантаж)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :{SPACE}(Розвантажитись і чекати повного завантаження)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :{SPACE}(Розвантажитись і чекати повного завантаження будь-якого виду)
+STR_ORDER_UNLOAD_NO_LOAD                                        :{SPACE}(Розвантажитись і залишитись пустим)
+STR_ORDER_TRANSFER                                              :{SPACE}(Передати і взяти вантаж)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :{SPACE}(Передати і чекати повного завантаження)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :{SPACE}(Передати і чекати повного завантаження будь-якого виду)
+STR_ORDER_TRANSFER_NO_LOAD                                      :{SPACE}(Передати і залишитись пустим)
+STR_ORDER_NO_UNLOAD                                             :{SPACE}(Не розвантажуватись і взяти вантаж)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :{SPACE}(Не розвантажуватись і чекати повного завантаження)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :{SPACE}(Не розвантажуватись і чекати повного завантаження будь-якого виду)
+STR_ORDER_NO_UNLOAD_NO_LOAD                                     :{SPACE}(Не розвантажуватись і не завантажуватись)
 
-STR_ORDER_AUTO_REFIT                                            :(Переобладнати в {STRING.z})
-STR_ORDER_FULL_LOAD_REFIT                                       :(Завантажити все з переобладнанням в {STRING})
-STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(Повністю завантажити будь-який вид вантажу з переобладнанням в {STRING})
-STR_ORDER_UNLOAD_REFIT                                          :(Розвантажити і взяти вантаж з переобладнанням в {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Розвантажитись і чекати повного завантаження вантажу з переобладнанням в {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Розвантажитись і чекати повного завантаження будь-якого вантажу з переобладнанням в {STRING})
-STR_ORDER_TRANSFER_REFIT                                        :(Передати і взяти вантаж з переобладнанням в {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Передати і чекати повного завантаження з переобладнанням в {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Передати і чекати повного завантаження будь-якого вантажу з переобладнанням в {STRING})
-STR_ORDER_NO_UNLOAD_REFIT                                       :(Не розвантажуватись і взяти вантаж з переобладнанням в {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(Не розвантажуватись і чекати повного завантаження з переобладнанням в {STRING})
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(Не розвантажуватись і чекати повного завантаження будь-якого вантажу з автопереобладнанням в {STRING})
+STR_ORDER_AUTO_REFIT                                            :{SPACE}(Переобладнати в {STRING.z})
+STR_ORDER_FULL_LOAD_REFIT                                       :{SPACE}(Завантажити все з переобладнанням в {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Повністю завантажити будь-який вантаж з переобладнанням в {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :{SPACE}(Розвантажити і взяти вантаж з переобладнанням на {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :{SPACE}(Розвантажитись і чекати повного завантаження з переобладнанням на {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :{SPACE}(Розвантажитись і чекати повного завантаження будь-якого вантажу з переобладнанням на {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :{SPACE}(Передати і взяти вантаж з переобладнанням на {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :{SPACE}(Передати і чекати повного завантаження з переобладнанням в {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :{SPACE}(Передати і чекати повного завантаження будь-якого вантажу з переобладнанням в {STRING})
+STR_ORDER_NO_UNLOAD_REFIT                                       :{SPACE}(Не розвантажуватись і взяти вантаж з переобладнанням в {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :{SPACE}(Не розвантажуватись і чекати повного завантаження з переобладнанням в {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :{SPACE}(Не розвантажуватись і чекати повного завантаження будь-якого вантажу з переобладнанням в {STRING})
 
 STR_ORDER_AUTO_REFIT_ANY                                        :доступний вантаж
 
 ###length 3
-STR_ORDER_STOP_LOCATION_NEAR_END                                :[початок]
-STR_ORDER_STOP_LOCATION_MIDDLE                                  :[середина]
-STR_ORDER_STOP_LOCATION_FAR_END                                 :[кінець]
+STR_ORDER_STOP_LOCATION_NEAR_END                                :{SPACE}[початок]
+STR_ORDER_STOP_LOCATION_MIDDLE                                  :{SPACE}[середина]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :{SPACE}[кінець]
 
 STR_ORDER_OUT_OF_RANGE                                          :{RED} (Наступний пункт призначення поза межею досяжності)
 
@@ -4893,16 +4907,17 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Розк
 STR_TIMETABLE_NO_TRAVEL                                         :Не прямувати
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :В дорозі (час руху враховано в наступному не автоматичному завданні)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :В дорозі (час не вказано)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Прямувати (без розкладу) зі швидкістю, що не перевищує {2:VELOCITY} (час не вказано)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Прямувати (без розкладу) зі швидкістю не більше {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :В дорозі {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :В дорозі {STRING} зі швидкістю, що не перевищує {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Поїздка (для {STRING}, без розкладу)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Їхати (протягом {STRING}, без розкладу) зі швидкістю не більше {VELOCITY}
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(стояти протягом {STRING}, без розкладу)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(їхати протягом {STRING}, без розкладу)
-STR_TIMETABLE_STAY_FOR                                          :і стояти {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :і прямувати до {STRING}
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(чекати {STRING}, без розкладу)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(їхати протягом {STRING}, без розкладу)
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}і чекати {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}і прямувати до {STRING}
 
+STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Для завершення цього розкладу треба приблизно {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Цей розклад займе {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Цей розклад займе якнайменше {STRING} (не все враховано)
 
@@ -4921,12 +4936,14 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Секунд д
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Змінити час
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Змінити час, впродовж якого має виконуватись завдання. Ctrl+клац змінить час в усіх завданнях
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Змінити час
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Скасувати час
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Скасувати час виконання виділеного завдання. Ctrl+клац скасує обмеження часу в усіх завданнях
 
 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Змінити обмеж. швидкості
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Змінити обмеження швидкості для виділеного пункту. Ctrl+клац змінить швидкість в усіх завданнях
+STR_TIMETABLE_CHANGE_SPEED_QUERY                                :Змінити обмеження швидкості
 
 STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Скасувати обмеж. швидкості
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Скасувати обмеження швидкості для виділеного завдання. Ctrl+клац скасує обмеження швидкості в усіх завданнях
@@ -5019,8 +5036,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Прийняти
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Вибрати виділений скрипт
-STR_AI_LIST_CANCEL                                              :{BLACK}Скасувати
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Не міняти скрипт
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Зробити знімок екрану
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Звичайний зняток
@@ -5031,9 +5046,8 @@ STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Знят
 STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Зняток мінімапи
 
 # Script Parameters
-STR_AI_SETTINGS_CAPTION_AI                                      :ШІ
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Ігровий скрипт
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Закрити
+STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Налаштування ШІ
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Налаштування ігрового скрипту
 STR_AI_SETTINGS_RESET                                           :{BLACK}Скидання
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5093,7 +5107,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<недосту
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Гра була записана у версії без підтримки трамваїв. Усі трамваї були видалені
 
 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Генерація карти перервана...{}... немає де розташувати міста
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Генерація карти перервана...{}{}... ніеможливо розташувати міста
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... у цьому сценарії немає міст
 
 STR_ERROR_PNGMAP                                                :{WHITE}Неможливо завантажити ландшафт з PNG...
@@ -5122,6 +5136,7 @@ STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Поми
 
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Повідомлення
+STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Повідомлення від компанії {COMPANY}
 
 # Generic construction errors
 STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}За межами карти
@@ -5183,7 +5198,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... на
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... забагато міст
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... на карті немає вільного місця
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Дорога ремонтується
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Не можна видалити це місто...{}Станція або депо, що належать місту або перебувають на землі у власності міста, не можуть бути видалені
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Неможливо видалити це місто...{}{}Станцію або депо, що належать місту або перебувають на землі міста, неможливо видалити
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... немає придатного місця для статуї в центрі цього міста
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}Неможливо звести цей будинок...
 
@@ -5594,7 +5609,7 @@ STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1                          :Торгови
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Іглу
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Вігвам
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Чайник-Дім
-STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Копилка
+STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Скарбни́чка
 
 ##id 0x4800
 # industry names
@@ -6023,7 +6038,7 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
 STR_SAVEGAME_NAME_SPECTATOR                                     :Спостерігач, {1:STRING}
 
 # Viewport strings
-STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN_POP                                           :{TOWN} ({COMMA})
 STR_VIEWPORT_STATION                                            :{STATION} {STATION_FEATURES}
 
 # Simple strings to get specific types of data
@@ -6047,6 +6062,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}млрд
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}трлн
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -6085,3 +6101,12 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
+STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Показує налаштування значків
+STR_BADGE_CONFIG_RESET                                          :Скидання
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Зображення значків
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Фільтри значків
+STR_BADGE_CONFIG_PREVIEW                                        :Попередній перегляд
+STR_BADGE_CONFIG_NAME                                           :Назва
+STR_BADGE_FILTER_ANY_LABEL                                      :Заголовок: {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} це {STRING}
diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt
index 3efa6374bd..3eb64e8b57 100644
--- a/src/lang/urdu.txt
+++ b/src/lang/urdu.txt
@@ -820,8 +820,9 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}کھیل
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}کرنسی کی اکائیاں
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}کرنسی کی اکائی اختیار کریں
+
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :کرنسی کی اکائیاں
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :کرنسی کی اکائی اختیار کریں
 
 
 ###length 45
@@ -858,21 +859,21 @@ STR_GAME_OPTIONS_CURRENCY_KRW                                   :جنوبی کو
 STR_GAME_OPTIONS_CURRENCY_ZAR                                   :جنوبی افریقہ کے رنڈ
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :اپنی مرضی کی ۔۔۔
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}خود مختار بچاو
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}خودمختار کھیل بچانے کے درمیان وقفہ اختیار کریں
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :خود مختار بچاو
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :خودمختار کھیل بچانے کے درمیان وقفہ اختیار کریں
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :بند
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}زبان
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}استعمال کرنے کےلئے زبان اختیار کئیجیے
+STR_GAME_OPTIONS_LANGUAGE                                       :زبان
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :استعمال کرنے کےلئے زبان اختیار کئیجیے
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}مُکمل سکرین
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}مُکمل اسکرین پر کھیلنے کے لئے اِس ڈبے کو نشان لگائیں
+STR_GAME_OPTIONS_FULLSCREEN                                     :مُکمل سکرین
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :مُکمل اسکرین پر کھیلنے کے لئے اِس ڈبے کو نشان لگائیں
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}اسکرین کی resolution
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}اسکرین کی resolution اختیار کریں
+STR_GAME_OPTIONS_RESOLUTION                                     :اسکرین کی resolution
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :اسکرین کی resolution اختیار کریں
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :دیگر
 
 
@@ -885,17 +886,18 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :دیگر
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}بُنیادی گرافک سیٹ
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}بُنیادی گرافک سیٹ اختیار کریں
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}بُنیادی گرافک سیٹ کے بارے میں اضافی معلومات
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}بُنیادی صوتی سیٹ
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}بُنیادی صوتی سیٹ اختیار کریں
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}بُنیادی صوتی سیٹ کے بارے میں اضافی معلومات
+STR_GAME_OPTIONS_BASE_GRF                                       :بُنیادی گرافک سیٹ
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :بُنیادی گرافک سیٹ اختیار کریں
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :بُنیادی گرافک سیٹ کے بارے میں اضافی معلومات
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}بُنیادی موسیقی سیٹ
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}بُنیادی موسیقی سیٹ اختیار کریں
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}بُنیادی موسیقی سیٹ کے بارے میں اضافی معلومات
+STR_GAME_OPTIONS_BASE_SFX                                       :بُنیادی صوتی سیٹ
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :بُنیادی صوتی سیٹ اختیار کریں
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :بُنیادی صوتی سیٹ کے بارے میں اضافی معلومات
+
+STR_GAME_OPTIONS_BASE_MUSIC                                     :بُنیادی موسیقی سیٹ
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :بُنیادی موسیقی سیٹ اختیار کریں
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :بُنیادی موسیقی سیٹ کے بارے میں اضافی معلومات
 
 
 
@@ -995,7 +997,7 @@ STR_CITY_APPROVAL_HOSTILE                                       :مخالفان
 STR_CITY_APPROVAL_PERMISSIVE                                    :اجازت دینے والا
 
 
-# Settings tree window
+# Settings tree in the Game Options window
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(کوئی وضاحت موجود نہیں)
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}ترتیب قسم: {ORANGE}{STRING}
 
@@ -1507,7 +1509,6 @@ STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE} ۔ ۔ 
 # Video initalization errors
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}نیا کھیل
 STR_INTRO_LOAD_GAME                                             :{BLACK}کھیل لوڈ کریں
@@ -1517,7 +1518,6 @@ STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}منظر
 STR_INTRO_MULTIPLAYER                                           :{BLACK}زیادہ کھلاڑی
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}کھیل کے اختیارات
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF چنئے
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}آن لائن مواد دیکھیں
 STR_INTRO_QUIT                                                  :{BLACK}باہر نکلو
 
@@ -1534,7 +1534,6 @@ STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE                        :{BLACK}منظر
 STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}منظر کشی کا 'toyland' طریقہ چُنئیے
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}کھیل کے اختیارات دکھائیں
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF سیٹنگز دیکھیئے
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}نئے اور ترمیم شدہ مواد کو ڈاون لوڈ کرنے کے لئے چیک کریں
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD' سے باہر نکلو
 
@@ -2157,6 +2156,7 @@ STR_FOUND_TOWN_SIZE_RANDOM                                      :{G=m}{BLACK}ک
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}شہر کا حجم منتخب کرو
 STR_FOUND_TOWN_CITY                                             :{BLACK}شہر
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}شہر کی سڑکوں کا پھیلائو:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}اس شہر کیلئے سڑکوں کا بھیلائو منتخب کرو
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}اصلی
@@ -2261,8 +2261,6 @@ STR_NEWGRF_SETTINGS_UPGRADE                                     :{BLACK}اپگر
 
 
 # NewGRF save preset window
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}منسوخ
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}پریسیٹ تبدیل نہ کریں
 STR_SAVE_PRESET_SAVE                                            :{BLACK}بچایں
 
 # NewGRF parameters window
@@ -2673,7 +2671,6 @@ STR_ORDER_OUT_OF_RANGE                                          :{RED} (اگلا
 # Time table window
 
 
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :زیادہ سے زیادہ {2:VELOCITY} رفتار پر سفر کریں (بغیر اوقات کے)
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING} کے لئے زیادہ سے زیادہ {VELOCITY} رفتار پر سفر کریں
 
 
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index f3525df674..44e00334f5 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Sắp xếp nh
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Cấu hình trò chơi
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Thiết Lập
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Thiết lập AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Thiết lập kịch bản màn chơi
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Thông số NewGRF
@@ -953,22 +952,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Sao ché
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Cấu Hình Trò Chơi
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Tổng quát
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Điều chỉnh thiết lập tổng quát
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Điều chỉnh thiết lập tổng quát
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Đồ họa
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Điều chỉnh thiết lập đồ họa
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Điều chỉnh thiết lập đồ họa
 STR_GAME_OPTIONS_TAB_SOUND                                      :Âm thanh
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Lựa chọn thiết lập cho âm thanh và nhạc
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Lựa chọn thiết lập cho âm thanh và nhạc
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Xã hội
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Chọn thiết lập các tích hợp xã hội
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Chọn thiết lập các tích hợp xã hội
 
 STR_GAME_OPTIONS_VOLUME                                         :Âm lượng
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Hiệu ứng âm thanh
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Âm nhạc
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Đơn vị tiền tệ
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Lựa chọn đơn vị tiền tệ
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Đơn vị tiền tệ
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Lựa chọn đơn vị tiền tệ
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1018,8 +1018,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit Malaysi
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lát-vi-a Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo Bồ Đào Nha
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Lưu tự động
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Lựa chọn khoảng thời gian tự động lưu
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Lưu tự động
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Lựa chọn khoảng thời gian tự động lưu
 
 # Autosave dropdown
 ###length 5
@@ -1029,77 +1029,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Mỗi 30 phút
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Mỗi 60 phút
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Mỗi 120 phút
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Ngôn ngữ
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Lựa chọn sử dụng ngôn ngữ giao diện
+STR_GAME_OPTIONS_LANGUAGE                                       :Ngôn ngữ
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Lựa chọn sử dụng ngôn ngữ giao diện
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} (hoàn thành {NUM}%)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Toàn màn hình
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Đánh dấu vào ô này để chơi OpenTTD ở chế độ toàn màn hình
+STR_GAME_OPTIONS_FULLSCREEN                                     :Toàn màn hình
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Đánh dấu vào ô này để chơi OpenTTD ở chế độ toàn màn hình
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Độ phân giải màn hình
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Chọn độ phân giải màn hình để sử dụng
+STR_GAME_OPTIONS_RESOLUTION                                     :Độ phân giải màn hình
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Chọn độ phân giải màn hình để sử dụng
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :khác
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Tăng tốc phần cứng
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Đánh dấu vào ô này để cho phép OpenTTD thử sử dụng tăng tốc phần cứng. Sẽ có tác dụng sau khi khởi động lại trò chơi
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Tăng tốc phần cứng
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Đánh dấu vào ô này để cho phép OpenTTD thử sử dụng tăng tốc phần cứng. Sẽ có tác dụng sau khi khởi động lại trò chơi
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Thiết lập chỉ có tác dụng sau khi khởi động lại trò chơi
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Đánh dấu vào ô này để bật tính năng v-sync cho màn hình. Sẽ có tác dụng sau khi khởi động lại trò chơi. Chỉ có thể hoạt động khi tăng tốc phần cứng được bật
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Đánh dấu vào ô này để bật tính năng v-sync cho màn hình. Sẽ có tác dụng sau khi khởi động lại trò chơi. Chỉ có thể hoạt động khi tăng tốc phần cứng được bật
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Trình điều khiển hiện tại: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Trình điều khiển hiện tại: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Kích thước giao diện
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Kéo thanh trượt để điều chỉnh kích thước giao diện. Giữ Ctrl để điều chỉnh liên tục
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Tự động nhận dạng kích thước
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Đánh dấu vào ô này để điều chỉnh kích thước giao diện tự động
+
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Kích thước giao diện
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Kéo thanh trượt để điều chỉnh kích thước giao diện. Giữ Ctrl để điều chỉnh liên tục
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Tự động nhận dạng kích thước
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Đánh dấu vào ô này để điều chỉnh kích thước giao diện tự động
 
 STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Tỷ lệ góc xiên
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Đánh dấu vào ô này để điều chỉnh tỷ lệ góc xiên theo kích thước giao diện
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Đánh dấu vào ô này để điều chỉnh tỷ lệ góc xiên theo kích thước giao diện
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Sử dụng sprite phông truyền thống
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Tuỳ chọn này nếu bạn muốn sử dụng sprite phông cố định truyền thống
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Phông chữ chống răng cưa
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Tuỳ chọn này để chống răng cưa phông chữ co dãn được
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Sử dụng sprite phông truyền thống
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Tuỳ chọn này nếu bạn muốn sử dụng sprite phông cố định truyền thống
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Phông chữ chống răng cưa
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Tuỳ chọn này để chống răng cưa phông chữ co dãn được
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Khảo sát tự động
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Tham gia khảo sát tự động
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Khi bật, OpenTTD sẽ gửi một khảo sát lúc rời ván chơi
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Về khảo sát và quyền riêng tư
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Sẽ mở trình duyệt để xem thêm thông tin về khảo sát tự động
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Xem trước kết quả khảo sát
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Hiển thị kết quả khảo sát ở ván chơi hiện tại
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Khảo sát tự động
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Tham gia khảo sát tự động
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Khi bật, OpenTTD sẽ gửi một khảo sát lúc rời ván chơi
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Về khảo sát và quyền riêng tư
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Sẽ mở trình duyệt để xem thêm thông tin về khảo sát tự động
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Xem trước kết quả khảo sát
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Hiển thị kết quả khảo sát ở ván chơi hiện tại
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Hình ảnh
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Tần số quét màn hình
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Chọn tần số quét màn hình
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Tần số quét màn hình
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Chọn tần số quét màn hình
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Tần số quét hơn 60Hz có thể làm ảnh hưởng đến hiệu năng
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Gói đồ họa
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Chọn gói đồ họa để sử dụng (không thể thay đổi khi trong ván chơi, chỉ đổi được khi ở menu chính)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Thông tin thêm về gói đồ họa
+STR_GAME_OPTIONS_BASE_GRF                                       :Gói đồ họa
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Chọn gói đồ họa để sử dụng (không thể thay đổi khi trong ván chơi, chỉ đổi được khi ở menu chính)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Thông tin thêm về gói đồ họa
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Bộ âm thanh chuẩn
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Chọn bộ âm thanh chuẩn để dùng (không thể thay đổi khi trong ván chơi, chỉ đổi được khi ở menu chính)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Thông tin thêm về bộ âm thanh chuẩn
+STR_GAME_OPTIONS_BASE_SFX                                       :Bộ âm thanh chuẩn
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Chọn bộ âm thanh chuẩn để dùng (không thể thay đổi khi trong ván chơi, chỉ đổi được khi ở menu chính)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Thông tin thêm về bộ âm thanh chuẩn
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Gói nhạc chuẩn
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Chọn gói nhạc để sử dụng
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Thông tin thêm về gói nhạc chuẩn
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Gói nhạc chuẩn
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Chọn gói nhạc để sử dụng
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Thông tin thêm về gói nhạc chuẩn
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Tải Nội Dung
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Kiểm tra những nội dung mới & cập nhật để tải về
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(không có plugins được cài đặt để tích hợp vào nền tảng xã hội)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Nền tảng:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Trạng thái Plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Nền tảng:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Trạng thái Plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Đang chạy
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Kích hoạt không thành công
@@ -1210,14 +1210,13 @@ STR_CITY_APPROVAL_TOLERANT                                      :Vừa phải
 STR_CITY_APPROVAL_HOSTILE                                       :Khó khăn
 STR_CITY_APPROVAL_PERMISSIVE                                    :Dễ dãi (không có tác dụng với hoạt động xây dựng của công ty)
 
-STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Không có AI nào phù hợp...{}Bạn có thể tải các AI từ mục 'Online Content'
+STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Không có AI nào phù hợp...{}{}Bạn có thể tải các AI từ mục 'Nội dung trực tuyến'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Thiết lập
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Lọc:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Mở xuống tất cả
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Đóng lại tất cả
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Thiết lập lại tất cả
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Lọc:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Mở xuống tất cả
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Đóng lại tất cả
+STR_CONFIG_SETTING_RESET_ALL                                    :Thiết lập lại tất cả
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(hiện không có giải thích nào)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Giá trị mặc định: {ORANGE}{STRING}
@@ -1230,9 +1229,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Thiết lập c
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Chú Ý!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Hành động này sẽ thiết lập lại tất cả các thông số về ban đầu.{}Bạn có muốn tiến hành?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Phân loại:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Kiểu:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Giới hạn danh sách bên dưới bằng những bộ lọc định sẵn
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Phân loại:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Kiểu:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Giới hạn danh sách bên dưới bằng những bộ lọc định sẵn
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Tùy chọn cơ bản
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Tùy chọn nâng cao
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Thiết lập chuyên gia/tất cả thiết lập
@@ -1249,9 +1248,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Thiết lập c
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Không -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Hiện tất cả kết quả tìm kiếm theo{}{SILVER}Phân loại {BLACK}cho {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Hiện tất cả kết quả tìm kiếm theo{}{SILVER}Kiểu {BLACK}cho {WHITE}tất cả kiểu thiết lập
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Hiện tất cả kết quả tìm kiếm theo{}{SILVER}Phân loại {BLACK}cho {WHITE}{STRING} {BLACK}và {SILVER}Kiểu {BLACK}cho {WHITE}tất cả kiểu thiết lập
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Hiện tất cả kết quả tìm kiếm theo{}{SILVER}Phân loại {BLACK}cho {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Hiện tất cả kết quả tìm kiếm theo{}{SILVER}Kiểu {BLACK}cho {WHITE}tất cả kiểu thiết lập
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Hiện tất cả kết quả tìm kiếm theo{}{SILVER}Phân loại {BLACK}cho {WHITE}{STRING} {BLACK}và {SILVER}Kiểu {BLACK}cho {WHITE}tất cả kiểu thiết lập
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Tắt
@@ -2180,7 +2179,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... khô
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... trình điều khiển GPU đã làm trò chơi bị lỗi. Tăng tốc phần cứng đã được tắt
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Màn Chơi Mới
 STR_INTRO_LOAD_GAME                                             :{BLACK}Nạp Ván Chơi
@@ -2192,11 +2190,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Ván Ch
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Cấu Hình Trò Chơi
 STR_INTRO_HIGHSCORE                                             :{BLACK}Bảng Thành Tích
 STR_INTRO_HELP                                                  :{BLACK}Trợ giúp & hướng dẫn
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Thiết lập
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Thiết Lập NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Nội Dung Trực Tuyến
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Thiết Lập AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Thiết Lập Tập Lệnh Trò Chơi
 STR_INTRO_QUIT                                                  :{BLACK}Thoát
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Màn chơi mới.Ctrl+Click để bỏ qua phần điều chỉnh màn
@@ -2214,11 +2208,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Chọn k
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Hiển thị cấu hình của trò chơi
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Hiện bảng thành tích
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Truy cập vào tài liệu và tài nguyên trực tuyến
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Thiết lập hiển thị
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Hiển thị tùy chỉnh NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Kiểm tra những nội dung mới & cập nhật để tải về
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Hiển thị tùy chỉnh AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Mở thiết lập kịch bản màn chơi
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Thoát 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Gói đồ họa cơ sở đang chọn bị thiếu  {NUM} sprite. Hãy cập nhật gói cơ sở này.
@@ -2854,6 +2844,9 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Phía ngoài ng
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Phía trong ngoại ô
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Nội thành
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :Ngăn chặn nâng cấp
+STR_HOUSE_PICKER_PROTECT_OFF                                    :Tắt
+STR_HOUSE_PICKER_PROTECT_ON                                     :Bật
 
 STR_STATION_CLASS_DFLT                                          :Mặc định
 STR_STATION_CLASS_DFLT_STATION                                  :Trạm mặc định
@@ -3060,6 +3053,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Chọn q
 STR_FOUND_TOWN_CITY                                             :{BLACK}Đô thị
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Thành phố phát triển nhanh hơn thị trấn{}Tuỳ thuộc thiết lập, chúng lớn hơn khi khai sinh
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Quy hoạch đường đô thị:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Chọn để quy hoạch đường bộ trong đô thị
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Nguyên bản
@@ -3504,15 +3498,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Lưu thi
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Danh sách những thiết lập có sẵn, chọn một để sao chép tên thiết lập
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Nhập tên cho thiết lập
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Tên hiện tại cho thiết lập được lưu
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Hủy bỏ
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Không thay đổi thiết lập
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Lưu
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Lưu thiết lập bằng tên được chọn
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Thay đổi các thông số của gói đồ họa chuẩn
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Thay Đổi Tham Số NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Đóng
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Đặt mặc định
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Đặt tất cả các tham số về mặc định
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Tham số {NUM}
@@ -4016,6 +4007,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Sản l
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Cần cung cấp:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} đang chờ{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} đang chờ
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Thay đổi sản lượng (bội số của 8, max 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Thay đổi mức sản lượng (theo phần trăm, cao nhất 800%)
@@ -4741,7 +4736,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Lịch t
 STR_TIMETABLE_NO_TRAVEL                                         :Không di chuyển
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Hành trình (tự động; tính thời gian theo lịch trình thủ công kế tiếp)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Di chuyển (không bó buộc theo lịch trình)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Hành trình với tốc độ tối đa là {2:VELOCITY} (chưa dựng lịch trình)
 STR_TIMETABLE_TRAVEL_FOR                                        :Di chuyển trong {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Lộ trình {STRING} với tốc độ tối đa {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Lộ trình (cho {STRING}, chưa có lịch trình)
@@ -4866,8 +4860,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Chấp nhận
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Chấp nhận AI đã chọn
-STR_AI_LIST_CANCEL                                              :{BLACK}Huỷ bỏ
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Không đổi tập lệnh
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Chụp màn hình
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Chụp màn hình bình thường
@@ -4880,7 +4872,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Chụp m
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Tham Số AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Tham Số Game Script
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Đóng
 STR_AI_SETTINGS_RESET                                           :{BLACK}Thiết Lập Lại
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
@@ -5305,8 +5296,16 @@ STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Không t
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Không thể bán máy bay...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_SELL_ALL_TRAIN                                  :{WHITE}Không thể bán tất cả tàu hoả...
+STR_ERROR_CAN_T_SELL_ALL_ROAD_VEHICLE                           :{WHITE}Không thể bán tất cả các xe...
+STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Không thể bán tất cả tàu thủy...
+STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Không thể bán tất cả máy bay...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Không thể tự động thay thế tàu hỏa...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Không thể tự động thay thế xe...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Không thể tự động thay thế tàu thủy...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Không thể tự động thay thế máy bay...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Quá nhiều phương tiện trong trò chơi
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Không thể thay đổi tần suất bảo trì...
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index fe2394b3de..d3925bb1aa 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -444,7 +444,6 @@ STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :Gosod tai
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Dewisiadau Gêm
-STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Gosodiadau
 STR_SETTINGS_MENU_AI_SETTINGS                                   :Gosodiadau AI
 STR_SETTINGS_MENU_GAMESCRIPT_SETTINGS                           :Gosodiadau sgript gêm
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Gosodiadau NewGRF
@@ -959,22 +958,23 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Gludo ll
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Dewisiadau Gêm
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Cyffredinol
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Dewis gosodiadau cyffredinol
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Dewis gosodiadau cyffredinol
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graffeg
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Dewis gosodiadau graffeg
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Dewis gosodiadau graffeg
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sain
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Dewis gosodiadau sain a cherddoriaeth
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Dewis gosodiadau sain a cherddoriaeth
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Cymdeithasol
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Dewis gosodiadau integreiddio cymdeithasol
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Dewis gosodiadau integreiddio cymdeithasol
 
 STR_GAME_OPTIONS_VOLUME                                         :Lefel Sain
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Effeithiau sŵn
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Cerddoriaeth
 
+
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Uned Arian
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Dewis unedau arian
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Uned Arian
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Dewis unedau arian
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1025,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats Latfia
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Esgwdo Portiwgeaidd
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia Wcrain
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Awtogadw
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Dewiswch pa mor aml y dylid awtogadw gemau
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Awtogadw
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Dewiswch pa mor aml y dylid awtogadw gemau
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1036,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Bob 30 munud
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Bob 60 munud
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Bob 120 munud
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Iaith
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Dewiswch yr iaith rhyngwyneb i'w defnyddio
+STR_GAME_OPTIONS_LANGUAGE                                       :Iaith
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Dewiswch yr iaith rhyngwyneb i'w defnyddio
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% wedi'i gwblhau)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Sgrin Llawn
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marciwch y blwch hwn i chwarae Open TTD gyda Sgrin Llawn
+STR_GAME_OPTIONS_FULLSCREEN                                     :Sgrin Llawn
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marciwch y blwch hwn i chwarae Open TTD gyda Sgrin Llawn
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Cydraniad Sgrin
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Dewiswch y cydraniad sgrin i'w defnyddio
+STR_GAME_OPTIONS_RESOLUTION                                     :Cydraniad Sgrin
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Dewiswch y cydraniad sgrin i'w defnyddio
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :arall
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Cyflymu caledwedd
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Bydd ticio'r blwch yma yn caniatáu i OpenTTD geisio defnyddio cyflymiad caledwedd. Bydd newid i'r gosodiad ond yn digwydd wedi ailddechrau'r gêm
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Cyflymu caledwedd
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Bydd ticio'r blwch yma yn caniatáu i OpenTTD geisio defnyddio cyflymiad caledwedd. Bydd newid i'r gosodiad ond yn digwydd wedi ailddechrau'r gêm
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Bydd y gosodiad ond yn cymryd effaith ar ôl ailddechrau'r gêm
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Bydd ticio'r blwch yma yn defnyddio cydamseriad fertigol wrth lunio'r sgrin. Bydd newid i'r gosodiad ond yn digwydd wedi ailddechrau'r gêm
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Bydd ticio'r blwch yma yn defnyddio cydamseriad fertigol wrth lunio'r sgrin. Bydd newid i'r gosodiad ond yn digwydd wedi ailddechrau'r gêm
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Gyriant presennol: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Gyriant presennol: {STRING}
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Maint rhyngwyneb
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Llusgwch y llithrwr i osod maint y rhyngwyneb. Daliwhc Ctrl i ganiatáu addasiad parhaol
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Awto-ganfod maint
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marciwch y blwch hwn i ganfod maint y rhyngwyneb yn awtomatig
+
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Maint rhyngwyneb
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Llusgwch y llithrwr i osod maint y rhyngwyneb. Daliwhc Ctrl i ganiatáu addasiad parhaol
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Awto-ganfod maint
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marciwch y blwch hwn i ganfod maint y rhyngwyneb yn awtomatig
 
 STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Helaethu befelau
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marciwch y blwch hwn i helaethu befelau yn ôl maint y rhyngwyneb
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marciwch y blwch hwn i helaethu befelau yn ôl maint y rhyngwyneb
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Defnyddio wynebfath corlun traddodiadol
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marciwch y blwch hwn os oes well gennych ddefnyddio y wynebfath corlun un-maint traddodiadol
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Gwynebfathau dadamgenu
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marciwch y blwch hwn i ddadamgennu ffontiau y gellir eu hailfeintio
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Defnyddio wynebfath corlun traddodiadol
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marciwch y blwch hwn os oes well gennych ddefnyddio y wynebfath corlun un-maint traddodiadol
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Gwynebfathau dadamgenu
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marciwch y blwch hwn i ddadamgennu ffontiau y gellir eu hailfeintio
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Arolwg awtomatig
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Cymryd rhan mewn arolwg awtomatig
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Pan y galluogir, bydd OpenTTD yn darlledu arolwg pan yn gadael gêm
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Am yr arolwg a phreifatrwydd
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Mae hwn yn agor porwr gyda mwy o wybodaeth am yr arolwg awtomatig
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Rhagolwg o ganlyniad yr arolwg
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Dangos canlyniadau arolwg y gêm sy'n rhedeg
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Arolwg awtomatig
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Cymryd rhan mewn arolwg awtomatig
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Pan y galluogir, bydd OpenTTD yn darlledu arolwg pan yn gadael gêm
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Am yr arolwg a phreifatrwydd
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Mae hwn yn agor porwr gyda mwy o wybodaeth am yr arolwg awtomatig
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Rhagolwg o ganlyniad yr arolwg
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Dangos canlyniadau arolwg y gêm sy'n rhedeg
 
-STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Graffeg
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Dangos cyfradd adnewyddu
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Dewis y cyfradd adnewyddu sgrin i'w defnyddio
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Dangos cyfradd adnewyddu
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Dewis y cyfradd adnewyddu sgrin i'w defnyddio
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Gall amleddau uwch na 60Hz amharu perfformiad
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set raffeg sylfaenol
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Dewiswch y set raffeg sylfaenol i'w defnyddio (ni ellir ei newid o fewn gêm, dim ond o'r brif ddewislen)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Gwybodaeth ychwanegol am y set graffeg sylfaenol
+STR_GAME_OPTIONS_BASE_GRF                                       :Set raffeg sylfaenol
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Dewiswch y set raffeg sylfaenol i'w defnyddio (ni ellir ei newid o fewn gêm, dim ond o'r brif ddewislen)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Gwybodaeth ychwanegol am y set graffeg sylfaenol
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set sain sylfaenol
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Dewiswch y set sain sylfaenol i'w ddefnyddio (ni ellir ei newid o fewn gêm, dim ond o'r brif ddewislen)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Gwybodaeth bellach am y set sain sylfaenol
+STR_GAME_OPTIONS_BASE_SFX                                       :Set sain sylfaenol
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Dewiswch y set sain sylfaenol i'w ddefnyddio (ni ellir ei newid o fewn gêm, dim ond o'r brif ddewislen)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Gwybodaeth bellach am y set sain sylfaenol
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set cerddoriaeth sylfaenol
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Dewisiwch y set cerddoriaeth sylfaenol i'w ddefnyddio
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Gwybodaeth bellach am y set gerddoriaeth sylfaenol
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set cerddoriaeth sylfaenol
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Dewisiwch y set cerddoriaeth sylfaenol i'w ddefnyddio
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Gwybodaeth bellach am y set gerddoriaeth sylfaenol
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Nôl Cynnwys
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Gwirio am gynnwys newydd a diweddar i'w lawrlwytho
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(dim ategolion integreiddio gyda llwyfannau cymdeithasol wedi'u gosod)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Llwyfan:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stâd ategolyn:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Llwyfan:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stâd ategolyn:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Yn rhedeg
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Methwyd sefydlu
@@ -1219,12 +1219,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Bodlon (dim eff
 
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Dim AI addas ar gael...{}{}Gallwch lawrlwytho sawl AI drwy'r system 'Cynnwys Ar-lein'
 
-# Settings tree window
-STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Gosodiadau
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Hidlydd:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Ehangu oll
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Cywasgu oll
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Ailosod pob gwerth
+# Settings tree in the Game Options window
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Hidlydd:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Ehangu oll
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Cywasgu oll
+STR_CONFIG_SETTING_RESET_ALL                                    :Ailosod pob gwerth
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(dim esboniad ar gael)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Gwerth rhagosodedig: {ORANGE}{STRING}
@@ -1237,9 +1236,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Gosodiad cwmni
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Rhybudd!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Bydd y weithred yma'n ailosod pob gosodiad gêm i'w gwerthoedd rhagosodedig.{}Ydych chi'n siwr eich bod am barhau?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Math:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Yn cyfyngu'r rhestr isod drwy hidlau rhagosodedig
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Math:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Yn cyfyngu'r rhestr isod drwy hidlau rhagosodedig
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Sylfaenol (gosodiadau pwysig yn unig)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Uwch (y rhan helaeth o'r gosodiadau)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Arbennigwyr (gosodiadau arbennigol, gan gynnwys rhai rhyfedd)
@@ -1256,9 +1255,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Gosodiadau cwmn
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Dim -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Dangosir holl ganlyniadau chwilio drwy osod{}{SILVER}Categori {BLACK}i {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Dangosir holl ganlyniadau chwilio drwy osod{}{SILVER}Math {BLACK}i {WHITE}Pob math o osodiad
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Dangosir holl ganlyniadau chwilio drwy osod{}{SILVER}Categori {BLACK}at {WHITE}{STRING} {BLACK}a {SILVER}Math {BLACK}i {WHITE}Pob math o osodiad
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Dangosir holl ganlyniadau chwilio drwy osod{}{SILVER}Categori {BLACK}i {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Dangosir holl ganlyniadau chwilio drwy osod{}{SILVER}Math {BLACK}i {WHITE}Pob math o osodiad
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Dangosir holl ganlyniadau chwilio drwy osod{}{SILVER}Categori {BLACK}at {WHITE}{STRING} {BLACK}a {SILVER}Math {BLACK}i {WHITE}Pob math o osodiad
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :I Ffwrdd
@@ -2020,7 +2019,7 @@ STR_CONFIG_SETTING_SOFT_LIMIT                                   :Uchafswm ffenes
 STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Y nifer o ffenestri agored (nad ydynt yn ludiog) cyn y caiff hen ffenestri eu cau'n ddiofyn i wneud lle ar gyfer ffenestri newydd
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 ###setting-zero-is-special
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :analluogwyd
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :Analluogwyd
 
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Lefel mwyháu uchafsymol: {STRING}
 STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Y lefel agosáu uchaf ar gyfer ffenestri olygfa. Sylwer y bydd galluogi lefelau uwch yn codi 'r gofynion côf
@@ -2191,7 +2190,6 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... dim
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... gyriant caledwedd graffig wedi chwalu'r gêm. Cyflymu caledwedd wedi;i analluogi
 
 # Intro window
-STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Gêm Newydd
 STR_INTRO_LOAD_GAME                                             :{BLACK}Llwytho Gêm
@@ -2203,11 +2201,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Amlchwar
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Dewisiadau Gêm
 STR_INTRO_HIGHSCORE                                             :{BLACK}Tabl Sgôr Uchaf
 STR_INTRO_HELP                                                  :{BLACK}Cymorth a Llawlyfrau
-STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Gosodiadau
-STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Gosodiadau NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Cynnwys Ar-lein
-STR_INTRO_AI_SETTINGS                                           :{BLACK}Gosodiadau AI
-STR_INTRO_GAMESCRIPT_SETTINGS                                   :{BLACK}Gosodiadau Sgript Gêm
 STR_INTRO_QUIT                                                  :{BLACK}Gadael
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Dechrau gêm newydd. Mae Ctrl+Clic yn hepgor dewisiadau map
@@ -2225,11 +2219,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Dewis ti
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Agor dewisiadau'r gêm
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Agor y tabl sgôr uchaf
 STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Cael mynediad at ddogfenyddiaeth ac adnoddau ar-lein
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Agor gosodiadau
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Agor gosodiadau NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Gwirio am gynnwys newydd neu wedi'i ddiweddaru i'w lwytho i lawr
-STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Agor gosodiadau AI
-STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS                           :{BLACK}Agor gosodiadau sgript gêm
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Gadael 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Mae {NUM} corlun ar goll o'r set raffeg sylfaenol a ddewiswyd. Gwiriwch am ddiweddariadau i'r set raffeg.
@@ -3076,6 +3066,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Dewiswch
 STR_FOUND_TOWN_CITY                                             :{BLACK}Dinas
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Mae dinasoedd yn tyfu'n gynt na threfi arferol{}Yn dibynnu ar y gosodiadau, maent hefyd yn fwy pan gânt eu sefydlu
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Cynllun ffyrdd tref
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Dewiswch y cynllun ffyrdd i'w ddefnyddio ar gyfer y dref hon
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Gwreiddiol
@@ -3525,15 +3516,12 @@ STR_SAVE_PRESET_CAPTION                                         :{WHITE}Cadw rha
 STR_SAVE_PRESET_LIST_TOOLTIP                                    :{BLACK}Rhestr o ragosodiadau ar gael, Dewiswch un i'w gopïo i'r enw cadw isod
 STR_SAVE_PRESET_TITLE                                           :{BLACK}Rhowch enw ar gyfer y rhagosodiad
 STR_SAVE_PRESET_EDITBOX_TOOLTIP                                 :{BLACK}Enw a ddewiswyd ar gyfer cadw'r rhagosodiad
-STR_SAVE_PRESET_CANCEL                                          :{BLACK}Canslo
-STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}Peidio newid y rhagosodiad
 STR_SAVE_PRESET_SAVE                                            :{BLACK}Cadw
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Cadw'r rhagosodiad i'r enw a ddewiswyd
 
 # NewGRF parameters window
 STR_BASEGRF_PARAMETERS_CAPTION                                  :{WHITE}Newid paramedrau graffeg sylfaenol
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Newid paramedrau NewGRF
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Cau
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Ailosod
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Gosod pob paramedr i'w werth rhagosodedig
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paramedr {NUM}
@@ -4767,7 +4755,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Amserlen
 STR_TIMETABLE_NO_TRAVEL                                         :Dim teithio
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Teithio (awtomatig; amserlennir gan y gorchymyn defnyddiwr nesaf)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Teithio (heb ei amserlenu)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Teithio heb oresgyn {2:VELOCITY} (heb ei amserlenu)
 STR_TIMETABLE_TRAVEL_FOR                                        :Teithio am{STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Teithio am {STRING} heb oresgyn {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Teithio (am {STRING}, heb ei amserlennu)
@@ -4894,8 +4881,6 @@ STR_AI_LIST_URL                                                 :{LTBLUE}URL: {O
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Derbyn
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Dewis y sgript a amlygwyd
-STR_AI_LIST_CANCEL                                              :{BLACK}Canslo
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Peidio newid y sgript
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Creu ciplun
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Ciplun arferol
@@ -4908,7 +4893,6 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Ciplun m
 # Script Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :{WHITE}Paramedrau AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :{WHITE}Paramedrau Sgript Gêm
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Cau
 STR_AI_SETTINGS_RESET                                           :{BLACK}Ailosod
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
diff --git a/src/language.h b/src/language.h
index 603ca8cfdd..4f1a50a29d 100644
--- a/src/language.h
+++ b/src/language.h
@@ -24,22 +24,22 @@ static const uint8_t MAX_NUM_CASES   = 16; ///< Maximum number of supported case
 struct LanguagePackHeader {
 	static const uint32_t IDENT = 0x474E414C; ///< Identifier for OpenTTD language files, big endian for "LANG"
 
-	uint32_t ident;       ///< 32-bits identifier
-	uint32_t version;     ///< 32-bits of auto generated version info which is basically a hash of strings.h
-	char name[32];      ///< the international name of this language
-	char own_name[32];  ///< the localized name of this language
-	char isocode[16];   ///< the ISO code for the language (not country code)
-	uint16_t offsets[TEXT_TAB_END]; ///< the offsets
+	uint32_t ident = 0; ///< 32-bits identifier
+	uint32_t version = 0; ///< 32-bits of auto generated version info which is basically a hash of strings.h
+	char name[32] = ""; ///< the international name of this language
+	char own_name[32] = ""; ///< the localized name of this language
+	char isocode[16] = ""; ///< the ISO code for the language (not country code)
+	uint16_t offsets[TEXT_TAB_END] = {}; ///< the offsets
 
 	/** Thousand separator used for anything not currencies */
-	char digit_group_separator[8];
+	char digit_group_separator[8] = ",";
 	/** Thousand separator used for currencies */
-	char digit_group_separator_currency[8];
+	char digit_group_separator_currency[8] = ",";
 	/** Decimal separator */
-	char digit_decimal_separator[8];
-	uint16_t missing;     ///< number of missing strings.
-	uint8_t plural_form;   ///< plural form index
-	uint8_t text_dir;      ///< default direction of the text
+	char digit_decimal_separator[8] = ".";
+	uint16_t missing = 0; ///< number of missing strings.
+	uint8_t plural_form = 0; ///< plural form index
+	uint8_t text_dir = 0; ///< default direction of the text
 	/**
 	 * Windows language ID:
 	 * Windows cannot and will not convert isocodes to something it can use to
@@ -48,14 +48,14 @@ struct LanguagePackHeader {
 	 * what language it is in "Windows". The ID is the 'locale identifier' on:
 	 *   http://msdn.microsoft.com/en-us/library/ms776294.aspx
 	 */
-	uint16_t winlangid;   ///< windows language id
-	uint8_t newgrflangid; ///< newgrf language id
-	uint8_t num_genders;  ///< the number of genders of this language
-	uint8_t num_cases;    ///< the number of cases of this language
-	uint8_t pad[3];        ///< pad header to be a multiple of 4
+	uint16_t winlangid = 0; ///< windows language id
+	uint8_t newgrflangid = 0; ///< newgrf language id
+	uint8_t num_genders = 0; ///< the number of genders of this language
+	uint8_t num_cases = 0; ///< the number of cases of this language
+	uint8_t pad[3] = {}; ///< pad header to be a multiple of 4
 
-	char genders[MAX_NUM_GENDERS][CASE_GENDER_LEN]; ///< the genders used by this translation
-	char cases[MAX_NUM_CASES][CASE_GENDER_LEN];     ///< the cases used by this translation
+	char genders[MAX_NUM_GENDERS][CASE_GENDER_LEN] = {}; ///< the genders used by this translation
+	char cases[MAX_NUM_CASES][CASE_GENDER_LEN] = {}; ///< the cases used by this translation
 
 	bool IsValid() const;
 	bool IsReasonablyFinished() const;
diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h
index 72ec56d61d..323158d230 100644
--- a/src/linkgraph/linkgraph.h
+++ b/src/linkgraph/linkgraph.h
@@ -183,7 +183,7 @@ public:
 	 * @param orig_age Age of the original link graph.
 	 * @return scaled value.
 	 */
-	inline static uint Scale(uint val, TimerGameEconomy::Date target_age, TimerGameEconomy::Date orig_age)
+	static inline uint Scale(uint val, TimerGameEconomy::Date target_age, TimerGameEconomy::Date orig_age)
 	{
 		return val > 0 ? std::max(1U, val * target_age.base() / orig_age.base()) : 0;
 	}
diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp
index 61c25550c0..57ab1dfaf0 100644
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -604,7 +604,7 @@ void LinkGraphLegendWindow::DrawWidget(const Rect &r, WidgetID widget) const
 		if (this->IsWidgetDisabled(widget)) return;
 		CompanyID cid = (CompanyID)(widget - WID_LGL_COMPANY_FIRST);
 		Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON);
-		DrawCompanyIcon(cid, CenterBounds(br.left, br.right, sprite_size.width), CenterBounds(br.top, br.bottom, sprite_size.height));
+		DrawCompanyIcon(cid, CentreBounds(br.left, br.right, sprite_size.width), CentreBounds(br.top, br.bottom, sprite_size.height));
 	}
 	if (IsInsideMM(widget, WID_LGL_SATURATION_FIRST, WID_LGL_SATURATION_LAST + 1)) {
 		uint8_t colour = LinkGraphOverlay::LINK_COLOURS[_settings_client.gui.linkgraph_colours][widget - WID_LGL_SATURATION_FIRST];
@@ -618,13 +618,13 @@ void LinkGraphLegendWindow::DrawWidget(const Rect &r, WidgetID widget) const
 			str = STR_LINKGRAPH_LEGEND_SATURATED;
 		}
 		if (str != STR_NULL) {
-			DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, GetCharacterHeight(FS_SMALL)), str, GetContrastColour(colour) | TC_FORCED, SA_HOR_CENTER, false, FS_SMALL);
+			DrawString(br.left, br.right, CentreBounds(br.top, br.bottom, GetCharacterHeight(FS_SMALL)), str, GetContrastColour(colour) | TC_FORCED, SA_HOR_CENTER, false, FS_SMALL);
 		}
 	}
 	if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) {
 		const CargoSpec *cargo = _sorted_cargo_specs[widget - WID_LGL_CARGO_FIRST];
 		GfxFillRect(br, cargo->legend_colour);
-		DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, GetCharacterHeight(FS_SMALL)), cargo->abbrev, GetContrastColour(cargo->legend_colour, 73), SA_HOR_CENTER, false, FS_SMALL);
+		DrawString(br.left, br.right, CentreBounds(br.top, br.bottom, GetCharacterHeight(FS_SMALL)), cargo->abbrev, GetContrastColour(cargo->legend_colour, 73), SA_HOR_CENTER, false, FS_SMALL);
 	}
 }
 
diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h
index 8e08711060..a43a2d5df0 100644
--- a/src/linkgraph/linkgraphjob.h
+++ b/src/linkgraph/linkgraphjob.h
@@ -299,7 +299,7 @@ public:
 	 * @param total Total capacity.
 	 * @return free * 16 / max(total, 1).
 	 */
-	inline static int GetCapacityRatio(int free, uint total)
+	static inline int GetCapacityRatio(int free, uint total)
 	{
 		return Clamp(free, PATH_CAP_MIN_FREE, PATH_CAP_MAX_FREE) * PATH_CAP_MULTIPLIER / std::max(total, 1U);
 	}
diff --git a/src/linkgraph/mcf.cpp b/src/linkgraph/mcf.cpp
index ef8ea4966b..490ab9168c 100644
--- a/src/linkgraph/mcf.cpp
+++ b/src/linkgraph/mcf.cpp
@@ -134,7 +134,7 @@ private:
 	LinkGraphJob &job; ///< Link graph job we're working with.
 
 	/** Lookup table for getting NodeIDs from StationIDs. */
-	ReferenceThroughBaseContainer<std::vector<NodeID>> station_to_node;
+	TypedIndexContainer<std::vector<NodeID>, StationID> station_to_node;
 
 	/** Current iterator in the shares map. */
 	FlowStat::SharesMap::const_iterator it;
diff --git a/src/linkgraph/refresh.cpp b/src/linkgraph/refresh.cpp
index 1ffb1dda50..25e5f47fb1 100644
--- a/src/linkgraph/refresh.cpp
+++ b/src/linkgraph/refresh.cpp
@@ -29,8 +29,8 @@
 	if (v->orders == nullptr) return;
 
 	/* Make sure the first order is a useful order. */
-	const Order *first = v->orders->GetNextDecisionNode(v->GetOrder(v->cur_implicit_order_index), 0);
-	if (first == nullptr) return;
+	VehicleOrderID first = v->orders->GetNextDecisionNode(v->cur_implicit_order_index, 0);
+	if (first == INVALID_VEH_ORDER_ID) return;
 
 	HopSet seen_hops;
 	LinkRefresher refresher(v, &seen_hops, allow_merge, is_full_loading);
@@ -138,22 +138,25 @@ void LinkRefresher::ResetRefit()
  * @param num_hops Number of hops already taken by recursive calls to this method.
  * @return new next Order.
  */
-const Order *LinkRefresher::PredictNextOrder(const Order *cur, const Order *next, RefreshFlags flags, uint num_hops)
+VehicleOrderID LinkRefresher::PredictNextOrder(VehicleOrderID cur, VehicleOrderID next, RefreshFlags flags, uint num_hops)
 {
+	assert(this->vehicle->orders != nullptr);
+	const OrderList &orderlist = *this->vehicle->orders;
+	auto orders = orderlist.GetOrders();
+
 	/* next is good if it's either nullptr (then the caller will stop the
 	 * evaluation) or if it's not conditional and the caller allows it to be
 	 * chosen (by setting RefreshFlag::UseNext). */
-	while (next != nullptr && (!flags.Test(RefreshFlag::UseNext) || next->IsType(OT_CONDITIONAL))) {
+	while (next < orderlist.GetNumOrders() && (!flags.Test(RefreshFlag::UseNext) || orders[next].IsType(OT_CONDITIONAL))) {
 
 		/* After the first step any further non-conditional order is good,
 		 * regardless of previous RefreshFlag::UseNext settings. The case of cur and next or
 		 * their respective stations being equal is handled elsewhere. */
 		flags.Set(RefreshFlag::UseNext);
 
-		if (next->IsType(OT_CONDITIONAL)) {
-			const Order *skip_to = this->vehicle->orders->GetNextDecisionNode(
-					this->vehicle->orders->GetOrderAt(next->GetConditionSkipToOrder()), num_hops);
-			if (skip_to != nullptr && num_hops < this->vehicle->orders->GetNumOrders()) {
+		if (orders[next].IsType(OT_CONDITIONAL)) {
+			VehicleOrderID skip_to = orderlist.GetNextDecisionNode(orders[next].GetConditionSkipToOrder(), num_hops);
+			if (skip_to != INVALID_VEH_ORDER_ID && num_hops < orderlist.GetNumOrders()) {
 				/* Make copies of capacity tracking lists. There is potential
 				 * for optimization here: If the vehicle never refits we don't
 				 * need to copy anything. Also, if we've seen the branched link
@@ -165,8 +168,7 @@ const Order *LinkRefresher::PredictNextOrder(const Order *cur, const Order *next
 
 		/* Reassign next with the following stop. This can be a station or a
 		 * depot.*/
-		next = this->vehicle->orders->GetNextDecisionNode(
-				this->vehicle->orders->GetNext(next), num_hops++);
+		next = orderlist.GetNextDecisionNode(orderlist.GetNext(next), num_hops++);
 	}
 	return next;
 }
@@ -176,10 +178,14 @@ const Order *LinkRefresher::PredictNextOrder(const Order *cur, const Order *next
  * @param cur Last stop where the consist could interact with cargo.
  * @param next Next order to be processed.
  */
-void LinkRefresher::RefreshStats(const Order *cur, const Order *next)
+void LinkRefresher::RefreshStats(VehicleOrderID cur, VehicleOrderID next)
 {
-	StationID next_station = next->GetDestination().ToStationID();
-	Station *st = Station::GetIfValid(cur->GetDestination().ToStationID());
+	assert(this->vehicle->orders != nullptr);
+	const OrderList &orderlist = *this->vehicle->orders;
+	auto orders = orderlist.GetOrders();
+
+	StationID next_station = orders[next].GetDestination().ToStationID();
+	Station *st = Station::GetIfValid(orders[cur].GetDestination().ToStationID());
 	if (st != nullptr && next_station != StationID::Invalid() && next_station != st->index) {
 		Station *st_to = Station::Get(next_station);
 		for (CargoType cargo = 0; cargo < NUM_CARGO; ++cargo) {
@@ -197,7 +203,7 @@ void LinkRefresher::RefreshStats(const Order *cur, const Order *next)
 			}
 
 			/* A link is at least partly restricted if a vehicle can't load at its source. */
-			EdgeUpdateMode restricted_mode = (cur->GetLoadType() & OLFB_NO_LOAD) == 0 ?
+			EdgeUpdateMode restricted_mode = (orders[cur].GetLoadType() & OLFB_NO_LOAD) == 0 ?
 						EdgeUpdateMode::Unrestricted : EdgeUpdateMode::Restricted;
 			/* This estimates the travel time of the link as the time needed
 			 * to travel between the stations at half the max speed of the consist.
@@ -240,14 +246,17 @@ void LinkRefresher::RefreshStats(const Order *cur, const Order *next)
  * @param flags RefreshFlags to give hints about the previous link and state carried over from that.
  * @param num_hops Number of hops already taken by recursive calls to this method.
  */
-void LinkRefresher::RefreshLinks(const Order *cur, const Order *next, RefreshFlags flags, uint num_hops)
+void LinkRefresher::RefreshLinks(VehicleOrderID cur, VehicleOrderID next, RefreshFlags flags, uint num_hops)
 {
-	while (next != nullptr) {
+	assert(this->vehicle->orders != nullptr);
+	const OrderList &orderlist = *this->vehicle->orders;
+	while (next < orderlist.GetNumOrders()) {
+		const Order *next_order = orderlist.GetOrderAt(next);
 
-		if ((next->IsType(OT_GOTO_DEPOT) || next->IsType(OT_GOTO_STATION)) && next->IsRefit()) {
+		if ((next_order->IsType(OT_GOTO_DEPOT) || next_order->IsType(OT_GOTO_STATION)) && next_order->IsRefit()) {
 			flags.Set(RefreshFlag::WasRefit);
-			if (!next->IsAutoRefit()) {
-				this->HandleRefit(next->GetRefitCargo());
+			if (!next_order->IsAutoRefit()) {
+				this->HandleRefit(next_order->GetRefitCargo());
 			} else if (!flags.Test(RefreshFlag::InAutorefit)) {
 				flags.Set(RefreshFlag::InAutorefit);
 				LinkRefresher backup(*this);
@@ -263,34 +272,38 @@ void LinkRefresher::RefreshLinks(const Order *cur, const Order *next, RefreshFla
 		/* Only reset the refit capacities if the "previous" next is a station,
 		 * meaning that either the vehicle was refit at the previous station or
 		 * it wasn't at all refit during the current hop. */
-		if (flags.Test(RefreshFlag::WasRefit) && (next->IsType(OT_GOTO_STATION) || next->IsType(OT_IMPLICIT))) {
+		if (flags.Test(RefreshFlag::WasRefit) && (next_order->IsType(OT_GOTO_STATION) || next_order->IsType(OT_IMPLICIT))) {
 			flags.Set(RefreshFlag::ResetRefit);
 		} else {
 			flags.Reset(RefreshFlag::ResetRefit);
 		}
 
 		next = this->PredictNextOrder(cur, next, flags, num_hops);
-		if (next == nullptr) break;
-		Hop hop(cur->index, next->index, this->cargo);
+		if (next == INVALID_VEH_ORDER_ID) break;
+		Hop hop(cur, next, this->cargo);
 		if (this->seen_hops->find(hop) != this->seen_hops->end()) {
 			break;
 		} else {
 			this->seen_hops->insert(hop);
 		}
 
+		next_order = orderlist.GetOrderAt(next);
+
 		/* Don't use the same order again, but choose a new one in the next round. */
 		flags.Reset(RefreshFlag::UseNext);
 
 		/* Skip resetting and link refreshing if next order won't do anything with cargo. */
-		if (!next->IsType(OT_GOTO_STATION) && !next->IsType(OT_IMPLICIT)) continue;
+		if (!next_order->IsType(OT_GOTO_STATION) && !next_order->IsType(OT_IMPLICIT)) continue;
 
 		if (flags.Test(RefreshFlag::ResetRefit)) {
 			this->ResetRefit();
 			flags.Reset({RefreshFlag::ResetRefit, RefreshFlag::WasRefit});
 		}
 
-		if (cur->IsType(OT_GOTO_STATION) || cur->IsType(OT_IMPLICIT)) {
-			if (cur->CanLeaveWithCargo(flags.Test(RefreshFlag::HasCargo))) {
+		const Order *cur_order = orderlist.GetOrderAt(cur);
+
+		if (cur_order->IsType(OT_GOTO_STATION) || cur_order->IsType(OT_IMPLICIT)) {
+			if (cur_order->CanLeaveWithCargo(flags.Test(RefreshFlag::HasCargo))) {
 				flags.Set(RefreshFlag::HasCargo);
 				this->RefreshStats(cur, next);
 			} else {
diff --git a/src/linkgraph/refresh.h b/src/linkgraph/refresh.h
index 5473cbf92c..449bf2bd0d 100644
--- a/src/linkgraph/refresh.h
+++ b/src/linkgraph/refresh.h
@@ -56,8 +56,8 @@ protected:
 	 * line.
 	 */
 	struct Hop {
-		OrderID from;  ///< Last order where vehicle could interact with cargo or absolute first order.
-		OrderID to;    ///< Next order to be processed.
+		VehicleOrderID from;  ///< Last order where vehicle could interact with cargo or absolute first order.
+		VehicleOrderID to;    ///< Next order to be processed.
 		CargoType cargo; ///< Cargo the consist is probably carrying or INVALID_CARGO if unknown.
 
 		/**
@@ -72,7 +72,7 @@ protected:
 		 * @param to Second order of the hop.
 		 * @param cargo Cargo the consist is probably carrying when passing the hop.
 		 */
-		Hop(OrderID from, OrderID to, CargoType cargo) : from(from), to(to), cargo(cargo) {}
+		Hop(VehicleOrderID from, VehicleOrderID to, CargoType cargo) : from(from), to(to), cargo(cargo) {}
 
 		constexpr auto operator<=>(const Hop &) const noexcept = default;
 	};
@@ -92,10 +92,10 @@ protected:
 
 	bool HandleRefit(CargoType refit_cargo);
 	void ResetRefit();
-	void RefreshStats(const Order *cur, const Order *next);
-	const Order *PredictNextOrder(const Order *cur, const Order *next, RefreshFlags flags, uint num_hops = 0);
+	void RefreshStats(VehicleOrderID cur, VehicleOrderID next);
+	VehicleOrderID PredictNextOrder(VehicleOrderID cur, VehicleOrderID next, RefreshFlags flags, uint num_hops = 0);
 
-	void RefreshLinks(const Order *cur, const Order *next, RefreshFlags flags, uint num_hops = 0);
+	void RefreshLinks(VehicleOrderID cur, VehicleOrderID next, RefreshFlags flags, uint num_hops = 0);
 };
 
 #endif /* REFRESH_H */
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index db31804541..f58f759867 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -219,7 +219,7 @@ struct MainWindow : Window
 		ResizeWindow(this, _screen.width, _screen.height);
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_M_VIEWPORT);
-		nvp->InitializeViewport(this, TileXY(32, 32), ScaleZoomGUI(ZOOM_LVL_VIEWPORT));
+		nvp->InitializeViewport(this, TileXY(32, 32), ScaleZoomGUI(ZoomLevel::Viewport));
 
 		this->viewport->overlay = std::make_shared<LinkGraphOverlay>(this, WID_M_VIEWPORT, 0, CompanyMask{}, 2);
 		this->refresh_timeout.Reset();
@@ -238,7 +238,7 @@ struct MainWindow : Window
 	}
 
 	/** Refresh the link-graph overlay on a regular interval. */
-	IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(7650), [this](auto) {
+	const IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(7650), [this](auto) {
 		RefreshLinkGraph();
 	}};
 
@@ -270,6 +270,9 @@ struct MainWindow : Window
 				DrawSprite(sprite, PAL_NONE, off_x, ScaleGUITrad(50));
 				off_x += GetSpriteSize(sprite).width + letter_spacing;
 			}
+
+			int text_y = this->height - GetCharacterHeight(FS_NORMAL) * 2;
+			DrawString(0, this->width - 1, text_y, STR_INTRO_VERSION, TC_WHITE, SA_CENTER);
 		}
 	}
 
@@ -433,8 +436,9 @@ struct MainWindow : Window
 		this->refresh_timeout.Reset();
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_M_VIEWPORT) return;
 		if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
 			bool in = wheel < 0;
 
@@ -522,7 +526,7 @@ struct MainWindow : Window
 };
 
 static WindowDesc _main_window_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_MAIN_WINDOW, WC_NONE,
 	WindowDefaultFlag::NoClose,
 	_nested_main_window_widgets,
@@ -549,7 +553,7 @@ void ShowSelectGameWindow();
 void SetupColoursAndInitialWindow()
 {
 	for (Colours i = COLOUR_BEGIN; i != COLOUR_END; i++) {
-		const uint8_t *b = GetNonSprite(GENERAL_SPRITE_COLOUR(i), SpriteType::Recolour) + 1;
+		const uint8_t *b = GetNonSprite(GetColourPalette(i), SpriteType::Recolour) + 1;
 		assert(b != nullptr);
 		for (ColourShade j = SHADE_BEGIN; j < SHADE_END; j++) {
 			SetColourGradient(i, j, b[0xC6 + j]);
diff --git a/src/map.cpp b/src/map.cpp
index 315b89cba9..efb5168cbf 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -227,95 +227,6 @@ uint DistanceFromEdgeDir(TileIndex tile, DiagDirection dir)
 	}
 }
 
-/**
- * Function performing a search around a center tile and going outward, thus in circle.
- * Although it really is a square search...
- * Every tile will be tested by means of the callback function proc,
- * which will determine if yes or no the given tile meets criteria of search.
- * @param tile to start the search from. Upon completion, it will return the tile matching the search
- * @param size: number of tiles per side of the desired search area
- * @param proc: callback testing function pointer.
- * @param user_data to be passed to the callback function. Depends on the implementation
- * @return result of the search
- * @pre proc != nullptr
- * @pre size > 0
- */
-bool CircularTileSearch(TileIndex *tile, uint size, TestTileOnSearchProc proc, void *user_data)
-{
-	assert(proc != nullptr);
-	assert(size > 0);
-
-	if (size % 2 == 1) {
-		/* If the length of the side is uneven, the center has to be checked
-		 * separately, as the pattern of uneven sides requires to go around the center */
-		if (proc(*tile, user_data)) return true;
-
-		/* If tile test is not successful, get one tile up,
-		 * ready for a test in first circle around center tile */
-		*tile = TileAddByDir(*tile, DIR_N);
-		return CircularTileSearch(tile, size / 2, 1, 1, proc, user_data);
-	} else {
-		return CircularTileSearch(tile, size / 2, 0, 0, proc, user_data);
-	}
-}
-
-/**
- * Generalized circular search allowing for rectangles and a hole.
- * Function performing a search around a center rectangle and going outward.
- * The center rectangle is left out from the search. To do a rectangular search
- * without a hole, set either h or w to zero.
- * Every tile will be tested by means of the callback function proc,
- * which will determine if yes or no the given tile meets criteria of search.
- * @param tile to start the search from. Upon completion, it will return the tile matching the search.
- *  This tile should be directly north of the hole (if any).
- * @param radius How many tiles to search outwards. Note: This is a radius and thus different
- *                from the size parameter of the other CircularTileSearch function, which is a diameter.
- * @param w the width of the inner rectangle
- * @param h the height of the inner rectangle
- * @param proc callback testing function pointer.
- * @param user_data to be passed to the callback function. Depends on the implementation
- * @return result of the search
- * @pre proc != nullptr
- * @pre radius > 0
- */
-bool CircularTileSearch(TileIndex *tile, uint radius, uint w, uint h, TestTileOnSearchProc proc, void *user_data)
-{
-	assert(proc != nullptr);
-	assert(radius > 0);
-
-	uint x = TileX(*tile) + w + 1;
-	uint y = TileY(*tile);
-
-	const uint extent[DIAGDIR_END] = { w, h, w, h };
-
-	for (uint n = 0; n < radius; n++) {
-		for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) {
-			/* Is the tile within the map? */
-			for (uint j = extent[dir] + n * 2 + 1; j != 0; j--) {
-				if (x < Map::SizeX() && y < Map::SizeY()) {
-					TileIndex t = TileXY(x, y);
-					/* Is the callback successful? */
-					if (proc(t, user_data)) {
-						/* Stop the search */
-						*tile = t;
-						return true;
-					}
-				}
-
-				/* Step to the next 'neighbour' in the circular line */
-				x += _tileoffs_by_diagdir[dir].x;
-				y += _tileoffs_by_diagdir[dir].y;
-			}
-		}
-		/* Jump to next circle to test */
-		x += _tileoffs_by_dir[DIR_W].x;
-		y += _tileoffs_by_dir[DIR_W].y;
-	}
-
-	*tile = INVALID_TILE;
-	return false;
-}
-
 /**
  * Finds the distance for the closest tile with water/land given a tile
  * @param tile  the tile to find the distance too
diff --git a/src/map_func.h b/src/map_func.h
index 370099b43f..e1929c2f91 100644
--- a/src/map_func.h
+++ b/src/map_func.h
@@ -632,18 +632,6 @@ inline DiagDirection DiagdirBetweenTiles(TileIndex tile_from, TileIndex tile_to)
 	}
 }
 
-/**
- * A callback function type for searching tiles.
- *
- * @param tile The tile to test
- * @param user_data additional data for the callback function to use
- * @return A boolean value, depend on the definition of the function.
- */
-typedef bool TestTileOnSearchProc(TileIndex tile, void *user_data);
-
-bool CircularTileSearch(TileIndex *tile, uint size, TestTileOnSearchProc proc, void *user_data);
-bool CircularTileSearch(TileIndex *tile, uint radius, uint w, uint h, TestTileOnSearchProc proc, void *user_data);
-
 /**
  * Get a random tile out of a given seed.
  * @param r the random 'seed'
diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt
index f45fa06960..f6df9b38eb 100644
--- a/src/misc/CMakeLists.txt
+++ b/src/misc/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_files(
+    alternating_iterator.hpp
+    autorelease.hpp
     binaryheap.hpp
     dbg_helpers.cpp
     dbg_helpers.h
diff --git a/src/misc/alternating_iterator.hpp b/src/misc/alternating_iterator.hpp
new file mode 100644
index 0000000000..a5b6d6f591
--- /dev/null
+++ b/src/misc/alternating_iterator.hpp
@@ -0,0 +1,145 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file alternating_iterator.hpp Iterator adaptor that takes items alternating from a middle position. */
+
+#ifndef ALTERNATING_ITERATOR_HPP
+#define ALTERNATING_ITERATOR_HPP
+
+#include <ranges>
+
+/**
+ * Iterator that alternately takes from the "middle" of a range.
+ * @tparam Titer Type of iterator.
+ */
+template <typename Titer>
+class AlternatingIterator {
+public:
+	using value_type = typename Titer::value_type;
+	using difference_type = std::ptrdiff_t;
+	using iterator_category = std::forward_iterator_tag;
+	using pointer = typename Titer::pointer;
+	using reference = typename Titer::reference;
+
+	AlternatingIterator() = default;
+
+	/**
+	 * Construct an AlternatingIterator.
+	 * @param first Iterator to first element.
+	 * @param last Iterator to last element.
+	 * @param middle Iterator to "middle" element, from where to start.
+	 * @param begin Whether this iterator points to the first or last elements.
+	 */
+	AlternatingIterator(Titer first, Titer last, Titer middle, bool begin) : first(first), last(last), middle(middle)
+	{
+		/* Starting from the end is not supported, unless the range is empty. */
+		assert(first == last || middle != last);
+
+		this->position = begin ? 0 : std::distance(this->first, this->last);
+		this->before = middle;
+		this->after = middle;
+		this->next_state = this->before == this->first;
+		this->state = this->next_state;
+	}
+
+	bool operator==(const AlternatingIterator &rhs) const
+	{
+		assert(this->first == rhs.first);
+		assert(this->last == rhs.last);
+		assert(this->middle == rhs.middle);
+		return this->position == rhs.position;
+	}
+
+	std::strong_ordering operator<=>(const AlternatingIterator &rhs) const
+	{
+		assert(this->first == rhs.first);
+		assert(this->last == rhs.last);
+		assert(this->middle == rhs.middle);
+		return this->position <=> rhs.position;
+	}
+
+	inline reference operator*() const
+	{
+		return *this->Base();
+	}
+
+	AlternatingIterator &operator++()
+	{
+		size_t size = static_cast<size_t>(std::distance(this->first, this->last));
+		assert(this->position < size);
+
+		++this->position;
+		if (this->position < size) this->Next();
+
+		return *this;
+	}
+
+	AlternatingIterator operator++(int)
+	{
+		AlternatingIterator result = *this;
+		++*this;
+		return result;
+	}
+
+	inline Titer Base() const
+	{
+		return this->state ? this->after : this->before;
+	}
+
+private:
+	Titer first; ///< Initial first iterator.
+	Titer last; ///< Initial last iterator.
+	Titer middle; ///< Initial middle iterator.
+
+	Titer after; ///< Current iterator after the middle.
+	Titer before; ///< Current iterator before the middle.
+
+	size_t position; ///< Position within the entire range.
+
+	bool next_state; ///< Next state for advancing iterator. If true take from after middle, otherwise take from before middle.
+	bool state; ///< Current state for reading iterator. If true take from after middle, otherwise take from before middle.
+
+	void Next()
+	{
+		this->state = this->next_state;
+		if (this->next_state) {
+			assert(this->after != this->last);
+			++this->after;
+			this->next_state = this->before == this->first;
+		} else {
+			assert(this->before != this->first);
+			--this->before;
+			this->next_state = std::next(this->after) != this->last;
+		}
+	}
+};
+
+template <typename Titer>
+class AlternatingView : public std::ranges::view_interface<AlternatingIterator<Titer>> {
+public:
+	AlternatingView(std::ranges::viewable_range auto &&range, Titer middle) :
+		first(std::ranges::begin(range)), last(std::ranges::end(range)), middle(middle)
+	{
+	}
+
+	auto begin() const
+	{
+		return AlternatingIterator{first, last, middle, true};
+	}
+
+	auto end() const
+	{
+		return AlternatingIterator{first, last, middle, false};
+	}
+
+private:
+	Titer first; ///< Iterator to first element.
+	Titer last; ///< Iterator to last element.
+	Titer middle; ///< Iterator to middle element.
+};
+
+#endif /* ALTERNATING_ITERATOR_HPP */
diff --git a/src/misc/autorelease.hpp b/src/misc/autorelease.hpp
new file mode 100644
index 0000000000..78f5d87226
--- /dev/null
+++ b/src/misc/autorelease.hpp
@@ -0,0 +1,27 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file autorelease.hpp Helper for std::unique_ptr to use an arbitrary function as the deleter. */
+
+#ifndef AUTORELEASE_HPP
+#define AUTORELEASE_HPP
+
+/** Deleter that calls a function rather than deleting the pointer. */
+template <auto Tfunc>
+struct DeleterFromFunc {
+	template <typename T>
+	constexpr void operator()(T *arg) const
+	{
+		if (arg != nullptr) Tfunc(arg);
+	}
+};
+
+/** Specialisation of std::unique_ptr for objects which must be deleted by calling a function. */
+template <typename T, auto Tfunc>
+using AutoRelease = std::unique_ptr<T, DeleterFromFunc<Tfunc>>;
+
+#endif /* AUTORELEASE_HPP */
diff --git a/src/misc/dbg_helpers.cpp b/src/misc/dbg_helpers.cpp
index 647510ebd7..7e2d4314c4 100644
--- a/src/misc/dbg_helpers.cpp
+++ b/src/misc/dbg_helpers.cpp
@@ -9,12 +9,13 @@
 
 #include "../stdafx.h"
 #include "../rail_map.h"
+#include "../core/enum_type.hpp"
 #include "dbg_helpers.h"
 
 #include "../safeguards.h"
 
 /** Trackdir & TrackdirBits short names. */
-static const char * const trackdir_names[] = {
+static const std::string_view trackdir_names[] = {
 	"NE", "SE", "UE", "LE", "LS", "RS", "rne", "rse",
 	"SW", "NW", "UW", "LW", "LN", "RN", "rsw", "rnw",
 };
@@ -22,37 +23,37 @@ static const char * const trackdir_names[] = {
 /** Return name of given Trackdir. */
 std::string ValueStr(Trackdir td)
 {
-	return std::to_string(td) + " (" + ItemAtT(td, trackdir_names, "UNK", INVALID_TRACKDIR, "INV") + ")";
+	return fmt::format("{} ({})", to_underlying(td), ItemAtT(td, trackdir_names, "UNK", INVALID_TRACKDIR, "INV"));
 }
 
 /** Return composed name of given TrackdirBits. */
 std::string ValueStr(TrackdirBits td_bits)
 {
-	return std::to_string(td_bits) + " (" + ComposeNameT(td_bits, trackdir_names, "UNK", INVALID_TRACKDIR_BIT, "INV") + ")";
+	return fmt::format("{} ({})", to_underlying(td_bits), ComposeNameT(td_bits, trackdir_names, "UNK", INVALID_TRACKDIR_BIT, "INV"));
 }
 
 
 /** DiagDirection short names. */
-static const char * const diagdir_names[] = {
+static const std::string_view diagdir_names[] = {
 	"NE", "SE", "SW", "NW",
 };
 
 /** Return name of given DiagDirection. */
 std::string ValueStr(DiagDirection dd)
 {
-	return std::to_string(dd) + " (" + ItemAtT(dd, diagdir_names, "UNK", INVALID_DIAGDIR, "INV") + ")";
+	return fmt::format("{} ({})", to_underlying(dd), ItemAtT(dd, diagdir_names, "UNK", INVALID_DIAGDIR, "INV"));
 }
 
 
 /** SignalType short names. */
-static const char * const signal_type_names[] = {
+static const std::string_view signal_type_names[] = {
 	"NORMAL", "ENTRY", "EXIT", "COMBO", "PBS", "NOENTRY",
 };
 
 /** Return name of given SignalType. */
 std::string ValueStr(SignalType t)
 {
-	return std::to_string(t) + " (" + ItemAtT(t, signal_type_names, "UNK") + ")";
+	return fmt::format("{} ({})", to_underlying(t), ItemAtT(t, signal_type_names, "UNK"));
 }
 
 
@@ -105,31 +106,17 @@ void DumpTarget::WriteIndent()
 	}
 }
 
-/** Write 'name = value' with indent and new-line. */
-void DumpTarget::WriteValue(const std::string &name, int value)
-{
-	WriteIndent();
-	m_out += name + " = " + std::to_string(value) + "\n";
-}
-
-/** Write 'name = value' with indent and new-line. */
-void DumpTarget::WriteValue(const std::string &name, const std::string &value_str)
-{
-	WriteIndent();
-	m_out += name + " = " + value_str + "\n";
-}
-
 /** Write name & TileIndex to the output. */
-void DumpTarget::WriteTile(const std::string &name, TileIndex tile)
+void DumpTarget::WriteTile(std::string_view name, TileIndex tile)
 {
 	WriteIndent();
-	m_out += name + " = " + TileStr(tile) + "\n";
+	format_append(m_out, "{} = {}\n", name, TileStr(tile));
 }
 
 /**
  * Open new structure (one level deeper than the current one) 'name = {\<LF\>'.
  */
-void DumpTarget::BeginStruct(size_t type_id, const std::string &name, const void *ptr)
+void DumpTarget::BeginStruct(size_t type_id, std::string_view name, const void *ptr)
 {
 	/* make composite name */
 	std::string cur_name = GetCurrentStructName();
@@ -146,7 +133,7 @@ void DumpTarget::BeginStruct(size_t type_id, const std::string &name, const void
 	m_known_names.insert(KNOWN_NAMES::value_type(KnownStructKey(type_id, ptr), cur_name));
 
 	WriteIndent();
-	m_out += name + " = {\n";
+	format_append(m_out, "{} = {{\n", name);
 	m_indent++;
 }
 
diff --git a/src/misc/dbg_helpers.h b/src/misc/dbg_helpers.h
index 87505ad4cd..69e598fb74 100644
--- a/src/misc/dbg_helpers.h
+++ b/src/misc/dbg_helpers.h
@@ -16,6 +16,7 @@
 #include "../signal_type.h"
 #include "../tile_type.h"
 #include "../track_type.h"
+#include "../core/format.hpp"
 
 /** Helper template class that provides C array length and item type */
 template <typename T> struct ArrayT;
@@ -64,7 +65,7 @@ inline typename ArrayT<T>::Item ItemAtT(E idx, const T &t, typename ArrayT<T>::I
  * or t_unk when index is out of bounds.
  */
 template <typename E, typename T>
-inline std::string ComposeNameT(E value, T &t, const char *t_unk, E val_inv, const char *name_inv)
+inline std::string ComposeNameT(E value, T &t, std::string_view t_unk, E val_inv, std::string_view name_inv)
 {
 	std::string out;
 	if (value == val_inv) {
@@ -156,23 +157,28 @@ struct DumpTarget {
 
 	void WriteIndent();
 
-	void WriteValue(const std::string &name, int value);
-	void WriteValue(const std::string &name, const std::string &value_str);
-	void WriteTile(const std::string &name, TileIndex t);
+	/** Write 'name = value' with indent and new-line. */
+	void WriteValue(std::string_view name, const auto &value)
+	{
+		WriteIndent();
+		format_append(m_out, "{} = {}\n", name, value);
+	}
+
+	void WriteTile(std::string_view name, TileIndex t);
 
 	/** Dump given enum value (as a number and as named value) */
-	template <typename E> void WriteEnumT(const std::string &name, E e)
+	template <typename E> void WriteEnumT(std::string_view name, E e)
 	{
 		WriteValue(name, ValueStr(e));
 	}
 
-	void BeginStruct(size_t type_id, const std::string &name, const void *ptr);
+	void BeginStruct(size_t type_id, std::string_view name, const void *ptr);
 	void EndStruct();
 
 	/** Dump nested object (or only its name if this instance is already known). */
-	template <typename S> void WriteStructT(const std::string &name, const S *s)
+	template <typename S> void WriteStructT(std::string_view name, const S *s)
 	{
-		static size_t type_id = ++LastTypeId();
+		static const size_t type_id = ++LastTypeId();
 
 		if (s == nullptr) {
 			/* No need to dump nullptr struct. */
@@ -193,9 +199,9 @@ struct DumpTarget {
 	}
 
 	/** Dump nested object (or only its name if this instance is already known). */
-	template <typename S> void WriteStructT(const std::string &name, const std::deque<S> *s)
+	template <typename S> void WriteStructT(std::string_view name, const std::deque<S> *s)
 	{
-		static size_t type_id = ++LastTypeId();
+		static const size_t type_id = ++LastTypeId();
 
 		if (s == nullptr) {
 			/* No need to dump nullptr struct. */
@@ -211,7 +217,7 @@ struct DumpTarget {
 			/* Still unknown, dump it */
 			BeginStruct(type_id, name, s);
 			size_t num_items = s->size();
-			this->WriteValue("num_items", std::to_string(num_items));
+			this->WriteValue("num_items", num_items);
 			for (size_t i = 0; i < num_items; i++) {
 				const auto &item = (*s)[i];
 				this->WriteStructT(fmt::format("item[{}]", i), &item);
diff --git a/src/misc/endian_buffer.hpp b/src/misc/endian_buffer.hpp
index d72cfca8af..ca531eb641 100644
--- a/src/misc/endian_buffer.hpp
+++ b/src/misc/endian_buffer.hpp
@@ -31,7 +31,6 @@ public:
 
 	EndianBufferWriter &operator <<(const std::string &data) { return *this << std::string_view{ data }; }
 	EndianBufferWriter &operator <<(const EncodedString &data) { return *this << data.string; }
-	EndianBufferWriter &operator <<(const char *data) { return *this << std::string_view{ data }; }
 	EndianBufferWriter &operator <<(std::string_view data) { this->Write(data); return *this; }
 	EndianBufferWriter &operator <<(bool data) { return *this << static_cast<uint8_t>(data ? 1 : 0); }
 
diff --git a/src/misc/getoptdata.cpp b/src/misc/getoptdata.cpp
index fbc4907375..73494bc1dc 100644
--- a/src/misc/getoptdata.cpp
+++ b/src/misc/getoptdata.cpp
@@ -21,30 +21,30 @@
  */
 int GetOptData::GetOpt()
 {
-	const char *s = this->cont;
-	if (s == nullptr) {
+	std::string_view s = this->cont;
+	if (s.empty()) {
 		if (this->arguments.empty()) return -1; // No arguments left -> finished.
 
 		s = this->arguments[0];
-		if (*s != '-') return -1; // No leading '-' -> not an option -> finished.
+		if (s[0] != '-') return -1; // No leading '-' -> not an option -> finished.
 
 		this->arguments = this->arguments.subspan(1);
 
 		/* Is it a long option? */
 		for (auto &option : this->options) {
-			if (option.longname != nullptr && !strcmp(option.longname, s)) { // Long options always use the entire argument.
-				this->cont = nullptr;
+			if (option.longname == s) { // Long options always use the entire argument.
+				this->cont = {};
 				return this->GetOpt(option);
 			}
 		}
 
-		s++; // Skip leading '-'.
+		s.remove_prefix(1); // Skip leading '-'.
 	}
 
 	/* Is it a short option? */
 	for (auto &option : this->options) {
-		if (option.shortname != '\0' && *s == option.shortname) {
-			this->cont = (s[1] != '\0') ? s + 1 : nullptr;
+		if (option.shortname != '\0' && s[0] == option.shortname) {
+			this->cont = s.substr(1);
 			return this->GetOpt(option);
 		}
 	}
@@ -54,16 +54,16 @@ int GetOptData::GetOpt()
 
 int GetOptData::GetOpt(const OptionData &option)
 {
-	this->opt = nullptr;
+	this->opt = {};
 	switch (option.type) {
 		case ODF_NO_VALUE:
 			return option.id;
 
 		case ODF_HAS_VALUE:
 		case ODF_OPTIONAL_VALUE:
-			if (this->cont != nullptr) { // Remainder of the argument is the option value.
+			if (!this->cont.empty()) { // Remainder of the argument is the option value.
 				this->opt = this->cont;
-				this->cont = nullptr;
+				this->cont = {};
 				return option.id;
 			}
 			/* No more arguments, either return an error or a value-less option. */
diff --git a/src/misc/getoptdata.h b/src/misc/getoptdata.h
index 244c96358b..a5fe16733d 100644
--- a/src/misc/getoptdata.h
+++ b/src/misc/getoptdata.h
@@ -22,18 +22,18 @@ struct OptionData {
 	OptionDataType type; ///< The type of option.
 	char id; ///< Unique identification of this option data, often the same as #shortname.
 	char shortname = '\0'; ///< Short option letter if available, else use \c '\0'.
-	const char *longname = nullptr; ///< Long option name including '-'/'--' prefix, use \c nullptr if not available.
+	std::string_view longname{}; ///< Long option name including '-'/'--' prefix, leave empty if not available.
 };
 
 /** Data storage for parsing command line options. */
 struct GetOptData {
 	using OptionSpan = std::span<const OptionData>;
-	using ArgumentSpan = std::span<char * const>;
+	using ArgumentSpan = std::span<std::string_view>;
 
 	ArgumentSpan arguments; ///< Remaining command line arguments.
 	const OptionSpan options; ///< Command line option descriptions.
-	const char *opt = nullptr; ///< Option value, if available (else \c nullptr).
-	const char *cont = nullptr; ///< Next call to #GetOpt should start here (in the middle of an argument).
+	std::string_view opt; ///< Option value, if available (else empty).
+	std::string_view cont; ///< Next call to #GetOpt should start here (in the middle of an argument).
 
 	/**
 	 * Constructor of the data store.
diff --git a/src/misc/hashtable.hpp b/src/misc/hashtable.hpp
index 36eeaf421c..52a06462c9 100644
--- a/src/misc/hashtable.hpp
+++ b/src/misc/hashtable.hpp
@@ -147,7 +147,7 @@ protected:
 	int number_of_items = 0; // item counter
 
 	/** static helper - return hash for the given key modulo number of slots */
-	inline static int CalcHash(const Tkey &key)
+	static inline int CalcHash(const Tkey &key)
 	{
 		uint32_t hash = key.CalcHash();
 		hash -= (hash >> 17);          // hash * 131071 / 131072
@@ -157,7 +157,7 @@ protected:
 	}
 
 	/** static helper - return hash for the given item modulo number of slots */
-	inline static int CalcHash(const Titem &item)
+	static inline int CalcHash(const Titem &item)
 	{
 		return CalcHash(item.GetKey());
 	}
diff --git a/src/misc/lrucache.hpp b/src/misc/lrucache.hpp
index b5f262a3a7..7267cfb128 100644
--- a/src/misc/lrucache.hpp
+++ b/src/misc/lrucache.hpp
@@ -15,17 +15,20 @@
 
 /**
  * Size limited cache with a least recently used eviction strategy.
+ * @note If a comparator is provided, the lookup type is a std::map, otherwise std::unordered_map is used.
  * @tparam Tkey Type of the cache key.
- * @tparam Tdata Type of the cache item. The cache will store a pointer of this type.
+ * @tparam Tdata Type of the cache item.
  */
-template <class Tkey, class Tdata>
+template <class Tkey, class Tdata, class Thash = std::hash<Tkey>, class Tequality = std::equal_to<>>
 class LRUCache {
 private:
-	typedef std::pair<Tkey, std::unique_ptr<Tdata>> Tpair;
-	typedef typename std::list<Tpair>::iterator Titer;
+	using PairType = std::pair<Tkey, Tdata>;
+	using StorageType = std::list<PairType>;
+	using IteratorType = StorageType::iterator;
+	using LookupType = std::unordered_map<Tkey, IteratorType, Thash, Tequality>;
 
-	std::list<Tpair> data; ///< Ordered list of all items.
-	std::unordered_map<Tkey, Titer> lookup;  ///< Map of keys to items.
+	StorageType data; ///< Ordered list of all items.
+	LookupType lookup; ///< Map of keys to items.
 
 	const size_t capacity; ///< Number of items to cache.
 
@@ -41,7 +44,7 @@ public:
 	 * @param key The key to search.
 	 * @return True, if the key was found.
 	 */
-	inline bool Contains(const Tkey key)
+	inline bool Contains(const Tkey &key)
 	{
 		return this->lookup.find(key) != this->lookup.end();
 	}
@@ -51,11 +54,12 @@ public:
 	 * @param key Key under which the item should be stored.
 	 * @param item Item to insert.
 	 */
-	void Insert(const Tkey key, std::unique_ptr<Tdata> &&item)
+	void Insert(const Tkey &key, Tdata &&item)
 	{
-		if (this->Contains(key)) {
+		auto it = this->lookup.find(key);
+		if (it != this->lookup.end()) {
 			/* Replace old value. */
-			this->lookup[key]->second = std::move(item);
+			it->second->second = std::move(item);
 			return;
 		}
 
@@ -85,13 +89,31 @@ public:
 	 * @return The item value.
 	 * @note Throws if item not found.
 	 */
-	inline Tdata *Get(const Tkey key)
+	inline const Tdata &Get(const Tkey &key)
 	{
-		if (this->lookup.find(key) == this->lookup.end()) throw std::out_of_range("item not found");
+		auto it = this->lookup.find(key);
+		if (it == this->lookup.end()) throw std::out_of_range("item not found");
 		/* Move to front if needed. */
-		this->data.splice(this->data.begin(), this->data, this->lookup[key]);
+		this->data.splice(this->data.begin(), this->data, it->second);
 
-		return this->data.front().second.get();
+		return this->data.front().second;
+	}
+
+	/**
+	 * Get an item from the cache.
+	 * @param key The key to look up.
+	 * @return The item value.
+	 * @note Throws if item not found.
+	 */
+	inline Tdata *GetIfValid(const auto &key)
+	{
+		auto it = this->lookup.find(key);
+		if (it == this->lookup.end()) return nullptr;
+
+		/* Move to front if needed. */
+		this->data.splice(this->data.begin(), this->data, it->second);
+
+		return &this->data.front().second;
 	}
 };
 
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index bae49d57f3..719f5a5dfa 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -58,7 +58,7 @@ static constexpr NWidgetPart _nested_land_info_widgets[] = {
 };
 
 static WindowDesc _land_info_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_LAND_INFO, WC_NONE,
 	{},
 	_nested_land_info_widgets
@@ -336,7 +336,7 @@ static constexpr NWidgetPart _nested_about_widgets[] = {
 };
 
 static WindowDesc _about_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	{},
 	_nested_about_widgets
@@ -465,7 +465,7 @@ struct AboutWindow : public Window {
 	 *
 	 * The interval of 2100ms is chosen to maintain parity: 2100 / GetCharacterHeight(FS_NORMAL) = 150ms.
 	 */
-	IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(2100) / GetCharacterHeight(FS_NORMAL), [this](uint count) {
+	const IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(2100) / GetCharacterHeight(FS_NORMAL), [this](uint count) {
 		this->text_position -= count;
 		/* If the last text has scrolled start a new from the start */
 		if (this->text_position < (int)(this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y - std::size(_credits) * this->line_height)) {
@@ -591,7 +591,7 @@ static constexpr NWidgetPart _nested_tooltips_widgets[] = {
 };
 
 static WindowDesc _tool_tips_desc(
-	WDP_MANUAL, nullptr, 0, 0, // Coordinates and sizes are not used,
+	WDP_MANUAL, {}, 0, 0, // Coordinates and sizes are not used,
 	WC_TOOLTIPS, WC_NONE,
 	{WindowDefaultFlag::NoFocus, WindowDefaultFlag::NoClose},
 	_nested_tooltips_widgets
@@ -744,7 +744,7 @@ void QueryString::DrawEditBox(const Window *w, WidgetID wid) const
 
 	DrawFrameRect(cr, wi->colour, wi->IsLowered() ? FrameFlag::Lowered : FrameFlags{});
 	DrawSpriteIgnorePadding(rtl ? SPR_IMG_DELETE_RIGHT : SPR_IMG_DELETE_LEFT, PAL_NONE, cr, SA_CENTER);
-	if (StrEmpty(this->text.GetText())) GfxFillRect(cr.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(wi->colour, SHADE_DARKER), FILLRECT_CHECKER);
+	if (this->text.GetText().empty()) GfxFillRect(cr.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(wi->colour, SHADE_DARKER), FILLRECT_CHECKER);
 
 	DrawFrameRect(fr, wi->colour, {FrameFlag::Lowered, FrameFlag::Darkened});
 	GfxFillRect(fr.Shrink(WidgetDimensions::scaled.bevel), PC_BLACK);
@@ -767,14 +767,14 @@ void QueryString::DrawEditBox(const Window *w, WidgetID wid) const
 	/* If we have a marked area, draw a background highlight. */
 	if (tb->marklength != 0) GfxFillRect(fr.left + tb->markxoffs, fr.top, fr.left + tb->markxoffs + tb->marklength - 1, fr.bottom, PC_GREY);
 
-	DrawString(fr.left, fr.right, CenterBounds(fr.top, fr.bottom, GetCharacterHeight(FS_NORMAL)), tb->GetText(), TC_YELLOW);
+	DrawString(fr.left, fr.right, CentreBounds(fr.top, fr.bottom, GetCharacterHeight(FS_NORMAL)), tb->GetText(), TC_YELLOW);
 	bool focussed = w->IsWidgetGloballyFocused(wid) || IsOSKOpenedFor(w, wid);
 	if (focussed && tb->caret) {
 		int caret_width = GetCaretWidth();
 		if (rtl) {
-			DrawString(fr.right - tb->pixels + tb->caretxoffs - caret_width, fr.right - tb->pixels + tb->caretxoffs, CenterBounds(fr.top, fr.bottom, GetCharacterHeight(FS_NORMAL)), "_", TC_WHITE);
+			DrawString(fr.right - tb->pixels + tb->caretxoffs - caret_width, fr.right - tb->pixels + tb->caretxoffs, CentreBounds(fr.top, fr.bottom, GetCharacterHeight(FS_NORMAL)), "_", TC_WHITE);
 		} else {
-			DrawString(fr.left + tb->caretxoffs, fr.left + tb->caretxoffs + caret_width, CenterBounds(fr.top, fr.bottom, GetCharacterHeight(FS_NORMAL)), "_", TC_WHITE);
+			DrawString(fr.left + tb->caretxoffs, fr.left + tb->caretxoffs + caret_width, CentreBounds(fr.top, fr.bottom, GetCharacterHeight(FS_NORMAL)), "_", TC_WHITE);
 		}
 	}
 }
@@ -813,7 +813,7 @@ Point QueryString::GetCaretPosition(const Window *w, WidgetID wid) const
  * @param to End of the string range.
  * @return Rectangle encompassing the string range, relative to the window.
  */
-Rect QueryString::GetBoundingRect(const Window *w, WidgetID wid, const char *from, const char *to) const
+Rect QueryString::GetBoundingRect(const Window *w, WidgetID wid, size_t from, size_t to) const
 {
 	const NWidgetLeaf *wi = w->GetWidget<NWidgetLeaf>(wid);
 
@@ -877,7 +877,7 @@ void QueryString::ClickEditBox(Window *w, Point pt, WidgetID wid, int click_coun
 	Rect cr = wi->GetCurrentRect().WithWidth(clearbtn_width, !rtl);
 
 	if (IsInsideMM(pt.x, cr.left, cr.right)) {
-		if (!StrEmpty(this->text.GetText())) {
+		if (!this->text.GetText().empty()) {
 			this->text.DeleteAll();
 			w->HandleButtonClick(wid);
 			w->OnEditboxChanged(wid);
@@ -942,7 +942,7 @@ struct QueryStringWindow : public Window
 		if (!this->editbox.orig.has_value() || this->editbox.text.GetText() != this->editbox.orig) {
 			assert(this->parent != nullptr);
 
-			this->parent->OnQueryTextFinished(this->editbox.text.GetText());
+			this->parent->OnQueryTextFinished(std::string{this->editbox.text.GetText()});
 			this->editbox.handled = true;
 		}
 	}
@@ -991,7 +991,7 @@ static constexpr NWidgetPart _nested_query_string_widgets[] = {
 };
 
 static WindowDesc _query_string_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
 	{},
 	_nested_query_string_widgets
@@ -1037,7 +1037,7 @@ struct QueryWindow : public Window {
 		this->Window::Close();
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int, bool) override
 	{
 		/* Position query window over the calling window, ensuring it's within screen bounds. */
 		this->left = SoftClamp(parent->left + (parent->width / 2) - (this->width / 2), 0, _screen.width - this->width);
@@ -1130,7 +1130,7 @@ static constexpr NWidgetPart _nested_query_widgets[] = {
 };
 
 static WindowDesc _query_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
 	WindowDefaultFlag::Modal,
 	_nested_query_widgets
diff --git a/src/mixer.cpp b/src/mixer.cpp
index 81205cf398..ec46d786e3 100644
--- a/src/mixer.cpp
+++ b/src/mixer.cpp
@@ -19,7 +19,7 @@
 
 struct MixerChannel {
 	/* pointer to allocated buffer memory */
-	std::shared_ptr<std::vector<uint8_t>> memory;
+	std::shared_ptr<std::vector<std::byte>> memory;
 
 	/* current position in memory */
 	uint32_t pos;
@@ -131,7 +131,7 @@ void MxMixSamples(void *buffer, uint samples)
 	}
 
 	/* Clear the buffer */
-	memset(buffer, 0, sizeof(int16_t) * 2 * samples);
+	std::fill_n(static_cast<int16_t *>(buffer), 2 * samples, 0);
 
 	{
 		std::lock_guard<std::mutex> lock{ _music_stream_mutex };
@@ -180,7 +180,7 @@ MixerChannel *MxAllocateChannel()
 	return mc;
 }
 
-void MxSetChannelRawSrc(MixerChannel *mc, const std::shared_ptr<std::vector<uint8_t>> &mem, uint rate, bool is16bit)
+void MxSetChannelRawSrc(MixerChannel *mc, const std::shared_ptr<std::vector<std::byte>> &mem, uint rate, bool is16bit)
 {
 	mc->memory = mem;
 	mc->frac_pos = 0;
diff --git a/src/mixer.h b/src/mixer.h
index 265725696e..707967d234 100644
--- a/src/mixer.h
+++ b/src/mixer.h
@@ -24,7 +24,7 @@ bool MxInitialize(uint rate);
 void MxMixSamples(void *buffer, uint samples);
 
 MixerChannel *MxAllocateChannel();
-void MxSetChannelRawSrc(MixerChannel *mc, const std::shared_ptr<std::vector<uint8_t>> &mem, uint rate, bool is16bit);
+void MxSetChannelRawSrc(MixerChannel *mc, const std::shared_ptr<std::vector<std::byte>> &mem, uint rate, bool is16bit);
 void MxSetChannelVolume(MixerChannel *mc, uint volume, float pan);
 void MxActivateChannel(MixerChannel*);
 void MxCloseAllChannels();
diff --git a/src/music.cpp b/src/music.cpp
index a8bf2ee1ac..bca4a671e4 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -12,6 +12,7 @@
 #include "base_media_func.h"
 #include "base_media_music.h"
 #include "random_access_file_type.h"
+#include "core/string_consumer.hpp"
 
 #include "safeguards.h"
 
@@ -83,7 +84,7 @@ template <>
 }
 
 template <>
-/* static */ const char *BaseMedia<MusicSet>::GetExtension()
+/* static */ std::string_view BaseMedia<MusicSet>::GetExtension()
 {
 	return ".obm"; // OpenTTD Base Music
 }
@@ -94,7 +95,7 @@ template <>
 	if (BaseMedia<MusicSet>::used_set != nullptr) return true;
 
 	const MusicSet *best = nullptr;
-	for (const MusicSet *c = BaseMedia<MusicSet>::available_sets; c != nullptr; c = c->next) {
+	for (const auto &c : BaseMedia<MusicSet>::available_sets) {
 		if (c->GetNumMissing() != 0) continue;
 
 		if (best == nullptr ||
@@ -102,7 +103,7 @@ template <>
 				best->valid_files < c->valid_files ||
 				(best->valid_files == c->valid_files &&
 					(best->shortname == c->shortname && best->version < c->version))) {
-			best = c;
+			best = c.get();
 		}
 	}
 
@@ -133,7 +134,12 @@ bool MusicSet::FillSetDetails(const IniFile &ini, const std::string &path, const
 			if (item != nullptr && item->value.has_value() && !item->value->empty()) {
 				/* Song has a CAT file index, assume it's MPS MIDI format */
 				this->songinfo[i].filetype = MTT_MPSMIDI;
-				this->songinfo[i].cat_index = atoi(item->value->c_str());
+				auto value = ParseInteger(*item->value);
+				if (!value.has_value()) {
+					Debug(grf, 0, "Invalid base music set song index: {}/{}", filename, *item->value);
+					continue;
+				}
+				this->songinfo[i].cat_index = *value;
 				auto songname = GetMusicCatEntryName(filename, this->songinfo[i].cat_index);
 				if (!songname.has_value()) {
 					Debug(grf, 0, "Base music set song missing from CAT file: {}/{}", filename, this->songinfo[i].cat_index);
@@ -144,17 +150,24 @@ bool MusicSet::FillSetDetails(const IniFile &ini, const std::string &path, const
 				this->songinfo[i].filetype = MTT_STANDARDMIDI;
 			}
 
-			const char *trimmed_filename = filename.c_str();
+			std::string_view trimmed_filename{filename};
 			/* As we possibly add a path to the filename and we compare
 			 * on the filename with the path as in the .obm, we need to
 			 * keep stripping path elements until we find a match. */
-			for (; trimmed_filename != nullptr; trimmed_filename = strchr(trimmed_filename, PATHSEPCHAR)) {
+			while (!trimmed_filename.empty()) {
 				/* Remove possible double path separator characters from
 				 * the beginning, so we don't start reading e.g. root. */
-				while (*trimmed_filename == PATHSEPCHAR) trimmed_filename++;
+				while (trimmed_filename.starts_with(PATHSEPCHAR)) trimmed_filename.remove_prefix(1);
 
 				item = names != nullptr ? names->GetItem(trimmed_filename) : nullptr;
 				if (item != nullptr && item->value.has_value() && !item->value->empty()) break;
+
+				auto next = trimmed_filename.find(PATHSEPCHAR);
+				if (next == std::string_view::npos) {
+					trimmed_filename = {};
+				} else {
+					trimmed_filename.remove_prefix(next);
+				}
 			}
 
 			if (this->songinfo[i].filetype == MTT_STANDARDMIDI) {
@@ -174,12 +187,15 @@ bool MusicSet::FillSetDetails(const IniFile &ini, const std::string &path, const
 				this->songinfo[i].tracknr = tracknr++;
 			}
 
-			item = trimmed_filename != nullptr && timingtrim != nullptr ? timingtrim->GetItem(trimmed_filename) : nullptr;
+			item = !trimmed_filename.empty() && timingtrim != nullptr ? timingtrim->GetItem(trimmed_filename) : nullptr;
 			if (item != nullptr && item->value.has_value() && !item->value->empty()) {
-				auto endpos = item->value->find(':');
-				if (endpos != std::string::npos) {
-					this->songinfo[i].override_start = atoi(item->value->c_str());
-					this->songinfo[i].override_end = atoi(item->value->c_str() + endpos + 1);
+				StringConsumer consumer{*item->value};
+				auto start = consumer.TryReadIntegerBase<uint>(10);
+				auto valid = consumer.ReadIf(":");
+				auto end = consumer.TryReadIntegerBase<uint>(10);
+				if (start.has_value() && valid && end.has_value() && !consumer.AnyBytesLeft()) {
+					this->songinfo[i].override_start = *start;
+					this->songinfo[i].override_end = *end;
 				}
 			}
 		}
diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp
index 9aa847712f..c4616b2cd3 100644
--- a/src/music/cocoa_m.cpp
+++ b/src/music/cocoa_m.cpp
@@ -135,7 +135,7 @@ void MusicDriver_Cocoa::PlaySong(const MusicSongInfo &song)
 	}
 
 	std::string os_file = OTTD2FS(filename);
-	CFAutoRelease<CFURLRef> url(CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8*)os_file.c_str(), os_file.length(), false));
+	CFAutoRelease<CFURLRef> url(CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8*)os_file.data(), os_file.length(), false));
 
 	if (MusicSequenceFileLoad(_sequence, url.get(), kMusicSequenceFile_AnyType, 0) != noErr) {
 		Debug(driver, 0, "cocoa_m: Failed to load MIDI file");
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 5ddc36bb03..ce89c64aeb 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -14,7 +14,6 @@
 #endif
 #include "../debug.h"
 #include "../os/windows/win32.h"
-#include "../core/mem_func.hpp"
 #include "../thread.h"
 #include "../fileio_func.h"
 #include "../base_media_base.h"
@@ -34,8 +33,8 @@
 #	pragma comment(lib, "ole32.lib")
 #endif /* defined(_MSC_VER) */
 
-static const int MS_TO_REFTIME = 1000 * 10; ///< DirectMusic time base is 100 ns.
-static const int MIDITIME_TO_REFTIME = 10;  ///< Time base of the midi file reader is 1 us.
+static constexpr REFERENCE_TIME MS_TO_REFTIME = 1000 * 10; ///< DirectMusic time base is 100 ns.
+static constexpr REFERENCE_TIME MIDITIME_TO_REFTIME = 10;  ///< Time base of the midi file reader is 1 us.
 
 
 #define FOURCC_INFO  mmioFOURCC('I', 'N', 'F', 'O')
@@ -78,7 +77,7 @@ struct DLSFile {
 	std::vector<DLSWave> waves;
 
 	/** Try loading a DLS file into memory. */
-	bool LoadFile(const std::string &file);
+	bool LoadFile(std::string_view file);
 
 private:
 	/** Load an articulation structure from a DLS file. */
@@ -336,7 +335,6 @@ bool DLSFile::ReadDLSWave(FileHandle &f, DWORD list_length, long offset)
 	DLSWave &wave = this->waves.emplace_back();
 
 	/* Set default values. */
-	MemSetT(&wave.wave_sample, 0);
 	wave.wave_sample.cbSize = sizeof(WSMPL);
 	wave.wave_sample.usUnityNote = 60;
 	wave.file_offset = offset; // Store file offset so we can resolve the wave pool table later on.
@@ -422,7 +420,7 @@ bool DLSFile::ReadDLSWaveList(FileHandle &f, DWORD list_length)
 	return true;
 }
 
-bool DLSFile::LoadFile(const std::string &file)
+bool DLSFile::LoadFile(std::string_view file)
 {
 	Debug(driver, 2, "DMusic: Try to load DLS file {}", file);
 
@@ -441,8 +439,7 @@ bool DLSFile::LoadFile(const std::string &file)
 
 	Debug(driver, 2, "DMusic: Parsing DLS file");
 
-	DLSHEADER header;
-	MemSetT(&header, 0);
+	DLSHEADER header{};
 
 	/* Iterate over all chunks in the file. */
 	while (hdr.length > 0) {
@@ -587,7 +584,7 @@ static void MidiThreadProc()
 	PlaybackSegment current_segment;     // segment info for current playback
 	size_t current_block = 0;            // next block index to send
 	uint8_t current_volume = 0;             // current effective volume setting
-	uint8_t channel_volumes[16];            // last seen volume controller values in raw data
+	std::array<uint8_t, 16> channel_volumes; // last seen volume controller values in raw data
 
 	/* Get pointer to the reference clock of our output port. */
 	IReferenceClock *clock;
@@ -642,7 +639,7 @@ static void MidiThreadProc()
 				clock->GetTime(&cur_time);
 				TransmitNotesOff(_buffer, block_time, cur_time);
 
-				MemSetT<uint8_t>(channel_volumes, 127, lengthof(channel_volumes));
+				channel_volumes.fill(127);
 				/* Invalidate current volume. */
 				current_volume = UINT8_MAX;
 				last_volume_time = 0;
@@ -665,14 +662,14 @@ static void MidiThreadProc()
 					preload_bytes += block.data.size();
 					if (block.ticktime >= current_segment.start) {
 						if (current_segment.loop) {
-							Debug(driver, 2, "DMusic: timer: loop from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, ((int)block.realtime) / 1000.0, preload_bytes);
+							Debug(driver, 2, "DMusic: timer: loop from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, block.realtime / 1000.0, preload_bytes);
 							current_segment.start_block = bl;
 							break;
 						} else {
 							/* Skip the transmission delay compensation performed in the Win32 MIDI driver.
 							 * The DMusic driver will most likely be used with the MS softsynth, which is not subject to transmission delays.
 							 */
-							Debug(driver, 2, "DMusic: timer: start from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, ((int)block.realtime) / 1000.0, preload_bytes);
+							Debug(driver, 2, "DMusic: timer: start from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, block.realtime / 1000.0, preload_bytes);
 							playback_start_time -= block.realtime * MIDITIME_TO_REFTIME;
 							break;
 						}
@@ -718,14 +715,14 @@ static void MidiThreadProc()
 				REFERENCE_TIME playback_time = current_time - playback_start_time;
 				if (block.realtime * MIDITIME_TO_REFTIME > playback_time +  3 *_playback.preload_time * MS_TO_REFTIME) {
 					/* Stop the thread loop until we are at the preload time of the next block. */
-					next_timeout = Clamp(((int64_t)block.realtime * MIDITIME_TO_REFTIME - playback_time) / MS_TO_REFTIME - _playback.preload_time, 0, 1000);
+					next_timeout = Clamp((block.realtime * MIDITIME_TO_REFTIME - playback_time) / MS_TO_REFTIME - _playback.preload_time, 0, 1000);
 					Debug(driver, 9, "DMusic thread: Next event in {} ms (music {}, ref {})", next_timeout, block.realtime * MIDITIME_TO_REFTIME, playback_time);
 					break;
 				}
 
 				/* Timestamp of the current block. */
 				block_time = playback_start_time + block.realtime * MIDITIME_TO_REFTIME;
-				Debug(driver, 9, "DMusic thread: Streaming block {} (cur={}, block={})", current_block, (long long)(current_time / MS_TO_REFTIME), (long long)(block_time / MS_TO_REFTIME));
+				Debug(driver, 9, "DMusic thread: Streaming block {} (cur={}, block={})", current_block, current_time / MS_TO_REFTIME, block_time / MS_TO_REFTIME);
 
 				const uint8_t *data = block.data.data();
 				size_t remaining = block.data.size();
@@ -838,15 +835,13 @@ static void * DownloadArticulationData(int base_offset, void *data, const std::v
 	CONNECTIONLIST *con_list = (CONNECTIONLIST *)(art + 1);
 	con_list->cbSize = sizeof(CONNECTIONLIST);
 	con_list->cConnections = (ULONG)artic.size();
-	MemCpyT((CONNECTION *)(con_list + 1), &artic.front(), artic.size());
 
-	return (CONNECTION *)(con_list + 1) + artic.size();
+	return std::copy_n(artic.begin(), artic.size(), reinterpret_cast<CONNECTION *>(con_list + 1));
 }
 
-static const char *LoadDefaultDLSFile(const char *user_dls)
+static std::optional<std::string_view> LoadDefaultDLSFile(std::optional<std::string_view> user_dls)
 {
-	DMUS_PORTCAPS caps;
-	MemSetT(&caps, 0);
+	DMUS_PORTCAPS caps{};
 	caps.dwSize = sizeof(DMUS_PORTCAPS);
 	_port->GetCaps(&caps);
 
@@ -854,7 +849,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 	if ((caps.dwFlags & (DMUS_PC_DLS | DMUS_PC_DLS2)) != 0 && (caps.dwFlags & DMUS_PC_GMINHARDWARE) == 0) {
 		DLSFile dls_file;
 
-		if (user_dls == nullptr) {
+		if (!user_dls.has_value()) {
 			/* Try loading the default GM DLS file stored in the registry. */
 			HKEY hkDM;
 			if (SUCCEEDED(RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\DirectMusic", 0, KEY_READ, &hkDM))) {
@@ -877,7 +872,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 				if (!dls_file.LoadFile(FS2OTTD(path))) return "Can't load GM DLS collection";
 			}
 		} else {
-			if (!dls_file.LoadFile(user_dls)) return "Can't load GM DLS collection";
+			if (!dls_file.LoadFile(*user_dls)) return "Can't load GM DLS collection";
 		}
 
 		/* Get download port and allocate download IDs. */
@@ -910,7 +905,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 			}
 
 			/* Fill download data. */
-			MemSetT(wave, 0);
+			*wave = {};
 			wave->dlInfo.dwDLType = DMUS_DOWNLOADINFO_WAVE;
 			wave->dlInfo.cbSize = wave_size;
 			wave->dlInfo.dwDLId = dlid_wave + i;
@@ -918,9 +913,9 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 			wave->ulOffsetTable[0] = offsetof(WAVE_DOWNLOAD, dmWave);
 			wave->ulOffsetTable[1] = offsetof(WAVE_DOWNLOAD, dmWaveData);
 			wave->dmWave.ulWaveDataIdx = 1;
-			MemCpyT((PCMWAVEFORMAT *)&wave->dmWave.WaveformatEx, &dls_file.waves[i].fmt, 1);
 			wave->dmWaveData.cbSize = (DWORD)dls_file.waves[i].data.size();
-			MemCpyT(wave->dmWaveData.byData, &dls_file.waves[i].data[0], dls_file.waves[i].data.size());
+			reinterpret_cast<PCMWAVEFORMAT &>(wave->dmWave.WaveformatEx) = dls_file.waves[i].fmt;
+			std::copy_n(dls_file.waves[i].data.begin(), dls_file.waves[i].data.size(), wave->dmWaveData.byData);
 
 			_dls_downloads.push_back(dl_wave);
 			if (FAILED(download_port->Download(dl_wave))) {
@@ -972,7 +967,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 				download_port->Release();
 				return "Can't get instrument download buffer";
 			}
-			char *inst_base = (char *)instrument;
+			const std::byte *inst_base = reinterpret_cast<const std::byte *>(instrument);
 
 			/* Fill download header. */
 			DMUS_DOWNLOADINFO *d_info = (DMUS_DOWNLOADINFO *)instrument;
@@ -989,19 +984,19 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 
 			/* Instrument header. */
 			DMUS_INSTRUMENT *inst_data = (DMUS_INSTRUMENT *)instrument;
-			MemSetT(inst_data, 0);
-			offset_table[last_offset++] = (char *)inst_data - inst_base;
+			*inst_data = {};
+			offset_table[last_offset++] = reinterpret_cast<const std::byte *>(inst_data) - inst_base;
 			inst_data->ulPatch = (dls_file.instruments[i].hdr.Locale.ulBank & F_INSTRUMENT_DRUMS) | ((dls_file.instruments[i].hdr.Locale.ulBank & 0x7F7F) << 8) | (dls_file.instruments[i].hdr.Locale.ulInstrument & 0x7F);
 			instrument = inst_data + 1;
 
 			/* Write global articulations. */
 			if (!dls_file.instruments[i].articulators.empty()) {
 				inst_data->ulGlobalArtIdx = last_offset;
-				offset_table[last_offset++] = (char *)instrument - inst_base;
-				offset_table[last_offset++] = (char *)instrument + sizeof(DMUS_ARTICULATION2) - inst_base;
+				offset_table[last_offset++] = reinterpret_cast<const std::byte *>(instrument) - inst_base;
+				offset_table[last_offset++] = reinterpret_cast<const std::byte *>(instrument) + sizeof(DMUS_ARTICULATION2) - inst_base;
 
 				instrument = DownloadArticulationData(inst_data->ulGlobalArtIdx, instrument, dls_file.instruments[i].articulators);
-				assert((char *)instrument - inst_base <= (ptrdiff_t)inst_size);
+				assert(reinterpret_cast<const std::byte *>(instrument) - inst_base <= (ptrdiff_t)inst_size);
 			}
 
 			/* Write out regions. */
@@ -1010,7 +1005,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 				DLSFile::DLSRegion &rgn = dls_file.instruments[i].regions[j];
 
 				DMUS_REGION *inst_region = (DMUS_REGION *)instrument;
-				offset_table[last_offset++] = (char *)inst_region - inst_base;
+				offset_table[last_offset++] = reinterpret_cast<const std::byte *>(inst_region) - inst_base;
 				inst_region->RangeKey = rgn.hdr.RangeKey;
 				inst_region->RangeVelocity = rgn.hdr.RangeVelocity;
 				inst_region->fusOptions = rgn.hdr.fusOptions;
@@ -1024,27 +1019,23 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 				/* The wave sample data will be taken from the region, if defined, otherwise from the wave itself. */
 				if (rgn.wave_sample.cbSize != 0) {
 					inst_region->WSMP = rgn.wave_sample;
-					if (!rgn.wave_loops.empty()) MemCpyT(inst_region->WLOOP, &rgn.wave_loops.front(), rgn.wave_loops.size());
-
-					instrument = (char *)(inst_region + 1) - sizeof(DMUS_REGION::WLOOP) + sizeof(WLOOP) * rgn.wave_loops.size();
+					instrument = std::copy_n(rgn.wave_loops.begin(), rgn.wave_loops.size(), inst_region->WLOOP);
 				} else {
 					inst_region->WSMP = rgn.wave_sample;
-					if (!dls_file.waves[wave_id].wave_loops.empty()) MemCpyT(inst_region->WLOOP, &dls_file.waves[wave_id].wave_loops.front(), dls_file.waves[wave_id].wave_loops.size());
-
-					instrument = (char *)(inst_region + 1) - sizeof(DMUS_REGION::WLOOP) + sizeof(WLOOP) * dls_file.waves[wave_id].wave_loops.size();
+					instrument = std::copy_n(dls_file.waves[wave_id].wave_loops.begin(), dls_file.waves[wave_id].wave_loops.size(), inst_region->WLOOP);
 				}
 
 				/* Write local articulator data. */
 				if (!rgn.articulators.empty()) {
 					inst_region->ulRegionArtIdx = last_offset;
-					offset_table[last_offset++] = (char *)instrument - inst_base;
-					offset_table[last_offset++] = (char *)instrument + sizeof(DMUS_ARTICULATION2) - inst_base;
+					offset_table[last_offset++] = reinterpret_cast<const std::byte *>(instrument) - inst_base;
+					offset_table[last_offset++] = reinterpret_cast<const std::byte *>(instrument) + sizeof(DMUS_ARTICULATION2) - inst_base;
 
 					instrument = DownloadArticulationData(inst_region->ulRegionArtIdx, instrument, rgn.articulators);
 				} else {
 					inst_region->ulRegionArtIdx = 0;
 				}
-				assert((char *)instrument - inst_base <= (ptrdiff_t)inst_size);
+				assert(reinterpret_cast<const std::byte *>(instrument) - inst_base <= (ptrdiff_t)inst_size);
 
 				/* Link to the next region unless this was the last one.*/
 				inst_region->ulNextRegionIdx = j < dls_file.instruments[i].regions.size() - 1 ? last_offset : 0;
@@ -1060,7 +1051,7 @@ static const char *LoadDefaultDLSFile(const char *user_dls)
 		download_port->Release();
 	}
 
-	return nullptr;
+	return std::nullopt;
 }
 
 
@@ -1092,8 +1083,7 @@ std::optional<std::string_view> MusicDriver_DMusic::Start(const StringList &parm
 		/* Print all valid output ports. */
 		char desc[DMUS_MAX_DESCRIPTION];
 
-		DMUS_PORTCAPS caps;
-		MemSetT(&caps, 0);
+		DMUS_PORTCAPS caps{};
 		caps.dwSize = sizeof(DMUS_PORTCAPS);
 
 		Debug(driver, 1, "Detected DirectMusic ports:");
@@ -1107,8 +1097,7 @@ std::optional<std::string_view> MusicDriver_DMusic::Start(const StringList &parm
 	GUID guidPort;
 	if (pIdx >= 0) {
 		/* Check if the passed port is a valid port. */
-		DMUS_PORTCAPS caps;
-		MemSetT(&caps, 0);
+		DMUS_PORTCAPS caps{};
 		caps.dwSize = sizeof(DMUS_PORTCAPS);
 		if (FAILED(_music->EnumPort(pIdx, &caps))) return "Supplied port parameter is not a valid port";
 		if (caps.dwClass != DMUS_PC_OUTPUTCLASS) return "Supplied port parameter is not an output port";
@@ -1118,8 +1107,7 @@ std::optional<std::string_view> MusicDriver_DMusic::Start(const StringList &parm
 	}
 
 	/* Create new port. */
-	DMUS_PORTPARAMS params;
-	MemSetT(&params, 0);
+	DMUS_PORTPARAMS params{};
 	params.dwSize = sizeof(DMUS_PORTPARAMS);
 	params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS;
 	params.dwChannelGroups = 1;
@@ -1128,16 +1116,15 @@ std::optional<std::string_view> MusicDriver_DMusic::Start(const StringList &parm
 	if (FAILED(_port->Activate(TRUE))) return "Failed to activate port";
 
 	/* Create playback buffer. */
-	DMUS_BUFFERDESC desc;
-	MemSetT(&desc, 0);
+	DMUS_BUFFERDESC desc{};
 	desc.dwSize = sizeof(DMUS_BUFFERDESC);
 	desc.guidBufferFormat = KSDATAFORMAT_SUBTYPE_DIRECTMUSIC;
 	desc.cbBuffer = 1024;
 	if (FAILED(_music->CreateMusicBuffer(&desc, &_buffer, nullptr))) return "Failed to create music buffer";
 
 	/* On soft-synths (e.g. the default DirectMusic one), we might need to load a wavetable set to get music. */
-	const char *dls = LoadDefaultDLSFile(GetDriverParam(parm, "dls"));
-	if (dls != nullptr) return dls;
+	auto dls = LoadDefaultDLSFile(GetDriverParam(parm, "dls"));
+	if (dls.has_value()) return dls;
 
 	/* Create playback thread and synchronization primitives. */
 	_thread_event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index 4ec5b72670..04143149e3 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -43,22 +43,21 @@ std::optional<std::string_view> MusicDriver_ExtMidi::Start(const StringList &par
 		return "the extmidi driver does not work when Allegro is loaded.";
 	}
 
-	const char *command = GetDriverParam(parm, "cmd");
+	auto command = GetDriverParam(parm, "cmd");
 #ifndef MIDI_ARG
-	if (StrEmpty(command)) command = EXTERNAL_PLAYER;
+	if (!command.has_value() || command->empty()) command = EXTERNAL_PLAYER;
 #else
-	if (StrEmpty(command)) command = EXTERNAL_PLAYER " " MIDI_ARG;
+	if (!command.has_value() || command->empty()) command = EXTERNAL_PLAYER " " MIDI_ARG;
 #endif
 
 	this->command_tokens.clear();
 
-	std::string_view view = command;
 	for (;;) {
-		auto pos = view.find(' ');
-		this->command_tokens.emplace_back(view.substr(0, pos));
+		auto pos = command->find(' ');
+		this->command_tokens.emplace_back(command->substr(0, pos));
 
 		if (pos == std::string_view::npos) break;
-		view.remove_prefix(pos + 1);
+		command->remove_prefix(pos + 1);
 	}
 
 	this->song.clear();
diff --git a/src/music/fluidsynth.cpp b/src/music/fluidsynth.cpp
index 4ffd90e620..d428a14123 100644
--- a/src/music/fluidsynth.cpp
+++ b/src/music/fluidsynth.cpp
@@ -16,6 +16,7 @@
 #include <fluidsynth.h>
 #include "../mixer.h"
 #include <mutex>
+#include "../safeguards.h"
 
 static struct {
 	fluid_settings_t *settings;    ///< FluidSynth settings handle
@@ -62,10 +63,10 @@ std::optional<std::string_view> MusicDriver_FluidSynth::Start(const StringList &
 {
 	std::lock_guard<std::mutex> lock{ _midi.synth_mutex };
 
-	const char *sfont_name = GetDriverParam(param, "soundfont");
+	auto sfont_name = GetDriverParam(param, "soundfont");
 	int sfont_id;
 
-	Debug(driver, 1, "Fluidsynth: sf {}", sfont_name != nullptr ? sfont_name : "(null)");
+	Debug(driver, 1, "Fluidsynth: sf {}", sfont_name.has_value() ? *sfont_name : "(null)");
 
 	/* Create the settings. */
 	_midi.settings = new_fluid_settings();
@@ -84,7 +85,7 @@ std::optional<std::string_view> MusicDriver_FluidSynth::Start(const StringList &
 
 	/* Load a SoundFont and reset presets (so that new instruments
 	 * get used from the SoundFont) */
-	if (sfont_name == nullptr) {
+	if (!sfont_name.has_value()) {
 		sfont_id = FLUID_FAILED;
 
 		/* Try loading the default soundfont registered with FluidSynth. */
@@ -104,7 +105,8 @@ std::optional<std::string_view> MusicDriver_FluidSynth::Start(const StringList &
 		}
 		if (sfont_id == FLUID_FAILED) return "Could not open any sound font";
 	} else {
-		sfont_id = fluid_synth_sfload(_midi.synth, sfont_name, 1);
+		std::string name{sfont_name.value()};
+		sfont_id = fluid_synth_sfload(_midi.synth, name.c_str(), 1);
 		if (sfont_id == FLUID_FAILED) return "Could not open sound font";
 	}
 
diff --git a/src/music/midi.h b/src/music/midi.h
index ee3fe69a17..cda9192696 100644
--- a/src/music/midi.h
+++ b/src/music/midi.h
@@ -10,8 +10,6 @@
 #ifndef MUSIC_MIDI_H
 #define MUSIC_MIDI_H
 
-#include "../stdafx.h"
-
 /** Header of a Stanard MIDI File */
 struct SMFHeader {
 	uint16_t format;
diff --git a/src/music/midifile.cpp b/src/music/midifile.cpp
index 9cc3cd8840..a45688773d 100644
--- a/src/music/midifile.cpp
+++ b/src/music/midifile.cpp
@@ -7,6 +7,8 @@
 
 /* @file midifile.cpp Parser for standard MIDI files */
 
+#include "../stdafx.h"
+
 #include "midifile.hpp"
 #include "../fileio_func.h"
 #include "../fileio_type.h"
@@ -21,6 +23,8 @@
 
 #include "table/strings.h"
 
+#include "../safeguards.h"
+
 /* SMF reader based on description at: http://www.somascape.org/midi/tech/mfile.html */
 
 
@@ -194,7 +198,7 @@ static bool ReadTrackChunk(FileHandle &file, MidiFile &target)
 	if (fread(buf, sizeof(magic), 1, file) != 1) {
 		return false;
 	}
-	if (memcmp(magic, buf, sizeof(magic)) != 0) {
+	if (!std::ranges::equal(magic, buf)) {
 		return false;
 	}
 
@@ -373,7 +377,7 @@ static bool FixupMidiData(MidiFile &target)
 
 	/* Annotate blocks with real time */
 	last_ticktime = 0;
-	uint32_t last_realtime = 0;
+	int64_t last_realtime = 0;
 	size_t cur_tempo = 0, cur_block = 0;
 	while (cur_block < target.blocks.size()) {
 		MidiFile::DataBlock &block = target.blocks[cur_block];
@@ -383,14 +387,14 @@ static bool FixupMidiData(MidiFile &target)
 			/* block is within the current tempo */
 			int64_t tickdiff = block.ticktime - last_ticktime;
 			last_ticktime = block.ticktime;
-			last_realtime += uint32_t(tickdiff * tempo.tempo / target.tickdiv);
+			last_realtime += tickdiff * tempo.tempo / target.tickdiv;
 			block.realtime = last_realtime;
 			cur_block++;
 		} else {
 			/* tempo change occurs before this block */
 			int64_t tickdiff = next_tempo.ticktime - last_ticktime;
 			last_ticktime = next_tempo.ticktime;
-			last_realtime += uint32_t(tickdiff * tempo.tempo / target.tickdiv); // current tempo until the tempo change
+			last_realtime += tickdiff * tempo.tempo / target.tickdiv; // current tempo until the tempo change
 			cur_tempo++;
 		}
 	}
@@ -1039,29 +1043,23 @@ std::string MidiFile::GetSMFFile(const MusicSongInfo &song)
 
 	if (song.filetype != MTT_MPSMIDI) return std::string();
 
-	char basename[MAX_PATH];
+	std::string tempdirname = FioGetDirectory(Searchpath::SP_AUTODOWNLOAD_DIR, Subdirectory::BASESET_DIR);
 	{
-		const char *fnstart = strrchr(song.filename.c_str(), PATHSEPCHAR);
-		if (fnstart == nullptr) {
-			fnstart = song.filename.c_str();
-		} else {
-			fnstart++;
-		}
+		std::string_view basename{song.filename};
+		auto fnstart = basename.rfind(PATHSEPCHAR);
+		if (fnstart != std::string_view::npos) basename.remove_prefix(fnstart + 1);
 
 		/* Remove all '.' characters from filename */
-		char *wp = basename;
-		for (const char *rp = fnstart; *rp != '\0'; rp++) {
-			if (*rp != '.') *wp++ = *rp;
+		tempdirname.reserve(tempdirname.size() + basename.size());
+		for (auto c : basename) {
+			if (c != '.') tempdirname.append(1, c);
 		}
-		*wp++ = '\0';
 	}
 
-	std::string tempdirname = FioGetDirectory(Searchpath::SP_AUTODOWNLOAD_DIR, Subdirectory::BASESET_DIR);
-	tempdirname += basename;
 	AppendPathSeparator(tempdirname);
 	FioCreateDirectory(tempdirname);
 
-	std::string output_filename = tempdirname + std::to_string(song.cat_index) + ".mid";
+	std::string output_filename = fmt::format("{}{}.mid", tempdirname, song.cat_index);
 
 	if (FileExists(output_filename)) {
 		/* If the file already exists, assume it's the correct decoded data */
@@ -1084,13 +1082,13 @@ std::string MidiFile::GetSMFFile(const MusicSongInfo &song)
 }
 
 
-static bool CmdDumpSMF(uint8_t argc, char *argv[])
+static bool CmdDumpSMF(std::span<std::string_view> argv)
 {
-	if (argc == 0) {
+	if (argv.empty()) {
 		IConsolePrint(CC_HELP, "Write the current song to a Standard MIDI File. Usage: 'dumpsmf <filename>'.");
 		return true;
 	}
-	if (argc != 2) {
+	if (argv.size() != 2) {
 		IConsolePrint(CC_WARNING, "You must specify a filename to write MIDI data to.");
 		return false;
 	}
diff --git a/src/music/midifile.hpp b/src/music/midifile.hpp
index 1293a5a08c..27cb05db5b 100644
--- a/src/music/midifile.hpp
+++ b/src/music/midifile.hpp
@@ -10,7 +10,6 @@
 #ifndef MUSIC_MIDIFILE_HPP
 #define MUSIC_MIDIFILE_HPP
 
-#include "../stdafx.h"
 #include "../fileio_type.h"
 #include "midi.h"
 
@@ -19,7 +18,7 @@ struct MusicSongInfo;
 struct MidiFile {
 	struct DataBlock {
 		uint32_t ticktime; ///< tick number since start of file this block should be triggered at
-		uint32_t realtime = 0; ///< real-time (microseconds) since start of file this block should be triggered at
+		int64_t realtime = 0; ///< real-time (microseconds) since start of file this block should be triggered at
 		std::vector<uint8_t> data; ///< raw midi data contained in block
 		DataBlock(uint32_t _ticktime = 0) : ticktime(_ticktime) { }
 	};
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 638a4210fd..c25b5d4b4f 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -18,7 +18,6 @@
 #include "midi.h"
 #include "../base_media_base.h"
 #include "../base_media_music.h"
-#include "../core/mem_func.hpp"
 #include <mutex>
 
 #include "../safeguards.h"
@@ -48,7 +47,7 @@ static struct {
 	MidiFile next_file;              ///< upcoming file to play
 	PlaybackSegment next_segment;    ///< segment info for upcoming file
 
-	uint8_t channel_volumes[16]; ///< last seen volume controller values in raw data
+	std::array<uint8_t, 16> channel_volumes; ///< last seen volume controller values in raw data
 } _midi;
 
 static FMusicDriver_Win32 iFMusicDriver_Win32;
@@ -163,7 +162,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR
 			_midi.do_start = 0;
 			_midi.current_block = 0;
 
-			MemSetT<uint8_t>(_midi.channel_volumes, 127, lengthof(_midi.channel_volumes));
+			_midi.channel_volumes.fill(127);
 			/* Invalidate current volume. */
 			_midi.current_volume = UINT8_MAX;
 			volume_throttle = 0;
@@ -202,7 +201,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR
 			preload_bytes += block.data.size();
 			if (block.ticktime >= _midi.current_segment.start) {
 				if (_midi.current_segment.loop) {
-					Debug(driver, 2, "Win32-MIDI: timer: loop from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, ((int)block.realtime)/1000.0, preload_bytes);
+					Debug(driver, 2, "Win32-MIDI: timer: loop from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, block.realtime / 1000.0, preload_bytes);
 					_midi.current_segment.start_block = bl;
 					break;
 				} else {
@@ -211,7 +210,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR
 					 * which have a bitrate of 31,250 bits/sec, and transmit 1+8+1 start/data/stop bits per byte.
 					 * The delay compensation is needed to avoid time-compression of following messages.
 					 */
-					Debug(driver, 2, "Win32-MIDI: timer: start from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, ((int)block.realtime) / 1000.0, preload_bytes);
+					Debug(driver, 2, "Win32-MIDI: timer: start from block {} (ticktime {}, realtime {:.3f}, bytes {})", bl, block.ticktime, block.realtime / 1000.0, preload_bytes);
 					_midi.playback_start_time -= block.realtime / 1000 - (DWORD)(preload_bytes * 1000 / 3125);
 					break;
 				}
@@ -372,10 +371,10 @@ std::optional<std::string_view> MusicDriver_Win32::Start(const StringList &parm)
 
 	int resolution = GetDriverParamInt(parm, "resolution", 5);
 	uint port = (uint)GetDriverParamInt(parm, "port", UINT_MAX);
-	const char *portname = GetDriverParam(parm, "portname");
+	auto portname = GetDriverParam(parm, "portname");
 
 	/* Enumerate ports either for selecting port by name, or for debug output */
-	if (portname != nullptr || _debug_driver_level > 0) {
+	if (portname.has_value() || _debug_driver_level > 0) {
 		uint numports = midiOutGetNumDevs();
 		Debug(driver, 1, "Win32-MIDI: Found {} output devices:", numports);
 		for (uint tryport = 0; tryport < numports; tryport++) {
@@ -386,7 +385,7 @@ std::optional<std::string_view> MusicDriver_Win32::Start(const StringList &parm)
 
 				/* Compare requested and detected port name.
 				 * If multiple ports have the same name, this will select the last matching port, and the debug output will be confusing. */
-				if (portname != nullptr && strncmp(tryportname, portname, lengthof(tryportname)) == 0) port = tryport;
+				if (portname.has_value() && *portname == tryportname) port = tryport;
 
 				Debug(driver, 1, "MIDI port {:2d}: {}{}", tryport, tryportname, (tryport == port) ? " [selected]" : "");
 			}
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index d882cedde4..cddd9c08db 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -19,7 +19,6 @@
 #include "gfx_func.h"
 #include "zoom_func.h"
 #include "core/random_func.hpp"
-#include "core/mem_func.hpp"
 #include "error.h"
 #include "core/geometry_func.hpp"
 #include "string_func.h"
@@ -439,7 +438,7 @@ void MusicSystem::SaveCustomPlaylist(PlaylistChoices pl)
 	}
 
 	size_t num = 0;
-	MemSetT(settings_pl, 0, NUM_SONGS_PLAYLIST);
+	std::fill_n(settings_pl, NUM_SONGS_PLAYLIST, 0);
 
 	for (const auto &song : this->standard_playlists[pl]) {
 		/* Music set indices in the settings playlist are 1-based, 0 means unused slot */
@@ -611,7 +610,7 @@ struct MusicTrackSelectionWindow : public Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_MTS_MUSICSET:
@@ -661,7 +660,7 @@ static constexpr NWidgetPart _nested_music_track_selection_widgets[] = {
 };
 
 static WindowDesc _music_track_selection_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_MUSIC_TRACK_SELECTION, WC_NONE,
 	{},
 	_nested_music_track_selection_widgets
@@ -710,7 +709,7 @@ struct MusicWindow : public Window {
 			case WID_M_TRACK_NR: {
 				Dimension d = GetStringBoundingBox(STR_MUSIC_TRACK_NONE);
 				d.width += padding.width;
-				d.height += padding.height;
+				d.height += padding.height + WidgetDimensions::scaled.fullbevel.bottom;
 				size = maxdim(size, d);
 				break;
 			}
@@ -721,7 +720,7 @@ struct MusicWindow : public Window {
 					d = maxdim(d, GetStringBoundingBox(GetString(STR_MUSIC_TITLE_NAME, song.songname)));
 				}
 				d.width += padding.width;
-				d.height += padding.height;
+				d.height += padding.height + WidgetDimensions::scaled.fullbevel.bottom;
 				size = maxdim(size, d);
 				break;
 			}
@@ -744,9 +743,9 @@ struct MusicWindow : public Window {
 				}
 				Rect ir = r.Shrink(WidgetDimensions::scaled.framerect);
 				if (_music.IsPlaying()) {
-					DrawString(ir, GetString(STR_MUSIC_TRACK_DIGIT, _music.GetCurrentSong().tracknr, 2));
+					DrawString(ir, GetString(STR_MUSIC_TRACK_DIGIT, _music.GetCurrentSong().tracknr, 2), TC_FROMSTRING, SA_HOR_CENTER);
 				} else {
-					DrawString(ir, STR_MUSIC_TRACK_NONE);
+					DrawString(ir, STR_MUSIC_TRACK_NONE, TC_FROMSTRING, SA_HOR_CENTER);
 				}
 				break;
 			}
@@ -768,11 +767,11 @@ struct MusicWindow : public Window {
 			}
 
 			case WID_M_MUSIC_VOL:
-				DrawSliderWidget(r, 0, INT8_MAX, 0, _settings_client.music.music_vol, nullptr);
+				DrawSliderWidget(r, COLOUR_GREY, COLOUR_GREY, TC_BLACK, 0, INT8_MAX, 0, _settings_client.music.music_vol, nullptr);
 				break;
 
 			case WID_M_EFFECT_VOL:
-				DrawSliderWidget(r, 0, INT8_MAX, 0, _settings_client.music.effect_vol, nullptr);
+				DrawSliderWidget(r, COLOUR_GREY, COLOUR_GREY, TC_BLACK, 0, INT8_MAX, 0, _settings_client.music.effect_vol, nullptr);
 				break;
 		}
 	}
@@ -865,47 +864,43 @@ static constexpr NWidgetPart _nested_music_window_widgets[] = {
 
 	NWidget(NWID_HORIZONTAL),
 		NWidget(NWID_VERTICAL),
-			NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), EndContainer(),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PREV), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_NEXT), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_STOP), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PLAY), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PREV), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_NEXT), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_STOP), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PLAY), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), EndContainer(),
 		EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY, WID_M_SLIDERS),
-			NWidget(NWID_HORIZONTAL), SetPIP(4, 0, 4),
-				NWidget(NWID_VERTICAL),
-					NWidget(WWT_LABEL, INVALID_COLOUR, -1), SetFill(1, 0), SetStringTip(STR_MUSIC_MUSIC_VOLUME),
-					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_M_MUSIC_VOL), SetMinimalSize(67, 0), SetPadding(2), SetMinimalTextLines(1, 0), SetFill(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
+			NWidget(NWID_HORIZONTAL), SetPIP(WidgetDimensions::unscaled.hsep_wide, WidgetDimensions::unscaled.hsep_wide, WidgetDimensions::unscaled.hsep_wide),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.vsep_normal), SetPIPRatio(1, 0, 1),
+					NWidget(WWT_LABEL, INVALID_COLOUR), SetFill(1, 0), SetStringTip(STR_MUSIC_MUSIC_VOLUME),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_M_MUSIC_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
 				EndContainer(),
-				NWidget(NWID_VERTICAL),
-					NWidget(WWT_LABEL, INVALID_COLOUR, -1), SetFill(1, 0), SetStringTip(STR_MUSIC_EFFECTS_VOLUME),
-					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_M_EFFECT_VOL), SetMinimalSize(67, 0), SetPadding(2), SetMinimalTextLines(1, 0), SetFill(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.vsep_normal), SetPIPRatio(1, 0, 1),
+					NWidget(WWT_LABEL, INVALID_COLOUR), SetFill(1, 0), SetStringTip(STR_MUSIC_EFFECTS_VOLUME),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_M_EFFECT_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
 				EndContainer(),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, WID_M_BACKGROUND),
-		NWidget(NWID_HORIZONTAL), SetPIP(6, 0, 6),
-			NWidget(NWID_VERTICAL),
-				NWidget(NWID_SPACER), SetFill(0, 1),
-				NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_SHUFFLE), SetMinimalSize(50, 8), SetStringTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE),
-				NWidget(NWID_SPACER), SetFill(0, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(NWID_VERTICAL), SetPIPRatio(1, 0, 1), SetPadding(WidgetDimensions::unscaled.frametext),
+				NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_SHUFFLE), SetMinimalSize(50, 0), SetStringTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE),
 			EndContainer(),
-			NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3),
+			NWidget(NWID_VERTICAL), SetPIP(WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.vsep_normal), SetPIPRatio(1, 0, 1),
 				NWidget(WWT_LABEL, INVALID_COLOUR, WID_M_TRACK), SetFill(0, 0), SetStringTip(STR_MUSIC_TRACK),
-				NWidget(WWT_INSET, COLOUR_GREY, WID_M_TRACK_NR), EndContainer(),
+				NWidget(WWT_INSET, COLOUR_GREY, WID_M_TRACK_NR), SetFill(0, 0), EndContainer(),
 			EndContainer(),
-			NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 0),
+			NWidget(NWID_VERTICAL), SetPIP(WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.vsep_normal), SetPIPRatio(1, 0, 1),
 				NWidget(WWT_LABEL, INVALID_COLOUR, WID_M_TRACK_TITLE), SetFill(1, 0), SetStringTip(STR_MUSIC_XTITLE),
 				NWidget(WWT_INSET, COLOUR_GREY, WID_M_TRACK_NAME), SetFill(1, 0), EndContainer(),
 			EndContainer(),
-			NWidget(NWID_VERTICAL),
-				NWidget(NWID_SPACER), SetFill(0, 1),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_M_PROGRAMME), SetMinimalSize(50, 8), SetStringTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION),
-				NWidget(NWID_SPACER), SetFill(0, 1),
+			NWidget(NWID_VERTICAL), SetPIPRatio(1, 0, 1), SetPadding(WidgetDimensions::unscaled.frametext),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_M_PROGRAMME), SetMinimalSize(50, 0), SetStringTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp
index dee1bcc1d0..cb2337d698 100644
--- a/src/network/core/address.cpp
+++ b/src/network/core/address.cpp
@@ -12,6 +12,7 @@
 #include "address.h"
 #include "../network_internal.h"
 #include "../../debug.h"
+#include "../../core/string_consumer.hpp"
 
 #include "../../safeguards.h"
 
@@ -77,7 +78,7 @@ void NetworkAddress::SetPort(uint16_t port)
  * @param with_family Whether to add the familty to the address (e.g. IPv4).
  * @return The format string for the address.
  */
-static const char *GetAddressFormatString(uint16_t family, bool with_family)
+static std::string_view GetAddressFormatString(uint16_t family, bool with_family)
 {
 	switch (family) {
 		case AF_INET: return with_family ? "{}:{} (IPv4)" : "{}:{}";
@@ -143,31 +144,25 @@ bool NetworkAddress::IsFamily(int family)
  * @note netmask without /n assumes all bits need to match.
  * @return true if this IP is within the netmask.
  */
-bool NetworkAddress::IsInNetmask(const std::string &netmask)
+bool NetworkAddress::IsInNetmask(std::string_view netmask)
 {
 	/* Resolve it if we didn't do it already */
 	if (!this->IsResolved()) this->GetAddress();
 
 	int cidr = this->address.ss_family == AF_INET ? 32 : 128;
 
-	NetworkAddress mask_address;
-
+	StringConsumer consumer{netmask};
 	/* Check for CIDR separator */
-	auto cidr_separator_location = netmask.find('/');
-	if (cidr_separator_location != std::string::npos) {
-		int tmp_cidr = atoi(netmask.substr(cidr_separator_location + 1).c_str());
+	NetworkAddress mask_address(consumer.ReadUntilChar('/', StringConsumer::SKIP_ONE_SEPARATOR), 0, this->address.ss_family);
+	if (mask_address.GetAddressLength() == 0) return false;
+
+	if (consumer.AnyBytesLeft()) {
+		int tmp_cidr = consumer.ReadIntegerBase(10, cidr);
 
 		/* Invalid CIDR, treat as single host */
 		if (tmp_cidr > 0 && tmp_cidr < cidr) cidr = tmp_cidr;
-
-		/* Remove the / so that NetworkAddress works on the IP portion */
-		mask_address = NetworkAddress(netmask.substr(0, cidr_separator_location), 0, this->address.ss_family);
-	} else {
-		mask_address = NetworkAddress(netmask, 0, this->address.ss_family);
 	}
 
-	if (mask_address.GetAddressLength() == 0) return false;
-
 	uint32_t *ip;
 	uint32_t *mask;
 	switch (this->address.ss_family) {
@@ -207,14 +202,13 @@ bool NetworkAddress::IsInNetmask(const std::string &netmask)
 SOCKET NetworkAddress::Resolve(int family, int socktype, int flags, SocketList *sockets, LoopProc func)
 {
 	struct addrinfo *ai;
-	struct addrinfo hints;
-	memset(&hints, 0, sizeof (hints));
+	struct addrinfo hints{};
 	hints.ai_family   = family;
 	hints.ai_flags    = flags;
 	hints.ai_socktype = socktype;
 
 	/* The port needs to be a string. Six is enough to contain all characters + '\0'. */
-	std::string port_name = std::to_string(this->GetPort());
+	std::string port_name = fmt::format("{}", this->GetPort());
 
 	bool reset_hostname = false;
 	/* Setting both hostname to nullptr and port to 0 is not allowed.
@@ -265,7 +259,7 @@ SOCKET NetworkAddress::Resolve(int family, int socktype, int flags, SocketList *
 		if (sockets == nullptr) {
 			this->address_length = (int)runp->ai_addrlen;
 			assert(sizeof(this->address) >= runp->ai_addrlen);
-			memcpy(&this->address, runp->ai_addr, runp->ai_addrlen);
+			std::copy_n(reinterpret_cast<const std::byte *>(runp->ai_addr), runp->ai_addrlen, reinterpret_cast<std::byte *>(&this->address));
 #ifdef __EMSCRIPTEN__
 			/* Emscripten doesn't zero sin_zero, but as we compare addresses
 			 * to see if they are the same address, we need them to be zero'd.
@@ -275,7 +269,7 @@ SOCKET NetworkAddress::Resolve(int family, int socktype, int flags, SocketList *
 			 */
 			if (this->address.ss_family == AF_INET) {
 				sockaddr_in *address_ipv4 = (sockaddr_in *)&this->address;
-				memset(address_ipv4->sin_zero, 0, sizeof(address_ipv4->sin_zero));
+				std::ranges::fill(address_ipv4->sin_zero, 0);
 			}
 #endif
 			break;
@@ -301,8 +295,8 @@ static SOCKET ListenLoopProc(addrinfo *runp)
 
 	SOCKET sock = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
 	if (sock == INVALID_SOCKET) {
-		const char *type = NetworkAddress::SocketTypeAsString(runp->ai_socktype);
-		const char *family = NetworkAddress::AddressFamilyAsString(runp->ai_family);
+		std::string_view type = NetworkAddress::SocketTypeAsString(runp->ai_socktype);
+		std::string_view family = NetworkAddress::AddressFamilyAsString(runp->ai_family);
 		Debug(net, 0, "Could not create {} {} socket: {}", type, family, NetworkError::GetLast().AsString());
 		return INVALID_SOCKET;
 	}
@@ -317,7 +311,7 @@ static SOCKET ListenLoopProc(addrinfo *runp)
 
 	int on = 1;
 	if (runp->ai_family == AF_INET6 &&
-			setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&on, sizeof(on)) == -1) {
+			setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&on), sizeof(on)) == -1) {
 		Debug(net, 3, "Could not disable IPv4 over IPv6: {}", NetworkError::GetLast().AsString());
 	}
 
@@ -370,7 +364,7 @@ void NetworkAddress::Listen(int socktype, SocketList *sockets)
  * @return the string representation
  * @note only works for SOCK_STREAM and SOCK_DGRAM
  */
-/* static */ const char *NetworkAddress::SocketTypeAsString(int socktype)
+/* static */ std::string_view NetworkAddress::SocketTypeAsString(int socktype)
 {
 	switch (socktype) {
 		case SOCK_STREAM: return "tcp";
@@ -385,7 +379,7 @@ void NetworkAddress::Listen(int socktype, SocketList *sockets)
  * @return the string representation
  * @note only works for AF_INET, AF_INET6 and AF_UNSPEC
  */
-/* static */ const char *NetworkAddress::AddressFamilyAsString(int family)
+/* static */ std::string_view NetworkAddress::AddressFamilyAsString(int family)
 {
 	switch (family) {
 		case AF_UNSPEC: return "either IPv4 or IPv6";
@@ -447,7 +441,7 @@ void NetworkAddress::Listen(int socktype, SocketList *sockets)
  * @param company Pointer to the company variable to set iff indicated.
  * @return A valid ServerAddress of the parsed information.
  */
-/* static */ ServerAddress ServerAddress::Parse(const std::string &connection_string, uint16_t default_port, CompanyID *company_id)
+/* static */ ServerAddress ServerAddress::Parse(std::string_view connection_string, uint16_t default_port, CompanyID *company_id)
 {
 	if (connection_string.starts_with("+")) {
 		std::string_view invite_code = ParseCompanyFromConnectionString(connection_string, company_id);
@@ -456,5 +450,5 @@ void NetworkAddress::Listen(int socktype, SocketList *sockets)
 
 	uint16_t port = default_port;
 	std::string_view ip = ParseFullConnectionString(connection_string, port, company_id);
-	return ServerAddress(SERVER_ADDRESS_DIRECT, std::string(ip) + ":" + std::to_string(port));
+	return ServerAddress(SERVER_ADDRESS_DIRECT, fmt::format("{}:{}", ip, port));
 }
diff --git a/src/network/core/address.h b/src/network/core/address.h
index 9fb0a8fe05..524908610c 100644
--- a/src/network/core/address.h
+++ b/src/network/core/address.h
@@ -27,10 +27,10 @@ using SocketList = std::map<SOCKET, NetworkAddress>;    ///< Type for a mapping
  */
 class NetworkAddress {
 private:
-	std::string hostname;     ///< The hostname
-	int address_length;       ///< The length of the resolved address
-	sockaddr_storage address; ///< The resolved address
-	bool resolved;            ///< Whether the address has been (tried to be) resolved
+	std::string hostname{}; ///< The hostname
+	int address_length{}; ///< The length of the resolved address
+	sockaddr_storage address{}; ///< The resolved address
+	bool resolved = false; ///< Whether the address has been (tried to be) resolved
 
 	/**
 	 * Helper function to resolve something to a socket.
@@ -58,12 +58,11 @@ public:
 	 * @param address The IP address with port.
 	 * @param address_length The length of the address.
 	 */
-	NetworkAddress(sockaddr *address, int address_length) :
+	NetworkAddress(const sockaddr *address, int address_length) :
 		address_length(address_length),
 		resolved(address_length != 0)
 	{
-		memset(&this->address, 0, sizeof(this->address));
-		memcpy(&this->address, address, address_length);
+		std::copy_n(reinterpret_cast<const std::byte *>(address), address_length, reinterpret_cast<std::byte *>(&this->address));
 	}
 
 	/**
@@ -81,8 +80,6 @@ public:
 			hostname.remove_suffix(1);
 		}
 		this->hostname = hostname;
-
-		memset(&this->address, 0, sizeof(this->address));
 		this->address.ss_family = family;
 		this->SetPort(port);
 	}
@@ -115,7 +112,7 @@ public:
 	}
 
 	bool IsFamily(int family);
-	bool IsInNetmask(const std::string &netmask);
+	bool IsInNetmask(std::string_view netmask);
 
 	/**
 	 * Compare the address of this class with the address of another.
@@ -162,8 +159,8 @@ public:
 
 	void Listen(int socktype, SocketList *sockets);
 
-	static const char *SocketTypeAsString(int socktype);
-	static const char *AddressFamilyAsString(int family);
+	static std::string_view SocketTypeAsString(int socktype);
+	static std::string_view AddressFamilyAsString(int family);
 	static NetworkAddress GetPeerAddress(SOCKET sock);
 	static NetworkAddress GetSockAddress(SOCKET sock);
 	static const std::string GetPeerName(SOCKET sock);
@@ -194,13 +191,13 @@ private:
 	 * @param type The type of the ServerAdress.
 	 * @param connection_string The connection_string that belongs to this ServerAddress type.
 	 */
-	ServerAddress(ServerAddressType type, const std::string &connection_string) : type(type), connection_string(connection_string) {}
+	ServerAddress(ServerAddressType type, std::string &&connection_string) : type(type), connection_string(std::move(connection_string)) {}
 
 public:
 	ServerAddressType type;        ///< The type of this ServerAddress.
 	std::string connection_string; ///< The connection string for this ServerAddress.
 
-	static ServerAddress Parse(const std::string &connection_string, uint16_t default_port, CompanyID *company_id = nullptr);
+	static ServerAddress Parse(std::string_view connection_string, uint16_t default_port, CompanyID *company_id = nullptr);
 };
 
 #endif /* NETWORK_CORE_ADDRESS_H */
diff --git a/src/network/core/config.cpp b/src/network/core/config.cpp
index 8451ecac58..fbadb6818f 100644
--- a/src/network/core/config.cpp
+++ b/src/network/core/config.cpp
@@ -15,26 +15,14 @@
 
 #include "../../safeguards.h"
 
-/**
- * Get the environment variable using std::getenv and when it is an empty string (or nullptr), return a fallback value instead.
- * @param variable The environment variable to read from.
- * @param fallback The fallback in case the environment variable is not set.
- * @return The environment value, or when that does not exist the given fallback value.
- */
-static const char *GetEnv(const char *variable, const char *fallback)
-{
-	const char *value = std::getenv(variable);
-	return StrEmpty(value) ? fallback : value;
-}
-
 /**
  * Get the connection string for the game coordinator from the environment variable OTTD_COORDINATOR_CS,
  * or when it has not been set a hard coded default DNS hostname of the production server.
  * @return The game coordinator's connection string.
  */
-const char *NetworkCoordinatorConnectionString()
+std::string_view NetworkCoordinatorConnectionString()
 {
-	return GetEnv("OTTD_COORDINATOR_CS", "coordinator.openttd.org");
+	return GetEnv("OTTD_COORDINATOR_CS").value_or("coordinator.openttd.org");
 }
 
 /**
@@ -42,9 +30,9 @@ const char *NetworkCoordinatorConnectionString()
  * or when it has not been set a hard coded default DNS hostname of the production server.
  * @return The STUN server's connection string.
  */
-const char *NetworkStunConnectionString()
+std::string_view NetworkStunConnectionString()
 {
-	return GetEnv("OTTD_STUN_CS", "stun.openttd.org");
+	return GetEnv("OTTD_STUN_CS").value_or("stun.openttd.org");
 }
 
 /**
@@ -52,9 +40,9 @@ const char *NetworkStunConnectionString()
  * or when it has not been set a hard coded default DNS hostname of the production server.
  * @return The content server's connection string.
  */
-const char *NetworkContentServerConnectionString()
+std::string_view NetworkContentServerConnectionString()
 {
-	return GetEnv("OTTD_CONTENT_SERVER_CS", "content.openttd.org");
+	return GetEnv("OTTD_CONTENT_SERVER_CS").value_or("content.openttd.org");
 }
 
 /**
@@ -62,9 +50,9 @@ const char *NetworkContentServerConnectionString()
  * or when it has not been set a hard coded URI of the production server.
  * @return The content mirror's URI string.
  */
-const char *NetworkContentMirrorUriString()
+std::string_view NetworkContentMirrorUriString()
 {
-	return GetEnv("OTTD_CONTENT_MIRROR_URI", "https://binaries.openttd.org/bananas");
+	return GetEnv("OTTD_CONTENT_MIRROR_URI").value_or("https://binaries.openttd.org/bananas");
 }
 
 /**
@@ -72,7 +60,7 @@ const char *NetworkContentMirrorUriString()
  * or when it has not been set a hard coded URI of the production server.
  * @return The survey's URI string.
  */
-const char *NetworkSurveyUriString()
+std::string_view NetworkSurveyUriString()
 {
-	return GetEnv("OTTD_SURVEY_URI", "https://survey-participate.openttd.org/");
+	return GetEnv("OTTD_SURVEY_URI").value_or("https://survey-participate.openttd.org/");
 }
diff --git a/src/network/core/config.h b/src/network/core/config.h
index 560d486663..7b7d1cc45f 100644
--- a/src/network/core/config.h
+++ b/src/network/core/config.h
@@ -12,11 +12,11 @@
 #ifndef NETWORK_CORE_CONFIG_H
 #define NETWORK_CORE_CONFIG_H
 
-const char *NetworkCoordinatorConnectionString();
-const char *NetworkStunConnectionString();
-const char *NetworkContentServerConnectionString();
-const char *NetworkContentMirrorUriString();
-const char *NetworkSurveyUriString();
+std::string_view NetworkCoordinatorConnectionString();
+std::string_view NetworkStunConnectionString();
+std::string_view NetworkContentServerConnectionString();
+std::string_view NetworkContentMirrorUriString();
+std::string_view NetworkSurveyUriString();
 
 static const uint16_t NETWORK_COORDINATOR_SERVER_PORT = 3976;           ///< The default port of the Game Coordinator server (TCP)
 static const uint16_t NETWORK_STUN_SERVER_PORT        = 3975;           ///< The default port of the STUN server (TCP)
diff --git a/src/network/core/host.cpp b/src/network/core/host.cpp
index e55a44a024..636fd9dd33 100644
--- a/src/network/core/host.cpp
+++ b/src/network/core/host.cpp
@@ -48,7 +48,7 @@ static void NetworkFindBroadcastIPsInternal(NetworkAddressList *broadcast) // Wi
 
 		sockaddr_storage address{};
 		/* iiBroadcast is unusable, because it always seems to be set to 255.255.255.255. */
-		memcpy(&address, &ifo.iiAddress.Address, sizeof(sockaddr));
+		std::copy_n(reinterpret_cast<const std::byte *>(&ifo.iiAddress.Address), sizeof(sockaddr), reinterpret_cast<std::byte *>(&address));
 		reinterpret_cast<sockaddr_in*>(&address)->sin_addr.s_addr = ifo.iiAddress.AddressIn.sin_addr.s_addr | ~ifo.iiNetmask.AddressIn.sin_addr.s_addr;
 		NetworkAddress addr(address, sizeof(sockaddr));
 		if (std::none_of(broadcast->begin(), broadcast->end(), [&addr](NetworkAddress const &elem) -> bool { return elem == addr; })) broadcast->push_back(addr);
diff --git a/src/network/core/http.h b/src/network/core/http.h
index dfeadb7596..2a6d1614af 100644
--- a/src/network/core/http.h
+++ b/src/network/core/http.h
@@ -55,7 +55,7 @@ public:
 	 * @param callback the callback to send data back on.
 	 * @param data     the data we want to send. When non-empty, this will be a POST request, otherwise a GET request.
 	 */
-	static void Connect(const std::string &uri, HTTPCallback *callback, const std::string data = "");
+	static void Connect(std::string_view uri, HTTPCallback *callback, std::string &&data = "");
 
 	/**
 	 * Do the receiving for all HTTP connections.
diff --git a/src/network/core/http_curl.cpp b/src/network/core/http_curl.cpp
index 334d0fd6d0..dcfc7d0a91 100644
--- a/src/network/core/http_curl.cpp
+++ b/src/network/core/http_curl.cpp
@@ -29,19 +29,19 @@
 
 #if defined(UNIX)
 /** List of certificate bundles, depending on OS. Taken from: https://go.dev/src/crypto/x509/root_linux.go. */
-static auto _certificate_files = {
-	"/etc/ssl/certs/ca-certificates.crt",                // Debian/Ubuntu/Gentoo etc.
-	"/etc/pki/tls/certs/ca-bundle.crt",                  // Fedora/RHEL 6
-	"/etc/ssl/ca-bundle.pem",                            // OpenSUSE
-	"/etc/pki/tls/cacert.pem",                           // OpenELEC
-	"/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", // CentOS/RHEL 7
-	"/etc/ssl/cert.pem",                                 // Alpine Linux
+static constexpr std::initializer_list<std::string_view> _certificate_files = {
+	"/etc/ssl/certs/ca-certificates.crt"sv,                // Debian/Ubuntu/Gentoo etc.
+	"/etc/pki/tls/certs/ca-bundle.crt"sv,                  // Fedora/RHEL 6
+	"/etc/ssl/ca-bundle.pem"sv,                            // OpenSUSE
+	"/etc/pki/tls/cacert.pem"sv,                           // OpenELEC
+	"/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"sv, // CentOS/RHEL 7
+	"/etc/ssl/cert.pem"sv,                                 // Alpine Linux
 };
 /** List of certificate directories, depending on OS. Taken from: https://go.dev/src/crypto/x509/root_linux.go. */
-static auto _certificate_directories = {
-	"/etc/ssl/certs",                                    // SLES10/SLES11, https://golang.org/issue/12139
-	"/etc/pki/tls/certs",                                // Fedora/RHEL
-	"/system/etc/security/cacerts",                      // Android
+static constexpr std::initializer_list<std::string_view> _certificate_directories = {
+	"/etc/ssl/certs"sv,                                    // SLES10/SLES11, https://golang.org/issue/12139
+	"/etc/pki/tls/certs"sv,                                // Fedora/RHEL
+	"/system/etc/security/cacerts"sv,                      // Android
 };
 #endif /* UNIX */
 
@@ -60,10 +60,10 @@ public:
 	 * @param callback the callback to send data back on.
 	 * @param data     the data we want to send. When non-empty, this will be a POST request, otherwise a GET request.
 	 */
-	NetworkHTTPRequest(const std::string &uri, HTTPCallback *callback, const std::string &data) :
+	NetworkHTTPRequest(std::string_view uri, HTTPCallback *callback, std::string &&data) :
 		uri(uri),
 		callback(callback),
-		data(data)
+		data(std::move(data))
 	{
 		std::lock_guard<std::mutex> lock(_new_http_callback_mutex);
 		_new_http_callbacks.push_back(&this->callback);
@@ -90,7 +90,7 @@ static std::string _http_ca_file = "";
 static std::string _http_ca_path = "";
 #endif /* UNIX */
 
-/* static */ void NetworkHTTPSocketHandler::Connect(const std::string &uri, HTTPCallback *callback, const std::string data)
+/* static */ void NetworkHTTPSocketHandler::Connect(std::string_view uri, HTTPCallback *callback, std::string &&data)
 {
 #if defined(UNIX)
 	if (_http_ca_file.empty() && _http_ca_path.empty()) {
@@ -100,7 +100,7 @@ static std::string _http_ca_path = "";
 #endif /* UNIX */
 
 	std::lock_guard<std::mutex> lock(_http_mutex);
-	_http_requests.push(std::make_unique<NetworkHTTPRequest>(uri, callback, data));
+	_http_requests.push(std::make_unique<NetworkHTTPRequest>(uri, callback, std::move(data)));
 	_http_cv.notify_one();
 }
 
@@ -203,7 +203,7 @@ void HttpThread()
 
 			/* Copy the buffer out of CURL. OnReceiveData() will free it when done. */
 			std::unique_ptr<char[]> buffer = std::make_unique<char[]>(size * nmemb);
-			memcpy(buffer.get(), ptr, size * nmemb);
+			std::copy_n(ptr, size * nmemb, buffer.get());
 			callback->OnReceiveData(std::move(buffer), size * nmemb);
 
 			return size * nmemb;
diff --git a/src/network/core/http_none.cpp b/src/network/core/http_none.cpp
index 822c71f01c..2c3816834b 100644
--- a/src/network/core/http_none.cpp
+++ b/src/network/core/http_none.cpp
@@ -18,7 +18,7 @@
 
 #include "../../safeguards.h"
 
-/* static */ void NetworkHTTPSocketHandler::Connect(const std::string &, HTTPCallback *callback, const std::string)
+/* static */ void NetworkHTTPSocketHandler::Connect(std::string_view, HTTPCallback *callback, std::string&&)
 {
 	/* No valid HTTP backend was compiled in, so we fail all HTTP requests. */
 	callback->OnFailure();
diff --git a/src/network/core/http_winhttp.cpp b/src/network/core/http_winhttp.cpp
index 11bf67d6f7..abc6849d9b 100644
--- a/src/network/core/http_winhttp.cpp
+++ b/src/network/core/http_winhttp.cpp
@@ -37,7 +37,7 @@ private:
 	int depth = 0;                       ///< Current redirect depth we are in.
 
 public:
-	NetworkHTTPRequest(const std::wstring &uri, HTTPCallback *callback, const std::string &data);
+	NetworkHTTPRequest(std::wstring &&uri, HTTPCallback *callback, std::string &&data);
 
 	~NetworkHTTPRequest();
 
@@ -62,10 +62,10 @@ static std::mutex _new_http_callback_mutex;
  * @param callback the callback to send data back on.
  * @param data     the data we want to send. When non-empty, this will be a POST request, otherwise a GET request.
  */
-NetworkHTTPRequest::NetworkHTTPRequest(const std::wstring &uri, HTTPCallback *callback, const std::string &data) :
-	uri(uri),
+NetworkHTTPRequest::NetworkHTTPRequest(std::wstring &&uri, HTTPCallback *callback, std::string &&data) :
+	uri(std::move(uri)),
 	callback(callback),
-	data(data)
+	data(std::move(data))
 {
 	std::lock_guard<std::mutex> lock(_new_http_callback_mutex);
 	_new_http_callbacks.push_back(&this->callback);
@@ -254,7 +254,7 @@ void NetworkHTTPRequest::Connect()
 	} else {
 		/* When the payload starts with a '{', it is a JSON payload. */
 		LPCWSTR content_type = data.starts_with("{") ? L"Content-Type: application/json\r\n" : L"Content-Type: application/x-www-form-urlencoded\r\n";
-		WinHttpSendRequest(this->request, content_type, -1, const_cast<char *>(data.c_str()), static_cast<DWORD>(data.size()), static_cast<DWORD>(data.size()), reinterpret_cast<DWORD_PTR>(this));
+		WinHttpSendRequest(this->request, content_type, -1, const_cast<char *>(data.data()), static_cast<DWORD>(data.size()), static_cast<DWORD>(data.size()), reinterpret_cast<DWORD_PTR>(this));
 	}
 }
 
@@ -291,9 +291,9 @@ NetworkHTTPRequest::~NetworkHTTPRequest()
 	_http_callbacks.erase(std::remove(_http_callbacks.begin(), _http_callbacks.end(), &this->callback), _http_callbacks.end());
 }
 
-/* static */ void NetworkHTTPSocketHandler::Connect(const std::string &uri, HTTPCallback *callback, const std::string data)
+/* static */ void NetworkHTTPSocketHandler::Connect(std::string_view uri, HTTPCallback *callback, std::string &&data)
 {
-	auto request = new NetworkHTTPRequest(std::wstring(uri.begin(), uri.end()), callback, data);
+	auto request = new NetworkHTTPRequest(std::wstring(uri.begin(), uri.end()), callback, std::move(data));
 	request->Connect();
 
 	std::lock_guard<std::mutex> lock(_new_http_requests_mutex);
diff --git a/src/network/core/os_abstraction.cpp b/src/network/core/os_abstraction.cpp
index 238f368f6e..045bfb913f 100644
--- a/src/network/core/os_abstraction.cpp
+++ b/src/network/core/os_abstraction.cpp
@@ -29,7 +29,7 @@
  * @param error The error code.
  * @param message The error message. Leave empty to determine this automatically based on the error number.
  */
-NetworkError::NetworkError(int error, const std::string &message) : error(error), message(message)
+NetworkError::NetworkError(int error, std::string_view message) : error(error), message(message)
 {
 }
 
@@ -78,7 +78,7 @@ bool NetworkError::IsConnectInProgress() const
  * Get the string representation of the error message.
  * @return The string representation that will get overwritten by next calls.
  */
-const std::string &NetworkError::AsString() const
+std::string_view NetworkError::AsString() const
 {
 	if (this->message.empty()) {
 #if defined(_WIN32)
@@ -155,8 +155,8 @@ bool SetNoDelay([[maybe_unused]] SOCKET d)
 	return true;
 #else
 	int flags = 1;
-	/* The (const char*) cast is needed for windows */
-	return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, (const char *)&flags, sizeof(flags)) == 0;
+	/* The (const char *) cast is needed for windows */
+	return setsockopt(d, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<const char *>(&flags), sizeof(flags)) == 0;
 #endif
 }
 
diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h
index 86c37db105..0b4abc0fcf 100644
--- a/src/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
@@ -23,13 +23,13 @@ private:
 	int error;                   ///< The underlying error number from errno or WSAGetLastError.
 	mutable std::string message; ///< The string representation of the error (set on first call to #AsString).
 public:
-	NetworkError(int error, const std::string &message = {});
+	NetworkError(int error, std::string_view message = {});
 
 	bool HasError() const;
 	bool WouldBlock() const;
 	bool IsConnectionReset() const;
 	bool IsConnectInProgress() const;
-	const std::string &AsString() const;
+	std::string_view AsString() const;
 
 	static NetworkError GetLast();
 };
@@ -141,4 +141,22 @@ NetworkError GetSocketError(SOCKET d);
 static_assert(sizeof(in_addr)  ==  4); ///< IPv4 addresses should be 4 bytes.
 static_assert(sizeof(in6_addr) == 16); ///< IPv6 addresses should be 16 bytes.
 
+struct SocketSender {
+	SOCKET sock;
+
+	ssize_t operator()(std::span<const uint8_t> buffer)
+	{
+		return send(this->sock, reinterpret_cast<const char *>(buffer.data()), static_cast<int>(buffer.size()), 0);
+	}
+};
+
+struct SocketReceiver {
+	SOCKET sock;
+
+	ssize_t operator()(std::span<uint8_t> buffer)
+	{
+		return recv(this->sock, reinterpret_cast<char *>(buffer.data()), static_cast<int>(buffer.size()), 0);
+	}
+};
+
 #endif /* NETWORK_CORE_OS_ABSTRACTION_H */
diff --git a/src/network/core/packet.cpp b/src/network/core/packet.cpp
index ef43de7ed1..bb828f846b 100644
--- a/src/network/core/packet.cpp
+++ b/src/network/core/packet.cpp
@@ -169,7 +169,7 @@ void Packet::Send_uint64(uint64_t data)
  * the string + '\0'. No size-byte or something.
  * @param data The string to send
  */
-void Packet::Send_string(const std::string_view data)
+void Packet::Send_string(std::string_view data)
 {
 	assert(this->CanWriteToPacket(data.size() + 1));
 	this->buffer.insert(this->buffer.end(), data.begin(), data.end());
@@ -397,18 +397,18 @@ std::vector<uint8_t> Packet::Recv_buffer()
 
 /**
  * Extract at most the length of the span bytes from the packet into the span.
- * @param span The span to write the bytes to.
+ * @param destination The span to write the bytes to.
  * @return The number of bytes that were actually read.
  */
-size_t Packet::Recv_bytes(std::span<uint8_t> span)
+size_t Packet::Recv_bytes(std::span<uint8_t> destination)
 {
-	auto tranfer_to_span = [](std::span<uint8_t> destination, const char *source, size_t amount) {
-		size_t to_copy = std::min(amount, destination.size());
-		std::copy(source, source + to_copy, destination.data());
-		return to_copy;
+	auto transfer_to_span = [&destination](std::span<const uint8_t> source) {
+		auto to_copy = source.subspan(0, destination.size());
+		std::ranges::copy(to_copy, destination.begin());
+		return to_copy.size();
 	};
 
-	return this->TransferOut(tranfer_to_span, span);
+	return this->TransferOut(transfer_to_span);
 }
 
 /**
diff --git a/src/network/core/packet.h b/src/network/core/packet.h
index d1ffa33c80..aa2754eb06 100644
--- a/src/network/core/packet.h
+++ b/src/network/core/packet.h
@@ -68,7 +68,7 @@ public:
 	void   Send_uint16(uint16_t data);
 	void   Send_uint32(uint32_t data);
 	void   Send_uint64(uint64_t data);
-	void   Send_string(const std::string_view data);
+	void   Send_string(std::string_view data);
 	void   Send_buffer(const std::vector<uint8_t> &data);
 	std::span<const uint8_t> Send_bytes(const std::span<const uint8_t> span);
 
@@ -95,29 +95,22 @@ public:
 	 * Transfer data from the packet to the given function. It starts reading at the
 	 * position the last transfer stopped.
 	 * See Packet::TransferIn for more information about transferring data to functions.
-	 * @param transfer_function The function to pass the buffer as second parameter and the
-	 *                          amount to write as third parameter. It returns the amount that
-	 *                          was written or -1 upon errors.
+	 * @param transfer_function The function to pass span of bytes to write to.
+	 *                          It returns the amount that was written or -1 upon errors.
 	 * @param limit             The maximum amount of bytes to transfer.
-	 * @param destination       The first parameter of the transfer function.
-	 * @param args              The fourth and further parameters to the transfer function, if any.
+	 * @tparam F The type of the transfer_function.
 	 * @return The return value of the transfer_function.
 	 */
-	template <
-		typename A = size_t, ///< The type for the amount to be passed, so it can be cast to the right type.
-		typename F,          ///< The type of the function.
-		typename D,          ///< The type of the destination.
-		typename ... Args>   ///< The types of the remaining arguments to the function.
-	ssize_t TransferOutWithLimit(F transfer_function, size_t limit, D destination, Args&& ... args)
+	template <typename F>
+	ssize_t TransferOutWithLimit(F transfer_function, size_t limit)
 	{
 		size_t amount = std::min(this->RemainingBytesToTransfer(), limit);
 		if (amount == 0) return 0;
 
 		assert(this->pos < this->buffer.size());
 		assert(this->pos + amount <= this->buffer.size());
-		/* Making buffer a char means casting a lot in the Recv/Send functions. */
-		const char *output_buffer = reinterpret_cast<const char*>(this->buffer.data() + this->pos);
-		ssize_t bytes = transfer_function(destination, output_buffer, static_cast<A>(amount), std::forward<Args>(args)...);
+		auto output_buffer = std::span<const uint8_t>(this->buffer.data() + this->pos, amount);
+		ssize_t bytes = transfer_function(output_buffer);
 		if (bytes > 0) this->pos += bytes;
 		return bytes;
 	}
@@ -126,21 +119,15 @@ public:
 	 * Transfer data from the packet to the given function. It starts reading at the
 	 * position the last transfer stopped.
 	 * See Packet::TransferIn for more information about transferring data to functions.
-	 * @param transfer_function The function to pass the buffer as second parameter and the
-	 *                          amount to write as third parameter. It returns the amount that
-	 *                          was written or -1 upon errors.
-	 * @param destination       The first parameter of the transfer function.
-	 * @param args              The fourth and further parameters to the transfer function, if any.
-	 * @tparam A    The type for the amount to be passed, so it can be cast to the right type.
-	 * @tparam F    The type of the transfer_function.
-	 * @tparam D    The type of the destination.
-	 * @tparam Args The types of the remaining arguments to the function.
+	 * @param transfer_function The function to pass span of bytes to write to.
+	 *                          It returns the amount that was written or -1 upon errors.
+	 * @tparam F The type of the transfer_function.
 	 * @return The return value of the transfer_function.
 	 */
-	template <typename A = size_t, typename F, typename D, typename ... Args>
-	ssize_t TransferOut(F transfer_function, D destination, Args&& ... args)
+	template <typename F>
+	ssize_t TransferOut(F transfer_function)
 	{
-		return TransferOutWithLimit<A>(transfer_function, std::numeric_limits<size_t>::max(), destination, std::forward<Args>(args)...);
+		return TransferOutWithLimit(transfer_function, std::numeric_limits<size_t>::max());
 	}
 
 	/**
@@ -161,28 +148,21 @@ public:
 	 *
 	 * This will attempt to write all the remaining bytes into the packet. It updates the
 	 * position based on how many bytes were actually written by the called transfer_function.
-	 * @param transfer_function The function to pass the buffer as second parameter and the
-	 *                          amount to read as third parameter. It returns the amount that
-	 *                          was read or -1 upon errors.
-	 * @param source            The first parameter of the transfer function.
-	 * @param args              The fourth and further parameters to the transfer function, if any.
-	 * @tparam A    The type for the amount to be passed, so it can be cast to the right type.
-	 * @tparam F    The type of the transfer_function.
-	 * @tparam S    The type of the source.
-	 * @tparam Args The types of the remaining arguments to the function.
+	 * @param transfer_function The function to pass a span of bytes to read to.
+	 *                          It returns the amount that was read or -1 upon errors.
+	 * @tparam F The type of the transfer_function.
 	 * @return The return value of the transfer_function.
 	 */
-	template <typename A = size_t, typename F, typename S, typename ... Args>
-	ssize_t TransferIn(F transfer_function, S source, Args&& ... args)
+	template <typename F>
+	ssize_t TransferIn(F transfer_function)
 	{
 		size_t amount = this->RemainingBytesToTransfer();
 		if (amount == 0) return 0;
 
 		assert(this->pos < this->buffer.size());
 		assert(this->pos + amount <= this->buffer.size());
-		/* Making buffer a char means casting a lot in the Recv/Send functions. */
-		char *input_buffer = reinterpret_cast<char*>(this->buffer.data() + this->pos);
-		ssize_t bytes = transfer_function(source, input_buffer, static_cast<A>(amount), std::forward<Args>(args)...);
+		auto input_buffer = std::span<uint8_t>(this->buffer.data() + this->pos, amount);
+		ssize_t bytes = transfer_function(input_buffer);
 		if (bytes > 0) this->pos += bytes;
 		return bytes;
 	}
diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp
index a03eed0b74..d29a530564 100644
--- a/src/network/core/tcp.cpp
+++ b/src/network/core/tcp.cpp
@@ -81,7 +81,7 @@ SendPacketsState NetworkTCPSocketHandler::SendPackets(bool closing_down)
 
 	while (!this->packet_queue.empty()) {
 		Packet &p = *this->packet_queue.front();
-		ssize_t res = p.TransferOut<int>(send, this->sock, 0);
+		ssize_t res = p.TransferOut(SocketSender{this->sock});
 		if (res == -1) {
 			NetworkError err = NetworkError::GetLast();
 			if (!err.WouldBlock()) {
@@ -131,7 +131,7 @@ std::unique_ptr<Packet> NetworkTCPSocketHandler::ReceivePacket()
 	/* Read packet size */
 	if (!p.HasPacketSizeData()) {
 		while (p.RemainingBytesToTransfer() != 0) {
-			res = p.TransferIn<int>(recv, this->sock, 0);
+			res = p.TransferIn(SocketReceiver{this->sock});
 			if (res == -1) {
 				NetworkError err = NetworkError::GetLast();
 				if (!err.WouldBlock()) {
@@ -159,7 +159,7 @@ std::unique_ptr<Packet> NetworkTCPSocketHandler::ReceivePacket()
 
 	/* Read rest of packet */
 	while (p.RemainingBytesToTransfer() != 0) {
-		res = p.TransferIn<int>(recv, this->sock, 0);
+		res = p.TransferIn(SocketReceiver{this->sock});
 		if (res == -1) {
 			NetworkError err = NetworkError::GetLast();
 			if (!err.WouldBlock()) {
diff --git a/src/network/core/tcp.h b/src/network/core/tcp.h
index 0c5e1a547f..38d76aaa47 100644
--- a/src/network/core/tcp.h
+++ b/src/network/core/tcp.h
@@ -120,7 +120,7 @@ private:
 
 public:
 	TCPConnecter() {};
-	TCPConnecter(const std::string &connection_string, uint16_t default_port, const NetworkAddress &bind_address = {}, int family = AF_UNSPEC);
+	TCPConnecter(std::string_view connection_string, uint16_t default_port, const NetworkAddress &bind_address = {}, int family = AF_UNSPEC);
 	virtual ~TCPConnecter();
 
 	/**
@@ -161,7 +161,7 @@ private:
 public:
 	ServerAddress server_address; ///< Address we are connecting to.
 
-	TCPServerConnecter(const std::string &connection_string, uint16_t default_port);
+	TCPServerConnecter(std::string_view connection_string, uint16_t default_port);
 
 	void SetConnected(SOCKET sock);
 	void SetFailure();
diff --git a/src/network/core/tcp_connect.cpp b/src/network/core/tcp_connect.cpp
index 1559f95172..8b0bd647c9 100644
--- a/src/network/core/tcp_connect.cpp
+++ b/src/network/core/tcp_connect.cpp
@@ -26,7 +26,7 @@
  * @param default_port If not indicated in connection_string, what port to use.
  * @param bind_address The local bind address to use. Defaults to letting the OS find one.
  */
-TCPConnecter::TCPConnecter(const std::string &connection_string, uint16_t default_port, const NetworkAddress &bind_address, int family) :
+TCPConnecter::TCPConnecter(std::string_view connection_string, uint16_t default_port, const NetworkAddress &bind_address, int family) :
 	bind_address(bind_address),
 	family(family)
 {
@@ -38,7 +38,7 @@ TCPConnecter::TCPConnecter(const std::string &connection_string, uint16_t defaul
  * @param connection_string The address to connect to.
  * @param default_port If not indicated in connection_string, what port to use.
  */
-TCPServerConnecter::TCPServerConnecter(const std::string &connection_string, uint16_t default_port) :
+TCPServerConnecter::TCPServerConnecter(std::string_view connection_string, uint16_t default_port) :
 	server_address(ServerAddress::Parse(connection_string, default_port))
 {
 	switch (this->server_address.type) {
@@ -222,13 +222,12 @@ void TCPConnecter::Resolve()
 	/* Port is already guaranteed part of the connection_string. */
 	NetworkAddress address = ParseConnectionString(this->connection_string, 0);
 
-	addrinfo hints;
-	memset(&hints, 0, sizeof(hints));
+	addrinfo hints{};
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_flags = AI_ADDRCONFIG;
 	hints.ai_socktype = SOCK_STREAM;
 
-	std::string port_name = std::to_string(address.GetPort());
+	std::string port_name = fmt::format("{}", address.GetPort());
 
 	static bool getaddrinfo_timeout_error_shown = false;
 	auto start = std::chrono::steady_clock::now();
diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index c8e24547db..4eef5abb01 100644
--- a/src/network/core/tcp_content.cpp
+++ b/src/network/core/tcp_content.cpp
@@ -32,9 +32,9 @@
 bool ContentInfo::IsSelected() const
 {
 	switch (this->state) {
-		case ContentInfo::SELECTED:
-		case ContentInfo::AUTOSELECTED:
-		case ContentInfo::ALREADY_HERE:
+		case ContentInfo::State::Selected:
+		case ContentInfo::State::Autoselected:
+		case ContentInfo::State::AlreadyHere:
 			return true;
 
 		default:
@@ -48,7 +48,7 @@ bool ContentInfo::IsSelected() const
  */
 bool ContentInfo::IsValid() const
 {
-	return this->state < ContentInfo::INVALID && this->type >= CONTENT_TYPE_BEGIN && this->type < CONTENT_TYPE_END;
+	return this->state < ContentInfo::State::Invalid && this->type >= CONTENT_TYPE_BEGIN && this->type < CONTENT_TYPE_END;
 }
 
 /**
@@ -58,43 +58,43 @@ bool ContentInfo::IsValid() const
  */
 std::optional<std::string> ContentInfo::GetTextfile(TextfileType type) const
 {
-	if (this->state == INVALID) return std::nullopt;
-	const char *tmp;
+	if (this->state == ContentInfo::State::Invalid) return std::nullopt;
+	std::optional<std::string_view> tmp;
 	switch (this->type) {
 		default: NOT_REACHED();
 		case CONTENT_TYPE_AI:
-			tmp = AI::GetScannerInfo()->FindMainScript(this, true);
+			tmp = AI::GetScannerInfo()->FindMainScript(*this, true);
 			break;
 		case CONTENT_TYPE_AI_LIBRARY:
-			tmp = AI::GetScannerLibrary()->FindMainScript(this, true);
+			tmp = AI::GetScannerLibrary()->FindMainScript(*this, true);
 			break;
 		case CONTENT_TYPE_GAME:
-			tmp = Game::GetScannerInfo()->FindMainScript(this, true);
+			tmp = Game::GetScannerInfo()->FindMainScript(*this, true);
 			break;
 		case CONTENT_TYPE_GAME_LIBRARY:
-			tmp = Game::GetScannerLibrary()->FindMainScript(this, true);
+			tmp = Game::GetScannerLibrary()->FindMainScript(*this, true);
 			break;
 		case CONTENT_TYPE_NEWGRF: {
 			const GRFConfig *gc = FindGRFConfig(std::byteswap(this->unique_id), FGCM_EXACT, &this->md5sum);
-			tmp = gc != nullptr ? gc->filename.c_str() : nullptr;
+			if (gc != nullptr) tmp = gc->filename;
 			break;
 		}
 		case CONTENT_TYPE_BASE_GRAPHICS:
-			tmp = TryGetBaseSetFile(this, true, BaseGraphics::GetAvailableSets());
+			tmp = TryGetBaseSetFile(*this, true, BaseGraphics::GetAvailableSets());
 			break;
 		case CONTENT_TYPE_BASE_SOUNDS:
-			tmp = TryGetBaseSetFile(this, true, BaseSounds::GetAvailableSets());
+			tmp = TryGetBaseSetFile(*this, true, BaseSounds::GetAvailableSets());
 			break;
 		case CONTENT_TYPE_BASE_MUSIC:
-			tmp = TryGetBaseSetFile(this, true, BaseMusic::GetAvailableSets());
+			tmp = TryGetBaseSetFile(*this, true, BaseMusic::GetAvailableSets());
 			break;
 		case CONTENT_TYPE_SCENARIO:
 		case CONTENT_TYPE_HEIGHTMAP:
-			tmp = FindScenario(this, true);
+			tmp = FindScenario(*this, true);
 			break;
 	}
-	if (tmp == nullptr) return std::nullopt;
-	return ::GetTextfile(type, GetContentInfoSubDir(this->type), tmp);
+	if (!tmp.has_value()) return std::nullopt;
+	return ::GetTextfile(type, GetContentInfoSubDir(this->type), *tmp);
 }
 
 /**
diff --git a/src/network/core/tcp_content_type.h b/src/network/core/tcp_content_type.h
index de1792d264..ac25c241c4 100644
--- a/src/network/core/tcp_content_type.h
+++ b/src/network/core/tcp_content_type.h
@@ -14,6 +14,9 @@
 
 #include "../../3rdparty/md5/md5.h"
 
+#include "../../string_type.h"
+#include "../../textfile_type.h"
+
 /** The values in the enum are important; they are used as database 'keys' */
 enum ContentType : uint8_t {
 	CONTENT_TYPE_BEGIN         = 1, ///< Helper to mark the begin of the types
@@ -30,6 +33,7 @@ enum ContentType : uint8_t {
 	CONTENT_TYPE_END,               ///< Helper to mark the end of the types
 	INVALID_CONTENT_TYPE       = 0xFF, ///< Invalid/uninitialized content
 };
+using ContentTypes = EnumBitSet<ContentType, uint16_t, CONTENT_TYPE_END>;
 
 /** Enum with all types of TCP content packets. The order MUST not be changed **/
 enum PacketContentType : uint8_t {
@@ -51,13 +55,13 @@ static constexpr ContentID INVALID_CONTENT_ID = UINT32_MAX; ///< Sentinel for in
 /** Container for all important information about a piece of content. */
 struct ContentInfo {
 	/** The state the content can be in. */
-	enum State : uint8_t {
-		UNSELECTED,     ///< The content has not been selected
-		SELECTED,       ///< The content has been manually selected
-		AUTOSELECTED,   ///< The content has been selected as dependency
-		ALREADY_HERE,   ///< The content is already at the client side
-		DOES_NOT_EXIST, ///< The content does not exist in the content system
-		INVALID,        ///< The content's invalid
+	enum class State : uint8_t {
+		Unselected, ///< The content has not been selected
+		Selected, ///< The content has been manually selected
+		Autoselected, ///< The content has been selected as dependency
+		AlreadyHere, ///< The content is already at the client side
+		DoesNotExist, ///< The content does not exist in the content system
+		Invalid, ///< The content's invalid
 	};
 
 	ContentType type = INVALID_CONTENT_TYPE; ///< Type of content
@@ -72,7 +76,7 @@ struct ContentInfo {
 	MD5Hash md5sum;                          ///< The MD5 checksum
 	std::vector<ContentID> dependencies;     ///< The dependencies (unique server side ids)
 	StringList tags;                         ///< Tags associated with the content
-	State state = State::UNSELECTED;         ///< Whether the content info is selected (for download)
+	State state = State::Unselected;         ///< Whether the content info is selected (for download)
 	bool upgrade = false;                    ///< This item is an upgrade
 
 	bool IsSelected() const;
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
index 1752fee3fc..9e03a7be8d 100644
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -519,7 +519,7 @@ public:
 
 	NetworkRecvStatus ReceivePackets();
 
-	const char *ReceiveCommand(Packet &p, CommandPacket &cp);
+	std::optional<std::string_view> ReceiveCommand(Packet &p, CommandPacket &cp);
 	void SendCommand(Packet &p, const CommandPacket &cp);
 
 	bool IsPendingDeletion() const { return this->is_pending_deletion; }
diff --git a/src/network/core/tcp_listen.h b/src/network/core/tcp_listen.h
index 8af0cbe23e..7e38734e6d 100644
--- a/src/network/core/tcp_listen.h
+++ b/src/network/core/tcp_listen.h
@@ -14,6 +14,8 @@
 
 #include "tcp.h"
 #include "../network.h"
+#include "../network_func.h"
+#include "../network_internal.h"
 #include "../../core/pool_type.hpp"
 #include "../../debug.h"
 
@@ -41,7 +43,7 @@ public:
 
 				Debug(net, 2, "[{}] Banned ip tried to join ({}), refused", Tsocket::GetName(), entry);
 
-				if (p.TransferOut<int>(send, s, 0) < 0) {
+				if (p.TransferOut(SocketSender{s}) < 0) {
 					Debug(net, 0, "[{}] send failed: {}", Tsocket::GetName(), NetworkError::GetLast().AsString());
 				}
 				closesocket(s);
@@ -56,7 +58,7 @@ public:
 			Packet p(nullptr, Tfull_packet);
 			p.PrepareToSend();
 
-			if (p.TransferOut<int>(send, s, 0) < 0) {
+			if (p.TransferOut(SocketSender{s}) < 0) {
 				Debug(net, 0, "[{}] send failed: {}", Tsocket::GetName(), NetworkError::GetLast().AsString());
 			}
 			closesocket(s);
@@ -74,8 +76,7 @@ public:
 	static void AcceptClient(SOCKET ls)
 	{
 		for (;;) {
-			struct sockaddr_storage sin;
-			memset(&sin, 0, sizeof(sin));
+			struct sockaddr_storage sin{};
 			socklen_t sin_len = sizeof(sin);
 			SOCKET s = accept(ls, (struct sockaddr*)&sin, &sin_len);
 			if (s == INVALID_SOCKET) return;
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index d3e69fce85..000e650411 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -94,7 +94,9 @@ void NetworkUDPSocketHandler::SendPacket(Packet &p, NetworkAddress &recv, bool a
 		}
 
 		/* Send the buffer */
-		ssize_t res = p.TransferOut<int>(sendto, s.first, 0, (const struct sockaddr *)send.GetAddress(), send.GetAddressLength());
+		ssize_t res = p.TransferOut([&](std::span<const uint8_t> buffer) {
+			return sendto(s.first, reinterpret_cast<const char *>(buffer.data()), static_cast<int>(buffer.size()), 0, reinterpret_cast<const struct sockaddr *>(send.GetAddress()), send.GetAddressLength());
+		});
 		Debug(net, 7, "sendto({})", send.GetAddressAsString());
 
 		/* Check for any errors, but ignore it otherwise */
@@ -111,8 +113,7 @@ void NetworkUDPSocketHandler::ReceivePackets()
 {
 	for (auto &s : this->sockets) {
 		for (int i = 0; i < 1000; i++) { // Do not infinitely loop when DoSing with UDP
-			struct sockaddr_storage client_addr;
-			memset(&client_addr, 0, sizeof(client_addr));
+			struct sockaddr_storage client_addr{};
 
 			/* The limit is UDP_MTU, but also allocate that much as we need to read the whole packet in one go. */
 			Packet p(this, UDP_MTU, UDP_MTU);
@@ -120,7 +121,9 @@ void NetworkUDPSocketHandler::ReceivePackets()
 
 			/* Try to receive anything */
 			SetNonBlocking(s.first); // Some OSes seem to lose the non-blocking status of the socket
-			ssize_t nbytes = p.TransferIn<int>(recvfrom, s.first, 0, (struct sockaddr *)&client_addr, &client_len);
+			ssize_t nbytes = p.TransferIn([&](std::span<uint8_t> buffer) {
+				return recvfrom(s.first, reinterpret_cast<char *>(buffer.data()), static_cast<int>(buffer.size()), 0, reinterpret_cast<struct sockaddr *>(&client_addr), &client_len);
+			});
 
 			/* Did we get the bytes for the base header of the packet? */
 			if (nbytes <= 0) break;    // No data, i.e. no packet
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 321e47ffb7..6a02b82f5a 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -9,6 +9,7 @@
 
 #include "../stdafx.h"
 
+#include "../core/string_consumer.hpp"
 #include "../strings_func.h"
 #include "../command_func.h"
 #include "../timer/timer_game_tick.h"
@@ -230,7 +231,7 @@ uint8_t NetworkSpectatorCount()
 /* This puts a text-message to the console, or in the future, the chat-box,
  *  (to keep it all a bit more general)
  * If 'self_send' is true, this is the client who is sending the message */
-void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const std::string &name, const std::string &str, StringParameter &&data)
+void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, std::string_view name, std::string_view str, StringParameter &&data)
 {
 	std::string message;
 	StringBuilder builder(message);
@@ -472,7 +473,7 @@ static void CheckPauseOnJoin()
  * @param company_id        The company ID to set, if available.
  * @return A std::string_view into the connection string without the company part.
  */
-std::string_view ParseCompanyFromConnectionString(const std::string &connection_string, CompanyID *company_id)
+std::string_view ParseCompanyFromConnectionString(std::string_view connection_string, CompanyID *company_id)
 {
 	std::string_view ip = connection_string;
 	if (company_id == nullptr) return ip;
@@ -516,7 +517,7 @@ std::string_view ParseCompanyFromConnectionString(const std::string &connection_
  * @param company_id        The company ID to set, if available.
  * @return A std::string_view into the connection string with the (IP) address part.
  */
-std::string_view ParseFullConnectionString(const std::string &connection_string, uint16_t &port, CompanyID *company_id)
+std::string_view ParseFullConnectionString(std::string_view connection_string, uint16_t &port, CompanyID *company_id)
 {
 	std::string_view ip = ParseCompanyFromConnectionString(connection_string, company_id);
 
@@ -536,11 +537,11 @@ std::string_view ParseFullConnectionString(const std::string &connection_string,
  * @param default_port The port to use if none is given.
  * @return The normalized connection string.
  */
-std::string NormalizeConnectionString(const std::string &connection_string, uint16_t default_port)
+std::string NormalizeConnectionString(std::string_view connection_string, uint16_t default_port)
 {
 	uint16_t port = default_port;
 	std::string_view ip = ParseFullConnectionString(connection_string, port);
-	return std::string(ip) + ":" + std::to_string(port);
+	return fmt::format("{}:{}", ip, port);
 }
 
 /**
@@ -551,7 +552,7 @@ std::string NormalizeConnectionString(const std::string &connection_string, uint
  * @param default_port The default port to set port to if not in connection_string.
  * @return A valid NetworkAddress of the parsed information.
  */
-NetworkAddress ParseConnectionString(const std::string &connection_string, uint16_t default_port)
+NetworkAddress ParseConnectionString(std::string_view connection_string, uint16_t default_port)
 {
 	uint16_t port = default_port;
 	std::string_view ip = ParseFullConnectionString(connection_string, port);
@@ -642,7 +643,7 @@ private:
 	std::string connection_string;
 
 public:
-	TCPQueryConnecter(const std::string &connection_string) : TCPServerConnecter(connection_string, NETWORK_DEFAULT_PORT), connection_string(connection_string) {}
+	TCPQueryConnecter(std::string_view connection_string) : TCPServerConnecter(connection_string, NETWORK_DEFAULT_PORT), connection_string(connection_string) {}
 
 	void OnFailure() override
 	{
@@ -667,7 +668,7 @@ public:
  * Query a server to fetch the game-info.
  * @param connection_string the address to query.
  */
-void NetworkQueryServer(const std::string &connection_string)
+void NetworkQueryServer(std::string_view connection_string)
 {
 	if (!_network_available) return;
 
@@ -689,7 +690,7 @@ void NetworkQueryServer(const std::string &connection_string)
  * @param never_expire Whether the entry can expire (removed when no longer found in the public listing).
  * @return The entry on the game list.
  */
-NetworkGame *NetworkAddServer(const std::string &connection_string, bool manually, bool never_expire)
+NetworkGame *NetworkAddServer(std::string_view connection_string, bool manually, bool never_expire)
 {
 	if (connection_string.empty()) return nullptr;
 
@@ -718,7 +719,7 @@ NetworkGame *NetworkAddServer(const std::string &connection_string, bool manuall
 void GetBindAddresses(NetworkAddressList *addresses, uint16_t port)
 {
 	for (const auto &iter : _network_bind_list) {
-		addresses->emplace_back(iter.c_str(), port);
+		addresses->emplace_back(iter, port);
 	}
 
 	/* No address, so bind to everything. */
@@ -745,7 +746,7 @@ private:
 	std::string connection_string;
 
 public:
-	TCPClientConnecter(const std::string &connection_string) : TCPServerConnecter(connection_string, NETWORK_DEFAULT_PORT), connection_string(connection_string) {}
+	TCPClientConnecter(std::string_view connection_string) : TCPServerConnecter(connection_string, NETWORK_DEFAULT_PORT), connection_string(connection_string) {}
 
 	void OnFailure() override
 	{
@@ -782,7 +783,7 @@ public:
  * @param join_server_password  The password for the server.
  * @return Whether the join has started.
  */
-bool NetworkClientConnectGame(const std::string &connection_string, CompanyID default_company, const std::string &join_server_password)
+bool NetworkClientConnectGame(std::string_view connection_string, CompanyID default_company, const std::string &join_server_password)
 {
 	Debug(net, 9, "NetworkClientConnectGame(): connection_string={}", connection_string);
 
@@ -1125,7 +1126,7 @@ void NetworkGameLoop()
 			if (TimerGameEconomy::date == next_date && TimerGameEconomy::date_fract == next_date_fract) {
 				if (cp != nullptr) {
 					NetworkSendCommand(cp->cmd, cp->err_msg, nullptr, cp->company, cp->data);
-					Debug(desync, 0, "Injecting: {:08x}; {:02x}; {:02x}; {:08x}; {} ({})", TimerGameEconomy::date, TimerGameEconomy::date_fract, (int)_current_company, cp->cmd, FormatArrayAsHex(cp->data), GetCommandName(cp->cmd));
+					Debug(desync, 0, "Injecting: {:08x}; {:02x}; {:02x}; {:08x}; {} ({})", TimerGameEconomy::date, TimerGameEconomy::date_fract, _current_company.base(), cp->cmd, FormatArrayAsHex(cp->data), GetCommandName(cp->cmd));
 					delete cp;
 					cp = nullptr;
 				}
@@ -1156,70 +1157,72 @@ void NetworkGameLoop()
 			char buff[4096];
 			if (fgets(buff, lengthof(buff), *f) == nullptr) break;
 
-			char *p = buff;
+			StringConsumer consumer{std::string_view{buff}};
 			/* Ignore the "[date time] " part of the message */
-			if (*p == '[') {
-				p = strchr(p, ']');
-				if (p == nullptr) break;
-				p += 2;
+			if (consumer.ReadCharIf('[')) {
+				consumer.SkipUntilChar(']', StringConsumer::SKIP_ONE_SEPARATOR);
+				consumer.SkipCharIf(' ');
 			}
 
-			if (strncmp(p, "cmd: ", 5) == 0
+			if (consumer.ReadIf("cmd: ")
 #ifdef DEBUG_FAILED_DUMP_COMMANDS
-				|| strncmp(p, "cmdf: ", 6) == 0
+				|| consumer.ReadIf("cmdf: ")
 #endif
 				) {
-				p += 5;
-				if (*p == ' ') p++;
 				cp = new CommandPacket();
-				int company;
-				uint cmd;
-				char buffer[256];
-				uint32_t next_date_raw;
-				int ret = sscanf(p, "%x; %x; %x; %x; %x; %255s", &next_date_raw, &next_date_fract, &company, &cmd, &cp->err_msg, buffer);
-				assert(ret == 6);
-				next_date = TimerGameEconomy::Date((int32_t)next_date_raw);
-				cp->company = (CompanyID)company;
-				cp->cmd = (Commands)cmd;
+				next_date = TimerGameEconomy::Date(consumer.ReadIntegerBase<uint32_t>(16));
+				bool valid = consumer.ReadIf("; ");
+				next_date_fract = consumer.ReadIntegerBase<uint32_t>(16);
+				valid &= consumer.ReadIf("; ");
+				cp->company = static_cast<CompanyID>(consumer.ReadIntegerBase<uint16_t>(16));
+				valid &= consumer.ReadIf("; ");
+				cp->cmd = static_cast<Commands>(consumer.ReadIntegerBase<uint32_t>(16));
+				valid &= consumer.ReadIf("; ");
+				cp->err_msg = consumer.ReadIntegerBase<uint32_t>(16);
+				valid &= consumer.ReadIf("; ");
+				auto args = consumer.ReadUntilChar(' ', StringConsumer::SKIP_ONE_SEPARATOR);
+				assert(valid);
 
 				/* Parse command data. */
-				std::vector<uint8_t> args;
-				size_t arg_len = strlen(buffer);
-				for (size_t i = 0; i + 1 < arg_len; i += 2) {
+				cp->data.clear();
+				for (size_t i = 0; i + 1 < args.size(); i += 2) {
 					uint8_t e = 0;
-					std::from_chars(buffer + i, buffer + i + 2, e, 16);
-					args.emplace_back(e);
+					std::from_chars(args.data() + i, args.data() + i + 2, e, 16);
+					cp->data.push_back(e);
 				}
-				cp->data = args;
-			} else if (strncmp(p, "join: ", 6) == 0) {
+			} else if (consumer.ReadIf("join: ")) {
 				/* Manually insert a pause when joining; this way the client can join at the exact right time. */
-				uint32_t next_date_raw;
-				int ret = sscanf(p + 6, "%x; %x", &next_date_raw, &next_date_fract);
-				next_date = TimerGameEconomy::Date((int32_t)next_date_raw);
-				assert(ret == 2);
+				next_date = TimerGameEconomy::Date(consumer.ReadIntegerBase<uint32_t>(16));
+				bool valid = consumer.ReadIf("; ");
+				next_date_fract = consumer.ReadIntegerBase<uint32_t>(16);
+				assert(valid);
 				Debug(desync, 0, "Injecting pause for join at {:08x}:{:02x}; please join when paused", next_date, next_date_fract);
 				cp = new CommandPacket();
 				cp->company = COMPANY_SPECTATOR;
 				cp->cmd = CMD_PAUSE;
 				cp->data = EndianBufferWriter<>::FromValue(CommandTraits<CMD_PAUSE>::Args{ PauseMode::Normal, true });
 				_ddc_fastforward = false;
-			} else if (strncmp(p, "sync: ", 6) == 0) {
-				uint32_t next_date_raw;
-				int ret = sscanf(p + 6, "%x; %x; %x; %x", &next_date_raw, &next_date_fract, &sync_state[0], &sync_state[1]);
-				next_date = TimerGameEconomy::Date((int32_t)next_date_raw);
-				assert(ret == 4);
+			} else if (consumer.ReadIf("sync: ")) {
+				next_date = TimerGameEconomy::Date(consumer.ReadIntegerBase<uint32_t>(16));
+				bool valid = consumer.ReadIf("; ");
+				next_date_fract = consumer.ReadIntegerBase<uint32_t>(16);
+				valid &= consumer.ReadIf("; ");
+				sync_state[0] = consumer.ReadIntegerBase<uint32_t>(16);
+				valid &= consumer.ReadIf("; ");
+				sync_state[1] = consumer.ReadIntegerBase<uint32_t>(16);
+				assert(valid);
 				check_sync_state = true;
-			} else if (strncmp(p, "msg: ", 5) == 0 || strncmp(p, "client: ", 8) == 0 ||
-						strncmp(p, "load: ", 6) == 0 || strncmp(p, "save: ", 6) == 0 ||
-						strncmp(p, "warning: ", 9) == 0) {
+			} else if (consumer.ReadIf("msg: ") || consumer.ReadIf("client: ") ||
+						consumer.ReadIf("load: ") || consumer.ReadIf("save: ") ||
+						consumer.ReadIf("warning: ")) {
 				/* A message that is not very important to the log playback, but part of the log. */
 #ifndef DEBUG_FAILED_DUMP_COMMANDS
-			} else if (strncmp(p, "cmdf: ", 6) == 0) {
-				Debug(desync, 0, "Skipping replay of failed command: {}", p + 6);
+			} else if (consumer.ReadIf("cmdf: ")) {
+				Debug(desync, 0, "Skipping replay of failed command: {}", consumer.Read(StringConsumer::npos));
 #endif
 			} else {
 				/* Can't parse a line; what's wrong here? */
-				Debug(desync, 0, "Trying to parse: {}", p);
+				Debug(desync, 0, "Trying to parse: {}", consumer.Read(StringConsumer::npos));
 				NOT_REACHED();
 			}
 		}
diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp
index 0175212a6b..82b7bd5383 100644
--- a/src/network/network_admin.cpp
+++ b/src/network/network_admin.cpp
@@ -440,7 +440,7 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendCompanyStats()
  * @param msg The actual message.
  * @param data Arbitrary extra data.
  */
-NetworkRecvStatus ServerNetworkAdminSocketHandler::SendChat(NetworkAction action, DestType desttype, ClientID client_id, const std::string &msg, int64_t data)
+NetworkRecvStatus ServerNetworkAdminSocketHandler::SendChat(NetworkAction action, DestType desttype, ClientID client_id, std::string_view msg, int64_t data)
 {
 	auto p = std::make_unique<Packet>(this, ADMIN_PACKET_SERVER_CHAT);
 
@@ -458,7 +458,7 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendChat(NetworkAction action
  * Send a notification indicating the rcon command has completed.
  * @param command The original command sent.
  */
-NetworkRecvStatus ServerNetworkAdminSocketHandler::SendRconEnd(const std::string_view command)
+NetworkRecvStatus ServerNetworkAdminSocketHandler::SendRconEnd(std::string_view command)
 {
 	auto p = std::make_unique<Packet>(this, ADMIN_PACKET_SERVER_RCON_END);
 
@@ -473,7 +473,7 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendRconEnd(const std::string
  * @param colour The colour of the text.
  * @param result The result of the command.
  */
-NetworkRecvStatus ServerNetworkAdminSocketHandler::SendRcon(uint16_t colour, const std::string_view result)
+NetworkRecvStatus ServerNetworkAdminSocketHandler::SendRcon(uint16_t colour, std::string_view result)
 {
 	auto p = std::make_unique<Packet>(this, ADMIN_PACKET_SERVER_RCON);
 
@@ -526,7 +526,7 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::Receive_ADMIN_PING(Packet &p)
  * @param origin The origin of the string.
  * @param string The string that's put on the console.
  */
-NetworkRecvStatus ServerNetworkAdminSocketHandler::SendConsole(const std::string_view origin, const std::string_view string)
+NetworkRecvStatus ServerNetworkAdminSocketHandler::SendConsole(std::string_view origin, std::string_view string)
 {
 	/* If the length of both strings, plus the 2 '\0' terminations and 3 bytes of the packet
 	 * are bigger than the MTU, just ignore the message. Better safe than sorry. It should
@@ -547,7 +547,7 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendConsole(const std::string
  * Send GameScript JSON output.
  * @param json The JSON string.
  */
-NetworkRecvStatus ServerNetworkAdminSocketHandler::SendGameScript(const std::string_view json)
+NetworkRecvStatus ServerNetworkAdminSocketHandler::SendGameScript(std::string_view json)
 {
 	auto p = std::make_unique<Packet>(this, ADMIN_PACKET_SERVER_GAMESCRIPT);
 
@@ -574,12 +574,12 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendCmdNames()
 	auto p = std::make_unique<Packet>(this, ADMIN_PACKET_SERVER_CMD_NAMES);
 
 	for (uint16_t i = 0; i < CMD_END; i++) {
-		const char *cmdname = GetCommandName(static_cast<Commands>(i));
+		std::string_view cmdname = GetCommandName(static_cast<Commands>(i));
 
 		/* Should COMPAT_MTU be exceeded, start a new packet
 		 * (magic 5: 1 bool "more data" and one uint16_t "command id", one
 		 * byte for string '\0' termination and 1 bool "no more data" */
-		if (!p->CanWriteToPacket(strlen(cmdname) + 5)) {
+		if (!p->CanWriteToPacket(cmdname.size() + 5)) {
 			p->Send_bool(false);
 			this->SendPacket(std::move(p));
 
@@ -980,7 +980,7 @@ void NetworkAdminCompanyRemove(CompanyID company_id, AdminCompanyRemoveReason bc
 /**
  * Send chat to the admin network (if they did opt in for the respective update).
  */
-void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_id, const std::string &msg, int64_t data, bool from_admin)
+void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_id, std::string_view msg, int64_t data, bool from_admin)
 {
 	if (from_admin) return;
 
@@ -997,7 +997,7 @@ void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_i
  * @param colour_code The colour of the string.
  * @param string      The string to show.
  */
-void NetworkServerSendAdminRcon(AdminID admin_index, TextColour colour_code, const std::string_view string)
+void NetworkServerSendAdminRcon(AdminID admin_index, TextColour colour_code, std::string_view string)
 {
 	ServerNetworkAdminSocketHandler::Get(admin_index)->SendRcon(colour_code, string);
 }
@@ -1007,7 +1007,7 @@ void NetworkServerSendAdminRcon(AdminID admin_index, TextColour colour_code, con
  * @param origin the origin of the message.
  * @param string the message as printed on the console.
  */
-void NetworkAdminConsole(const std::string_view origin, const std::string_view string)
+void NetworkAdminConsole(std::string_view origin, std::string_view string)
 {
 	for (ServerNetworkAdminSocketHandler *as : ServerNetworkAdminSocketHandler::IterateActive()) {
 		if (as->update_frequency[ADMIN_UPDATE_CONSOLE].Test(AdminUpdateFrequency::Automatic)) {
@@ -1020,7 +1020,7 @@ void NetworkAdminConsole(const std::string_view origin, const std::string_view s
  * Send GameScript JSON to the admin network (if they did opt in for the respective update).
  * @param json The JSON data as received from the GameScript.
  */
-void NetworkAdminGameScript(const std::string_view json)
+void NetworkAdminGameScript(std::string_view json)
 {
 	for (ServerNetworkAdminSocketHandler *as : ServerNetworkAdminSocketHandler::IterateActive()) {
 		if (as->update_frequency[ADMIN_UPDATE_GAMESCRIPT].Test(AdminUpdateFrequency::Automatic)) {
diff --git a/src/network/network_admin.h b/src/network/network_admin.h
index 4551d0afaf..89a7ac80a5 100644
--- a/src/network/network_admin.h
+++ b/src/network/network_admin.h
@@ -68,13 +68,13 @@ public:
 	NetworkRecvStatus SendCompanyEconomy();
 	NetworkRecvStatus SendCompanyStats();
 
-	NetworkRecvStatus SendChat(NetworkAction action, DestType desttype, ClientID client_id, const std::string &msg, int64_t data);
-	NetworkRecvStatus SendRcon(uint16_t colour, const std::string_view command);
-	NetworkRecvStatus SendConsole(const std::string_view origin, const std::string_view command);
-	NetworkRecvStatus SendGameScript(const std::string_view json);
+	NetworkRecvStatus SendChat(NetworkAction action, DestType desttype, ClientID client_id, std::string_view msg, int64_t data);
+	NetworkRecvStatus SendRcon(uint16_t colour, std::string_view command);
+	NetworkRecvStatus SendConsole(std::string_view origin, std::string_view command);
+	NetworkRecvStatus SendGameScript(std::string_view json);
 	NetworkRecvStatus SendCmdNames();
 	NetworkRecvStatus SendCmdLogging(ClientID client_id, const CommandPacket &cp);
-	NetworkRecvStatus SendRconEnd(const std::string_view command);
+	NetworkRecvStatus SendRconEnd(std::string_view command);
 
 	static void Send();
 	static void AcceptConnection(SOCKET s, const NetworkAddress &address);
@@ -85,7 +85,7 @@ public:
 	 * Get the name used by the listener.
 	 * @return the name to show in debug logs and the like.
 	 */
-	static const char *GetName()
+	static std::string_view GetName()
 	{
 		return "admin";
 	}
@@ -113,11 +113,11 @@ void NetworkAdminCompanyNew(const Company *company);
 void NetworkAdminCompanyUpdate(const Company *company);
 void NetworkAdminCompanyRemove(CompanyID company_id, AdminCompanyRemoveReason bcrr);
 
-void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_id, const std::string &msg, int64_t data = 0, bool from_admin = false);
+void NetworkAdminChat(NetworkAction action, DestType desttype, ClientID client_id, std::string_view msg, int64_t data = 0, bool from_admin = false);
 void NetworkAdminUpdate(AdminUpdateFrequency freq);
-void NetworkServerSendAdminRcon(AdminID admin_index, TextColour colour_code, const std::string_view string);
-void NetworkAdminConsole(const std::string_view origin, const std::string_view string);
-void NetworkAdminGameScript(const std::string_view json);
+void NetworkServerSendAdminRcon(AdminID admin_index, TextColour colour_code, std::string_view string);
+void NetworkAdminConsole(std::string_view origin, std::string_view string);
+void NetworkAdminGameScript(std::string_view json);
 void NetworkAdminCmdLogging(const NetworkClientSocket *owner, const CommandPacket &cp);
 
 #endif /* NETWORK_ADMIN_H */
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index cef0062ae5..30bf187c10 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -165,7 +165,7 @@ void NetworkUndrawChatMessage()
 }
 
 /** Check if a message is expired on a regular interval. */
-static IntervalTimer<TimerWindow> network_message_expired_interval(std::chrono::seconds(1), [](auto) {
+static const IntervalTimer<TimerWindow> network_message_expired_interval(std::chrono::seconds(1), [](auto) {
 	auto now = std::chrono::steady_clock::now();
 	for (auto &cmsg : _chatmsg_list) {
 		/* Message has expired, remove from the list */
@@ -251,7 +251,7 @@ void NetworkDrawChatMessage()
  * @param type The type of destination.
  * @param dest The actual destination index.
  */
-static void SendChat(const std::string &buf, DestType type, int dest)
+static void SendChat(std::string_view buf, DestType type, int dest)
 {
 	if (buf.empty()) return;
 	if (!_network_server) {
@@ -330,9 +330,9 @@ struct NetworkChatWindow : public Window {
 		this->Window::Close();
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int def_height, bool allow_resize) override
 	{
-		Window::FindWindowPlacementAndResize(_toolbar_width, def_height);
+		Window::FindWindowPlacementAndResize(_toolbar_width, def_height, allow_resize);
 	}
 
 	/**
@@ -427,7 +427,7 @@ static constexpr NWidgetPart _nested_chat_window_widgets[] = {
 
 /** The description of the chat window. */
 static WindowDesc _chat_window_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_SEND_NETWORK_MSG, WC_NONE,
 	{},
 	_nested_chat_window_widgets
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 928b01f828..618a499211 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -9,6 +9,7 @@
 
 #include "../stdafx.h"
 #include "network_gui.h"
+#include "../core/string_consumer.hpp"
 #include "../saveload/saveload.h"
 #include "../saveload/saveload_filter.h"
 #include "../command_func.h"
@@ -52,19 +53,6 @@ struct PacketReader : LoadFilter {
 	{
 	}
 
-	/**
-	 * Simple wrapper around fwrite to be able to pass it to Packet's TransferOut.
-	 * @param destination The reader to add the data to.
-	 * @param source      The buffer to read data from.
-	 * @param amount      The number of bytes to copy.
-	 * @return The number of bytes that were copied.
-	 */
-	static inline ssize_t TransferOutMemCopy(PacketReader *destination, const char *source, size_t amount)
-	{
-		std::copy_n(source, amount, std::back_inserter(destination->buffer));
-		return amount;
-	}
-
 	/**
 	 * Add a packet to this buffer.
 	 * @param p The packet to add.
@@ -72,7 +60,10 @@ struct PacketReader : LoadFilter {
 	void AddPacket(Packet &p)
 	{
 		assert(this->read_bytes == 0);
-		p.TransferOut(TransferOutMemCopy, this);
+		p.TransferOut([this](std::span<const uint8_t> source) {
+			std::ranges::copy(source, std::back_inserter(this->buffer));
+			return source.size();
+		});
 	}
 
 	size_t Read(uint8_t *rbuf, size_t size) override
@@ -109,7 +100,7 @@ void ClientNetworkEmergencySave()
  * Create a new socket for the client side of the game connection.
  * @param s The socket to connect with.
  */
-ClientNetworkGameSocketHandler::ClientNetworkGameSocketHandler(SOCKET s, const std::string &connection_string) : NetworkGameSocketHandler(s), connection_string(connection_string)
+ClientNetworkGameSocketHandler::ClientNetworkGameSocketHandler(SOCKET s, std::string_view connection_string) : NetworkGameSocketHandler(s), connection_string(connection_string)
 {
 	assert(ClientNetworkGameSocketHandler::my_client == nullptr);
 	ClientNetworkGameSocketHandler::my_client = this;
@@ -401,7 +392,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendCommand(const CommandPacke
 }
 
 /** Send a chat-packet over the network */
-NetworkRecvStatus ClientNetworkGameSocketHandler::SendChat(NetworkAction action, DestType type, int dest, const std::string &msg, int64_t data)
+NetworkRecvStatus ClientNetworkGameSocketHandler::SendChat(NetworkAction action, DestType type, int dest, std::string_view msg, int64_t data)
 {
 	Debug(net, 9, "Client::SendChat(): action={}, type={}, dest={}", action, type, dest);
 
@@ -462,7 +453,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendQuit()
  * @param pass The password for the remote command.
  * @param command The actual command.
  */
-NetworkRecvStatus ClientNetworkGameSocketHandler::SendRCon(const std::string &pass, const std::string &command)
+NetworkRecvStatus ClientNetworkGameSocketHandler::SendRCon(std::string_view pass, std::string_view command)
 {
 	Debug(net, 9, "Client::SendRCon()");
 
@@ -823,7 +814,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_MAP_DONE(Packet
 	ClearErrorMessages();
 
 	/* Set the abstract filetype. This is read during savegame load. */
-	_file_to_saveload.SetMode(SLO_LOAD, FT_SAVEGAME, DFT_GAME_FILE);
+	_file_to_saveload.SetMode(FIOS_TYPE_FILE, SLO_LOAD);
 
 	bool load_success = SafeLoad({}, SLO_LOAD, DFT_GAME_FILE, GM_NORMAL, NO_DIRECTORY, this->savegame);
 	this->savegame = nullptr;
@@ -925,14 +916,14 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_COMMAND(Packet
 	if (this->status != STATUS_ACTIVE) return NETWORK_RECV_STATUS_MALFORMED_PACKET;
 
 	CommandPacket cp;
-	const char *err = this->ReceiveCommand(p, cp);
+	auto err = this->ReceiveCommand(p, cp);
 	cp.frame    = p.Recv_uint32();
 	cp.my_cmd   = p.Recv_bool();
 
 	Debug(net, 9, "Client::Receive_SERVER_COMMAND(): cmd={}, frame={}", cp.cmd, cp.frame);
 
-	if (err != nullptr) {
-		IConsolePrint(CC_WARNING, "Dropping server connection due to {}.", err);
+	if (err.has_value()) {
+		IConsolePrint(CC_WARNING, "Dropping server connection due to {}.", *err);
 		return NETWORK_RECV_STATUS_MALFORMED_PACKET;
 	}
 
@@ -1212,7 +1203,7 @@ void NetworkClient_Connected()
  * @param password The password.
  * @param command The command to execute.
  */
-void NetworkClientSendRcon(const std::string &password, const std::string &command)
+void NetworkClientSendRcon(std::string_view password, std::string_view command)
 {
 	MyClient::SendRCon(password, command);
 }
@@ -1252,7 +1243,7 @@ void NetworkClientsToSpectators(CompanyID cid)
  * @param client_name The client name to check for validity.
  * @return True iff the name is valid.
  */
-bool NetworkIsValidClientName(const std::string_view client_name)
+bool NetworkIsValidClientName(std::string_view client_name)
 {
 	if (client_name.empty()) return false;
 	if (client_name[0] == ' ') return false;
@@ -1287,7 +1278,7 @@ bool NetworkValidateClientName(std::string &client_name)
  * Convenience method for NetworkValidateClientName on _settings_client.network.client_name.
  * It trims the client name and checks whether it is empty. When it is empty
  * an error message is shown to the GUI user.
- * See \c NetworkValidateClientName(char*) for details about the functionality.
+ * See \c NetworkValidateClientName(std::string&) for details about the functionality.
  * @return True iff the client name is valid.
  */
 bool NetworkValidateOurClientName()
@@ -1328,7 +1319,7 @@ void NetworkUpdateClientName(const std::string &client_name)
  * @param msg The actual message.
  * @param data Arbitrary extra data.
  */
-void NetworkClientSendChat(NetworkAction action, DestType type, int dest, const std::string &msg, int64_t data)
+void NetworkClientSendChat(NetworkAction action, DestType type, int dest, std::string_view msg, int64_t data)
 {
 	MyClient::SendChat(action, type, dest, msg, data);
 }
diff --git a/src/network/network_client.h b/src/network/network_client.h
index 2b1423c82e..6205ed9b1b 100644
--- a/src/network/network_client.h
+++ b/src/network/network_client.h
@@ -74,7 +74,7 @@ protected:
 	static NetworkRecvStatus SendIdentify();
 	void CheckConnection();
 public:
-	ClientNetworkGameSocketHandler(SOCKET s, const std::string &connection_string);
+	ClientNetworkGameSocketHandler(SOCKET s, std::string_view connection_string);
 	~ClientNetworkGameSocketHandler();
 
 	NetworkRecvStatus CloseConnection(NetworkRecvStatus status) override;
@@ -88,9 +88,9 @@ public:
 
 	static NetworkRecvStatus SendAuthResponse();
 
-	static NetworkRecvStatus SendChat(NetworkAction action, DestType type, int dest, const std::string &msg, int64_t data);
+	static NetworkRecvStatus SendChat(NetworkAction action, DestType type, int dest, std::string_view msg, int64_t data);
 	static NetworkRecvStatus SendSetName(const std::string &name);
-	static NetworkRecvStatus SendRCon(const std::string &password, const std::string &command);
+	static NetworkRecvStatus SendRCon(std::string_view password, std::string_view command);
 	static NetworkRecvStatus SendMove(CompanyID company);
 
 	static bool IsConnected();
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 092ac1811f..c3495b788b 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -110,7 +110,7 @@ inline auto MakeCallbackTable(std::index_sequence<i...>) noexcept
 }
 
 /** Type-erased table of callbacks. */
-static auto _callback_table = MakeCallbackTable(std::make_index_sequence<_callback_tuple_size>{});
+static const auto _callback_table = MakeCallbackTable(std::make_index_sequence<_callback_tuple_size>{});
 
 template <typename T> struct CallbackArgsHelper;
 template <typename... Targs>
@@ -358,22 +358,22 @@ void NetworkDistributeCommands()
  * Receives a command from the network.
  * @param p the packet to read from.
  * @param cp the struct to write the data to.
- * @return an error message. When nullptr there has been no error.
+ * @return An error message, or std::nullopt there has been no error.
  */
-const char *NetworkGameSocketHandler::ReceiveCommand(Packet &p, CommandPacket &cp)
+std::optional<std::string_view> NetworkGameSocketHandler::ReceiveCommand(Packet &p, CommandPacket &cp)
 {
 	cp.company = (CompanyID)p.Recv_uint8();
 	cp.cmd     = static_cast<Commands>(p.Recv_uint16());
-	if (!IsValidCommand(cp.cmd))               return "invalid command";
+	if (!IsValidCommand(cp.cmd)) return "invalid command";
 	if (GetCommandFlags(cp.cmd).Test(CommandFlag::Offline)) return "single-player only command";
 	cp.err_msg = p.Recv_uint16();
 	cp.data    = _cmd_dispatch[cp.cmd].Sanitize(p.Recv_buffer());
 
 	uint8_t callback = p.Recv_uint8();
-	if (callback >= _callback_table.size() || _cmd_dispatch[cp.cmd].Unpack[callback] == nullptr)  return "invalid callback";
+	if (callback >= _callback_table.size() || _cmd_dispatch[cp.cmd].Unpack[callback] == nullptr) return "invalid callback";
 
 	cp.callback = _callback_table[callback];
-	return nullptr;
+	return std::nullopt;
 }
 
 /**
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 3848ffc6ca..552764722f 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -20,6 +20,9 @@
 #include "../base_media_sounds.h"
 #include "../settings_type.h"
 #include "../strings_func.h"
+#include "../timer/timer.h"
+#include "../timer/timer_window.h"
+#include "../core/string_consumer.hpp"
 #include "network_content.h"
 
 #include "table/strings.h"
@@ -38,15 +41,15 @@
 
 #include "../safeguards.h"
 
-extern bool HasScenario(const ContentInfo *ci, bool md5sum);
+extern bool HasScenario(const ContentInfo &ci, bool md5sum);
 
 /** The client we use to connect to the server. */
 ClientNetworkContentSocketHandler _network_content_client;
 
 /** Wrapper function for the HasProc */
-static bool HasGRFConfig(const ContentInfo *ci, bool md5sum)
+static bool HasGRFConfig(const ContentInfo &ci, bool md5sum)
 {
-	return FindGRFConfig(std::byteswap(ci->unique_id), md5sum ? FGCM_EXACT : FGCM_ANY, md5sum ? &ci->md5sum : nullptr) != nullptr;
+	return FindGRFConfig(std::byteswap(ci.unique_id), md5sum ? FGCM_EXACT : FGCM_ANY, md5sum ? &ci.md5sum : nullptr) != nullptr;
 }
 
 /**
@@ -56,7 +59,7 @@ static bool HasGRFConfig(const ContentInfo *ci, bool md5sum)
  * @param md5sum also match the MD5 checksum?
  * @return true iff it's known
  */
-using HasContentProc = bool(const ContentInfo *ci, bool md5sum);
+using HasContentProc = bool(const ContentInfo &ci, bool md5sum);
 
 /**
  * Get the has-content check function for the given content type.
@@ -82,7 +85,7 @@ static HasContentProc *GetHasContentProcforContentType(ContentType type)
 
 bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet &p)
 {
-	ContentInfo *ci = new ContentInfo();
+	auto ci = std::make_unique<ContentInfo>();
 	ci->type     = (ContentType)p.Recv_uint8();
 	ci->id       = (ContentID)p.Recv_uint32();
 	ci->filesize = p.Recv_uint32();
@@ -108,28 +111,27 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet &p)
 	for (uint i = 0; i < tag_count; i++) ci->tags.push_back(p.Recv_string(NETWORK_CONTENT_TAG_LENGTH));
 
 	if (!ci->IsValid()) {
-		delete ci;
 		this->CloseConnection();
 		return false;
 	}
 
 	HasContentProc *proc = GetHasContentProcforContentType(ci->type);
 	if (proc != nullptr) {
-		if (proc(ci, true)) {
-			ci->state = ContentInfo::ALREADY_HERE;
+		if (proc(*ci, true)) {
+			ci->state = ContentInfo::State::AlreadyHere;
 		} else {
-			ci->state = ContentInfo::UNSELECTED;
-			if (proc(ci, false)) ci->upgrade = true;
+			ci->state = ContentInfo::State::Unselected;
+			if (proc(*ci, false)) ci->upgrade = true;
 		}
 	} else {
-		ci->state = ContentInfo::UNSELECTED;
+		ci->state = ContentInfo::State::Unselected;
 	}
 
 	/* Something we don't have and has filesize 0 does not exist in the system */
-	if (ci->state == ContentInfo::UNSELECTED && ci->filesize == 0) ci->state = ContentInfo::DOES_NOT_EXIST;
+	if (ci->state == ContentInfo::State::Unselected && ci->filesize == 0) ci->state = ContentInfo::State::DoesNotExist;
 
 	/* Do we already have a stub for this? */
-	for (ContentInfo *ici : this->infos) {
+	for (const auto &ici : this->infos) {
 		if (ici->type == ci->type && ici->unique_id == ci->unique_id && ci->md5sum == ici->md5sum) {
 			/* Preserve the name if possible */
 			if (ci->name.empty()) ci->name = ici->name;
@@ -141,29 +143,27 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet &p)
 			 * we (just) already preserved.
 			 */
 			*ici = *ci;
-			delete ci;
 
-			this->OnReceiveContentInfo(ici);
+			this->OnReceiveContentInfo(*ici);
 			return true;
 		}
 	}
 
 	/* Missing content info? Don't list it */
 	if (ci->filesize == 0) {
-		delete ci;
 		return true;
 	}
 
-	this->infos.push_back(ci);
+	ContentInfo *info = this->infos.emplace_back(std::move(ci)).get();
 
 	/* Incoming data means that we might need to reconsider dependencies */
 	ConstContentVector parents;
-	this->ReverseLookupTreeDependency(parents, ci);
+	this->ReverseLookupTreeDependency(parents, info);
 	for (const ContentInfo *ici : parents) {
-		this->CheckDependencyState(ici);
+		this->CheckDependencyState(*ici);
 	}
 
-	this->OnReceiveContentInfo(ci);
+	this->OnReceiveContentInfo(*info);
 
 	return true;
 }
@@ -215,27 +215,29 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentType type)
  * @param count The number of IDs to request.
  * @param content_ids The unique identifiers of the content to request information about.
  */
-void ClientNetworkContentSocketHandler::RequestContentList(uint count, const ContentID *content_ids)
+void ClientNetworkContentSocketHandler::RequestContentList(std::span<const ContentID> content_ids)
 {
+	/* We can "only" send a limited number of IDs in a single packet.
+	 * A packet begins with the packet size and a byte for the type.
+	 * Then this packet adds a uint16_t for the count in this packet.
+	 * The rest of the packet can be used for the IDs. */
+	static constexpr size_t MAX_CONTENT_IDS_PER_PACKET = (TCP_MTU - sizeof(PacketSize) - sizeof(uint8_t) - sizeof(uint16_t)) / sizeof(uint32_t);
+
+	if (content_ids.empty()) return;
+
 	this->Connect();
 
-	while (count > 0) {
-		/* We can "only" send a limited number of IDs in a single packet.
-		 * A packet begins with the packet size and a byte for the type.
-		 * Then this packet adds a uint16_t for the count in this packet.
-		 * The rest of the packet can be used for the IDs. */
-		uint p_count = std::min<uint>(count, (TCP_MTU - sizeof(PacketSize) - sizeof(uint8_t) - sizeof(uint16_t)) / sizeof(uint32_t));
+	for (auto it = std::begin(content_ids); it != std::end(content_ids); /* nothing */) {
+		auto last = std::ranges::next(it, MAX_CONTENT_IDS_PER_PACKET, std::end(content_ids));
 
 		auto p = std::make_unique<Packet>(this, PACKET_CONTENT_CLIENT_INFO_ID, TCP_MTU);
-		p->Send_uint16(p_count);
+		p->Send_uint16(std::distance(it, last));
 
-		for (uint i = 0; i < p_count; i++) {
-			p->Send_uint32(content_ids[i]);
+		for (; it != last; ++it) {
+			p->Send_uint32(*it);
 		}
 
 		this->SendPacket(std::move(p));
-		count -= p_count;
-		content_ids += p_count;
 	}
 }
 
@@ -257,7 +259,7 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
 	auto p = std::make_unique<Packet>(this, send_md5sum ? PACKET_CONTENT_CLIENT_INFO_EXTID_MD5 : PACKET_CONTENT_CLIENT_INFO_EXTID, TCP_MTU);
 	p->Send_uint8((uint8_t)cv->size());
 
-	for (const ContentInfo *ci : *cv) {
+	for (const auto &ci : *cv) {
 		p->Send_uint8((uint8_t)ci->type);
 		p->Send_uint32(ci->unique_id);
 		if (!send_md5sum) continue;
@@ -266,9 +268,9 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
 
 	this->SendPacket(std::move(p));
 
-	for (ContentInfo *ci : *cv) {
+	for (auto &ci : *cv) {
 		bool found = false;
-		for (ContentInfo *ci2 : this->infos) {
+		for (const auto &ci2 : this->infos) {
 			if (ci->type == ci2->type && ci->unique_id == ci2->unique_id &&
 					(!send_md5sum || ci->md5sum == ci2->md5sum)) {
 				found = true;
@@ -276,9 +278,7 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
 			}
 		}
 		if (!found) {
-			this->infos.push_back(ci);
-		} else {
-			delete ci;
+			this->infos.push_back(std::move(ci));
 		}
 	}
 }
@@ -294,8 +294,8 @@ void ClientNetworkContentSocketHandler::DownloadSelectedContent(uint &files, uin
 	bytes = 0;
 
 	ContentIDList content;
-	for (const ContentInfo *ci : this->infos) {
-		if (!ci->IsSelected() || ci->state == ContentInfo::ALREADY_HERE) continue;
+	for (const auto &ci : this->infos) {
+		if (!ci->IsSelected() || ci->state == ContentInfo::State::AlreadyHere) continue;
 
 		content.push_back(ci->id);
 		bytes += ci->filesize;
@@ -323,7 +323,7 @@ void ClientNetworkContentSocketHandler::DownloadSelectedContentHTTP(const Conten
 {
 	std::string content_request;
 	for (const ContentID &id : content) {
-		content_request += std::to_string(id) + "\n";
+		format_append(content_request, "{}\n", id);
 	}
 
 	this->http_response_index = -1;
@@ -368,13 +368,13 @@ void ClientNetworkContentSocketHandler::DownloadSelectedContentFallback(const Co
  * @return a statically allocated buffer with the filename or
  *         nullptr when no filename could be made.
  */
-static std::string GetFullFilename(const ContentInfo *ci, bool compressed)
+static std::string GetFullFilename(const ContentInfo &ci, bool compressed)
 {
-	Subdirectory dir = GetContentInfoSubDir(ci->type);
+	Subdirectory dir = GetContentInfoSubDir(ci.type);
 	if (dir == NO_DIRECTORY) return {};
 
 	std::string buf = FioGetDirectory(SP_AUTODOWNLOAD_DIR, dir);
-	buf += ci->filename;
+	buf += ci.filename;
 	buf += compressed ? ".tar.gz" : ".tar";
 
 	return buf;
@@ -385,7 +385,7 @@ static std::string GetFullFilename(const ContentInfo *ci, bool compressed)
  * @param ci container with filename
  * @return true if the gunzip completed
  */
-static bool GunzipFile(const ContentInfo *ci)
+static bool GunzipFile(const ContentInfo &ci)
 {
 #if defined(WITH_ZLIB)
 	bool ret = true;
@@ -447,24 +447,11 @@ static bool GunzipFile(const ContentInfo *ci)
 #endif /* defined(WITH_ZLIB) */
 }
 
-/**
- * Simple wrapper around fwrite to be able to pass it to Packet's TransferOut.
- * @param file   The file to write data to.
- * @param buffer The buffer to write to the file.
- * @param amount The number of bytes to write.
- * @return The number of bytes that were written.
- */
-static inline ssize_t TransferOutFWrite(std::optional<FileHandle> &file, const char *buffer, size_t amount)
-{
-	return fwrite(buffer, 1, amount, *file);
-}
-
 bool ClientNetworkContentSocketHandler::Receive_SERVER_CONTENT(Packet &p)
 {
 	if (!this->cur_file.has_value()) {
-		delete this->cur_info;
 		/* When we haven't opened a file this must be our first packet with metadata. */
-		this->cur_info = new ContentInfo;
+		this->cur_info = std::make_unique<ContentInfo>();
 		this->cur_info->type     = (ContentType)p.Recv_uint8();
 		this->cur_info->id       = (ContentID)p.Recv_uint32();
 		this->cur_info->filesize = p.Recv_uint32();
@@ -476,8 +463,11 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_CONTENT(Packet &p)
 		}
 	} else {
 		/* We have a file opened, thus are downloading internal content */
-		size_t to_read = p.RemainingBytesToTransfer();
-		if (to_read != 0 && static_cast<size_t>(p.TransferOut(TransferOutFWrite, std::ref(this->cur_file))) != to_read) {
+		ssize_t to_read = p.RemainingBytesToTransfer();
+		auto write_to_disk = [this](std::span<const uint8_t> buffer) {
+			return fwrite(buffer.data(), 1, buffer.size(), *this->cur_file);
+		};
+		if (to_read != 0 && p.TransferOut(write_to_disk) != to_read) {
 			CloseWindowById(WC_NETWORK_STATUS_WINDOW, WN_NETWORK_STATUS_WINDOW_CONTENT_DOWNLOAD);
 			ShowErrorMessage(
 				GetEncodedString(STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD),
@@ -489,7 +479,7 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_CONTENT(Packet &p)
 			return false;
 		}
 
-		this->OnDownloadProgress(this->cur_info, (int)to_read);
+		this->OnDownloadProgress(*this->cur_info, (int)to_read);
 
 		if (to_read == 0) this->AfterDownload();
 	}
@@ -504,14 +494,13 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_CONTENT(Packet &p)
 bool ClientNetworkContentSocketHandler::BeforeDownload()
 {
 	if (!this->cur_info->IsValid()) {
-		delete this->cur_info;
-		this->cur_info = nullptr;
+		this->cur_info.reset();
 		return false;
 	}
 
 	if (this->cur_info->filesize != 0) {
 		/* The filesize is > 0, so we are going to download it */
-		std::string filename = GetFullFilename(this->cur_info, true);
+		std::string filename = GetFullFilename(*this->cur_info, true);
 		if (filename.empty() || !(this->cur_file = FileHandle::Open(filename, "wb")).has_value()) {
 			/* Unless that fails of course... */
 			CloseWindowById(WC_NETWORK_STATUS_WINDOW, WN_NETWORK_STATUS_WINDOW_CONTENT_DOWNLOAD);
@@ -535,14 +524,14 @@ void ClientNetworkContentSocketHandler::AfterDownload()
 	 * Now gunzip the tar and make it known. */
 	this->cur_file.reset();
 
-	if (GunzipFile(this->cur_info)) {
-		FioRemove(GetFullFilename(this->cur_info, true));
+	if (GunzipFile(*this->cur_info)) {
+		FioRemove(GetFullFilename(*this->cur_info, true));
 
 		Subdirectory sd = GetContentInfoSubDir(this->cur_info->type);
 		if (sd == NO_DIRECTORY) NOT_REACHED();
 
 		TarScanner ts;
-		std::string fname = GetFullFilename(this->cur_info, false);
+		std::string fname = GetFullFilename(*this->cur_info, false);
 		ts.AddFile(sd, fname);
 
 		if (this->cur_info->type == CONTENT_TYPE_BASE_MUSIC) {
@@ -574,7 +563,7 @@ void ClientNetworkContentSocketHandler::OnFailure()
 	this->http_response_index = -2;
 
 	if (this->cur_file.has_value()) {
-		this->OnDownloadProgress(this->cur_info, -1);
+		this->OnDownloadProgress(*this->cur_info, -1);
 
 		this->cur_file.reset();
 	}
@@ -617,7 +606,7 @@ void ClientNetworkContentSocketHandler::OnReceiveData(std::unique_ptr<char[]> da
 			this->OnFailure();
 		} else {
 			/* Just received the data. */
-			this->OnDownloadProgress(this->cur_info, (int)length);
+			this->OnDownloadProgress(*this->cur_info, (int)length);
 		}
 
 		/* Nothing more to do now. */
@@ -637,104 +626,69 @@ void ClientNetworkContentSocketHandler::OnReceiveData(std::unique_ptr<char[]> da
 		return;
 	}
 
-	delete this->cur_info;
 	/* When we haven't opened a file this must be our first packet with metadata. */
-	this->cur_info = new ContentInfo;
+	this->cur_info = std::make_unique<ContentInfo>();
 
-/** Check p for not being null and return calling OnFailure if that's not the case. */
-#define check_not_null(p) { if ((p) == nullptr) { this->OnFailure(); return; } }
-/** Check p for not being null and then terminate, or return calling OnFailure. */
-#define check_and_terminate(p) { check_not_null(p); *(p) = '\0'; }
+	try {
+		for (;;) {
+			std::string_view buffer{this->http_response.data(), this->http_response.size()};
+			buffer.remove_prefix(this->http_response_index);
+			auto len = buffer.find('\n');
+			if (len == std::string_view::npos) throw std::exception{};
+			/* Update the index for the next one */
+			this->http_response_index += static_cast<int>(len + 1);
 
-	for (;;) {
-		char *str = this->http_response.data() + this->http_response_index;
-		char *p = strchr(str, '\n');
-		check_and_terminate(p);
+			StringConsumer consumer{buffer.substr(0, len)};
 
-		/* Update the index for the next one */
-		this->http_response_index += (int)strlen(str) + 1;
+			/* Read the ID */
+			this->cur_info->id = static_cast<ContentID>(consumer.ReadIntegerBase<uint>(10));
+			if (!consumer.ReadIf(",")) throw std::exception{};
 
-		/* Read the ID */
-		p = strchr(str, ',');
-		check_and_terminate(p);
-		this->cur_info->id = (ContentID)atoi(str);
+			/* Read the type */
+			this->cur_info->type = static_cast<ContentType>(consumer.ReadIntegerBase<uint>(10));
+			if (!consumer.ReadIf(",")) throw std::exception{};
 
-		/* Read the type */
-		str = p + 1;
-		p = strchr(str, ',');
-		check_and_terminate(p);
-		this->cur_info->type = (ContentType)atoi(str);
+			/* Read the file size */
+			this->cur_info->filesize = consumer.ReadIntegerBase<uint32_t>(10);
+			if (!consumer.ReadIf(",")) throw std::exception{};
 
-		/* Read the file size */
-		str = p + 1;
-		p = strchr(str, ',');
-		check_and_terminate(p);
-		this->cur_info->filesize = atoi(str);
+			/* Read the URL */
+			auto url = consumer.GetLeftData();
 
-		/* Read the URL */
-		str = p + 1;
-		/* Is it a fallback URL? If so, just continue with the next one. */
-		if (strncmp(str, "ottd", 4) == 0) {
-			if ((uint)this->http_response_index >= this->http_response.size()) {
+			/* Is it a fallback URL? If so, just continue with the next one. */
+			if (consumer.ReadIf("ottd")) {
 				/* Have we gone through all lines? */
-				this->OnFailure();
-				return;
+				if (static_cast<size_t>(this->http_response_index) >= this->http_response.size()) throw std::exception{};
+				continue;
 			}
-			continue;
-		}
 
-		p = strrchr(str, '/');
-		check_not_null(p);
-		p++; // Start after the '/'
+			consumer.SkipUntilChar('/', StringConsumer::KEEP_SEPARATOR);
+			std::string_view filename;
+			/* Skip all but the last part. There must be at least one / though */
+			do {
+				if (!consumer.ReadIf("/")) throw std::exception{};
+				filename = consumer.ReadUntilChar('/', StringConsumer::KEEP_SEPARATOR);
+			} while (consumer.AnyBytesLeft());
 
-		std::string filename = p;
-		/* Remove the extension from the string. */
-		for (uint i = 0; i < 2; i++) {
-			auto pos = filename.find_last_of('.');
-			if (pos == std::string::npos) {
-				this->OnFailure();
-				return;
+			/* Remove the extension from the string. */
+			for (uint i = 0; i < 2; i++) {
+				auto pos = filename.find_last_of('.');
+				if (pos == std::string::npos) throw std::exception{};
+				filename = filename.substr(0, pos);
 			}
-			filename.erase(pos);
+
+			/* Copy the string, without extension, to the filename. */
+			this->cur_info->filename = filename;
+
+			/* Request the next file. */
+			if (!this->BeforeDownload()) throw std::exception{};
+
+			NetworkHTTPSocketHandler::Connect(url, this);
+			break;
 		}
-
-		/* Copy the string, without extension, to the filename. */
-		this->cur_info->filename = std::move(filename);
-
-		/* Request the next file. */
-		if (!this->BeforeDownload()) {
-			this->OnFailure();
-			return;
-		}
-
-		NetworkHTTPSocketHandler::Connect(str, this);
-		return;
+	} catch (const std::exception&) {
+		this->OnFailure();
 	}
-
-#undef check
-#undef check_and_terminate
-}
-
-/**
- * Create a socket handler to handle the connection.
- */
-ClientNetworkContentSocketHandler::ClientNetworkContentSocketHandler() :
-	NetworkContentSocketHandler(),
-	http_response_index(-2),
-	cur_file(std::nullopt),
-	cur_info(nullptr),
-	is_connecting(false),
-	is_cancelled(false)
-{
-	this->last_activity = std::chrono::steady_clock::now();
-}
-
-/** Clear up the mess ;) */
-ClientNetworkContentSocketHandler::~ClientNetworkContentSocketHandler()
-{
-	delete this->cur_info;
-
-	for (ContentInfo *ci : this->infos) delete ci;
 }
 
 /** Connect to the content server. */
@@ -744,7 +698,7 @@ public:
 	 * Initiate the connecting.
 	 * @param address The address of the server.
 	 */
-	NetworkContentConnecter(const std::string &connection_string) : TCPConnecter(connection_string, NETWORK_CONTENT_SERVER_PORT) {}
+	NetworkContentConnecter(std::string_view connection_string) : TCPConnecter(connection_string, NETWORK_CONTENT_SERVER_PORT) {}
 
 	void OnFailure() override
 	{
@@ -824,6 +778,13 @@ void ClientNetworkContentSocketHandler::SendReceive()
 	this->SendPackets();
 }
 
+/** Timeout after queueing content for it to try to be requested. */
+static constexpr auto CONTENT_QUEUE_TIMEOUT = std::chrono::milliseconds(100);
+
+static TimeoutTimer<TimerWindow> _request_queue_timeout = {CONTENT_QUEUE_TIMEOUT, []() {
+	_network_content_client.RequestQueuedContentInfo();
+}};
+
 /**
  * Download information of a given Content ID if not already tried
  * @param cid the ID to try
@@ -834,7 +795,33 @@ void ClientNetworkContentSocketHandler::DownloadContentInfo(ContentID cid)
 	if (std::ranges::find(this->requested, cid) != this->requested.end()) return;
 
 	this->requested.push_back(cid);
-	this->RequestContentList(1, &cid);
+	this->queued.push_back(cid);
+	_request_queue_timeout.Reset();
+}
+
+/**
+ * Send a content request for queued content info download.
+ */
+void ClientNetworkContentSocketHandler::RequestQueuedContentInfo()
+{
+	if (this->queued.empty()) return;
+
+	/* Wait until we've briefly stopped receiving data (which will contain more content) before making the request. */
+	if (std::chrono::steady_clock::now() <= this->last_activity + CONTENT_QUEUE_TIMEOUT) {
+		_request_queue_timeout.Reset();
+		return;
+	}
+
+	/* Move the queue locally so more ids can be queued for later. */
+	ContentIDList queue;
+	queue.swap(this->queued);
+
+	/* Remove ids that have since been received since the request was queued. */
+	queue.erase(std::remove_if(std::begin(queue), std::end(queue), [this](ContentID content_id) {
+		return std::ranges::find(this->infos, content_id, &ContentInfo::id) != std::end(this->infos);
+	}), std::end(queue));
+
+	this->RequestContentList(queue);
 }
 
 /**
@@ -844,8 +831,8 @@ void ClientNetworkContentSocketHandler::DownloadContentInfo(ContentID cid)
  */
 ContentInfo *ClientNetworkContentSocketHandler::GetContent(ContentID cid) const
 {
-	for (ContentInfo *ci : this->infos) {
-		if (ci->id == cid) return ci;
+	for (const auto &ci : this->infos) {
+		if (ci->id == cid) return ci.get();
 	}
 	return nullptr;
 }
@@ -858,10 +845,10 @@ ContentInfo *ClientNetworkContentSocketHandler::GetContent(ContentID cid) const
 void ClientNetworkContentSocketHandler::Select(ContentID cid)
 {
 	ContentInfo *ci = this->GetContent(cid);
-	if (ci == nullptr || ci->state != ContentInfo::UNSELECTED) return;
+	if (ci == nullptr || ci->state != ContentInfo::State::Unselected) return;
 
-	ci->state = ContentInfo::SELECTED;
-	this->CheckDependencyState(ci);
+	ci->state = ContentInfo::State::Selected;
+	this->CheckDependencyState(*ci);
 }
 
 /**
@@ -873,17 +860,17 @@ void ClientNetworkContentSocketHandler::Unselect(ContentID cid)
 	ContentInfo *ci = this->GetContent(cid);
 	if (ci == nullptr || !ci->IsSelected()) return;
 
-	ci->state = ContentInfo::UNSELECTED;
-	this->CheckDependencyState(ci);
+	ci->state = ContentInfo::State::Unselected;
+	this->CheckDependencyState(*ci);
 }
 
 /** Select everything we can select */
 void ClientNetworkContentSocketHandler::SelectAll()
 {
-	for (ContentInfo *ci : this->infos) {
-		if (ci->state == ContentInfo::UNSELECTED) {
-			ci->state = ContentInfo::SELECTED;
-			this->CheckDependencyState(ci);
+	for (const auto &ci : this->infos) {
+		if (ci->state == ContentInfo::State::Unselected) {
+			ci->state = ContentInfo::State::Selected;
+			this->CheckDependencyState(*ci);
 		}
 	}
 }
@@ -891,10 +878,10 @@ void ClientNetworkContentSocketHandler::SelectAll()
 /** Select everything that's an update for something we've got */
 void ClientNetworkContentSocketHandler::SelectUpgrade()
 {
-	for (ContentInfo *ci : this->infos) {
-		if (ci->state == ContentInfo::UNSELECTED && ci->upgrade) {
-			ci->state = ContentInfo::SELECTED;
-			this->CheckDependencyState(ci);
+	for (const auto &ci : this->infos) {
+		if (ci->state == ContentInfo::State::Unselected && ci->upgrade) {
+			ci->state = ContentInfo::State::Selected;
+			this->CheckDependencyState(*ci);
 		}
 	}
 }
@@ -902,22 +889,22 @@ void ClientNetworkContentSocketHandler::SelectUpgrade()
 /** Unselect everything that we've not downloaded so far. */
 void ClientNetworkContentSocketHandler::UnselectAll()
 {
-	for (ContentInfo *ci : this->infos) {
-		if (ci->IsSelected() && ci->state != ContentInfo::ALREADY_HERE) ci->state = ContentInfo::UNSELECTED;
+	for (const auto &ci : this->infos) {
+		if (ci->IsSelected() && ci->state != ContentInfo::State::AlreadyHere) ci->state = ContentInfo::State::Unselected;
 	}
 }
 
 /** Toggle the state of a content info and check its dependencies */
-void ClientNetworkContentSocketHandler::ToggleSelectedState(const ContentInfo *ci)
+void ClientNetworkContentSocketHandler::ToggleSelectedState(const ContentInfo &ci)
 {
-	switch (ci->state) {
-		case ContentInfo::SELECTED:
-		case ContentInfo::AUTOSELECTED:
-			this->Unselect(ci->id);
+	switch (ci.state) {
+		case ContentInfo::State::Selected:
+		case ContentInfo::State::Autoselected:
+			this->Unselect(ci.id);
 			break;
 
-		case ContentInfo::UNSELECTED:
-			this->Select(ci->id);
+		case ContentInfo::State::Unselected:
+			this->Select(ci.id);
 			break;
 
 		default:
@@ -930,9 +917,9 @@ void ClientNetworkContentSocketHandler::ToggleSelectedState(const ContentInfo *c
  * @param parents list to store all parents in (is not cleared)
  * @param child   the child to search the parents' dependencies for
  */
-void ClientNetworkContentSocketHandler::ReverseLookupDependency(ConstContentVector &parents, const ContentInfo *child) const
+void ClientNetworkContentSocketHandler::ReverseLookupDependency(ConstContentVector &parents, const ContentInfo &child) const
 {
-	auto range = this->reverse_dependency_map.equal_range(child->id);
+	auto range = this->reverse_dependency_map.equal_range(child.id);
 
 	for (auto iter = range.first; iter != range.second; ++iter) {
 		parents.push_back(GetContent(iter->second));
@@ -950,11 +937,11 @@ void ClientNetworkContentSocketHandler::ReverseLookupTreeDependency(ConstContent
 
 	/* First find all direct parents. We can't use the "normal" iterator as
 	 * we are including stuff into the vector and as such the vector's data
-	 * store can be reallocated (and thus move), which means out iterating
+	 * store can be reallocated (and thus move), which means our iterating
 	 * pointer gets invalid. So fall back to the indices. */
-	for (uint i = 0; i < tree.size(); i++) {
+	for (size_t i = 0; i < tree.size(); i++) {
 		ConstContentVector parents;
-		this->ReverseLookupDependency(parents, tree[i]);
+		this->ReverseLookupDependency(parents, *tree[i]);
 
 		for (const ContentInfo *ci : parents) {
 			include(tree, ci);
@@ -966,25 +953,25 @@ void ClientNetworkContentSocketHandler::ReverseLookupTreeDependency(ConstContent
  * Check the dependencies (recursively) of this content info
  * @param ci the content info to check the dependencies of
  */
-void ClientNetworkContentSocketHandler::CheckDependencyState(const ContentInfo *ci)
+void ClientNetworkContentSocketHandler::CheckDependencyState(const ContentInfo &ci)
 {
-	if (ci->IsSelected() || ci->state == ContentInfo::ALREADY_HERE) {
+	if (ci.IsSelected() || ci.state == ContentInfo::State::AlreadyHere) {
 		/* Selection is easy; just walk all children and set the
 		 * autoselected state. That way we can see what we automatically
 		 * selected and thus can unselect when a dependency is removed. */
-		for (auto &dependency : ci->dependencies) {
+		for (auto &dependency : ci.dependencies) {
 			ContentInfo *c = this->GetContent(dependency);
 			if (c == nullptr) {
 				this->DownloadContentInfo(dependency);
-			} else if (c->state == ContentInfo::UNSELECTED) {
-				c->state = ContentInfo::AUTOSELECTED;
-				this->CheckDependencyState(c);
+			} else if (c->state == ContentInfo::State::Unselected) {
+				c->state = ContentInfo::State::Autoselected;
+				this->CheckDependencyState(*c);
 			}
 		}
 		return;
 	}
 
-	if (ci->state != ContentInfo::UNSELECTED) return;
+	if (ci.state != ContentInfo::State::Unselected) return;
 
 	/* For unselection we need to find the parents of us. We need to
 	 * unselect them. After that we unselect all children that we
@@ -998,24 +985,24 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(const ContentInfo *
 		this->Unselect(c->id);
 	}
 
-	for (auto &dependency : ci->dependencies) {
+	for (auto &dependency : ci.dependencies) {
 		const ContentInfo *c = this->GetContent(dependency);
 		if (c == nullptr) {
 			DownloadContentInfo(dependency);
 			continue;
 		}
-		if (c->state != ContentInfo::AUTOSELECTED) continue;
+		if (c->state != ContentInfo::State::Autoselected) continue;
 
 		/* Only unselect when WE are the only parent. */
 		parents.clear();
-		this->ReverseLookupDependency(parents, c);
+		this->ReverseLookupDependency(parents, *c);
 
 		/* First check whether anything depends on us */
 		int sel_count = 0;
 		bool force_selection = false;
 		for (const ContentInfo *parent_ci : parents) {
 			if (parent_ci->IsSelected()) sel_count++;
-			if (parent_ci->state == ContentInfo::SELECTED) force_selection = true;
+			if (parent_ci->state == ContentInfo::State::Selected) force_selection = true;
 		}
 		if (sel_count == 0) {
 			/* Nothing depends on us */
@@ -1031,7 +1018,7 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(const ContentInfo *
 
 		/* Is there anything that is "force" selected?, if so... we're done. */
 		for (const ContentInfo *parent_ci : parents) {
-			if (parent_ci->state != ContentInfo::SELECTED) continue;
+			if (parent_ci->state != ContentInfo::State::Selected) continue;
 
 			force_selection = true;
 			break;
@@ -1045,10 +1032,10 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(const ContentInfo *
 		 * to unselect. Don't do it immediately because it'll do exactly what
 		 * we're doing now. */
 		for (const ContentInfo *parent : parents) {
-			if (parent->state == ContentInfo::AUTOSELECTED) this->Unselect(parent->id);
+			if (parent->state == ContentInfo::State::Autoselected) this->Unselect(parent->id);
 		}
 		for (const ContentInfo *parent : parents) {
-			this->CheckDependencyState(this->GetContent(parent->id));
+			this->CheckDependencyState(*this->GetContent(parent->id));
 		}
 	}
 }
@@ -1056,10 +1043,9 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(const ContentInfo *
 /** Clear all downloaded content information. */
 void ClientNetworkContentSocketHandler::Clear()
 {
-	for (ContentInfo *c : this->infos) delete c;
-
 	this->infos.clear();
 	this->requested.clear();
+	this->queued.clear();
 	this->reverse_dependency_map.clear();
 }
 
@@ -1084,7 +1070,7 @@ void ClientNetworkContentSocketHandler::OnDisconnect()
 	}
 }
 
-void ClientNetworkContentSocketHandler::OnReceiveContentInfo(const ContentInfo *ci)
+void ClientNetworkContentSocketHandler::OnReceiveContentInfo(const ContentInfo &ci)
 {
 	for (size_t i = 0; i < this->callbacks.size(); /* nothing */) {
 		ContentCallback *cb = this->callbacks[i];
@@ -1094,7 +1080,7 @@ void ClientNetworkContentSocketHandler::OnReceiveContentInfo(const ContentInfo *
 	}
 }
 
-void ClientNetworkContentSocketHandler::OnDownloadProgress(const ContentInfo *ci, int bytes)
+void ClientNetworkContentSocketHandler::OnDownloadProgress(const ContentInfo &ci, int bytes)
 {
 	for (size_t i = 0; i < this->callbacks.size(); /* nothing */) {
 		ContentCallback *cb = this->callbacks[i];
@@ -1107,7 +1093,7 @@ void ClientNetworkContentSocketHandler::OnDownloadComplete(ContentID cid)
 {
 	ContentInfo *ci = this->GetContent(cid);
 	if (ci != nullptr) {
-		ci->state = ContentInfo::ALREADY_HERE;
+		ci->state = ContentInfo::State::AlreadyHere;
 	}
 
 	for (size_t i = 0; i < this->callbacks.size(); /* nothing */) {
diff --git a/src/network/network_content.h b/src/network/network_content.h
index ee145ff6a4..2ed54fbd65 100644
--- a/src/network/network_content.h
+++ b/src/network/network_content.h
@@ -10,20 +10,16 @@
 #ifndef NETWORK_CONTENT_H
 #define NETWORK_CONTENT_H
 
+#include <ranges>
 #include "core/tcp_content.h"
 #include "core/http.h"
 #include <unordered_map>
 #include "../core/container_func.hpp"
 
 /** Vector with content info */
-typedef std::vector<ContentInfo *> ContentVector;
+using ContentVector = std::vector<std::unique_ptr<ContentInfo>>;
 /** Vector with constant content info */
-typedef std::vector<const ContentInfo *> ConstContentVector;
-
-/** Iterator for the content vector */
-typedef ContentInfo **ContentIterator;
-/** Iterator for the constant content vector */
-typedef const ContentInfo * const * ConstContentIterator;
+using ConstContentVector = std::vector<const ContentInfo *>;
 
 /** Callbacks for notifying others about incoming data */
 struct ContentCallback {
@@ -42,14 +38,14 @@ struct ContentCallback {
 	 * We received a content info.
 	 * @param ci the content info
 	 */
-	virtual void OnReceiveContentInfo([[maybe_unused]] const ContentInfo *ci) {}
+	virtual void OnReceiveContentInfo([[maybe_unused]] const ContentInfo &ci) {}
 
 	/**
 	 * We have progress in the download of a file
 	 * @param ci the content info of the file
 	 * @param bytes the number of bytes downloaded since the previous call
 	 */
-	virtual void OnDownloadProgress([[maybe_unused]] const ContentInfo *ci, [[maybe_unused]] int bytes) {}
+	virtual void OnDownloadProgress([[maybe_unused]] const ContentInfo &ci, [[maybe_unused]] int bytes) {}
 
 	/**
 	 * We have finished downloading a file
@@ -66,19 +62,20 @@ struct ContentCallback {
  */
 class ClientNetworkContentSocketHandler : public NetworkContentSocketHandler, ContentCallback, HTTPCallback {
 protected:
-	typedef std::vector<ContentID> ContentIDList; ///< List of content IDs to (possibly) select.
-	std::vector<ContentCallback *> callbacks;     ///< Callbacks to notify "the world"
-	ContentIDList requested;                      ///< ContentIDs we already requested (so we don't do it again)
-	ContentVector infos;                          ///< All content info we received
+	using ContentIDList = std::vector<ContentID>; ///< List of content IDs to (possibly) select.
+	std::vector<ContentCallback *> callbacks; ///< Callbacks to notify "the world"
+	ContentIDList requested; ///< ContentIDs we already requested (so we don't do it again)
+	ContentIDList queued; ///< ContentID queue to be requested.
+	ContentVector infos; ///< All content info we received
 	std::unordered_multimap<ContentID, ContentID> reverse_dependency_map; ///< Content reverse dependency map
-	std::vector<char> http_response;              ///< The HTTP response to the requests we've been doing
-	int http_response_index;                      ///< Where we are, in the response, with handling it
+	std::vector<char> http_response; ///< The HTTP response to the requests we've been doing
+	int http_response_index = -2; ///< Where we are, in the response, with handling it
 
 	std::optional<FileHandle> cur_file; ///< Currently downloaded file
-	ContentInfo *cur_info; ///< Information about the currently downloaded file
-	bool is_connecting;    ///< Whether we're connecting
-	bool is_cancelled;     ///< Whether the download has been cancelled
-	std::chrono::steady_clock::time_point last_activity;  ///< The last time there was network activity
+	std::unique_ptr<ContentInfo> cur_info; ///< Information about the currently downloaded file
+	bool is_connecting = false; ///< Whether we're connecting
+	bool is_cancelled = false; ///< Whether the download has been cancelled
+	std::chrono::steady_clock::time_point last_activity = std::chrono::steady_clock::now(); ///< The last time there was network activity
 
 	friend class NetworkContentConnecter;
 
@@ -90,8 +87,8 @@ protected:
 
 	void OnConnect(bool success) override;
 	void OnDisconnect() override;
-	void OnReceiveContentInfo(const ContentInfo *ci) override;
-	void OnDownloadProgress(const ContentInfo *ci, int bytes) override;
+	void OnReceiveContentInfo(const ContentInfo &ci) override;
+	void OnDownloadProgress(const ContentInfo &ci, int bytes) override;
 	void OnDownloadComplete(ContentID cid) override;
 
 	void OnFailure() override;
@@ -107,39 +104,34 @@ public:
 	/** The idle timeout; when to close the connection because it's idle. */
 	static constexpr std::chrono::seconds IDLE_TIMEOUT = std::chrono::seconds(60);
 
-	ClientNetworkContentSocketHandler();
-	~ClientNetworkContentSocketHandler();
-
 	void Connect();
 	void SendReceive();
 	NetworkRecvStatus CloseConnection(bool error = true) override;
 	void Cancel();
 
 	void RequestContentList(ContentType type);
-	void RequestContentList(uint count, const ContentID *content_ids);
+	void RequestContentList(std::span<const ContentID> content_ids);
 	void RequestContentList(ContentVector *cv, bool send_md5sum = true);
 
 	void DownloadSelectedContent(uint &files, uint &bytes, bool fallback = false);
+	void RequestQueuedContentInfo();
 
 	void Select(ContentID cid);
 	void Unselect(ContentID cid);
 	void SelectAll();
 	void SelectUpgrade();
 	void UnselectAll();
-	void ToggleSelectedState(const ContentInfo *ci);
+	void ToggleSelectedState(const ContentInfo &ci);
 
-	void ReverseLookupDependency(ConstContentVector &parents, const ContentInfo *child) const;
+	void ReverseLookupDependency(ConstContentVector &parents, const ContentInfo &child) const;
 	void ReverseLookupTreeDependency(ConstContentVector &tree, const ContentInfo *child) const;
-	void CheckDependencyState(const ContentInfo *ci);
+	void CheckDependencyState(const ContentInfo &ci);
 
-	/** Get the number of content items we know locally. */
-	uint Length() const { return (uint)this->infos.size(); }
-	/** Get the begin of the content inf iterator. */
-	ConstContentIterator Begin() const { return this->infos.data(); }
-	/** Get the nth position of the content inf iterator. */
-	ConstContentIterator Get(uint32_t index) const { return this->infos.data() + index; }
-	/** Get the end of the content inf iterator. */
-	ConstContentIterator End() const { return this->Begin() + this->Length(); }
+	/**
+	 * Get a read-only view of content info for iterating externally.
+	 * @return Read-only view of content info.
+	 */
+	auto Info() const { return this->infos | std::views::transform([](const auto &ci) -> const ContentInfo & { return *ci; }); }
 
 	void Clear();
 
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 7a9ff3d124..117a0c1e7b 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -31,8 +31,6 @@
 #include "table/strings.h"
 #include "../table/sprites.h"
 
-#include <bitset>
-
 #include "../safeguards.h"
 
 
@@ -44,7 +42,7 @@ static bool _accepted_external_search = false;
 struct ContentTextfileWindow : public TextfileWindow {
 	const ContentInfo *ci = nullptr; ///< View the textfile of this ContentInfo.
 
-	ContentTextfileWindow(TextfileType file_type, const ContentInfo *ci) : TextfileWindow(file_type), ci(ci)
+	ContentTextfileWindow(Window *parent, TextfileType file_type, const ContentInfo *ci) : TextfileWindow(parent, file_type), ci(ci)
 	{
 		this->ConstructWindow();
 
@@ -79,10 +77,10 @@ struct ContentTextfileWindow : public TextfileWindow {
 	}
 };
 
-void ShowContentTextfileWindow(TextfileType file_type, const ContentInfo *ci)
+static void ShowContentTextfileWindow(Window *parent, TextfileType file_type, const ContentInfo *ci)
 {
-	CloseWindowById(WC_TEXTFILE, file_type);
-	new ContentTextfileWindow(file_type, ci);
+	parent->CloseChildWindowById(WC_TEXTFILE, file_type);
+	new ContentTextfileWindow(parent, file_type, ci);
 }
 
 /** Nested widgets for the download window. */
@@ -99,7 +97,7 @@ static constexpr NWidgetPart _nested_network_content_download_status_window_widg
 
 /** Window description for the download window */
 static WindowDesc _network_content_download_status_window_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WindowDefaultFlag::Modal,
 	_nested_network_content_download_status_window_widgets
@@ -145,7 +143,7 @@ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, WidgetID
 			DrawFrameRect(r, COLOUR_GREY, {FrameFlag::BorderOnly, FrameFlag::Lowered});
 			Rect ir = r.Shrink(WidgetDimensions::scaled.bevel);
 			DrawFrameRect(ir.WithWidth((uint64_t)ir.Width() * this->downloaded_bytes / this->total_bytes, _current_text_dir == TD_RTL), COLOUR_MAUVE, {});
-			DrawString(ir.left, ir.right, CenterBounds(ir.top, ir.bottom, GetCharacterHeight(FS_NORMAL)),
+			DrawString(ir.left, ir.right, CentreBounds(ir.top, ir.bottom, GetCharacterHeight(FS_NORMAL)),
 				GetString(STR_CONTENT_DOWNLOAD_PROGRESS_SIZE, this->downloaded_bytes, this->total_bytes, this->downloaded_bytes * 100LL / this->total_bytes),
 				TC_FROMSTRING, SA_HOR_CENTER);
 			break;
@@ -165,11 +163,11 @@ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, WidgetID
 	}
 }
 
-void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo *ci, int bytes)
+void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo &ci, int bytes)
 {
-	if (ci->id != this->cur_id) {
-		this->name = ci->filename;
-		this->cur_id = ci->id;
+	if (ci.id != this->cur_id) {
+		this->name = ci.filename;
+		this->cur_id = ci.id;
 		this->downloaded_files++;
 	}
 
@@ -187,7 +185,7 @@ void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInf
 /** Window for showing the download status of content */
 struct NetworkContentDownloadStatusWindow : public BaseNetworkContentDownloadStatusWindow {
 private:
-	std::vector<ContentType> receivedTypes{}; ///< Types we received so we can update their cache
+	ContentTypes received_types{}; ///< Types we received so we can update their cache
 
 public:
 	/**
@@ -202,7 +200,7 @@ public:
 	void Close([[maybe_unused]] int data = 0) override
 	{
 		TarScanner::Modes modes{};
-		for (auto ctype : this->receivedTypes) {
+		for (auto ctype : this->received_types) {
 			switch (ctype) {
 				case CONTENT_TYPE_AI:
 				case CONTENT_TYPE_AI_LIBRARY:
@@ -236,7 +234,7 @@ public:
 		TarScanner::DoScan(modes);
 
 		/* Tell all the backends about what we've downloaded */
-		for (auto ctype : this->receivedTypes) {
+		for (auto ctype : this->received_types) {
 			switch (ctype) {
 				case CONTENT_TYPE_AI:
 				case CONTENT_TYPE_AI_LIBRARY:
@@ -298,10 +296,10 @@ public:
 		}
 	}
 
-	void OnDownloadProgress(const ContentInfo *ci, int bytes) override
+	void OnDownloadProgress(const ContentInfo &ci, int bytes) override
 	{
 		BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(ci, bytes);
-		include(this->receivedTypes, ci->type);
+		this->received_types.Set(ci.type);
 
 		/* When downloading is finished change cancel in ok */
 		if (this->downloaded_bytes == this->total_bytes) {
@@ -313,7 +311,7 @@ public:
 /** Filter data for NetworkContentListWindow. */
 struct ContentListFilterData {
 	StringFilter string_filter; ///< Text filter of content list
-	std::bitset<CONTENT_TYPE_END> types; ///< Content types displayed
+	ContentTypes types; ///< Content types displayed
 };
 
 /** Filter criteria for NetworkContentListWindow. */
@@ -359,26 +357,26 @@ class NetworkContentListWindow : public Window, ContentCallback {
 
 			bool first = true;
 			for (const ContentInfo *ci : this->content) {
-				if (ci->state != ContentInfo::DOES_NOT_EXIST) continue;
+				if (ci->state != ContentInfo::State::DoesNotExist) continue;
 
 				if (!first) url.push_back(',');
 				first = false;
 
-				fmt::format_to(std::back_inserter(url), "{:08X}:{}", ci->unique_id, FormatArrayAsHex(ci->md5sum));
+				format_append(url, "{:08X}:{}", ci->unique_id, FormatArrayAsHex(ci->md5sum));
 			}
 		} else {
 			url += "do=searchtext&q=";
 
 			/* Escape search term */
-			for (const char *search = this->filter_editbox.text.GetText(); *search != '\0'; search++) {
+			for (char search : this->filter_editbox.text.GetText()) {
 				/* Remove quotes */
-				if (*search == '\'' || *search == '"') continue;
+				if (search == '\'' || search == '"') continue;
 
 				/* Escape special chars, such as &%,= */
-				if (*search < 0x30) {
-					fmt::format_to(std::back_inserter(url), "%{:02X}", *search);
+				if (static_cast<unsigned char>(search) < 0x30) {
+					format_append(url, "%{:02X}", search);
 				} else {
-					url.push_back(*search);
+					url.push_back(search);
 				}
 			}
 		}
@@ -410,9 +408,9 @@ class NetworkContentListWindow : public Window, ContentCallback {
 
 		bool all_available = true;
 
-		for (ConstContentIterator iter = _network_content_client.Begin(); iter != _network_content_client.End(); iter++) {
-			if ((*iter)->state == ContentInfo::DOES_NOT_EXIST) all_available = false;
-			this->content.push_back(*iter);
+		for (const ContentInfo &ci : _network_content_client.Info()) {
+			if (ci.state == ContentInfo::State::DoesNotExist) all_available = false;
+			this->content.push_back(&ci);
 		}
 
 		this->SetWidgetDisabledState(WID_NCL_SEARCH_EXTERNAL, this->auto_select && all_available);
@@ -428,7 +426,9 @@ class NetworkContentListWindow : public Window, ContentCallback {
 	/** Sort content by name. */
 	static bool NameSorter(const ContentInfo * const &a, const ContentInfo * const &b)
 	{
-		return StrNaturalCompare(a->name, b->name, true) < 0; // Sort by name (natural sorting).
+		int r = StrNaturalCompare(a->name, b->name, true); // Sort by name (natural sorting).
+		if (r == 0) r = StrNaturalCompare(a->version, b->version, true);
+		return r < 0;
 	}
 
 	/** Sort content by type. */
@@ -445,7 +445,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
 	/** Sort content by state. */
 	static bool StateSorter(const ContentInfo * const &a, const ContentInfo * const &b)
 	{
-		int r = a->state - b->state;
+		int r = to_underlying(a->state) - to_underlying(b->state);
 		if (r == 0) return TypeSorter(a, b);
 		return r < 0;
 	}
@@ -462,7 +462,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
 	/** Filter content by tags/name */
 	static bool TagNameFilter(const ContentInfo * const *a, ContentListFilterData &filter)
 	{
-		if ((*a)->state == ContentInfo::SELECTED || (*a)->state == ContentInfo::AUTOSELECTED) return true;
+		if ((*a)->state == ContentInfo::State::Selected || (*a)->state == ContentInfo::State::Autoselected) return true;
 
 		filter.string_filter.ResetState();
 		for (auto &tag : (*a)->tags) filter.string_filter.AddLine(tag);
@@ -474,9 +474,9 @@ class NetworkContentListWindow : public Window, ContentCallback {
 	/** Filter content by type, but still show content selected for download. */
 	static bool TypeOrSelectedFilter(const ContentInfo * const *a, ContentListFilterData &filter)
 	{
-		if (filter.types.none()) return true;
-		if (filter.types[(*a)->type]) return true;
-		return ((*a)->state == ContentInfo::SELECTED || (*a)->state == ContentInfo::AUTOSELECTED);
+		if (filter.types.None()) return true;
+		if (filter.types.Test((*a)->type)) return true;
+		return ((*a)->state == ContentInfo::State::Selected || (*a)->state == ContentInfo::State::Autoselected);
 	}
 
 	/** Filter the content list */
@@ -488,7 +488,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
 			this->content.SetFilterType(CONTENT_FILTER_TEXT);
 			changed |= this->content.Filter(this->filter_data);
 		}
-		if (this->filter_data.types.any()) {
+		if (this->filter_data.types.Any()) {
 			this->content.SetFilterType(CONTENT_FILTER_TYPE_OR_SELECTED);
 			changed |= this->content.Filter(this->filter_data);
 		}
@@ -513,7 +513,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
 	bool UpdateFilterState()
 	{
 		Filtering old_params = this->content.GetFiltering();
-		bool new_state = !this->filter_data.string_filter.IsEmpty() || this->filter_data.types.any();
+		bool new_state = !this->filter_data.string_filter.IsEmpty() || this->filter_data.types.Any();
 		if (new_state != old_params.state) {
 			this->content.SetFilterState(new_state);
 		}
@@ -539,7 +539,7 @@ public:
 	 *   other types are only shown when content that depend on them are
 	 *   selected.
 	 */
-	NetworkContentListWindow(WindowDesc &desc, bool select_all, const std::bitset<CONTENT_TYPE_END> &types) :
+	NetworkContentListWindow(WindowDesc &desc, bool select_all, ContentTypes types) :
 			Window(desc),
 			auto_select(select_all),
 			filter_editbox(EDITBOX_MAX_SIZE)
@@ -596,7 +596,7 @@ public:
 			}
 
 			case WID_NCL_MATRIX:
-				resize.height = std::max(this->checkbox_size.height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;
+				fill.height = resize.height = std::max(this->checkbox_size.height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;
 				size.height = 10 * resize.height;
 				break;
 		}
@@ -639,6 +639,7 @@ public:
 	 */
 	void DrawMatrix(const Rect &r) const
 	{
+		bool rtl = _current_text_dir == TD_RTL;
 		const Rect checkbox = this->GetWidget<NWidgetBase>(WID_NCL_CHECKBOX)->GetCurrentRect();
 		const Rect name = this->GetWidget<NWidgetBase>(WID_NCL_NAME)->GetCurrentRect().Shrink(WidgetDimensions::scaled.framerect);
 		const Rect type = this->GetWidget<NWidgetBase>(WID_NCL_TYPE)->GetCurrentRect().Shrink(WidgetDimensions::scaled.framerect);
@@ -646,6 +647,7 @@ public:
 		/* Fill the matrix with the information */
 		const uint step_height = this->GetWidget<NWidgetBase>(WID_NCL_MATRIX)->resize_y;
 		const int text_y_offset = WidgetDimensions::scaled.matrix.top + (step_height - WidgetDimensions::scaled.matrix.Vertical() - GetCharacterHeight(FS_NORMAL)) / 2;
+		const int version_y_offset = WidgetDimensions::scaled.matrix.top + (step_height - WidgetDimensions::scaled.matrix.Vertical() - GetCharacterHeight(FS_SMALL)) / 2;
 
 		Rect mr = r.WithHeight(step_height);
 		auto [first, last] = this->vscroll->GetVisibleRangeIterators(this->content);
@@ -657,11 +659,11 @@ public:
 			SpriteID sprite;
 			SpriteID pal = PAL_NONE;
 			switch (ci->state) {
-				case ContentInfo::UNSELECTED:     sprite = SPR_BOX_EMPTY;   break;
-				case ContentInfo::SELECTED:       sprite = SPR_BOX_CHECKED; break;
-				case ContentInfo::AUTOSELECTED:   sprite = SPR_BOX_CHECKED; break;
-				case ContentInfo::ALREADY_HERE:   sprite = SPR_BLOT; pal = PALETTE_TO_GREEN; break;
-				case ContentInfo::DOES_NOT_EXIST: sprite = SPR_BLOT; pal = PALETTE_TO_RED;   break;
+				case ContentInfo::State::Unselected: sprite = SPR_BOX_EMPTY; break;
+				case ContentInfo::State::Selected: sprite = SPR_BOX_CHECKED; break;
+				case ContentInfo::State::Autoselected: sprite = SPR_BOX_CHECKED; break;
+				case ContentInfo::State::AlreadyHere: sprite = SPR_BLOT; pal = PALETTE_TO_GREEN; break;
+				case ContentInfo::State::DoesNotExist: sprite = SPR_BLOT; pal = PALETTE_TO_RED; break;
 				default: NOT_REACHED();
 			}
 			DrawSpriteIgnorePadding(sprite, pal, {checkbox.left, mr.top, checkbox.right, mr.bottom}, SA_CENTER);
@@ -669,7 +671,10 @@ public:
 			StringID str = STR_CONTENT_TYPE_BASE_GRAPHICS + ci->type - CONTENT_TYPE_BASE_GRAPHICS;
 			DrawString(type.left, type.right, mr.top + text_y_offset, str, TC_BLACK, SA_HOR_CENTER);
 
-			DrawString(name.left, name.right, mr.top + text_y_offset, ci->name, TC_BLACK);
+			int x = DrawString(name.left, name.right, mr.top + version_y_offset, ci->version, TC_BLACK, SA_RIGHT, false, FS_SMALL);
+			x += rtl ? WidgetDimensions::scaled.hsep_wide : -WidgetDimensions::scaled.hsep_wide;
+
+			DrawString(rtl ? x : name.left, rtl ? name.right : x, mr.top + text_y_offset, ci->name, TC_BLACK);
 			mr = mr.Translate(0, step_height);
 		}
 	}
@@ -687,8 +692,8 @@ public:
 		Rect tr = r.Shrink(WidgetDimensions::scaled.frametext);
 		tr.top += HEADER_HEIGHT;
 
-		/* Create the nice grayish rectangle at the details top */
-		GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), PC_DARK_BLUE);
+		/* Create the nice darker rectangle at the details top */
+		GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), GetColourGradient(COLOUR_LIGHT_BLUE, SHADE_NORMAL));
 		DrawString(hr.left, hr.right, hr.top, STR_CONTENT_DETAIL_TITLE, TC_FROMSTRING, SA_HOR_CENTER);
 
 		/* Draw the total download size */
@@ -697,7 +702,7 @@ public:
 		if (this->selected == nullptr) return;
 
 		/* And fill the rest of the details when there's information to place there */
-		DrawStringMultiLine(hr.left, hr.right, hr.top + GetCharacterHeight(FS_NORMAL), hr.bottom, STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED + this->selected->state, TC_FROMSTRING, SA_CENTER);
+		DrawStringMultiLine(hr.left, hr.right, hr.top + GetCharacterHeight(FS_NORMAL), hr.bottom, STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED + to_underlying(this->selected->state), TC_FROMSTRING, SA_CENTER);
 
 		/* Also show the total download size, so keep some space from the bottom */
 		tr.bottom -= GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_wide;
@@ -732,13 +737,11 @@ public:
 			std::string buf;
 			for (auto &cid : this->selected->dependencies) {
 				/* Try to find the dependency */
-				ConstContentIterator iter = _network_content_client.Begin();
-				for (; iter != _network_content_client.End(); iter++) {
-					const ContentInfo *ci = *iter;
-					if (ci->id != cid) continue;
+				for (const ContentInfo &ci : _network_content_client.Info()) {
+					if (ci.id != cid) continue;
 
 					if (!buf.empty()) buf += list_separator;
-					buf += (*iter)->name;
+					buf += ci.name;
 					break;
 				}
 			}
@@ -762,7 +765,7 @@ public:
 
 			std::string buf;
 			for (const ContentInfo *ci : tree) {
-				if (ci == this->selected || ci->state != ContentInfo::SELECTED) continue;
+				if (ci == this->selected || ci->state != ContentInfo::State::Selected) continue;
 
 				if (!buf.empty()) buf += list_separator;
 				buf += ci->name;
@@ -776,9 +779,9 @@ public:
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
 		if (widget >= WID_NCL_TEXTFILE && widget < WID_NCL_TEXTFILE + TFT_CONTENT_END) {
-			if (this->selected == nullptr || this->selected->state != ContentInfo::ALREADY_HERE) return;
+			if (this->selected == nullptr || this->selected->state != ContentInfo::State::AlreadyHere) return;
 
-			ShowContentTextfileWindow((TextfileType)(widget - WID_NCL_TEXTFILE), this->selected);
+			ShowContentTextfileWindow(this, (TextfileType)(widget - WID_NCL_TEXTFILE), this->selected);
 			return;
 		}
 
@@ -787,17 +790,17 @@ public:
 				auto it = this->vscroll->GetScrolledItemFromWidget(this->content, pt.y, this, WID_NCL_MATRIX);
 				if (it == this->content.end()) return; // click out of bounds
 
-				this->selected = *it;
-				this->list_pos = it - this->content.begin();
-
 				const NWidgetBase *checkbox = this->GetWidget<NWidgetBase>(WID_NCL_CHECKBOX);
 				if (click_count > 1 || IsInsideBS(pt.x, checkbox->pos_x, checkbox->current_x)) {
-					_network_content_client.ToggleSelectedState(this->selected);
+					_network_content_client.ToggleSelectedState(**it);
 					this->content.ForceResort();
 					this->content.ForceRebuild();
+				} else {
+					this->selected = *it;
+					this->list_pos = it - this->content.begin();
 				}
 
-				if (this->filter_data.types.any()) {
+				if (this->filter_data.types.Any()) {
 					this->content.ForceRebuild();
 				}
 
@@ -835,10 +838,6 @@ public:
 				this->InvalidateData();
 				break;
 
-			case WID_NCL_CANCEL:
-				this->Close();
-				break;
-
 			case WID_NCL_OPEN_URL:
 				if (this->selected != nullptr) {
 					OpenBrowser(this->selected->url);
@@ -870,11 +869,11 @@ public:
 				case WKC_RETURN:
 					if (keycode == WKC_RETURN || !IsWidgetFocused(WID_NCL_FILTER)) {
 						if (this->selected != nullptr) {
-							_network_content_client.ToggleSelectedState(this->selected);
+							_network_content_client.ToggleSelectedState(*this->selected);
 							this->content.ForceResort();
 							this->InvalidateData();
 						}
-						if (this->filter_data.types.any()) {
+						if (this->filter_data.types.Any()) {
 							this->content.ForceRebuild();
 							this->InvalidateData();
 						}
@@ -925,9 +924,9 @@ public:
 		this->vscroll->SetCapacityFromWidget(this, WID_NCL_MATRIX);
 	}
 
-	void OnReceiveContentInfo(const ContentInfo *rci) override
+	void OnReceiveContentInfo(const ContentInfo &rci) override
 	{
-		if (this->auto_select && !rci->IsSelected()) _network_content_client.ToggleSelectedState(rci);
+		if (this->auto_select && !rci.IsSelected()) _network_content_client.ToggleSelectedState(rci);
 		this->content.ForceRebuild();
 		this->InvalidateData(0, false);
 	}
@@ -965,12 +964,12 @@ public:
 		bool show_select_upgrade = false;
 		for (const ContentInfo *ci : this->content) {
 			switch (ci->state) {
-				case ContentInfo::SELECTED:
-				case ContentInfo::AUTOSELECTED:
+				case ContentInfo::State::Selected:
+				case ContentInfo::State::Autoselected:
 					this->filesize_sum += ci->filesize;
 					break;
 
-				case ContentInfo::UNSELECTED:
+				case ContentInfo::State::Unselected:
 					show_select_all = true;
 					show_select_upgrade |= ci->upgrade;
 					break;
@@ -987,10 +986,8 @@ public:
 		this->SetWidgetDisabledState(WID_NCL_SELECT_UPDATE, !show_select_upgrade || !this->filter_data.string_filter.IsEmpty());
 		this->SetWidgetDisabledState(WID_NCL_OPEN_URL, this->selected == nullptr || this->selected->url.empty());
 		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
-			this->SetWidgetDisabledState(WID_NCL_TEXTFILE + tft, this->selected == nullptr || this->selected->state != ContentInfo::ALREADY_HERE || !this->selected->GetTextfile(tft).has_value());
+			this->SetWidgetDisabledState(WID_NCL_TEXTFILE + tft, this->selected == nullptr || this->selected->state != ContentInfo::State::AlreadyHere || !this->selected->GetTextfile(tft).has_value());
 		}
-
-		this->GetWidget<NWidgetCore>(WID_NCL_CANCEL)->SetString(this->filesize_sum == 0 ? STR_AI_SETTINGS_CLOSE : STR_AI_LIST_CANCEL);
 	}
 };
 
@@ -1083,12 +1080,8 @@ static constexpr NWidgetPart _nested_network_content_list_widgets[] = {
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SEARCH_EXTERNAL), SetResize(1, 0), SetFill(1, 0),
 						SetStringTip(STR_CONTENT_SEARCH_EXTERNAL, STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP),
-				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CANCEL), SetResize(1, 0), SetFill(1, 0),
-							SetStringTip(STR_BUTTON_CANCEL),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_DOWNLOAD), SetResize(1, 0), SetFill(1, 0),
-							SetStringTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP),
-				EndContainer(),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_DOWNLOAD), SetResize(1, 0), SetFill(1, 0),
+						SetStringTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP),
 			EndContainer(),
 		EndContainer(),
 		/* Resize button. */
@@ -1117,7 +1110,7 @@ static WindowDesc _network_content_list_desc(
 void ShowNetworkContentListWindow(ContentVector *cv, ContentType type1, ContentType type2)
 {
 #if defined(WITH_ZLIB)
-	std::bitset<CONTENT_TYPE_END> types;
+	ContentTypes types{};
 	_network_content_client.Clear();
 	if (cv == nullptr) {
 		assert(type1 != CONTENT_TYPE_END || type2 == CONTENT_TYPE_END);
@@ -1125,8 +1118,8 @@ void ShowNetworkContentListWindow(ContentVector *cv, ContentType type1, ContentT
 		_network_content_client.RequestContentList(type1);
 		if (type2 != CONTENT_TYPE_END) _network_content_client.RequestContentList(type2);
 
-		if (type1 != CONTENT_TYPE_END) types[type1] = true;
-		if (type2 != CONTENT_TYPE_END) types[type2] = true;
+		if (type1 != CONTENT_TYPE_END) types.Set(type1);
+		if (type2 != CONTENT_TYPE_END) types.Set(type2);
 	} else {
 		_network_content_client.RequestContentList(cv, true);
 	}
@@ -1138,9 +1131,5 @@ void ShowNetworkContentListWindow(ContentVector *cv, ContentType type1, ContentT
 		GetEncodedString(STR_CONTENT_NO_ZLIB),
 		GetEncodedString(STR_CONTENT_NO_ZLIB_SUB),
 		WL_ERROR);
-	/* Connection failed... clean up the mess */
-	if (cv != nullptr) {
-		for (ContentInfo *ci : *cv) delete ci;
-	}
 #endif /* WITH_ZLIB */
 }
diff --git a/src/network/network_content_gui.h b/src/network/network_content_gui.h
index 2de7b262df..6fd71d0ad8 100644
--- a/src/network/network_content_gui.h
+++ b/src/network/network_content_gui.h
@@ -35,7 +35,7 @@ public:
 	void Close([[maybe_unused]] int data = 0) override;
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override;
 	void DrawWidget(const Rect &r, WidgetID widget) const override;
-	void OnDownloadProgress(const ContentInfo *ci, int bytes) override;
+	void OnDownloadProgress(const ContentInfo &ci, int bytes) override;
 };
 
 void BuildContentTypeStringList();
diff --git a/src/network/network_coordinator.cpp b/src/network/network_coordinator.cpp
index bf1203f436..95eee80530 100644
--- a/src/network/network_coordinator.cpp
+++ b/src/network/network_coordinator.cpp
@@ -45,7 +45,7 @@ public:
 	 * @param token The token as given by the Game Coordinator to track this connection attempt.
 	 * @param tracking_number The tracking number as given by the Game Coordinator to track this connection attempt.
 	 */
-	NetworkDirectConnecter(const std::string &hostname, uint16_t port, const std::string &token, uint8_t tracking_number) : TCPConnecter(hostname, port), token(token), tracking_number(tracking_number) {}
+	NetworkDirectConnecter(std::string_view hostname, uint16_t port, std::string &&token, uint8_t tracking_number) : TCPConnecter(hostname, port), token(std::move(token)), tracking_number(tracking_number) {}
 
 	void OnFailure() override
 	{
@@ -76,7 +76,7 @@ public:
 	 * @param tracking_number The tracking number of the connection.
 	 * @param family The family this connection is using.
 	 */
-	NetworkReuseStunConnecter(const std::string &hostname, uint16_t port, const NetworkAddress &bind_address, std::string token, uint8_t tracking_number, uint8_t family) :
+	NetworkReuseStunConnecter(std::string_view hostname, uint16_t port, const NetworkAddress &bind_address, std::string &&token, uint8_t tracking_number, uint8_t family) :
 		TCPConnecter(hostname, port, bind_address),
 		token(std::move(token)),
 		tracking_number(tracking_number),
@@ -106,7 +106,7 @@ public:
 	 * Initiate the connecting.
 	 * @param connection_string The address of the Game Coordinator server.
 	 */
-	NetworkCoordinatorConnecter(const std::string &connection_string) : TCPConnecter(connection_string, NETWORK_COORDINATOR_SERVER_PORT) {}
+	NetworkCoordinatorConnecter(std::string_view connection_string) : TCPConnecter(connection_string, NETWORK_COORDINATOR_SERVER_PORT) {}
 
 	void OnFailure() override
 	{
@@ -305,7 +305,7 @@ bool ClientNetworkCoordinatorSocketHandler::Receive_GC_DIRECT_CONNECT(Packet &p)
 		this->game_connecter = nullptr;
 	}
 
-	this->game_connecter = TCPConnecter::Create<NetworkDirectConnecter>(hostname, port, token, tracking_number);
+	this->game_connecter = TCPConnecter::Create<NetworkDirectConnecter>(hostname, port, std::move(token), tracking_number);
 	return true;
 }
 
@@ -348,7 +348,7 @@ bool ClientNetworkCoordinatorSocketHandler::Receive_GC_STUN_CONNECT(Packet &p)
 	 * STUN server. This means that if there is any NAT in the local network,
 	 * the public ip:port is still pointing to the local address, and as such
 	 * a connection can be established. */
-	this->game_connecter = TCPConnecter::Create<NetworkReuseStunConnecter>(host, port, family_it->second->local_addr, token, tracking_number, family);
+	this->game_connecter = TCPConnecter::Create<NetworkReuseStunConnecter>(host, port, family_it->second->local_addr, std::move(token), tracking_number, family);
 	return true;
 }
 
@@ -393,7 +393,7 @@ bool ClientNetworkCoordinatorSocketHandler::Receive_GC_TURN_CONNECT(Packet &p)
 				break;
 
 			case URS_ASK:
-				ShowNetworkAskRelay(connecter_it->second.first, connection_string, token);
+				ShowNetworkAskRelay(connecter_it->second.first, std::move(connection_string), std::move(token));
 				break;
 
 			case URS_ALLOW:
@@ -407,7 +407,7 @@ bool ClientNetworkCoordinatorSocketHandler::Receive_GC_TURN_CONNECT(Packet &p)
 	return true;
 }
 
-void ClientNetworkCoordinatorSocketHandler::StartTurnConnection(std::string &token)
+void ClientNetworkCoordinatorSocketHandler::StartTurnConnection(std::string_view token)
 {
 	auto turn_it = this->turn_handlers.find(token);
 	if (turn_it == this->turn_handlers.end()) return;
@@ -511,7 +511,7 @@ void ClientNetworkCoordinatorSocketHandler::GetListing()
  * @param invite_code The invite code of the server to connect to.
  * @param connecter The connecter of the request.
  */
-void ClientNetworkCoordinatorSocketHandler::ConnectToServer(const std::string &invite_code, TCPServerConnecter *connecter)
+void ClientNetworkCoordinatorSocketHandler::ConnectToServer(std::string_view invite_code, TCPServerConnecter *connecter)
 {
 	assert(invite_code.starts_with("+"));
 
@@ -525,7 +525,7 @@ void ClientNetworkCoordinatorSocketHandler::ConnectToServer(const std::string &i
 
 	/* Initially we store based on invite code; on first reply we know the
 	 * token, and will start using that key instead. */
-	this->connecter_pre[invite_code] = connecter;
+	this->connecter_pre[std::string(invite_code)] = connecter;
 
 	this->Connect();
 
@@ -541,7 +541,7 @@ void ClientNetworkCoordinatorSocketHandler::ConnectToServer(const std::string &i
  * @param token Token of the connecter that failed.
  * @param tracking_number Tracking number of the connecter that failed.
  */
-void ClientNetworkCoordinatorSocketHandler::ConnectFailure(const std::string &token, uint8_t tracking_number)
+void ClientNetworkCoordinatorSocketHandler::ConnectFailure(std::string_view token, uint8_t tracking_number)
 {
 	/* Connecter will destroy itself. */
 	this->game_connecter = nullptr;
@@ -563,7 +563,7 @@ void ClientNetworkCoordinatorSocketHandler::ConnectFailure(const std::string &to
  * @param token Token of the connecter that succeeded.
  * @param sock The socket that the connecter can now use.
  */
-void ClientNetworkCoordinatorSocketHandler::ConnectSuccess(const std::string &token, SOCKET sock, NetworkAddress &address)
+void ClientNetworkCoordinatorSocketHandler::ConnectSuccess(std::string_view token, SOCKET sock, NetworkAddress &address)
 {
 	assert(sock != INVALID_SOCKET);
 
@@ -603,7 +603,7 @@ void ClientNetworkCoordinatorSocketHandler::ConnectSuccess(const std::string &to
  * This helps the Game Coordinator not to wait for a timeout on its end, but
  * rather react as soon as the client/server knows the result.
  */
-void ClientNetworkCoordinatorSocketHandler::StunResult(const std::string &token, uint8_t family, bool result)
+void ClientNetworkCoordinatorSocketHandler::StunResult(std::string_view token, uint8_t family, bool result)
 {
 	auto p = std::make_unique<Packet>(this, PACKET_COORDINATOR_SERCLI_STUN_RESULT);
 	p->Send_uint8(NETWORK_COORDINATOR_VERSION);
@@ -618,7 +618,7 @@ void ClientNetworkCoordinatorSocketHandler::StunResult(const std::string &token,
  * @param token The token used for the STUN handlers.
  * @param family The family of STUN handlers to close. AF_UNSPEC to close all STUN handlers for this token.
  */
-void ClientNetworkCoordinatorSocketHandler::CloseStunHandler(const std::string &token, uint8_t family)
+void ClientNetworkCoordinatorSocketHandler::CloseStunHandler(std::string_view token, uint8_t family)
 {
 	auto stun_it = this->stun_handlers.find(token);
 	if (stun_it == this->stun_handlers.end()) return;
@@ -645,7 +645,7 @@ void ClientNetworkCoordinatorSocketHandler::CloseStunHandler(const std::string &
  * Close the TURN handler.
  * @param token The token used for the TURN handler.
  */
-void ClientNetworkCoordinatorSocketHandler::CloseTurnHandler(const std::string &token)
+void ClientNetworkCoordinatorSocketHandler::CloseTurnHandler(std::string_view token)
 {
 	CloseWindowByClass(WC_NETWORK_ASK_RELAY, NRWCD_HANDLED);
 
@@ -664,7 +664,7 @@ void ClientNetworkCoordinatorSocketHandler::CloseTurnHandler(const std::string &
  * Close everything related to this connection token.
  * @param token The connection token to close.
  */
-void ClientNetworkCoordinatorSocketHandler::CloseToken(const std::string &token)
+void ClientNetworkCoordinatorSocketHandler::CloseToken(std::string_view token)
 {
 	/* Close all remaining STUN / TURN connections. */
 	this->CloseStunHandler(token);
diff --git a/src/network/network_coordinator.h b/src/network/network_coordinator.h
index f8aa88e6b8..eccb90d7b1 100644
--- a/src/network/network_coordinator.h
+++ b/src/network/network_coordinator.h
@@ -53,10 +53,10 @@
 class ClientNetworkCoordinatorSocketHandler : public NetworkCoordinatorSocketHandler {
 private:
 	std::chrono::steady_clock::time_point next_update; ///< When to send the next update (if server and public).
-	std::map<std::string, std::pair<std::string, TCPServerConnecter *>> connecter; ///< Based on tokens, the current (invite-code, connecter) that are pending.
-	std::map<std::string, TCPServerConnecter *> connecter_pre; ///< Based on invite codes, the current connecters that are pending.
-	std::map<std::string, std::map<int, std::unique_ptr<ClientNetworkStunSocketHandler>>> stun_handlers; ///< All pending STUN handlers, stored by token:family.
-	std::map<std::string, std::unique_ptr<ClientNetworkTurnSocketHandler>> turn_handlers; ///< Pending TURN handler (if any), stored by token.
+	std::map<std::string, std::pair<std::string, TCPServerConnecter *>, std::less<>> connecter; ///< Based on tokens, the current (invite-code, connecter) that are pending.
+	std::map<std::string, TCPServerConnecter *, std::less<>> connecter_pre; ///< Based on invite codes, the current connecters that are pending.
+	std::map<std::string, std::map<int, std::unique_ptr<ClientNetworkStunSocketHandler>>, std::less<>> stun_handlers; ///< All pending STUN handlers, stored by token:family.
+	std::map<std::string, std::unique_ptr<ClientNetworkTurnSocketHandler>, std::less<>> turn_handlers; ///< Pending TURN handler (if any), stored by token.
 	std::shared_ptr<TCPConnecter> game_connecter{}; ///< Pending connecter to the game server.
 
 	uint32_t newgrf_lookup_table_cursor = 0; ///< Last received cursor for the #GameInfoNewGRFLookupTable updates.
@@ -86,22 +86,22 @@ public:
 	NetworkRecvStatus CloseConnection(bool error = true) override;
 	void SendReceive();
 
-	void ConnectFailure(const std::string &token, uint8_t tracking_number);
-	void ConnectSuccess(const std::string &token, SOCKET sock, NetworkAddress &address);
-	void StunResult(const std::string &token, uint8_t family, bool result);
+	void ConnectFailure(std::string_view token, uint8_t tracking_number);
+	void ConnectSuccess(std::string_view token, SOCKET sock, NetworkAddress &address);
+	void StunResult(std::string_view token, uint8_t family, bool result);
 
 	void Connect();
-	void CloseToken(const std::string &token);
+	void CloseToken(std::string_view token);
 	void CloseAllConnections();
-	void CloseStunHandler(const std::string &token, uint8_t family = AF_UNSPEC);
-	void CloseTurnHandler(const std::string &token);
+	void CloseStunHandler(std::string_view token, uint8_t family = AF_UNSPEC);
+	void CloseTurnHandler(std::string_view token);
 
 	void Register();
 	void SendServerUpdate();
 	void GetListing();
 
-	void ConnectToServer(const std::string &invite_code, TCPServerConnecter *connecter);
-	void StartTurnConnection(std::string &token);
+	void ConnectToServer(std::string_view invite_code, TCPServerConnecter *connecter);
+	void StartTurnConnection(std::string_view token);
 };
 
 extern ClientNetworkCoordinatorSocketHandler _network_coordinator_client;
diff --git a/src/network/network_func.h b/src/network/network_func.h
index 037a0deea1..40a6bc8a4c 100644
--- a/src/network/network_func.h
+++ b/src/network/network_func.h
@@ -33,7 +33,7 @@ extern StringList _network_host_list;
 extern StringList _network_ban_list;
 
 uint8_t NetworkSpectatorCount();
-bool NetworkIsValidClientName(const std::string_view client_name);
+bool NetworkIsValidClientName(std::string_view client_name);
 bool NetworkValidateOurClientName();
 bool NetworkValidateClientName(std::string &client_name);
 bool NetworkValidateServerName(std::string &server_name);
@@ -44,17 +44,17 @@ void NetworkReboot();
 void NetworkDisconnect(bool close_admins = true);
 void NetworkGameLoop();
 void NetworkBackgroundLoop();
-std::string_view ParseFullConnectionString(const std::string &connection_string, uint16_t &port, CompanyID *company_id = nullptr);
-using NetworkCompanyStatsArray = ReferenceThroughBaseContainer<std::array<NetworkCompanyStats, MAX_COMPANIES>>;
+std::string_view ParseFullConnectionString(std::string_view connection_string, uint16_t &port, CompanyID *company_id = nullptr);
+using NetworkCompanyStatsArray = TypedIndexContainer<std::array<NetworkCompanyStats, MAX_COMPANIES>, CompanyID>;
 NetworkCompanyStatsArray NetworkGetCompanyStats();
 
 void NetworkUpdateClientInfo(ClientID client_id);
 void NetworkClientsToSpectators(CompanyID cid);
-bool NetworkClientConnectGame(const std::string &connection_string, CompanyID default_company, const std::string &join_server_password = "");
+bool NetworkClientConnectGame(std::string_view connection_string, CompanyID default_company, const std::string &join_server_password = "");
 void NetworkClientJoinGame();
 void NetworkClientRequestMove(CompanyID company);
-void NetworkClientSendRcon(const std::string &password, const std::string &command);
-void NetworkClientSendChat(NetworkAction action, DestType type, int dest, const std::string &msg, int64_t data = 0);
+void NetworkClientSendRcon(std::string_view password, std::string_view command);
+void NetworkClientSendChat(NetworkAction action, DestType type, int dest, std::string_view msg, int64_t data = 0);
 bool NetworkClientPreferTeamChat(const NetworkClientInfo *cio);
 uint NetworkMaxCompaniesAllowed();
 bool NetworkMaxCompaniesReached();
@@ -75,13 +75,13 @@ bool NetworkServerChangeClientName(ClientID client_id, const std::string &new_na
 
 bool NetworkCanJoinCompany(CompanyID company_id);
 void NetworkServerDoMove(ClientID client_id, CompanyID company_id);
-void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, const std::string &string);
-void NetworkServerSendChat(NetworkAction action, DestType type, int dest, const std::string &msg, ClientID from_id, int64_t data = 0, bool from_admin = false);
-void NetworkServerSendExternalChat(const std::string &source, TextColour colour, const std::string &user, const std::string &msg);
+void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, std::string_view string);
+void NetworkServerSendChat(NetworkAction action, DestType type, int dest, std::string_view msg, ClientID from_id, int64_t data = 0, bool from_admin = false);
+void NetworkServerSendExternalChat(std::string_view source, TextColour colour, std::string_view user, std::string_view msg);
 
-void NetworkServerKickClient(ClientID client_id, const std::string &reason);
-uint NetworkServerKickOrBanIP(ClientID client_id, bool ban, const std::string &reason);
-uint NetworkServerKickOrBanIP(const std::string &ip, bool ban, const std::string &reason);
+void NetworkServerKickClient(ClientID client_id, std::string_view reason);
+uint NetworkServerKickOrBanIP(ClientID client_id, bool ban, std::string_view reason);
+uint NetworkServerKickOrBanIP(std::string_view ip, bool ban, std::string_view reason);
 
 void NetworkInitChatMessage();
 void NetworkReInitChatBoxSize();
diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp
index 4b06381865..ebf51f87a5 100644
--- a/src/network/network_gamelist.cpp
+++ b/src/network/network_gamelist.cpp
@@ -11,12 +11,10 @@
  */
 
 #include "../stdafx.h"
-#include "../debug.h"
+
 #include "../window_func.h"
 #include "network_internal.h"
-#include "network_udp.h"
 #include "network_gamelist.h"
-#include <atomic>
 
 #include "../safeguards.h"
 
@@ -29,7 +27,7 @@ int _network_game_list_version = 0; ///< Current version of all items in the lis
  * @param connection_string the address of the to-be added item
  * @return a point to the newly added or already existing item
  */
-NetworkGame *NetworkGameListAddItem(const std::string &connection_string)
+NetworkGame *NetworkGameListAddItem(std::string_view connection_string)
 {
 	/* Parse the connection string to ensure the default port is there. */
 	const std::string resolved_connection_string = ServerAddress::Parse(connection_string, NETWORK_DEFAULT_PORT).connection_string;
diff --git a/src/network/network_gamelist.h b/src/network/network_gamelist.h
index db84540f6b..50c8a71abc 100644
--- a/src/network/network_gamelist.h
+++ b/src/network/network_gamelist.h
@@ -25,7 +25,7 @@ enum NetworkGameStatus : uint8_t {
 
 /** Structure with information shown in the game list (GUI) */
 struct NetworkGame {
-	NetworkGame(const std::string &connection_string) : connection_string(connection_string) {}
+	NetworkGame(std::string_view connection_string) : connection_string(connection_string) {}
 
 	NetworkGameInfo info{};                  ///< The game information of this server.
 	std::string connection_string;           ///< Address of the server.
@@ -38,7 +38,7 @@ struct NetworkGame {
 extern std::vector<std::unique_ptr<NetworkGame>> _network_game_list;
 extern int _network_game_list_version;
 
-NetworkGame *NetworkGameListAddItem(const std::string &connection_string);
+NetworkGame *NetworkGameListAddItem(std::string_view connection_string);
 void NetworkGameListRemoveItem(NetworkGame *remove);
 void NetworkGameListRemoveExpired();
 
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index cb5c5cb4a2..d6c77dce1f 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -41,6 +41,7 @@
 #include "../timer/timer_game_calendar.h"
 #include "../textfile_gui.h"
 #include "../stringfilter_type.h"
+#include "../core/string_consumer.hpp"
 
 #include "../widgets/network_widget.h"
 
@@ -475,8 +476,7 @@ public:
 	{
 		switch (widget) {
 			case WID_NG_MATRIX:
-				resize.height = std::max(GetSpriteSize(SPR_BLOT).height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;
-				fill.height = resize.height;
+				fill.height = resize.height = std::max(GetSpriteSize(SPR_BLOT).height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;
 				size.height = 12 * resize.height;
 				break;
 
@@ -502,7 +502,7 @@ public:
 
 			case WID_NG_MAPSIZE: {
 				size.width += 2 * Window::SortButtonWidth(); // Make space for the arrow
-				auto max_map_size = GetParamMaxValue(0, MAX_MAP_SIZE);
+				auto max_map_size = GetParamMaxValue(MAX_MAP_SIZE);
 				size = maxdim(size, GetStringBoundingBox(GetString(STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT, max_map_size, max_map_size)));
 				break;
 			}
@@ -623,8 +623,8 @@ public:
 		tr.top += header_height;
 
 		/* Draw the right menu */
-		/* Create the nice grayish rectangle at the details top */
-		GfxFillRect(r.WithHeight(header_height).Shrink(WidgetDimensions::scaled.bevel), PC_DARK_BLUE);
+		/* Create the nice darker rectangle at the details top */
+		GfxFillRect(r.WithHeight(header_height).Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(COLOUR_LIGHT_BLUE, SHADE_NORMAL));
 		hr.top = DrawStringMultiLine(hr, header_msg, TC_FROMSTRING, SA_HOR_CENTER);
 		if (sel == nullptr) return;
 
@@ -670,10 +670,6 @@ public:
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
 		switch (widget) {
-			case WID_NG_CANCEL: // Cancel button
-				CloseWindowById(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME);
-				break;
-
 			case WID_NG_NAME:    // Sort by name
 			case WID_NG_CLIENTS: // Sort by connected clients
 			case WID_NG_MAPSIZE: // Sort by map size
@@ -832,7 +828,7 @@ public:
 	}
 
 	/** Refresh the online servers on a regular interval. */
-	IntervalTimer<TimerWindow> refresh_interval = {std::chrono::seconds(30), [this](uint) {
+	const IntervalTimer<TimerWindow> refresh_interval = {std::chrono::seconds(30), [this](uint) {
 		if (!this->searched_internet) return;
 
 		_network_coordinator_client.GetListing();
@@ -909,7 +905,7 @@ static constexpr NWidgetPart _nested_network_game_widgets[] = {
 								NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_NEWGRF_MISSING), SetFill(1, 0), SetStringTip(STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON, STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP),
 							EndContainer(),
 							NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NG_NEWGRF_SEL),
-								NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_NEWGRF), SetFill(1, 0), SetStringTip(STR_INTRO_NEWGRF_SETTINGS),
+								NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_NEWGRF), SetFill(1, 0), SetStringTip(STR_MAPGEN_NEWGRF_SETTINGS, STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP),
 							EndContainer(),
 							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
 								NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_JOIN), SetFill(1, 0), SetStringTip(STR_NETWORK_SERVER_LIST_JOIN_GAME),
@@ -925,7 +921,6 @@ static constexpr NWidgetPart _nested_network_game_widgets[] = {
 				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_SEARCH_LAN), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN, STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_ADD), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_NETWORK_SERVER_LIST_ADD_SERVER, STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_START), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_NETWORK_SERVER_LIST_START_SERVER, STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_CANCEL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_BUTTON_CANCEL),
 			EndContainer(),
 		EndContainer(),
 		/* Resize button. */
@@ -1086,7 +1081,7 @@ struct NetworkStartServerWindow : public Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_NSS_CONNTYPE_BTN:
@@ -1101,7 +1096,7 @@ struct NetworkStartServerWindow : public Window {
 
 	bool CheckServerName()
 	{
-		std::string str = this->name_editbox.text.GetText();
+		std::string str{this->name_editbox.text.GetText()};
 		if (!NetworkValidateServerName(str)) return false;
 
 		SetSettingValue(GetSettingFromName("network.server_name")->AsStringSetting(), std::move(str));
@@ -1120,12 +1115,13 @@ struct NetworkStartServerWindow : public Window {
 		if (this->widget_id == WID_NSS_SETPWD) {
 			_settings_client.network.server_password = std::move(*str);
 		} else {
-			int32_t value = atoi(str->c_str());
+			auto value = ParseInteger<int32_t>(*str, 10, true);
+			if (!value.has_value()) return;
 			this->SetWidgetDirty(this->widget_id);
 			switch (this->widget_id) {
 				default: NOT_REACHED();
-				case WID_NSS_CLIENTS_TXT:    _settings_client.network.max_clients    = Clamp(value, 2, MAX_CLIENTS); break;
-				case WID_NSS_COMPANIES_TXT:  _settings_client.network.max_companies  = Clamp(value, 1, MAX_COMPANIES); break;
+				case WID_NSS_CLIENTS_TXT:    _settings_client.network.max_clients    = Clamp(*value, 2, MAX_CLIENTS); break;
+				case WID_NSS_COMPANIES_TXT:  _settings_client.network.max_companies  = Clamp(*value, 1, MAX_COMPANIES); break;
 			}
 		}
 
@@ -1201,7 +1197,7 @@ static constexpr NWidgetPart _nested_network_start_server_window_widgets[] = {
 };
 
 static WindowDesc _network_start_server_window_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_NETWORK_WINDOW, WC_NONE,
 	{},
 	_nested_network_start_server_window_widgets
@@ -1659,8 +1655,7 @@ public:
 				this->line_height = std::max(height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;
 
 				resize.width = 1;
-				resize.height = this->line_height;
-				fill.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = std::max(size.height, 5 * this->line_height);
 				break;
 			}
@@ -1771,15 +1766,15 @@ public:
 		return false;
 	}
 
-	void OnDropdownClose(Point pt, WidgetID widget, int index, bool instant_close) override
+	void OnDropdownClose(Point pt, WidgetID widget, int index, int click_result, bool instant_close) override
 	{
 		/* If you close the dropdown outside the list, don't take any action. */
 		if (widget == WID_CL_MATRIX) return;
 
-		Window::OnDropdownClose(pt, widget, index, instant_close);
+		Window::OnDropdownClose(pt, widget, index, click_result, instant_close);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_CL_SERVER_VISIBILITY:
@@ -1900,10 +1895,10 @@ public:
 	void DrawCompany(CompanyID company_id, const Rect &r, uint &line) const
 	{
 		bool rtl = _current_text_dir == TD_RTL;
-		int text_y_offset = CenterBounds(0, this->line_height, GetCharacterHeight(FS_NORMAL));
+		int text_y_offset = CentreBounds(0, this->line_height, GetCharacterHeight(FS_NORMAL));
 
 		Dimension d = GetSpriteSize(SPR_COMPANY_ICON);
-		int offset = CenterBounds(0, this->line_height, d.height);
+		int offset = CentreBounds(0, this->line_height, d.height);
 
 		uint line_start = this->vscroll->GetPosition();
 		uint line_end = line_start + this->vscroll->GetCapacity();
@@ -1961,7 +1956,7 @@ public:
 
 				if (player_icon != 0) {
 					Dimension d2 = GetSpriteSize(player_icon);
-					int offset_y = CenterBounds(0, this->line_height, d2.height);
+					int offset_y = CentreBounds(0, this->line_height, d2.height);
 					DrawSprite(player_icon, PALETTE_TO_GREY, rtl ? tr.right - d2.width : tr.left, y + offset_y);
 					tr = tr.Indent(d2.width + WidgetDimensions::scaled.hsep_normal, rtl);
 				}
@@ -2075,7 +2070,7 @@ struct NetworkJoinStatusWindow : Window {
 						break;
 				}
 				DrawFrameRect(ir.WithWidth(ir.Width() * progress / 100, _current_text_dir == TD_RTL), COLOUR_MAUVE, {});
-				DrawString(ir.left, ir.right, CenterBounds(ir.top, ir.bottom, GetCharacterHeight(FS_NORMAL)), STR_NETWORK_CONNECTING_1 + _network_join_status, TC_FROMSTRING, SA_HOR_CENTER);
+				DrawString(ir.left, ir.right, CentreBounds(ir.top, ir.bottom, GetCharacterHeight(FS_NORMAL)), STR_NETWORK_CONNECTING_1 + _network_join_status, TC_FROMSTRING, SA_HOR_CENTER);
 				break;
 			}
 
@@ -2157,7 +2152,7 @@ static constexpr NWidgetPart _nested_network_join_status_window_widgets[] = {
 };
 
 static WindowDesc _network_join_status_window_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WindowDefaultFlag::Modal,
 	_nested_network_join_status_window_widgets
@@ -2186,11 +2181,11 @@ struct NetworkAskRelayWindow : public Window {
 	std::string relay_connection_string{}; ///< The relay server we want to connect to.
 	std::string token{}; ///< The token for this connection.
 
-	NetworkAskRelayWindow(WindowDesc &desc, Window *parent, const std::string &server_connection_string, const std::string &relay_connection_string, const std::string &token) :
+	NetworkAskRelayWindow(WindowDesc &desc, Window *parent, std::string_view server_connection_string, std::string &&relay_connection_string, std::string &&token) :
 		Window(desc),
 		server_connection_string(server_connection_string),
-		relay_connection_string(relay_connection_string),
-		token(token)
+		relay_connection_string(std::move(relay_connection_string)),
+		token(std::move(token))
 	{
 		this->parent = parent;
 		this->InitNested(0);
@@ -2216,7 +2211,7 @@ struct NetworkAskRelayWindow : public Window {
 		}
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int, bool) override
 	{
 		/* Position query window over the calling window, ensuring it's within screen bounds. */
 		this->left = Clamp(parent->left + (parent->width / 2) - (this->width / 2), 0, _screen.width - this->width);
@@ -2264,7 +2259,7 @@ static constexpr NWidgetPart _nested_network_ask_relay_widgets[] = {
 };
 
 static WindowDesc _network_ask_relay_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_NETWORK_ASK_RELAY, WC_NONE,
 	WindowDefaultFlag::Modal,
 	_nested_network_ask_relay_widgets
@@ -2276,12 +2271,12 @@ static WindowDesc _network_ask_relay_desc(
  * @param relay_connection_string The relay server we want to connect to.
  * @param token The token for this connection.
  */
-void ShowNetworkAskRelay(const std::string &server_connection_string, const std::string &relay_connection_string, const std::string &token)
+void ShowNetworkAskRelay(std::string_view server_connection_string, std::string &&relay_connection_string, std::string &&token)
 {
 	CloseWindowByClass(WC_NETWORK_ASK_RELAY, NRWCD_HANDLED);
 
 	Window *parent = GetMainWindow();
-	new NetworkAskRelayWindow(_network_ask_relay_desc, parent, server_connection_string, relay_connection_string, token);
+	new NetworkAskRelayWindow(_network_ask_relay_desc, parent, server_connection_string, std::move(relay_connection_string), std::move(token));
 }
 
 /**
@@ -2309,7 +2304,7 @@ struct NetworkAskSurveyWindow : public Window {
 		}
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int, bool) override
 	{
 		/* Position query window over the calling window, ensuring it's within screen bounds. */
 		this->left = Clamp(parent->left + (parent->width / 2) - (this->width / 2), 0, _screen.width - this->width);
@@ -2321,7 +2316,7 @@ struct NetworkAskSurveyWindow : public Window {
 	{
 		switch (widget) {
 			case WID_NAS_PREVIEW:
-				ShowSurveyResultTextfileWindow();
+				ShowSurveyResultTextfileWindow(this);
 				break;
 
 			case WID_NAS_LINK:
@@ -2362,7 +2357,7 @@ static constexpr NWidgetPart _nested_network_ask_survey_widgets[] = {
 };
 
 static WindowDesc _network_ask_survey_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_NETWORK_ASK_SURVEY, WC_NONE,
 	WindowDefaultFlag::Modal,
 	_nested_network_ask_survey_widgets
@@ -2386,7 +2381,7 @@ void ShowNetworkAskSurvey()
 struct SurveyResultTextfileWindow : public TextfileWindow {
 	const GRFConfig *grf_config; ///< View the textfile of this GRFConfig.
 
-	SurveyResultTextfileWindow(TextfileType file_type) : TextfileWindow(file_type)
+	SurveyResultTextfileWindow(Window *parent, TextfileType file_type) : TextfileWindow(parent, file_type)
 	{
 		this->ConstructWindow();
 
@@ -2396,8 +2391,8 @@ struct SurveyResultTextfileWindow : public TextfileWindow {
 	}
 };
 
-void ShowSurveyResultTextfileWindow()
+void ShowSurveyResultTextfileWindow(Window *parent)
 {
-	CloseWindowById(WC_TEXTFILE, TFT_SURVEY_RESULT);
-	new SurveyResultTextfileWindow(TFT_SURVEY_RESULT);
+	parent->CloseChildWindowById(WC_TEXTFILE, TFT_SURVEY_RESULT);
+	new SurveyResultTextfileWindow(parent, TFT_SURVEY_RESULT);
 }
diff --git a/src/network/network_gui.h b/src/network/network_gui.h
index 30a476c696..a717db2f90 100644
--- a/src/network/network_gui.h
+++ b/src/network/network_gui.h
@@ -22,9 +22,9 @@ void ShowNetworkChatQueryWindow(DestType type, int dest);
 void ShowJoinStatusWindow();
 void ShowNetworkGameWindow();
 void ShowClientList();
-void ShowNetworkAskRelay(const std::string &server_connection_string, const std::string &relay_connection_string, const std::string &token);
+void ShowNetworkAskRelay(std::string_view server_connection_string, std::string &&relay_connection_string, std::string &&token);
 void ShowNetworkAskSurvey();
-void ShowSurveyResultTextfileWindow();
+void ShowSurveyResultTextfileWindow(Window *parent);
 
 /** Company information stored at the client side */
 struct NetworkCompanyInfo : NetworkCompanyStats {
diff --git a/src/network/network_internal.h b/src/network/network_internal.h
index 9d8873ca2b..f9e045d3f0 100644
--- a/src/network/network_internal.h
+++ b/src/network/network_internal.h
@@ -81,10 +81,10 @@ extern std::string _network_server_name;
 
 extern uint8_t _network_reconnect;
 
-void NetworkQueryServer(const std::string &connection_string);
+void NetworkQueryServer(std::string_view connection_string);
 
 void GetBindAddresses(NetworkAddressList *addresses, uint16_t port);
-struct NetworkGame *NetworkAddServer(const std::string &connection_string, bool manually = true, bool never_expire = false);
+struct NetworkGame *NetworkAddServer(std::string_view connection_string, bool manually = true, bool never_expire = false);
 void NetworkRebuildHostList();
 void UpdateNetworkGameWindow();
 
@@ -110,14 +110,14 @@ void NetworkSyncCommandQueue(NetworkClientSocket *cs);
 void NetworkReplaceCommandClientId(CommandPacket &cp, ClientID client_id);
 
 void ShowNetworkError(StringID error_string);
-void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const std::string &name, const std::string &str = "", StringParameter &&data = {});
+void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, std::string_view name, std::string_view str = {}, StringParameter &&data = {});
 uint NetworkCalculateLag(const NetworkClientSocket *cs);
 StringID GetNetworkErrorMsg(NetworkErrorCode err);
 bool NetworkMakeClientNameUnique(std::string &new_name);
 
-std::string_view ParseCompanyFromConnectionString(const std::string &connection_string, CompanyID *company_id);
-NetworkAddress ParseConnectionString(const std::string &connection_string, uint16_t default_port);
-std::string NormalizeConnectionString(const std::string &connection_string, uint16_t default_port);
+std::string_view ParseCompanyFromConnectionString(std::string_view connection_string, CompanyID *company_id);
+NetworkAddress ParseConnectionString(std::string_view connection_string, uint16_t default_port);
+std::string NormalizeConnectionString(std::string_view connection_string, uint16_t default_port);
 
 void ClientNetworkEmergencySave();
 
diff --git a/src/network/network_query.cpp b/src/network/network_query.cpp
index 82dab9e527..82421f09cf 100644
--- a/src/network/network_query.cpp
+++ b/src/network/network_query.cpp
@@ -8,12 +8,10 @@
 /** @file network_query.cpp Query part of the network protocol. */
 
 #include "../stdafx.h"
+
 #include "core/network_game_info.h"
 #include "network_query.h"
 #include "network_gamelist.h"
-#include "../error.h"
-
-#include "table/strings.h"
 
 #include "../safeguards.h"
 
diff --git a/src/network/network_query.h b/src/network/network_query.h
index 9a58a19573..8e33ef9ccb 100644
--- a/src/network/network_query.h
+++ b/src/network/network_query.h
@@ -36,14 +36,14 @@ public:
 	 * @param s The socket to connect with.
 	 * @param connection_string The connection string of the server.
 	 */
-	QueryNetworkGameSocketHandler(SOCKET s, const std::string &connection_string) : NetworkGameSocketHandler(s), connection_string(connection_string) {}
+	QueryNetworkGameSocketHandler(SOCKET s, std::string_view connection_string) : NetworkGameSocketHandler(s), connection_string(connection_string) {}
 
 	/**
 	 * Start to query a server based on an open socket.
 	 * @param s The socket to connect with.
 	 * @param connection_string The connection string of the server.
 	 */
-	static void QueryServer(SOCKET s, const std::string &connection_string)
+	static void QueryServer(SOCKET s, std::string_view connection_string)
 	{
 		auto query = std::make_unique<QueryNetworkGameSocketHandler>(s, connection_string);
 		query->SendGameInfo();
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 6247807a39..3087db360e 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -356,7 +356,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendGameInfo()
  * @param error The error to disconnect for.
  * @param reason In case of kicking a client, specifies the reason for kicking the client.
  */
-NetworkRecvStatus ServerNetworkGameSocketHandler::SendError(NetworkErrorCode error, const std::string &reason)
+NetworkRecvStatus ServerNetworkGameSocketHandler::SendError(NetworkErrorCode error, std::string_view reason)
 {
 	Debug(net, 9, "client[{}] SendError(): error={}", this->client_id, error);
 
@@ -677,7 +677,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendCommand(const CommandPacke
  * @param msg The actual message.
  * @param data Arbitrary extra data.
  */
-NetworkRecvStatus ServerNetworkGameSocketHandler::SendChat(NetworkAction action, ClientID client_id, bool self_send, const std::string &msg, int64_t data)
+NetworkRecvStatus ServerNetworkGameSocketHandler::SendChat(NetworkAction action, ClientID client_id, bool self_send, std::string_view msg, int64_t data)
 {
 	Debug(net, 9, "client[{}] SendChat(): action={}, client_id={}, self_send={}", this->client_id, action, client_id, self_send);
 
@@ -702,7 +702,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendChat(NetworkAction action,
  * @param user Name of the user who sent the message.
  * @param msg The actual message.
  */
-NetworkRecvStatus ServerNetworkGameSocketHandler::SendExternalChat(const std::string &source, TextColour colour, const std::string &user, const std::string &msg)
+NetworkRecvStatus ServerNetworkGameSocketHandler::SendExternalChat(std::string_view source, TextColour colour, std::string_view user, std::string_view msg)
 {
 	Debug(net, 9, "client[{}] SendExternalChat(): source={}", this->client_id, source);
 
@@ -778,7 +778,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendNewGame()
  * @param colour The colour of the result.
  * @param command The command that was executed.
  */
-NetworkRecvStatus ServerNetworkGameSocketHandler::SendRConResult(uint16_t colour, const std::string &command)
+NetworkRecvStatus ServerNetworkGameSocketHandler::SendRConResult(uint16_t colour, std::string_view command)
 {
 	Debug(net, 9, "client[{}] SendRConResult()", this->client_id);
 
@@ -1066,18 +1066,17 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_COMMAND(Packet
 	Debug(net, 9, "client[{}] Receive_CLIENT_COMMAND()", this->client_id);
 
 	CommandPacket cp;
-	const char *err = this->ReceiveCommand(p, cp);
+	auto err = this->ReceiveCommand(p, cp);
 
 	if (this->HasClientQuit()) return NETWORK_RECV_STATUS_CLIENT_QUIT;
 
 	NetworkClientInfo *ci = this->GetInfo();
 
-	if (err != nullptr) {
-		IConsolePrint(CC_WARNING, "Dropping client #{} (IP: {}) due to {}.", ci->client_id, this->GetClientIP(), err);
+	if (err.has_value()) {
+		IConsolePrint(CC_WARNING, "Dropping client #{} (IP: {}) due to {}.", ci->client_id, this->GetClientIP(), *err);
 		return this->SendError(NETWORK_ERROR_NOT_EXPECTED);
 	}
 
-
 	if (GetCommandFlags(cp.cmd).Test(CommandFlag::Server) && ci->client_id != CLIENT_ID_SERVER) {
 		IConsolePrint(CC_WARNING, "Kicking client #{} (IP: {}) due to calling a server only command {}.", ci->client_id, this->GetClientIP(), cp.cmd);
 		return this->SendError(NETWORK_ERROR_KICKED);
@@ -1250,7 +1249,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_ACK(Packet &p)
  * @param data Arbitrary data.
  * @param from_admin Whether the origin is an admin or not.
  */
-void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, const std::string &msg, ClientID from_id, int64_t data, bool from_admin)
+void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, std::string_view msg, ClientID from_id, int64_t data, bool from_admin)
 {
 	const NetworkClientInfo *ci, *ci_own, *ci_to;
 
@@ -1367,7 +1366,7 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co
  * @param user Name of the user who sent the message.
  * @param msg The actual message.
  */
-void NetworkServerSendExternalChat(const std::string &source, TextColour colour, const std::string &user, const std::string &msg)
+void NetworkServerSendExternalChat(std::string_view source, TextColour colour, std::string_view user, std::string_view msg)
 {
 	for (NetworkClientSocket *cs : NetworkClientSocket::Iterate()) {
 		if (cs->status >= ServerNetworkGameSocketHandler::STATUS_AUTHORIZED) cs->SendExternalChat(source, colour, user, msg);
@@ -1628,7 +1627,7 @@ bool NetworkMakeClientNameUnique(std::string &name)
 
 		if (!is_name_unique) {
 			/* Try a new name (<name> #1, <name> #2, and so on) */
-			name = original_name + " #" + std::to_string(number);
+			name = fmt::format("{} #{}", original_name, number);
 
 			/* The constructed client name is larger than the limit,
 			 * so... bail out as no valid name can be created. */
@@ -1814,7 +1813,7 @@ void NetworkServer_Tick(bool send_frame)
 static void NetworkRestartMap()
 {
 	_settings_newgame.game_creation.generation_seed = GENERATE_NEW_SEED;
-	switch (_file_to_saveload.abstract_ftype) {
+	switch (_file_to_saveload.ftype.abstract) {
 		case FT_SAVEGAME:
 		case FT_SCENARIO:
 			_switch_mode = SM_LOAD_GAME;
@@ -1865,14 +1864,14 @@ static void NetworkCheckRestartMapYear()
 }
 
 /** Calendar yearly "callback". Called whenever the calendar year changes. */
-static IntervalTimer<TimerGameCalendar> _calendar_network_yearly({ TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE }, [](auto) {
+static const IntervalTimer<TimerGameCalendar> _calendar_network_yearly({ TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE }, [](auto) {
 	if (!_network_server) return;
 
 	NetworkCheckRestartMapYear();
 });
 
 /** Economy yearly "callback". Called whenever the economy year changes. */
-static IntervalTimer<TimerGameEconomy> _economy_network_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_network_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::NONE}, [](auto)
 {
 	if (!_network_server) return;
 
@@ -1880,7 +1879,7 @@ static IntervalTimer<TimerGameEconomy> _economy_network_yearly({TimerGameEconomy
 });
 
 /** Quarterly "callback". Called whenever the economy quarter changes. */
-static IntervalTimer<TimerGameEconomy> _network_quarterly({TimerGameEconomy::QUARTER, TimerGameEconomy::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _network_quarterly({TimerGameEconomy::QUARTER, TimerGameEconomy::Priority::NONE}, [](auto)
 {
 	if (!_network_server) return;
 
@@ -1889,7 +1888,7 @@ static IntervalTimer<TimerGameEconomy> _network_quarterly({TimerGameEconomy::QUA
 });
 
 /** Economy monthly "callback". Called whenever the economy month changes. */
-static IntervalTimer<TimerGameEconomy> _network_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _network_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::NONE}, [](auto)
 {
 	if (!_network_server) return;
 
@@ -1898,7 +1897,7 @@ static IntervalTimer<TimerGameEconomy> _network_monthly({TimerGameEconomy::MONTH
 });
 
 /** Economy weekly "callback". Called whenever the economy week changes. */
-static IntervalTimer<TimerGameEconomy> _network_weekly({TimerGameEconomy::WEEK, TimerGameEconomy::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _network_weekly({TimerGameEconomy::WEEK, TimerGameEconomy::Priority::NONE}, [](auto)
 {
 	if (!_network_server) return;
 
@@ -1906,7 +1905,7 @@ static IntervalTimer<TimerGameEconomy> _network_weekly({TimerGameEconomy::WEEK,
 });
 
 /** Daily "callback". Called whenever the economy date changes. */
-static IntervalTimer<TimerGameEconomy> _economy_network_daily({TimerGameEconomy::DAY, TimerGameEconomy::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_network_daily({TimerGameEconomy::DAY, TimerGameEconomy::Priority::NONE}, [](auto)
 {
 	if (!_network_server) return;
 
@@ -1917,7 +1916,7 @@ static IntervalTimer<TimerGameEconomy> _economy_network_daily({TimerGameEconomy:
  * Get the IP address/hostname of the connected client.
  * @return The IP address.
  */
-const std::string &ServerNetworkGameSocketHandler::GetClientIP()
+std::string_view ServerNetworkGameSocketHandler::GetClientIP()
 {
 	return this->client_address.GetHostname();
 }
@@ -1925,7 +1924,7 @@ const std::string &ServerNetworkGameSocketHandler::GetClientIP()
 /** Show the status message of all clients on the console. */
 void NetworkServerShowStatusToConsole()
 {
-	static const char * const stat_str[] = {
+	static const std::string_view stat_str[] = {
 		"inactive",
 		"authorizing",
 		"identifying client",
@@ -1943,9 +1942,8 @@ void NetworkServerShowStatusToConsole()
 		NetworkClientInfo *ci = cs->GetInfo();
 		if (ci == nullptr) continue;
 		uint lag = NetworkCalculateLag(cs);
-		const char *status;
 
-		status = (cs->status < (ptrdiff_t)lengthof(stat_str) ? stat_str[cs->status] : "unknown");
+		std::string_view status = (cs->status < (ptrdiff_t)lengthof(stat_str) ? stat_str[cs->status] : "unknown");
 		IConsolePrint(CC_INFO, "Client #{}  name: '{}'  status: '{}'  frame-lag: {}  company: {}  IP: {}",
 			cs->client_id, ci->client_name, status, lag,
 			ci->client_playas + (Company::IsValidID(ci->client_playas) ? 1 : 0),
@@ -2018,7 +2016,7 @@ void NetworkServerDoMove(ClientID client_id, CompanyID company_id)
  * @param colour_code The colour of the text.
  * @param string The actual reply.
  */
-void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, const std::string &string)
+void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, std::string_view string)
 {
 	NetworkClientSocket::GetByClientID(client_id)->SendRConResult(colour_code, string);
 }
@@ -2028,7 +2026,7 @@ void NetworkServerSendRcon(ClientID client_id, TextColour colour_code, const std
  * @param client_id The client to kick.
  * @param reason In case of kicking a client, specifies the reason for kicking the client.
  */
-void NetworkServerKickClient(ClientID client_id, const std::string &reason)
+void NetworkServerKickClient(ClientID client_id, std::string_view reason)
 {
 	if (client_id == CLIENT_ID_SERVER) return;
 	NetworkClientSocket::GetByClientID(client_id)->SendError(NETWORK_ERROR_KICKED, reason);
@@ -2040,7 +2038,7 @@ void NetworkServerKickClient(ClientID client_id, const std::string &reason)
  * @param ban Whether to ban or kick.
  * @param reason In case of kicking a client, specifies the reason for kicking the client.
  */
-uint NetworkServerKickOrBanIP(ClientID client_id, bool ban, const std::string &reason)
+uint NetworkServerKickOrBanIP(ClientID client_id, bool ban, std::string_view reason)
 {
 	return NetworkServerKickOrBanIP(NetworkClientSocket::GetByClientID(client_id)->GetClientIP(), ban, reason);
 }
@@ -2051,7 +2049,7 @@ uint NetworkServerKickOrBanIP(ClientID client_id, bool ban, const std::string &r
  * @param ban Whether to ban or just kick.
  * @param reason In case of kicking a client, specifies the reason for kicking the client.
  */
-uint NetworkServerKickOrBanIP(const std::string &ip, bool ban, const std::string &reason)
+uint NetworkServerKickOrBanIP(std::string_view ip, bool ban, std::string_view reason)
 {
 	/* Add address to ban-list */
 	if (ban) {
diff --git a/src/network/network_server.h b/src/network/network_server.h
index cd5c48e0e9..7a4528dc30 100644
--- a/src/network/network_server.h
+++ b/src/network/network_server.h
@@ -89,13 +89,13 @@ public:
 	NetworkRecvStatus SendQuit(ClientID client_id);
 	NetworkRecvStatus SendShutdown();
 	NetworkRecvStatus SendNewGame();
-	NetworkRecvStatus SendRConResult(uint16_t colour, const std::string &command);
+	NetworkRecvStatus SendRConResult(uint16_t colour, std::string_view command);
 	NetworkRecvStatus SendMove(ClientID client_id, CompanyID company_id);
 
 	NetworkRecvStatus SendClientInfo(NetworkClientInfo *ci);
-	NetworkRecvStatus SendError(NetworkErrorCode error, const std::string &reason = {});
-	NetworkRecvStatus SendChat(NetworkAction action, ClientID client_id, bool self_send, const std::string &msg, int64_t data);
-	NetworkRecvStatus SendExternalChat(const std::string &source, TextColour colour, const std::string &user, const std::string &msg);
+	NetworkRecvStatus SendError(NetworkErrorCode error, std::string_view reason = {});
+	NetworkRecvStatus SendChat(NetworkAction action, ClientID client_id, bool self_send, std::string_view msg, int64_t data);
+	NetworkRecvStatus SendExternalChat(std::string_view source, TextColour colour, std::string_view user, std::string_view msg);
 	NetworkRecvStatus SendJoin(ClientID client_id);
 	NetworkRecvStatus SendFrame();
 	NetworkRecvStatus SendSync();
@@ -110,12 +110,12 @@ public:
 	 * Get the name used by the listener.
 	 * @return the name to show in debug logs and the like.
 	 */
-	static const char *GetName()
+	static std::string_view GetName()
 	{
 		return "server";
 	}
 
-	const std::string &GetClientIP();
+	std::string_view GetClientIP();
 	std::string_view GetPeerPublicKey() const { return this->peer_public_key; }
 
 	static ServerNetworkGameSocketHandler *GetByClientID(ClientID client_id);
diff --git a/src/network/network_stun.cpp b/src/network/network_stun.cpp
index 2acd438e56..9424ea0221 100644
--- a/src/network/network_stun.cpp
+++ b/src/network/network_stun.cpp
@@ -8,8 +8,8 @@
 /** @file network_stun.cpp STUN sending/receiving part of the network protocol. */
 
 #include "../stdafx.h"
+
 #include "../debug.h"
-#include "network.h"
 #include "network_coordinator.h"
 #include "network_stun.h"
 
@@ -28,7 +28,7 @@ public:
 	 * @param stun_handler The handler for this request.
 	 * @param connection_string The address of the server.
 	 */
-	NetworkStunConnecter(ClientNetworkStunSocketHandler *stun_handler, const std::string &connection_string, const std::string &token, uint8_t family) :
+	NetworkStunConnecter(ClientNetworkStunSocketHandler *stun_handler, std::string_view connection_string, std::string_view token, uint8_t family) :
 		TCPConnecter(connection_string, NETWORK_STUN_SERVER_PORT, NetworkAddress(), family),
 		stun_handler(stun_handler),
 		token(token),
@@ -70,7 +70,7 @@ public:
  * @param token The token as received from the Game Coordinator.
  * @param family What IP family to use.
  */
-void ClientNetworkStunSocketHandler::Connect(const std::string &token, uint8_t family)
+void ClientNetworkStunSocketHandler::Connect(std::string_view token, uint8_t family)
 {
 	this->token = token;
 	this->family = family;
@@ -86,7 +86,7 @@ void ClientNetworkStunSocketHandler::Connect(const std::string &token, uint8_t f
  * @param family What IP family this STUN request is for.
  * @return The handler for this STUN request.
  */
-std::unique_ptr<ClientNetworkStunSocketHandler> ClientNetworkStunSocketHandler::Stun(const std::string &token, uint8_t family)
+std::unique_ptr<ClientNetworkStunSocketHandler> ClientNetworkStunSocketHandler::Stun(std::string_view token, uint8_t family)
 {
 	auto stun_handler = std::make_unique<ClientNetworkStunSocketHandler>();
 
diff --git a/src/network/network_stun.h b/src/network/network_stun.h
index 3e0b9d6ef4..3903328412 100644
--- a/src/network/network_stun.h
+++ b/src/network/network_stun.h
@@ -27,9 +27,9 @@ public:
 	~ClientNetworkStunSocketHandler() override;
 	void SendReceive();
 
-	void Connect(const std::string &token, uint8_t family);
+	void Connect(std::string_view token, uint8_t family);
 
-	static std::unique_ptr<ClientNetworkStunSocketHandler> Stun(const std::string &token, uint8_t family);
+	static std::unique_ptr<ClientNetworkStunSocketHandler> Stun(std::string_view token, uint8_t family);
 };
 
 #endif /* NETWORK_STUN_H */
diff --git a/src/network/network_turn.cpp b/src/network/network_turn.cpp
index 02de66ab9e..6ba9211cf0 100644
--- a/src/network/network_turn.cpp
+++ b/src/network/network_turn.cpp
@@ -8,14 +8,11 @@
 /** @file network_turn.cpp TURN sending/receiving part of the network protocol. */
 
 #include "../stdafx.h"
+
 #include "../debug.h"
-#include "../error.h"
-#include "../strings_func.h"
 #include "network_coordinator.h"
 #include "network_turn.h"
 
-#include "table/strings.h"
-
 #include "../safeguards.h"
 
 /** Connect to the TURN server. */
@@ -28,7 +25,7 @@ public:
 	 * Initiate the connecting.
 	 * @param connection_string The address of the TURN server.
 	 */
-	NetworkTurnConnecter(ClientNetworkTurnSocketHandler *handler, const std::string &connection_string) : TCPConnecter(connection_string, NETWORK_TURN_SERVER_PORT), handler(handler) {}
+	NetworkTurnConnecter(ClientNetworkTurnSocketHandler *handler, std::string_view connection_string) : TCPConnecter(connection_string, NETWORK_TURN_SERVER_PORT), handler(handler) {}
 
 	void OnFailure() override
 	{
@@ -96,7 +93,7 @@ void ClientNetworkTurnSocketHandler::Connect()
  * @param connection_string Connection string of the TURN server.
  * @return The handler for this TURN connection.
  */
-/* static */ std::unique_ptr<ClientNetworkTurnSocketHandler> ClientNetworkTurnSocketHandler::Turn(const std::string &token, uint8_t tracking_number, const std::string &ticket, const std::string &connection_string)
+/* static */ std::unique_ptr<ClientNetworkTurnSocketHandler> ClientNetworkTurnSocketHandler::Turn(std::string_view token, uint8_t tracking_number, std::string_view ticket, std::string_view connection_string)
 {
 	auto turn_handler = std::make_unique<ClientNetworkTurnSocketHandler>(token, tracking_number, connection_string);
 
diff --git a/src/network/network_turn.h b/src/network/network_turn.h
index 961a961788..8ea994bd23 100644
--- a/src/network/network_turn.h
+++ b/src/network/network_turn.h
@@ -27,7 +27,7 @@ public:
 	std::shared_ptr<TCPConnecter> connecter{}; ///< Connecter instance.
 	bool connect_started = false;      ///< Whether we started the connection.
 
-	ClientNetworkTurnSocketHandler(const std::string &token, uint8_t tracking_number, const std::string &connection_string) : token(token), tracking_number(tracking_number), connection_string(connection_string) {}
+	ClientNetworkTurnSocketHandler(std::string_view token, uint8_t tracking_number, std::string_view connection_string) : token(token), tracking_number(tracking_number), connection_string(connection_string) {}
 
 	NetworkRecvStatus CloseConnection(bool error = true) override;
 	~ClientNetworkTurnSocketHandler() override;
@@ -36,7 +36,7 @@ public:
 	void Connect();
 	void ConnectFailure();
 
-	static std::unique_ptr<ClientNetworkTurnSocketHandler> Turn(const std::string &token, uint8_t tracking_number, const std::string &ticket, const std::string &connection_string);
+	static std::unique_ptr<ClientNetworkTurnSocketHandler> Turn(std::string_view token, uint8_t tracking_number, std::string_view ticket, std::string_view connection_string);
 };
 
 #endif /* NETWORK_TURN_H */
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 4b0edb0165..ed318b92d2 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -13,21 +13,10 @@
  */
 
 #include "../stdafx.h"
-#include "../timer/timer_game_calendar.h"
-#include "../map_func.h"
+
 #include "../debug.h"
-#include "core/network_game_info.h"
-#include "network_gamelist.h"
 #include "network_internal.h"
 #include "network_udp.h"
-#include "network.h"
-#include "../core/endian_func.hpp"
-#include "../company_base.h"
-#include "../rev.h"
-#include "../newgrf_text.h"
-#include "../strings_func.h"
-
-#include "table/strings.h"
 
 #include "core/udp.h"
 
@@ -58,7 +47,7 @@ struct UDPSocket {
 static UDPSocket _udp_client("Client"); ///< udp client socket
 static UDPSocket _udp_server("Server"); ///< udp server socket
 
-///*** Communication with clients (we are server) ***/
+/* Communication with clients (we are server) */
 
 /** Helper class for handling all server side communication. */
 class ServerNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
@@ -81,7 +70,7 @@ void ServerNetworkUDPSocketHandler::Receive_CLIENT_FIND_SERVER(Packet &, Network
 	Debug(net, 7, "Queried from {}", client_addr.GetHostname());
 }
 
-///*** Communication with servers (we are client) ***/
+/* Communication with servers (we are client) */
 
 /** Helper class for handling all client side communication. */
 class ClientNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 46c95a643d..c1d9904ad2 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -22,6 +22,7 @@
 #include "currency.h"
 #include "landscape.h"
 #include "newgrf_badge.h"
+#include "newgrf_badge_config.h"
 #include "newgrf_cargo.h"
 #include "newgrf_sound.h"
 #include "newgrf_station.h"
@@ -71,9 +72,9 @@ GrfMiscBits _misc_grf_features{};
 /** Indicates which are the newgrf features currently loaded ingame */
 GRFLoadedFeatures _loaded_newgrf_features;
 
-GrfProcessingState _cur;
+GrfProcessingState _cur_gps;
 
-ReferenceThroughBaseContainer<std::vector<GRFTempEngineData>> _gted;  ///< Temporary engine data used during NewGRF loading
+TypedIndexContainer<std::vector<GRFTempEngineData>, EngineID> _gted;  ///< Temporary engine data used during NewGRF loading
 
 /**
  * Debug() function dedicated to newGRF debugging messages
@@ -87,7 +88,11 @@ ReferenceThroughBaseContainer<std::vector<GRFTempEngineData>> _gted;  ///< Tempo
  */
 void GrfMsgI(int severity, const std::string &msg)
 {
-	Debug(grf, severity, "[{}:{}] {}", _cur.grfconfig->filename, _cur.nfo_line, msg);
+	if (_cur_gps.grfconfig == nullptr) {
+		Debug(grf, severity, "{}", msg);
+	} else {
+		Debug(grf, severity, "[{}:{}] {}", _cur_gps.grfconfig->filename, _cur_gps.nfo_line, msg);
+	}
 }
 
 /**
@@ -132,18 +137,18 @@ GRFError *DisableGrf(StringID message, GRFConfig *config)
 	if (config != nullptr) {
 		file = GetFileByGRFID(config->ident.grfid);
 	} else {
-		config = _cur.grfconfig;
-		file = _cur.grffile;
+		config = _cur_gps.grfconfig;
+		file = _cur_gps.grffile;
 	}
 
 	config->status = GCS_DISABLED;
 	if (file != nullptr) ClearTemporaryNewGRFData(file);
-	if (config == _cur.grfconfig) _cur.skip_sprites = -1;
+	if (config == _cur_gps.grfconfig) _cur_gps.skip_sprites = -1;
 
 	if (message == STR_NULL) return nullptr;
 
 	config->error = {STR_NEWGRF_ERROR_MSG_FATAL, message};
-	if (config == _cur.grfconfig) config->error->param_value[0] = _cur.nfo_line;
+	if (config == _cur_gps.grfconfig) config->error->param_value[0] = _cur_gps.nfo_line;
 	return &config->error.value();
 }
 
@@ -159,7 +164,7 @@ GRFError *DisableGrf(StringID message, GRFConfig *config)
 void DisableStaticNewGRFInfluencingNonStaticNewGRFs(GRFConfig &c)
 {
 	GRFError *error = DisableGrf(STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC, &c);
-	error->data = _cur.grfconfig->GetName();
+	error->data = _cur_gps.grfconfig->GetName();
 }
 
 static std::map<uint32_t, uint32_t> _grf_id_overrides;
@@ -186,7 +191,7 @@ void SetNewGRFOverride(uint32_t source_grfid, uint32_t target_grfid)
  */
 GRFFile *GetCurrentGRFOverride()
 {
-	auto found = _grf_id_overrides.find(_cur.grffile->grfid);
+	auto found = _grf_id_overrides.find(_cur_gps.grffile->grfid);
 	if (found != std::end(_grf_id_overrides)) {
 		GRFFile *grffile = GetFileByGRFID(found->second);
 		if (grffile != nullptr) return grffile;
@@ -306,7 +311,7 @@ CargoTypes TranslateRefitMask(uint32_t refit_mask)
 {
 	CargoTypes result = 0;
 	for (uint8_t bit : SetBitIterator(refit_mask)) {
-		CargoType cargo = GetCargoTranslation(bit, _cur.grffile, true);
+		CargoType cargo = GetCargoTranslation(bit, _cur_gps.grffile, true);
 		if (IsValidCargoType(cargo)) SetBit(result, cargo);
 	}
 	return result;
@@ -319,7 +324,7 @@ CargoTypes TranslateRefitMask(uint32_t refit_mask)
  * @param error_location Function name for grf error messages
  * @param[out] index If \a base_pointer is valid, \a index is assigned to the matching price; else it is left unchanged
  */
-void ConvertTTDBasePrice(uint32_t base_pointer, const char *error_location, Price *index)
+void ConvertTTDBasePrice(uint32_t base_pointer, std::string_view error_location, Price *index)
 {
 	/* Special value for 'none' */
 	if (base_pointer == 0) {
@@ -362,16 +367,17 @@ void ConvertTTDBasePrice(uint32_t base_pointer, const char *error_location, Pric
  */
 void GRFUnsafe(ByteReader &)
 {
-	_cur.grfconfig->flags.Set(GRFConfigFlag::Unsafe);
+	_cur_gps.grfconfig->flags.Set(GRFConfigFlag::Unsafe);
 
 	/* Skip remainder of GRF */
-	_cur.skip_sprites = -1;
+	_cur_gps.skip_sprites = -1;
 }
 
 /** Reset and clear all NewGRFs */
 static void ResetNewGRF()
 {
-	_cur.grffile = nullptr;
+	_cur_gps.grfconfig = nullptr;
+	_cur_gps.grffile = nullptr;
 	_grf_files.clear();
 
 	/* We store pointers to GRFFiles in many places, so need to ensure that the pointers do not become invalid
@@ -522,14 +528,14 @@ void ResetPersistentNewGRFData()
  */
 static void BuildCargoTranslationMap()
 {
-	_cur.grffile->cargo_map.fill(UINT8_MAX);
+	_cur_gps.grffile->cargo_map.fill(UINT8_MAX);
 
-	auto cargo_list = GetCargoTranslationTable(*_cur.grffile);
+	auto cargo_list = GetCargoTranslationTable(*_cur_gps.grffile);
 
 	for (const CargoSpec *cs : CargoSpec::Iterate()) {
 		/* Check the translation table for this cargo's label */
 		int idx = find_index(cargo_list, cs->label);
-		if (idx >= 0) _cur.grffile->cargo_map[cs->Index()] = idx;
+		if (idx >= 0) _cur_gps.grffile->cargo_map[cs->Index()] = idx;
 	}
 }
 
@@ -542,12 +548,12 @@ static void InitNewGRFFile(const GRFConfig &config)
 	GRFFile *newfile = GetFileByFilename(config.filename);
 	if (newfile != nullptr) {
 		/* We already loaded it once. */
-		_cur.grffile = newfile;
+		_cur_gps.grffile = newfile;
 		return;
 	}
 
 	assert(_grf_files.size() < _grf_files.capacity()); // We must not invalidate pointers.
-	_cur.grffile = &_grf_files.emplace_back(config);
+	_cur_gps.grffile = &_grf_files.emplace_back(config);
 }
 
 /**
@@ -904,7 +910,7 @@ static void FinaliseEngineArray()
 		}
 
 		if (e->info.variant_id != EngineID::Invalid()) {
-			Engine::Get(e->info.variant_id)->display_flags.Set(EngineDisplayFlag::HasVariants).Set(EngineDisplayFlag::IsFolded);
+			Engine::Get(e->info.variant_id)->display_flags.Set({EngineDisplayFlag::HasVariants, EngineDisplayFlag::IsFolded});
 		}
 	}
 }
@@ -940,40 +946,40 @@ void FinaliseCargoArray()
  * @param filename The filename of the newgrf this house was defined in.
  * @return Whether the given housespec is valid.
  */
-static bool IsHouseSpecValid(HouseSpec *hs, const HouseSpec *next1, const HouseSpec *next2, const HouseSpec *next3, const std::string &filename)
+static bool IsHouseSpecValid(HouseSpec &hs, const HouseSpec *next1, const HouseSpec *next2, const HouseSpec *next3, const std::string &filename)
 {
-	if ((hs->building_flags.Any(BUILDING_HAS_2_TILES) &&
+	if ((hs.building_flags.Any(BUILDING_HAS_2_TILES) &&
 				(next1 == nullptr || !next1->enabled || next1->building_flags.Any(BUILDING_HAS_1_TILE))) ||
-			(hs->building_flags.Any(BUILDING_HAS_4_TILES) &&
+			(hs.building_flags.Any(BUILDING_HAS_4_TILES) &&
 				(next2 == nullptr || !next2->enabled || next2->building_flags.Any(BUILDING_HAS_1_TILE) ||
 				next3 == nullptr || !next3->enabled || next3->building_flags.Any(BUILDING_HAS_1_TILE)))) {
-		hs->enabled = false;
-		if (!filename.empty()) Debug(grf, 1, "FinaliseHouseArray: {} defines house {} as multitile, but no suitable tiles follow. Disabling house.", filename, hs->grf_prop.local_id);
+		hs.enabled = false;
+		if (!filename.empty()) Debug(grf, 1, "FinaliseHouseArray: {} defines house {} as multitile, but no suitable tiles follow. Disabling house.", filename, hs.grf_prop.local_id);
 		return false;
 	}
 
 	/* Some places sum population by only counting north tiles. Other places use all tiles causing desyncs.
 	 * As the newgrf specs define population to be zero for non-north tiles, we just disable the offending house.
 	 * If you want to allow non-zero populations somewhen, make sure to sum the population of all tiles in all places. */
-	if ((hs->building_flags.Any(BUILDING_HAS_2_TILES) && next1->population != 0) ||
-			(hs->building_flags.Any(BUILDING_HAS_4_TILES) && (next2->population != 0 || next3->population != 0))) {
-		hs->enabled = false;
-		if (!filename.empty()) Debug(grf, 1, "FinaliseHouseArray: {} defines multitile house {} with non-zero population on additional tiles. Disabling house.", filename, hs->grf_prop.local_id);
+	if ((hs.building_flags.Any(BUILDING_HAS_2_TILES) && next1->population != 0) ||
+			(hs.building_flags.Any(BUILDING_HAS_4_TILES) && (next2->population != 0 || next3->population != 0))) {
+		hs.enabled = false;
+		if (!filename.empty()) Debug(grf, 1, "FinaliseHouseArray: {} defines multitile house {} with non-zero population on additional tiles. Disabling house.", filename, hs.grf_prop.local_id);
 		return false;
 	}
 
 	/* Substitute type is also used for override, and having an override with a different size causes crashes.
 	 * This check should only be done for NewGRF houses because grf_prop.subst_id is not set for original houses.*/
-	if (!filename.empty() && (hs->building_flags & BUILDING_HAS_1_TILE) != (HouseSpec::Get(hs->grf_prop.subst_id)->building_flags & BUILDING_HAS_1_TILE)) {
-		hs->enabled = false;
-		Debug(grf, 1, "FinaliseHouseArray: {} defines house {} with different house size then it's substitute type. Disabling house.", filename, hs->grf_prop.local_id);
+	if (!filename.empty() && (hs.building_flags & BUILDING_HAS_1_TILE) != (HouseSpec::Get(hs.grf_prop.subst_id)->building_flags & BUILDING_HAS_1_TILE)) {
+		hs.enabled = false;
+		Debug(grf, 1, "FinaliseHouseArray: {} defines house {} with different house size then it's substitute type. Disabling house.", filename, hs.grf_prop.local_id);
 		return false;
 	}
 
 	/* Make sure that additional parts of multitile houses are not available. */
-	if (!hs->building_flags.Any(BUILDING_HAS_1_TILE) && (hs->building_availability & HZ_ZONALL) != 0 && (hs->building_availability & HZ_CLIMALL) != 0) {
-		hs->enabled = false;
-		if (!filename.empty()) Debug(grf, 1, "FinaliseHouseArray: {} defines house {} without a size but marked it as available. Disabling house.", filename, hs->grf_prop.local_id);
+	if (!hs.building_flags.Any(BUILDING_HAS_1_TILE) && hs.building_availability.Any(HZ_ZONE_ALL) && hs.building_availability.Any(HZ_CLIMATE_ALL)) {
+		hs.enabled = false;
+		if (!filename.empty()) Debug(grf, 1, "FinaliseHouseArray: {} defines house {} without a size but marked it as available. Disabling house.", filename, hs.grf_prop.local_id);
 		return false;
 	}
 
@@ -992,7 +998,7 @@ static void EnsureEarlyHouse(HouseZones bitmask)
 
 	for (const auto &hs : HouseSpec::Specs()) {
 		if (!hs.enabled) continue;
-		if ((hs.building_availability & bitmask) != bitmask) continue;
+		if (!hs.building_availability.All(bitmask)) continue;
 		if (hs.min_year < min_year) min_year = hs.min_year;
 	}
 
@@ -1000,7 +1006,7 @@ static void EnsureEarlyHouse(HouseZones bitmask)
 
 	for (auto &hs : HouseSpec::Specs()) {
 		if (!hs.enabled) continue;
-		if ((hs.building_availability & bitmask) != bitmask) continue;
+		if (!hs.building_availability.All(bitmask)) continue;
 		if (hs.min_year == min_year) hs.min_year = CalendarTime::MIN_YEAR;
 	}
 }
@@ -1022,12 +1028,12 @@ static void FinaliseHouseArray()
 	 * On the other hand, why 1930? Just 'fix' the houses with the lowest
 	 * minimum introduction date to 0.
 	 */
-	for (const auto &file : _grf_files) {
+	for (auto &file : _grf_files) {
 		if (file.housespec.empty()) continue;
 
 		size_t num_houses = file.housespec.size();
 		for (size_t i = 0; i < num_houses; i++) {
-			HouseSpec *hs = file.housespec[i].get();
+			auto &hs = file.housespec[i];
 
 			if (hs == nullptr) continue;
 
@@ -1035,10 +1041,14 @@ static void FinaliseHouseArray()
 			const HouseSpec *next2 = (i + 2 < num_houses ? file.housespec[i + 2].get() : nullptr);
 			const HouseSpec *next3 = (i + 3 < num_houses ? file.housespec[i + 3].get() : nullptr);
 
-			if (!IsHouseSpecValid(hs, next1, next2, next3, file.filename)) continue;
+			if (!IsHouseSpecValid(*hs, next1, next2, next3, file.filename)) continue;
 
-			_house_mngr.SetEntitySpec(hs);
+			_house_mngr.SetEntitySpec(std::move(*hs));
 		}
+
+		/* Won't be used again */
+		file.housespec.clear();
+		file.housespec.shrink_to_fit();
 	}
 
 	for (size_t i = 0; i < HouseSpec::Specs().size(); i++) {
@@ -1049,7 +1059,7 @@ static void FinaliseHouseArray()
 
 		/* We need to check all houses again to we are sure that multitile houses
 		 * did get consecutive IDs and none of the parts are missing. */
-		if (!IsHouseSpecValid(hs, next1, next2, next3, std::string{})) {
+		if (!IsHouseSpecValid(*hs, next1, next2, next3, std::string{})) {
 			/* GetHouseNorthPart checks 3 houses that are directly before
 			 * it in the house pool. If any of those houses have multi-tile
 			 * flags set it assumes it's part of a multitile house. Since
@@ -1068,19 +1078,11 @@ static void FinaliseHouseArray()
 		}
 	}
 
-	HouseZones climate_mask = (HouseZones)(1 << (to_underlying(_settings_game.game_creation.landscape) + 12));
-	EnsureEarlyHouse(HZ_ZON1 | climate_mask);
-	EnsureEarlyHouse(HZ_ZON2 | climate_mask);
-	EnsureEarlyHouse(HZ_ZON3 | climate_mask);
-	EnsureEarlyHouse(HZ_ZON4 | climate_mask);
-	EnsureEarlyHouse(HZ_ZON5 | climate_mask);
-
-	if (_settings_game.game_creation.landscape == LandscapeType::Arctic) {
-		EnsureEarlyHouse(HZ_ZON1 | HZ_SUBARTC_ABOVE);
-		EnsureEarlyHouse(HZ_ZON2 | HZ_SUBARTC_ABOVE);
-		EnsureEarlyHouse(HZ_ZON3 | HZ_SUBARTC_ABOVE);
-		EnsureEarlyHouse(HZ_ZON4 | HZ_SUBARTC_ABOVE);
-		EnsureEarlyHouse(HZ_ZON5 | HZ_SUBARTC_ABOVE);
+	HouseZones climate_mask = GetClimateMaskForLandscape();
+	for (HouseZone climate : climate_mask) {
+		for (HouseZone zone : HZ_ZONE_ALL) {
+			EnsureEarlyHouse({climate, zone});
+		}
 	}
 }
 
@@ -1091,18 +1093,24 @@ static void FinaliseHouseArray()
  */
 static void FinaliseIndustriesArray()
 {
-	for (const auto &file : _grf_files) {
-		for (const auto &indsp : file.industryspec) {
+	for (auto &file : _grf_files) {
+		for (auto &indsp : file.industryspec) {
 			if (indsp == nullptr || !indsp->enabled) continue;
 
-			_industry_mngr.SetEntitySpec(indsp.get());
+			_industry_mngr.SetEntitySpec(std::move(*indsp));
 		}
 
-		for (const auto &indtsp : file.indtspec) {
+		for (auto &indtsp : file.indtspec) {
 			if (indtsp != nullptr) {
-				_industile_mngr.SetEntitySpec(indtsp.get());
+				_industile_mngr.SetEntitySpec(std::move(*indtsp));
 			}
 		}
+
+		/* Won't be used again */
+		file.industryspec.clear();
+		file.industryspec.shrink_to_fit();
+		file.indtspec.clear();
+		file.indtspec.shrink_to_fit();
 	}
 
 	for (auto &indsp : _industry_specs) {
@@ -1139,12 +1147,16 @@ static void FinaliseIndustriesArray()
  */
 static void FinaliseObjectsArray()
 {
-	for (const auto &file : _grf_files) {
+	for (auto &file : _grf_files) {
 		for (auto &objectspec : file.objectspec) {
 			if (objectspec != nullptr && objectspec->grf_prop.HasGrfFile() && objectspec->IsEnabled()) {
-				_object_mngr.SetEntitySpec(objectspec.get());
+				_object_mngr.SetEntitySpec(std::move(*objectspec));
 			}
 		}
+
+		/* Won't be used again */
+		file.objectspec.clear();
+		file.objectspec.shrink_to_fit();
 	}
 
 	ObjectSpec::BindToClasses();
@@ -1157,18 +1169,24 @@ static void FinaliseObjectsArray()
  */
 static void FinaliseAirportsArray()
 {
-	for (const auto &file : _grf_files) {
+	for (auto &file : _grf_files) {
 		for (auto &as : file.airportspec) {
 			if (as != nullptr && as->enabled) {
-				_airport_mngr.SetEntitySpec(as.get());
+				_airport_mngr.SetEntitySpec(std::move(*as));
 			}
 		}
 
 		for (auto &ats : file.airtspec) {
 			if (ats != nullptr && ats->enabled) {
-				_airporttile_mngr.SetEntitySpec(ats.get());
+				_airporttile_mngr.SetEntitySpec(std::move(*ats));
 			}
 		}
+
+		/* Won't be used again */
+		file.airportspec.clear();
+		file.airportspec.shrink_to_fit();
+		file.airtspec.clear();
+		file.airtspec.shrink_to_fit();
 	}
 }
 
@@ -1213,23 +1231,26 @@ struct InvokeGrfActionHandler {
  * XXX: We consider GRF files trusted. It would be trivial to exploit OTTD by
  * a crafted invalid GRF file. We should tell that to the user somehow, or
  * better make this more robust in the future. */
-static void DecodeSpecialSprite(uint8_t *buf, uint num, GrfLoadingStage stage)
+static void DecodeSpecialSprite(ReusableBuffer<uint8_t> &allocator, uint num, GrfLoadingStage stage)
 {
-	auto it = _grf_line_to_action6_sprite_override.find({_cur.grfconfig->ident.grfid, _cur.nfo_line});
+	uint8_t *buf;
+	auto it = _grf_line_to_action6_sprite_override.find({_cur_gps.grfconfig->ident.grfid, _cur_gps.nfo_line});
 	if (it == _grf_line_to_action6_sprite_override.end()) {
 		/* No preloaded sprite to work with; read the
 		 * pseudo sprite content. */
-		_cur.file->ReadBlock(buf, num);
+		buf = allocator.Allocate(num);
+		_cur_gps.file->ReadBlock(buf, num);
 	} else {
 		/* Use the preloaded sprite data. */
 		buf = it->second.data();
+		assert(it->second.size() == num);
 		GrfMsg(7, "DecodeSpecialSprite: Using preloaded pseudo sprite data");
 
 		/* Skip the real (original) content of this action. */
-		_cur.file->SeekTo(num, SEEK_CUR);
+		_cur_gps.file->SeekTo(num, SEEK_CUR);
 	}
 
-	ByteReader br(buf, buf + num);
+	ByteReader br(buf, num);
 
 	try {
 		uint8_t action = br.ReadByte();
@@ -1255,8 +1276,8 @@ static void DecodeSpecialSprite(uint8_t *buf, uint num, GrfLoadingStage stage)
  */
 static void LoadNewGRFFileFromFile(GRFConfig &config, GrfLoadingStage stage, SpriteFile &file)
 {
-	AutoRestoreBackup cur_file(_cur.file, &file);
-	AutoRestoreBackup cur_config(_cur.grfconfig, &config);
+	AutoRestoreBackup cur_file(_cur_gps.file, &file);
+	AutoRestoreBackup cur_config(_cur_gps.grfconfig, &config);
 
 	Debug(grf, 2, "LoadNewGRFFile: Reading NewGRF-file '{}'", config.filename);
 
@@ -1295,16 +1316,16 @@ static void LoadNewGRFFileFromFile(GRFConfig &config, GrfLoadingStage stage, Spr
 		return;
 	}
 
-	_cur.ClearDataForNextFile();
+	_cur_gps.ClearDataForNextFile();
 
-	ReusableBuffer<uint8_t> buf;
+	ReusableBuffer<uint8_t> allocator;
 
 	while ((num = (grf_container_version >= 2 ? file.ReadDword() : file.ReadWord())) != 0) {
 		uint8_t type = file.ReadByte();
-		_cur.nfo_line++;
+		_cur_gps.nfo_line++;
 
 		if (type == 0xFF) {
-			if (_cur.skip_sprites == 0) {
+			if (_cur_gps.skip_sprites == 0) {
 				/* Limit the special sprites to 1 MiB. */
 				if (num > 1024 * 1024) {
 					GrfMsg(0, "LoadNewGRFFile: Unexpectedly large sprite, disabling");
@@ -1312,17 +1333,17 @@ static void LoadNewGRFFileFromFile(GRFConfig &config, GrfLoadingStage stage, Spr
 					break;
 				}
 
-				DecodeSpecialSprite(buf.Allocate(num), num, stage);
+				DecodeSpecialSprite(allocator, num, stage);
 
 				/* Stop all processing if we are to skip the remaining sprites */
-				if (_cur.skip_sprites == -1) break;
+				if (_cur_gps.skip_sprites == -1) break;
 
 				continue;
 			} else {
 				file.SkipBytes(num);
 			}
 		} else {
-			if (_cur.skip_sprites == 0) {
+			if (_cur_gps.skip_sprites == 0) {
 				GrfMsg(0, "LoadNewGRFFile: Unexpected sprite, disabling");
 				DisableGrf(STR_NEWGRF_ERROR_UNEXPECTED_SPRITE);
 				break;
@@ -1337,7 +1358,7 @@ static void LoadNewGRFFileFromFile(GRFConfig &config, GrfLoadingStage stage, Spr
 			}
 		}
 
-		if (_cur.skip_sprites > 0) _cur.skip_sprites--;
+		if (_cur_gps.skip_sprites > 0) _cur_gps.skip_sprites--;
 	}
 }
 
@@ -1363,8 +1384,8 @@ void LoadNewGRFFile(GRFConfig &config, GrfLoadingStage stage, Subdirectory subdi
 	 * carried out.  All others are ignored, because they only need to be
 	 * processed once at initialization.  */
 	if (stage != GLS_FILESCAN && stage != GLS_SAFETYSCAN && stage != GLS_LABELSCAN) {
-		_cur.grffile = GetFileByFilename(filename);
-		if (_cur.grffile == nullptr) UserError("File '{}' lost in cache.\n", filename);
+		_cur_gps.grffile = GetFileByFilename(filename);
+		if (_cur_gps.grffile == nullptr) UserError("File '{}' lost in cache.\n", filename);
 		if (stage == GLS_RESERVE && config.status != GCS_INITIALISED) return;
 		if (stage == GLS_ACTIVATION && !config.flags.Test(GRFConfigFlag::Reserved)) return;
 	}
@@ -1441,7 +1462,7 @@ static void FinalisePriceBaseMultipliers()
 {
 	extern const PriceBaseSpec _price_base_specs[];
 	/** Features, to which '_grf_id_overrides' applies. Currently vehicle features only. */
-	static const uint32_t override_features = (1 << GSF_TRAINS) | (1 << GSF_ROADVEHICLES) | (1 << GSF_SHIPS) | (1 << GSF_AIRCRAFT);
+	static constexpr GrfSpecFeatures override_features{GSF_TRAINS, GSF_ROADVEHICLES, GSF_SHIPS, GSF_AIRCRAFT};
 
 	/* Evaluate grf overrides */
 	int num_grfs = (uint)_grf_files.size();
@@ -1465,13 +1486,13 @@ static void FinalisePriceBaseMultipliers()
 		GRFFile &source = _grf_files[i];
 		GRFFile &dest = _grf_files[grf_overrides[i]];
 
-		uint32_t features = (source.grf_features | dest.grf_features) & override_features;
-		source.grf_features |= features;
-		dest.grf_features |= features;
+		GrfSpecFeatures features = (source.grf_features | dest.grf_features) & override_features;
+		source.grf_features.Set(features);
+		dest.grf_features.Set(features);
 
 		for (Price p = PR_BEGIN; p < PR_END; p++) {
 			/* No price defined -> nothing to do */
-			if (!HasBit(features, _price_base_specs[p].grf_feature) || source.price_base_multipliers[p] == INVALID_PRICE_MODIFIER) continue;
+			if (!features.Test(_price_base_specs[p].grf_feature) || source.price_base_multipliers[p] == INVALID_PRICE_MODIFIER) continue;
 			Debug(grf, 3, "'{}' overrides price base multiplier {} of '{}'", source.filename, p, dest.filename);
 			dest.price_base_multipliers[p] = source.price_base_multipliers[p];
 		}
@@ -1483,13 +1504,13 @@ static void FinalisePriceBaseMultipliers()
 		GRFFile &source = _grf_files[i];
 		GRFFile &dest = _grf_files[grf_overrides[i]];
 
-		uint32_t features = (source.grf_features | dest.grf_features) & override_features;
-		source.grf_features |= features;
-		dest.grf_features |= features;
+		GrfSpecFeatures features = (source.grf_features | dest.grf_features) & override_features;
+		source.grf_features.Set(features);
+		dest.grf_features.Set(features);
 
 		for (Price p = PR_BEGIN; p < PR_END; p++) {
 			/* Already a price defined -> nothing to do */
-			if (!HasBit(features, _price_base_specs[p].grf_feature) || dest.price_base_multipliers[p] != INVALID_PRICE_MODIFIER) continue;
+			if (!features.Test(_price_base_specs[p].grf_feature) || dest.price_base_multipliers[p] != INVALID_PRICE_MODIFIER) continue;
 			Debug(grf, 3, "Price base multiplier {} from '{}' propagated to '{}'", p, source.filename, dest.filename);
 			dest.price_base_multipliers[p] = source.price_base_multipliers[p];
 		}
@@ -1501,12 +1522,12 @@ static void FinalisePriceBaseMultipliers()
 		GRFFile &source = _grf_files[i];
 		GRFFile &dest = _grf_files[grf_overrides[i]];
 
-		uint32_t features = (source.grf_features | dest.grf_features) & override_features;
-		source.grf_features |= features;
-		dest.grf_features |= features;
+		GrfSpecFeatures features = (source.grf_features | dest.grf_features) & override_features;
+		source.grf_features.Set(features);
+		dest.grf_features.Set(features);
 
 		for (Price p = PR_BEGIN; p < PR_END; p++) {
-			if (!HasBit(features, _price_base_specs[p].grf_feature)) continue;
+			if (!features.Test(_price_base_specs[p].grf_feature)) continue;
 			if (source.price_base_multipliers[p] != dest.price_base_multipliers[p]) {
 				Debug(grf, 3, "Price base multiplier {} from '{}' propagated to '{}'", p, dest.filename, source.filename);
 			}
@@ -1536,7 +1557,7 @@ static void FinalisePriceBaseMultipliers()
 				/* No multiplier was set; set it to a neutral value */
 				price_base_multipliers[p] = 0;
 			} else {
-				if (!HasBit(file.grf_features, _price_base_specs[p].grf_feature)) {
+				if (!file.grf_features.Test(_price_base_specs[p].grf_feature)) {
 					/* The grf does not define any objects of the feature,
 					 * so it must be a difficulty setting. Apply it globally */
 					Debug(grf, 3, "'{}' sets global price base multiplier {}", file.filename, p);
@@ -1584,6 +1605,7 @@ static void FinaliseBadges()
 	}
 
 	ApplyBadgeFeaturesToClassBadges();
+	AddBadgeClassesToConfiguration();
 }
 
 extern void InitGRFTownGeneratorNames();
@@ -1755,7 +1777,7 @@ void LoadNewGRF(SpriteID load_index, uint num_baseset)
 		if (c->status != GCS_NOT_FOUND) c->status = GCS_UNKNOWN;
 	}
 
-	_cur.spriteid = load_index;
+	_cur_gps.spriteid = load_index;
 
 	/* Load newgrf sprites
 	 * in each loading stage, (try to) open each file specified in the config
@@ -1781,7 +1803,7 @@ void LoadNewGRF(SpriteID load_index, uint num_baseset)
 		uint num_grfs = 0;
 		uint num_non_static = 0;
 
-		_cur.stage = stage;
+		_cur_gps.stage = stage;
 		for (const auto &c : _grfconfig) {
 			if (c->status == GCS_DISABLED || c->status == GCS_NOT_FOUND) continue;
 			if (stage > GLS_INIT && c->flags.Test(GRFConfigFlag::InitOnly)) continue;
@@ -1812,19 +1834,23 @@ void LoadNewGRF(SpriteID load_index, uint num_baseset)
 				c->flags.Set(GRFConfigFlag::Reserved);
 			} else if (stage == GLS_ACTIVATION) {
 				c->flags.Reset(GRFConfigFlag::Reserved);
-				assert(GetFileByGRFID(c->ident.grfid) == _cur.grffile);
-				ClearTemporaryNewGRFData(_cur.grffile);
+				assert(GetFileByGRFID(c->ident.grfid) == _cur_gps.grffile);
+				ClearTemporaryNewGRFData(_cur_gps.grffile);
 				BuildCargoTranslationMap();
-				Debug(sprite, 2, "LoadNewGRF: Currently {} sprites are loaded", _cur.spriteid);
+				Debug(sprite, 2, "LoadNewGRF: Currently {} sprites are loaded", _cur_gps.spriteid);
 			} else if (stage == GLS_INIT && c->flags.Test(GRFConfigFlag::InitOnly)) {
 				/* We're not going to activate this, so free whatever data we allocated */
-				ClearTemporaryNewGRFData(_cur.grffile);
+				ClearTemporaryNewGRFData(_cur_gps.grffile);
 			}
 		}
 	}
 
+	/* We've finished reading files. */
+	_cur_gps.grfconfig = nullptr;
+	_cur_gps.grffile = nullptr;
+
 	/* Pseudo sprite processing is finished; free temporary stuff */
-	_cur.ClearDataForNextFile();
+	_cur_gps.ClearDataForNextFile();
 
 	/* Call any functions that should be run after GRFs have been loaded. */
 	AfterLoadGRFs();
diff --git a/src/newgrf.h b/src/newgrf.h
index a04dcf71c4..beb5a0ed4f 100644
--- a/src/newgrf.h
+++ b/src/newgrf.h
@@ -18,7 +18,6 @@
 #include "newgrf_callbacks.h"
 #include "newgrf_text_type.h"
 #include "core/bitmath_func.hpp"
-#include "core/mem_func.hpp"
 
 /**
  * List of different canal 'features'.
@@ -92,9 +91,12 @@ enum GrfSpecFeature : uint8_t {
 	GSF_BADGES,
 	GSF_END,
 
+	GSF_DEFAULT = GSF_END, ///< Unspecified feature, default badge
 	GSF_FAKE_TOWNS = GSF_END, ///< Fake town GrfSpecFeature for NewGRF debugging (parent scope)
 	GSF_FAKE_END,             ///< End of the fake features
 
+	GSF_ORIGINAL_STRINGS = 0x48,
+
 	GSF_INVALID = 0xFF,       ///< An invalid spec feature
 };
 using GrfSpecFeatures = EnumBitSet<GrfSpecFeature, uint32_t, GrfSpecFeature::GSF_END>;
@@ -153,7 +155,7 @@ struct GRFFile {
 	int traininfo_vehicle_pitch = 0; ///< Vertical offset for drawing train images in depot GUI and vehicle details
 	uint traininfo_vehicle_width = 0; ///< Width (in pixels) of a 8/8 train vehicle in depot GUI and vehicle details
 
-	uint32_t grf_features = 0; ///< Bitset of GrfSpecFeature the grf uses
+	GrfSpecFeatures grf_features{}; ///< Bitset of GrfSpecFeature the grf uses
 	PriceMultipliers price_base_multipliers{}; ///< Price base multipliers as set by the grf.
 
 	GRFFile(const struct GRFConfig &config);
@@ -190,6 +192,16 @@ struct GRFLoadedFeatures {
 	TramReplacement tram;     ///< In which way tram depots were replaced.
 };
 
+/**
+ * Describes properties of price bases.
+ */
+struct PriceBaseSpec {
+	Money start_price; ///< Default value at game start, before adding multipliers.
+	PriceCategory category; ///< Price is affected by certain difficulty settings.
+	GrfSpecFeature grf_feature; ///< GRF Feature that decides whether price multipliers apply locally or globally, #GSF_END if none.
+	Price fallback_price; ///< Fallback price multiplier for new prices but old grfs.
+};
+
 /**
  * Check for grf miscellaneous bits
  * @param bit The bit to check.
diff --git a/src/newgrf/newgrf_act0.cpp b/src/newgrf/newgrf_act0.cpp
index 9f13c1e478..815c099c8d 100644
--- a/src/newgrf/newgrf_act0.cpp
+++ b/src/newgrf/newgrf_act0.cpp
@@ -19,7 +19,7 @@
 #include "newgrf_bytereader.h"
 #include "newgrf_internal.h"
 
-#include "../table/strings.h"
+#include "table/strings.h"
 
 #include "../safeguards.h"
 
@@ -92,12 +92,12 @@ std::vector<BadgeID> ReadBadgeList(ByteReader &buf, GrfSpecFeature feature)
 
 	while (count-- > 0) {
 		uint16_t local_index = buf.ReadWord();
-		if (local_index >= std::size(_cur.grffile->badge_list)) {
-			GrfMsg(1, "ReadBadgeList: Badge label {} out of range (max {}), skipping.", local_index, std::size(_cur.grffile->badge_list) - 1);
+		if (local_index >= std::size(_cur_gps.grffile->badge_list)) {
+			GrfMsg(1, "ReadBadgeList: Badge label {} out of range (max {}), skipping.", local_index, std::size(_cur_gps.grffile->badge_list) - 1);
 			continue;
 		}
 
-		BadgeID index = _cur.grffile->badge_list[local_index];
+		BadgeID index = _cur_gps.grffile->badge_list[local_index];
 
 		/* Is badge already present? */
 		if (std::ranges::find(badges, index) != std::end(badges)) continue;
@@ -109,7 +109,7 @@ std::vector<BadgeID> ReadBadgeList(ByteReader &buf, GrfSpecFeature feature)
 	return badges;
 }
 
-bool HandleChangeInfoResult(const char *caller, ChangeInfoResult cir, uint8_t feature, uint8_t property)
+bool HandleChangeInfoResult(std::string_view caller, ChangeInfoResult cir, GrfSpecFeature feature, uint8_t property)
 {
 	switch (cir) {
 		default: NOT_REACHED();
@@ -204,7 +204,7 @@ static void FeatureChangeInfo(ByteReader &buf)
 	}
 
 	/* Mark the feature as used by the grf */
-	SetBit(_cur.grffile->grf_features, feature);
+	_cur_gps.grffile->grf_features.Set(feature);
 
 	while (numprops-- && buf.HasData()) {
 		uint8_t prop = buf.ReadByte();
diff --git a/src/newgrf/newgrf_act0_aircraft.cpp b/src/newgrf/newgrf_act0_aircraft.cpp
index 922d0b6e07..d246544784 100644
--- a/src/newgrf/newgrf_act0_aircraft.cpp
+++ b/src/newgrf/newgrf_act0_aircraft.cpp
@@ -31,7 +31,7 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint first, uint last, int pro
 	ChangeInfoResult ret = CIR_SUCCESS;
 
 	for (uint id = first; id < last; ++id) {
-		Engine *e = GetNewEngine(_cur.grffile, VEH_AIRCRAFT, id);
+		Engine *e = GetNewEngine(_cur_gps.grffile, VEH_AIRCRAFT, id);
 		if (e == nullptr) return CIR_INVALID_ID; // No engine could be allocated, so neither can any next vehicles
 
 		EngineInfo *ei = &e->info;
@@ -43,9 +43,9 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint first, uint last, int pro
 				uint8_t orig_spriteid = spriteid;
 
 				/* aircraft have different custom id in the GRF file */
-				if (spriteid == 0xFF) spriteid = 0xFD;
+				if (spriteid == 0xFF) spriteid = CUSTOM_VEHICLE_SPRITENUM;
 
-				if (spriteid < 0xFD) spriteid >>= 1;
+				if (spriteid < CUSTOM_VEHICLE_SPRITENUM) spriteid >>= 1;
 
 				if (IsValidNewGRFImageIndex<VEH_AIRCRAFT>(spriteid)) {
 					avi->image_index = spriteid;
@@ -93,14 +93,14 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint first, uint last, int pro
 				break;
 
 			case 0x12: // SFX
-				avi->sfx = GetNewGRFSoundID(_cur.grffile, buf.ReadByte());
+				avi->sfx = GetNewGRFSoundID(_cur_gps.grffile, buf.ReadByte());
 				break;
 
 			case 0x13: { // Cargoes available for refitting
 				uint32_t mask = buf.ReadDWord();
 				_gted[e->index].UpdateRefittability(mask != 0);
 				ei->refit_mask = TranslateRefitMask(mask);
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 			}
 
@@ -127,7 +127,7 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint first, uint last, int pro
 			case 0x18: // Cargo classes allowed
 				_gted[e->index].cargo_allowed = CargoClasses{buf.ReadWord()};
 				_gted[e->index].UpdateRefittability(_gted[e->index].cargo_allowed.Any());
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 
 			case 0x19: // Cargo classes disallowed
@@ -151,11 +151,11 @@ static ChangeInfoResult AircraftVehicleChangeInfo(uint first, uint last, int pro
 			case 0x1E: { // CTT refit exclude list
 				uint8_t count = buf.ReadByte();
 				_gted[e->index].UpdateRefittability(prop == 0x1D && count != 0);
-				if (prop == 0x1D) _gted[e->index].defaultcargo_grf = _cur.grffile;
+				if (prop == 0x1D) _gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				CargoTypes &ctt = prop == 0x1D ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
 				ctt = 0;
 				while (count--) {
-					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
 				}
 				break;
diff --git a/src/newgrf/newgrf_act0_airports.cpp b/src/newgrf/newgrf_act0_airports.cpp
index e70a165f15..62c0f4c61b 100644
--- a/src/newgrf/newgrf_act0_airports.cpp
+++ b/src/newgrf/newgrf_act0_airports.cpp
@@ -35,10 +35,10 @@ static ChangeInfoResult AirportChangeInfo(uint first, uint last, int prop, ByteR
 	}
 
 	/* Allocate industry specs if they haven't been allocated already. */
-	if (_cur.grffile->airportspec.size() < last) _cur.grffile->airportspec.resize(last);
+	if (_cur_gps.grffile->airportspec.size() < last) _cur_gps.grffile->airportspec.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &as = _cur.grffile->airportspec[id];
+		auto &as = _cur_gps.grffile->airportspec[id];
 
 		if (as == nullptr && prop != 0x08 && prop != 0x09) {
 			GrfMsg(2, "AirportChangeInfo: Attempt to modify undefined airport {}, ignoring", id);
@@ -68,9 +68,9 @@ static ChangeInfoResult AirportChangeInfo(uint first, uint last, int prop, ByteR
 					as->enabled = true;
 					as->grf_prop.local_id = id;
 					as->grf_prop.subst_id = subs_id;
-					as->grf_prop.SetGRFFile(_cur.grffile);
+					as->grf_prop.SetGRFFile(_cur_gps.grffile);
 					/* override the default airport */
-					_airport_mngr.Add(id, _cur.grffile->grfid, subs_id);
+					_airport_mngr.Add(id, _cur_gps.grffile->grfid, subs_id);
 				}
 				break;
 			}
@@ -93,10 +93,8 @@ static ChangeInfoResult AirportChangeInfo(uint first, uint last, int prop, ByteR
 						tile.ti.x = buf.ReadByte();
 						tile.ti.y = buf.ReadByte();
 						if (tile.ti.x == 0 && tile.ti.y == 0x80) {
-							/* Convert terminator to our own. */
-							tile.ti.x = -0x80;
-							tile.ti.y = 0;
-							tile.gfx = 0;
+							/* Terminator, remove and finish up. */
+							layout.tiles.pop_back();
 							break;
 						}
 
@@ -107,7 +105,7 @@ static ChangeInfoResult AirportChangeInfo(uint first, uint last, int prop, ByteR
 							int local_tile_id = buf.ReadWord();
 
 							/* Read the ID from the _airporttile_mngr. */
-							uint16_t tempid = _airporttile_mngr.GetID(local_tile_id, _cur.grffile->grfid);
+							uint16_t tempid = _airporttile_mngr.GetID(local_tile_id, _cur_gps.grffile->grfid);
 
 							if (tempid == INVALID_AIRPORTTILE) {
 								GrfMsg(2, "AirportChangeInfo: Attempt to use airport tile {} with airport id {}, not yet defined. Ignoring.", local_tile_id, id);
@@ -185,10 +183,10 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop,
 	}
 
 	/* Allocate airport tile specs if they haven't been allocated already. */
-	if (_cur.grffile->airtspec.size() < last) _cur.grffile->airtspec.resize(last);
+	if (_cur_gps.grffile->airtspec.size() < last) _cur_gps.grffile->airtspec.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &tsp = _cur.grffile->airtspec[id];
+		auto &tsp = _cur_gps.grffile->airtspec[id];
 
 		if (prop != 0x08 && tsp == nullptr) {
 			GrfMsg(2, "AirportTileChangeInfo: Attempt to modify undefined airport tile {}. Ignoring.", id);
@@ -210,12 +208,12 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop,
 
 					tsp->enabled = true;
 
-					tsp->animation.status = ANIM_STATUS_NO_ANIMATION;
+					tsp->animation = {};
 
 					tsp->grf_prop.local_id = id;
 					tsp->grf_prop.subst_id = subs_id;
-					tsp->grf_prop.SetGRFFile(_cur.grffile);
-					_airporttile_mngr.AddEntityID(id, _cur.grffile->grfid, subs_id); // pre-reserve the tile slot
+					tsp->grf_prop.SetGRFFile(_cur_gps.grffile);
+					_airporttile_mngr.AddEntityID(id, _cur_gps.grffile->grfid, subs_id); // pre-reserve the tile slot
 				}
 				break;
 			}
@@ -229,7 +227,7 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop,
 					continue;
 				}
 
-				_airporttile_mngr.Add(id, _cur.grffile->grfid, override_id);
+				_airporttile_mngr.Add(id, _cur_gps.grffile->grfid, override_id);
 				break;
 			}
 
@@ -239,7 +237,7 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop,
 
 			case 0x0F: // Animation information
 				tsp->animation.frames = buf.ReadByte();
-				tsp->animation.status = buf.ReadByte();
+				tsp->animation.status = static_cast<AnimationStatus>(buf.ReadByte());
 				break;
 
 			case 0x10: // Animation speed
@@ -247,7 +245,7 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop,
 				break;
 
 			case 0x11: // Animation triggers
-				tsp->animation.triggers = buf.ReadByte();
+				tsp->animation.triggers = static_cast<AirportAnimationTriggers>(buf.ReadByte());
 				break;
 
 			case 0x12: // Badge list
diff --git a/src/newgrf/newgrf_act0_badges.cpp b/src/newgrf/newgrf_act0_badges.cpp
index 3945e802e2..823cf0e0d5 100644
--- a/src/newgrf/newgrf_act0_badges.cpp
+++ b/src/newgrf/newgrf_act0_badges.cpp
@@ -26,8 +26,8 @@ static ChangeInfoResult BadgeChangeInfo(uint first, uint last, int prop, ByteRea
 	}
 
 	for (uint id = first; id < last; ++id) {
-		auto it = _cur.grffile->badge_map.find(id);
-		if (prop != 0x08 && it == std::end(_cur.grffile->badge_map)) {
+		auto it = _cur_gps.grffile->badge_map.find(id);
+		if (prop != 0x08 && it == std::end(_cur_gps.grffile->badge_map)) {
 			GrfMsg(1, "BadgeChangeInfo: Attempt to modify undefined tag {}, ignoring", id);
 			return CIR_INVALID_ID;
 		}
@@ -38,7 +38,7 @@ static ChangeInfoResult BadgeChangeInfo(uint first, uint last, int prop, ByteRea
 		switch (prop) {
 			case 0x08: { // Label
 				std::string_view label = buf.ReadString();
-				_cur.grffile->badge_map[id] = GetOrCreateBadge(label).index;
+				_cur_gps.grffile->badge_map[id] = GetOrCreateBadge(label).index;
 				break;
 			}
 
diff --git a/src/newgrf/newgrf_act0_canals.cpp b/src/newgrf/newgrf_act0_canals.cpp
index 38d32cdc02..b48c8af3f7 100644
--- a/src/newgrf/newgrf_act0_canals.cpp
+++ b/src/newgrf/newgrf_act0_canals.cpp
@@ -32,7 +32,7 @@ static ChangeInfoResult CanalChangeInfo(uint first, uint last, int prop, ByteRea
 	}
 
 	for (uint id = first; id < last; ++id) {
-		CanalProperties *cp = &_cur.grffile->canal_local_properties[id];
+		CanalProperties *cp = &_cur_gps.grffile->canal_local_properties[id];
 
 		switch (prop) {
 			case 0x08:
diff --git a/src/newgrf/newgrf_act0_cargo.cpp b/src/newgrf/newgrf_act0_cargo.cpp
index db111dda06..c5794a2874 100644
--- a/src/newgrf/newgrf_act0_cargo.cpp
+++ b/src/newgrf/newgrf_act0_cargo.cpp
@@ -40,7 +40,7 @@ static ChangeInfoResult CargoReserveInfo(uint first, uint last, int prop, ByteRe
 			case 0x08: // Bit number of cargo
 				cs->bitnum = buf.ReadByte();
 				if (cs->IsValid()) {
-					cs->grffile = _cur.grffile;
+					cs->grffile = _cur_gps.grffile;
 					SetBit(_cargo_mask, id);
 				} else {
 					ClrBit(_cargo_mask, id);
diff --git a/src/newgrf/newgrf_act0_globalvar.cpp b/src/newgrf/newgrf_act0_globalvar.cpp
index d1e4f30ead..625c8f3015 100644
--- a/src/newgrf/newgrf_act0_globalvar.cpp
+++ b/src/newgrf/newgrf_act0_globalvar.cpp
@@ -49,7 +49,7 @@ static ChangeInfoResult LoadTranslationTable(uint first, uint last, ByteReader &
 		return CIR_INVALID_ID;
 	}
 
-	std::vector<T> &translation_table = gettable(*_cur.grffile);
+	std::vector<T> &translation_table = gettable(*_cur_gps.grffile);
 	translation_table.clear();
 	translation_table.reserve(last);
 	for (uint id = first; id < last; ++id) {
@@ -67,7 +67,7 @@ static ChangeInfoResult LoadTranslationTable(uint first, uint last, ByteReader &
 	return CIR_SUCCESS;
 }
 
-static ChangeInfoResult LoadBadgeTranslationTable(uint first, uint last, ByteReader &buf, std::vector<BadgeID> &translation_table, const char *name)
+static ChangeInfoResult LoadBadgeTranslationTable(uint first, uint last, ByteReader &buf, std::vector<BadgeID> &translation_table, std::string_view name)
 {
 	if (first != 0 && first != std::size(translation_table)) {
 		GrfMsg(1, "LoadBadgeTranslationTable: {} translation table must start at zero or {}", name, std::size(translation_table));
@@ -122,7 +122,7 @@ static ChangeInfoResult GlobalVarChangeInfo(uint first, uint last, int prop, Byt
 			return LoadTranslationTable<RoadTypeLabel>(first, last, buf, [](GRFFile &grf) -> std::vector<RoadTypeLabel> & { return grf.tramtype_list; }, "Tram type");
 
 		case 0x18: // Badge translation table
-			return LoadBadgeTranslationTable(first, last, buf, _cur.grffile->badge_list, "Badge");
+			return LoadBadgeTranslationTable(first, last, buf, _cur_gps.grffile->badge_list, "Badge");
 
 		default:
 			break;
@@ -136,7 +136,7 @@ static ChangeInfoResult GlobalVarChangeInfo(uint first, uint last, int prop, Byt
 				int factor = buf.ReadByte();
 
 				if (id < PR_END) {
-					_cur.grffile->price_base_multipliers[id] = std::min<int>(factor - 8, MAX_PRICE_MODIFIER);
+					_cur_gps.grffile->price_base_multipliers[id] = std::min<int>(factor - 8, MAX_PRICE_MODIFIER);
 				} else {
 					GrfMsg(1, "GlobalVarChangeInfo: Price {} out of range, ignoring", id);
 				}
@@ -235,7 +235,7 @@ static ChangeInfoResult GlobalVarChangeInfo(uint first, uint last, int prop, Byt
 						for (uint j = 0; j < SNOW_LINE_DAYS; j++) {
 							uint8_t &level = snow_line->table[i][j];
 							level = buf.ReadByte();
-							if (_cur.grffile->grf_version >= 8) {
+							if (_cur_gps.grffile->grf_version >= 8) {
 								if (level != 0xFF) level = level * (1 + _settings_game.construction.map_height_limit) / 256;
 							} else {
 								if (level >= 128) {
@@ -283,7 +283,7 @@ static ChangeInfoResult GlobalVarChangeInfo(uint first, uint last, int prop, Byt
 					if (plural_form >= LANGUAGE_MAX_PLURAL) {
 						GrfMsg(1, "GlobalVarChanceInfo: Plural form {} is out of range, ignoring", plural_form);
 					} else {
-						_cur.grffile->language_map[curidx].plural_form = plural_form;
+						_cur_gps.grffile->language_map[curidx].plural_form = plural_form;
 					}
 					break;
 				}
@@ -306,14 +306,14 @@ static ChangeInfoResult GlobalVarChangeInfo(uint first, uint last, int prop, Byt
 						if (map.openttd_id >= MAX_NUM_GENDERS) {
 							GrfMsg(1, "GlobalVarChangeInfo: Gender name {} is not known, ignoring", StrMakeValid(name));
 						} else {
-							_cur.grffile->language_map[curidx].gender_map.push_back(map);
+							_cur_gps.grffile->language_map[curidx].gender_map.push_back(map);
 						}
 					} else {
 						map.openttd_id = lang->GetCaseIndex(name);
 						if (map.openttd_id >= MAX_NUM_CASES) {
 							GrfMsg(1, "GlobalVarChangeInfo: Case name {} is not known, ignoring", StrMakeValid(name));
 						} else {
-							_cur.grffile->language_map[curidx].case_map.push_back(map);
+							_cur_gps.grffile->language_map[curidx].case_map.push_back(map);
 						}
 					}
 					newgrf_id = buf.ReadByte();
@@ -347,7 +347,7 @@ static ChangeInfoResult GlobalVarReserveInfo(uint first, uint last, int prop, By
 			return LoadTranslationTable<RoadTypeLabel>(first, last, buf, [](GRFFile &grf) -> std::vector<RoadTypeLabel> & { return grf.tramtype_list; }, "Tram type");
 
 		case 0x18: // Badge translation table
-			return LoadBadgeTranslationTable(first, last, buf, _cur.grffile->badge_list, "Badge");
+			return LoadBadgeTranslationTable(first, last, buf, _cur_gps.grffile->badge_list, "Badge");
 
 		default:
 			break;
@@ -458,11 +458,11 @@ bool GetGlobalVariable(uint8_t param, uint32_t *value, const GRFFile *grffile)
 		}
 
 		case 0x0D: // TTD Version, 00=DOS, 01=Windows
-			*value = _cur.grfconfig->palette & GRFP_USE_MASK;
+			*value = GetGRFConfig(grffile->grfid)->palette & GRFP_USE_MASK;
 			return true;
 
 		case 0x0E: // Y-offset for train sprites
-			*value = _cur.grffile->traininfo_vehicle_pitch;
+			*value = grffile->traininfo_vehicle_pitch;
 			return true;
 
 		case 0x0F: // Rail track type cost factors
@@ -509,7 +509,7 @@ bool GetGlobalVariable(uint8_t param, uint32_t *value, const GRFFile *grffile)
 
 			/* Add the local flags */
 			assert(!bits.Test(GrfMiscBit::TrainWidth32Pixels));
-			if (_cur.grffile->traininfo_vehicle_width == VEHICLEINFO_FULL_VEHICLE_WIDTH) bits.Set(GrfMiscBit::TrainWidth32Pixels);
+			if (grffile->traininfo_vehicle_width == VEHICLEINFO_FULL_VEHICLE_WIDTH) bits.Set(GrfMiscBit::TrainWidth32Pixels);
 
 			*value = bits.base();
 			return true;
diff --git a/src/newgrf/newgrf_act0_houses.cpp b/src/newgrf/newgrf_act0_houses.cpp
index 51996ac3bc..c73ff6fd6e 100644
--- a/src/newgrf/newgrf_act0_houses.cpp
+++ b/src/newgrf/newgrf_act0_houses.cpp
@@ -103,10 +103,10 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 	}
 
 	/* Allocate house specs if they haven't been allocated already. */
-	if (_cur.grffile->housespec.size() < last) _cur.grffile->housespec.resize(last);
+	if (_cur_gps.grffile->housespec.size() < last) _cur_gps.grffile->housespec.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &housespec = _cur.grffile->housespec[id];
+		auto &housespec = _cur_gps.grffile->housespec[id];
 
 		if (prop != 0x08 && housespec == nullptr) {
 			/* If the house property 08 is not yet set, ignore this property */
@@ -137,7 +137,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 					housespec->enabled = true;
 					housespec->grf_prop.local_id = id;
 					housespec->grf_prop.subst_id = subs_id;
-					housespec->grf_prop.SetGRFFile(_cur.grffile);
+					housespec->grf_prop.SetGRFFile(_cur_gps.grffile);
 					/* Set default colours for randomization, used if not overridden. */
 					housespec->random_colour[0] = COLOUR_RED;
 					housespec->random_colour[1] = COLOUR_BLUE;
@@ -145,7 +145,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 					housespec->random_colour[3] = COLOUR_GREEN;
 
 					/* House flags 40 and 80 are exceptions; these flags are never set automatically. */
-					housespec->building_flags.Reset(BuildingFlag::IsChurch).Reset(BuildingFlag::IsStadium);
+					housespec->building_flags.Reset({BuildingFlag::IsChurch, BuildingFlag::IsStadium});
 
 					/* Make sure that the third cargo type is valid in this
 					 * climate. This can cause problems when copying the properties
@@ -233,7 +233,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 					continue;
 				}
 
-				_house_mngr.Add(id, _cur.grffile->grfid, override_id);
+				_house_mngr.Add(id, _cur_gps.grffile->grfid, override_id);
 				break;
 			}
 
@@ -253,18 +253,19 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 				housespec->extra_flags = static_cast<HouseExtraFlags>(buf.ReadByte());
 				break;
 
-			case 0x1A: // Animation frames
-				housespec->animation.frames = buf.ReadByte();
-				housespec->animation.status = GB(housespec->animation.frames, 7, 1);
-				SB(housespec->animation.frames, 7, 1, 0);
+			case 0x1A: { // Animation frames
+				uint8_t info = buf.ReadByte();
+				housespec->animation.frames = GB(info, 0, 7);
+				housespec->animation.status = HasBit(info, 7) ? AnimationStatus::Looping : AnimationStatus::NonLooping;
 				break;
+			}
 
 			case 0x1B: // Animation speed
 				housespec->animation.speed = Clamp(buf.ReadByte(), 2, 16);
 				break;
 
 			case 0x1C: // Class of the building type
-				housespec->class_id = AllocateHouseClassID(buf.ReadByte(), _cur.grffile->grfid);
+				housespec->class_id = AllocateHouseClassID(buf.ReadByte(), _cur_gps.grffile->grfid);
 				break;
 
 			case 0x1D: { // Callback mask part 2
@@ -283,7 +284,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 				for (uint j = 0; j < HOUSE_ORIGINAL_NUM_ACCEPTS; j++) {
 					/* Get the cargo number from the 'list' */
 					uint8_t cargo_part = GB(cargotypes, 8 * j, 8);
-					CargoType cargo = GetCargoTranslation(cargo_part, _cur.grffile);
+					CargoType cargo = GetCargoTranslation(cargo_part, _cur_gps.grffile);
 
 					if (!IsValidCargoType(cargo)) {
 						/* Disable acceptance of invalid cargo type */
@@ -303,7 +304,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 			case 0x20: { // Cargo acceptance watch list
 				uint8_t count = buf.ReadByte();
 				for (uint8_t j = 0; j < count; j++) {
-					CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					if (IsValidCargoType(cargo)) SetBit(housespec->watched_cargoes, cargo);
 				}
 				break;
@@ -330,7 +331,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
 				 * any risks of array overrun. */
 				for (uint i = 0; i < lengthof(housespec->accepts_cargo); i++) {
 					if (i < count) {
-						housespec->accepts_cargo[i] = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+						housespec->accepts_cargo[i] = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 						housespec->cargo_acceptance[i] = buf.ReadByte();
 					} else {
 						housespec->accepts_cargo[i] = INVALID_CARGO;
diff --git a/src/newgrf/newgrf_act0_industries.cpp b/src/newgrf/newgrf_act0_industries.cpp
index 03f4d79ea3..f1bd06c880 100644
--- a/src/newgrf/newgrf_act0_industries.cpp
+++ b/src/newgrf/newgrf_act0_industries.cpp
@@ -79,10 +79,10 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 	}
 
 	/* Allocate industry tile specs if they haven't been allocated already. */
-	if (_cur.grffile->indtspec.size() < last) _cur.grffile->indtspec.resize(last);
+	if (_cur_gps.grffile->indtspec.size() < last) _cur_gps.grffile->indtspec.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &tsp = _cur.grffile->indtspec[id];
+		auto &tsp = _cur_gps.grffile->indtspec[id];
 
 		if (prop != 0x08 && tsp == nullptr) {
 			ChangeInfoResult cir = IgnoreIndustryTileProperty(prop, buf);
@@ -113,8 +113,8 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 
 					tsp->grf_prop.local_id = id;
 					tsp->grf_prop.subst_id = subs_id;
-					tsp->grf_prop.SetGRFFile(_cur.grffile);
-					_industile_mngr.AddEntityID(id, _cur.grffile->grfid, subs_id); // pre-reserve the tile slot
+					tsp->grf_prop.SetGRFFile(_cur_gps.grffile);
+					_industile_mngr.AddEntityID(id, _cur_gps.grffile->grfid, subs_id); // pre-reserve the tile slot
 				}
 				break;
 			}
@@ -128,7 +128,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 					continue;
 				}
 
-				_industile_mngr.Add(id, _cur.grffile->grfid, ovrid);
+				_industile_mngr.Add(id, _cur_gps.grffile->grfid, ovrid);
 				break;
 			}
 
@@ -136,7 +136,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 			case 0x0B:
 			case 0x0C: {
 				uint16_t acctp = buf.ReadWord();
-				tsp->accepts_cargo[prop - 0x0A] = GetCargoTranslation(GB(acctp, 0, 8), _cur.grffile);
+				tsp->accepts_cargo[prop - 0x0A] = GetCargoTranslation(GB(acctp, 0, 8), _cur_gps.grffile);
 				tsp->acceptance[prop - 0x0A] = Clamp(GB(acctp, 8, 8), 0, 16);
 				tsp->accepts_cargo_label[prop - 0x0A] = CT_INVALID;
 				break;
@@ -152,7 +152,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 
 			case 0x0F: // Animation information
 				tsp->animation.frames = buf.ReadByte();
-				tsp->animation.status = buf.ReadByte();
+				tsp->animation.status = static_cast<AnimationStatus>(buf.ReadByte());
 				break;
 
 			case 0x10: // Animation speed
@@ -160,7 +160,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 				break;
 
 			case 0x11: // Triggers for callback 25
-				tsp->animation.triggers = buf.ReadByte();
+				tsp->animation.triggers = static_cast<IndustryAnimationTriggers>(buf.ReadByte());
 				break;
 
 			case 0x12: // Special flags
@@ -176,7 +176,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint first, uint last, int prop,
 				}
 				for (uint i = 0; i < std::size(tsp->acceptance); i++) {
 					if (i < num_cargoes) {
-						tsp->accepts_cargo[i] = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+						tsp->accepts_cargo[i] = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 						/* Tile acceptance can be negative to counteract the IndustryTileSpecialFlag::AcceptsAllCargo flag */
 						tsp->acceptance[i] = (int8_t)buf.ReadByte();
 					} else {
@@ -344,10 +344,10 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 	}
 
 	/* Allocate industry specs if they haven't been allocated already. */
-	if (_cur.grffile->industryspec.size() < last) _cur.grffile->industryspec.resize(last);
+	if (_cur_gps.grffile->industryspec.size() < last) _cur_gps.grffile->industryspec.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &indsp = _cur.grffile->industryspec[id];
+		auto &indsp = _cur_gps.grffile->industryspec[id];
 
 		if (prop != 0x08 && indsp == nullptr) {
 			ChangeInfoResult cir = IgnoreIndustryProperty(prop, buf);
@@ -378,7 +378,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 					indsp->enabled = true;
 					indsp->grf_prop.local_id = id;
 					indsp->grf_prop.subst_id = subs_id;
-					indsp->grf_prop.SetGRFFile(_cur.grffile);
+					indsp->grf_prop.SetGRFFile(_cur_gps.grffile);
 					/* If the grf industry needs to check its surrounding upon creation, it should
 					 * rely on callbacks, not on the original placement functions */
 					indsp->check_proc = CHECK_NOTHING;
@@ -395,7 +395,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 					continue;
 				}
 				indsp->grf_prop.override_id = ovrid;
-				_industry_mngr.Add(id, _cur.grffile->grfid, ovrid);
+				_industry_mngr.Add(id, _cur_gps.grffile->grfid, ovrid);
 				break;
 			}
 
@@ -459,7 +459,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 							bytes_read += 2;
 
 							/* Read the ID from the _industile_mngr. */
-							int tempid = _industile_mngr.GetID(local_tile_id, _cur.grffile->grfid);
+							int tempid = _industile_mngr.GetID(local_tile_id, _cur_gps.grffile->grfid);
 
 							if (tempid == INVALID_INDUSTRYTILE) {
 								GrfMsg(2, "IndustriesChangeInfo: Attempt to use industry tile {} with industry id {}, not yet defined. Ignoring.", local_tile_id, id);
@@ -478,7 +478,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 							 * Since GRF version 8 the position is interpreted as pair of independent int8.
 							 * For GRF version < 8 we need to emulate the old shifting behaviour.
 							 */
-							if (_cur.grffile->grf_version < 8 && it.ti.x < 0) it.ti.y += 1;
+							if (_cur_gps.grffile->grf_version < 8 && it.ti.x < 0) it.ti.y += 1;
 						}
 					}
 
@@ -517,14 +517,14 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 
 			case 0x10: // Production cargo types
 				for (uint8_t j = 0; j < INDUSTRY_ORIGINAL_NUM_OUTPUTS; j++) {
-					indsp->produced_cargo[j] = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					indsp->produced_cargo[j] = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					indsp->produced_cargo_label[j] = CT_INVALID;
 				}
 				break;
 
 			case 0x11: // Acceptance cargo types
 				for (uint8_t j = 0; j < INDUSTRY_ORIGINAL_NUM_INPUTS; j++) {
-					indsp->accepts_cargo[j] = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					indsp->accepts_cargo[j] = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					indsp->accepts_cargo_label[j] = CT_INVALID;
 				}
 				buf.ReadByte(); // Unnused, eat it up
@@ -624,7 +624,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 				}
 				for (size_t i = 0; i < std::size(indsp->produced_cargo); i++) {
 					if (i < num_cargoes) {
-						CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+						CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 						indsp->produced_cargo[i] = cargo;
 					} else {
 						indsp->produced_cargo[i] = INVALID_CARGO;
@@ -643,7 +643,7 @@ static ChangeInfoResult IndustriesChangeInfo(uint first, uint last, int prop, By
 				}
 				for (size_t i = 0; i < std::size(indsp->accepts_cargo); i++) {
 					if (i < num_cargoes) {
-						CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+						CargoType cargo = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 						indsp->accepts_cargo[i] = cargo;
 					} else {
 						indsp->accepts_cargo[i] = INVALID_CARGO;
diff --git a/src/newgrf/newgrf_act0_objects.cpp b/src/newgrf/newgrf_act0_objects.cpp
index b83f2fd0bc..4a61e11661 100644
--- a/src/newgrf/newgrf_act0_objects.cpp
+++ b/src/newgrf/newgrf_act0_objects.cpp
@@ -83,10 +83,10 @@ static ChangeInfoResult ObjectChangeInfo(uint first, uint last, int prop, ByteRe
 	}
 
 	/* Allocate object specs if they haven't been allocated already. */
-	if (_cur.grffile->objectspec.size() < last) _cur.grffile->objectspec.resize(last);
+	if (_cur_gps.grffile->objectspec.size() < last) _cur_gps.grffile->objectspec.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &spec = _cur.grffile->objectspec[id];
+		auto &spec = _cur_gps.grffile->objectspec[id];
 
 		if (prop != 0x08 && spec == nullptr) {
 			/* If the object property 08 is not yet set, ignore this property */
@@ -151,7 +151,7 @@ static ChangeInfoResult ObjectChangeInfo(uint first, uint last, int prop, ByteRe
 
 			case 0x11: // Animation info
 				spec->animation.frames = buf.ReadByte();
-				spec->animation.status = buf.ReadByte();
+				spec->animation.status = static_cast<AnimationStatus>(buf.ReadByte());
 				break;
 
 			case 0x12: // Animation speed
@@ -159,7 +159,7 @@ static ChangeInfoResult ObjectChangeInfo(uint first, uint last, int prop, ByteRe
 				break;
 
 			case 0x13: // Animation triggers
-				spec->animation.triggers = buf.ReadWord();
+				spec->animation.triggers = static_cast<ObjectAnimationTriggers>(buf.ReadWord());
 				break;
 
 			case 0x14: // Removal cost multiplier
diff --git a/src/newgrf/newgrf_act0_railtypes.cpp b/src/newgrf/newgrf_act0_railtypes.cpp
index 18ed679f8f..fe9e52132d 100644
--- a/src/newgrf/newgrf_act0_railtypes.cpp
+++ b/src/newgrf/newgrf_act0_railtypes.cpp
@@ -36,7 +36,7 @@ static ChangeInfoResult RailTypeChangeInfo(uint first, uint last, int prop, Byte
 	}
 
 	for (uint id = first; id < last; ++id) {
-		RailType rt = _cur.grffile->railtype_map[id];
+		RailType rt = _cur_gps.grffile->railtype_map[id];
 		if (rt == INVALID_RAILTYPE) return CIR_INVALID_ID;
 
 		RailTypeInfo *rti = &_railtypes[rt];
@@ -50,7 +50,7 @@ static ChangeInfoResult RailTypeChangeInfo(uint first, uint last, int prop, Byte
 			case 0x09: { // Toolbar caption of railtype (sets name as well for backwards compatibility for grf ver < 8)
 				GRFStringID str{buf.ReadWord()};
 				AddStringForMapping(str, &rti->strings.toolbar_caption);
-				if (_cur.grffile->grf_version < 8) {
+				if (_cur_gps.grffile->grf_version < 8) {
 					AddStringForMapping(str, &rti->strings.name);
 				}
 				break;
@@ -182,7 +182,7 @@ static ChangeInfoResult RailTypeReserveInfo(uint first, uint last, int prop, Byt
 					rt = AllocateRailType(rtl);
 				}
 
-				_cur.grffile->railtype_map[id] = rt;
+				_cur_gps.grffile->railtype_map[id] = rt;
 				break;
 			}
 
@@ -199,10 +199,10 @@ static ChangeInfoResult RailTypeReserveInfo(uint first, uint last, int prop, Byt
 				break;
 
 			case 0x1D: // Alternate rail type label list
-				if (_cur.grffile->railtype_map[id] != INVALID_RAILTYPE) {
+				if (_cur_gps.grffile->railtype_map[id] != INVALID_RAILTYPE) {
 					int n = buf.ReadByte();
 					for (int j = 0; j != n; j++) {
-						_railtypes[_cur.grffile->railtype_map[id]].alternate_labels.push_back(std::byteswap(buf.ReadDWord()));
+						_railtypes[_cur_gps.grffile->railtype_map[id]].alternate_labels.push_back(std::byteswap(buf.ReadDWord()));
 					}
 					break;
 				}
diff --git a/src/newgrf/newgrf_act0_roadstops.cpp b/src/newgrf/newgrf_act0_roadstops.cpp
index 4ff60db79a..df930ff267 100644
--- a/src/newgrf/newgrf_act0_roadstops.cpp
+++ b/src/newgrf/newgrf_act0_roadstops.cpp
@@ -70,10 +70,10 @@ static ChangeInfoResult RoadStopChangeInfo(uint first, uint last, int prop, Byte
 		return CIR_INVALID_ID;
 	}
 
-	if (_cur.grffile->roadstops.size() < last) _cur.grffile->roadstops.resize(last);
+	if (_cur_gps.grffile->roadstops.size() < last) _cur_gps.grffile->roadstops.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &rs = _cur.grffile->roadstops[id];
+		auto &rs = _cur_gps.grffile->roadstops[id];
 
 		if (rs == nullptr && prop != 0x08) {
 			GrfMsg(1, "RoadStopChangeInfo: Attempt to modify undefined road stop {}, ignoring", id);
@@ -115,7 +115,7 @@ static ChangeInfoResult RoadStopChangeInfo(uint first, uint last, int prop, Byte
 
 			case 0x0E: // Animation info
 				rs->animation.frames = buf.ReadByte();
-				rs->animation.status = buf.ReadByte();
+				rs->animation.status = static_cast<AnimationStatus>(buf.ReadByte());
 				break;
 
 			case 0x0F: // Animation speed
@@ -123,7 +123,7 @@ static ChangeInfoResult RoadStopChangeInfo(uint first, uint last, int prop, Byte
 				break;
 
 			case 0x10: // Animation triggers
-				rs->animation.triggers = buf.ReadWord();
+				rs->animation.triggers = static_cast<StationAnimationTriggers>(buf.ReadWord());
 				break;
 
 			case 0x11: // Callback mask
diff --git a/src/newgrf/newgrf_act0_roadtypes.cpp b/src/newgrf/newgrf_act0_roadtypes.cpp
index 795762f1a6..f6b6f48926 100644
--- a/src/newgrf/newgrf_act0_roadtypes.cpp
+++ b/src/newgrf/newgrf_act0_roadtypes.cpp
@@ -30,7 +30,7 @@ static ChangeInfoResult RoadTypeChangeInfo(uint first, uint last, int prop, Byte
 	ChangeInfoResult ret = CIR_SUCCESS;
 
 	extern RoadTypeInfo _roadtypes[ROADTYPE_END];
-	std::array<RoadType, ROADTYPE_END> &type_map = (rtt == RTT_TRAM) ? _cur.grffile->tramtype_map : _cur.grffile->roadtype_map;
+	std::array<RoadType, ROADTYPE_END> &type_map = (rtt == RTT_TRAM) ? _cur_gps.grffile->tramtype_map : _cur_gps.grffile->roadtype_map;
 
 	if (last > ROADTYPE_END) {
 		GrfMsg(1, "RoadTypeChangeInfo: Road type {} is invalid, max {}, ignoring", last, ROADTYPE_END);
@@ -151,7 +151,7 @@ static ChangeInfoResult RoadTypeReserveInfo(uint first, uint last, int prop, Byt
 	ChangeInfoResult ret = CIR_SUCCESS;
 
 	extern RoadTypeInfo _roadtypes[ROADTYPE_END];
-	std::array<RoadType, ROADTYPE_END> &type_map = (rtt == RTT_TRAM) ? _cur.grffile->tramtype_map : _cur.grffile->roadtype_map;
+	std::array<RoadType, ROADTYPE_END> &type_map = (rtt == RTT_TRAM) ? _cur_gps.grffile->tramtype_map : _cur_gps.grffile->roadtype_map;
 
 	if (last > ROADTYPE_END) {
 		GrfMsg(1, "RoadTypeReserveInfo: Road type {} is invalid, max {}, ignoring", last, ROADTYPE_END);
diff --git a/src/newgrf/newgrf_act0_roadvehs.cpp b/src/newgrf/newgrf_act0_roadvehs.cpp
index c34fd3a96f..e8cf67f6bb 100644
--- a/src/newgrf/newgrf_act0_roadvehs.cpp
+++ b/src/newgrf/newgrf_act0_roadvehs.cpp
@@ -32,7 +32,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 	ChangeInfoResult ret = CIR_SUCCESS;
 
 	for (uint id = first; id < last; ++id) {
-		Engine *e = GetNewEngine(_cur.grffile, VEH_ROAD, id);
+		Engine *e = GetNewEngine(_cur_gps.grffile, VEH_ROAD, id);
 		if (e == nullptr) return CIR_INVALID_ID; // No engine could be allocated, so neither can any next vehicles
 
 		EngineInfo *ei = &e->info;
@@ -62,9 +62,9 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 				uint8_t orig_spriteid = spriteid;
 
 				/* cars have different custom id in the GRF file */
-				if (spriteid == 0xFF) spriteid = 0xFD;
+				if (spriteid == 0xFF) spriteid = CUSTOM_VEHICLE_SPRITENUM;
 
-				if (spriteid < 0xFD) spriteid >>= 1;
+				if (spriteid < CUSTOM_VEHICLE_SPRITENUM) spriteid >>= 1;
 
 				if (IsValidNewGRFImageIndex<VEH_ROAD>(spriteid)) {
 					rvi->image_index = spriteid;
@@ -80,7 +80,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 				break;
 
 			case 0x10: { // Cargo type
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				uint8_t ctype = buf.ReadByte();
 
 				if (ctype == 0xFF) {
@@ -88,7 +88,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 					ei->cargo_type = INVALID_CARGO;
 				} else {
 					/* Use translated cargo. Might result in INVALID_CARGO (first refittable), if cargo is not defined. */
-					ei->cargo_type = GetCargoTranslation(ctype, _cur.grffile);
+					ei->cargo_type = GetCargoTranslation(ctype, _cur_gps.grffile);
 					if (ei->cargo_type == INVALID_CARGO) GrfMsg(2, "RoadVehicleChangeInfo: Invalid cargo type {}, using first refittable", ctype);
 				}
 				ei->cargo_label = CT_INVALID;
@@ -100,7 +100,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 				break;
 
 			case 0x12: // SFX
-				rvi->sfx = GetNewGRFSoundID(_cur.grffile, buf.ReadByte());
+				rvi->sfx = GetNewGRFSoundID(_cur_gps.grffile, buf.ReadByte());
 				break;
 
 			case PROP_ROADVEH_POWER: // Power in units of 10 HP.
@@ -119,7 +119,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 				uint32_t mask = buf.ReadDWord();
 				_gted[e->index].UpdateRefittability(mask != 0);
 				ei->refit_mask = TranslateRefitMask(mask);
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 			}
 
@@ -154,7 +154,7 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 			case 0x1D: // Cargo classes allowed
 				_gted[e->index].cargo_allowed = CargoClasses{buf.ReadWord()};
 				_gted[e->index].UpdateRefittability(_gted[e->index].cargo_allowed.Any());
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 
 			case 0x1E: // Cargo classes disallowed
@@ -192,11 +192,11 @@ static ChangeInfoResult RoadVehicleChangeInfo(uint first, uint last, int prop, B
 			case 0x25: { // CTT refit exclude list
 				uint8_t count = buf.ReadByte();
 				_gted[e->index].UpdateRefittability(prop == 0x24 && count != 0);
-				if (prop == 0x24) _gted[e->index].defaultcargo_grf = _cur.grffile;
+				if (prop == 0x24) _gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				CargoTypes &ctt = prop == 0x24 ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
 				ctt = 0;
 				while (count--) {
-					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
 				}
 				break;
diff --git a/src/newgrf/newgrf_act0_ships.cpp b/src/newgrf/newgrf_act0_ships.cpp
index 9641212b45..0e1bfe0b17 100644
--- a/src/newgrf/newgrf_act0_ships.cpp
+++ b/src/newgrf/newgrf_act0_ships.cpp
@@ -33,7 +33,7 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 	ChangeInfoResult ret = CIR_SUCCESS;
 
 	for (uint id = first; id < last; ++id) {
-		Engine *e = GetNewEngine(_cur.grffile, VEH_SHIP, id);
+		Engine *e = GetNewEngine(_cur_gps.grffile, VEH_SHIP, id);
 		if (e == nullptr) return CIR_INVALID_ID; // No engine could be allocated, so neither can any next vehicles
 
 		EngineInfo *ei = &e->info;
@@ -45,9 +45,9 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 				uint8_t orig_spriteid = spriteid;
 
 				/* ships have different custom id in the GRF file */
-				if (spriteid == 0xFF) spriteid = 0xFD;
+				if (spriteid == 0xFF) spriteid = CUSTOM_VEHICLE_SPRITENUM;
 
-				if (spriteid < 0xFD) spriteid >>= 1;
+				if (spriteid < CUSTOM_VEHICLE_SPRITENUM) spriteid >>= 1;
 
 				if (IsValidNewGRFImageIndex<VEH_SHIP>(spriteid)) {
 					svi->image_index = spriteid;
@@ -71,7 +71,7 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 				break;
 
 			case 0x0C: { // Cargo type
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				uint8_t ctype = buf.ReadByte();
 
 				if (ctype == 0xFF) {
@@ -79,7 +79,7 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 					ei->cargo_type = INVALID_CARGO;
 				} else {
 					/* Use translated cargo. Might result in INVALID_CARGO (first refittable), if cargo is not defined. */
-					ei->cargo_type = GetCargoTranslation(ctype, _cur.grffile);
+					ei->cargo_type = GetCargoTranslation(ctype, _cur_gps.grffile);
 					if (ei->cargo_type == INVALID_CARGO) GrfMsg(2, "ShipVehicleChangeInfo: Invalid cargo type {}, using first refittable", ctype);
 				}
 				ei->cargo_label = CT_INVALID;
@@ -95,14 +95,14 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 				break;
 
 			case 0x10: // SFX
-				svi->sfx = GetNewGRFSoundID(_cur.grffile, buf.ReadByte());
+				svi->sfx = GetNewGRFSoundID(_cur_gps.grffile, buf.ReadByte());
 				break;
 
 			case 0x11: { // Cargoes available for refitting
 				uint32_t mask = buf.ReadDWord();
 				_gted[e->index].UpdateRefittability(mask != 0);
 				ei->refit_mask = TranslateRefitMask(mask);
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 			}
 
@@ -137,7 +137,7 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 			case 0x18: // Cargo classes allowed
 				_gted[e->index].cargo_allowed = CargoClasses{buf.ReadWord()};
 				_gted[e->index].UpdateRefittability(_gted[e->index].cargo_allowed.Any());
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 
 			case 0x19: // Cargo classes disallowed
@@ -171,11 +171,11 @@ static ChangeInfoResult ShipVehicleChangeInfo(uint first, uint last, int prop, B
 			case 0x1F: { // CTT refit exclude list
 				uint8_t count = buf.ReadByte();
 				_gted[e->index].UpdateRefittability(prop == 0x1E && count != 0);
-				if (prop == 0x1E) _gted[e->index].defaultcargo_grf = _cur.grffile;
+				if (prop == 0x1E) _gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				CargoTypes &ctt = prop == 0x1E ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
 				ctt = 0;
 				while (count--) {
-					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
 				}
 				break;
diff --git a/src/newgrf/newgrf_act0_sounds.cpp b/src/newgrf/newgrf_act0_sounds.cpp
index d74bb4b45b..a80699d41d 100644
--- a/src/newgrf/newgrf_act0_sounds.cpp
+++ b/src/newgrf/newgrf_act0_sounds.cpp
@@ -26,19 +26,20 @@
 static ChangeInfoResult SoundEffectChangeInfo(uint first, uint last, int prop, ByteReader &buf)
 {
 	ChangeInfoResult ret = CIR_SUCCESS;
+	if (first == last) return ret;
 
-	if (_cur.grffile->sound_offset == 0) {
+	if (_cur_gps.grffile->sound_offset == 0) {
 		GrfMsg(1, "SoundEffectChangeInfo: No effects defined, skipping");
 		return CIR_INVALID_ID;
 	}
 
-	if (last - ORIGINAL_SAMPLE_COUNT > _cur.grffile->num_sounds) {
-		GrfMsg(1, "SoundEffectChangeInfo: Attempting to change undefined sound effect ({}), max ({}). Ignoring.", last, ORIGINAL_SAMPLE_COUNT + _cur.grffile->num_sounds);
+	if (last - ORIGINAL_SAMPLE_COUNT > _cur_gps.grffile->num_sounds) {
+		GrfMsg(1, "SoundEffectChangeInfo: Attempting to change undefined sound effect ({}), max ({}). Ignoring.", last, ORIGINAL_SAMPLE_COUNT + _cur_gps.grffile->num_sounds);
 		return CIR_INVALID_ID;
 	}
 
 	for (uint id = first; id < last; ++id) {
-		SoundEntry *sound = GetSound(first + _cur.grffile->sound_offset - ORIGINAL_SAMPLE_COUNT);
+		SoundEntry *sound = GetSound(first + _cur_gps.grffile->sound_offset - ORIGINAL_SAMPLE_COUNT);
 
 		switch (prop) {
 			case 0x08: // Relative volume
diff --git a/src/newgrf/newgrf_act0_stations.cpp b/src/newgrf/newgrf_act0_stations.cpp
index 97bbcbef2b..e4c0a4bfc1 100644
--- a/src/newgrf/newgrf_act0_stations.cpp
+++ b/src/newgrf/newgrf_act0_stations.cpp
@@ -37,10 +37,10 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 	}
 
 	/* Allocate station specs if necessary */
-	if (_cur.grffile->stations.size() < last) _cur.grffile->stations.resize(last);
+	if (_cur_gps.grffile->stations.size() < last) _cur_gps.grffile->stations.resize(last);
 
 	for (uint id = first; id < last; ++id) {
-		auto &statspec = _cur.grffile->stations[id];
+		auto &statspec = _cur_gps.grffile->stations[id];
 
 		/* Check that the station we are modifying is defined. */
 		if (statspec == nullptr && prop != 0x08) {
@@ -81,7 +81,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 
 					ReadSpriteLayoutSprite(buf, false, false, false, GSF_STATIONS, &dts->ground);
 					/* On error, bail out immediately. Temporary GRF data was already freed */
-					if (_cur.skip_sprites < 0) return CIR_DISABLED;
+					if (_cur_gps.skip_sprites < 0) return CIR_DISABLED;
 
 					std::vector<DrawTileSeqStruct> tmp_layout;
 					for (;;) {
@@ -99,7 +99,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 
 						ReadSpriteLayoutSprite(buf, false, true, false, GSF_STATIONS, &dtss.image);
 						/* On error, bail out immediately. Temporary GRF data was already freed */
-						if (_cur.skip_sprites < 0) return CIR_DISABLED;
+						if (_cur_gps.skip_sprites < 0) return CIR_DISABLED;
 					}
 					dts->seq = std::move(tmp_layout);
 				}
@@ -114,7 +114,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 
 			case 0x0A: { // Copy sprite layout
 				uint16_t srcid = buf.ReadExtendedByte();
-				const StationSpec *srcstatspec = srcid >= _cur.grffile->stations.size() ? nullptr : _cur.grffile->stations[srcid].get();
+				const StationSpec *srcstatspec = srcid >= _cur_gps.grffile->stations.size() ? nullptr : _cur_gps.grffile->stations[srcid].get();
 
 				if (srcstatspec == nullptr) {
 					GrfMsg(1, "StationChangeInfo: Station {} is not defined, cannot copy sprite layout to {}.", srcid, id);
@@ -167,7 +167,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 
 			case 0x0F: { // Copy custom layout
 				uint16_t srcid = buf.ReadExtendedByte();
-				const StationSpec *srcstatspec = srcid >= _cur.grffile->stations.size() ? nullptr : _cur.grffile->stations[srcid].get();
+				const StationSpec *srcstatspec = srcid >= _cur_gps.grffile->stations.size() ? nullptr : _cur_gps.grffile->stations[srcid].get();
 
 				if (srcstatspec == nullptr) {
 					GrfMsg(1, "StationChangeInfo: Station {} is not defined, cannot copy tile layout to {}.", srcid, id);
@@ -196,7 +196,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 			}
 
 			case 0x12: // Cargo types for random triggers
-				if (_cur.grffile->grf_version >= 7) {
+				if (_cur_gps.grffile->grf_version >= 7) {
 					statspec->cargo_triggers = TranslateRefitMask(buf.ReadDWord());
 				} else {
 					statspec->cargo_triggers = (CargoTypes)buf.ReadDWord();
@@ -235,7 +235,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 
 			case 0x16: // Animation info
 				statspec->animation.frames = buf.ReadByte();
-				statspec->animation.status = buf.ReadByte();
+				statspec->animation.status = static_cast<AnimationStatus>(buf.ReadByte());
 				break;
 
 			case 0x17: // Animation speed
@@ -243,7 +243,7 @@ static ChangeInfoResult StationChangeInfo(uint first, uint last, int prop, ByteR
 				break;
 
 			case 0x18: // Animation triggers
-				statspec->animation.triggers = buf.ReadWord();
+				statspec->animation.triggers = static_cast<StationAnimationTriggers>(buf.ReadWord());
 				break;
 
 			/* 0x19 road routing (not implemented) */
diff --git a/src/newgrf/newgrf_act0_trains.cpp b/src/newgrf/newgrf_act0_trains.cpp
index 7840f63e6e..445dbf294b 100644
--- a/src/newgrf/newgrf_act0_trains.cpp
+++ b/src/newgrf/newgrf_act0_trains.cpp
@@ -31,7 +31,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 	ChangeInfoResult ret = CIR_SUCCESS;
 
 	for (uint id = first; id < last; ++id) {
-		Engine *e = GetNewEngine(_cur.grffile, VEH_TRAIN, id);
+		Engine *e = GetNewEngine(_cur_gps.grffile, VEH_TRAIN, id);
 		if (e == nullptr) return CIR_INVALID_ID; // No engine could be allocated, so neither can any next vehicles
 
 		EngineInfo *ei = &e->info;
@@ -41,8 +41,8 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 			case 0x05: { // Track type
 				uint8_t tracktype = buf.ReadByte();
 
-				if (tracktype < _cur.grffile->railtype_list.size()) {
-					_gted[e->index].railtypelabel = _cur.grffile->railtype_list[tracktype];
+				if (tracktype < _cur_gps.grffile->railtype_list.size()) {
+					_gted[e->index].railtypelabel = _cur_gps.grffile->railtype_list[tracktype];
 					break;
 				}
 
@@ -98,7 +98,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 
 				/* TTD sprite IDs point to a location in a 16bit array, but we use it
 				 * as an array index, so we need it to be half the original value. */
-				if (spriteid < 0xFD) spriteid >>= 1;
+				if (spriteid < CUSTOM_VEHICLE_SPRITENUM) spriteid >>= 1;
 
 				if (IsValidNewGRFImageIndex<VEH_TRAIN>(spriteid)) {
 					rvi->image_index = spriteid;
@@ -126,7 +126,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 				break;
 
 			case 0x15: { // Cargo type
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				uint8_t ctype = buf.ReadByte();
 
 				if (ctype == 0xFF) {
@@ -134,7 +134,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 					ei->cargo_type = INVALID_CARGO;
 				} else {
 					/* Use translated cargo. Might result in INVALID_CARGO (first refittable), if cargo is not defined. */
-					ei->cargo_type = GetCargoTranslation(ctype, _cur.grffile);
+					ei->cargo_type = GetCargoTranslation(ctype, _cur_gps.grffile);
 					if (ei->cargo_type == INVALID_CARGO) GrfMsg(2, "RailVehicleChangeInfo: Invalid cargo type {}, using first refittable", ctype);
 				}
 				ei->cargo_label = CT_INVALID;
@@ -179,7 +179,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 					break;
 				}
 
-				if (_cur.grffile->railtype_list.empty()) {
+				if (_cur_gps.grffile->railtype_list.empty()) {
 					/* Use traction type to select between normal and electrified
 					 * rail only when no translation list is in place. */
 					if (_gted[e->index].railtypelabel == RAILTYPE_LABEL_RAIL     && engclass >= EC_ELECTRIC) _gted[e->index].railtypelabel = RAILTYPE_LABEL_ELECTRIC;
@@ -206,7 +206,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 				uint32_t mask = buf.ReadDWord();
 				_gted[e->index].UpdateRefittability(mask != 0);
 				ei->refit_mask = TranslateRefitMask(mask);
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 			}
 
@@ -270,7 +270,7 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 			case 0x28: // Cargo classes allowed
 				_gted[e->index].cargo_allowed = CargoClasses{buf.ReadWord()};
 				_gted[e->index].UpdateRefittability(_gted[e->index].cargo_allowed.Any());
-				_gted[e->index].defaultcargo_grf = _cur.grffile;
+				_gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				break;
 
 			case 0x29: // Cargo classes disallowed
@@ -290,11 +290,11 @@ ChangeInfoResult RailVehicleChangeInfo(uint first, uint last, int prop, ByteRead
 			case 0x2D: { // CTT refit exclude list
 				uint8_t count = buf.ReadByte();
 				_gted[e->index].UpdateRefittability(prop == 0x2C && count != 0);
-				if (prop == 0x2C) _gted[e->index].defaultcargo_grf = _cur.grffile;
+				if (prop == 0x2C) _gted[e->index].defaultcargo_grf = _cur_gps.grffile;
 				CargoTypes &ctt = prop == 0x2C ? _gted[e->index].ctt_include_mask : _gted[e->index].ctt_exclude_mask;
 				ctt = 0;
 				while (count--) {
-					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur.grffile);
+					CargoType ctype = GetCargoTranslation(buf.ReadByte(), _cur_gps.grffile);
 					if (IsValidCargoType(ctype)) SetBit(ctt, ctype);
 				}
 				break;
diff --git a/src/newgrf/newgrf_act1.cpp b/src/newgrf/newgrf_act1.cpp
index 21ff5c658f..ae1a05ba6b 100644
--- a/src/newgrf/newgrf_act1.cpp
+++ b/src/newgrf/newgrf_act1.cpp
@@ -32,7 +32,7 @@ static void NewSpriteSet(ByteReader &buf)
 	 *                         In that case, use num-dirs=4.
 	 */
 
-	uint8_t  feature   = buf.ReadByte();
+	GrfSpecFeature feature{buf.ReadByte()};
 	uint16_t num_sets  = buf.ReadByte();
 	uint16_t first_set = 0;
 
@@ -45,20 +45,20 @@ static void NewSpriteSet(ByteReader &buf)
 	uint16_t num_ents = buf.ReadExtendedByte();
 
 	if (feature >= GSF_END) {
-		_cur.skip_sprites = num_sets * num_ents;
-		GrfMsg(1, "NewSpriteSet: Unsupported feature 0x{:02X}, skipping {} sprites", feature, _cur.skip_sprites);
+		_cur_gps.skip_sprites = num_sets * num_ents;
+		GrfMsg(1, "NewSpriteSet: Unsupported feature 0x{:02X}, skipping {} sprites", feature, _cur_gps.skip_sprites);
 		return;
 	}
 
-	_cur.AddSpriteSets(feature, _cur.spriteid, first_set, num_sets, num_ents);
+	_cur_gps.AddSpriteSets(feature, _cur_gps.spriteid, first_set, num_sets, num_ents);
 
 	GrfMsg(7, "New sprite set at {} of feature 0x{:02X}, consisting of {} sets with {} views each (total {})",
-		_cur.spriteid, feature, num_sets, num_ents, num_sets * num_ents
+		_cur_gps.spriteid, feature, num_sets, num_ents, num_sets * num_ents
 	);
 
 	for (int i = 0; i < num_sets * num_ents; i++) {
-		_cur.nfo_line++;
-		LoadNextSprite(_cur.spriteid++, *_cur.file, _cur.nfo_line);
+		_cur_gps.nfo_line++;
+		LoadNextSprite(_cur_gps.spriteid++, *_cur_gps.file, _cur_gps.nfo_line);
 	}
 }
 
@@ -76,9 +76,9 @@ static void SkipAct1(ByteReader &buf)
 	}
 	uint16_t num_ents = buf.ReadExtendedByte();
 
-	_cur.skip_sprites = num_sets * num_ents;
+	_cur_gps.skip_sprites = num_sets * num_ents;
 
-	GrfMsg(3, "SkipAct1: Skipping {} sprites", _cur.skip_sprites);
+	GrfMsg(3, "SkipAct1: Skipping {} sprites", _cur_gps.skip_sprites);
 }
 
 template <> void GrfActionHandler<0x01>::FileScan(ByteReader &buf) { SkipAct1(buf); }
diff --git a/src/newgrf/newgrf_act10.cpp b/src/newgrf/newgrf_act10.cpp
index bb9cbb5cb3..7c41d7cb0c 100644
--- a/src/newgrf/newgrf_act10.cpp
+++ b/src/newgrf/newgrf_act10.cpp
@@ -24,7 +24,7 @@ static void DefineGotoLabel(ByteReader &buf)
 
 	uint8_t nfo_label = buf.ReadByte();
 
-	_cur.grffile->labels.emplace_back(nfo_label, _cur.nfo_line, _cur.file->GetPos());
+	_cur_gps.grffile->labels.emplace_back(nfo_label, _cur_gps.nfo_line, _cur_gps.file->GetPos());
 
 	GrfMsg(2, "DefineGotoLabel: GOTO target with label 0x{:02X}", nfo_label);
 }
diff --git a/src/newgrf/newgrf_act11.cpp b/src/newgrf/newgrf_act11.cpp
index 9d1fc766f2..e923fcfe28 100644
--- a/src/newgrf/newgrf_act11.cpp
+++ b/src/newgrf/newgrf_act11.cpp
@@ -24,8 +24,8 @@
 static void ImportGRFSound(SoundEntry *sound)
 {
 	const GRFFile *file;
-	uint32_t grfid = _cur.file->ReadDword();
-	SoundID sound_id = _cur.file->ReadWord();
+	uint32_t grfid = _cur_gps.file->ReadDword();
+	SoundID sound_id = _cur_gps.file->ReadWord();
 
 	file = GetFileByGRFID(grfid);
 	if (file == nullptr || file->sound_offset == 0) {
@@ -60,10 +60,10 @@ static void LoadGRFSound(size_t offs, SoundEntry *sound)
 
 	if (offs != SIZE_MAX) {
 		/* Sound is present in the NewGRF. */
-		sound->file = _cur.file;
+		sound->file = _cur_gps.file;
 		sound->file_offset = offs;
 		sound->source = SoundSource::NewGRF;
-		sound->grf_container_ver = _cur.file->GetContainerVersion();
+		sound->grf_container_ver = _cur_gps.file->GetContainerVersion();
 	}
 }
 
@@ -78,22 +78,22 @@ static void GRFSound(ByteReader &buf)
 	if (num == 0) return;
 
 	SoundEntry *sound;
-	if (_cur.grffile->sound_offset == 0) {
-		_cur.grffile->sound_offset = GetNumSounds();
-		_cur.grffile->num_sounds = num;
+	if (_cur_gps.grffile->sound_offset == 0) {
+		_cur_gps.grffile->sound_offset = GetNumSounds();
+		_cur_gps.grffile->num_sounds = num;
 		sound = AllocateSound(num);
 	} else {
-		sound = GetSound(_cur.grffile->sound_offset);
+		sound = GetSound(_cur_gps.grffile->sound_offset);
 	}
 
-	SpriteFile &file = *_cur.file;
+	SpriteFile &file = *_cur_gps.file;
 	uint8_t grf_container_version = file.GetContainerVersion();
 	for (int i = 0; i < num; i++) {
-		_cur.nfo_line++;
+		_cur_gps.nfo_line++;
 
 		/* Check whether the index is in range. This might happen if multiple action 11 are present.
 		 * While this is invalid, we do not check for this. But we should prevent it from causing bigger trouble */
-		bool invalid = i >= _cur.grffile->num_sounds;
+		bool invalid = i >= _cur_gps.grffile->num_sounds;
 
 		size_t offs = file.GetPos();
 
@@ -110,7 +110,7 @@ static void GRFSound(ByteReader &buf)
 				file.SkipBytes(len);
 			} else {
 				uint32_t id = file.ReadDword();
-				if (_cur.stage == GLS_INIT) LoadGRFSound(GetGRFSpriteOffset(id), sound + i);
+				if (_cur_gps.stage == GLS_INIT) LoadGRFSound(GetGRFSpriteOffset(id), sound + i);
 			}
 			continue;
 		}
@@ -118,7 +118,7 @@ static void GRFSound(ByteReader &buf)
 		if (type != 0xFF) {
 			GrfMsg(1, "GRFSound: Unexpected RealSprite found, skipping");
 			file.SkipBytes(7);
-			SkipSpriteData(*_cur.file, type, len - 8);
+			SkipSpriteData(*_cur_gps.file, type, len - 8);
 			continue;
 		}
 
@@ -131,7 +131,7 @@ static void GRFSound(ByteReader &buf)
 		switch (action) {
 			case 0xFF:
 				/* Allocate sound only in init stage. */
-				if (_cur.stage == GLS_INIT) {
+				if (_cur_gps.stage == GLS_INIT) {
 					if (grf_container_version >= 2) {
 						GrfMsg(1, "GRFSound: Inline sounds are not supported for container version >= 2");
 					} else {
@@ -142,7 +142,7 @@ static void GRFSound(ByteReader &buf)
 				break;
 
 			case 0xFE:
-				if (_cur.stage == GLS_ACTIVATION) {
+				if (_cur_gps.stage == GLS_ACTIVATION) {
 					/* XXX 'Action 0xFE' isn't really specified. It is only mentioned for
 					 * importing sounds, so this is probably all wrong... */
 					if (file.ReadByte() != 0) GrfMsg(1, "GRFSound: Import type mismatch");
@@ -167,14 +167,14 @@ static void SkipAct11(ByteReader &buf)
 	 *
 	 * W num      Number of sound files that follow */
 
-	_cur.skip_sprites = buf.ReadWord();
+	_cur_gps.skip_sprites = buf.ReadWord();
 
-	GrfMsg(3, "SkipAct11: Skipping {} sprites", _cur.skip_sprites);
+	GrfMsg(3, "SkipAct11: Skipping {} sprites", _cur_gps.skip_sprites);
 }
 
 template <> void GrfActionHandler<0x11>::FileScan(ByteReader &buf) { SkipAct11(buf); }
 template <> void GrfActionHandler<0x11>::SafetyScan(ByteReader &buf) { GRFUnsafe(buf); }
 template <> void GrfActionHandler<0x11>::LabelScan(ByteReader &buf) { SkipAct11(buf); }
-template <> void GrfActionHandler<0x11>::Init(ByteReader &buf) { SkipAct11(buf); }
+template <> void GrfActionHandler<0x11>::Init(ByteReader &buf) { GRFSound(buf); }
 template <> void GrfActionHandler<0x11>::Reserve(ByteReader &buf) { SkipAct11(buf); }
 template <> void GrfActionHandler<0x11>::Activation(ByteReader &buf) { GRFSound(buf); }
diff --git a/src/newgrf/newgrf_act12.cpp b/src/newgrf/newgrf_act12.cpp
index 65d2b2825f..2e0250775b 100644
--- a/src/newgrf/newgrf_act12.cpp
+++ b/src/newgrf/newgrf_act12.cpp
@@ -39,9 +39,9 @@ static void LoadFontGlyph(ByteReader &buf)
 		GrfMsg(7, "LoadFontGlyph: Loading {} glyph(s) at 0x{:04X} for size {}", num_char, base_char, size);
 
 		for (uint c = 0; c < num_char; c++) {
-			if (size < FS_END) SetUnicodeGlyph(size, base_char + c, _cur.spriteid);
-			_cur.nfo_line++;
-			LoadNextSprite(_cur.spriteid++, *_cur.file, _cur.nfo_line);
+			if (size < FS_END) SetUnicodeGlyph(size, base_char + c, _cur_gps.spriteid);
+			_cur_gps.nfo_line++;
+			LoadNextSprite(_cur_gps.spriteid++, *_cur_gps.file, _cur_gps.nfo_line);
 		}
 	}
 }
@@ -63,13 +63,13 @@ static void SkipAct12(ByteReader &buf)
 		buf.ReadByte();
 
 		/* Sum up number of characters */
-		_cur.skip_sprites += buf.ReadByte();
+		_cur_gps.skip_sprites += buf.ReadByte();
 
 		/* Ignore 'base_char' word */
 		buf.ReadWord();
 	}
 
-	GrfMsg(3, "SkipAct12: Skipping {} sprites", _cur.skip_sprites);
+	GrfMsg(3, "SkipAct12: Skipping {} sprites", _cur_gps.skip_sprites);
 }
 
 template <> void GrfActionHandler<0x12>::FileScan(ByteReader &buf) { SkipAct12(buf); }
diff --git a/src/newgrf/newgrf_act13.cpp b/src/newgrf/newgrf_act13.cpp
index 9f8f08beb0..d9bcab51e7 100644
--- a/src/newgrf/newgrf_act13.cpp
+++ b/src/newgrf/newgrf_act13.cpp
@@ -50,7 +50,7 @@ static void TranslateGRFStrings(ByteReader &buf)
 	 * new_scheme has to be true as well, which will also be implicitly the case for version 8
 	 * and higher. A language id of 0x7F will be overridden by a non-generic id, so this will
 	 * not change anything if a string has been provided specifically for this language. */
-	uint8_t language = _cur.grffile->grf_version >= 8 ? buf.ReadByte() : 0x7F;
+	uint8_t language = _cur_gps.grffile->grf_version >= 8 ? buf.ReadByte() : 0x7F;
 	uint8_t num_strings = buf.ReadByte();
 	uint16_t first_id  = buf.ReadWord();
 
diff --git a/src/newgrf/newgrf_act14.cpp b/src/newgrf/newgrf_act14.cpp
index 3d7ae47570..824cb58905 100644
--- a/src/newgrf/newgrf_act14.cpp
+++ b/src/newgrf/newgrf_act14.cpp
@@ -18,21 +18,21 @@
 /** Callback function for 'INFO'->'NAME' to add a translation to the newgrf name. */
 static bool ChangeGRFName(uint8_t langid, std::string_view str)
 {
-	AddGRFTextToList(_cur.grfconfig->name, langid, _cur.grfconfig->ident.grfid, false, str);
+	AddGRFTextToList(_cur_gps.grfconfig->name, langid, _cur_gps.grfconfig->ident.grfid, false, str);
 	return true;
 }
 
 /** Callback function for 'INFO'->'DESC' to add a translation to the newgrf description. */
 static bool ChangeGRFDescription(uint8_t langid, std::string_view str)
 {
-	AddGRFTextToList(_cur.grfconfig->info, langid, _cur.grfconfig->ident.grfid, true, str);
+	AddGRFTextToList(_cur_gps.grfconfig->info, langid, _cur_gps.grfconfig->ident.grfid, true, str);
 	return true;
 }
 
 /** Callback function for 'INFO'->'URL_' to set the newgrf url. */
 static bool ChangeGRFURL(uint8_t langid, std::string_view str)
 {
-	AddGRFTextToList(_cur.grfconfig->url, langid, _cur.grfconfig->ident.grfid, false, str);
+	AddGRFTextToList(_cur_gps.grfconfig->url, langid, _cur_gps.grfconfig->ident.grfid, false, str);
 	return true;
 }
 
@@ -43,7 +43,7 @@ static bool ChangeGRFNumUsedParams(size_t len, ByteReader &buf)
 		GrfMsg(2, "StaticGRFInfo: expected only 1 byte for 'INFO'->'NPAR' but got {}, ignoring this field", len);
 		buf.Skip(len);
 	} else {
-		_cur.grfconfig->num_valid_params = std::min(buf.ReadByte(), GRFConfig::MAX_NUM_PARAMS);
+		_cur_gps.grfconfig->num_valid_params = std::min(buf.ReadByte(), GRFConfig::MAX_NUM_PARAMS);
 	}
 	return true;
 }
@@ -67,8 +67,8 @@ static bool ChangeGRFPalette(size_t len, ByteReader &buf)
 				break;
 		}
 		if (pal != GRFP_GRF_UNSET) {
-			_cur.grfconfig->palette &= ~GRFP_GRF_MASK;
-			_cur.grfconfig->palette |= pal;
+			_cur_gps.grfconfig->palette &= ~GRFP_GRF_MASK;
+			_cur_gps.grfconfig->palette |= pal;
 		}
 	}
 	return true;
@@ -90,8 +90,8 @@ static bool ChangeGRFBlitter(size_t len, ByteReader &buf)
 				GrfMsg(2, "StaticGRFInfo: unexpected value '{:02X}' for 'INFO'->'BLTR', ignoring this field", data);
 				return true;
 		}
-		_cur.grfconfig->palette &= ~GRFP_BLT_MASK;
-		_cur.grfconfig->palette |= pal;
+		_cur_gps.grfconfig->palette &= ~GRFP_BLT_MASK;
+		_cur_gps.grfconfig->palette |= pal;
 	}
 	return true;
 }
@@ -104,7 +104,7 @@ static bool ChangeGRFVersion(size_t len, ByteReader &buf)
 		buf.Skip(len);
 	} else {
 		/* Set min_loadable_version as well (default to minimal compatibility) */
-		_cur.grfconfig->version = _cur.grfconfig->min_loadable_version = buf.ReadDWord();
+		_cur_gps.grfconfig->version = _cur_gps.grfconfig->min_loadable_version = buf.ReadDWord();
 	}
 	return true;
 }
@@ -116,14 +116,14 @@ static bool ChangeGRFMinVersion(size_t len, ByteReader &buf)
 		GrfMsg(2, "StaticGRFInfo: expected 4 bytes for 'INFO'->'MINV' but got {}, ignoring this field", len);
 		buf.Skip(len);
 	} else {
-		_cur.grfconfig->min_loadable_version = buf.ReadDWord();
-		if (_cur.grfconfig->version == 0) {
+		_cur_gps.grfconfig->min_loadable_version = buf.ReadDWord();
+		if (_cur_gps.grfconfig->version == 0) {
 			GrfMsg(2, "StaticGRFInfo: 'MINV' defined before 'VRSN' or 'VRSN' set to 0, ignoring this field");
-			_cur.grfconfig->min_loadable_version = 0;
+			_cur_gps.grfconfig->min_loadable_version = 0;
 		}
-		if (_cur.grfconfig->version < _cur.grfconfig->min_loadable_version) {
-			GrfMsg(2, "StaticGRFInfo: 'MINV' defined as {}, limiting it to 'VRSN'", _cur.grfconfig->min_loadable_version);
-			_cur.grfconfig->min_loadable_version = _cur.grfconfig->version;
+		if (_cur_gps.grfconfig->version < _cur_gps.grfconfig->min_loadable_version) {
+			GrfMsg(2, "StaticGRFInfo: 'MINV' defined as {}, limiting it to 'VRSN'", _cur_gps.grfconfig->min_loadable_version);
+			_cur_gps.grfconfig->min_loadable_version = _cur_gps.grfconfig->version;
 		}
 	}
 	return true;
@@ -134,14 +134,14 @@ static GRFParameterInfo *_cur_parameter; ///< The parameter which info is curren
 /** Callback function for 'INFO'->'PARAM'->param_num->'NAME' to set the name of a parameter. */
 static bool ChangeGRFParamName(uint8_t langid, std::string_view str)
 {
-	AddGRFTextToList(_cur_parameter->name, langid, _cur.grfconfig->ident.grfid, false, str);
+	AddGRFTextToList(_cur_parameter->name, langid, _cur_gps.grfconfig->ident.grfid, false, str);
 	return true;
 }
 
 /** Callback function for 'INFO'->'PARAM'->param_num->'DESC' to set the description of a parameter. */
 static bool ChangeGRFParamDescription(uint8_t langid, std::string_view str)
 {
-	AddGRFTextToList(_cur_parameter->desc, langid, _cur.grfconfig->ident.grfid, true, str);
+	AddGRFTextToList(_cur_parameter->desc, langid, _cur_gps.grfconfig->ident.grfid, true, str);
 	return true;
 }
 
@@ -214,7 +214,7 @@ static bool ChangeGRFParamDefault(size_t len, ByteReader &buf)
 	} else {
 		_cur_parameter->def_value = buf.ReadDWord();
 	}
-	_cur.grfconfig->has_param_defaults = true;
+	_cur_gps.grfconfig->has_param_defaults = true;
 	return true;
 }
 
@@ -265,7 +265,7 @@ static bool ChangeGRFParamValueNames(ByteReader &buf)
 		if (it == std::end(_cur_parameter->value_names) || it->first != id) {
 			it = _cur_parameter->value_names.emplace(it, id, GRFTextList{});
 		}
-		AddGRFTextToList(it->second, langid, _cur.grfconfig->ident.grfid, false, name_string);
+		AddGRFTextToList(it->second, langid, _cur_gps.grfconfig->ident.grfid, false, name_string);
 
 		type = buf.ReadByte();
 	}
@@ -294,20 +294,20 @@ static bool HandleParameterInfo(ByteReader &buf)
 	uint8_t type = buf.ReadByte();
 	while (type != 0) {
 		uint32_t id = buf.ReadDWord();
-		if (type != 'C' || id >= _cur.grfconfig->num_valid_params) {
+		if (type != 'C' || id >= _cur_gps.grfconfig->num_valid_params) {
 			GrfMsg(2, "StaticGRFInfo: all child nodes of 'INFO'->'PARA' should have type 'C' and their parameter number as id");
 			if (!SkipUnknownInfo(buf, type)) return false;
 			type = buf.ReadByte();
 			continue;
 		}
 
-		if (id >= _cur.grfconfig->param_info.size()) {
-			_cur.grfconfig->param_info.resize(id + 1);
+		if (id >= _cur_gps.grfconfig->param_info.size()) {
+			_cur_gps.grfconfig->param_info.resize(id + 1);
 		}
-		if (!_cur.grfconfig->param_info[id].has_value()) {
-			_cur.grfconfig->param_info[id] = GRFParameterInfo(id);
+		if (!_cur_gps.grfconfig->param_info[id].has_value()) {
+			_cur_gps.grfconfig->param_info[id] = GRFParameterInfo(id);
 		}
-		_cur_parameter = &_cur.grfconfig->param_info[id].value();
+		_cur_parameter = &_cur_gps.grfconfig->param_info[id].value();
 		/* Read all parameter-data and process each node. */
 		if (!HandleNodes(buf, _tags_parameters)) return false;
 		type = buf.ReadByte();
diff --git a/src/newgrf/newgrf_act2.cpp b/src/newgrf/newgrf_act2.cpp
index acbafcc94e..bb26fc9215 100644
--- a/src/newgrf/newgrf_act2.cpp
+++ b/src/newgrf/newgrf_act2.cpp
@@ -18,10 +18,13 @@
 #include "newgrf_bytereader.h"
 #include "newgrf_internal.h"
 
-#include "../table/strings.h"
+#include "table/strings.h"
 
 #include "../safeguards.h"
 
+constexpr uint16_t GROUPID_CALLBACK_FAILED = 0x7FFF; ///< Explicit "failure" result.
+constexpr uint16_t GROUPID_CALCULATED_RESULT = 0x7FFE; ///< Return calculated result from VarAction2.
+
 /**
  * Map the colour modifiers of TTDPatch to those that Open is using.
  * @param grf_sprite Pointer to the structure been modified.
@@ -57,7 +60,7 @@ void MapSpriteMappingRecolour(PalSpriteID *grf_sprite)
  * @param[out] max_palette_offset Optionally returns the number of sprites in the spriteset of the palette. (0 if no spritset)
  * @return Read TileLayoutFlags.
  */
-TileLayoutFlags ReadSpriteLayoutSprite(ByteReader &buf, bool read_flags, bool invert_action1_flag, bool use_cur_spritesets, int feature, PalSpriteID *grf_sprite, uint16_t *max_sprite_offset, uint16_t *max_palette_offset)
+TileLayoutFlags ReadSpriteLayoutSprite(ByteReader &buf, bool read_flags, bool invert_action1_flag, bool use_cur_spritesets, GrfSpecFeature feature, PalSpriteID *grf_sprite, uint16_t *max_sprite_offset, uint16_t *max_palette_offset)
 {
 	grf_sprite->sprite = buf.ReadWord();
 	grf_sprite->pal = buf.ReadWord();
@@ -70,13 +73,13 @@ TileLayoutFlags ReadSpriteLayoutSprite(ByteReader &buf, bool read_flags, bool in
 	if (custom_sprite) {
 		/* Use sprite from Action 1 */
 		uint index = GB(grf_sprite->sprite, 0, 14);
-		if (use_cur_spritesets && (!_cur.IsValidSpriteSet(feature, index) || _cur.GetNumEnts(feature, index) == 0)) {
+		if (use_cur_spritesets && (!_cur_gps.IsValidSpriteSet(feature, index) || _cur_gps.GetNumEnts(feature, index) == 0)) {
 			GrfMsg(1, "ReadSpriteLayoutSprite: Spritelayout uses undefined custom spriteset {}", index);
 			grf_sprite->sprite = SPR_IMG_QUERY;
 			grf_sprite->pal = PAL_NONE;
 		} else {
-			SpriteID sprite = use_cur_spritesets ? _cur.GetSprite(feature, index) : index;
-			if (max_sprite_offset != nullptr) *max_sprite_offset = use_cur_spritesets ? _cur.GetNumEnts(feature, index) : UINT16_MAX;
+			SpriteID sprite = use_cur_spritesets ? _cur_gps.GetSprite(feature, index) : index;
+			if (max_sprite_offset != nullptr) *max_sprite_offset = use_cur_spritesets ? _cur_gps.GetNumEnts(feature, index) : UINT16_MAX;
 			SB(grf_sprite->sprite, 0, SPRITE_WIDTH, sprite);
 			SetBit(grf_sprite->sprite, SPRITE_MODIFIER_CUSTOM_SPRITE);
 		}
@@ -89,12 +92,12 @@ TileLayoutFlags ReadSpriteLayoutSprite(ByteReader &buf, bool read_flags, bool in
 	if (flags & TLF_CUSTOM_PALETTE) {
 		/* Use palette from Action 1 */
 		uint index = GB(grf_sprite->pal, 0, 14);
-		if (use_cur_spritesets && (!_cur.IsValidSpriteSet(feature, index) || _cur.GetNumEnts(feature, index) == 0)) {
+		if (use_cur_spritesets && (!_cur_gps.IsValidSpriteSet(feature, index) || _cur_gps.GetNumEnts(feature, index) == 0)) {
 			GrfMsg(1, "ReadSpriteLayoutSprite: Spritelayout uses undefined custom spriteset {} for 'palette'", index);
 			grf_sprite->pal = PAL_NONE;
 		} else {
-			SpriteID sprite = use_cur_spritesets ? _cur.GetSprite(feature, index) : index;
-			if (max_palette_offset != nullptr) *max_palette_offset = use_cur_spritesets ? _cur.GetNumEnts(feature, index) : UINT16_MAX;
+			SpriteID sprite = use_cur_spritesets ? _cur_gps.GetSprite(feature, index) : index;
+			if (max_palette_offset != nullptr) *max_palette_offset = use_cur_spritesets ? _cur_gps.GetNumEnts(feature, index) : UINT16_MAX;
 			SB(grf_sprite->pal, 0, SPRITE_WIDTH, sprite);
 			SetBit(grf_sprite->pal, SPRITE_MODIFIER_CUSTOM_SPRITE);
 		}
@@ -168,7 +171,7 @@ static void ReadSpriteLayoutRegisters(ByteReader &buf, TileLayoutFlags flags, bo
  * @param dts                  Layout container to output into
  * @return True on error (GRF was disabled).
  */
-bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_spritesets, uint8_t feature, bool allow_var10, bool no_z_position, NewGRFSpriteLayout *dts)
+bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_spritesets, GrfSpecFeature feature, bool allow_var10, bool no_z_position, NewGRFSpriteLayout *dts)
 {
 	bool has_flags = HasBit(num_building_sprites, 6);
 	ClrBit(num_building_sprites, 6);
@@ -181,7 +184,7 @@ bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_s
 
 	/* Groundsprite */
 	TileLayoutFlags flags = ReadSpriteLayoutSprite(buf, has_flags, false, use_cur_spritesets, feature, &dts->ground, max_sprite_offset.data(), max_palette_offset.data());
-	if (_cur.skip_sprites < 0) return true;
+	if (_cur_gps.skip_sprites < 0) return true;
 
 	if (flags & ~(valid_flags & ~TLF_NON_GROUND_FLAGS)) {
 		GrfMsg(1, "ReadSpriteLayout: Spritelayout uses invalid flag 0x{:X} for ground sprite", flags & ~(valid_flags & ~TLF_NON_GROUND_FLAGS));
@@ -190,13 +193,13 @@ bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_s
 	}
 
 	ReadSpriteLayoutRegisters(buf, flags, false, dts, 0);
-	if (_cur.skip_sprites < 0) return true;
+	if (_cur_gps.skip_sprites < 0) return true;
 
 	for (uint i = 0; i < num_building_sprites; i++) {
 		DrawTileSeqStruct *seq = const_cast<DrawTileSeqStruct*>(&dts->seq[i]);
 
 		flags = ReadSpriteLayoutSprite(buf, has_flags, false, use_cur_spritesets, feature, &seq->image, max_sprite_offset.data() + i + 1, max_palette_offset.data() + i + 1);
-		if (_cur.skip_sprites < 0) return true;
+		if (_cur_gps.skip_sprites < 0) return true;
 
 		if (flags & ~valid_flags) {
 			GrfMsg(1, "ReadSpriteLayout: Spritelayout uses unknown flag 0x{:X}", flags & ~valid_flags);
@@ -216,7 +219,7 @@ bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_s
 		}
 
 		ReadSpriteLayoutRegisters(buf, flags, seq->IsParentSprite(), dts, i + 1);
-		if (_cur.skip_sprites < 0) return true;
+		if (_cur_gps.skip_sprites < 0) return true;
 	}
 
 	/* Check if the number of sprites per spriteset is consistent */
@@ -271,7 +274,7 @@ static const SpriteGroup *GetCallbackResultGroup(uint16_t value)
 {
 	/* Old style callback results (only valid for version < 8) have the highest byte 0xFF to signify it is a callback result.
 	 * New style ones only have the highest bit set (allows 15-bit results, instead of just 8) */
-	if (_cur.grffile->grf_version < 8 && GB(value, 8, 8) == 0xFF) {
+	if (_cur_gps.grffile->grf_version < 8 && GB(value, 8, 8) == 0xFF) {
 		value &= ~0xFF00;
 	} else {
 		value &= ~0x8000;
@@ -293,13 +296,14 @@ static const SpriteGroup *GetCallbackResultGroup(uint16_t value)
 static const SpriteGroup *GetGroupFromGroupID(uint8_t setid, uint8_t type, uint16_t groupid)
 {
 	if (HasBit(groupid, 15)) return GetCallbackResultGroup(groupid);
+	if (groupid == GROUPID_CALLBACK_FAILED) return nullptr;
 
-	if (groupid > MAX_SPRITEGROUP || _cur.spritegroups[groupid] == nullptr) {
+	if (groupid > MAX_SPRITEGROUP || _cur_gps.spritegroups[groupid] == nullptr) {
 		GrfMsg(1, "GetGroupFromGroupID(0x{:02X}:0x{:02X}): Groupid 0x{:04X} does not exist, leaving empty", setid, type, groupid);
 		return nullptr;
 	}
 
-	return _cur.spritegroups[groupid];
+	return _cur_gps.spritegroups[groupid];
 }
 
 /**
@@ -310,20 +314,20 @@ static const SpriteGroup *GetGroupFromGroupID(uint8_t setid, uint8_t type, uint1
  * @param spriteid Raw value from the GRF for the new spritegroup; describes either the return value or the referenced spritegroup.
  * @return Created spritegroup.
  */
-static const SpriteGroup *CreateGroupFromGroupID(uint8_t feature, uint8_t setid, uint8_t type, uint16_t spriteid)
+static const SpriteGroup *CreateGroupFromGroupID(GrfSpecFeature feature, uint8_t setid, uint8_t type, uint16_t spriteid)
 {
 	if (HasBit(spriteid, 15)) return GetCallbackResultGroup(spriteid);
 
-	if (!_cur.IsValidSpriteSet(feature, spriteid)) {
+	if (!_cur_gps.IsValidSpriteSet(feature, spriteid)) {
 		GrfMsg(1, "CreateGroupFromGroupID(0x{:02X}:0x{:02X}): Sprite set {} invalid", setid, type, spriteid);
 		return nullptr;
 	}
 
-	SpriteID spriteset_start = _cur.GetSprite(feature, spriteid);
-	uint num_sprites = _cur.GetNumEnts(feature, spriteid);
+	SpriteID spriteset_start = _cur_gps.GetSprite(feature, spriteid);
+	uint num_sprites = _cur_gps.GetNumEnts(feature, spriteid);
 
 	/* Ensure that the sprites are loeded */
-	assert(spriteset_start + num_sprites <= _cur.spriteid);
+	assert(spriteset_start + num_sprites <= _cur_gps.spriteid);
 
 	assert(ResultSpriteGroup::CanAllocateItem());
 	return new ResultSpriteGroup(spriteset_start, num_sprites);
@@ -344,7 +348,7 @@ static void NewSpriteGroup(ByteReader &buf)
 	 * V feature-specific-data (huge mess, don't even look it up --pasky) */
 	const SpriteGroup *act_group = nullptr;
 
-	uint8_t feature = buf.ReadByte();
+	GrfSpecFeature feature{buf.ReadByte()};
 	if (feature >= GSF_END) {
 		GrfMsg(1, "NewSpriteGroup: Unsupported feature 0x{:02X}, skipping", feature);
 		return;
@@ -371,7 +375,7 @@ static void NewSpriteGroup(ByteReader &buf)
 
 			assert(DeterministicSpriteGroup::CanAllocateItem());
 			DeterministicSpriteGroup *group = new DeterministicSpriteGroup();
-			group->nfo_line = _cur.nfo_line;
+			group->nfo_line = _cur_gps.nfo_line;
 			act_group = group;
 			group->var_scope = HasBit(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 
@@ -417,15 +421,31 @@ static void NewSpriteGroup(ByteReader &buf)
 			std::vector<DeterministicSpriteGroupRange> ranges;
 			ranges.resize(buf.ReadByte());
 			for (auto &range : ranges) {
-				range.group = GetGroupFromGroupID(setid, type, buf.ReadWord());
+				auto groupid = buf.ReadWord();
+				if (groupid == GROUPID_CALCULATED_RESULT) {
+					range.result.calculated_result = true;
+				} else {
+					range.result.group = GetGroupFromGroupID(setid, type, groupid);
+				}
 				range.low   = buf.ReadVarSize(varsize);
 				range.high  = buf.ReadVarSize(varsize);
 			}
 
-			group->default_group = GetGroupFromGroupID(setid, type, buf.ReadWord());
-			group->error_group = ranges.empty() ? group->default_group : ranges[0].group;
-			/* nvar == 0 is a special case -- we turn our value into a callback result */
-			group->calculated_result = ranges.empty();
+			auto defgroupid = buf.ReadWord();
+			if (defgroupid == GROUPID_CALCULATED_RESULT) {
+				group->default_result.calculated_result = true;
+			} else {
+				group->default_result.group = GetGroupFromGroupID(setid, type, defgroupid);
+			}
+			/* 'calculated_result' makes no sense for the 'error' case. Use callback failure (nullptr) instead */
+			group->error_group = ranges.empty() ? group->default_result.group : ranges[0].result.group;
+			/* nvar == 0 is a special case:
+			 * - set "default_result" to "calculated_result".
+			 * - the old value specifies the "error_group". */
+			if (ranges.empty()) {
+				group->default_result.calculated_result = true;
+				group->default_result.group = nullptr;
+			}
 
 			/* Sort ranges ascending. When ranges overlap, this may required clamping or splitting them */
 			std::vector<uint32_t> bounds;
@@ -437,13 +457,13 @@ static void NewSpriteGroup(ByteReader &buf)
 			std::sort(bounds.begin(), bounds.end());
 			bounds.erase(std::unique(bounds.begin(), bounds.end()), bounds.end());
 
-			std::vector<const SpriteGroup *> target;
+			std::vector<DeterministicSpriteGroupResult> target;
 			target.reserve(bounds.size());
 			for (const auto &bound : bounds) {
-				const SpriteGroup *t = group->default_group;
+				auto t = group->default_result;
 				for (const auto &range : ranges) {
 					if (range.low <= bound && bound <= range.high) {
-						t = range.group;
+						t = range.result;
 						break;
 					}
 				}
@@ -452,11 +472,11 @@ static void NewSpriteGroup(ByteReader &buf)
 			assert(target.size() == bounds.size());
 
 			for (uint j = 0; j < bounds.size(); ) {
-				if (target[j] != group->default_group) {
+				if (target[j] != group->default_result) {
 					DeterministicSpriteGroupRange &r = group->ranges.emplace_back();
-					r.group = target[j];
+					r.result = target[j];
 					r.low = bounds[j];
-					while (j < bounds.size() && target[j] == r.group) {
+					while (j < bounds.size() && target[j] == r.result) {
 						j++;
 					}
 					r.high = j < bounds.size() ? bounds[j] - 1 : UINT32_MAX;
@@ -475,7 +495,7 @@ static void NewSpriteGroup(ByteReader &buf)
 		{
 			assert(RandomizedSpriteGroup::CanAllocateItem());
 			RandomizedSpriteGroup *group = new RandomizedSpriteGroup();
-			group->nfo_line = _cur.nfo_line;
+			group->nfo_line = _cur_gps.nfo_line;
 			act_group = group;
 			group->var_scope = HasBit(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 
@@ -522,7 +542,7 @@ static void NewSpriteGroup(ByteReader &buf)
 					uint8_t num_loaded  = type;
 					uint8_t num_loading = buf.ReadByte();
 
-					if (!_cur.HasValidSpriteSets(feature)) {
+					if (!_cur_gps.HasValidSpriteSets(feature)) {
 						GrfMsg(0, "NewSpriteGroup: No sprite set to work on! Skipping");
 						return;
 					}
@@ -569,7 +589,7 @@ static void NewSpriteGroup(ByteReader &buf)
 
 					assert(RealSpriteGroup::CanAllocateItem());
 					RealSpriteGroup *group = new RealSpriteGroup();
-					group->nfo_line = _cur.nfo_line;
+					group->nfo_line = _cur_gps.nfo_line;
 					act_group = group;
 
 					if (loaded_same && loaded.size() > 1) loaded.resize(1);
@@ -598,7 +618,7 @@ static void NewSpriteGroup(ByteReader &buf)
 
 					assert(TileLayoutSpriteGroup::CanAllocateItem());
 					TileLayoutSpriteGroup *group = new TileLayoutSpriteGroup();
-					group->nfo_line = _cur.nfo_line;
+					group->nfo_line = _cur_gps.nfo_line;
 					act_group = group;
 
 					/* On error, bail out immediately. Temporary GRF data was already freed */
@@ -614,7 +634,7 @@ static void NewSpriteGroup(ByteReader &buf)
 
 					assert(IndustryProductionSpriteGroup::CanAllocateItem());
 					IndustryProductionSpriteGroup *group = new IndustryProductionSpriteGroup();
-					group->nfo_line = _cur.nfo_line;
+					group->nfo_line = _cur_gps.nfo_line;
 					act_group = group;
 					group->version = type;
 					if (type == 0) {
@@ -646,7 +666,7 @@ static void NewSpriteGroup(ByteReader &buf)
 						}
 						for (uint i = 0; i < group->num_input; i++) {
 							uint8_t rawcargo = buf.ReadByte();
-							CargoType cargo = GetCargoTranslation(rawcargo, _cur.grffile);
+							CargoType cargo = GetCargoTranslation(rawcargo, _cur_gps.grffile);
 							if (!IsValidCargoType(cargo)) {
 								/* The mapped cargo is invalid. This is permitted at this point,
 								 * as long as the result is not used. Mark it invalid so this
@@ -668,7 +688,7 @@ static void NewSpriteGroup(ByteReader &buf)
 						}
 						for (uint i = 0; i < group->num_output; i++) {
 							uint8_t rawcargo = buf.ReadByte();
-							CargoType cargo = GetCargoTranslation(rawcargo, _cur.grffile);
+							CargoType cargo = GetCargoTranslation(rawcargo, _cur_gps.grffile);
 							if (!IsValidCargoType(cargo)) {
 								/* Mark this result as invalid to use */
 								group->version = 0xFF;
@@ -693,7 +713,7 @@ static void NewSpriteGroup(ByteReader &buf)
 		}
 	}
 
-	_cur.spritegroups[setid] = act_group;
+	_cur_gps.spritegroups[setid] = act_group;
 }
 
 template <> void GrfActionHandler<0x02>::FileScan(ByteReader &) { }
diff --git a/src/newgrf/newgrf_act3.cpp b/src/newgrf/newgrf_act3.cpp
index 89db8d6868..aa9b61ee42 100644
--- a/src/newgrf/newgrf_act3.cpp
+++ b/src/newgrf/newgrf_act3.cpp
@@ -33,17 +33,17 @@
 #include "../safeguards.h"
 
 
-static CargoType TranslateCargo(uint8_t feature, uint8_t ctype)
+static CargoType TranslateCargo(GrfSpecFeature feature, uint8_t ctype)
 {
 	/* Special cargo types for purchase list and stations */
-	if ((feature == GSF_STATIONS || feature == GSF_ROADSTOPS) && ctype == 0xFE) return SpriteGroupCargo::SG_DEFAULT_NA;
-	if (ctype == 0xFF) return SpriteGroupCargo::SG_PURCHASE;
+	if ((feature == GSF_STATIONS || feature == GSF_ROADSTOPS) && ctype == 0xFE) return CargoGRFFileProps::SG_DEFAULT_NA;
+	if (ctype == 0xFF) return CargoGRFFileProps::SG_PURCHASE;
 
-	auto cargo_list = GetCargoTranslationTable(*_cur.grffile);
+	auto cargo_list = GetCargoTranslationTable(*_cur_gps.grffile);
 
 	/* Check if the cargo type is out of bounds of the cargo translation table */
 	if (ctype >= cargo_list.size()) {
-		GrfMsg(1, "TranslateCargo: Cargo type {} out of range (max {}), skipping.", ctype, (unsigned int)_cur.grffile->cargo_list.size() - 1);
+		GrfMsg(1, "TranslateCargo: Cargo type {} out of range (max {}), skipping.", ctype, (unsigned int)_cur_gps.grffile->cargo_list.size() - 1);
 		return INVALID_CARGO;
 	}
 
@@ -65,9 +65,9 @@ static CargoType TranslateCargo(uint8_t feature, uint8_t ctype)
 }
 
 
-static bool IsValidGroupID(uint16_t groupid, const char *function)
+static bool IsValidGroupID(uint16_t groupid, std::string_view function)
 {
-	if (groupid > MAX_SPRITEGROUP || _cur.spritegroups[groupid] == nullptr) {
+	if (groupid > MAX_SPRITEGROUP || _cur_gps.spritegroups[groupid] == nullptr) {
 		GrfMsg(1, "{}: Spritegroup 0x{:04X} out of range or empty, skipping.", function, groupid);
 		return false;
 	}
@@ -75,7 +75,7 @@ static bool IsValidGroupID(uint16_t groupid, const char *function)
 	return true;
 }
 
-static void VehicleMapSpriteGroup(ByteReader &buf, uint8_t feature, uint8_t idcount)
+static void VehicleMapSpriteGroup(ByteReader &buf, GrfSpecFeature feature, uint8_t idcount)
 {
 	static std::vector<EngineID> last_engines; // Engine IDs are remembered in case the next action is a wagon override.
 	bool wagover = false;
@@ -99,12 +99,12 @@ static void VehicleMapSpriteGroup(ByteReader &buf, uint8_t feature, uint8_t idco
 	std::vector<EngineID> engines;
 	engines.reserve(idcount);
 	for (uint i = 0; i < idcount; i++) {
-		Engine *e = GetNewEngine(_cur.grffile, (VehicleType)feature, buf.ReadExtendedByte());
+		Engine *e = GetNewEngine(_cur_gps.grffile, (VehicleType)feature, buf.ReadExtendedByte());
 		if (e == nullptr) {
 			/* No engine could be allocated?!? Deal with it. Okay,
 			 * this might look bad. Also make sure this NewGRF
 			 * gets disabled, as a half loaded one is bad. */
-			HandleChangeInfoResult("VehicleMapSpriteGroup", CIR_INVALID_ID, 0, 0);
+			HandleChangeInfoResult("VehicleMapSpriteGroup", CIR_INVALID_ID, feature, 0);
 			return;
 		}
 
@@ -129,9 +129,9 @@ static void VehicleMapSpriteGroup(ByteReader &buf, uint8_t feature, uint8_t idco
 			GrfMsg(7, "VehicleMapSpriteGroup: [{}] Engine {}...", i, engine);
 
 			if (wagover) {
-				SetWagonOverrideSprites(engine, cargo_type, _cur.spritegroups[groupid], last_engines);
+				SetWagonOverrideSprites(engine, cargo_type, _cur_gps.spritegroups[groupid], last_engines);
 			} else {
-				SetCustomEngineSprites(engine, cargo_type, _cur.spritegroups[groupid]);
+				SetCustomEngineSprites(engine, cargo_type, _cur_gps.spritegroups[groupid]);
 			}
 		}
 	}
@@ -145,10 +145,10 @@ static void VehicleMapSpriteGroup(ByteReader &buf, uint8_t feature, uint8_t idco
 		EngineID engine = engines[i];
 
 		if (wagover) {
-			SetWagonOverrideSprites(engine, SpriteGroupCargo::SG_DEFAULT, _cur.spritegroups[groupid], last_engines);
+			SetWagonOverrideSprites(engine, CargoGRFFileProps::SG_DEFAULT, _cur_gps.spritegroups[groupid], last_engines);
 		} else {
-			SetCustomEngineSprites(engine, SpriteGroupCargo::SG_DEFAULT, _cur.spritegroups[groupid]);
-			SetEngineGRF(engine, _cur.grffile);
+			SetCustomEngineSprites(engine, CargoGRFFileProps::SG_DEFAULT, _cur_gps.spritegroups[groupid]);
+			SetEngineGRF(engine, _cur_gps.grffile);
 		}
 	}
 }
@@ -174,15 +174,15 @@ static void CanalMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 			continue;
 		}
 
-		_water_feature[cf].grffile = _cur.grffile;
-		_water_feature[cf].group = _cur.spritegroups[groupid];
+		_water_feature[cf].grffile = _cur_gps.grffile;
+		_water_feature[cf].group = _cur_gps.spritegroups[groupid];
 	}
 }
 
 
 static void StationMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->stations.empty()) {
+	if (_cur_gps.grffile->stations.empty()) {
 		GrfMsg(1, "StationMapSpriteGroup: No stations defined, skipping");
 		return;
 	}
@@ -199,18 +199,18 @@ static void StationMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		uint16_t groupid = buf.ReadWord();
 		if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue;
 
-		ctype = TranslateCargo(GSF_STATIONS, ctype);
-		if (!IsValidCargoType(ctype)) continue;
+		CargoType cargo_type = TranslateCargo(GSF_STATIONS, ctype);
+		if (!IsValidCargoType(cargo_type)) continue;
 
 		for (auto &station : stations) {
-			StationSpec *statspec = station >= _cur.grffile->stations.size() ? nullptr : _cur.grffile->stations[station].get();
+			StationSpec *statspec = station >= _cur_gps.grffile->stations.size() ? nullptr : _cur_gps.grffile->stations[station].get();
 
 			if (statspec == nullptr) {
 				GrfMsg(1, "StationMapSpriteGroup: Station {} undefined, skipping", station);
 				continue;
 			}
 
-			statspec->grf_prop.SetSpriteGroup(ctype, _cur.spritegroups[groupid]);
+			statspec->grf_prop.SetSpriteGroup(cargo_type, _cur_gps.spritegroups[groupid]);
 		}
 	}
 
@@ -218,7 +218,7 @@ static void StationMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 	if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) return;
 
 	for (auto &station : stations) {
-		StationSpec *statspec = station >= _cur.grffile->stations.size() ? nullptr : _cur.grffile->stations[station].get();
+		StationSpec *statspec = station >= _cur_gps.grffile->stations.size() ? nullptr : _cur_gps.grffile->stations[station].get();
 
 		if (statspec == nullptr) {
 			GrfMsg(1, "StationMapSpriteGroup: Station {} undefined, skipping", station);
@@ -230,8 +230,8 @@ static void StationMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 			continue;
 		}
 
-		statspec->grf_prop.SetSpriteGroup(SpriteGroupCargo::SG_DEFAULT, _cur.spritegroups[groupid]);
-		statspec->grf_prop.SetGRFFile(_cur.grffile);
+		statspec->grf_prop.SetSpriteGroup(CargoGRFFileProps::SG_DEFAULT, _cur_gps.spritegroups[groupid]);
+		statspec->grf_prop.SetGRFFile(_cur_gps.grffile);
 		statspec->grf_prop.local_id = station;
 		StationClass::Assign(statspec);
 	}
@@ -240,7 +240,7 @@ static void StationMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 
 static void TownHouseMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->housespec.empty()) {
+	if (_cur_gps.grffile->housespec.empty()) {
 		GrfMsg(1, "TownHouseMapSpriteGroup: No houses defined, skipping");
 		return;
 	}
@@ -251,28 +251,36 @@ static void TownHouseMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		houses.push_back(buf.ReadExtendedByte());
 	}
 
-	/* Skip the cargo type section, we only care about the default group */
-	uint8_t cidcount = buf.ReadByte();
-	buf.Skip(cidcount * 3);
+	auto set_sprite_group = [&houses](StandardSpriteGroup key, uint16_t groupid) {
+		if (!IsValidGroupID(groupid, "TownHouseMapSpriteGroup")) return;
 
-	uint16_t groupid = buf.ReadWord();
-	if (!IsValidGroupID(groupid, "TownHouseMapSpriteGroup")) return;
+		for (auto &house : houses) {
+			HouseSpec *hs = house >= _cur_gps.grffile->housespec.size() ? nullptr : _cur_gps.grffile->housespec[house].get();
+			if (hs == nullptr) {
+				GrfMsg(1, "TownHouseMapSpriteGroup: House {} undefined, skipping.", house);
+				continue;
+			}
 
-	for (auto &house : houses) {
-		HouseSpec *hs = house >= _cur.grffile->housespec.size() ? nullptr : _cur.grffile->housespec[house].get();
-
-		if (hs == nullptr) {
-			GrfMsg(1, "TownHouseMapSpriteGroup: House {} undefined, skipping.", house);
-			continue;
+			hs->grf_prop.SetSpriteGroup(key, _cur_gps.spritegroups[groupid]);
 		}
+	};
 
-		hs->grf_prop.SetSpriteGroup(0, _cur.spritegroups[groupid]);
+	uint8_t cidcount = buf.ReadByte();
+	for (uint c = 0; c < cidcount; c++) {
+		uint8_t ctype = buf.ReadByte();
+		uint16_t groupid = buf.ReadWord();
+		if (ctype == 0xFF) {
+			set_sprite_group(StandardSpriteGroup::Purchase, groupid);
+		} else {
+			GrfMsg(1, "TownHouseMapSpriteGroup: Invalid cargo bitnum {} for houses, skipping.", ctype);
+		}
 	}
+	set_sprite_group(StandardSpriteGroup::Default, buf.ReadWord());
 }
 
 static void IndustryMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->industryspec.empty()) {
+	if (_cur_gps.grffile->industryspec.empty()) {
 		GrfMsg(1, "IndustryMapSpriteGroup: No industries defined, skipping");
 		return;
 	}
@@ -283,28 +291,36 @@ static void IndustryMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		industries.push_back(buf.ReadExtendedByte());
 	}
 
-	/* Skip the cargo type section, we only care about the default group */
-	uint8_t cidcount = buf.ReadByte();
-	buf.Skip(cidcount * 3);
+	auto set_sprite_group = [&industries](StandardSpriteGroup key, uint16_t groupid) {
+		if (!IsValidGroupID(groupid, "IndustryMapSpriteGroup")) return;
 
-	uint16_t groupid = buf.ReadWord();
-	if (!IsValidGroupID(groupid, "IndustryMapSpriteGroup")) return;
+		for (auto &industry : industries) {
+			IndustrySpec *indsp = industry >= _cur_gps.grffile->industryspec.size() ? nullptr : _cur_gps.grffile->industryspec[industry].get();
+			if (indsp == nullptr) {
+				GrfMsg(1, "IndustryMapSpriteGroup: Industry {} undefined, skipping", industry);
+				continue;
+			}
 
-	for (auto &industry : industries) {
-		IndustrySpec *indsp = industry >= _cur.grffile->industryspec.size() ? nullptr : _cur.grffile->industryspec[industry].get();
-
-		if (indsp == nullptr) {
-			GrfMsg(1, "IndustryMapSpriteGroup: Industry {} undefined, skipping", industry);
-			continue;
+			indsp->grf_prop.SetSpriteGroup(key, _cur_gps.spritegroups[groupid]);
 		}
+	};
 
-		indsp->grf_prop.SetSpriteGroup(0, _cur.spritegroups[groupid]);
+	uint8_t cidcount = buf.ReadByte();
+	for (uint c = 0; c < cidcount; c++) {
+		uint8_t ctype = buf.ReadByte();
+		uint16_t groupid = buf.ReadWord();
+		if (ctype == 0xFF) {
+			set_sprite_group(StandardSpriteGroup::Purchase, groupid);
+		} else {
+			GrfMsg(1, "IndustryMapSpriteGroup: Invalid cargo bitnum {} for industries, skipping.", ctype);
+		}
 	}
+	set_sprite_group(StandardSpriteGroup::Default, buf.ReadWord());
 }
 
 static void IndustrytileMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->indtspec.empty()) {
+	if (_cur_gps.grffile->indtspec.empty()) {
 		GrfMsg(1, "IndustrytileMapSpriteGroup: No industry tiles defined, skipping");
 		return;
 	}
@@ -315,23 +331,31 @@ static void IndustrytileMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		indtiles.push_back(buf.ReadExtendedByte());
 	}
 
-	/* Skip the cargo type section, we only care about the default group */
-	uint8_t cidcount = buf.ReadByte();
-	buf.Skip(cidcount * 3);
+	auto set_sprite_group = [&indtiles](StandardSpriteGroup key, uint16_t groupid) {
+		if (!IsValidGroupID(groupid, "IndustrytileMapSpriteGroup")) return;
 
-	uint16_t groupid = buf.ReadWord();
-	if (!IsValidGroupID(groupid, "IndustrytileMapSpriteGroup")) return;
+		for (auto &indtile : indtiles) {
+			IndustryTileSpec *indtsp = indtile >= _cur_gps.grffile->indtspec.size() ? nullptr : _cur_gps.grffile->indtspec[indtile].get();
+			if (indtsp == nullptr) {
+				GrfMsg(1, "IndustrytileMapSpriteGroup: Industry tile {} undefined, skipping", indtile);
+				continue;
+			}
 
-	for (auto &indtile : indtiles) {
-		IndustryTileSpec *indtsp = indtile >= _cur.grffile->indtspec.size() ? nullptr : _cur.grffile->indtspec[indtile].get();
-
-		if (indtsp == nullptr) {
-			GrfMsg(1, "IndustrytileMapSpriteGroup: Industry tile {} undefined, skipping", indtile);
-			continue;
+			indtsp->grf_prop.SetSpriteGroup(key, _cur_gps.spritegroups[groupid]);
 		}
+	};
 
-		indtsp->grf_prop.SetSpriteGroup(0, _cur.spritegroups[groupid]);
+	uint8_t cidcount = buf.ReadByte();
+	for (uint c = 0; c < cidcount; c++) {
+		uint8_t ctype = buf.ReadByte();
+		uint16_t groupid = buf.ReadWord();
+		if (ctype == 0xFF) {
+			set_sprite_group(StandardSpriteGroup::Purchase, groupid);
+		} else {
+			GrfMsg(1, "IndustrytileMapSpriteGroup: Invalid cargo bitnum {} for industry tiles, skipping.", ctype);
+		}
 	}
+	set_sprite_group(StandardSpriteGroup::Default, buf.ReadWord());
 }
 
 static void CargoMapSpriteGroup(ByteReader &buf, uint8_t idcount)
@@ -356,14 +380,14 @@ static void CargoMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		}
 
 		CargoSpec *cs = CargoSpec::Get(cargo_type);
-		cs->grffile = _cur.grffile;
-		cs->group = _cur.spritegroups[groupid];
+		cs->grffile = _cur_gps.grffile;
+		cs->group = _cur_gps.spritegroups[groupid];
 	}
 }
 
 static void ObjectMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->objectspec.empty()) {
+	if (_cur_gps.grffile->objectspec.empty()) {
 		GrfMsg(1, "ObjectMapSpriteGroup: No object tiles defined, skipping");
 		return;
 	}
@@ -387,14 +411,14 @@ static void ObjectMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		}
 
 		for (auto &object : objects) {
-			ObjectSpec *spec = object >= _cur.grffile->objectspec.size() ? nullptr : _cur.grffile->objectspec[object].get();
+			ObjectSpec *spec = object >= _cur_gps.grffile->objectspec.size() ? nullptr : _cur_gps.grffile->objectspec[object].get();
 
 			if (spec == nullptr) {
 				GrfMsg(1, "ObjectMapSpriteGroup: Object {} undefined, skipping", object);
 				continue;
 			}
 
-			spec->grf_prop.SetSpriteGroup(OBJECT_SPRITE_GROUP_PURCHASE, _cur.spritegroups[groupid]);
+			spec->grf_prop.SetSpriteGroup(StandardSpriteGroup::Purchase, _cur_gps.spritegroups[groupid]);
 		}
 	}
 
@@ -402,7 +426,7 @@ static void ObjectMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 	if (!IsValidGroupID(groupid, "ObjectMapSpriteGroup")) return;
 
 	for (auto &object : objects) {
-		ObjectSpec *spec = object >= _cur.grffile->objectspec.size() ? nullptr : _cur.grffile->objectspec[object].get();
+		ObjectSpec *spec = object >= _cur_gps.grffile->objectspec.size() ? nullptr : _cur_gps.grffile->objectspec[object].get();
 
 		if (spec == nullptr) {
 			GrfMsg(1, "ObjectMapSpriteGroup: Object {} undefined, skipping", object);
@@ -414,8 +438,8 @@ static void ObjectMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 			continue;
 		}
 
-		spec->grf_prop.SetSpriteGroup(OBJECT_SPRITE_GROUP_DEFAULT, _cur.spritegroups[groupid]);
-		spec->grf_prop.SetGRFFile(_cur.grffile);
+		spec->grf_prop.SetSpriteGroup(StandardSpriteGroup::Default, _cur_gps.spritegroups[groupid]);
+		spec->grf_prop.SetGRFFile(_cur_gps.grffile);
 		spec->grf_prop.local_id = object;
 	}
 }
@@ -426,7 +450,7 @@ static void RailTypeMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 	railtypes.reserve(idcount);
 	for (uint i = 0; i < idcount; i++) {
 		uint16_t id = buf.ReadExtendedByte();
-		railtypes.push_back(id < RAILTYPE_END ? _cur.grffile->railtype_map[id] : INVALID_RAILTYPE);
+		railtypes.push_back(id < RAILTYPE_END ? _cur_gps.grffile->railtype_map[id] : INVALID_RAILTYPE);
 	}
 
 	uint8_t cidcount = buf.ReadByte();
@@ -442,8 +466,8 @@ static void RailTypeMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 			if (railtype != INVALID_RAILTYPE) {
 				RailTypeInfo *rti = &_railtypes[railtype];
 
-				rti->grffile[ctype] = _cur.grffile;
-				rti->group[ctype] = _cur.spritegroups[groupid];
+				rti->grffile[ctype] = _cur_gps.grffile;
+				rti->group[ctype] = _cur_gps.spritegroups[groupid];
 			}
 		}
 	}
@@ -454,7 +478,7 @@ static void RailTypeMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 
 static void RoadTypeMapSpriteGroup(ByteReader &buf, uint8_t idcount, RoadTramType rtt)
 {
-	std::array<RoadType, ROADTYPE_END> &type_map = (rtt == RTT_TRAM) ? _cur.grffile->tramtype_map : _cur.grffile->roadtype_map;
+	std::array<RoadType, ROADTYPE_END> &type_map = (rtt == RTT_TRAM) ? _cur_gps.grffile->tramtype_map : _cur_gps.grffile->roadtype_map;
 
 	std::vector<uint8_t> roadtypes;
 	roadtypes.reserve(idcount);
@@ -476,8 +500,8 @@ static void RoadTypeMapSpriteGroup(ByteReader &buf, uint8_t idcount, RoadTramTyp
 			if (roadtype != INVALID_ROADTYPE) {
 				RoadTypeInfo *rti = &_roadtypes[roadtype];
 
-				rti->grffile[ctype] = _cur.grffile;
-				rti->group[ctype] = _cur.spritegroups[groupid];
+				rti->grffile[ctype] = _cur_gps.grffile;
+				rti->group[ctype] = _cur_gps.spritegroups[groupid];
 			}
 		}
 	}
@@ -488,7 +512,7 @@ static void RoadTypeMapSpriteGroup(ByteReader &buf, uint8_t idcount, RoadTramTyp
 
 static void AirportMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->airportspec.empty()) {
+	if (_cur_gps.grffile->airportspec.empty()) {
 		GrfMsg(1, "AirportMapSpriteGroup: No airports defined, skipping");
 		return;
 	}
@@ -499,28 +523,36 @@ static void AirportMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		airports.push_back(buf.ReadExtendedByte());
 	}
 
-	/* Skip the cargo type section, we only care about the default group */
-	uint8_t cidcount = buf.ReadByte();
-	buf.Skip(cidcount * 3);
+	auto set_sprite_group = [&airports](StandardSpriteGroup key, uint16_t groupid) {
+		if (!IsValidGroupID(groupid, "AirportMapSpriteGroup")) return;
 
-	uint16_t groupid = buf.ReadWord();
-	if (!IsValidGroupID(groupid, "AirportMapSpriteGroup")) return;
+		for (auto &airport : airports) {
+			AirportSpec *as = airport >= _cur_gps.grffile->airportspec.size() ? nullptr : _cur_gps.grffile->airportspec[airport].get();
+			if (as == nullptr) {
+				GrfMsg(1, "AirportMapSpriteGroup: Airport {} undefined, skipping", airport);
+				continue;
+			}
 
-	for (auto &airport : airports) {
-		AirportSpec *as = airport >= _cur.grffile->airportspec.size() ? nullptr : _cur.grffile->airportspec[airport].get();
-
-		if (as == nullptr) {
-			GrfMsg(1, "AirportMapSpriteGroup: Airport {} undefined, skipping", airport);
-			continue;
+			as->grf_prop.SetSpriteGroup(key, _cur_gps.spritegroups[groupid]);
 		}
+	};
 
-		as->grf_prop.SetSpriteGroup(0, _cur.spritegroups[groupid]);
+	uint8_t cidcount = buf.ReadByte();
+	for (uint c = 0; c < cidcount; c++) {
+		uint8_t ctype = buf.ReadByte();
+		uint16_t groupid = buf.ReadWord();
+		if (ctype == 0xFF) {
+			set_sprite_group(StandardSpriteGroup::Purchase, groupid);
+		} else {
+			GrfMsg(1, "AirportMapSpriteGroup: Invalid cargo bitnum {} for airports, skipping.", ctype);
+		}
 	}
+	set_sprite_group(StandardSpriteGroup::Default, buf.ReadWord());
 }
 
 static void AirportTileMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->airtspec.empty()) {
+	if (_cur_gps.grffile->airtspec.empty()) {
 		GrfMsg(1, "AirportTileMapSpriteGroup: No airport tiles defined, skipping");
 		return;
 	}
@@ -531,28 +563,36 @@ static void AirportTileMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		airptiles.push_back(buf.ReadExtendedByte());
 	}
 
-	/* Skip the cargo type section, we only care about the default group */
-	uint8_t cidcount = buf.ReadByte();
-	buf.Skip(cidcount * 3);
+	auto set_sprite_group = [&airptiles](StandardSpriteGroup key, uint16_t groupid) {
+		if (!IsValidGroupID(groupid, "AirportTileMapSpriteGroup")) return;
 
-	uint16_t groupid = buf.ReadWord();
-	if (!IsValidGroupID(groupid, "AirportTileMapSpriteGroup")) return;
+		for (auto &airptile : airptiles) {
+			AirportTileSpec *airtsp = airptile >= _cur_gps.grffile->airtspec.size() ? nullptr : _cur_gps.grffile->airtspec[airptile].get();
+			if (airtsp == nullptr) {
+				GrfMsg(1, "AirportTileMapSpriteGroup: Airport tile {} undefined, skipping", airptile);
+				continue;
+			}
 
-	for (auto &airptile : airptiles) {
-		AirportTileSpec *airtsp = airptile >= _cur.grffile->airtspec.size() ? nullptr : _cur.grffile->airtspec[airptile].get();
-
-		if (airtsp == nullptr) {
-			GrfMsg(1, "AirportTileMapSpriteGroup: Airport tile {} undefined, skipping", airptile);
-			continue;
+			airtsp->grf_prop.SetSpriteGroup(key, _cur_gps.spritegroups[groupid]);
 		}
+	};
 
-		airtsp->grf_prop.SetSpriteGroup(0, _cur.spritegroups[groupid]);
+	uint8_t cidcount = buf.ReadByte();
+	for (uint c = 0; c < cidcount; c++) {
+		uint8_t ctype = buf.ReadByte();
+		uint16_t groupid = buf.ReadWord();
+		if (ctype == 0xFF) {
+			set_sprite_group(StandardSpriteGroup::Purchase, groupid);
+		} else {
+			GrfMsg(1, "AirportTileMapSpriteGroup: Invalid cargo bitnum {} for airport tiles, skipping.", ctype);
+		}
 	}
+	set_sprite_group(StandardSpriteGroup::Default, buf.ReadWord());
 }
 
 static void RoadStopMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->roadstops.empty()) {
+	if (_cur_gps.grffile->roadstops.empty()) {
 		GrfMsg(1, "RoadStopMapSpriteGroup: No roadstops defined, skipping");
 		return;
 	}
@@ -569,18 +609,18 @@ static void RoadStopMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		uint16_t groupid = buf.ReadWord();
 		if (!IsValidGroupID(groupid, "RoadStopMapSpriteGroup")) continue;
 
-		ctype = TranslateCargo(GSF_ROADSTOPS, ctype);
-		if (!IsValidCargoType(ctype)) continue;
+		CargoType cargo_type = TranslateCargo(GSF_ROADSTOPS, ctype);
+		if (!IsValidCargoType(cargo_type)) continue;
 
 		for (auto &roadstop : roadstops) {
-			RoadStopSpec *roadstopspec = roadstop >= _cur.grffile->roadstops.size() ? nullptr : _cur.grffile->roadstops[roadstop].get();
+			RoadStopSpec *roadstopspec = roadstop >= _cur_gps.grffile->roadstops.size() ? nullptr : _cur_gps.grffile->roadstops[roadstop].get();
 
 			if (roadstopspec == nullptr) {
 				GrfMsg(1, "RoadStopMapSpriteGroup: Road stop {} undefined, skipping", roadstop);
 				continue;
 			}
 
-			roadstopspec->grf_prop.SetSpriteGroup(ctype, _cur.spritegroups[groupid]);
+			roadstopspec->grf_prop.SetSpriteGroup(cargo_type, _cur_gps.spritegroups[groupid]);
 		}
 	}
 
@@ -588,7 +628,7 @@ static void RoadStopMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 	if (!IsValidGroupID(groupid, "RoadStopMapSpriteGroup")) return;
 
 	for (auto &roadstop : roadstops) {
-		RoadStopSpec *roadstopspec = roadstop >= _cur.grffile->roadstops.size() ? nullptr : _cur.grffile->roadstops[roadstop].get();
+		RoadStopSpec *roadstopspec = roadstop >= _cur_gps.grffile->roadstops.size() ? nullptr : _cur_gps.grffile->roadstops[roadstop].get();
 
 		if (roadstopspec == nullptr) {
 			GrfMsg(1, "RoadStopMapSpriteGroup: Road stop {} undefined, skipping.", roadstop);
@@ -600,8 +640,8 @@ static void RoadStopMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 			continue;
 		}
 
-		roadstopspec->grf_prop.SetSpriteGroup(SpriteGroupCargo::SG_DEFAULT, _cur.spritegroups[groupid]);
-		roadstopspec->grf_prop.SetGRFFile(_cur.grffile);
+		roadstopspec->grf_prop.SetSpriteGroup(CargoGRFFileProps::SG_DEFAULT, _cur_gps.spritegroups[groupid]);
+		roadstopspec->grf_prop.SetGRFFile(_cur_gps.grffile);
 		roadstopspec->grf_prop.local_id = roadstop;
 		RoadStopClass::Assign(roadstopspec);
 	}
@@ -609,7 +649,7 @@ static void RoadStopMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 
 static void BadgeMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 {
-	if (_cur.grffile->badge_map.empty()) {
+	if (_cur_gps.grffile->badge_map.empty()) {
 		GrfMsg(1, "BadgeMapSpriteGroup: No badges defined, skipping");
 		return;
 	}
@@ -629,14 +669,14 @@ static void BadgeMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 		if (ctype >= GSF_END) continue;
 
 		for (const auto &local_id : local_ids) {
-			auto found = _cur.grffile->badge_map.find(local_id);
-			if (found == std::end(_cur.grffile->badge_map)) {
+			auto found = _cur_gps.grffile->badge_map.find(local_id);
+			if (found == std::end(_cur_gps.grffile->badge_map)) {
 				GrfMsg(1, "BadgeMapSpriteGroup: Badge {} undefined, skipping", local_id);
 				continue;
 			}
 
 			auto &badge = *GetBadge(found->second);
-			badge.grf_prop.SetSpriteGroup(ctype, _cur.spritegroups[groupid]);
+			badge.grf_prop.SetSpriteGroup(static_cast<GrfSpecFeature>(ctype), _cur_gps.spritegroups[groupid]);
 		}
 	}
 
@@ -644,15 +684,15 @@ static void BadgeMapSpriteGroup(ByteReader &buf, uint8_t idcount)
 	if (!IsValidGroupID(groupid, "BadgeMapSpriteGroup")) return;
 
 	for (auto &local_id : local_ids) {
-		auto found = _cur.grffile->badge_map.find(local_id);
-		if (found == std::end(_cur.grffile->badge_map)) {
+		auto found = _cur_gps.grffile->badge_map.find(local_id);
+		if (found == std::end(_cur_gps.grffile->badge_map)) {
 			GrfMsg(1, "BadgeMapSpriteGroup: Badge {} undefined, skipping", local_id);
 			continue;
 		}
 
 		auto &badge = *GetBadge(found->second);
-		badge.grf_prop.SetSpriteGroup(GSF_END, _cur.spritegroups[groupid]);
-		badge.grf_prop.SetGRFFile(_cur.grffile);
+		badge.grf_prop.SetSpriteGroup(GSF_DEFAULT, _cur_gps.spritegroups[groupid]);
+		badge.grf_prop.SetGRFFile(_cur_gps.grffile);
 		badge.grf_prop.local_id = local_id;
 	}
 }
@@ -674,7 +714,7 @@ static void FeatureMapSpriteGroup(ByteReader &buf)
 	 * W cid           cargo ID (sprite group ID) for this type of cargo
 	 * W def-cid       default cargo ID (sprite group ID) */
 
-	uint8_t feature = buf.ReadByte();
+	GrfSpecFeature feature{buf.ReadByte()};
 	uint8_t idcount = buf.ReadByte();
 
 	if (feature >= GSF_END) {
@@ -691,12 +731,12 @@ static void FeatureMapSpriteGroup(ByteReader &buf)
 
 		GrfMsg(6, "FeatureMapSpriteGroup: Adding generic feature callback for feature 0x{:02X}", feature);
 
-		AddGenericCallback(feature, _cur.grffile, _cur.spritegroups[groupid]);
+		AddGenericCallback(feature, _cur_gps.grffile, _cur_gps.spritegroups[groupid]);
 		return;
 	}
 
 	/* Mark the feature as used by the grf (generic callbacks do not count) */
-	SetBit(_cur.grffile->grf_features, feature);
+	_cur_gps.grffile->grf_features.Set(feature);
 
 	GrfMsg(6, "FeatureMapSpriteGroup: Feature 0x{:02X}, {} ids", feature, idcount);
 
diff --git a/src/newgrf/newgrf_act4.cpp b/src/newgrf/newgrf_act4.cpp
index 38c6701d67..f0559a13f2 100644
--- a/src/newgrf/newgrf_act4.cpp
+++ b/src/newgrf/newgrf_act4.cpp
@@ -46,10 +46,10 @@ static void FeatureNewName(ByteReader &buf)
 	 * S data          new texts, each of them zero-terminated, after
 	 *                 which the next name begins. */
 
-	bool new_scheme = _cur.grffile->grf_version >= 7;
+	bool new_scheme = _cur_gps.grffile->grf_version >= 7;
 
-	uint8_t feature  = buf.ReadByte();
-	if (feature >= GSF_END && feature != 0x48) {
+	GrfSpecFeature feature{buf.ReadByte()};
+	if (feature >= GSF_END && feature != GSF_ORIGINAL_STRINGS) {
 		GrfMsg(1, "FeatureNewName: Unsupported feature 0x{:02X}, skipping", feature);
 		return;
 	}
@@ -77,7 +77,7 @@ static void FeatureNewName(ByteReader &buf)
 	uint32_t feature_overlay = generic ? 0 : ((feature + 1) << 16);
 
 	for (; id < endid && buf.HasData(); id++) {
-		const std::string_view name = buf.ReadString();
+		std::string_view name = buf.ReadString();
 		GrfMsg(8, "FeatureNewName: 0x{:04X} <- {}", id, StrMakeValid(name));
 
 		switch (feature) {
@@ -86,67 +86,67 @@ static void FeatureNewName(ByteReader &buf)
 			case GSF_SHIPS:
 			case GSF_AIRCRAFT:
 				if (!generic) {
-					Engine *e = GetNewEngine(_cur.grffile, (VehicleType)feature, id, _cur.grfconfig->flags.Test(GRFConfigFlag::Static));
+					Engine *e = GetNewEngine(_cur_gps.grffile, (VehicleType)feature, id, _cur_gps.grfconfig->flags.Test(GRFConfigFlag::Static));
 					if (e == nullptr) break;
-					StringID string = AddGRFString(_cur.grffile->grfid, GRFStringID{feature_overlay | e->index.base()}, lang, new_scheme, false, name, e->info.string_id);
+					StringID string = AddGRFString(_cur_gps.grffile->grfid, GRFStringID{feature_overlay | e->index.base()}, lang, new_scheme, false, name, e->info.string_id);
 					e->info.string_id = string;
 				} else {
-					AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, true, name, STR_UNDEFINED);
+					AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, true, name, STR_UNDEFINED);
 				}
 				break;
 
 			case GSF_BADGES: {
 				if (!generic) {
-					auto found = _cur.grffile->badge_map.find(id);
-					if (found == std::end(_cur.grffile->badge_map)) {
+					auto found = _cur_gps.grffile->badge_map.find(id);
+					if (found == std::end(_cur_gps.grffile->badge_map)) {
 						GrfMsg(1, "FeatureNewName: Attempt to name undefined badge 0x{:X}, ignoring", id);
 					} else {
 						Badge &badge = *GetBadge(found->second);
-						badge.name = AddGRFString(_cur.grffile->grfid, GRFStringID{feature_overlay | id}, lang, true, false, name, STR_UNDEFINED);
+						badge.name = AddGRFString(_cur_gps.grffile->grfid, GRFStringID{feature_overlay | id}, lang, true, false, name, STR_UNDEFINED);
 					}
 				} else {
-					AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, true, name, STR_UNDEFINED);
+					AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, true, name, STR_UNDEFINED);
 				}
 				break;
 			}
 
 			default:
 				if (IsInsideMM(id, 0xD000, 0xD400) || IsInsideMM(id, 0xD800, 0x10000)) {
-					AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, true, name, STR_UNDEFINED);
+					AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, true, name, STR_UNDEFINED);
 					break;
 				}
 
 				switch (GB(id, 8, 8)) {
 					case 0xC4: // Station class name
-						if (GB(id, 0, 8) >= _cur.grffile->stations.size() || _cur.grffile->stations[GB(id, 0, 8)] == nullptr) {
+						if (GB(id, 0, 8) >= _cur_gps.grffile->stations.size() || _cur_gps.grffile->stations[GB(id, 0, 8)] == nullptr) {
 							GrfMsg(1, "FeatureNewName: Attempt to name undefined station 0x{:X}, ignoring", GB(id, 0, 8));
 						} else {
-							StationClassID class_index = _cur.grffile->stations[GB(id, 0, 8)]->class_index;
-							StationClass::Get(class_index)->name = AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
+							StationClassID class_index = _cur_gps.grffile->stations[GB(id, 0, 8)]->class_index;
+							StationClass::Get(class_index)->name = AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
 						}
 						break;
 
 					case 0xC5: // Station name
-						if (GB(id, 0, 8) >= _cur.grffile->stations.size() || _cur.grffile->stations[GB(id, 0, 8)] == nullptr) {
+						if (GB(id, 0, 8) >= _cur_gps.grffile->stations.size() || _cur_gps.grffile->stations[GB(id, 0, 8)] == nullptr) {
 							GrfMsg(1, "FeatureNewName: Attempt to name undefined station 0x{:X}, ignoring", GB(id, 0, 8));
 						} else {
-							_cur.grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
+							_cur_gps.grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
 						}
 						break;
 
 					case 0xC7: // Airporttile name
-						if (GB(id, 0, 8) >= _cur.grffile->airtspec.size() || _cur.grffile->airtspec[GB(id, 0, 8)] == nullptr) {
+						if (GB(id, 0, 8) >= _cur_gps.grffile->airtspec.size() || _cur_gps.grffile->airtspec[GB(id, 0, 8)] == nullptr) {
 							GrfMsg(1, "FeatureNewName: Attempt to name undefined airport tile 0x{:X}, ignoring", GB(id, 0, 8));
 						} else {
-							_cur.grffile->airtspec[GB(id, 0, 8)]->name = AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
+							_cur_gps.grffile->airtspec[GB(id, 0, 8)]->name = AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
 						}
 						break;
 
 					case 0xC9: // House name
-						if (GB(id, 0, 8) >= _cur.grffile->housespec.size() || _cur.grffile->housespec[GB(id, 0, 8)] == nullptr) {
+						if (GB(id, 0, 8) >= _cur_gps.grffile->housespec.size() || _cur_gps.grffile->housespec[GB(id, 0, 8)] == nullptr) {
 							GrfMsg(1, "FeatureNewName: Attempt to name undefined house 0x{:X}, ignoring.", GB(id, 0, 8));
 						} else {
-							_cur.grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
+							_cur_gps.grffile->housespec[GB(id, 0, 8)]->building_name = AddGRFString(_cur_gps.grffile->grfid, GRFStringID{id}, lang, new_scheme, false, name, STR_UNDEFINED);
 						}
 						break;
 
diff --git a/src/newgrf/newgrf_act5.cpp b/src/newgrf/newgrf_act5.cpp
index 751ef0aa97..e9b590dfb2 100644
--- a/src/newgrf/newgrf_act5.cpp
+++ b/src/newgrf/newgrf_act5.cpp
@@ -27,7 +27,7 @@
  * @param name        Used for error warnings.
  * @return The number of sprites that is going to be skipped.
  */
-static uint16_t SanitizeSpriteOffset(uint16_t &num, uint16_t offset, int max_sprites, const std::string_view name)
+static uint16_t SanitizeSpriteOffset(uint16_t &num, uint16_t offset, int max_sprites, std::string_view name)
 {
 
 	if (offset >= max_sprites) {
@@ -103,20 +103,20 @@ static void GraphicsNew(ByteReader &buf)
 	uint16_t offset = HasBit(type, 7) ? buf.ReadExtendedByte() : 0;
 	ClrBit(type, 7); // Clear the high bit as that only indicates whether there is an offset.
 
-	if ((type == 0x0D) && (num == 10) && _cur.grfconfig->flags.Test(GRFConfigFlag::System)) {
+	if ((type == 0x0D) && (num == 10) && _cur_gps.grfconfig->flags.Test(GRFConfigFlag::System)) {
 		/* Special not-TTDP-compatible case used in openttd.grf
 		 * Missing shore sprites and initialisation of SPR_SHORE_BASE */
 		GrfMsg(2, "GraphicsNew: Loading 10 missing shore sprites from extra grf.");
-		LoadNextSprite(SPR_SHORE_BASE +  0, *_cur.file, _cur.nfo_line++); // SLOPE_STEEP_S
-		LoadNextSprite(SPR_SHORE_BASE +  5, *_cur.file, _cur.nfo_line++); // SLOPE_STEEP_W
-		LoadNextSprite(SPR_SHORE_BASE +  7, *_cur.file, _cur.nfo_line++); // SLOPE_WSE
-		LoadNextSprite(SPR_SHORE_BASE + 10, *_cur.file, _cur.nfo_line++); // SLOPE_STEEP_N
-		LoadNextSprite(SPR_SHORE_BASE + 11, *_cur.file, _cur.nfo_line++); // SLOPE_NWS
-		LoadNextSprite(SPR_SHORE_BASE + 13, *_cur.file, _cur.nfo_line++); // SLOPE_ENW
-		LoadNextSprite(SPR_SHORE_BASE + 14, *_cur.file, _cur.nfo_line++); // SLOPE_SEN
-		LoadNextSprite(SPR_SHORE_BASE + 15, *_cur.file, _cur.nfo_line++); // SLOPE_STEEP_E
-		LoadNextSprite(SPR_SHORE_BASE + 16, *_cur.file, _cur.nfo_line++); // SLOPE_EW
-		LoadNextSprite(SPR_SHORE_BASE + 17, *_cur.file, _cur.nfo_line++); // SLOPE_NS
+		LoadNextSprite(SPR_SHORE_BASE +  0, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_STEEP_S
+		LoadNextSprite(SPR_SHORE_BASE +  5, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_STEEP_W
+		LoadNextSprite(SPR_SHORE_BASE +  7, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_WSE
+		LoadNextSprite(SPR_SHORE_BASE + 10, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_STEEP_N
+		LoadNextSprite(SPR_SHORE_BASE + 11, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_NWS
+		LoadNextSprite(SPR_SHORE_BASE + 13, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_ENW
+		LoadNextSprite(SPR_SHORE_BASE + 14, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_SEN
+		LoadNextSprite(SPR_SHORE_BASE + 15, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_STEEP_E
+		LoadNextSprite(SPR_SHORE_BASE + 16, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_EW
+		LoadNextSprite(SPR_SHORE_BASE + 17, *_cur_gps.file, _cur_gps.nfo_line++); // SLOPE_NS
 		if (_loaded_newgrf_features.shore == SHORE_REPLACE_NONE) _loaded_newgrf_features.shore = SHORE_REPLACE_ONLY_NEW;
 		return;
 	}
@@ -124,7 +124,7 @@ static void GraphicsNew(ByteReader &buf)
 	/* Supported type? */
 	if ((type >= std::size(_action5_types)) || (_action5_types[type].block_type == A5BLOCK_INVALID)) {
 		GrfMsg(2, "GraphicsNew: Custom graphics (type 0x{:02X}) sprite block of length {} (unimplemented, ignoring)", type, num);
-		_cur.skip_sprites = num;
+		_cur_gps.skip_sprites = num;
 		return;
 	}
 
@@ -142,7 +142,7 @@ static void GraphicsNew(ByteReader &buf)
 	 * This does not make sense, if <offset> is allowed */
 	if ((action5_type->block_type == A5BLOCK_FIXED) && (num < action5_type->min_sprites)) {
 		GrfMsg(1, "GraphicsNew: {} (type 0x{:02X}) count must be at least {}. Only {} were specified. Skipping.", action5_type->name, type, action5_type->min_sprites, num);
-		_cur.skip_sprites = num;
+		_cur_gps.skip_sprites = num;
 		return;
 	}
 
@@ -166,16 +166,16 @@ static void GraphicsNew(ByteReader &buf)
 	bool dup_oneway_sprites = ((type == 0x09) && (offset + num <= ONEWAY_SLOPE_N_OFFSET));
 
 	for (; num > 0; num--) {
-		_cur.nfo_line++;
-		SpriteID load_index = (replace == 0 ? _cur.spriteid++ : replace++);
-		LoadNextSprite(load_index, *_cur.file, _cur.nfo_line);
+		_cur_gps.nfo_line++;
+		SpriteID load_index = (replace == 0 ? _cur_gps.spriteid++ : replace++);
+		LoadNextSprite(load_index, *_cur_gps.file, _cur_gps.nfo_line);
 		if (dup_oneway_sprites) {
 			DupSprite(load_index, load_index + ONEWAY_SLOPE_N_OFFSET);
 			DupSprite(load_index, load_index + ONEWAY_SLOPE_S_OFFSET);
 		}
 	}
 
-	_cur.skip_sprites = skip_num;
+	_cur_gps.skip_sprites = skip_num;
 }
 
 /* Action 0x05 (SKIP) */
@@ -185,9 +185,9 @@ static void SkipAct5(ByteReader &buf)
 	buf.ReadByte();
 
 	/* Skip the sprites of this action */
-	_cur.skip_sprites = buf.ReadExtendedByte();
+	_cur_gps.skip_sprites = buf.ReadExtendedByte();
 
-	GrfMsg(3, "SkipAct5: Skipping {} sprites", _cur.skip_sprites);
+	GrfMsg(3, "SkipAct5: Skipping {} sprites", _cur_gps.skip_sprites);
 }
 
 template <> void GrfActionHandler<0x05>::FileScan(ByteReader &buf) { SkipAct5(buf); }
diff --git a/src/newgrf/newgrf_act6.cpp b/src/newgrf/newgrf_act6.cpp
index 34390adc95..a30dcb2092 100644
--- a/src/newgrf/newgrf_act6.cpp
+++ b/src/newgrf/newgrf_act6.cpp
@@ -32,7 +32,7 @@ static void CfgApply(ByteReader &buf)
 	 *                 to place where parameter is to be stored. */
 
 	/* Preload the next sprite */
-	SpriteFile &file = *_cur.file;
+	SpriteFile &file = *_cur_gps.file;
 	size_t pos = file.GetPos();
 	uint32_t num = file.GetContainerVersion() >= 2 ? file.ReadDword() : file.ReadWord();
 	uint8_t type = file.ReadByte();
@@ -47,7 +47,7 @@ static void CfgApply(ByteReader &buf)
 	}
 
 	/* Get (or create) the override for the next sprite. */
-	GRFLocation location(_cur.grfconfig->ident.grfid, _cur.nfo_line + 1);
+	GRFLocation location(_cur_gps.grfconfig->ident.grfid, _cur_gps.nfo_line + 1);
 	std::vector<uint8_t> &preload_sprite = _grf_line_to_action6_sprite_override[location];
 
 	/* Load new sprite data if it hasn't already been loaded. */
@@ -85,7 +85,7 @@ static void CfgApply(ByteReader &buf)
 
 		/* If the parameter is a GRF parameter (not an internal variable) check
 		 * if it (and all further sequential parameters) has been defined. */
-		if (param_num < 0x80 && (param_num + (param_size - 1) / 4) >= std::size(_cur.grffile->param)) {
+		if (param_num < 0x80 && (param_num + (param_size - 1) / 4) >= std::size(_cur_gps.grffile->param)) {
 			GrfMsg(2, "CfgApply: Ignoring (param {} not set)", (param_num + (param_size - 1) / 4));
 			break;
 		}
diff --git a/src/newgrf/newgrf_act7_9.cpp b/src/newgrf/newgrf_act7_9.cpp
index bb36fc0781..4d08d2e67e 100644
--- a/src/newgrf/newgrf_act7_9.cpp
+++ b/src/newgrf/newgrf_act7_9.cpp
@@ -117,7 +117,7 @@ uint32_t GetParamVal(uint8_t param, uint32_t *cond_val)
 {
 	/* First handle variable common with VarAction2 */
 	uint32_t value;
-	if (GetGlobalVariable(param - 0x80, &value, _cur.grffile)) return value;
+	if (GetGlobalVariable(param - 0x80, &value, _cur_gps.grffile)) return value;
 
 
 	/* Non-common variable */
@@ -125,9 +125,9 @@ uint32_t GetParamVal(uint8_t param, uint32_t *cond_val)
 		case 0x84: { // GRF loading stage
 			uint32_t res = 0;
 
-			if (_cur.stage > GLS_INIT) SetBit(res, 0);
-			if (_cur.stage == GLS_RESERVE) SetBit(res, 8);
-			if (_cur.stage == GLS_ACTIVATION) SetBit(res, 9);
+			if (_cur_gps.stage > GLS_INIT) SetBit(res, 0);
+			if (_cur_gps.stage == GLS_RESERVE) SetBit(res, 8);
+			if (_cur_gps.stage == GLS_ACTIVATION) SetBit(res, 9);
 			return res;
 		}
 
@@ -149,7 +149,7 @@ uint32_t GetParamVal(uint8_t param, uint32_t *cond_val)
 
 		default:
 			/* GRF Parameter */
-			if (param < 0x80) return _cur.grffile->GetParam(param);
+			if (param < 0x80) return _cur_gps.grffile->GetParam(param);
 
 			/* In-game variable. */
 			GrfMsg(1, "Unsupported in-game variable 0x{:02X}", param);
@@ -189,7 +189,7 @@ static void SkipIf(ByteReader &buf)
 		default: break;
 	}
 
-	if (param < 0x80 && std::size(_cur.grffile->param) <= param) {
+	if (param < 0x80 && std::size(_cur_gps.grffile->param) <= param) {
 		GrfMsg(7, "SkipIf: Param {} undefined, skipping test", param);
 		return;
 	}
@@ -237,7 +237,7 @@ static void SkipIf(ByteReader &buf)
 
 		GRFConfig *c = GetGRFConfig(cond_val, mask);
 
-		if (c != nullptr && c->flags.Test(GRFConfigFlag::Static) && !_cur.grfconfig->flags.Test(GRFConfigFlag::Static) && _networking) {
+		if (c != nullptr && c->flags.Test(GRFConfigFlag::Static) && !_cur_gps.grfconfig->flags.Test(GRFConfigFlag::Static) && _networking) {
 			DisableStaticNewGRFInfluencingNonStaticNewGRFs(*c);
 			c = nullptr;
 		}
@@ -304,13 +304,13 @@ static void SkipIf(ByteReader &buf)
 	 * the current nfo_line. If no matching label is found, the first matching
 	 * label in the file is used. */
 	const GRFLabel *choice = nullptr;
-	for (const auto &label : _cur.grffile->labels) {
+	for (const auto &label : _cur_gps.grffile->labels) {
 		if (label.label != numsprites) continue;
 
 		/* Remember a goto before the current line */
 		if (choice == nullptr) choice = &label;
 		/* If we find a label here, this is definitely good */
-		if (label.nfo_line > _cur.nfo_line) {
+		if (label.nfo_line > _cur_gps.nfo_line) {
 			choice = &label;
 			break;
 		}
@@ -318,21 +318,21 @@ static void SkipIf(ByteReader &buf)
 
 	if (choice != nullptr) {
 		GrfMsg(2, "SkipIf: Jumping to label 0x{:X} at line {}, test was true", choice->label, choice->nfo_line);
-		_cur.file->SeekTo(choice->pos, SEEK_SET);
-		_cur.nfo_line = choice->nfo_line;
+		_cur_gps.file->SeekTo(choice->pos, SEEK_SET);
+		_cur_gps.nfo_line = choice->nfo_line;
 		return;
 	}
 
 	GrfMsg(2, "SkipIf: Skipping {} sprites, test was true", numsprites);
-	_cur.skip_sprites = numsprites;
-	if (_cur.skip_sprites == 0) {
+	_cur_gps.skip_sprites = numsprites;
+	if (_cur_gps.skip_sprites == 0) {
 		/* Zero means there are no sprites to skip, so
 		 * we use -1 to indicate that all further
 		 * sprites should be skipped. */
-		_cur.skip_sprites = -1;
+		_cur_gps.skip_sprites = -1;
 
 		/* If an action 8 hasn't been encountered yet, disable the grf. */
-		if (_cur.grfconfig->status != (_cur.stage < GLS_RESERVE ? GCS_INITIALISED : GCS_ACTIVATED)) {
+		if (_cur_gps.grfconfig->status != (_cur_gps.stage < GLS_RESERVE ? GCS_INITIALISED : GCS_ACTIVATED)) {
 			DisableGrf();
 		}
 	}
diff --git a/src/newgrf/newgrf_act8.cpp b/src/newgrf/newgrf_act8.cpp
index d71365070a..129377e15a 100644
--- a/src/newgrf/newgrf_act8.cpp
+++ b/src/newgrf/newgrf_act8.cpp
@@ -13,7 +13,7 @@
 #include "newgrf_bytereader.h"
 #include "newgrf_internal.h"
 
-#include "../table/strings.h"
+#include "table/strings.h"
 
 #include "../safeguards.h"
 
@@ -24,25 +24,25 @@ static void ScanInfo(ByteReader &buf)
 	uint32_t grfid      = buf.ReadDWord();
 	std::string_view name = buf.ReadString();
 
-	_cur.grfconfig->ident.grfid = grfid;
+	_cur_gps.grfconfig->ident.grfid = grfid;
 
 	if (grf_version < 2 || grf_version > 8) {
-		_cur.grfconfig->flags.Set(GRFConfigFlag::Invalid);
-		Debug(grf, 0, "{}: NewGRF \"{}\" (GRFID {:08X}) uses GRF version {}, which is incompatible with this version of OpenTTD.", _cur.grfconfig->filename, StrMakeValid(name), std::byteswap(grfid), grf_version);
+		_cur_gps.grfconfig->flags.Set(GRFConfigFlag::Invalid);
+		Debug(grf, 0, "{}: NewGRF \"{}\" (GRFID {:08X}) uses GRF version {}, which is incompatible with this version of OpenTTD.", _cur_gps.grfconfig->filename, StrMakeValid(name), std::byteswap(grfid), grf_version);
 	}
 
 	/* GRF IDs starting with 0xFF are reserved for internal TTDPatch use */
-	if (GB(grfid, 0, 8) == 0xFF) _cur.grfconfig->flags.Set(GRFConfigFlag::System);
+	if (GB(grfid, 0, 8) == 0xFF) _cur_gps.grfconfig->flags.Set(GRFConfigFlag::System);
 
-	AddGRFTextToList(_cur.grfconfig->name, 0x7F, grfid, false, name);
+	AddGRFTextToList(_cur_gps.grfconfig->name, 0x7F, grfid, false, name);
 
 	if (buf.HasData()) {
 		std::string_view info = buf.ReadString();
-		AddGRFTextToList(_cur.grfconfig->info, 0x7F, grfid, true, info);
+		AddGRFTextToList(_cur_gps.grfconfig->info, 0x7F, grfid, true, info);
 	}
 
 	/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */
-	_cur.skip_sprites = -1;
+	_cur_gps.skip_sprites = -1;
 }
 
 /* Action 0x08 */
@@ -59,21 +59,21 @@ static void GRFInfo(ByteReader &buf)
 	uint32_t grfid     = buf.ReadDWord();
 	std::string_view name = buf.ReadString();
 
-	if (_cur.stage < GLS_RESERVE && _cur.grfconfig->status != GCS_UNKNOWN) {
+	if (_cur_gps.stage < GLS_RESERVE && _cur_gps.grfconfig->status != GCS_UNKNOWN) {
 		DisableGrf(STR_NEWGRF_ERROR_MULTIPLE_ACTION_8);
 		return;
 	}
 
-	if (_cur.grffile->grfid != grfid) {
-		Debug(grf, 0, "GRFInfo: GRFID {:08X} in FILESCAN stage does not match GRFID {:08X} in INIT/RESERVE/ACTIVATION stage", std::byteswap(_cur.grffile->grfid), std::byteswap(grfid));
-		_cur.grffile->grfid = grfid;
+	if (_cur_gps.grffile->grfid != grfid) {
+		Debug(grf, 0, "GRFInfo: GRFID {:08X} in FILESCAN stage does not match GRFID {:08X} in INIT/RESERVE/ACTIVATION stage", std::byteswap(_cur_gps.grffile->grfid), std::byteswap(grfid));
+		_cur_gps.grffile->grfid = grfid;
 	}
 
-	_cur.grffile->grf_version = version;
-	_cur.grfconfig->status = _cur.stage < GLS_RESERVE ? GCS_INITIALISED : GCS_ACTIVATED;
+	_cur_gps.grffile->grf_version = version;
+	_cur_gps.grfconfig->status = _cur_gps.stage < GLS_RESERVE ? GCS_INITIALISED : GCS_ACTIVATED;
 
 	/* Do swap the GRFID for displaying purposes since people expect that */
-	Debug(grf, 1, "GRFInfo: Loaded GRFv{} set {:08X} - {} (palette: {}, version: {})", version, std::byteswap(grfid), StrMakeValid(name), (_cur.grfconfig->palette & GRFP_USE_MASK) ? "Windows" : "DOS", _cur.grfconfig->version);
+	Debug(grf, 1, "GRFInfo: Loaded GRFv{} set {:08X} - {} (palette: {}, version: {})", version, std::byteswap(grfid), StrMakeValid(name), (_cur_gps.grfconfig->palette & GRFP_USE_MASK) ? "Windows" : "DOS", _cur_gps.grfconfig->version);
 }
 
 template <> void GrfActionHandler<0x08>::FileScan(ByteReader &buf) { ScanInfo(buf); }
diff --git a/src/newgrf/newgrf_acta.cpp b/src/newgrf/newgrf_acta.cpp
index b66bd35837..ba4e509bc4 100644
--- a/src/newgrf/newgrf_acta.cpp
+++ b/src/newgrf/newgrf_acta.cpp
@@ -26,7 +26,7 @@
 static bool IsGRMReservedSprite(SpriteID first_sprite, uint16_t num_sprites)
 {
 	for (const auto &grm_sprite : _grm_sprites) {
-		if (grm_sprite.first.grfid != _cur.grffile->grfid) continue;
+		if (grm_sprite.first.grfid != _cur_gps.grffile->grfid) continue;
 		if (grm_sprite.second.first <= first_sprite && grm_sprite.second.first + grm_sprite.second.second >= first_sprite + num_sprites) return true;
 	}
 	return false;
@@ -60,15 +60,15 @@ static void SpriteReplace(ByteReader &buf)
 					i, num_sprites, first_sprite, SPR_OPENTTD_BASE);
 
 				/* Load the sprites at the current location so they will do nothing instead of appearing to work. */
-				first_sprite = _cur.spriteid;
-				_cur.spriteid += num_sprites;
+				first_sprite = _cur_gps.spriteid;
+				_cur_gps.spriteid += num_sprites;
 			}
 		}
 
 		for (uint j = 0; j < num_sprites; j++) {
 			SpriteID load_index = first_sprite + j;
-			_cur.nfo_line++;
-			LoadNextSprite(load_index, *_cur.file, _cur.nfo_line); // XXX
+			_cur_gps.nfo_line++;
+			LoadNextSprite(load_index, *_cur_gps.file, _cur_gps.nfo_line); // XXX
 
 			/* Shore sprites now located at different addresses.
 			 * So detect when the old ones get replaced. */
@@ -86,12 +86,12 @@ static void SkipActA(ByteReader &buf)
 
 	for (uint i = 0; i < num_sets; i++) {
 		/* Skip the sprites this replaces */
-		_cur.skip_sprites += buf.ReadByte();
+		_cur_gps.skip_sprites += buf.ReadByte();
 		/* But ignore where they go */
 		buf.ReadWord();
 	}
 
-	GrfMsg(3, "SkipActA: Skipping {} sprites", _cur.skip_sprites);
+	GrfMsg(3, "SkipActA: Skipping {} sprites", _cur_gps.skip_sprites);
 }
 
 template <> void GrfActionHandler<0x0A>::FileScan(ByteReader &buf) { SkipActA(buf); }
diff --git a/src/newgrf/newgrf_actb.cpp b/src/newgrf/newgrf_actb.cpp
index a462bbf0c2..53aed45267 100644
--- a/src/newgrf/newgrf_actb.cpp
+++ b/src/newgrf/newgrf_actb.cpp
@@ -56,12 +56,12 @@ static void GRFLoadError(ByteReader &buf)
 	uint8_t message_id = buf.ReadByte();
 
 	/* Skip the error if it isn't valid for the current language. */
-	if (!CheckGrfLangID(lang, _cur.grffile->grf_version)) return;
+	if (!CheckGrfLangID(lang, _cur_gps.grffile->grf_version)) return;
 
 	/* Skip the error until the activation stage unless bit 7 of the severity
 	 * is set. */
-	if (!HasBit(severity, 7) && _cur.stage == GLS_INIT) {
-		GrfMsg(7, "GRFLoadError: Skipping non-fatal GRFLoadError in stage {}", _cur.stage);
+	if (!HasBit(severity, 7) && _cur_gps.stage == GLS_INIT) {
+		GrfMsg(7, "GRFLoadError: Skipping non-fatal GRFLoadError in stage {}", _cur_gps.stage);
 		return;
 	}
 	ClrBit(severity, 7);
@@ -75,7 +75,7 @@ static void GRFLoadError(ByteReader &buf)
 		DisableGrf();
 
 		/* Make sure we show fatal errors, instead of silly infos from before */
-		_cur.grfconfig->error.reset();
+		_cur_gps.grfconfig->error.reset();
 	}
 
 	if (message_id >= lengthof(msgstr) && message_id != 0xFF) {
@@ -89,17 +89,17 @@ static void GRFLoadError(ByteReader &buf)
 	}
 
 	/* For now we can only show one message per newgrf file. */
-	if (_cur.grfconfig->error.has_value()) return;
+	if (_cur_gps.grfconfig->error.has_value()) return;
 
-	_cur.grfconfig->error = {sevstr[severity]};
-	GRFError *error = &_cur.grfconfig->error.value();
+	_cur_gps.grfconfig->error = {sevstr[severity]};
+	GRFError *error = &_cur_gps.grfconfig->error.value();
 
 	if (message_id == 0xFF) {
 		/* This is a custom error message. */
 		if (buf.HasData()) {
 			std::string_view message = buf.ReadString();
 
-			error->custom_message = TranslateTTDPatchCodes(_cur.grffile->grfid, lang, true, message, SCC_RAW_STRING_POINTER);
+			error->custom_message = TranslateTTDPatchCodes(_cur_gps.grffile->grfid, lang, true, message, SCC_RAW_STRING_POINTER);
 		} else {
 			GrfMsg(7, "GRFLoadError: No custom message supplied.");
 			error->custom_message.clear();
@@ -111,7 +111,7 @@ static void GRFLoadError(ByteReader &buf)
 	if (buf.HasData()) {
 		std::string_view data = buf.ReadString();
 
-		error->data = TranslateTTDPatchCodes(_cur.grffile->grfid, lang, true, data);
+		error->data = TranslateTTDPatchCodes(_cur_gps.grffile->grfid, lang, true, data);
 	} else {
 		GrfMsg(7, "GRFLoadError: No message data supplied.");
 		error->data.clear();
@@ -120,7 +120,7 @@ static void GRFLoadError(ByteReader &buf)
 	/* Only two parameter numbers can be used in the string. */
 	for (uint i = 0; i < error->param_value.size() && buf.HasData(); i++) {
 		uint param_number = buf.ReadByte();
-		error->param_value[i] = _cur.grffile->GetParam(param_number);
+		error->param_value[i] = _cur_gps.grffile->GetParam(param_number);
 	}
 }
 
diff --git a/src/newgrf/newgrf_actd.cpp b/src/newgrf/newgrf_actd.cpp
index 62bfa546e3..8231c9a192 100644
--- a/src/newgrf/newgrf_actd.cpp
+++ b/src/newgrf/newgrf_actd.cpp
@@ -132,18 +132,18 @@ static uint32_t GetPatchVariable(uint8_t param)
 	}
 }
 
-static uint32_t PerformGRM(std::span<uint32_t> grm, uint16_t count, uint8_t op, uint8_t target, const char *type)
+static uint32_t PerformGRM(std::span<uint32_t> grm, uint16_t count, uint8_t op, uint8_t target, std::string_view type)
 {
 	uint start = 0;
 	uint size  = 0;
 
 	if (op == 6) {
 		/* Return GRFID of set that reserved ID */
-		return grm[_cur.grffile->GetParam(target)];
+		return grm[_cur_gps.grffile->GetParam(target)];
 	}
 
 	/* With an operation of 2 or 3, we want to reserve a specific block of IDs */
-	if (op == 2 || op == 3) start = _cur.grffile->GetParam(target);
+	if (op == 2 || op == 3) start = _cur_gps.grffile->GetParam(target);
 
 	for (uint i = start; i < std::size(grm); i++) {
 		if (grm[i] == 0) {
@@ -161,7 +161,7 @@ static uint32_t PerformGRM(std::span<uint32_t> grm, uint16_t count, uint8_t op,
 		/* Got the slot... */
 		if (op == 0 || op == 3) {
 			GrfMsg(2, "ParamSet: GRM: Reserving {} {} at {}", count, type, start);
-			for (uint i = 0; i < count; i++) grm[start + i] = _cur.grffile->grfid;
+			for (uint i = 0; i < count; i++) grm[start + i] = _cur_gps.grffile->grfid;
 		}
 		return start;
 	}
@@ -218,7 +218,7 @@ static void ParamSet(ByteReader &buf)
 	 * - it OR A PARAMETER WITH HIGHER NUMBER has been set to any value by
 	 *   an earlier action D */
 	if (HasBit(oper, 7)) {
-		if (target < 0x80 && target < std::size(_cur.grffile->param)) {
+		if (target < 0x80 && target < std::size(_cur_gps.grffile->param)) {
 			GrfMsg(7, "ParamSet: Param {} already defined, skipping", target);
 			return;
 		}
@@ -234,43 +234,43 @@ static void ParamSet(ByteReader &buf)
 			} else {
 				/* GRF Resource Management */
 				uint8_t  op      = src1;
-				uint8_t  feature = GB(data, 8, 8);
+				GrfSpecFeature feature{static_cast<uint8_t>(GB(data, 8, 8))};
 				uint16_t count   = GB(data, 16, 16);
 
-				if (_cur.stage == GLS_RESERVE) {
-					if (feature == 0x08) {
+				if (_cur_gps.stage == GLS_RESERVE) {
+					if (feature == GSF_GLOBALVAR) {
 						/* General sprites */
 						if (op == 0) {
 							/* Check if the allocated sprites will fit below the original sprite limit */
-							if (_cur.spriteid + count >= 16384) {
+							if (_cur_gps.spriteid + count >= 16384) {
 								GrfMsg(0, "ParamSet: GRM: Unable to allocate {} sprites; try changing NewGRF order", count);
 								DisableGrf(STR_NEWGRF_ERROR_GRM_FAILED);
 								return;
 							}
 
 							/* Reserve space at the current sprite ID */
-							GrfMsg(4, "ParamSet: GRM: Allocated {} sprites at {}", count, _cur.spriteid);
-							_grm_sprites[GRFLocation(_cur.grffile->grfid, _cur.nfo_line)] = std::make_pair(_cur.spriteid, count);
-							_cur.spriteid += count;
+							GrfMsg(4, "ParamSet: GRM: Allocated {} sprites at {}", count, _cur_gps.spriteid);
+							_grm_sprites[GRFLocation(_cur_gps.grffile->grfid, _cur_gps.nfo_line)] = std::make_pair(_cur_gps.spriteid, count);
+							_cur_gps.spriteid += count;
 						}
 					}
 					/* Ignore GRM result during reservation */
 					src1 = 0;
-				} else if (_cur.stage == GLS_ACTIVATION) {
+				} else if (_cur_gps.stage == GLS_ACTIVATION) {
 					switch (feature) {
-						case 0x00: // Trains
-						case 0x01: // Road Vehicles
-						case 0x02: // Ships
-						case 0x03: // Aircraft
+						case GSF_TRAINS:
+						case GSF_ROADVEHICLES:
+						case GSF_SHIPS:
+						case GSF_AIRCRAFT:
 							if (!_settings_game.vehicle.dynamic_engines) {
 								src1 = PerformGRM({std::begin(_grm_engines) + _engine_offsets[feature], _engine_counts[feature]}, count, op, target, "vehicles");
-								if (_cur.skip_sprites == -1) return;
+								if (_cur_gps.skip_sprites == -1) return;
 							} else {
 								/* GRM does not apply for dynamic engine allocation. */
 								switch (op) {
 									case 2:
 									case 3:
-										src1 = _cur.grffile->GetParam(target);
+										src1 = _cur_gps.grffile->GetParam(target);
 										break;
 
 									default:
@@ -280,16 +280,16 @@ static void ParamSet(ByteReader &buf)
 							}
 							break;
 
-						case 0x08: // General sprites
+						case GSF_GLOBALVAR: // General sprites
 							switch (op) {
 								case 0:
 									/* Return space reserved during reservation stage */
-									src1 = _grm_sprites[GRFLocation(_cur.grffile->grfid, _cur.nfo_line)].first;
+									src1 = _grm_sprites[GRFLocation(_cur_gps.grffile->grfid, _cur_gps.nfo_line)].first;
 									GrfMsg(4, "ParamSet: GRM: Using pre-allocated sprites at {}", src1);
 									break;
 
 								case 1:
-									src1 = _cur.spriteid;
+									src1 = _cur_gps.spriteid;
 									break;
 
 								default:
@@ -298,10 +298,10 @@ static void ParamSet(ByteReader &buf)
 							}
 							break;
 
-						case 0x0B: // Cargo
+						case GSF_CARGOES: // Cargo
 							/* There are two ranges: one for cargo IDs and one for cargo bitmasks */
 							src1 = PerformGRM(_grm_cargoes, count, op, target, "cargoes");
-							if (_cur.skip_sprites == -1) return;
+							if (_cur_gps.skip_sprites == -1) return;
 							break;
 
 						default: GrfMsg(1, "ParamSet: GRM: Unsupported feature 0x{:X}", feature); return;
@@ -315,7 +315,7 @@ static void ParamSet(ByteReader &buf)
 			/* Read another GRF File's parameter */
 			const GRFFile *file = GetFileByGRFID(data);
 			GRFConfig *c = GetGRFConfig(data);
-			if (c != nullptr && c->flags.Test(GRFConfigFlag::Static) && !_cur.grfconfig->flags.Test(GRFConfigFlag::Static) && _networking) {
+			if (c != nullptr && c->flags.Test(GRFConfigFlag::Static) && !_cur_gps.grfconfig->flags.Test(GRFConfigFlag::Static) && _networking) {
 				/* Disable the read GRF if it is a static NewGRF. */
 				DisableStaticNewGRFInfluencingNonStaticNewGRFs(*c);
 				src1 = 0;
@@ -420,7 +420,7 @@ static void ParamSet(ByteReader &buf)
 
 	switch (target) {
 		case 0x8E: // Y-Offset for train sprites
-			_cur.grffile->traininfo_vehicle_pitch = res;
+			_cur_gps.grffile->traininfo_vehicle_pitch = res;
 			break;
 
 		case 0x8F: { // Rail track type cost factors
@@ -451,12 +451,12 @@ static void ParamSet(ByteReader &buf)
 			GrfMiscBits bits(res);
 
 			/* Set train list engine width */
-			_cur.grffile->traininfo_vehicle_width = bits.Test(GrfMiscBit::TrainWidth32Pixels) ? VEHICLEINFO_FULL_VEHICLE_WIDTH : TRAININFO_DEFAULT_VEHICLE_WIDTH;
+			_cur_gps.grffile->traininfo_vehicle_width = bits.Test(GrfMiscBit::TrainWidth32Pixels) ? VEHICLEINFO_FULL_VEHICLE_WIDTH : TRAININFO_DEFAULT_VEHICLE_WIDTH;
 			/* Remove the local flags from the global flags */
 			bits.Reset(GrfMiscBit::TrainWidth32Pixels);
 
 			/* Only copy safe bits for static grfs */
-			if (_cur.grfconfig->flags.Test(GRFConfigFlag::Static)) {
+			if (_cur_gps.grfconfig->flags.Test(GRFConfigFlag::Static)) {
 				GrfMiscBits safe_bits = GrfMiscBit::SecondRockyTileSet;
 
 				_misc_grf_features.Reset(safe_bits);
@@ -474,8 +474,8 @@ static void ParamSet(ByteReader &buf)
 		default:
 			if (target < 0x80) {
 				/* Resize (and fill with zeroes) if needed. */
-				if (target >= std::size(_cur.grffile->param)) _cur.grffile->param.resize(target + 1);
-				_cur.grffile->param[target] = res;
+				if (target >= std::size(_cur_gps.grffile->param)) _cur_gps.grffile->param.resize(target + 1);
+				_cur_gps.grffile->param[target] = res;
 			} else {
 				GrfMsg(7, "ParamSet: Skipping unknown target 0x{:02X}", target);
 			}
diff --git a/src/newgrf/newgrf_acte.cpp b/src/newgrf/newgrf_acte.cpp
index 6270fe4559..fdd923ce7b 100644
--- a/src/newgrf/newgrf_acte.cpp
+++ b/src/newgrf/newgrf_acte.cpp
@@ -30,7 +30,7 @@ static void SafeGRFInhibit(ByteReader &buf)
 		uint32_t grfid = buf.ReadDWord();
 
 		/* GRF is unsafe it if tries to deactivate other GRFs */
-		if (grfid != _cur.grfconfig->ident.grfid) {
+		if (grfid != _cur_gps.grfconfig->ident.grfid) {
 			GRFUnsafe(buf);
 			return;
 		}
@@ -52,10 +52,10 @@ static void GRFInhibit(ByteReader &buf)
 		GRFConfig *file = GetGRFConfig(grfid);
 
 		/* Unset activation flag */
-		if (file != nullptr && file != _cur.grfconfig) {
+		if (file != nullptr && file != _cur_gps.grfconfig) {
 			GrfMsg(2, "GRFInhibit: Deactivating file '{}'", file->filename);
 			GRFError *error = DisableGrf(STR_NEWGRF_ERROR_FORCEFULLY_DISABLED, file);
-			error->data = _cur.grfconfig->GetName();
+			error->data = _cur_gps.grfconfig->GetName();
 		}
 	}
 }
diff --git a/src/newgrf/newgrf_actf.cpp b/src/newgrf/newgrf_actf.cpp
index 82503b4fd5..473ab023c6 100644
--- a/src/newgrf/newgrf_actf.cpp
+++ b/src/newgrf/newgrf_actf.cpp
@@ -27,7 +27,7 @@ static void FeatureTownName(ByteReader &buf)
 	 * B num-parts   Number of parts in this definition
 	 * V parts       The parts */
 
-	uint32_t grfid = _cur.grffile->grfid;
+	uint32_t grfid = _cur_gps.grffile->grfid;
 
 	GRFTownName *townname = AddGRFTownName(grfid);
 
@@ -37,7 +37,7 @@ static void FeatureTownName(ByteReader &buf)
 	if (HasBit(id, 7)) {
 		/* Final definition */
 		ClrBit(id, 7);
-		bool new_scheme = _cur.grffile->grf_version >= 7;
+		bool new_scheme = _cur_gps.grffile->grf_version >= 7;
 
 		uint8_t lang = buf.ReadByte();
 		StringID style = STR_UNDEFINED;
diff --git a/src/newgrf/newgrf_bytereader.cpp b/src/newgrf/newgrf_bytereader.cpp
index d09c1dfadc..a1a9585ff2 100644
--- a/src/newgrf/newgrf_bytereader.cpp
+++ b/src/newgrf/newgrf_bytereader.cpp
@@ -14,17 +14,6 @@
 
 #include "../safeguards.h"
 
-/**
- * Read a single DWord (32 bits).
- * @note The buffer is NOT advanced.
- * @returns Value read from buffer.
- */
-uint32_t ByteReader::PeekDWord()
-{
-	AutoRestoreBackup backup(this->data, this->data);
-	return this->ReadDWord();
-}
-
 /**
  * Read a value of the given number of bytes.
  * @returns Value read from buffer.
@@ -40,18 +29,3 @@ uint32_t ByteReader::ReadVarSize(uint8_t size)
 			return 0;
 	}
 }
-
-/**
- * Read a string.
- * @returns Sting read from the buffer.
- */
-std::string_view ByteReader::ReadString()
-{
-	const char *string = reinterpret_cast<const char *>(this->data);
-	size_t string_length = ttd_strnlen(string, this->Remaining());
-
-	/* Skip past the terminating NUL byte if it is present, but not more than remaining. */
-	this->Skip(std::min(string_length + 1, this->Remaining()));
-
-	return std::string_view(string, string_length);
-}
diff --git a/src/newgrf/newgrf_bytereader.h b/src/newgrf/newgrf_bytereader.h
index b3ceec7f2b..69553ed884 100644
--- a/src/newgrf/newgrf_bytereader.h
+++ b/src/newgrf/newgrf_bytereader.h
@@ -10,24 +10,21 @@
 #ifndef NEWGRF_BYTEREADER_H
 #define NEWGRF_BYTEREADER_H
 
+#include "../core/string_consumer.hpp"
+
 class OTTDByteReaderSignal { };
 
 /** Class to read from a NewGRF file */
 class ByteReader {
+	StringConsumer consumer;
 public:
-	ByteReader(const uint8_t *data, const uint8_t *end) : data(data), end(end) { }
+	ByteReader(const uint8_t *data, size_t len) : consumer(std::string_view{reinterpret_cast<const char *>(data), len}) { }
 
 	const uint8_t *ReadBytes(size_t size)
 	{
-		if (this->data + size >= this->end) {
-			/* Put data at the end, as would happen if every byte had been individually read. */
-			this->data = this->end;
-			throw OTTDByteReaderSignal();
-		}
-
-		const uint8_t *ret = this->data;
-		this->data += size;
-		return ret;
+		auto result = this->consumer.Read(size);
+		if (result.size() != size) throw OTTDByteReaderSignal();
+		return reinterpret_cast<const uint8_t *>(result.data());
 	}
 
 	/**
@@ -36,8 +33,9 @@ public:
 	 */
 	uint8_t ReadByte()
 	{
-		if (this->data < this->end) return *this->data++;
-		throw OTTDByteReaderSignal();
+		auto result = this->consumer.TryReadUint8();
+		if (!result.has_value()) throw OTTDByteReaderSignal();
+		return *result;
 	}
 
 	/**
@@ -46,8 +44,9 @@ public:
 	 */
 	uint16_t ReadWord()
 	{
-		uint16_t val = this->ReadByte();
-		return val | (this->ReadByte() << 8);
+		auto result = this->consumer.TryReadUint16LE();
+		if (!result.has_value()) throw OTTDByteReaderSignal();
+		return *result;
 	}
 
 	/**
@@ -66,35 +65,51 @@ public:
 	 */
 	uint32_t ReadDWord()
 	{
-		uint32_t val = this->ReadWord();
-		return val | (this->ReadWord() << 16);
+		auto result = this->consumer.TryReadUint32LE();
+		if (!result.has_value()) throw OTTDByteReaderSignal();
+		return *result;
+	}
+
+	/**
+	 * Read a single DWord (32 bits).
+	 * @note The buffer is NOT advanced.
+	 * @returns Value read from buffer.
+	 */
+	uint32_t PeekDWord()
+	{
+		auto result = this->consumer.PeekUint32LE();
+		if (!result.has_value()) throw OTTDByteReaderSignal();
+		return *result;
 	}
 
-	uint32_t PeekDWord();
 	uint32_t ReadVarSize(uint8_t size);
-	std::string_view ReadString();
+
+	/**
+	 * Read a NUL-terminated string.
+	 * @returns String read from the buffer.
+	 */
+	std::string_view ReadString()
+	{
+		/* Terminating NUL may be missing at the end of sprite. */
+		return this->consumer.ReadUntilChar('\0', StringConsumer::SKIP_ONE_SEPARATOR);
+	}
 
 	size_t Remaining() const
 	{
-		return this->end - this->data;
+		return this->consumer.GetBytesLeft();
 	}
 
 	bool HasData(size_t count = 1) const
 	{
-		return this->data + count <= this->end;
+		return count <= this->consumer.GetBytesLeft();
 	}
 
 	void Skip(size_t len)
 	{
-		this->data += len;
-		/* It is valid to move the buffer to exactly the end of the data,
-		 * as there may not be any more data read. */
-		if (this->data > this->end) throw OTTDByteReaderSignal();
+		auto result = this->consumer.Read(len);
+		if (result.size() != len) throw OTTDByteReaderSignal();
 	}
 
-private:
-	const uint8_t *data; ///< Current position within data.
-	const uint8_t *end; ///< Last position of data.
 };
 
 #endif /* NEWGRF_BYTEREADER_H */
diff --git a/src/newgrf/newgrf_internal.h b/src/newgrf/newgrf_internal.h
index 642535198a..d4001219ec 100644
--- a/src/newgrf/newgrf_internal.h
+++ b/src/newgrf/newgrf_internal.h
@@ -95,7 +95,7 @@ public:
 	 * @param numsets Number of sets to define.
 	 * @param numents Number of sprites per set to define.
 	 */
-	void AddSpriteSets(uint8_t feature, SpriteID first_sprite, uint first_set, uint numsets, uint numents)
+	void AddSpriteSets(GrfSpecFeature feature, SpriteID first_sprite, uint first_set, uint numsets, uint numents)
 	{
 		assert(feature < GSF_END);
 		for (uint i = 0; i < numsets; i++) {
@@ -111,7 +111,7 @@ public:
 	 * @return true if there are any valid sets.
 	 * @note Spritesets with zero sprites are valid to allow callback-failures.
 	 */
-	bool HasValidSpriteSets(uint8_t feature) const
+	bool HasValidSpriteSets(GrfSpecFeature feature) const
 	{
 		assert(feature < GSF_END);
 		return !this->spritesets[feature].empty();
@@ -124,7 +124,7 @@ public:
 	 * @return true if the set is valid.
 	 * @note Spritesets with zero sprites are valid to allow callback-failures.
 	 */
-	bool IsValidSpriteSet(uint8_t feature, uint set) const
+	bool IsValidSpriteSet(GrfSpecFeature feature, uint set) const
 	{
 		assert(feature < GSF_END);
 		return this->spritesets[feature].find(set) != this->spritesets[feature].end();
@@ -136,7 +136,7 @@ public:
 	 * @param set Set to query.
 	 * @return First sprite of the set.
 	 */
-	SpriteID GetSprite(uint8_t feature, uint set) const
+	SpriteID GetSprite(GrfSpecFeature feature, uint set) const
 	{
 		assert(IsValidSpriteSet(feature, set));
 		return this->spritesets[feature].find(set)->second.sprite;
@@ -148,14 +148,14 @@ public:
 	 * @param set Set to query.
 	 * @return Number of sprites in the set.
 	 */
-	uint GetNumEnts(uint8_t feature, uint set) const
+	uint GetNumEnts(GrfSpecFeature feature, uint set) const
 	{
 		assert(IsValidSpriteSet(feature, set));
 		return this->spritesets[feature].find(set)->second.num_sprites;
 	}
 };
 
-extern GrfProcessingState _cur;
+extern GrfProcessingState _cur_gps;
 
 struct GRFLocation {
 	uint32_t grfid;
@@ -192,13 +192,13 @@ void SkipBadgeList(ByteReader &buf);
 std::vector<BadgeID> ReadBadgeList(ByteReader &buf, GrfSpecFeature feature);
 
 void MapSpriteMappingRecolour(PalSpriteID *grf_sprite);
-TileLayoutFlags ReadSpriteLayoutSprite(ByteReader &buf, bool read_flags, bool invert_action1_flag, bool use_cur_spritesets, int feature, PalSpriteID *grf_sprite, uint16_t *max_sprite_offset = nullptr, uint16_t *max_palette_offset = nullptr);
-bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_spritesets, uint8_t feature, bool allow_var10, bool no_z_position, NewGRFSpriteLayout *dts);
+TileLayoutFlags ReadSpriteLayoutSprite(ByteReader &buf, bool read_flags, bool invert_action1_flag, bool use_cur_spritesets, GrfSpecFeature feature, PalSpriteID *grf_sprite, uint16_t *max_sprite_offset = nullptr, uint16_t *max_palette_offset = nullptr);
+bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_spritesets, GrfSpecFeature feature, bool allow_var10, bool no_z_position, NewGRFSpriteLayout *dts);
 
 GRFFile *GetFileByGRFID(uint32_t grfid);
 GRFError *DisableGrf(StringID message = {}, GRFConfig *config = nullptr);
 void DisableStaticNewGRFInfluencingNonStaticNewGRFs(GRFConfig &c);
-bool HandleChangeInfoResult(const char *caller, ChangeInfoResult cir, uint8_t feature, uint8_t property);
+bool HandleChangeInfoResult(std::string_view caller, ChangeInfoResult cir, GrfSpecFeature feature, uint8_t property);
 uint32_t GetParamVal(uint8_t param, uint32_t *cond_val);
 void GRFUnsafe(ByteReader &);
 
diff --git a/src/newgrf/newgrf_internal_vehicle.h b/src/newgrf/newgrf_internal_vehicle.h
index 53526e7526..185382c530 100644
--- a/src/newgrf/newgrf_internal_vehicle.h
+++ b/src/newgrf/newgrf_internal_vehicle.h
@@ -49,21 +49,21 @@ struct GRFTempEngineData {
 	}
 };
 
-extern ReferenceThroughBaseContainer<std::vector<GRFTempEngineData>> _gted;  ///< Temporary engine data used during NewGRF loading
+extern TypedIndexContainer<std::vector<GRFTempEngineData>, EngineID> _gted;  ///< Temporary engine data used during NewGRF loading
 
 Engine *GetNewEngine(const GRFFile *file, VehicleType type, uint16_t internal_id, bool static_access = false);
-void ConvertTTDBasePrice(uint32_t base_pointer, const char *error_location, Price *index);
+void ConvertTTDBasePrice(uint32_t base_pointer, std::string_view error_location, Price *index);
 
 /**
  * Helper to check whether an image index is valid for a particular NewGRF vehicle.
  * @tparam T The type of vehicle.
  * @param image_index The image index to check.
- * @return True iff the image index is valid, or 0xFD (use new graphics).
+ * @return True iff the image index is valid, or CUSTOM_VEHICLE_SPRITENUM (use new graphics).
  */
 template <VehicleType T>
 static inline bool IsValidNewGRFImageIndex(uint8_t image_index)
 {
-	 return image_index == 0xFD || IsValidImageIndex<T>(image_index);
+	return image_index == CUSTOM_VEHICLE_SPRITENUM || IsValidImageIndex<T>(image_index);
 }
 
 ChangeInfoResult CommonVehicleChangeInfo(EngineInfo *ei, int prop, ByteReader &buf);
diff --git a/src/newgrf/newgrf_stringmapping.cpp b/src/newgrf/newgrf_stringmapping.cpp
index 2063325d86..3de9b7c993 100644
--- a/src/newgrf/newgrf_stringmapping.cpp
+++ b/src/newgrf/newgrf_stringmapping.cpp
@@ -16,9 +16,9 @@
 #include "newgrf_internal.h"
 #include "newgrf_stringmapping.h"
 
-#include "../safeguards.h"
+#include "table/strings.h"
 
-#include "../table/strings.h"
+#include "../safeguards.h"
 
 /**
  * Information for mapping static StringIDs.
@@ -42,7 +42,7 @@ static std::vector<StringIDMapping> _string_to_grf_mapping;
 void AddStringForMapping(GRFStringID source, std::function<void(StringID)> &&func)
 {
 	func(STR_UNDEFINED);
-	_string_to_grf_mapping.emplace_back(_cur.grffile->grfid, source, std::move(func));
+	_string_to_grf_mapping.emplace_back(_cur_gps.grffile->grfid, source, std::move(func));
 }
 
 /**
diff --git a/src/newgrf_act5.h b/src/newgrf_act5.h
index 1a73fb473d..e560d2beda 100644
--- a/src/newgrf_act5.h
+++ b/src/newgrf_act5.h
@@ -10,6 +10,8 @@
 #ifndef NEWGRF_ACT5_H
 #define NEWGRF_ACT5_H
 
+#include "gfx_type.h"
+
 /** The type of action 5 type. */
 enum Action5BlockType : uint8_t {
 	A5BLOCK_FIXED,                ///< Only allow replacing a whole block of sprites. (TTDP compatible)
diff --git a/src/newgrf_airport.cpp b/src/newgrf_airport.cpp
index fdd5fc3739..3a47007a20 100644
--- a/src/newgrf_airport.cpp
+++ b/src/newgrf_airport.cpp
@@ -134,22 +134,22 @@ void BindAirportSpecs()
 }
 
 
-void AirportOverrideManager::SetEntitySpec(AirportSpec *as)
+void AirportOverrideManager::SetEntitySpec(AirportSpec &&as)
 {
-	uint8_t airport_id = this->AddEntityID(as->grf_prop.local_id, as->grf_prop.grfid, as->grf_prop.subst_id);
+	uint8_t airport_id = this->AddEntityID(as.grf_prop.local_id, as.grf_prop.grfid, as.grf_prop.subst_id);
 
 	if (airport_id == this->invalid_id) {
 		GrfMsg(1, "Airport.SetEntitySpec: Too many airports allocated. Ignoring.");
 		return;
 	}
 
-	*AirportSpec::GetWithoutOverride(airport_id) = *as;
+	AirportSpec::specs[airport_id] = std::move(as);
 
 	/* Now add the overrides. */
 	for (int i = 0; i < this->max_offset; i++) {
 		AirportSpec *overridden_as = AirportSpec::GetWithoutOverride(i);
 
-		if (this->entity_overrides[i] != as->grf_prop.local_id || this->grfid_overrides[i] != as->grf_prop.grfid) continue;
+		if (this->entity_overrides[i] != AirportSpec::specs[airport_id].grf_prop.local_id || this->grfid_overrides[i] != AirportSpec::specs[airport_id].grf_prop.grfid) continue;
 
 		overridden_as->grf_prop.override_id = airport_id;
 		overridden_as->enabled = false;
@@ -252,22 +252,22 @@ AirportResolverObject::AirportResolverObject(TileIndex tile, Station *st, const
 		CallbackID callback, uint32_t param1, uint32_t param2)
 	: ResolverObject(spec->grf_prop.grffile, callback, param1, param2), airport_scope(*this, tile, st, spec, layout)
 {
-	this->root_spritegroup = spec->grf_prop.GetSpriteGroup();
+	this->root_spritegroup = spec->grf_prop.GetSpriteGroup(st != nullptr);
 }
 
 SpriteID GetCustomAirportSprite(const AirportSpec *as, uint8_t layout)
 {
 	AirportResolverObject object(INVALID_TILE, nullptr, as, layout);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return as->preview_sprite;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return as->preview_sprite;
 
-	return group->GetResult();
+	return group->sprite;
 }
 
-uint16_t GetAirportCallback(CallbackID callback, uint32_t param1, uint32_t param2, Station *st, TileIndex tile)
+uint16_t GetAirportCallback(CallbackID callback, uint32_t param1, uint32_t param2, Station *st, TileIndex tile, std::span<int32_t> regs100)
 {
 	AirportResolverObject object(tile, st, AirportSpec::Get(st->airport.type), st->airport.layout, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
@@ -280,8 +280,12 @@ uint16_t GetAirportCallback(CallbackID callback, uint32_t param1, uint32_t param
 StringID GetAirportTextCallback(const AirportSpec *as, uint8_t layout, uint16_t callback)
 {
 	AirportResolverObject object(INVALID_TILE, nullptr, as, layout, (CallbackID)callback);
-	uint16_t cb_res = object.ResolveCallback();
+	std::array<int32_t, 1> regs100;
+	uint16_t cb_res = object.ResolveCallback(regs100);
 	if (cb_res == CALLBACK_FAILED || cb_res == 0x400) return STR_UNDEFINED;
+	if (cb_res == 0x40F) {
+		return GetGRFStringID(as->grf_prop.grfid, static_cast<GRFStringID>(regs100[0]));
+	}
 	if (cb_res > 0x400) {
 		ErrorUnknownCallbackResult(as->grf_prop.grfid, callback, cb_res);
 		return STR_UNDEFINED;
diff --git a/src/newgrf_airport.h b/src/newgrf_airport.h
index f9faa33921..b6ac05ab0a 100644
--- a/src/newgrf_airport.h
+++ b/src/newgrf_airport.h
@@ -25,14 +25,15 @@ typedef uint8_t StationGfx;
 /** Tile-offset / AirportTileID pair. */
 struct AirportTileTable {
 	TileIndexDiffC ti; ///< Tile offset from  the top-most airport tile.
-	StationGfx gfx;    ///< AirportTile to use for this tile.
+	StationGfx gfx; ///< AirportTile to use for this tile.
 };
 
 /** Iterator to iterate over all tiles belonging to an airport spec. */
 class AirportTileTableIterator : public TileIterator {
 private:
-	const AirportTileTable *att; ///< The offsets.
-	TileIndex base_tile;         ///< The tile we base the offsets off.
+	std::span<const AirportTileTable> att; ///< The offsets.
+	TileIndex base_tile; ///< The tile we base the offsets off.
+	std::span<const AirportTileTable>::iterator iter;
 
 public:
 	/**
@@ -40,17 +41,19 @@ public:
 	 * @param att The TileTable we want to iterate over.
 	 * @param base_tile The basetile for all offsets.
 	 */
-	AirportTileTableIterator(const AirportTileTable *att, TileIndex base_tile) : TileIterator(base_tile + ToTileIndexDiff(att->ti)), att(att), base_tile(base_tile)
+	AirportTileTableIterator(std::span<const AirportTileTable> att, TileIndex base_tile)
+		: TileIterator(base_tile + ToTileIndexDiff(att.front().ti))
+		, att(att), base_tile(base_tile), iter(att.begin())
 	{
 	}
 
 	inline TileIterator& operator ++() override
 	{
-		this->att++;
-		if (this->att->ti.x == -0x80) {
+		++this->iter;
+		if (this->iter == std::end(att)) {
 			this->tile = INVALID_TILE;
 		} else {
-			this->tile = this->base_tile + ToTileIndexDiff(this->att->ti);
+			this->tile = this->base_tile + ToTileIndexDiff(this->iter->ti);
 		}
 		return *this;
 	}
@@ -58,7 +61,7 @@ public:
 	/** Get the StationGfx for the current tile. */
 	StationGfx GetStationGfx() const
 	{
-		return this->att->gfx;
+		return this->iter->gfx;
 	}
 
 	std::unique_ptr<TileIterator> Clone() const override
@@ -119,7 +122,7 @@ struct AirportSpec : NewGRFSpecBase<AirportClassID> {
 	uint16_t maintenance_cost;               ///< maintenance cost multiplier
 	/* Newgrf data */
 	bool enabled;                          ///< Entity still available (by default true). Newgrf can disable it, though.
-	struct GRFFileProps grf_prop;          ///< Properties related to the grf file.
+	SubstituteGRFFileProps grf_prop; ///< Properties related to the grf file.
 	std::vector<BadgeID> badges;
 
 	static const AirportSpec *Get(uint8_t type);
@@ -141,6 +144,8 @@ struct AirportSpec : NewGRFSpecBase<AirportClassID> {
 
 private:
 	static AirportSpec specs[NUM_AIRPORTS]; ///< Specs of the airports.
+
+	friend void AirportOverrideManager::SetEntitySpec(AirportSpec &&as);
 };
 
 /** Information related to airport classes. */
diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp
index f47e9e4af6..bc2520718a 100644
--- a/src/newgrf_airporttiles.cpp
+++ b/src/newgrf_airporttiles.cpp
@@ -66,22 +66,22 @@ void AirportTileSpec::ResetAirportTiles()
 	_airporttile_mngr.ResetOverride();
 }
 
-void AirportTileOverrideManager::SetEntitySpec(const AirportTileSpec *airpts)
+void AirportTileOverrideManager::SetEntitySpec(AirportTileSpec &&airpts)
 {
-	StationGfx airpt_id = this->AddEntityID(airpts->grf_prop.local_id, airpts->grf_prop.grfid, airpts->grf_prop.subst_id);
+	StationGfx airpt_id = this->AddEntityID(airpts.grf_prop.local_id, airpts.grf_prop.grfid, airpts.grf_prop.subst_id);
 
 	if (airpt_id == this->invalid_id) {
 		GrfMsg(1, "AirportTile.SetEntitySpec: Too many airport tiles allocated. Ignoring.");
 		return;
 	}
 
-	AirportTileSpec::tiles[airpt_id] = *airpts;
+	AirportTileSpec::tiles[airpt_id] = std::move(airpts);
 
 	/* Now add the overrides. */
 	for (int i = 0; i < this->max_offset; i++) {
 		AirportTileSpec *overridden_airpts = &AirportTileSpec::tiles[i];
 
-		if (this->entity_overrides[i] != airpts->grf_prop.local_id || this->grfid_overrides[i] != airpts->grf_prop.grfid) continue;
+		if (this->entity_overrides[i] != AirportTileSpec::tiles[airpt_id].grf_prop.local_id || this->grfid_overrides[i] != AirportTileSpec::tiles[airpt_id].grf_prop.grfid) continue;
 
 		overridden_airpts->grf_prop.override_id = airpt_id;
 		overridden_airpts->enabled = false;
@@ -150,7 +150,7 @@ static uint32_t GetAirportTileIDAtOffset(TileIndex tile, const Station *st, uint
 		}
 	}
 	/* Not an 'old type' tile */
-	if (ats->grf_prop.GetSpriteGroup() != nullptr) { // tile has a spritegroup ?
+	if (ats->grf_prop.HasSpriteGroups()) {
 		if (ats->grf_prop.grfid == cur_grfid) { // same airport, same grf ?
 			return ats->grf_prop.local_id;
 		} else {
@@ -170,7 +170,7 @@ static uint32_t GetAirportTileIDAtOffset(TileIndex tile, const Station *st, uint
 		case 0x41: return GetTerrainType(this->tile);
 
 		/* Current town zone of the tile in the nearest town */
-		case 0x42: return GetTownRadiusGroup(ClosestTownFromTile(this->tile, UINT_MAX), this->tile);
+		case 0x42: return to_underlying(GetTownRadiusGroup(ClosestTownFromTile(this->tile, UINT_MAX), this->tile));
 
 		/* Position relative to most northern airport tile. */
 		case 0x43: return GetRelativePosition(this->tile, this->st->airport.tile);
@@ -222,7 +222,7 @@ AirportTileResolverObject::AirportTileResolverObject(const AirportTileSpec *ats,
 		tiles_scope(*this, ats, tile, st),
 		airport_scope(*this, tile, st, st != nullptr ? AirportSpec::Get(st->airport.type) : nullptr, st != nullptr ? st->airport.layout : 0)
 {
-	this->root_spritegroup = ats->grf_prop.GetSpriteGroup();
+	this->root_spritegroup = ats->grf_prop.GetSpriteGroup(st != nullptr);
 }
 
 GrfSpecFeature AirportTileResolverObject::GetFeature() const
@@ -235,28 +235,26 @@ uint32_t AirportTileResolverObject::GetDebugID() const
 	return this->tiles_scope.ats->grf_prop.local_id;
 }
 
-uint16_t GetAirportTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, const AirportTileSpec *ats, Station *st, TileIndex tile, [[maybe_unused]] int extra_data = 0)
+static uint16_t GetAirportTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, const AirportTileSpec *ats, Station *st, TileIndex tile, std::span<int32_t> regs100 = {})
 {
 	AirportTileResolverObject object(ats, tile, st, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
-static void AirportDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, uint8_t colour)
+static void AirportDrawTileLayout(const TileInfo *ti, const DrawTileSpriteSpan &dts, Colours colour)
 {
-	const DrawTileSprites *dts = group->ProcessRegisters(nullptr);
-
-	SpriteID image = dts->ground.sprite;
-	SpriteID pal   = dts->ground.pal;
+	SpriteID image = dts.ground.sprite;
+	SpriteID pal = dts.ground.pal;
 
 	if (GB(image, 0, SPRITE_WIDTH) != 0) {
 		if (image == SPR_FLAT_WATER_TILE && IsTileOnWater(ti->tile)) {
 			DrawWaterClassGround(ti);
 		} else {
-			DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GENERAL_SPRITE_COLOUR(colour)));
+			DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GetColourPalette(colour)));
 		}
 	}
 
-	DrawNewGRFTileSeq(ti, dts, TO_BUILDINGS, 0, GENERAL_SPRITE_COLOUR(colour));
+	DrawNewGRFTileSeq(ti, &dts, TO_BUILDINGS, 0, GetColourPalette(colour));
 }
 
 bool DrawNewAirportTile(TileInfo *ti, Station *st, const AirportTileSpec *airts)
@@ -273,20 +271,27 @@ bool DrawNewAirportTile(TileInfo *ti, Station *st, const AirportTileSpec *airts)
 	}
 
 	AirportTileResolverObject object(airts, ti->tile, st);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_TILELAYOUT) {
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) {
 		return false;
 	}
 
-	const TileLayoutSpriteGroup *tlgroup = (const TileLayoutSpriteGroup *)group;
-	AirportDrawTileLayout(ti, tlgroup, Company::Get(st->owner)->colour);
+	auto processor = group->ProcessRegisters(object, nullptr);
+	auto dts = processor.GetLayout();
+	AirportDrawTileLayout(ti, dts, Company::Get(st->owner)->colour);
 	return true;
 }
 
+/* Simple wrapper for GetAirportTileCallback to keep the animation unified. */
+static uint16_t GetSimpleAirportTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, const AirportTileSpec *ats, Station *st, TileIndex tile, int)
+{
+	return GetAirportTileCallback(callback, param1, param2, ats, st, tile);
+}
+
 /** Helper class for animation control. */
-struct AirportTileAnimationBase : public AnimationBase<AirportTileAnimationBase, AirportTileSpec, Station, int, GetAirportTileCallback, TileAnimationFrameAnimationHelper<Station> > {
+struct AirportTileAnimationBase : public AnimationBase<AirportTileAnimationBase, AirportTileSpec, Station, int, GetSimpleAirportTileCallback, TileAnimationFrameAnimationHelper<Station>> {
 	static constexpr CallbackID cb_animation_speed      = CBID_AIRPTILE_ANIMATION_SPEED;
-	static constexpr CallbackID cb_animation_next_frame = CBID_AIRPTILE_ANIM_NEXT_FRAME;
+	static constexpr CallbackID cb_animation_next_frame = CBID_AIRPTILE_ANIMATION_NEXT_FRAME;
 
 	static constexpr AirportTileCallbackMask cbm_animation_speed      = AirportTileCallbackMask::AnimationSpeed;
 	static constexpr AirportTileCallbackMask cbm_animation_next_frame = AirportTileCallbackMask::AnimationNextFrame;
@@ -300,20 +305,42 @@ void AnimateAirportTile(TileIndex tile)
 	AirportTileAnimationBase::AnimateTile(ats, Station::GetByTile(tile), tile, HasBit(ats->animation_special_flags, 0));
 }
 
-void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigger trigger, CargoType cargo_type)
+static bool DoTriggerAirportTileAnimation(Station *st, TileIndex tile, AirportAnimationTrigger trigger, uint32_t random, uint32_t var18_extra = 0)
 {
 	const AirportTileSpec *ats = AirportTileSpec::GetByTile(tile);
-	if (!HasBit(ats->animation.triggers, trigger)) return;
+	if (!ats->animation.triggers.Test(trigger)) return false;
 
-	AirportTileAnimationBase::ChangeAnimationFrame(CBID_AIRPTILE_ANIM_START_STOP, ats, st, tile, Random(), (uint8_t)trigger | (cargo_type << 8));
+	AirportTileAnimationBase::ChangeAnimationFrame(CBID_AIRPTILE_ANIMATION_TRIGGER, ats, st, tile, random, to_underlying(trigger) | var18_extra);
+	return true;
 }
 
-void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoType cargo_type)
+bool TriggerAirportTileAnimation(Station *st, TileIndex tile, AirportAnimationTrigger trigger)
 {
-	if (st->airport.tile == INVALID_TILE) return;
-
-	for (TileIndex tile : st->airport) {
-		if (st->TileBelongsToAirport(tile)) AirportTileAnimationTrigger(st, tile, trigger, cargo_type);
-	}
+	return DoTriggerAirportTileAnimation(st, tile, trigger, Random());
 }
 
+bool TriggerAirportAnimation(Station *st, AirportAnimationTrigger trigger, CargoType cargo_type)
+{
+	if (st->airport.tile == INVALID_TILE) return false;
+
+	bool ret = true;
+	uint32_t random = Random();
+	for (TileIndex tile : st->airport) {
+		if (!st->TileBelongsToAirport(tile)) continue;
+
+		const AirportTileSpec *ats = AirportTileSpec::GetByTile(tile);
+		if (ats->grf_prop.grffile == nullptr) continue;
+
+		uint8_t var18_extra = 0;
+		if (IsValidCargoType(cargo_type)) {
+			var18_extra |= ats->grf_prop.grffile->cargo_map[cargo_type] << 8;
+		}
+
+		if (DoTriggerAirportTileAnimation(st, tile, trigger, random, var18_extra)) {
+			SB(random, 0, 16, Random());
+		} else {
+			ret = false;
+		}
+	}
+	return ret;
+}
diff --git a/src/newgrf_airporttiles.h b/src/newgrf_airporttiles.h
index 1f2d989c33..34b37cf5e7 100644
--- a/src/newgrf_airporttiles.h
+++ b/src/newgrf_airporttiles.h
@@ -68,12 +68,12 @@ struct AirportTileResolverObject : public ResolverObject {
  * Defines the data structure of each individual tile of an airport.
  */
 struct AirportTileSpec {
-	AnimationInfo animation;              ///< Information about the animation.
+	AnimationInfo<AirportAnimationTriggers> animation; ///< Information about the animation.
 	StringID name;                        ///< Tile Subname string, land information on this tile will give you "AirportName (TileSubname)"
 	AirportTileCallbackMasks callback_mask;                  ///< Bitmask telling which grf callback is set
 	uint8_t animation_special_flags;        ///< Extra flags to influence the animation
 	bool enabled;                         ///< entity still available (by default true). newgrf can disable it, though
-	GRFFileProps grf_prop;                ///< properties related the the grf file
+	SubstituteGRFFileProps grf_prop; ///< properties related the the grf file
 	std::vector<BadgeID> badges;
 
 	static const AirportTileSpec *Get(StationGfx gfx);
@@ -84,12 +84,12 @@ struct AirportTileSpec {
 private:
 	static AirportTileSpec tiles[NUM_AIRPORTTILES];
 
-	friend void AirportTileOverrideManager::SetEntitySpec(const AirportTileSpec *airpts);
+	friend void AirportTileOverrideManager::SetEntitySpec(AirportTileSpec &&airpts);
 };
 
 void AnimateAirportTile(TileIndex tile);
-void AirportTileAnimationTrigger(Station *st, TileIndex tile, AirpAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
-void AirportAnimationTrigger(Station *st, AirpAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
+bool TriggerAirportTileAnimation(Station *st, TileIndex tile, AirportAnimationTrigger trigger);
+bool TriggerAirportAnimation(Station *st, AirportAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
 bool DrawNewAirportTile(TileInfo *ti, Station *st, const AirportTileSpec *airts);
 
 #endif /* NEWGRF_AIRPORTTILES_H */
diff --git a/src/newgrf_animation_base.h b/src/newgrf_animation_base.h
index c1c266f93d..c601179a70 100644
--- a/src/newgrf_animation_base.h
+++ b/src/newgrf_animation_base.h
@@ -103,7 +103,7 @@ struct AnimationBase {
 		if (!frame_set_by_callback) {
 			if (frame < num_frames) {
 				frame++;
-			} else if (frame == num_frames && spec->animation.status == ANIM_STATUS_LOOPING) {
+			} else if (frame == num_frames && spec->animation.status == AnimationStatus::Looping) {
 				/* This animation loops, so start again from the beginning */
 				frame = 0;
 			} else {
diff --git a/src/newgrf_animation_type.h b/src/newgrf_animation_type.h
index 6835111bfb..1796c6bdc4 100644
--- a/src/newgrf_animation_type.h
+++ b/src/newgrf_animation_type.h
@@ -10,53 +10,26 @@
 #ifndef NEWGRF_ANIMATION_TYPE_H
 #define NEWGRF_ANIMATION_TYPE_H
 
-static const uint8_t ANIM_STATUS_NON_LOOPING  = 0x00; ///< Animation is not looping.
-static const uint8_t ANIM_STATUS_LOOPING      = 0x01; ///< Animation is looping.
-static const uint8_t ANIM_STATUS_NO_ANIMATION = 0xFF; ///< There is no animation.
+enum class AnimationStatus : uint8_t {
+	NonLooping = 0x00, ///< Animation is not looping.
+	Looping = 0x01, ///< Animation is looping.
+	NoAnimation = 0xFF, ///< There is no animation.
+};
 
 /** Information about animation. */
+template <class AnimationTriggers>
 struct AnimationInfo {
-	uint8_t  frames;   ///< The number of frames.
-	uint8_t  status;   ///< Status; 0: no looping, 1: looping, 0xFF: no animation.
-	uint8_t  speed;    ///< The speed, i.e. the amount of time between frames.
-	uint16_t triggers; ///< The triggers that trigger animation.
+	uint8_t frames = 0; ///< The number of frames.
+	AnimationStatus status = AnimationStatus::NoAnimation; ///< Status.
+	uint8_t speed = 2; ///< The speed: time between frames = 2^speed ticks.
+	AnimationTriggers triggers; ///< The enabled animation triggers.
 };
 
-/** Animation triggers for station. */
-enum StationAnimationTrigger : uint8_t {
-	SAT_BUILT,         ///< Trigger tile when built.
-	SAT_NEW_CARGO,     ///< Trigger station on new cargo arrival.
-	SAT_CARGO_TAKEN,   ///< Trigger station when cargo is completely taken.
-	SAT_TRAIN_ARRIVES, ///< Trigger platform when train arrives.
-	SAT_TRAIN_DEPARTS, ///< Trigger platform when train leaves.
-	SAT_TRAIN_LOADS,   ///< Trigger platform when train loads/unloads.
-	SAT_250_TICKS,     ///< Trigger station every 250 ticks.
-};
-
-/** Animation triggers of the industries. */
-enum IndustryAnimationTrigger : uint8_t {
-	IAT_CONSTRUCTION_STATE_CHANGE,  ///< Trigger whenever the construction state changes.
-	IAT_TILELOOP,                   ///< Trigger in the periodic tile loop.
-	IAT_INDUSTRY_TICK,              ///< Trigger every tick.
-	IAT_INDUSTRY_RECEIVED_CARGO,    ///< Trigger when cargo is received .
-	IAT_INDUSTRY_DISTRIBUTES_CARGO, ///< Trigger when cargo is distributed.
-};
-
-/** Animation triggers for airport tiles */
-enum AirpAnimationTrigger : uint8_t {
-	AAT_BUILT,                   ///< Triggered when the airport is built (for all tiles at the same time).
-	AAT_TILELOOP,                ///< Triggered in the periodic tile loop.
-	AAT_STATION_NEW_CARGO,       ///< Triggered when new cargo arrives at the station (for all tiles at the same time).
-	AAT_STATION_CARGO_TAKEN,     ///< Triggered when a cargo type is completely removed from the station (for all tiles at the same time).
-	AAT_STATION_250_TICKS,       ///< Triggered every 250 ticks (for all tiles at the same time).
-	AAT_STATION_AIRPLANE_LAND,   ///< Triggered when an airplane (not a helicopter) touches down at the airport (for single tile).
-};
-
-/** Animation triggers for objects. */
-enum ObjectAnimationTrigger : uint8_t {
-	OAT_BUILT,     ///< Triggered when the object is built (for all tiles at the same time).
-	OAT_TILELOOP,  ///< Triggered in the periodic tile loop.
-	OAT_256_TICKS, ///< Triggered every 256 ticks (for all tiles at the same time).
+template <>
+struct AnimationInfo<void> {
+	uint8_t frames = 0;
+	AnimationStatus status = AnimationStatus::NoAnimation;
+	uint8_t speed = 2;
 };
 
 #endif /* NEWGRF_ANIMATION_TYPE_H */
diff --git a/src/newgrf_badge.cpp b/src/newgrf_badge.cpp
index 94aa72d966..59a9a4a1ca 100644
--- a/src/newgrf_badge.cpp
+++ b/src/newgrf_badge.cpp
@@ -8,7 +8,6 @@
 /** @file newgrf_badge.cpp Functionality for NewGRF badges. */
 
 #include "stdafx.h"
-#include "dropdown_type.h"
 #include "newgrf.h"
 #include "newgrf_badge.h"
 #include "newgrf_badge_type.h"
@@ -16,13 +15,9 @@
 #include "stringfilter_type.h"
 #include "strings_func.h"
 #include "timer/timer_game_calendar.h"
-#include "window_gui.h"
-#include "zoom_func.h"
 
 #include "table/strings.h"
 
-#include "dropdown_common_type.h"
-
 #include "safeguards.h"
 
 /** Separator to identify badge classes from a label. */
@@ -38,6 +33,24 @@ public:
 /** Static instance of badge state. */
 static Badges _badges = {};
 
+/**
+ * Get a read-only view of badges.
+ * @return Span of badges.
+ */
+std::span<const Badge> GetBadges()
+{
+	return _badges.specs;
+}
+
+/**
+ * Get a read-only view of class badge index.
+ * @return Span of badges.
+ */
+std::span<const BadgeID> GetClassBadges()
+{
+	return _badges.classes;
+}
+
 /**
  * Assign a BadgeClassID to the given badge.
  * @param index Badge ID of badge that should be assigned.
@@ -199,8 +212,7 @@ BadgeResolverObject::BadgeResolverObject(const Badge &badge, GrfSpecFeature feat
 		: ResolverObject(badge.grf_prop.grffile, callback, callback_param1, callback_param2), self_scope(*this, badge, introduction_date)
 {
 	assert(feature <= GSF_END);
-	this->root_spritegroup = this->self_scope.badge.grf_prop.GetSpriteGroup(feature);
-	if (this->root_spritegroup == nullptr) this->root_spritegroup = this->self_scope.badge.grf_prop.GetSpriteGroup(GSF_END);
+	this->root_spritegroup = this->self_scope.badge.grf_prop.GetFirstSpriteGroupOf({feature, GSF_DEFAULT});
 }
 
 /**
@@ -254,16 +266,14 @@ void AppendCopyableBadgeList(std::vector<BadgeID> &dst, std::span<const BadgeID>
 /** Apply features from all badges to their badge classes. */
 void ApplyBadgeFeaturesToClassBadges()
 {
-	for (const Badge &badge : _badges.specs) {
+	for (const Badge &badge : GetBadges()) {
 		Badge *class_badge = GetClassBadge(badge.class_index);
 		assert(class_badge != nullptr);
 		class_badge->features.Set(badge.features);
+		if (badge.name != STR_NULL) class_badge->flags.Set(BadgeFlag::HasText);
 	}
 }
 
-static constexpr uint MAX_BADGE_HEIGHT = 12; ///< Maximal height of a badge sprite.
-static constexpr uint MAX_BADGE_WIDTH = MAX_BADGE_HEIGHT * 2; ///< Maximal width.
-
 /**
  * Get sprite for the given badge.
  * @param badge Badge being queried.
@@ -272,123 +282,31 @@ static constexpr uint MAX_BADGE_WIDTH = MAX_BADGE_HEIGHT * 2; ///< Maximal width
  * @param remap Palette remap to use if the flag is company-coloured.
  * @returns Custom sprite to draw, or \c 0 if not available.
  */
-static PalSpriteID GetBadgeSprite(const Badge &badge, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap)
+PalSpriteID GetBadgeSprite(const Badge &badge, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap)
 {
 	BadgeResolverObject object(badge, feature, introduction_date);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return {0, PAL_NONE};
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return {0, PAL_NONE};
 
 	PaletteID pal = badge.flags.Test(BadgeFlag::UseCompanyColour) ? remap : PAL_NONE;
 
-	return {group->GetResult(), pal};
+	return {group->sprite, pal};
 }
 
 /**
- * Get the largest badge size (within limits) for a badge class.
- * @param badge_class Badge class.
- * @param feature Feature being used.
- * @returns Largest base size of the badge class for the feature.
+ * Create a list of used badge classes for a feature.
+ * @param feature GRF feature being used.
  */
-static Dimension GetBadgeMaximalDimension(BadgeClassID class_index, GrfSpecFeature feature)
+UsedBadgeClasses::UsedBadgeClasses(GrfSpecFeature feature) : feature(feature)
 {
-	Dimension d = { 0, MAX_BADGE_HEIGHT };
+	for (auto index : _badges.classes) {
+		Badge *class_badge = GetBadge(index);
+		if (!class_badge->features.Test(feature)) continue;
 
-	for (const auto &badge : _badges.specs) {
-		if (badge.class_index != class_index) continue;
-
-		PalSpriteID ps = GetBadgeSprite(badge, feature, std::nullopt, PAL_NONE);
-		if (ps.sprite == 0) continue;
-
-		d.width = std::max(d.width, GetSpriteSize(ps.sprite, nullptr, ZOOM_LVL_NORMAL).width);
-		if (d.width > MAX_BADGE_WIDTH) break;
+		this->classes.push_back(class_badge->class_index);
 	}
 
-	d.width = std::min(d.width, MAX_BADGE_WIDTH);
-	return d;
-}
-
-/** Utility class to create a list of badge classes used by a feature. */
-class UsedBadgeClasses {
-public:
-	/**
-	 * Create a list of used badge classes for a feature.
-	 * @param feature GRF feature being used.
-	 */
-	explicit UsedBadgeClasses(GrfSpecFeature feature)
-	{
-		for (auto index : _badges.classes) {
-			Badge *class_badge = GetBadge(index);
-			if (!class_badge->features.Test(feature)) continue;
-
-			this->classes.push_back(class_badge->class_index);
-		}
-
-		std::ranges::sort(this->classes, [](const BadgeClassID &a, const BadgeClassID &b)
-		{
-			return GetClassBadge(a)->label < GetClassBadge(b)->label;
-		});
-	}
-
-	std::span<const BadgeClassID> Classes() const { return this->classes; }
-
-private:
-	std::vector<BadgeClassID> classes; ///< List of badge classes.
-};
-
-static bool operator<(const GUIBadgeClasses::Element &a, const GUIBadgeClasses::Element &b)
-{
-	if (a.column_group != b.column_group) return a.column_group < b.column_group;
-	if (a.sort_order != b.sort_order) return a.sort_order < b.sort_order;
-	return a.label < b.label;
-}
-
-/**
- * Construct of list of badge classes and column groups to display.
- * @param feature feature being used.
- */
-GUIBadgeClasses::GUIBadgeClasses(GrfSpecFeature feature)
-{
-	/* Get list of classes used by feature. */
-	UsedBadgeClasses used(feature);
-
-	uint max_column = 0;
-	for (BadgeClassID class_index : used.Classes()) {
-		Dimension size = GetBadgeMaximalDimension(class_index, feature);
-		if (size.width == 0) continue;
-
-		uint8_t column = 0;
-		bool visible = true;
-		uint sort_order = UINT_MAX;
-
-		std::string_view label = GetClassBadge(class_index)->label;
-
-		this->gui_classes.emplace_back(class_index, column, visible, sort_order, size, label);
-		if (visible) max_column = std::max<uint>(max_column, column);
-	}
-
-	std::sort(std::begin(this->gui_classes), std::end(this->gui_classes));
-
-	/* Determine total width of visible badge columns. */
-	this->column_widths.resize(max_column + 1);
-	for (const auto &el : this->gui_classes) {
-		if (!el.visible) continue;
-		this->column_widths[el.column_group] += ScaleGUITrad(el.size.width) + WidgetDimensions::scaled.hsep_normal;
-	}
-
-	/* Replace trailing `hsep_normal` spacer with wider `hsep_wide` spacer. */
-	for (uint &badge_width : this->column_widths) {
-		if (badge_width == 0) continue;
-		badge_width = badge_width - WidgetDimensions::scaled.hsep_normal + WidgetDimensions::scaled.hsep_wide;
-	}
-}
-
-/**
- * Get total width of all columns.
- * @returns sum of all column widths.
- */
-uint GUIBadgeClasses::GetTotalColumnsWidth() const
-{
-	return std::accumulate(std::begin(this->column_widths), std::end(this->column_widths), 0U);
+	std::ranges::sort(this->classes, [](const BadgeClassID &a, const BadgeClassID &b) { return GetClassBadge(a)->label < GetClassBadge(b)->label; });
 }
 
 /**
@@ -402,7 +320,7 @@ BadgeTextFilter::BadgeTextFilter(StringFilter &filter, GrfSpecFeature feature)
 	if (filter.IsEmpty()) return;
 
 	/* Pre-build list of badges that match by string. */
-	for (const auto &badge : _badges.specs) {
+	for (const auto &badge : GetBadges()) {
 		if (badge.name == STR_NULL) continue;
 		if (!badge.features.Test(feature)) continue;
 
@@ -410,10 +328,7 @@ BadgeTextFilter::BadgeTextFilter(StringFilter &filter, GrfSpecFeature feature)
 		filter.AddLine(GetString(badge.name));
 		if (!filter.GetState()) continue;
 
-		auto it = std::ranges::lower_bound(this->badges, badge.index);
-		if (it != std::end(this->badges) && *it == badge.index) continue;
-
-		this->badges.insert(it, badge.index);
+		this->badges.insert(badge.index);
 	}
 }
 
@@ -428,126 +343,14 @@ bool BadgeTextFilter::Filter(std::span<const BadgeID> badges) const
 }
 
 /**
- * Draw names for a list of badge labels.
- * @param r Rect to draw in.
+ * Test if the given badges matches the filtered badge list.
  * @param badges List of badges.
- * @param feature GRF feature being used.
- * @returns Vertical position after drawing is complete.
+ * @return true iff all required badges are present in the provided list.
  */
-int DrawBadgeNameList(Rect r, std::span<const BadgeID> badges, GrfSpecFeature)
+bool BadgeDropdownFilter::Filter(std::span<const BadgeID> badges) const
 {
-	if (badges.empty()) return r.top;
+	if (this->badges.empty()) return true;
 
-	std::set<BadgeClassID> classes;
-	for (const BadgeID &index : badges) classes.insert(GetBadge(index)->class_index);
-
-	std::string_view list_separator = GetListSeparator();
-	for (const BadgeClassID &class_index : classes) {
-		const Badge *class_badge = GetClassBadge(class_index);
-		if (class_badge == nullptr || class_badge->name == STR_NULL) continue;
-
-		std::string s;
-		for (const BadgeID &index : badges) {
-			const Badge *badge = GetBadge(index);
-			if (badge == nullptr || badge->name == STR_NULL) continue;
-			if (badge->class_index != class_index) continue;
-
-			if (!s.empty()) {
-				if (badge->flags.Test(BadgeFlag::NameListFirstOnly)) continue;
-				s += list_separator;
-			}
-			AppendStringInPlace(s, badge->name);
-			if (badge->flags.Test(BadgeFlag::NameListStop)) break;
-		}
-
-		if (s.empty()) continue;
-
-		r.top = DrawStringMultiLine(r, GetString(STR_BADGE_NAME_LIST, class_badge->name, std::move(s)), TC_BLACK);
-	}
-
-	return r.top;
-}
-
-/**
- * Draw a badge column group.
- * @param r rect to draw within.
- * @param column_group column to draw.
- * @param badge_classes badge classes.
- * @param badges badges to draw.
- * @param feature feature being used.
- * @param introduction_date introduction date of item.
- * @param remap palette remap to for company-coloured badges.
- */
-void DrawBadgeColumn(Rect r, int column_group, const GUIBadgeClasses &badge_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap)
-{
-	bool rtl = _current_text_dir == TD_RTL;
-	for (const auto &badge_class : badge_classes.GetClasses()) {
-		if (badge_class.column_group != column_group) continue;
-		if (!badge_class.visible) continue;
-
-		int width = ScaleGUITrad(badge_class.size.width);
-		for (const BadgeID &index : badges) {
-			const Badge &badge = *GetBadge(index);
-			if (badge.class_index != badge_class.badge_class) continue;
-
-			PalSpriteID ps = GetBadgeSprite(badge, feature, introduction_date, remap);
-			if (ps.sprite == 0) continue;
-
-			DrawSpriteIgnorePadding(ps.sprite, ps.pal, r.WithWidth(width, rtl), SA_CENTER);
-			break;
-		}
-
-		r = r.Indent(width + WidgetDimensions::scaled.hsep_normal, rtl);
-	}
-}
-
-/** Drop down element that draws a list of badges. */
-template <class TBase, bool TEnd = true, FontSize TFs = FS_NORMAL>
-class DropDownBadges : public TBase {
-public:
-	template <typename... Args>
-	explicit DropDownBadges(const std::shared_ptr<GUIBadgeClasses> &badge_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, Args&&... args)
-		: TBase(std::forward<Args>(args)...), badge_classes(badge_classes), badges(badges), feature(feature), introduction_date(introduction_date)
-	{
-		for (const auto &badge_class : badge_classes->GetClasses()) {
-			if (badge_class.column_group != 0) continue;
-			dim.width += badge_class.size.width + WidgetDimensions::scaled.hsep_normal;
-			dim.height = std::max(dim.height, badge_class.size.height);
-		}
-	}
-
-	uint Height() const override { return std::max<uint>(this->dim.height, this->TBase::Height()); }
-	uint Width() const override { return this->dim.width + WidgetDimensions::scaled.hsep_wide + this->TBase::Width(); }
-
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
-	{
-		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
-
-		DrawBadgeColumn(r.WithWidth(this->dim.width, rtl), 0, *this->badge_classes, this->badges, this->feature, this->introduction_date, PAL_NONE);
-
-		this->TBase::Draw(full, r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), sel, bg_colour);
-	}
-
-private:
-	std::shared_ptr<GUIBadgeClasses> badge_classes;
-
-	const std::span<const BadgeID> badges;
-	const GrfSpecFeature feature;
-	const std::optional<TimerGameCalendar::Date> introduction_date;
-
-	Dimension dim{};
-
-};
-
-using DropDownListBadgeItem = DropDownBadges<DropDownListStringItem>;
-using DropDownListBadgeIconItem = DropDownBadges<DropDownListIconItem>;
-
-std::unique_ptr<DropDownListItem> MakeDropDownListBadgeItem(const std::shared_ptr<GUIBadgeClasses> &badge_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, std::string &&str, int value, bool masked, bool shaded)
-{
-	return std::make_unique<DropDownListBadgeItem>(badge_classes, badges, feature, introduction_date, std::move(str), value, masked, shaded);
-}
-
-std::unique_ptr<DropDownListItem> MakeDropDownListBadgeIconItem(const std::shared_ptr<GUIBadgeClasses> &badge_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, const Dimension &dim, SpriteID sprite, PaletteID palette, std::string &&str, int value, bool masked, bool shaded)
-{
-	return std::make_unique<DropDownListBadgeIconItem>(badge_classes, badges, feature, introduction_date, dim, sprite, palette, std::move(str), value, masked, shaded);
+	/* We want all filtered badges to match. */
+	return std::ranges::all_of(this->badges, [&badges](const auto &badge) { return std::ranges::find(badges, badge.second) != std::end(badges); });
 }
diff --git a/src/newgrf_badge.h b/src/newgrf_badge.h
index e76baa71d5..f08882351a 100644
--- a/src/newgrf_badge.h
+++ b/src/newgrf_badge.h
@@ -10,7 +10,7 @@
 #ifndef NEWGRF_BADGE_H
 #define NEWGRF_BADGE_H
 
-#include "dropdown_type.h"
+#include "core/flatset_type.hpp"
 #include "newgrf.h"
 #include "newgrf_badge_type.h"
 #include "newgrf_commons.h"
@@ -25,11 +25,32 @@ public:
 	BadgeFlags flags = {}; ///< Display flags
 	StringID name = 0; ///< Short name.
 	GrfSpecFeatures features{}; ///< Bitmask of which features use this badge.
-	VariableGRFFileProps grf_prop; ///< Sprite information.
+	VariableGRFFileProps<GrfSpecFeature> grf_prop; ///< Sprite information.
 
 	Badge(std::string_view label, BadgeID index, BadgeClassID class_index) : label(label), index(index), class_index(class_index) {}
 };
 
+/** Utility class to create a list of badge classes used by a feature. */
+class UsedBadgeClasses {
+public:
+	UsedBadgeClasses() = default;
+	explicit UsedBadgeClasses(GrfSpecFeature feature);
+
+	inline GrfSpecFeature GetFeature() const
+	{
+		return this->feature;
+	}
+
+	inline std::span<const BadgeClassID> Classes() const
+	{
+		return this->classes;
+	}
+
+private:
+	GrfSpecFeature feature;
+	std::vector<BadgeClassID> classes; ///< List of badge classes.
+};
+
 void ResetBadges();
 
 Badge &GetOrCreateBadge(std::string_view label);
@@ -37,53 +58,32 @@ void MarkBadgeSeen(BadgeID index, GrfSpecFeature feature);
 void AppendCopyableBadgeList(std::vector<BadgeID> &dst, std::span<const BadgeID> src, GrfSpecFeature feature);
 void ApplyBadgeFeaturesToClassBadges();
 
+std::span<const Badge> GetBadges();
 Badge *GetBadge(BadgeID index);
 Badge *GetBadgeByLabel(std::string_view label);
 Badge *GetClassBadge(BadgeClassID class_index);
-
-class GUIBadgeClasses {
-public:
-	struct Element {
-		BadgeClassID badge_class; ///< Badge class index.
-		uint8_t column_group; ///< Column group in UI. 0 = left, 1 = centre, 2 = right.
-		bool visible; ///< Whether this element is visible.
-		uint sort_order; ///< Order of element.
-		Dimension size; ///< Maximal size of this element.
-		std::string_view label; ///< Class label (string owned by the class badge)
-
-		constexpr Element(BadgeClassID badge_class, uint8_t column_group, bool visible, uint sort_order, Dimension size, std::string_view label) :
-			badge_class(badge_class), column_group(column_group), visible(visible), sort_order(sort_order), size(size), label(label) {}
-	};
-
-	GUIBadgeClasses() = default;
-	explicit GUIBadgeClasses(GrfSpecFeature feature);
-
-	inline std::span<const Element> GetClasses() const { return this->gui_classes; }
-
-	inline std::span<const uint> GetColumnWidths() const { return this->column_widths; }
-
-	uint GetTotalColumnsWidth() const;
-
-private:
-	std::vector<Element> gui_classes{};
-	std::vector<uint> column_widths{};
-};
-
-int DrawBadgeNameList(Rect r, std::span<const BadgeID> badges, GrfSpecFeature feature);
-void DrawBadgeColumn(Rect r, int column_group, const GUIBadgeClasses &badge_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap);
+std::span<const BadgeID> GetClassBadges();
 
 uint32_t GetBadgeVariableResult(const struct GRFFile &grffile, std::span<const BadgeID> badges, uint32_t parameter);
 
+PalSpriteID GetBadgeSprite(const Badge &badge, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap);
+
 class BadgeTextFilter {
 public:
 	BadgeTextFilter(struct StringFilter &filter, GrfSpecFeature feature);
 	bool Filter(std::span<const BadgeID> badges) const;
 
 private:
-	std::vector<BadgeID> badges{};
+	FlatSet<BadgeID> badges{};
 };
 
-std::unique_ptr<DropDownListItem> MakeDropDownListBadgeItem(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, std::string &&str, int value, bool masked = false, bool shaded = false);
-std::unique_ptr<DropDownListItem> MakeDropDownListBadgeIconItem(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, const Dimension &dim, SpriteID sprite, PaletteID palette, std::string &&str, int value, bool masked = false, bool shaded = false);
+class BadgeDropdownFilter {
+public:
+	BadgeDropdownFilter(const BadgeFilterChoices &conf) : badges(conf) {}
+	bool Filter(std::span<const BadgeID> badges) const;
+
+private:
+	const BadgeFilterChoices &badges;
+};
 
 #endif /* NEWGRF_BADGE_H */
diff --git a/src/newgrf_badge_config.cpp b/src/newgrf_badge_config.cpp
new file mode 100644
index 0000000000..a1da087efb
--- /dev/null
+++ b/src/newgrf_badge_config.cpp
@@ -0,0 +1,201 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file newgrf_badge_config.cpp Functionality for NewGRF badge configuration. */
+
+#include "stdafx.h"
+#include "core/string_consumer.hpp"
+#include "ini_type.h"
+#include "newgrf.h"
+#include "newgrf_badge.h"
+#include "newgrf_badge_config.h"
+#include "newgrf_badge_type.h"
+
+#include "table/strings.h"
+
+#include "safeguards.h"
+
+/** Global state for badge class configuration. */
+class BadgeClassConfig {
+public:
+	static inline const BadgeClassConfigItem EMPTY_CONFIG_ITEM{};
+
+	std::array<std::vector<BadgeClassConfigItem>, GrfSpecFeature::GSF_END> features = {};
+
+	static constexpr GrfSpecFeatures CONFIGURABLE_FEATURES = {
+		GSF_TRAINS, GSF_ROADVEHICLES, GSF_SHIPS, GSF_AIRCRAFT, GSF_STATIONS, GSF_HOUSES, GSF_OBJECTS, GSF_ROADSTOPS,
+	};
+
+	static inline const std::array<std::string_view, GrfSpecFeature::GSF_END> sections = {
+		"badges_trains", // GSF_TRAINS
+		"badges_roadvehicles", // GSF_ROADVEHICLES
+		"badges_ships", // GSF_SHIPS
+		"badges_aircraft", // GSF_AIRCRAFT
+		"badges_stations", // GSF_STATIONS
+		{}, // GSF_CANALS
+		{}, // GSF_BRIDGES
+		"badges_houses", // GSF_HOUSES
+		{}, // GSF_GLOBALVAR
+		{}, // GSF_INDUSTRYTILES
+		{}, // GSF_INDUSTRIES
+		{}, // GSF_CARGOES
+		{}, // GSF_SOUNDFX
+		{}, // GSF_AIRPORTS
+		{}, // GSF_SIGNALS
+		"badges_objects", // GSF_OBJECTS
+		{}, // GSF_RAILTYPES
+		{}, // GSF_AIRPORTTILES
+		{}, // GSF_ROADTYPES
+		{}, // GSF_TRAMTYPES
+		"badges_roadstops", // GSF_ROADSTOPS
+		{}, // GSF_BADGES
+	};
+};
+
+/** Static instance of badge class configuration state. */
+static BadgeClassConfig _badge_config;
+
+/**
+ * Get the badge user configuration for a feature.
+ * @returns badge configuration for the given feature.
+ */
+std::span<BadgeClassConfigItem> GetBadgeClassConfiguration(GrfSpecFeature feature)
+{
+	assert(BadgeClassConfig::CONFIGURABLE_FEATURES.Test(feature));
+	assert(feature < std::size(_badge_config.features));
+	return _badge_config.features[to_underlying(feature)];
+}
+
+/**
+ * Add current badge classes to user configuration.
+ */
+void AddBadgeClassesToConfiguration()
+{
+	for (const GrfSpecFeature &feature : BadgeClassConfig::CONFIGURABLE_FEATURES) {
+		auto &config = _badge_config.features[feature];
+
+		for (const BadgeID &index : GetClassBadges()) {
+			const Badge &badge = *GetBadge(index);
+			if (badge.name == STR_NULL) continue;
+			if (!badge.features.Test(feature)) continue;
+
+			auto found = std::ranges::find(config, badge.label, &BadgeClassConfigItem::label);
+			if (found != std::end(config)) continue;
+
+			/* Not found, insert it. */
+			config.emplace_back(badge.label, 0, true, false);
+		}
+	}
+}
+
+/**
+ * Reset badge class configuration for a feature.
+ * @param feature Feature to reset.
+ */
+void ResetBadgeClassConfiguration(GrfSpecFeature feature)
+{
+	assert(feature < GrfSpecFeature::GSF_END);
+
+	auto &config = _badge_config.features[feature];
+	config.clear();
+
+	for (const BadgeID &index : GetClassBadges()) {
+		const Badge &badge = *GetBadge(index);
+		if (badge.name == STR_NULL) continue;
+		config.emplace_back(badge.label, 0, true, false);
+	}
+}
+
+/**
+ * Get configuration for a badge class.
+ * @param feature Feature being used.
+ * @param label Badge class label.
+ * @return badge class configuration item.
+ */
+std::pair<const BadgeClassConfigItem &, int> GetBadgeClassConfigItem(GrfSpecFeature feature, std::string_view label)
+{
+	auto config = GetBadgeClassConfiguration(feature);
+	auto found = std::ranges::find(config, label, &BadgeClassConfigItem::label);
+	if (found == std::end(config)) {
+		return {BadgeClassConfig::EMPTY_CONFIG_ITEM, 0};
+	}
+
+	/* Sort order is simply the position in the configuration list. */
+	return {*found, static_cast<int>(std::distance(std::begin(config), found))};
+}
+
+/**
+ * Load badge column preferences.
+ * @param ini IniFile to load to.
+ * @param feature Feature to load.
+ */
+static void BadgeClassLoadConfigFeature(const IniFile &ini, GrfSpecFeature feature)
+{
+	assert(BadgeClassConfig::CONFIGURABLE_FEATURES.Test(feature));
+	assert(!BadgeClassConfig::sections[feature].empty());
+
+	auto &config = _badge_config.features[feature];
+	config.clear();
+
+	const IniGroup *group = ini.GetGroup(BadgeClassConfig::sections[feature]);
+	if (group == nullptr) return;
+
+	for (const IniItem &item : group->items) {
+		int column = 0;
+		bool show_icon = true;
+		bool show_filter = false;
+
+		if (item.value.has_value() && !item.value.value().empty()) {
+			StringConsumer consumer(item.value.value());
+			if (consumer.ReadCharIf('?')) show_filter = true;
+			if (consumer.ReadCharIf('!')) show_icon = false;
+			if (auto value = consumer.TryReadIntegerBase<int>(10); value.has_value()) column = *value;
+		}
+
+		config.emplace_back(item.name, column, show_icon, show_filter);
+	}
+}
+
+/**
+ * Load badge column preferences.
+ * @param ini IniFile to load to.
+ */
+void BadgeClassLoadConfig(const IniFile &ini)
+{
+	for (const GrfSpecFeature &feature : BadgeClassConfig::CONFIGURABLE_FEATURES) {
+		BadgeClassLoadConfigFeature(ini, feature);
+	}
+}
+
+/**
+ * Save badge column preferences.
+ * @param ini IniFile to save to.
+ * @param feature Feature to save.
+ */
+static void BadgeClassSaveConfigFeature(IniFile &ini, GrfSpecFeature feature)
+{
+	assert(BadgeClassConfig::CONFIGURABLE_FEATURES.Test(feature));
+	assert(!BadgeClassConfig::sections[feature].empty());
+
+	IniGroup &group = ini.GetOrCreateGroup(BadgeClassConfig::sections[feature]);
+	group.Clear();
+
+	for (const auto &item : _badge_config.features[to_underlying(feature)]) {
+		group.CreateItem(item.label).SetValue(fmt::format("{}{}{}", item.show_filter ? "?" : "", item.show_icon ? "" : "!", item.column));
+	}
+}
+
+/**
+ * Save badge column preferences.
+ * @param ini IniFile to save to.
+ */
+void BadgeClassSaveConfig(IniFile &ini)
+{
+	for (const GrfSpecFeature &feature : BadgeClassConfig::CONFIGURABLE_FEATURES) {
+		BadgeClassSaveConfigFeature(ini, feature);
+	}
+}
diff --git a/src/newgrf_badge_config.h b/src/newgrf_badge_config.h
new file mode 100644
index 0000000000..1da4fa75b3
--- /dev/null
+++ b/src/newgrf_badge_config.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file newgrf_badge_config.h Functions related to NewGRF badge configuration. */
+
+#ifndef NEWGRF_BADGE_CONFIG_H
+#define NEWGRF_BADGE_CONFIG_H
+
+#include "newgrf.h"
+#include "newgrf_badge_type.h"
+
+class BadgeClassConfigItem {
+public:
+	std::string label; ///< Class label.
+	int column = -1; ///< UI column, feature-dependent.
+	bool show_icon = false; ///< Set if the badge icons should be displayed for this class.
+	bool show_filter = false; ///< Set if a drop down filter should be added for this class.
+};
+
+void BadgeClassLoadConfig(const struct IniFile &ini);
+void BadgeClassSaveConfig(struct IniFile &ini);
+
+std::span<BadgeClassConfigItem> GetBadgeClassConfiguration(GrfSpecFeature feature);
+void AddBadgeClassesToConfiguration();
+void ResetBadgeClassConfiguration(GrfSpecFeature feature);
+std::pair<const BadgeClassConfigItem &, int> GetBadgeClassConfigItem(GrfSpecFeature feature, std::string_view label);
+
+#endif /* NEWGRF_BADGE_CONFIG_H */
diff --git a/src/newgrf_badge_gui.cpp b/src/newgrf_badge_gui.cpp
new file mode 100644
index 0000000000..c36981a7bc
--- /dev/null
+++ b/src/newgrf_badge_gui.cpp
@@ -0,0 +1,580 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file newgrf_badge.cpp Functionality for NewGRF badges. */
+
+#include "stdafx.h"
+
+#include "core/flatset_type.hpp"
+#include "dropdown_type.h"
+#include "dropdown_func.h"
+#include "newgrf.h"
+#include "newgrf_badge.h"
+#include "newgrf_badge_config.h"
+#include "newgrf_badge_gui.h"
+#include "newgrf_badge_type.h"
+#include "settings_gui.h"
+#include "strings_func.h"
+#include "timer/timer_game_calendar.h"
+#include "window_gui.h"
+#include "zoom_func.h"
+
+#include "table/strings.h"
+
+#include "dropdown_common_type.h"
+
+#include "safeguards.h"
+
+static constexpr uint MAX_BADGE_HEIGHT = 12; ///< Maximal height of a badge sprite.
+static constexpr uint MAX_BADGE_WIDTH = MAX_BADGE_HEIGHT * 2; ///< Maximal width.
+
+/**
+ * Get the largest badge size (within limits) for a badge class.
+ * @param class_index Badge class.
+ * @param feature Feature being used.
+ * @returns Largest base size of the badge class for the feature.
+ */
+static Dimension GetBadgeMaximalDimension(BadgeClassID class_index, GrfSpecFeature feature)
+{
+	Dimension d = {0, MAX_BADGE_HEIGHT};
+
+	for (const auto &badge : GetBadges()) {
+		if (badge.class_index != class_index) continue;
+
+		PalSpriteID ps = GetBadgeSprite(badge, feature, std::nullopt, PAL_NONE);
+		if (ps.sprite == 0) continue;
+
+		d.width = std::max(d.width, GetSpriteSize(ps.sprite, nullptr, ZoomLevel::Normal).width);
+		if (d.width > MAX_BADGE_WIDTH) break;
+	}
+
+	d.width = std::min(d.width, MAX_BADGE_WIDTH);
+	return d;
+}
+
+static bool operator<(const GUIBadgeClasses::Element &a, const GUIBadgeClasses::Element &b)
+{
+	if (a.column_group != b.column_group) return a.column_group < b.column_group;
+	if (a.sort_order != b.sort_order) return a.sort_order < b.sort_order;
+	return a.label < b.label;
+}
+
+/**
+ * Construct of list of badge classes and column groups to display.
+ * @param feature feature being used.
+ */
+GUIBadgeClasses::GUIBadgeClasses(GrfSpecFeature feature) : UsedBadgeClasses(feature)
+{
+	/* Get list of classes used by feature. */
+	uint max_column = 0;
+	for (BadgeClassID class_index : this->Classes()) {
+		const Badge *class_badge = GetClassBadge(class_index);
+		if (class_badge->name == STR_NULL) continue;
+
+		Dimension size = GetBadgeMaximalDimension(class_index, feature);
+		if (size.width == 0) continue;
+
+		const auto [config, sort_order] = GetBadgeClassConfigItem(feature, class_badge->label);
+
+		this->gui_classes.emplace_back(class_index, config.column, config.show_icon, sort_order, size, class_badge->label);
+		if (size.width != 0 && config.show_icon) max_column = std::max<uint>(max_column, config.column);
+	}
+
+	std::sort(std::begin(this->gui_classes), std::end(this->gui_classes));
+
+	/* Determine total width of visible badge columns. */
+	this->column_widths.resize(max_column + 1);
+	for (const auto &el : this->gui_classes) {
+		if (!el.visible || el.size.width == 0) continue;
+		this->column_widths[el.column_group] += ScaleGUITrad(el.size.width) + WidgetDimensions::scaled.hsep_normal;
+	}
+
+	/* Replace trailing `hsep_normal` spacer with wider `hsep_wide` spacer. */
+	for (uint &badge_width : this->column_widths) {
+		if (badge_width == 0) continue;
+		badge_width = badge_width - WidgetDimensions::scaled.hsep_normal + WidgetDimensions::scaled.hsep_wide;
+	}
+}
+
+/**
+ * Get total width of all columns.
+ * @returns sum of all column widths.
+ */
+uint GUIBadgeClasses::GetTotalColumnsWidth() const
+{
+	return std::accumulate(std::begin(this->column_widths), std::end(this->column_widths), 0U);
+}
+
+/**
+ * Draw names for a list of badge labels.
+ * @param r Rect to draw in.
+ * @param badges List of badges.
+ * @param feature GRF feature being used.
+ * @returns Vertical position after drawing is complete.
+ */
+int DrawBadgeNameList(Rect r, std::span<const BadgeID> badges, GrfSpecFeature)
+{
+	if (badges.empty()) return r.top;
+
+	FlatSet<BadgeClassID> class_indexes;
+	for (const BadgeID &index : badges) class_indexes.insert(GetBadge(index)->class_index);
+
+	std::string_view list_separator = GetListSeparator();
+	for (const BadgeClassID &class_index : class_indexes) {
+		const Badge *class_badge = GetClassBadge(class_index);
+		if (class_badge == nullptr || class_badge->name == STR_NULL) continue;
+
+		std::string s;
+		for (const BadgeID &index : badges) {
+			const Badge *badge = GetBadge(index);
+			if (badge == nullptr || badge->name == STR_NULL) continue;
+			if (badge->class_index != class_index) continue;
+
+			if (!s.empty()) {
+				if (badge->flags.Test(BadgeFlag::NameListFirstOnly)) continue;
+				s += list_separator;
+			}
+			AppendStringInPlace(s, badge->name);
+			if (badge->flags.Test(BadgeFlag::NameListStop)) break;
+		}
+
+		if (s.empty()) continue;
+
+		r.top = DrawStringMultiLine(r, GetString(STR_BADGE_NAME_LIST, class_badge->name, std::move(s)), TC_BLACK);
+	}
+
+	return r.top;
+}
+
+/**
+ * Draw a badge column group.
+ * @param r rect to draw within.
+ * @param column_group column to draw.
+ * @param gui_classes gui badge classes.
+ * @param badges badges to draw.
+ * @param feature feature being used.
+ * @param introduction_date introduction date of item.
+ * @param remap palette remap to for company-coloured badges.
+ */
+void DrawBadgeColumn(Rect r, int column_group, const GUIBadgeClasses &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap)
+{
+	bool rtl = _current_text_dir == TD_RTL;
+	for (const auto &gc : gui_classes.GetClasses()) {
+		if (gc.column_group != column_group) continue;
+		if (!gc.visible) continue;
+
+		int width = ScaleGUITrad(gc.size.width);
+		for (const BadgeID &index : badges) {
+			const Badge &badge = *GetBadge(index);
+			if (badge.class_index != gc.class_index) continue;
+
+			PalSpriteID ps = GetBadgeSprite(badge, feature, introduction_date, remap);
+			if (ps.sprite == 0) continue;
+
+			DrawSpriteIgnorePadding(ps.sprite, ps.pal, r.WithWidth(width, rtl), SA_CENTER);
+			break;
+		}
+
+		r = r.Indent(width + WidgetDimensions::scaled.hsep_normal, rtl);
+	}
+}
+
+/** Drop down element that draws a list of badges. */
+template <class TBase, bool TEnd = true, FontSize TFs = FS_NORMAL>
+class DropDownBadges : public TBase {
+public:
+	template <typename... Args>
+	explicit DropDownBadges(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, Args &&...args) :
+		TBase(std::forward<Args>(args)...), gui_classes(gui_classes), badges(badges), feature(feature), introduction_date(introduction_date)
+	{
+		for (const auto &gc : gui_classes->GetClasses()) {
+			if (gc.column_group != 0) continue;
+			dim.width += gc.size.width + WidgetDimensions::scaled.hsep_normal;
+			dim.height = std::max(dim.height, gc.size.height);
+		}
+	}
+
+	uint Height() const override
+	{
+		return std::max<uint>(this->dim.height, this->TBase::Height());
+	}
+
+	uint Width() const override
+	{
+		return this->dim.width + WidgetDimensions::scaled.hsep_wide + this->TBase::Width();
+	}
+
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+
+		DrawBadgeColumn(r.WithWidth(this->dim.width, rtl), 0, *this->gui_classes, this->badges, this->feature, this->introduction_date, PAL_NONE);
+
+		this->TBase::Draw(full, r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), sel, click_result, bg_colour);
+	}
+
+private:
+	std::shared_ptr<GUIBadgeClasses> gui_classes;
+
+	const std::span<const BadgeID> badges;
+	const GrfSpecFeature feature;
+	const std::optional<TimerGameCalendar::Date> introduction_date;
+
+	Dimension dim{};
+};
+
+using DropDownListBadgeItem = DropDownBadges<DropDownListStringItem>;
+using DropDownListBadgeIconItem = DropDownBadges<DropDownListIconItem>;
+
+std::unique_ptr<DropDownListItem> MakeDropDownListBadgeItem(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, std::string &&str, int value, bool masked, bool shaded)
+{
+	return std::make_unique<DropDownListBadgeItem>(gui_classes, badges, feature, introduction_date, std::move(str), value, masked, shaded);
+}
+
+std::unique_ptr<DropDownListItem> MakeDropDownListBadgeIconItem(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, const Dimension &dim, SpriteID sprite, PaletteID palette, std::string &&str, int value, bool masked, bool shaded)
+{
+	return std::make_unique<DropDownListBadgeIconItem>(gui_classes, badges, feature, introduction_date, dim, sprite, palette, std::move(str), value, masked, shaded);
+}
+
+/**
+ * Drop down component that shows extra buttons to indicate that the item can be moved up or down.
+ */
+template <class TBase, bool TEnd = true, FontSize TFs = FS_NORMAL>
+class DropDownMover : public TBase {
+public:
+	template <typename... Args>
+	explicit DropDownMover(int click_up, int click_down, Colours button_colour, Args &&...args)
+		: TBase(std::forward<Args>(args)...), click_up(click_up), click_down(click_down), button_colour(button_colour)
+	{
+	}
+
+	uint Height() const override
+	{
+		return std::max<uint>(SETTING_BUTTON_HEIGHT, this->TBase::Height());
+	}
+
+	uint Width() const override
+	{
+		return SETTING_BUTTON_WIDTH + WidgetDimensions::scaled.hsep_wide + this->TBase::Width();
+	}
+
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = (_current_text_dir == TD_RTL);
+		int w = SETTING_BUTTON_WIDTH;
+
+		Rect br = r.WithWidth(w, TEnd ^ rtl).CentreTo(w, SETTING_BUTTON_HEIGHT);
+		if (br.WithWidth(w / 2, rtl).Contains(pt)) return this->click_up;
+		if (br.WithWidth(w / 2, !rtl).Contains(pt)) return this->click_down;
+
+		return this->TBase::OnClick(r.Indent(w + WidgetDimensions::scaled.hsep_wide, TEnd ^ rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
+	{
+		bool rtl = (_current_text_dir == TD_RTL);
+		int w = SETTING_BUTTON_WIDTH;
+
+		int state = 0;
+		if (sel && click_result != 0) {
+			if (click_result == this->click_up) state = 1;
+			if (click_result == this->click_down) state = 2;
+		}
+
+		Rect br = r.WithWidth(w, TEnd ^ rtl).CentreTo(w, SETTING_BUTTON_HEIGHT);
+		DrawUpDownButtons(br.left, br.top, this->button_colour, state, this->click_up != 0, this->click_down != 0);
+
+		this->TBase::Draw(full, r.Indent(w + WidgetDimensions::scaled.hsep_wide, TEnd ^ rtl), sel, click_result, bg_colour);
+	}
+
+private:
+	int click_up; ///< Click result for up button. Button is inactive if 0.
+	int click_down; ///< Click result for down button. Button is inactive if 0.
+	Colours button_colour; ///< Colour of buttons.
+};
+
+using DropDownListToggleMoverItem = DropDownMover<DropDownToggle<DropDownString<DropDownListItem>>>;
+using DropDownListToggleItem = DropDownToggle<DropDownString<DropDownListItem>>;
+
+enum BadgeClick : int {
+	BADGE_CLICK_NONE,
+	BADGE_CLICK_MOVE_UP,
+	BADGE_CLICK_MOVE_DOWN,
+	BADGE_CLICK_TOGGLE_ICON,
+	BADGE_CLICK_TOGGLE_FILTER,
+};
+
+DropDownList BuildBadgeClassConfigurationList(const GUIBadgeClasses &gui_classes, uint columns, std::span<const StringID> column_separators)
+{
+	DropDownList list;
+
+	list.push_back(MakeDropDownListStringItem(STR_BADGE_CONFIG_RESET, INT_MAX));
+	if (gui_classes.GetClasses().empty()) return list;
+	list.push_back(MakeDropDownListDividerItem());
+	list.push_back(std::make_unique<DropDownUnselectable<DropDownListStringItem>>(GetString(STR_BADGE_CONFIG_ICONS), -1));
+
+	const BadgeClassID front = gui_classes.GetClasses().front().class_index;
+	const BadgeClassID back = gui_classes.GetClasses().back().class_index;
+
+	for (uint i = 0; i < columns; ++i) {
+		for (const auto &gc : gui_classes.GetClasses()) {
+			if (gc.column_group != i) continue;
+			if (gc.size.width == 0) continue;
+
+			bool first = (i == 0 && gc.class_index == front);
+			bool last = (i == columns - 1 && gc.class_index == back);
+			list.push_back(std::make_unique<DropDownListToggleMoverItem>(first ? 0 : BADGE_CLICK_MOVE_UP, last ? 0 : BADGE_CLICK_MOVE_DOWN, COLOUR_YELLOW, gc.visible, BADGE_CLICK_TOGGLE_ICON, COLOUR_YELLOW, COLOUR_GREY, GetString(GetClassBadge(gc.class_index)->name), gc.class_index.base()));
+		}
+
+		if (i >= column_separators.size()) continue;
+
+		if (column_separators[i] == STR_NULL) {
+			list.push_back(MakeDropDownListDividerItem());
+		} else {
+			list.push_back(MakeDropDownListStringItem(column_separators[i], INT_MIN + i, false, true));
+		}
+	}
+
+	list.push_back(MakeDropDownListDividerItem());
+	list.push_back(std::make_unique<DropDownUnselectable<DropDownListStringItem>>(GetString(STR_BADGE_CONFIG_FILTERS), -1));
+
+	for (const BadgeClassID &badge_class_index : gui_classes.Classes()) {
+		const Badge *badge = GetClassBadge(badge_class_index);
+		if (!badge->flags.Test(BadgeFlag::HasText)) continue;
+
+		const auto [config, _] = GetBadgeClassConfigItem(gui_classes.GetFeature(), badge->label);
+		list.push_back(std::make_unique<DropDownListToggleItem>(config.show_filter, BADGE_CLICK_TOGGLE_FILTER, COLOUR_YELLOW, COLOUR_GREY, GetString(badge->name), (1U << 16) | badge_class_index.base()));
+	}
+
+	return list;
+}
+
+/**
+ * Toggle badge class visibility.
+ * @param feature Feature being used.
+ * @param class_badge Class badge.
+ * @param click Dropdown click reuslt.
+ */
+static void BadgeClassToggleVisibility(GrfSpecFeature feature, Badge &class_badge, int click_result)
+{
+	auto config = GetBadgeClassConfiguration(feature);
+	auto it = std::ranges::find(config, class_badge.label, &BadgeClassConfigItem::label);
+	if (it == std::end(config)) return;
+
+	if (click_result == BADGE_CLICK_TOGGLE_ICON) it->show_icon = !it->show_icon;
+	if (click_result == BADGE_CLICK_TOGGLE_FILTER) it->show_filter = !it->show_filter;
+}
+
+/**
+ * Move the badge class to the previous position.
+ * @param feature Feature being used.
+ * @param class_badge Class badge.
+ */
+static void BadgeClassMovePrevious(GrfSpecFeature feature, Badge &class_badge)
+{
+	GUIBadgeClasses gui_classes(feature);
+	if (gui_classes.GetClasses().empty()) return;
+
+	auto config = GetBadgeClassConfiguration(feature);
+	auto it = std::ranges::find(config, class_badge.label, &BadgeClassConfigItem::label);
+	if (it == std::end(config)) return;
+
+	auto pos_cur = std::ranges::find(gui_classes.GetClasses(), class_badge.class_index, &GUIBadgeClasses::Element::class_index);
+	if (pos_cur == std::begin(gui_classes.GetClasses())) {
+		if (it->column > 0) --it->column;
+		return;
+	}
+
+	auto pos_prev = std::ranges::find(config, std::prev(pos_cur)->label, &BadgeClassConfigItem::label);
+	if (it->column > pos_prev->column) {
+		--it->column;
+	} else {
+		/* Rotate elements right so that it is placed before pos_prev, maintaining order of non-visible elements. */
+		std::rotate(pos_prev, it, std::next(it));
+	}
+}
+
+/**
+ * Move the badge class to the next position.
+ * @param feature Feature being used.
+ * @param class_badge Class badge.
+ * @param columns Maximum column number permitted.
+ */
+static void BadgeClassMoveNext(GrfSpecFeature feature, Badge &class_badge, uint columns)
+{
+	GUIBadgeClasses gui_classes(feature);
+	if (gui_classes.GetClasses().empty()) return;
+
+	auto config = GetBadgeClassConfiguration(feature);
+	auto it = std::ranges::find(config, class_badge.label, &BadgeClassConfigItem::label);
+	if (it == std::end(config)) return;
+
+	auto pos_cur = std::ranges::find(gui_classes.GetClasses(), class_badge.class_index, &GUIBadgeClasses::Element::class_index);
+	if (std::next(pos_cur) == std::end(gui_classes.GetClasses())) {
+		if (it->column < static_cast<int>(columns - 1)) ++it->column;
+		return;
+	}
+
+	auto pos_next = std::ranges::find(config, std::next(pos_cur)->label, &BadgeClassConfigItem::label);
+	if (it->column < pos_next->column) {
+		++it->column;
+	} else {
+		/* Rotate elements left so that it is placed after pos_next, maintaining order of non-visible elements. */
+		std::rotate(it, std::next(it), std::next(pos_next));
+	}
+}
+
+/**
+ * Handle the badge configuration drop down selection.
+ * @param feature Feature being used.
+ * @param columns Maximum column number permitted.
+ * @param result Selected dropdown item value.
+ * @param click_result Dropdown click result.
+ * @return true iff the caller should reinitialise their widgets.
+ */
+bool HandleBadgeConfigurationDropDownClick(GrfSpecFeature feature, uint columns, int result, int click_result)
+{
+	if (result == INT_MAX) {
+		ResetBadgeClassConfiguration(feature);
+		return true;
+	}
+
+	Badge *class_badge = GetClassBadge(static_cast<BadgeClassID>(result));
+	if (class_badge == nullptr) return false;
+
+	switch (click_result) {
+		case BADGE_CLICK_MOVE_DOWN: // Move down button.
+			BadgeClassMoveNext(feature, *class_badge, columns);
+			break;
+		case BADGE_CLICK_MOVE_UP: // Move up button.
+			BadgeClassMovePrevious(feature, *class_badge);
+			break;
+		case BADGE_CLICK_TOGGLE_ICON:
+		case BADGE_CLICK_TOGGLE_FILTER:
+			BadgeClassToggleVisibility(feature, *class_badge, click_result);
+			break;
+		default:
+			break;
+	}
+
+	return true;
+}
+
+NWidgetBadgeFilter::NWidgetBadgeFilter(Colours colour, WidgetID index, GrfSpecFeature feature, BadgeClassID badge_class)
+	: NWidgetLeaf(WWT_DROPDOWN, colour, index, WidgetData{ .string = STR_JUST_STRING }, STR_NULL)
+	, feature(feature), badge_class(badge_class)
+{
+	this->SetFill(1, 0);
+	this->SetResize(1, 0);
+}
+
+std::string NWidgetBadgeFilter::GetStringParameter(const BadgeFilterChoices &choices) const
+{
+	auto it = choices.find(this->badge_class);
+	if (it == std::end(choices)) {
+		return ::GetString(STR_BADGE_FILTER_ANY_LABEL, GetClassBadge(this->badge_class)->name);
+	}
+
+	return ::GetString(STR_BADGE_FILTER_IS_LABEL, GetClassBadge(it->first)->name, GetBadge(it->second)->name);
+}
+
+/**
+ * Get the drop down list of badges for this filter.
+ * @return Drop down list for filter.
+ */
+DropDownList NWidgetBadgeFilter::GetDropDownList() const
+{
+	DropDownList list;
+
+	/* Add item for disabling filtering. */
+	list.push_back(MakeDropDownListStringItem(::GetString(STR_BADGE_FILTER_ANY_LABEL, GetClassBadge(this->badge_class)->name), -1));
+	list.push_back(MakeDropDownListDividerItem());
+
+	/* Add badges */
+	Dimension d = GetBadgeMaximalDimension(this->badge_class, this->feature);
+	d.width = ScaleGUITrad(d.width);
+	d.height = ScaleGUITrad(d.height);
+
+	auto start = list.size();
+
+	const auto *bc = GetClassBadge(this->badge_class);
+
+	for (const Badge &badge : GetBadges()) {
+		if (badge.class_index != this->badge_class) continue;
+		if (badge.index == bc->index) continue;
+		if (badge.name == STR_NULL) continue;
+		if (!badge.features.Test(this->feature)) continue;
+
+		PalSpriteID ps = GetBadgeSprite(badge, this->feature, std::nullopt, PAL_NONE);
+		if (ps.sprite == 0) {
+			list.push_back(MakeDropDownListStringItem(badge.name, badge.index.base()));
+		} else {
+			list.push_back(MakeDropDownListIconItem(d, ps.sprite, ps.pal, badge.name, badge.index.base()));
+		}
+	}
+
+	std::sort(std::begin(list) + start, std::end(list), DropDownListStringItem::NatSortFunc);
+
+	return list;
+}
+
+/**
+ * Add badge drop down filter widgets.
+ * @param container Container widget to hold filter widgets.
+ * @param widget Widget index to apply to first filter.
+ * @param colour Background colour of widgets.
+ * @param feature GRF feature for filters.
+ * @return First and last widget indexes of filter widgets.
+ */
+std::pair<WidgetID, WidgetID> AddBadgeDropdownFilters(NWidgetContainer &container, WidgetID widget, Colours colour, GrfSpecFeature feature)
+{
+	container.Clear();
+	WidgetID first = ++widget;
+
+	/* Get list of classes used by feature. */
+	UsedBadgeClasses used(feature);
+
+	for (BadgeClassID class_index : used.Classes()) {
+		const auto [config, _] = GetBadgeClassConfigItem(feature, GetClassBadge(class_index)->label);
+		if (!config.show_filter) continue;
+
+		container.Add(std::make_unique<NWidgetBadgeFilter>(colour, widget, feature, class_index));
+		++widget;
+	}
+
+	return {first, widget};
+}
+
+/**
+ * Reset badge filter choice for a class.
+ * @param choices Badge filter choices.
+ * @param badge_class_index Badge class to reset.
+ */
+void ResetBadgeFilter(BadgeFilterChoices &choices, BadgeClassID badge_class_index)
+{
+	choices.erase(badge_class_index);
+}
+
+/**
+ * Set badge filter choice for a class.
+ * @param choides Badge filter choides.
+ * @param badge_index Badge to set. The badge class is inferred from the badge.
+ * @note if the badge_index is invalid, the filter will be reset instead.
+ */
+void SetBadgeFilter(BadgeFilterChoices &choices, BadgeID badge_index)
+{
+	const Badge *badge = GetBadge(badge_index);
+	assert(badge != nullptr);
+
+	choices[badge->class_index] = badge_index;
+}
diff --git a/src/newgrf_badge_gui.h b/src/newgrf_badge_gui.h
new file mode 100644
index 0000000000..935c48df22
--- /dev/null
+++ b/src/newgrf_badge_gui.h
@@ -0,0 +1,77 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file newgrf_badge.h Functions related to NewGRF badges. */
+
+#ifndef NEWGRF_BADGE_GUI_H
+#define NEWGRF_BADGE_GUI_H
+
+#include "dropdown_type.h"
+#include "newgrf.h"
+#include "newgrf_badge.h"
+#include "newgrf_badge_type.h"
+#include "timer/timer_game_calendar.h"
+
+class GUIBadgeClasses : public UsedBadgeClasses {
+public:
+	struct Element {
+		BadgeClassID class_index; ///< Badge class index.
+		uint8_t column_group; ///< Column group in UI. 0 = left, 1 = centre, 2 = right.
+		bool visible; ///< Whether the icon is visible.
+		uint sort_order; ///< Order of element.
+		Dimension size; ///< Maximal size of this element.
+		std::string_view label; ///< Class label (string owned by the class badge)
+	};
+
+	GUIBadgeClasses() = default;
+	explicit GUIBadgeClasses(GrfSpecFeature feature);
+
+	inline std::span<const Element> GetClasses() const
+	{
+		return this->gui_classes;
+	}
+
+	inline std::span<const uint> GetColumnWidths() const
+	{
+		return this->column_widths;
+	}
+
+	uint GetTotalColumnsWidth() const;
+
+private:
+	std::vector<Element> gui_classes{};
+	std::vector<uint> column_widths{};
+};
+
+int DrawBadgeNameList(Rect r, std::span<const BadgeID> badges, GrfSpecFeature feature);
+void DrawBadgeColumn(Rect r, int column_group, const GUIBadgeClasses &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, PaletteID remap);
+
+std::unique_ptr<DropDownListItem> MakeDropDownListBadgeItem(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, std::string &&str, int value, bool masked = false, bool shaded = false);
+std::unique_ptr<DropDownListItem> MakeDropDownListBadgeIconItem(const std::shared_ptr<GUIBadgeClasses> &gui_classes, std::span<const BadgeID> badges, GrfSpecFeature feature, std::optional<TimerGameCalendar::Date> introduction_date, const Dimension &dim, SpriteID sprite, PaletteID palette, std::string &&str, int value, bool masked = false, bool shaded = false);
+
+DropDownList BuildBadgeClassConfigurationList(const class GUIBadgeClasses &badge_class, uint columns, std::span<const StringID> column_separators);
+bool HandleBadgeConfigurationDropDownClick(GrfSpecFeature feature, uint columns, int result, int click_result);
+
+std::pair<WidgetID, WidgetID> AddBadgeDropdownFilters(NWidgetContainer &container, WidgetID widget, Colours colour, GrfSpecFeature feature);
+
+class NWidgetBadgeFilter : public NWidgetLeaf {
+public:
+	NWidgetBadgeFilter(Colours colour, WidgetID index, GrfSpecFeature feature, BadgeClassID badge_class);
+
+	BadgeClassID GetBadgeClassID() const { return this->badge_class; }
+	std::string GetStringParameter(const BadgeFilterChoices &choices) const;
+	DropDownList GetDropDownList() const;
+
+private:
+	GrfSpecFeature feature; ///< Feature of this dropdown.
+	BadgeClassID badge_class; ///< Badge class of this dropdown.
+};
+
+void ResetBadgeFilter(BadgeFilterChoices &choices, BadgeClassID badge_class_index);
+void SetBadgeFilter(BadgeFilterChoices &choices, BadgeID badge_index);
+
+#endif /* NEWGRF_BADGE_GUI_H */
diff --git a/src/newgrf_badge_type.h b/src/newgrf_badge_type.h
index 54810aca27..f23daf2f9a 100644
--- a/src/newgrf_badge_type.h
+++ b/src/newgrf_badge_type.h
@@ -16,12 +16,23 @@
 using BadgeID = StrongType::Typedef<uint16_t, struct BadgeIDTag, StrongType::Compare>;
 using BadgeClassID = StrongType::Typedef<uint16_t, struct BadgeClassIDTag, StrongType::Compare>;
 
+template <> struct std::hash<BadgeClassID> {
+	std::size_t operator()(const BadgeClassID &badge_class_index) const noexcept
+	{
+		return std::hash<BadgeClassID::BaseType>{}(badge_class_index.base());
+	}
+};
+
 enum class BadgeFlag : uint8_t {
 	Copy              = 0, ///< Copy badge to related things.
 	NameListStop      = 1, ///< Stop adding names to the name list after this badge.
 	NameListFirstOnly = 2, ///< Don't add this name to the name list if not first.
 	UseCompanyColour  = 3, ///< Apply company colour palette to this badge.
+
+	HasText, ///< Internal flag set if the badge has text.
 };
 using BadgeFlags = EnumBitSet<BadgeFlag, uint8_t>;
 
+using BadgeFilterChoices = std::unordered_map<BadgeClassID, BadgeID>;
+
 #endif /* NEWGRF_BADGE_TYPE_H */
diff --git a/src/newgrf_callbacks.h b/src/newgrf_callbacks.h
index 1753713d06..5c12e003af 100644
--- a/src/newgrf_callbacks.h
+++ b/src/newgrf_callbacks.h
@@ -65,10 +65,10 @@ enum CallbackID : uint16_t {
 	CBID_HOUSE_ANIMATION_NEXT_FRAME      = 0x1A, // 15 bit callback
 
 	/** Called for periodically starting or stopping the animation. */
-	CBID_HOUSE_ANIMATION_START_STOP      = 0x1B, // 15 bit callback
+	CBID_HOUSE_ANIMATION_TRIGGER_TILE_LOOP = 0x1B, // 15 bit callback
 
-	/** Called whenever the construction state of a house changes. */
-	CBID_HOUSE_CONSTRUCTION_STATE_CHANGE = 0x1C, // 15 bit callback
+	/** Called whenever the construction stage of a house changes. */
+	CBID_HOUSE_ANIMATION_TRIGGER_CONSTRUCTION_STAGE_CHANGED = 0x1C, // 15 bit callback
 
 	/** Determine whether a wagon can be attached to an already existing train. */
 	CBID_TRAIN_ALLOW_WAGON_ATTACH        = 0x1D,
@@ -98,10 +98,10 @@ enum CallbackID : uint16_t {
 	CBID_STATION_BUILD_TILE_LAYOUT       = 0x24, // 15 bit callback
 
 	/** Called for periodically starting or stopping the animation. */
-	CBID_INDTILE_ANIM_START_STOP         = 0x25, // 15 bit callback
+	CBID_INDTILE_ANIMATION_TRIGGER       = 0x25, // 15 bit callback
 
 	/** Called to determine industry tile next animation frame. */
-	CBID_INDTILE_ANIM_NEXT_FRAME         = 0x26, // 15 bit callback
+	CBID_INDTILE_ANIMATION_NEXT_FRAME    = 0x26, // 15 bit callback
 
 	/** Called to indicate how long the current animation frame should last. */
 	CBID_INDTILE_ANIMATION_SPEED         = 0x27, // 8 bit callback
@@ -184,10 +184,10 @@ enum CallbackID : uint16_t {
 	/* There are no callbacks 0x3E - 0x13F */
 
 	/** Called for periodically starting or stopping the animation. */
-	CBID_STATION_ANIM_START_STOP         = 0x140, // 15 bit callback
+	CBID_STATION_ANIMATION_TRIGGER       = 0x140, // 15 bit callback
 
 	/** Called to determine station tile next animation frame. */
-	CBID_STATION_ANIM_NEXT_FRAME         = 0x141, // 15 bit callback
+	CBID_STATION_ANIMATION_NEXT_FRAME    = 0x141, // 15 bit callback
 
 	/** Called to indicate how long the current animation frame should last. */
 	CBID_STATION_ANIMATION_SPEED         = 0x142, // 8 bit callback
@@ -208,7 +208,7 @@ enum CallbackID : uint16_t {
 	CBID_CANALS_SPRITE_OFFSET            = 0x147, // 15 bit callback
 
 	/** Called when a cargo type specified in property 20 is accepted. */
-	CBID_HOUSE_WATCHED_CARGO_ACCEPTED    = 0x148, // 15 bit callback
+	CBID_HOUSE_ANIMATION_TRIGGER_WATCHED_CARGO_ACCEPTED = 0x148, // 15 bit callback
 
 	/** Callback done for each tile of a station to check the slope. */
 	CBID_STATION_LAND_SLOPE_CHECK        = 0x149, // 15 bit callback
@@ -235,10 +235,10 @@ enum CallbackID : uint16_t {
 	CBID_AIRPTILE_DRAW_FOUNDATIONS       = 0x150, // 15 bit callback
 
 	/** Called for periodically starting or stopping the animation. */
-	CBID_AIRPTILE_ANIM_START_STOP        = 0x152, // 15 bit callback
+	CBID_AIRPTILE_ANIMATION_TRIGGER      = 0x152, // 15 bit callback
 
 	/** Called to determine airport tile next animation frame. */
-	CBID_AIRPTILE_ANIM_NEXT_FRAME        = 0x153, // 15 bit callback
+	CBID_AIRPTILE_ANIMATION_NEXT_FRAME   = 0x153, // 15 bit callback
 
 	/** Called to indicate how long the current animation frame should last. */
 	CBID_AIRPTILE_ANIMATION_SPEED        = 0x154, // 8 bit callback
@@ -259,7 +259,7 @@ enum CallbackID : uint16_t {
 	CBID_OBJECT_ANIMATION_NEXT_FRAME     = 0x158, // 15 bit callback
 
 	/** Called for periodically starting or stopping the animation. */
-	CBID_OBJECT_ANIMATION_START_STOP     = 0x159, // 15 bit callback
+	CBID_OBJECT_ANIMATION_TRIGGER        = 0x159, // 15 bit callback
 
 	/** Called to indicate how long the current animation frame should last. */
 	CBID_OBJECT_ANIMATION_SPEED          = 0x15A, // 8 bit callback
@@ -341,8 +341,8 @@ using RoadStopCallbackMasks = EnumBitSet<RoadStopCallbackMask, uint8_t>;
 enum class HouseCallbackMask : uint8_t {
 	AllowConstruction       =  0, ///< decide whether the house can be built on a given tile
 	AnimationNextFrame      =  1, ///< decides next animation frame
-	AnimationStartStop      =  2, ///< periodically start/stop the animation
-	ConstructionStateChange =  3, ///< change animation when construction state changes
+	AnimationTriggerTileLoop = 2, ///< periodically start/stop the animation
+	AnimationTriggerConstructionStageChanged = 3, ///< change animation when construction stage changes
 	Colour                  =  4, ///< decide the colour of the building
 	CargoAcceptance         =  5, ///< decides amount of cargo acceptance
 	AnimationSpeed          =  6, ///< decides animation speed
diff --git a/src/newgrf_canal.cpp b/src/newgrf_canal.cpp
index 48315fc4bf..4cb05922dd 100644
--- a/src/newgrf_canal.cpp
+++ b/src/newgrf_canal.cpp
@@ -140,10 +140,10 @@ CanalResolverObject::CanalResolverObject(CanalFeature feature, TileIndex tile,
 SpriteID GetCanalSprite(CanalFeature feature, TileIndex tile)
 {
 	CanalResolverObject object(feature, tile);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return 0;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return 0;
 
-	return group->GetResult();
+	return group->sprite;
 }
 
 /**
@@ -153,12 +153,13 @@ SpriteID GetCanalSprite(CanalFeature feature, TileIndex tile)
  * @param param2   Callback parameter 2.
  * @param feature  For which feature to run the callback.
  * @param tile     Tile index of canal.
+ * @param[out] regs100 Additional result values from registers 100+
  * @return Callback result or #CALLBACK_FAILED if the callback failed.
  */
-static uint16_t GetCanalCallback(CallbackID callback, uint32_t param1, uint32_t param2, CanalFeature feature, TileIndex tile)
+static uint16_t GetCanalCallback(CallbackID callback, uint32_t param1, uint32_t param2, CanalFeature feature, TileIndex tile, std::span<int32_t> regs100 = {})
 {
 	CanalResolverObject object(feature, tile, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index c0dc43b49a..0fa5f6cb70 100644
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -55,17 +55,17 @@ CargoResolverObject::CargoResolverObject(const CargoSpec *cs, CallbackID callbac
 SpriteID GetCustomCargoSprite(const CargoSpec *cs)
 {
 	CargoResolverObject object(cs);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return 0;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return 0;
 
-	return group->GetResult();
+	return group->sprite;
 }
 
 
-uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2, const CargoSpec *cs)
+uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2, const CargoSpec *cs, std::span<int32_t> regs100)
 {
 	CargoResolverObject object(cs, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
diff --git a/src/newgrf_cargo.h b/src/newgrf_cargo.h
index 649c9ee420..b0a723e697 100644
--- a/src/newgrf_cargo.h
+++ b/src/newgrf_cargo.h
@@ -14,23 +14,12 @@
 #include "cargo_type.h"
 #include "gfx_type.h"
 
-/**
- * Sprite Group Cargo types.
- * These special cargo types are used when resolving sprite groups when non-cargo-specific sprites or callbacks are needed,
- * e.g. in purchase lists, or if no specific cargo type sprite group is supplied.
- */
-namespace SpriteGroupCargo {
-	static constexpr CargoType SG_DEFAULT    = NUM_CARGO;     ///< Default type used when no more-specific cargo matches.
-	static constexpr CargoType SG_PURCHASE   = NUM_CARGO + 1; ///< Used in purchase lists before an item exists.
-	static constexpr CargoType SG_DEFAULT_NA = NUM_CARGO + 2; ///< Used only by stations and roads when no more-specific cargo matches.
-};
-
 /* Forward declarations of structs used */
 struct CargoSpec;
 struct GRFFile;
 
 SpriteID GetCustomCargoSprite(const CargoSpec *cs);
-uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2, const CargoSpec *cs);
+uint16_t GetCargoCallback(CallbackID callback, uint32_t param1, uint32_t param2, const CargoSpec *cs, std::span<int32_t> regs100 = {});
 CargoType GetCargoTranslation(uint8_t cargo, const GRFFile *grffile, bool usebit = false);
 
 std::span<const CargoLabel> GetClimateDependentCargoTranslationTable();
diff --git a/src/newgrf_class_func.h b/src/newgrf_class_func.h
index 7332ad7de9..783bb99a3d 100644
--- a/src/newgrf_class_func.h
+++ b/src/newgrf_class_func.h
@@ -9,6 +9,8 @@
 
 #include "newgrf_class.h"
 
+#include "table/strings.h"
+
 /** Reset the classes, i.e. clear everything. */
 template <typename Tspec, typename Tindex, Tindex Tmax>
 void NewGRFClass<Tspec, Tindex, Tmax>::Reset()
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp
index 6ed612ca81..98c9d434f1 100644
--- a/src/newgrf_commons.cpp
+++ b/src/newgrf_commons.cpp
@@ -157,9 +157,9 @@ uint16_t OverrideManagerBase::GetSubstituteID(uint16_t entity_id) const
  * It will find itself the proper slot on which it will go
  * @param hs HouseSpec read from the grf file, ready for inclusion
  */
-void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs)
+void HouseOverrideManager::SetEntitySpec(HouseSpec &&hs)
 {
-	HouseID house_id = this->AddEntityID(hs->grf_prop.local_id, hs->grf_prop.grfid, hs->grf_prop.subst_id);
+	HouseID house_id = this->AddEntityID(hs.grf_prop.local_id, hs.grf_prop.grfid, hs.grf_prop.subst_id);
 
 	if (house_id == this->invalid_id) {
 		GrfMsg(1, "House.SetEntitySpec: Too many houses allocated. Ignoring.");
@@ -170,13 +170,13 @@ void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs)
 
 	/* Now that we know we can use the given id, copy the spec to its final destination. */
 	if (house_id >= house_specs.size()) house_specs.resize(house_id + 1);
-	house_specs[house_id] = *hs;
+	house_specs[house_id] = std::move(hs);
 
 	/* Now add the overrides. */
 	for (int i = 0; i < this->max_offset; i++) {
 		HouseSpec *overridden_hs = HouseSpec::Get(i);
 
-		if (this->entity_overrides[i] != hs->grf_prop.local_id || this->grfid_overrides[i] != hs->grf_prop.grfid) continue;
+		if (this->entity_overrides[i] != house_specs[house_id].grf_prop.local_id || this->grfid_overrides[i] != house_specs[house_id].grf_prop.grfid) continue;
 
 		overridden_hs->grf_prop.override_id = house_id;
 		this->entity_overrides[i] = this->invalid_id;
@@ -245,18 +245,18 @@ uint16_t IndustryOverrideManager::AddEntityID(uint16_t grf_local_id, uint32_t gr
  * checking what is available
  * @param inds Industryspec that comes from the grf decoding process
  */
-void IndustryOverrideManager::SetEntitySpec(IndustrySpec *inds)
+void IndustryOverrideManager::SetEntitySpec(IndustrySpec &&inds)
 {
 	/* First step : We need to find if this industry is already specified in the savegame data. */
-	IndustryType ind_id = this->GetID(inds->grf_prop.local_id, inds->grf_prop.grfid);
+	IndustryType ind_id = this->GetID(inds.grf_prop.local_id, inds.grf_prop.grfid);
 
 	if (ind_id == this->invalid_id) {
 		/* Not found.
 		 * Or it has already been overridden, so you've lost your place.
 		 * Or it is a simple substitute.
 		 * We need to find a free available slot */
-		ind_id = this->AddEntityID(inds->grf_prop.local_id, inds->grf_prop.grfid, inds->grf_prop.subst_id);
-		inds->grf_prop.override_id = this->invalid_id;  // make sure it will not be detected as overridden
+		ind_id = this->AddEntityID(inds.grf_prop.local_id, inds.grf_prop.grfid, inds.grf_prop.subst_id);
+		inds.grf_prop.override_id = this->invalid_id;  // make sure it will not be detected as overridden
 	}
 
 	if (ind_id == this->invalid_id) {
@@ -265,27 +265,27 @@ void IndustryOverrideManager::SetEntitySpec(IndustrySpec *inds)
 	}
 
 	/* Now that we know we can use the given id, copy the spec to its final destination... */
-	_industry_specs[ind_id] = *inds;
+	_industry_specs[ind_id] = std::move(inds);
 	/* ... and mark it as usable*/
 	_industry_specs[ind_id].enabled = true;
 }
 
-void IndustryTileOverrideManager::SetEntitySpec(const IndustryTileSpec *its)
+void IndustryTileOverrideManager::SetEntitySpec(IndustryTileSpec &&its)
 {
-	IndustryGfx indt_id = this->AddEntityID(its->grf_prop.local_id, its->grf_prop.grfid, its->grf_prop.subst_id);
+	IndustryGfx indt_id = this->AddEntityID(its.grf_prop.local_id, its.grf_prop.grfid, its.grf_prop.subst_id);
 
 	if (indt_id == this->invalid_id) {
 		GrfMsg(1, "IndustryTile.SetEntitySpec: Too many industry tiles allocated. Ignoring.");
 		return;
 	}
 
-	_industry_tile_specs[indt_id] = *its;
+	_industry_tile_specs[indt_id] = std::move(its);
 
 	/* Now add the overrides. */
 	for (int i = 0; i < this->max_offset; i++) {
 		IndustryTileSpec *overridden_its = &_industry_tile_specs[i];
 
-		if (this->entity_overrides[i] != its->grf_prop.local_id || this->grfid_overrides[i] != its->grf_prop.grfid) continue;
+		if (this->entity_overrides[i] != _industry_tile_specs[indt_id].grf_prop.local_id || this->grfid_overrides[i] != _industry_tile_specs[indt_id].grf_prop.grfid) continue;
 
 		overridden_its->grf_prop.override_id = indt_id;
 		overridden_its->enabled = false;
@@ -300,17 +300,17 @@ void IndustryTileOverrideManager::SetEntitySpec(const IndustryTileSpec *its)
  * checking what is available
  * @param spec ObjectSpec that comes from the grf decoding process
  */
-void ObjectOverrideManager::SetEntitySpec(ObjectSpec *spec)
+void ObjectOverrideManager::SetEntitySpec(ObjectSpec &&spec)
 {
 	/* First step : We need to find if this object is already specified in the savegame data. */
-	ObjectType type = this->GetID(spec->grf_prop.local_id, spec->grf_prop.grfid);
+	ObjectType type = this->GetID(spec.grf_prop.local_id, spec.grf_prop.grfid);
 
 	if (type == this->invalid_id) {
 		/* Not found.
 		 * Or it has already been overridden, so you've lost your place.
 		 * Or it is a simple substitute.
 		 * We need to find a free available slot */
-		type = this->AddEntityID(spec->grf_prop.local_id, spec->grf_prop.grfid, OBJECT_TRANSMITTER);
+		type = this->AddEntityID(spec.grf_prop.local_id, spec.grf_prop.grfid, OBJECT_TRANSMITTER);
 	}
 
 	if (type == this->invalid_id) {
@@ -322,7 +322,7 @@ void ObjectOverrideManager::SetEntitySpec(ObjectSpec *spec)
 
 	/* Now that we know we can use the given id, copy the spec to its final destination. */
 	if (type >= _object_specs.size()) _object_specs.resize(type + 1);
-	_object_specs[type] = *spec;
+	_object_specs[type] = std::move(spec);
 }
 
 /**
@@ -357,7 +357,7 @@ uint32_t GetTerrainType(TileIndex tile, TileContext context)
 				case MP_ROAD:
 					/* During map generation the snowstate may not be valid yet, as the tileloop may not have run yet. */
 					if (_generating_world) goto genworld; // we do not care about foundations here
-					has_snow = IsOnSnow(tile);
+					has_snow = IsOnSnowOrDesert(tile);
 					break;
 
 				case MP_TREES: {
@@ -463,23 +463,29 @@ uint32_t GetCompanyInfo(CompanyID owner, const Livery *l)
 /**
  * Get the error message from a shape/location/slope check callback result.
  * @param cb_res Callback result to translate. If bit 10 is set this is a standard error message, otherwise a NewGRF provided string.
+ * @param textstack Text parameter stack.
  * @param grffile NewGRF to use to resolve a custom error message.
  * @param default_error Error message to use for the generic error.
  * @return CommandCost indicating success or the error message.
  */
-CommandCost GetErrorMessageFromLocationCallbackResult(uint16_t cb_res, const GRFFile *grffile, StringID default_error)
+CommandCost GetErrorMessageFromLocationCallbackResult(uint16_t cb_res, std::span<const int32_t> textstack, const GRFFile *grffile, StringID default_error)
 {
-	CommandCost res;
-
-	if (cb_res < 0x400) {
-		res = CommandCost(GetGRFStringID(grffile->grfid, GRFSTR_MISC_GRF_TEXT + cb_res));
+	auto get_newgrf_text = [&grffile](GRFStringID text_id, std::span<const int32_t> textstack) {
+		CommandCost res = CommandCost(GetGRFStringID(grffile->grfid, text_id));
 
 		/* If this error isn't for the local player then it won't be seen, so don't bother encoding anything. */
-		if (!IsLocalCompany()) return res;
+		if (IsLocalCompany()) {
+			StringID stringid = GetGRFStringID(grffile->grfid, text_id);
+			auto params = GetGRFSringTextStackParameters(grffile, stringid, textstack);
+			res.SetEncodedMessage(GetEncodedStringWithArgs(stringid, params));
+		}
 
-		StringID stringid = GetGRFStringID(grffile->grfid, GRFSTR_MISC_GRF_TEXT + cb_res);
-		auto params = GetGRFSringTextStackParameters(grffile, stringid, 4);
-		res.SetEncodedMessage(GetEncodedStringWithArgs(stringid, params));
+		return res;
+	};
+
+	CommandCost res;
+	if (cb_res < 0x400) {
+		res = get_newgrf_text(GRFSTR_MISC_GRF_TEXT + cb_res, textstack);
 	} else {
 		switch (cb_res) {
 			case 0x400: return res; // No error.
@@ -494,6 +500,7 @@ CommandCost GetErrorMessageFromLocationCallbackResult(uint16_t cb_res, const GRF
 			case 0x406: res = CommandCost(STR_ERROR_CAN_T_BUILD_ON_SEA); break;
 			case 0x407: res = CommandCost(STR_ERROR_CAN_T_BUILD_ON_CANAL); break;
 			case 0x408: res = CommandCost(STR_ERROR_CAN_T_BUILD_ON_RIVER); break;
+			case 0x40F: res = get_newgrf_text(static_cast<GRFStringID>(textstack[0]), textstack.subspan(1)); break;
 		}
 	}
 
@@ -562,10 +569,6 @@ bool Convert8bitBooleanCallback(const GRFFile *grffile, uint16_t cbid, uint16_t
 	return cb_res != 0;
 }
 
-
-/* static */ std::vector<DrawTileSeqStruct> NewGRFSpriteLayout::result_seq;
-
-
 /**
  * Allocate a spritelayout for \a num_sprites building sprites.
  * @param num_sprites Number of building sprites to allocate memory for. (not counting the terminator)
@@ -590,41 +593,38 @@ void NewGRFSpriteLayout::AllocateRegisters()
 /**
  * Prepares a sprite layout before resolving action-1-2-3 chains.
  * Integrates offsets into the layout and determines which chains to resolve.
- * @note The function uses statically allocated temporary storage, which is reused every time when calling the function.
- *       That means, you have to use the sprite layout before calling #PrepareLayout() the next time.
+ * @param raw_layout Sprite layout in need of preprocessing.
  * @param orig_offset          Offset to apply to non-action-1 sprites.
  * @param newgrf_ground_offset Offset to apply to action-1 ground sprites.
  * @param newgrf_offset        Offset to apply to action-1 non-ground sprites.
  * @param constr_stage         Construction stage (0-3) to apply to all action-1 sprites.
  * @param separate_ground      Whether the ground sprite shall be resolved by a separate action-1-2-3 chain by default.
- * @return Bitmask of values for variable 10 to resolve action-1-2-3 chains for.
  */
-uint32_t NewGRFSpriteLayout::PrepareLayout(uint32_t orig_offset, uint32_t newgrf_ground_offset, uint32_t newgrf_offset, uint constr_stage, bool separate_ground) const
+SpriteLayoutProcessor::SpriteLayoutProcessor(const NewGRFSpriteLayout &raw_layout, uint32_t orig_offset, uint32_t newgrf_ground_offset, uint32_t newgrf_offset, uint constr_stage, bool separate_ground) :
+	raw_layout(&raw_layout), separate_ground(separate_ground)
 {
-	result_seq.clear();
-	uint32_t var10_values = 0;
+	this->result_seq.reserve(this->raw_layout->seq.size() + 1);
 
 	/* Create a copy of the spritelayout, so we can modify some values.
 	 * Also include the groundsprite into the sequence for easier processing. */
-	DrawTileSeqStruct &copy = result_seq.emplace_back();
-	copy.image = ground;
+	DrawTileSeqStruct &copy = this->result_seq.emplace_back();
+	copy.image = this->raw_layout->ground;
 	copy.delta_z = static_cast<int8_t>(0x80);
 
-	for (const DrawTileSeqStruct &dtss : this->seq) {
-		result_seq.emplace_back(dtss);
-	}
+	this->result_seq.insert(this->result_seq.end(), this->raw_layout->seq.begin(), this->raw_layout->seq.end());
+
 	/* Determine the var10 values the action-1-2-3 chains needs to be resolved for,
 	 * and apply the default sprite offsets (unless disabled). */
-	const TileLayoutRegisters *regs = this->registers.empty() ? nullptr : this->registers.data();
+	const TileLayoutRegisters *regs = this->raw_layout->registers.empty() ? nullptr : this->raw_layout->registers.data();
 	bool ground = true;
-	for (DrawTileSeqStruct result : result_seq) {
+	for (DrawTileSeqStruct &result : this->result_seq) {
 		TileLayoutFlags flags = TLF_NOTHING;
 		if (regs != nullptr) flags = regs->flags;
 
 		/* Record var10 value for the sprite */
 		if (HasBit(result.image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE) || (flags & TLF_SPRITE_REG_FLAGS)) {
-			uint8_t var10 = (flags & TLF_SPRITE_VAR10) ? regs->sprite_var10 : (ground && separate_ground ? 1 : 0);
-			SetBit(var10_values, var10);
+			uint8_t var10 = (flags & TLF_SPRITE_VAR10) ? regs->sprite_var10 : (ground && this->separate_ground ? 1 : 0);
+			SetBit(this->var10_values, var10);
 		}
 
 		/* Add default sprite offset, unless there is a custom one */
@@ -639,8 +639,8 @@ uint32_t NewGRFSpriteLayout::PrepareLayout(uint32_t orig_offset, uint32_t newgrf
 
 		/* Record var10 value for the palette */
 		if (HasBit(result.image.pal, SPRITE_MODIFIER_CUSTOM_SPRITE) || (flags & TLF_PALETTE_REG_FLAGS)) {
-			uint8_t var10 = (flags & TLF_PALETTE_VAR10) ? regs->palette_var10 : (ground && separate_ground ? 1 : 0);
-			SetBit(var10_values, var10);
+			uint8_t var10 = (flags & TLF_PALETTE_VAR10) ? regs->palette_var10 : (ground && this->separate_ground ? 1 : 0);
+			SetBit(this->var10_values, var10);
 		}
 
 		/* Add default palette offset, unless there is a custom one */
@@ -654,38 +654,35 @@ uint32_t NewGRFSpriteLayout::PrepareLayout(uint32_t orig_offset, uint32_t newgrf
 		ground = false;
 		if (regs != nullptr) regs++;
 	}
-
-	return var10_values;
 }
 
 /**
  * Evaluates the register modifiers and integrates them into the preprocessed sprite layout.
- * @pre #PrepareLayout() needs calling first.
+ * @param object ResolverObject owning the temporary storage.
  * @param resolved_var10  The value of var10 the action-1-2-3 chain was evaluated for.
  * @param resolved_sprite Result sprite of the action-1-2-3 chain.
- * @param separate_ground Whether the ground sprite is resolved by a separate action-1-2-3 chain.
- * @return Resulting spritelayout after processing the registers.
  */
-void NewGRFSpriteLayout::ProcessRegisters(uint8_t resolved_var10, uint32_t resolved_sprite, bool separate_ground) const
+void SpriteLayoutProcessor::ProcessRegisters(const ResolverObject &object, uint8_t resolved_var10, uint32_t resolved_sprite)
 {
-	const TileLayoutRegisters *regs = this->registers.empty() ? nullptr : this->registers.data();
+	assert(this->raw_layout != nullptr);
+	const TileLayoutRegisters *regs = this->raw_layout->registers.empty() ? nullptr : this->raw_layout->registers.data();
 	bool ground = true;
-	for (DrawTileSeqStruct &result : result_seq) {
+	for (DrawTileSeqStruct &result : this->result_seq) {
 		TileLayoutFlags flags = TLF_NOTHING;
 		if (regs != nullptr) flags = regs->flags;
 
 		/* Is the sprite or bounding box affected by an action-1-2-3 chain? */
 		if (HasBit(result.image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE) || (flags & TLF_SPRITE_REG_FLAGS)) {
 			/* Does the var10 value apply to this sprite? */
-			uint8_t var10 = (flags & TLF_SPRITE_VAR10) ? regs->sprite_var10 : (ground && separate_ground ? 1 : 0);
+			uint8_t var10 = (flags & TLF_SPRITE_VAR10) ? regs->sprite_var10 : (ground && this->separate_ground ? 1 : 0);
 			if (var10 == resolved_var10) {
 				/* Apply registers */
-				if ((flags & TLF_DODRAW) && GetRegister(regs->dodraw) == 0) {
+				if ((flags & TLF_DODRAW) && object.GetRegister(regs->dodraw) == 0) {
 					result.image.sprite = 0;
 				} else {
 					if (HasBit(result.image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE)) result.image.sprite += resolved_sprite;
 					if (flags & TLF_SPRITE) {
-						int16_t offset = (int16_t)GetRegister(regs->sprite); // mask to 16 bits to avoid trouble
+						int16_t offset = static_cast<int16_t>(object.GetRegister(regs->sprite)); // mask to 16 bits to avoid trouble
 						if (!HasBit(result.image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE) || (offset >= 0 && offset < regs->max_sprite_offset)) {
 							result.image.sprite += offset;
 						} else {
@@ -695,13 +692,13 @@ void NewGRFSpriteLayout::ProcessRegisters(uint8_t resolved_var10, uint32_t resol
 
 					if (result.IsParentSprite()) {
 						if (flags & TLF_BB_XY_OFFSET) {
-							result.delta_x += static_cast<int32_t>(GetRegister(regs->delta.parent[0]));
-							result.delta_y += static_cast<int32_t>(GetRegister(regs->delta.parent[1]));
+							result.delta_x += object.GetRegister(regs->delta.parent[0]);
+							result.delta_y += object.GetRegister(regs->delta.parent[1]);
 						}
-						if (flags & TLF_BB_Z_OFFSET)    result.delta_z += static_cast<int32_t>(GetRegister(regs->delta.parent[2]));
+						if (flags & TLF_BB_Z_OFFSET) result.delta_z += object.GetRegister(regs->delta.parent[2]);
 					} else {
-						if (flags & TLF_CHILD_X_OFFSET) result.delta_x += static_cast<int32_t>(GetRegister(regs->delta.child[0]));
-						if (flags & TLF_CHILD_Y_OFFSET) result.delta_y += static_cast<int32_t>(GetRegister(regs->delta.child[1]));
+						if (flags & TLF_CHILD_X_OFFSET) result.delta_x += object.GetRegister(regs->delta.child[0]);
+						if (flags & TLF_CHILD_Y_OFFSET) result.delta_y += object.GetRegister(regs->delta.child[1]);
 					}
 				}
 			}
@@ -710,12 +707,12 @@ void NewGRFSpriteLayout::ProcessRegisters(uint8_t resolved_var10, uint32_t resol
 		/* Is the palette affected by an action-1-2-3 chain? */
 		if (result.image.sprite != 0 && (HasBit(result.image.pal, SPRITE_MODIFIER_CUSTOM_SPRITE) || (flags & TLF_PALETTE_REG_FLAGS))) {
 			/* Does the var10 value apply to this sprite? */
-			uint8_t var10 = (flags & TLF_PALETTE_VAR10) ? regs->palette_var10 : (ground && separate_ground ? 1 : 0);
+			uint8_t var10 = (flags & TLF_PALETTE_VAR10) ? regs->palette_var10 : (ground && this->separate_ground ? 1 : 0);
 			if (var10 == resolved_var10) {
 				/* Apply registers */
 				if (HasBit(result.image.pal, SPRITE_MODIFIER_CUSTOM_SPRITE)) result.image.pal += resolved_sprite;
 				if (flags & TLF_PALETTE) {
-					int16_t offset = (int16_t)GetRegister(regs->palette); // mask to 16 bits to avoid trouble
+					int16_t offset = static_cast<int16_t>(object.GetRegister(regs->palette)); // mask to 16 bits to avoid trouble
 					if (!HasBit(result.image.pal, SPRITE_MODIFIER_CUSTOM_SPRITE) || (offset >= 0 && offset < regs->max_palette_offset)) {
 						result.image.pal += offset;
 					} else {
@@ -740,30 +737,3 @@ void GRFFilePropsBase::SetGRFFile(const struct GRFFile *grffile)
 	this->grffile = grffile;
 	this->grfid = grffile == nullptr ? 0 : grffile->grfid;
 }
-
-/**
- * Get the SpriteGroup at the specified index.
- * @param index Index to get.
- * @returns SpriteGroup at index, or nullptr if not present.
- */
-const SpriteGroup *VariableGRFFileProps::GetSpriteGroup(size_t index) const
-{
-	auto it = std::ranges::lower_bound(this->spritegroups, index, std::less{}, &CargoSpriteGroup::first);
-	if (it == std::end(this->spritegroups) || it->first != index) return nullptr;
-	return it->second;
-}
-
-/**
- * Set the SpriteGroup at the specified index.
- * @param index Index to set.
- * @param spritegroup SpriteGroup to set.
- */
-void VariableGRFFileProps::SetSpriteGroup(size_t index, const SpriteGroup *spritegroup)
-{
-	auto it = std::ranges::lower_bound(this->spritegroups, index, std::less{}, &CargoSpriteGroup::first);
-	if (it == std::end(this->spritegroups) || it->first != index) {
-		this->spritegroups.emplace(it, index, spritegroup);
-	} else {
-		it->second = spritegroup;
-	}
-}
diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h
index 37ecc134e7..47ff3115a8 100644
--- a/src/newgrf_commons.h
+++ b/src/newgrf_commons.h
@@ -18,6 +18,8 @@
 #include "command_type.h"
 #include "direction_type.h"
 #include "company_type.h"
+#include "cargo_type.h"
+#include "core/bitmath_func.hpp"
 
 /** Context for tile accesses */
 enum TileContext : uint8_t {
@@ -123,9 +125,8 @@ struct NewGRFSpriteLayout : DrawTileSprites {
 	void AllocateRegisters();
 
 	/**
-	 * Tests whether this spritelayout needs preprocessing by
-	 * #PrepareLayout() and #ProcessRegisters(), or whether it can be
-	 * used directly.
+	 * Tests whether this spritelayout needs preprocessing by SpriteLayoutProcessor,
+	 * or whether it can be used directly.
 	 * @return true if preprocessing is needed
 	 */
 	bool NeedsPreprocessing() const
@@ -133,25 +134,48 @@ struct NewGRFSpriteLayout : DrawTileSprites {
 		return !this->registers.empty();
 	}
 
-	uint32_t PrepareLayout(uint32_t orig_offset, uint32_t newgrf_ground_offset, uint32_t newgrf_offset, uint constr_stage, bool separate_ground) const;
-	void ProcessRegisters(uint8_t resolved_var10, uint32_t resolved_sprite, bool separate_ground) const;
+	std::span<const DrawTileSeqStruct> GetSequence() const override { return {this->seq.begin(), this->seq.end()}; }
+};
+
+/**
+ * Add dynamic register values to a sprite layout.
+ */
+class SpriteLayoutProcessor {
+	const NewGRFSpriteLayout *raw_layout = nullptr;
+	std::vector<DrawTileSeqStruct> result_seq;
+	uint32_t var10_values = 0;
+	bool separate_ground = false;
+public:
+	SpriteLayoutProcessor() = default;
+
+	/** Constructor for spritelayout, which do not need preprocessing. */
+	SpriteLayoutProcessor(const NewGRFSpriteLayout &raw_layout) : raw_layout(&raw_layout) {}
+
+	SpriteLayoutProcessor(const NewGRFSpriteLayout &raw_layout, uint32_t orig_offset, uint32_t newgrf_ground_offset, uint32_t newgrf_offset, uint constr_stage, bool separate_ground);
+
+	/**
+	 * Get values for variable 10 to resolve sprites for.
+	 * NewStations only.
+	 */
+	SetBitIterator<uint8_t, uint32_t> Var10Values() const { return this->var10_values; }
+
+	void ProcessRegisters(const struct ResolverObject &object, uint8_t resolved_var10, uint32_t resolved_sprite);
 
 	/**
 	 * Returns the result spritelayout after preprocessing.
-	 * @pre #PrepareLayout() and #ProcessRegisters() need calling first.
-	 * @return result spritelayout
+	 * @return result ground sprite and spritelayout
 	 */
-	std::span<DrawTileSeqStruct> GetLayout(PalSpriteID *ground) const
+	DrawTileSpriteSpan GetLayout() const
 	{
-		*ground = result_seq[0].image;
-		return {++result_seq.begin(), result_seq.end()};
+		assert(this->raw_layout != nullptr);
+		if (this->result_seq.empty()) {
+			/* Simple layout without preprocessing. */
+			return {this->raw_layout->ground, this->raw_layout->seq};
+		} else {
+			/* Dynamic layout with preprocessing. */
+			return {this->result_seq[0].image, {++this->result_seq.begin(), this->result_seq.end()}};
+		}
 	}
-
-	std::span<const DrawTileSeqStruct> GetSequence() const override { return {this->seq.begin(), this->seq.end()}; }
-
-
-private:
-	static std::vector<DrawTileSeqStruct> result_seq; ///< Temporary storage when preprocessing spritelayouts.
 };
 
 /**
@@ -210,7 +234,7 @@ public:
 	HouseOverrideManager(uint16_t offset, uint16_t maximum, uint16_t invalid) :
 			OverrideManagerBase(offset, maximum, invalid) {}
 
-	void SetEntitySpec(const HouseSpec *hs);
+	void SetEntitySpec(HouseSpec &&hs);
 };
 
 
@@ -223,7 +247,7 @@ public:
 	uint16_t AddEntityID(uint16_t grf_local_id, uint32_t grfid, uint16_t substitute_id) override;
 	uint16_t GetID(uint16_t grf_local_id, uint32_t grfid) const override;
 
-	void SetEntitySpec(IndustrySpec *inds);
+	void SetEntitySpec(IndustrySpec &&inds);
 };
 
 
@@ -235,7 +259,7 @@ public:
 	IndustryTileOverrideManager(uint16_t offset, uint16_t maximum, uint16_t invalid) :
 			OverrideManagerBase(offset, maximum, invalid) {}
 
-	void SetEntitySpec(const IndustryTileSpec *indts);
+	void SetEntitySpec(IndustryTileSpec &&indts);
 };
 
 struct AirportSpec;
@@ -244,7 +268,7 @@ public:
 	AirportOverrideManager(uint16_t offset, uint16_t maximum, uint16_t invalid) :
 			OverrideManagerBase(offset, maximum, invalid) {}
 
-	void SetEntitySpec(AirportSpec *inds);
+	void SetEntitySpec(AirportSpec &&inds);
 };
 
 struct AirportTileSpec;
@@ -255,7 +279,7 @@ public:
 	AirportTileOverrideManager(uint16_t offset, uint16_t maximum, uint16_t invalid) :
 			OverrideManagerBase(offset, maximum, invalid) {}
 
-	void SetEntitySpec(const AirportTileSpec *ats);
+	void SetEntitySpec(AirportTileSpec &&ats);
 };
 
 struct ObjectSpec;
@@ -266,7 +290,7 @@ public:
 	ObjectOverrideManager(uint16_t offset, uint16_t maximum, uint16_t invalid) :
 			OverrideManagerBase(offset, maximum, invalid) {}
 
-	void SetEntitySpec(ObjectSpec *spec);
+	void SetEntitySpec(ObjectSpec &&spec);
 };
 
 extern HouseOverrideManager _house_mngr;
@@ -280,7 +304,7 @@ uint32_t GetTerrainType(TileIndex tile, TileContext context = TCX_NORMAL);
 TileIndex GetNearbyTile(uint8_t parameter, TileIndex tile, bool signed_offsets = true, Axis axis = INVALID_AXIS);
 uint32_t GetNearbyTileInformation(TileIndex tile, bool grf_version8);
 uint32_t GetCompanyInfo(CompanyID owner, const struct Livery *l = nullptr);
-CommandCost GetErrorMessageFromLocationCallbackResult(uint16_t cb_res, const GRFFile *grffile, StringID default_error);
+CommandCost GetErrorMessageFromLocationCallbackResult(uint16_t cb_res, std::span<const int32_t> textstack, const GRFFile *grffile, StringID default_error);
 
 void ErrorUnknownCallbackResult(uint32_t grfid, uint16_t cbid, uint16_t cb_res);
 bool ConvertBooleanCallback(const struct GRFFile *grffile, uint16_t cbid, uint16_t cb_res);
@@ -305,9 +329,10 @@ struct GRFFilePropsBase {
 
 /**
  * Fixed-length list of sprite groups for an entity.
+ * @tparam Tkey Key for indexing spritegroups
  * @tparam Tcount Number of spritegroups
  */
-template <size_t Tcount>
+template <class Tkey, size_t Tcount>
 struct FixedGRFFileProps : GRFFilePropsBase {
 	std::array<const struct SpriteGroup *, Tcount> spritegroups{}; ///< pointers to the different sprite groups of the entity
 
@@ -316,31 +341,130 @@ struct FixedGRFFileProps : GRFFilePropsBase {
 	 * @param index Index to get.
 	 * @returns SpriteGroup at index, or nullptr if not present.
 	 */
-	const struct SpriteGroup *GetSpriteGroup(size_t index = 0) const { return this->spritegroups[index]; }
+	const struct SpriteGroup *GetSpriteGroup(Tkey index) const { return this->spritegroups[static_cast<size_t>(index)]; }
+
+	/**
+	 * Get the first existing SpriteGroup from a list of options.
+	 * @param indices Valid options.
+	 * @return First existing, or nullptr if none exists.
+	 */
+	const struct SpriteGroup *GetFirstSpriteGroupOf(std::initializer_list<Tkey> indices) const
+	{
+		for (auto key : indices) {
+			auto *result = GetSpriteGroup(key);
+			if (result != nullptr) return result;
+		}
+		return nullptr;
+	}
 
 	/**
 	 * Set the SpriteGroup at the specified index.
 	 * @param index Index to set.
 	 * @param spritegroup SpriteGroup to set.
 	 */
-	void SetSpriteGroup(size_t index, const struct SpriteGroup *spritegroup) { this->spritegroups[index] = spritegroup; }
+	void SetSpriteGroup(Tkey index, const struct SpriteGroup *spritegroup) { this->spritegroups[static_cast<size_t>(index)] = spritegroup; }
+};
+
+/**
+ * Standard sprite groups.
+ */
+enum class StandardSpriteGroup {
+	Default, ///< Default type used when no more-specific group matches.
+	Purchase, ///< Used before an entity exists.
+	End
+};
+
+/**
+ * Container for standard sprite groups.
+ */
+struct StandardGRFFileProps : FixedGRFFileProps<StandardSpriteGroup, static_cast<size_t>(StandardSpriteGroup::End)> {
+	using FixedGRFFileProps<StandardSpriteGroup, static_cast<size_t>(StandardSpriteGroup::End)>::GetSpriteGroup;
+
+	/**
+	 * Check whether the entity has sprite groups.
+	 */
+	bool HasSpriteGroups() const
+	{
+		return GetSpriteGroup(StandardSpriteGroup::Default) != nullptr;
+	}
+
+	/**
+	 * Get the standard sprite group.
+	 * @param entity_exists Whether the entity exists (true), or is being constructed or shown in the GUI (false).
+	 */
+	const struct SpriteGroup *GetSpriteGroup(bool entity_exists) const
+	{
+		auto *res = entity_exists ? nullptr : GetSpriteGroup(StandardSpriteGroup::Purchase);
+		return res ? res : GetSpriteGroup(StandardSpriteGroup::Default);
+	}
 };
 
 /**
  * Variable-length list of sprite groups for an entity.
+ * @tparam Tkey Key for indexing spritegroups
  */
+template <class Tkey>
 struct VariableGRFFileProps : GRFFilePropsBase {
-	using CargoSpriteGroup = std::pair<size_t, const struct SpriteGroup *>;
-	std::vector<CargoSpriteGroup> spritegroups; ///< pointers to the different sprite groups of the entity
+	using ValueType = std::pair<Tkey, const struct SpriteGroup *>;
+	std::vector<ValueType> spritegroups; ///< pointers to the different sprite groups of the entity
 
-	const struct SpriteGroup *GetSpriteGroup(size_t index) const;
-	void SetSpriteGroup(size_t index, const struct SpriteGroup *spritegroup);
+	/**
+	 * Get the SpriteGroup at the specified index.
+	 * @param index Index to get.
+	 * @returns SpriteGroup at index, or nullptr if not present.
+	 */
+	const SpriteGroup *GetSpriteGroup(Tkey index) const
+	{
+		auto it = std::ranges::lower_bound(this->spritegroups, index, std::less{}, &ValueType::first);
+		if (it == std::end(this->spritegroups) || it->first != index) return nullptr;
+		return it->second;
+	}
+
+	/**
+	 * Get the first existing SpriteGroup from a list of options.
+	 * @param indices Valid options.
+	 * @return First existing, or nullptr if none exists.
+	 */
+	const struct SpriteGroup *GetFirstSpriteGroupOf(std::initializer_list<Tkey> indices) const
+	{
+		for (auto key : indices) {
+			auto *result = GetSpriteGroup(key);
+			if (result != nullptr) return result;
+		}
+		return nullptr;
+	}
+
+	/**
+	 * Set the SpriteGroup at the specified index.
+	 * @param index Index to set.
+	 * @param spritegroup SpriteGroup to set.
+	*/
+	void SetSpriteGroup(Tkey index, const SpriteGroup *spritegroup)
+	{
+		auto it = std::ranges::lower_bound(this->spritegroups, index, std::less{}, &ValueType::first);
+		if (it == std::end(this->spritegroups) || it->first != index) {
+			this->spritegroups.emplace(it, index, spritegroup);
+		} else {
+			it->second = spritegroup;
+		}
+	}
 };
 
-/** Data related to the handling of grf files. */
-struct GRFFileProps : FixedGRFFileProps<1> {
+/**
+ * Sprite groups indexed by CargoType.
+ */
+struct CargoGRFFileProps : VariableGRFFileProps<CargoType> {
+	static constexpr CargoType SG_DEFAULT = NUM_CARGO; ///< Default type used when no more-specific cargo matches.
+	static constexpr CargoType SG_PURCHASE = NUM_CARGO + 1; ///< Used in purchase lists before an item exists.
+	static constexpr CargoType SG_DEFAULT_NA = NUM_CARGO + 2; ///< Used only by stations and roads when no more-specific cargo matches.
+};
+
+/**
+ * NewGRF entities which can replace default entities.
+ */
+struct SubstituteGRFFileProps : StandardGRFFileProps {
 	/** Set all default data constructor for the props. */
-	constexpr GRFFileProps(uint16_t subst_id = 0) : subst_id(subst_id), override_id(subst_id) {}
+	constexpr SubstituteGRFFileProps(uint16_t subst_id = 0) : subst_id(subst_id), override_id(subst_id) {}
 
 	uint16_t subst_id;
 	uint16_t override_id; ///< id of the entity been replaced by
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index 5b7db9b30d..eb4862c7a0 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -643,7 +643,7 @@ std::string GRFBuildParamList(const GRFConfig &c)
 	std::string result;
 	for (const uint32_t &value : c.param) {
 		if (!result.empty()) result += ' ';
-		result += std::to_string(value);
+		format_append(result, "{}", value);
 	}
 	return result;
 }
diff --git a/src/newgrf_debug.h b/src/newgrf_debug.h
index 0a9ce1a842..141415884b 100644
--- a/src/newgrf_debug.h
+++ b/src/newgrf_debug.h
@@ -10,6 +10,7 @@
 #ifndef NEWGRF_DEBUG_H
 #define NEWGRF_DEBUG_H
 
+#include "core/flatset_type.hpp"
 #include "newgrf.h"
 #include "tile_type.h"
 #include "vehicle_type.h"
@@ -25,7 +26,7 @@ enum NewGrfDebugSpritePickerMode : uint8_t {
 struct NewGrfDebugSpritePicker {
 	NewGrfDebugSpritePickerMode mode;   ///< Current state
 	void *clicked_pixel;                ///< Clicked pixel (pointer to blitter buffer)
-	std::vector<SpriteID> sprites;       ///< Sprites found
+	FlatSet<SpriteID> sprites; ///< Sprites found
 };
 
 extern NewGrfDebugSpritePicker _newgrf_debug_sprite_picker;
diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index 40fabd2e0c..f3780370bf 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -19,6 +19,7 @@
 #include "textbuf_gui.h"
 #include "vehicle_gui.h"
 #include "zoom_func.h"
+#include "core/string_consumer.hpp"
 
 #include "engine_base.h"
 #include "industry.h"
@@ -49,7 +50,7 @@
 #include "safeguards.h"
 
 /** The sprite picker. */
-NewGrfDebugSpritePicker _newgrf_debug_sprite_picker = { SPM_NONE, nullptr, std::vector<SpriteID>() };
+NewGrfDebugSpritePicker _newgrf_debug_sprite_picker = { SPM_NONE, nullptr, {} };
 
 /**
  * Get the feature index related to the window number.
@@ -85,13 +86,12 @@ enum NIType : uint8_t {
 	NIT_CARGO, ///< The property is a cargo
 };
 
-typedef const void *NIOffsetProc(const void *b);
+using NIReadProc = uint32_t(const void *b);
 
 /** Representation of the data from a NewGRF property. */
 struct NIProperty {
 	std::string_view name;          ///< A (human readable) name for the property
-	NIOffsetProc *offset_proc; ///< Callback proc to get the actual variable address in memory
-	uint8_t read_size;            ///< Number of bytes (i.e. byte, word, dword etc)
+	NIReadProc *read_proc; ///< Callback proc to get the actual variable from memory
 	uint8_t prop;                 ///< The number of the property
 	uint8_t type;
 };
@@ -103,8 +103,7 @@ struct NIProperty {
  */
 struct NICallback {
 	std::string_view name;          ///< The human readable name of the callback
-	NIOffsetProc *offset_proc; ///< Callback proc to get the actual variable address in memory
-	uint8_t read_size;            ///< The number of bytes (i.e. byte, word, dword etc) to read
+	NIReadProc *read_proc; ///< Callback proc to get the actual variable from memory
 	std::variant<
 		std::monostate,
 		VehicleCallbackMask,
@@ -360,7 +359,7 @@ struct NewGRFInspectWindow : Window {
 			}
 
 			case WID_NGRFI_MAINPANEL:
-				resize.height = std::max(11, GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal);
+				fill.height = resize.height = std::max(11, GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal);
 				resize.width  = 1;
 
 				size.height = 5 * resize.height + WidgetDimensions::scaled.frametext.Vertical();
@@ -412,7 +411,7 @@ struct NewGRFInspectWindow : Window {
 
 		GrfSpecFeature f = GetFeatureNum(this->window_number);
 		int h = GetVehicleImageCellSize((VehicleType)(VEH_TRAIN + (f - GSF_TRAINS)), EIT_IN_DEPOT).height;
-		int y = CenterBounds(br.top, br.bottom, h);
+		int y = CentreBounds(br.top, br.bottom, h);
 		DrawVehicleImage(v->First(), br, VehicleID::Invalid(), EIT_IN_DETAILS, skip);
 
 		/* Highlight the articulated part (this is different to the whole-vehicle highlighting of DrawVehicleImage */
@@ -487,15 +486,7 @@ struct NewGRFInspectWindow : Window {
 		if (!nif->properties.empty()) {
 			this->DrawString(r, i++, "Properties:");
 			for (const NIProperty &nip : nif->properties) {
-				const void *ptr = nip.offset_proc(base);
-				uint value;
-				switch (nip.read_size) {
-					case 1: value = *(const uint8_t  *)ptr; break;
-					case 2: value = *(const uint16_t *)ptr; break;
-					case 4: value = *(const uint32_t *)ptr; break;
-					default: NOT_REACHED();
-				}
-
+				uint32_t value = nip.read_proc(base);
 				this->DrawString(r, i++, fmt::format("  {:02x}: {} ({})", nip.prop, this->GetPropertyString(nip, value), nip.name));
 			}
 		}
@@ -504,17 +495,10 @@ struct NewGRFInspectWindow : Window {
 			this->DrawString(r, i++, "Callbacks:");
 			for (const NICallback &nic : nif->callbacks) {
 				if (!std::holds_alternative<std::monostate>(nic.cb_bit)) {
-					const void *ptr = nic.offset_proc(base_spec);
-					uint value;
-					switch (nic.read_size) {
-						case 1: value = *(const uint8_t  *)ptr; break;
-						case 2: value = *(const uint16_t *)ptr; break;
-						case 4: value = *(const uint32_t *)ptr; break;
-						default: NOT_REACHED();
-					}
+					uint32_t value = nic.read_proc(base_spec);
 
 					struct visitor {
-						uint value;
+						uint32_t value;
 
 						bool operator()(const std::monostate &) { return false; }
 						bool operator()(const VehicleCallbackMask &bit) { return static_cast<VehicleCallbackMasks>(this->value).Test(bit); }
@@ -608,9 +592,11 @@ struct NewGRFInspectWindow : Window {
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
-		if (!str.has_value() || str->empty()) return;
+		if (!str.has_value()) return;
 
-		NewGRFInspectWindow::var60params[GetFeatureNum(this->window_number)][this->current_edit_param - 0x60] = std::strtol(str->c_str(), nullptr, 16);
+		auto val = ParseInteger<int32_t>(*str, 10, true);
+		if (!val.has_value()) return;
+		NewGRFInspectWindow::var60params[GetFeatureNum(this->window_number)][this->current_edit_param - 0x60] = *val;
 		this->SetDirty();
 	}
 
@@ -819,7 +805,7 @@ struct SpriteAlignerWindow : Window {
 	Scrollbar *vscroll = nullptr;
 	std::map<SpriteID, XyOffs> offs_start_map{}; ///< Mapping of starting offsets for the sprites which have been aligned in the sprite aligner window.
 
-	static inline ZoomLevel zoom = ZOOM_LVL_END;
+	static inline ZoomLevel zoom = ZoomLevel::End;
 	static bool centre;
 	static bool crosshair;
 	const Action5Type *act5_type = nullptr; ///< Sprite Area of current selected sprite.
@@ -827,7 +813,7 @@ struct SpriteAlignerWindow : Window {
 	SpriteAlignerWindow(WindowDesc &desc, WindowNumber wno) : Window(desc)
 	{
 		/* On first opening, set initial zoom to current zoom level. */
-		if (SpriteAlignerWindow::zoom == ZOOM_LVL_END) SpriteAlignerWindow::zoom = _gui_zoom;
+		if (SpriteAlignerWindow::zoom == ZoomLevel::End) SpriteAlignerWindow::zoom = _gui_zoom;
 		SpriteAlignerWindow::zoom = Clamp(SpriteAlignerWindow::zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
 
 		/* Oh yes, we assume there is at least one normal sprite! */
@@ -902,9 +888,8 @@ struct SpriteAlignerWindow : Window {
 					d = maxdim(d, GetStringBoundingBox(GetString(STR_SPRITE_ALIGNER_SPRITE, spritefile->GetSimplifiedFilename(), GetParamMaxDigits(6))));
 				}
 				size.width = d.width + padding.width;
-				resize.height = GetCharacterHeight(FS_NORMAL) + padding.height;
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL) + padding.height;
 				resize.width = 1;
-				fill.height = resize.height;
 				break;
 			}
 
@@ -954,7 +939,7 @@ struct SpriteAlignerWindow : Window {
 				const NWidgetBase *nwid = this->GetWidget<NWidgetBase>(widget);
 				int step_size = nwid->resize_y;
 
-				const std::vector<SpriteID> &list = _newgrf_debug_sprite_picker.sprites;
+				const FlatSet<SpriteID> &list = _newgrf_debug_sprite_picker.sprites;
 
 				Rect ir = r.Shrink(WidgetDimensions::scaled.matrix);
 				auto [first, last] = this->vscroll->GetVisibleRangeIterators(list);
@@ -1068,8 +1053,8 @@ struct SpriteAlignerWindow : Window {
 				break;
 
 			default:
-				if (IsInsideBS(widget, WID_SA_ZOOM, ZOOM_LVL_END)) {
-					SpriteAlignerWindow::zoom = ZoomLevel(widget - WID_SA_ZOOM);
+				if (IsInsideBS(widget, WID_SA_ZOOM, to_underlying(ZoomLevel::End))) {
+					SpriteAlignerWindow::zoom = static_cast<ZoomLevel>(widget - WID_SA_ZOOM);
 					this->InvalidateData(0, true);
 				}
 				break;
@@ -1078,9 +1063,11 @@ struct SpriteAlignerWindow : Window {
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
-		if (!str.has_value() || str->empty()) return;
+		if (!str.has_value()) return;
 
-		this->current_sprite = atoi(str->c_str());
+		auto value = ParseInteger(*str, 10, true);
+		if (!value.has_value()) return;
+		this->current_sprite = *value;
 		if (this->current_sprite >= GetMaxSpriteID()) this->current_sprite = 0;
 		while (GetSpriteType(this->current_sprite) != SpriteType::Normal) {
 			this->current_sprite = (this->current_sprite + 1) % GetMaxSpriteID();
@@ -1104,9 +1091,9 @@ struct SpriteAlignerWindow : Window {
 		}
 
 		SpriteAlignerWindow::zoom = Clamp(SpriteAlignerWindow::zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
-		for (ZoomLevel z = ZOOM_LVL_BEGIN; z < ZOOM_LVL_END; z++) {
-			this->SetWidgetsDisabledState(z < _settings_client.gui.zoom_min || z > _settings_client.gui.zoom_max, WID_SA_ZOOM + z);
-			this->SetWidgetsLoweredState(SpriteAlignerWindow::zoom == z, WID_SA_ZOOM + z);
+		for (ZoomLevel z = ZoomLevel::Begin; z < ZoomLevel::End; z++) {
+			this->SetWidgetsDisabledState(z < _settings_client.gui.zoom_min || z > _settings_client.gui.zoom_max, WID_SA_ZOOM + to_underlying(z));
+			this->SetWidgetsLoweredState(SpriteAlignerWindow::zoom == z, WID_SA_ZOOM + to_underlying(z));
 		}
 	}
 
@@ -1186,12 +1173,12 @@ static constexpr NWidgetPart _nested_sprite_aligner_widgets[] = {
 					NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_SA_SCROLLBAR),
 				EndContainer(),
 				NWidget(NWID_VERTICAL),
-					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + ZOOM_LVL_IN_4X), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_MIN), SetFill(1, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + ZOOM_LVL_IN_2X), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_IN_2X), SetFill(1, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + ZOOM_LVL_NORMAL), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_NORMAL), SetFill(1, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + ZOOM_LVL_OUT_2X), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X), SetFill(1, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + ZOOM_LVL_OUT_4X), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X), SetFill(1, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + ZOOM_LVL_OUT_8X), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X), SetFill(1, 0),
+					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + to_underlying(ZoomLevel::In4x)), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_MIN), SetFill(1, 0),
+					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + to_underlying(ZoomLevel::In2x)), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_IN_2X), SetFill(1, 0),
+					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + to_underlying(ZoomLevel::Normal)), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_NORMAL), SetFill(1, 0),
+					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + to_underlying(ZoomLevel::Out2x)), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X), SetFill(1, 0),
+					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + to_underlying(ZoomLevel::Out4x)), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X), SetFill(1, 0),
+					NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SA_ZOOM + to_underlying(ZoomLevel::Out8x)), SetStringTip(STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X), SetFill(1, 0),
 				EndContainer(),
 			EndContainer(),
 		EndContainer(),
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 88dfd74b33..e37ed01cf4 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -45,7 +45,7 @@ const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoType cargo, E
 	const Engine *e = Engine::Get(engine);
 
 	for (const WagonOverride &wo : e->overrides) {
-		if (wo.cargo != cargo && wo.cargo != SpriteGroupCargo::SG_DEFAULT) continue;
+		if (wo.cargo != cargo && wo.cargo != CargoGRFFileProps::SG_DEFAULT) continue;
 		if (std::ranges::find(wo.engines, overriding_engine) != wo.engines.end()) return wo.group;
 	}
 	return nullptr;
@@ -309,9 +309,9 @@ static uint8_t MapAircraftMovementAction(const Aircraft *v)
 	return this->v == nullptr ? 0 : this->v->random_bits;
 }
 
-/* virtual */ uint32_t VehicleScopeResolver::GetTriggers() const
+/* virtual */ uint32_t VehicleScopeResolver::GetRandomTriggers() const
 {
-	return this->v == nullptr ? 0 : this->v->waiting_triggers;
+	return this->v == nullptr ? 0 : this->v->waiting_random_triggers.base();
 }
 
 
@@ -325,7 +325,7 @@ static uint8_t MapAircraftMovementAction(const Aircraft *v)
 			if (this->self_scope.v != nullptr && (relative != this->cached_relative_count || count == 0)) {
 				/* Note: This caching only works as long as the VSG_SCOPE_RELATIVE cannot be used in
 				 *       VarAct2 with procedure calls. */
-				if (count == 0) count = GetRegister(0x100);
+				if (count == 0) count = this->GetRegister(0x100);
 
 				const Vehicle *v = nullptr;
 				switch (GB(relative, 6, 2)) {
@@ -621,14 +621,14 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 			if (object->ro.callback == CBID_NO_CALLBACK || object->ro.callback == CBID_RANDOM_TRIGGER || object->ro.callback == CBID_TRAIN_ALLOW_WAGON_ATTACH ||
 					object->ro.callback == CBID_VEHICLE_START_STOP_CHECK || object->ro.callback == CBID_VEHICLE_32DAY_CALLBACK || object->ro.callback == CBID_VEHICLE_COLOUR_MAPPING ||
 					object->ro.callback == CBID_VEHICLE_SPAWN_VISUAL_EFFECT) {
-				Vehicle *u = v->Move((int32_t)GetRegister(0x10F));
+				Vehicle *u = v->Move(object->ro.GetRegister(0x10F));
 				if (u == nullptr) return 0; // available, but zero
 
 				if (parameter == 0x5F) {
 					/* This seems to be the only variable that makes sense to access via var 61, but is not handled by VehicleGetVariable */
-					return (u->random_bits << 8) | u->waiting_triggers;
+					return (u->random_bits << 8) | u->waiting_random_triggers.base();
 				} else {
-					return VehicleGetVariable(u, object, parameter, GetRegister(0x10E), available);
+					return VehicleGetVariable(u, object, parameter, object->ro.GetRegister(0x10E), available);
 				}
 			}
 			/* Not available */
@@ -717,7 +717,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 
 			if (v->type == VEH_TRAIN) {
 				const Train *t = Train::From(v);
-				bool is_powered_wagon = HasBit(t->flags, VRF_POWEREDWAGON);
+				bool is_powered_wagon = t->flags.Test(VehicleRailFlag::PoweredWagon);
 				const Train *u = is_powered_wagon ? t->First() : t; // for powered wagons the engine defines the type of engine (i.e. railtype)
 				RailType railtype = GetRailType(v->tile);
 				bool powered = t->IsEngine() || is_powered_wagon;
@@ -725,7 +725,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 
 				if (powered && has_power) SetBit(modflags, 5);
 				if (powered && !has_power) SetBit(modflags, 6);
-				if (HasBit(t->flags, VRF_TOGGLE_REVERSE)) SetBit(modflags, 8);
+				if (t->flags.Test(VehicleRailFlag::Reversed)) SetBit(modflags, 8);
 			}
 			if (v->vehicle_flags.Test(VehicleFlag::CargoUnloading)) SetBit(modflags, 1);
 			if (v->vehicle_flags.Test(VehicleFlag::BuiltAsPrototype)) SetBit(modflags, 10);
@@ -838,8 +838,8 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 		case 0x46: return v->GetEngine()->grf_prop.local_id;
 		case 0x47: return GB(v->GetEngine()->grf_prop.local_id, 8, 8);
 		case 0x48:
-			if (v->type != VEH_TRAIN || v->spritenum != 0xFD) return v->spritenum;
-			return HasBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION) ? 0xFE : 0xFD;
+			if (v->type != VEH_TRAIN || v->spritenum != CUSTOM_VEHICLE_SPRITENUM) return v->spritenum;
+			return Train::From(v)->flags.Test(VehicleRailFlag::Flipped) ? CUSTOM_VEHICLE_SPRITENUM_REVERSED : CUSTOM_VEHICLE_SPRITENUM;
 
 		case 0x49: return v->day_counter;
 		case 0x4A: return v->breakdowns_since_last_service;
@@ -891,7 +891,7 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 		case 0x78: break; // not implemented
 		case 0x79: break; // not implemented
 		case 0x7A: return v->random_bits;
-		case 0x7B: return v->waiting_triggers;
+		case 0x7B: return v->waiting_random_triggers.base();
 		case 0x7C: break; // vehicle specific, see below
 		case 0x7D: break; // vehicle specific, see below
 		case 0x7E: break; // not implemented
@@ -998,13 +998,13 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 }
 
 
-/* virtual */ const SpriteGroup *VehicleResolverObject::ResolveReal(const RealSpriteGroup *group) const
+/* virtual */ const SpriteGroup *VehicleResolverObject::ResolveReal(const RealSpriteGroup &group) const
 {
 	const Vehicle *v = this->self_scope.v;
 
 	if (v == nullptr) {
-		if (!group->loading.empty()) return group->loading[0];
-		if (!group->loaded.empty())  return group->loaded[0];
+		if (!group.loading.empty()) return group.loading[0];
+		if (!group.loaded.empty()) return group.loaded[0];
 		return nullptr;
 	}
 
@@ -1012,14 +1012,14 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 	bool not_loading = (order.GetUnloadType() & OUFB_NO_UNLOAD) && (order.GetLoadType() & OLFB_NO_LOAD);
 	bool in_motion = !order.IsType(OT_LOADING) || not_loading;
 
-	uint totalsets = in_motion ? (uint)group->loaded.size() : (uint)group->loading.size();
+	uint totalsets = static_cast<uint>(in_motion ? group.loaded.size() : group.loading.size());
 
 	if (totalsets == 0) return nullptr;
 
 	uint set = (v->cargo.StoredCount() * totalsets) / std::max<uint16_t>(1u, v->cargo_cap);
 	set = std::min(set, totalsets - 1);
 
-	return in_motion ? group->loaded[set] : group->loading[set];
+	return in_motion ? group.loaded[set] : group.loading[set];
 }
 
 GrfSpecFeature VehicleResolverObject::GetFeature() const
@@ -1061,14 +1061,14 @@ static const GRFFile *GetEngineGrfFile(EngineID engine_type)
  */
 VehicleResolverObject::VehicleResolverObject(EngineID engine_type, const Vehicle *v, WagonOverride wagon_override, bool rotor_in_gui,
 		CallbackID callback, uint32_t callback_param1, uint32_t callback_param2)
-	: ResolverObject(GetEngineGrfFile(engine_type), callback, callback_param1, callback_param2),
+	: SpecializedResolverObject<VehicleRandomTriggers>(GetEngineGrfFile(engine_type), callback, callback_param1, callback_param2),
 	self_scope(*this, engine_type, v, rotor_in_gui),
 	parent_scope(*this, engine_type, ((v != nullptr) ? v->First() : v), rotor_in_gui),
 	relative_scope(*this, engine_type, v, rotor_in_gui),
 	cached_relative_count(0)
 {
 	if (wagon_override == WO_SELF) {
-		this->root_spritegroup = GetWagonOverrideSpriteSet(engine_type, SpriteGroupCargo::SG_DEFAULT, engine_type);
+		this->root_spritegroup = GetWagonOverrideSpriteSet(engine_type, CargoGRFFileProps::SG_DEFAULT, engine_type);
 	} else {
 		if (wagon_override != WO_NONE && v != nullptr && v->IsGroundVehicle()) {
 			assert(v->engine_type == engine_type); // overrides make little sense with fake scopes
@@ -1085,16 +1085,13 @@ VehicleResolverObject::VehicleResolverObject(EngineID engine_type, const Vehicle
 
 		if (this->root_spritegroup == nullptr) {
 			const Engine *e = Engine::Get(engine_type);
-			CargoType cargo = v != nullptr ? v->cargo_type : SpriteGroupCargo::SG_PURCHASE;
-			this->root_spritegroup = e->grf_prop.GetSpriteGroup(cargo);
-			if (this->root_spritegroup == nullptr) this->root_spritegroup = e->grf_prop.GetSpriteGroup(SpriteGroupCargo::SG_DEFAULT);
+			CargoType cargo = v != nullptr ? v->cargo_type : CargoGRFFileProps::SG_PURCHASE;
+			this->root_spritegroup = e->grf_prop.GetFirstSpriteGroupOf({cargo, CargoGRFFileProps::SG_DEFAULT});
 		}
 	}
 }
 
-
-
-void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
+static void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
 {
 	VehicleResolverObject object(engine, v, VehicleResolverObject::WO_CACHED, false, CBID_NO_CALLBACK);
 	result->Clear();
@@ -1102,12 +1099,11 @@ void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction directio
 	bool sprite_stack = EngInfo(engine)->misc_flags.Test(EngineMiscFlag::SpriteStack);
 	uint max_stack = sprite_stack ? static_cast<uint>(std::size(result->seq)) : 1;
 	for (uint stack = 0; stack < max_stack; ++stack) {
-		object.ResetState();
 		object.callback_param1 = image_type | (stack << 8);
-		const SpriteGroup *group = object.Resolve();
-		uint32_t reg100 = sprite_stack ? GetRegister(0x100) : 0;
-		if (group != nullptr && group->GetNumResults() != 0) {
-			result->seq[result->count].sprite = group->GetResult() + (direction % group->GetNumResults());
+		const auto *group = object.Resolve<ResultSpriteGroup>();
+		int32_t reg100 = sprite_stack ? object.GetRegister(0x100) : 0;
+		if (group != nullptr && group->num_sprites != 0) {
+			result->seq[result->count].sprite = group->sprite + (direction % group->num_sprites);
 			result->seq[result->count].pal    = GB(reg100, 0, 16); // zero means default recolouring
 			result->count++;
 		}
@@ -1115,8 +1111,17 @@ void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction directio
 	}
 }
 
+void GetCustomVehicleSprite(const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
+{
+	GetCustomEngineSprite(v->engine_type, v, direction, image_type, result);
+}
 
-void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
+void GetCustomVehicleIcon(EngineID engine, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result)
+{
+	GetCustomEngineSprite(engine, nullptr, direction, image_type, result);
+}
+
+static void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
 {
 	const Engine *e = Engine::Get(engine);
 
@@ -1136,12 +1141,11 @@ void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineIma
 	bool sprite_stack = e->info.misc_flags.Test(EngineMiscFlag::SpriteStack);
 	uint max_stack = sprite_stack ? static_cast<uint>(std::size(result->seq)) : 1;
 	for (uint stack = 0; stack < max_stack; ++stack) {
-		object.ResetState();
 		object.callback_param1 = image_type | (stack << 8);
-		const SpriteGroup *group = object.Resolve();
-		uint32_t reg100 = sprite_stack ? GetRegister(0x100) : 0;
-		if (group != nullptr && group->GetNumResults() != 0) {
-			result->seq[result->count].sprite = group->GetResult() + (rotor_pos % group->GetNumResults());
+		const auto *group = object.Resolve<ResultSpriteGroup>();
+		int32_t reg100 = sprite_stack ? object.GetRegister(0x100) : 0;
+		if (group != nullptr && group->num_sprites != 0) {
+			result->seq[result->count].sprite = group->sprite + (rotor_pos % group->num_sprites);
 			result->seq[result->count].pal    = GB(reg100, 0, 16); // zero means default recolouring
 			result->count++;
 		}
@@ -1149,6 +1153,15 @@ void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineIma
 	}
 }
 
+void GetCustomRotorSprite(const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
+{
+	GetRotorOverrideSprite(v->engine_type, v, image_type, result);
+}
+
+void GetCustomRotorIcon(EngineID engine, EngineImageType image_type, VehicleSpriteSeq *result)
+{
+	GetRotorOverrideSprite(engine, nullptr, image_type, result);
+}
 
 /**
  * Check if a wagon is currently using a wagon override
@@ -1168,12 +1181,13 @@ bool UsesWagonOverride(const Vehicle *v)
  * @param param2   Second parameter of the callback
  * @param engine   Engine type of the vehicle to evaluate the callback for
  * @param v        The vehicle to evaluate the callback for, or nullptr if it doesn't exist yet
+ * @param[out] regs100 Additional result values from registers 100+
  * @return The value the callback returned, or CALLBACK_FAILED if it failed
  */
-uint16_t GetVehicleCallback(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v)
+uint16_t GetVehicleCallback(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v, std::span<int32_t> regs100)
 {
 	VehicleResolverObject object(engine, v, VehicleResolverObject::WO_UNCACHED, false, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
@@ -1184,13 +1198,14 @@ uint16_t GetVehicleCallback(CallbackID callback, uint32_t param1, uint32_t param
  * @param engine   Engine type of the vehicle to evaluate the callback for
  * @param v        The vehicle to evaluate the callback for, or nullptr if it doesn't exist yet
  * @param parent   The vehicle to use for parent scope
+ * @param[out] regs100 Additional result values from registers 100+
  * @return The value the callback returned, or CALLBACK_FAILED if it failed
  */
-uint16_t GetVehicleCallbackParent(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v, const Vehicle *parent)
+uint16_t GetVehicleCallbackParent(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v, const Vehicle *parent, std::span<int32_t> regs100)
 {
 	VehicleResolverObject object(engine, v, VehicleResolverObject::WO_NONE, false, callback, param1, param2);
 	object.parent_scope.SetVehicle(parent);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 
@@ -1220,31 +1235,30 @@ int GetEngineProperty(EngineID engine, PropertyID property, int orig_value, cons
  * Test for vehicle build probablity type.
  * @param v Vehicle whose build probability to test.
  * @param type Build probability type to test for.
- * @returns True iff the probability result says so.
+ * @returns True or false depending on the probability result, or std::nullopt if the callback failed.
  */
-bool TestVehicleBuildProbability(Vehicle *v, EngineID engine, BuildProbabilityType type)
+std::optional<bool> TestVehicleBuildProbability(Vehicle *v, EngineID engine, BuildProbabilityType type)
 {
 	uint16_t p = GetVehicleCallback(CBID_VEHICLE_BUILD_PROBABILITY, to_underlying(type), 0, engine, v);
-	if (p == CALLBACK_FAILED) return false;
+	if (p == CALLBACK_FAILED) return std::nullopt;
 
 	const uint16_t PROBABILITY_RANGE = 100;
 	return p + RandomRange(PROBABILITY_RANGE) >= PROBABILITY_RANGE;
 }
 
-static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, uint16_t base_random_bits, bool first)
+static void DoTriggerVehicleRandomisation(Vehicle *v, VehicleRandomTrigger trigger, uint16_t base_random_bits, bool first)
 {
 	/* We can't trigger a non-existent vehicle... */
 	assert(v != nullptr);
 
 	VehicleResolverObject object(v->engine_type, v, VehicleResolverObject::WO_CACHED, false, CBID_RANDOM_TRIGGER);
-	object.waiting_triggers = v->waiting_triggers | trigger;
-	v->waiting_triggers = object.waiting_triggers; // store now for var 5F
+	v->waiting_random_triggers.Set(trigger); // store now for var 5F
+	object.SetWaitingRandomTriggers(v->waiting_random_triggers);
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return;
+	object.ResolveRerandomisation();
 
 	/* Store remaining triggers. */
-	v->waiting_triggers = object.GetRemainingTriggers();
+	v->waiting_random_triggers.Reset(object.GetUsedRandomTriggers());
 
 	/* Rerandomise bits. Scopes other than SELF are invalid for rerandomisation. For bug-to-bug-compatibility with TTDP we ignore the scope. */
 	uint16_t new_random_bits = Random();
@@ -1253,7 +1267,7 @@ static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, uint16_t base_r
 	v->random_bits |= (first ? new_random_bits : base_random_bits) & reseed;
 
 	switch (trigger) {
-		case VEHICLE_TRIGGER_NEW_CARGO:
+		case VehicleRandomTrigger::NewCargo:
 			/* All vehicles in chain get ANY_NEW_CARGO trigger now.
 			 * So we call it for the first one and they will recurse.
 			 * Indexing part of vehicle random bits needs to be
@@ -1262,46 +1276,41 @@ static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, uint16_t base_r
 			 * i.e.), so we give them all the NEW_CARGO triggered
 			 * vehicle's portion of random bits. */
 			assert(first);
-			DoTriggerVehicle(v->First(), VEHICLE_TRIGGER_ANY_NEW_CARGO, new_random_bits, false);
+			DoTriggerVehicleRandomisation(v->First(), VehicleRandomTrigger::AnyNewCargo, new_random_bits, false);
 			break;
 
-		case VEHICLE_TRIGGER_DEPOT:
+		case VehicleRandomTrigger::Depot:
 			/* We now trigger the next vehicle in chain recursively.
 			 * The random bits portions may be different for each
 			 * vehicle in chain. */
-			if (v->Next() != nullptr) DoTriggerVehicle(v->Next(), trigger, 0, true);
+			if (v->Next() != nullptr) DoTriggerVehicleRandomisation(v->Next(), trigger, 0, true);
 			break;
 
-		case VEHICLE_TRIGGER_EMPTY:
+		case VehicleRandomTrigger::Empty:
 			/* We now trigger the next vehicle in chain
 			 * recursively.  The random bits portions must be same
 			 * for each vehicle in chain, so we give them all
 			 * first chained vehicle's portion of random bits. */
-			if (v->Next() != nullptr) DoTriggerVehicle(v->Next(), trigger, first ? new_random_bits : base_random_bits, false);
+			if (v->Next() != nullptr) DoTriggerVehicleRandomisation(v->Next(), trigger, first ? new_random_bits : base_random_bits, false);
 			break;
 
-		case VEHICLE_TRIGGER_ANY_NEW_CARGO:
+		case VehicleRandomTrigger::AnyNewCargo:
 			/* Now pass the trigger recursively to the next vehicle
 			 * in chain. */
 			assert(!first);
-			if (v->Next() != nullptr) DoTriggerVehicle(v->Next(), VEHICLE_TRIGGER_ANY_NEW_CARGO, base_random_bits, false);
+			if (v->Next() != nullptr) DoTriggerVehicleRandomisation(v->Next(), trigger, base_random_bits, false);
 			break;
 
-		case VEHICLE_TRIGGER_CALLBACK_32:
+		case VehicleRandomTrigger::Callback32:
 			/* Do not do any recursion */
 			break;
 	}
 }
 
-void TriggerVehicle(Vehicle *v, VehicleTrigger trigger)
+void TriggerVehicleRandomisation(Vehicle *v, VehicleRandomTrigger trigger)
 {
-	if (trigger == VEHICLE_TRIGGER_DEPOT) {
-		/* store that the vehicle entered a depot this tick */
-		VehicleEnteredDepotThisTick(v);
-	}
-
 	v->InvalidateNewGRFCacheOfChain();
-	DoTriggerVehicle(v, trigger, 0, true);
+	DoTriggerVehicleRandomisation(v, trigger, 0, true);
 	v->InvalidateNewGRFCacheOfChain();
 }
 
diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h
index c08e4b19f7..912fba67b6 100644
--- a/src/newgrf_engine.h
+++ b/src/newgrf_engine.h
@@ -40,11 +40,11 @@ struct VehicleScopeResolver : public ScopeResolver {
 
 	uint32_t GetRandomBits() const override;
 	uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const override;
-	uint32_t GetTriggers() const override;
+	uint32_t GetRandomTriggers() const override;
 };
 
 /** Resolver for a vehicle (chain) */
-struct VehicleResolverObject : public ResolverObject {
+struct VehicleResolverObject : public SpecializedResolverObject<VehicleRandomTriggers> {
 	/** Application of 'wagon overrides'. */
 	enum WagonOverride : uint8_t {
 		WO_NONE,     //!< Resolve no wagon overrides.
@@ -64,7 +64,7 @@ struct VehicleResolverObject : public ResolverObject {
 
 	ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, uint8_t relative = 0) override;
 
-	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
+	const SpriteGroup *ResolveReal(const RealSpriteGroup &group) const override;
 
 	GrfSpecFeature GetFeature() const override;
 	uint32_t GetDebugID() const override;
@@ -80,13 +80,11 @@ void SetWagonOverrideSprites(EngineID engine, CargoType cargo, const struct Spri
 const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoType cargo, EngineID overriding_engine);
 void SetCustomEngineSprites(EngineID engine, CargoType cargo, const struct SpriteGroup *group);
 
-void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result);
-#define GetCustomVehicleSprite(v, direction, image_type, result) GetCustomEngineSprite(v->engine_type, v, direction, image_type, result)
-#define GetCustomVehicleIcon(et, direction, image_type, result) GetCustomEngineSprite(et, nullptr, direction, image_type, result)
+void GetCustomVehicleSprite(const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result);
+void GetCustomVehicleIcon(EngineID engine, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result);
 
-void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result);
-#define GetCustomRotorSprite(v, image_type, result) GetRotorOverrideSprite(v->engine_type, v, image_type, result)
-#define GetCustomRotorIcon(et, image_type, result) GetRotorOverrideSprite(et, nullptr, image_type, result)
+void GetCustomRotorSprite(const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result);
+void GetCustomRotorIcon(EngineID engine, EngineImageType image_type, VehicleSpriteSeq *result);
 
 /* Forward declaration of GRFFile, to avoid unnecessary inclusion of newgrf.h
  * elsewhere... */
@@ -94,8 +92,8 @@ struct GRFFile;
 
 void SetEngineGRF(EngineID engine, const struct GRFFile *file);
 
-uint16_t GetVehicleCallback(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v);
-uint16_t GetVehicleCallbackParent(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v, const Vehicle *parent);
+uint16_t GetVehicleCallback(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v, std::span<int32_t> regs100 = {});
+uint16_t GetVehicleCallbackParent(CallbackID callback, uint32_t param1, uint32_t param2, EngineID engine, const Vehicle *v, const Vehicle *parent, std::span<int32_t> regs100 = {});
 bool UsesWagonOverride(const Vehicle *v);
 
 /* Handler to Evaluate callback 36. If the callback fails (i.e. most of the
@@ -107,20 +105,9 @@ enum class BuildProbabilityType : uint8_t {
 	Reversed = 0,
 };
 
-bool TestVehicleBuildProbability(Vehicle *v, EngineID engine, BuildProbabilityType type);
+std::optional<bool> TestVehicleBuildProbability(Vehicle *v, EngineID engine, BuildProbabilityType type);
 
-enum VehicleTrigger : uint8_t {
-	VEHICLE_TRIGGER_NEW_CARGO     = 0x01,
-	/* Externally triggered only for the first vehicle in chain */
-	VEHICLE_TRIGGER_DEPOT         = 0x02,
-	/* Externally triggered only for the first vehicle in chain, only if whole chain is empty */
-	VEHICLE_TRIGGER_EMPTY         = 0x04,
-	/* Not triggered externally (called for the whole chain if we got NEW_CARGO) */
-	VEHICLE_TRIGGER_ANY_NEW_CARGO = 0x08,
-	/* Externally triggered for each vehicle in chain */
-	VEHICLE_TRIGGER_CALLBACK_32   = 0x10,
-};
-void TriggerVehicle(Vehicle *veh, VehicleTrigger trigger);
+void TriggerVehicleRandomisation(Vehicle *veh, VehicleRandomTrigger trigger);
 
 void AlterVehicleListOrder(EngineID engine, uint16_t target);
 void CommitVehicleListOrderChanges();
diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp
index fb5f7d80c0..d070119db1 100644
--- a/src/newgrf_generic.cpp
+++ b/src/newgrf_generic.cpp
@@ -28,7 +28,7 @@ struct GenericScopeResolver : public ScopeResolver {
 	uint8_t count;
 	uint8_t station_size;
 
-	uint8_t feature;
+	GrfSpecFeature feature;
 
 	/**
 	 * Generic scope resolver.
@@ -105,7 +105,7 @@ void ResetGenericCallbacks()
  * @param file The GRF of the callback.
  * @param group The sprite group of the callback.
  */
-void AddGenericCallback(uint8_t feature, const GRFFile *file, const SpriteGroup *group)
+void AddGenericCallback(GrfSpecFeature feature, const GRFFile *file, const SpriteGroup *group)
 {
 	if (feature >= lengthof(_gcl)) {
 		GrfMsg(5, "AddGenericCallback: Unsupported feature 0x{:02X}", feature);
@@ -161,10 +161,10 @@ GenericResolverObject::GenericResolverObject(bool ai_callback, CallbackID callba
  * @param object  pre-populated resolver object
  * @param param1_grfv7 callback_param1 for GRFs up to version 7.
  * @param param1_grfv8 callback_param1 for GRFs from version 8 on.
- * @param[out] file Optionally returns the GRFFile which made the final decision for the callback result. May be nullptr if not required.
- * @return callback value if successful or CALLBACK_FAILED
+ * @param[out] regs100 Additional result values from registers 100+
+ * @return answering GRFFile and callback value if successful, or CALLBACK_FAILED
  */
-static uint16_t GetGenericCallbackResult(uint8_t feature, ResolverObject &object, uint32_t param1_grfv7, uint32_t param1_grfv8, const GRFFile **file)
+static std::pair<const GRFFile *, uint16_t> GetGenericCallbackResult(GrfSpecFeature feature, ResolverObject &object, uint32_t param1_grfv7, uint32_t param1_grfv8, std::span<int32_t> regs100 = {})
 {
 	assert(feature < lengthof(_gcl));
 
@@ -174,17 +174,14 @@ static uint16_t GetGenericCallbackResult(uint8_t feature, ResolverObject &object
 		object.root_spritegroup = it.group;
 		/* Set callback param based on GRF version. */
 		object.callback_param1 = it.file->grf_version >= 8 ? param1_grfv8 : param1_grfv7;
-		uint16_t result = object.ResolveCallback();
+		uint16_t result = object.ResolveCallback(regs100);
 		if (result == CALLBACK_FAILED) continue;
 
-		/* Return NewGRF file if necessary */
-		if (file != nullptr) *file = it.file;
-
-		return result;
+		return {it.file, result};
 	}
 
 	/* No callback returned a valid result, so we've failed. */
-	return CALLBACK_FAILED;
+	return {nullptr, CALLBACK_FAILED};
 }
 
 
@@ -200,10 +197,9 @@ static uint16_t GetGenericCallbackResult(uint8_t feature, ResolverObject &object
  * @param event 'AI construction event' to pass to callback. (Variable 86)
  * @param count 'Construction number' to pass to callback. (Variable 87)
  * @param station_size 'Station size' to pass to callback. (Variable 88)
- * @param[out] file Optionally returns the GRFFile which made the final decision for the callback result. May be nullptr if not required.
- * @return callback value if successful or CALLBACK_FAILED
+ * @return answering GRFFile and callback value if successful, or CALLBACK_FAILED
  */
-uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoType cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size, const GRFFile **file)
+std::pair<const GRFFile *, uint16_t> GetAiPurchaseCallbackResult(GrfSpecFeature feature, CargoType cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size)
 {
 	GenericResolverObject object(true, CBID_GENERIC_AI_PURCHASE_SELECTION);
 
@@ -229,8 +225,8 @@ uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoType cargo_type, uint
 	object.generic_scope.station_size      = station_size;
 	object.generic_scope.feature           = feature;
 
-	uint16_t callback = GetGenericCallbackResult(feature, object, 0, 0, file);
-	if (callback != CALLBACK_FAILED) callback = GB(callback, 0, 8);
+	auto callback = GetGenericCallbackResult(feature, object, 0, 0);
+	if (callback.second != CALLBACK_FAILED && callback.first->grf_version < 8) callback.second = GB(callback.second, 0, 8);
 	return callback;
 }
 
@@ -255,8 +251,7 @@ void AmbientSoundEffectCallback(TileIndex tile)
 	uint32_t param1_v8 = GetTileType(tile) << 24 | GetTileZ(tile) << 16 | GB(r, 16, 8) << 8 | (HasTileWaterClass(tile) ? GetWaterClass(tile) : 0) << 3 | GetTerrainType(tile);
 
 	/* Run callback. */
-	const GRFFile *grf_file;
-	uint16_t callback = GetGenericCallbackResult(GSF_SOUNDFX, object, param1_v7, param1_v8, &grf_file);
+	auto callback = GetGenericCallbackResult(GSF_SOUNDFX, object, param1_v7, param1_v8);
 
-	if (callback != CALLBACK_FAILED) PlayTileSound(grf_file, callback, tile);
+	if (callback.second != CALLBACK_FAILED) PlayTileSound(callback.first, callback.second, tile);
 }
diff --git a/src/newgrf_generic.h b/src/newgrf_generic.h
index 6ac66d3aa9..0ea88c4996 100644
--- a/src/newgrf_generic.h
+++ b/src/newgrf_generic.h
@@ -45,9 +45,9 @@ static const IndustryType IT_AI_UNKNOWN = 0xFE; ///< The AI has no specific indu
 static const IndustryType IT_AI_TOWN    = 0xFF; ///< The AI actually wants to transport to/from a town, not an industry.
 
 void ResetGenericCallbacks();
-void AddGenericCallback(uint8_t feature, const GRFFile *file, const SpriteGroup *group);
+void AddGenericCallback(GrfSpecFeature feature, const GRFFile *file, const SpriteGroup *group);
 
-uint16_t GetAiPurchaseCallbackResult(uint8_t feature, CargoType cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size, const GRFFile **file);
+std::pair<const GRFFile *, uint16_t> GetAiPurchaseCallbackResult(GrfSpecFeature feature, CargoType cargo_type, uint8_t default_selection, IndustryType src_industry, IndustryType dst_industry, uint8_t distance, AIConstructionEvent event, uint8_t count, uint8_t station_size);
 void AmbientSoundEffectCallback(TileIndex tile);
 
 /** Play an ambient sound effect for an empty tile. */
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 9a36c269d2..da30cac7ee 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -31,6 +31,7 @@
 #include "timer/timer.h"
 #include "timer/timer_window.h"
 #include "zoom_func.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/newgrf_widget.h"
 #include "widgets/misc_widget.h"
@@ -223,7 +224,7 @@ struct NewGRFParametersWindow : public Window {
 				this->line_height = std::max(SETTING_BUTTON_HEIGHT, GetCharacterHeight(FS_NORMAL)) + padding.height;
 
 				resize.width = 1;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = 5 * this->line_height;
 				break;
 
@@ -260,7 +261,7 @@ struct NewGRFParametersWindow : public Window {
 
 		auto it = std::ranges::lower_bound(par_info.value_names, value, std::less{}, &GRFParameterInfo::ValueName::first);
 		if (it != std::end(par_info.value_names) && it->first == value) {
-			if (auto label = GetGRFStringFromGRFText(it->second); label.has_value()) return {STR_JUST_RAW_STRING, std::string(*label)};
+			if (auto label = GetGRFStringFromGRFText(it->second); label.has_value()) return {STR_JUST_RAW_STRING, *label};
 		}
 
 		return {STR_JUST_INT, value};
@@ -301,7 +302,7 @@ struct NewGRFParametersWindow : public Window {
 			bool selected = (i == this->clicked_row);
 
 			if (par_info.type == PTYPE_BOOL) {
-				DrawBoolButton(buttons_left, ir.top + button_y_offset, current_value != 0, this->editable);
+				DrawBoolButton(buttons_left, ir.top + button_y_offset, COLOUR_YELLOW, COLOUR_MAUVE, current_value != 0, this->editable);
 			} else if (par_info.type == PTYPE_UINT_ENUM) {
 				if (par_info.complete_labels) {
 					DrawDropDownButton(buttons_left, ir.top + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && this->clicked_dropdown, this->editable);
@@ -428,23 +429,20 @@ struct NewGRFParametersWindow : public Window {
 				this->InvalidateData();
 				SetWindowDirty(WC_GAME_OPTIONS, WN_GAME_OPTIONS_NEWGRF_STATE);
 				break;
-
-			case WID_NP_ACCEPT:
-				this->Close();
-				break;
 		}
 	}
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
 		if (!str.has_value() || str->empty()) return;
-		int32_t value = atoi(str->c_str());
+		auto value = ParseInteger<int32_t>(*str, 10, true);
+		if (!value.has_value()) return;
 		GRFParameterInfo &par_info = this->GetParameterInfo(this->clicked_row);
-		this->grf_config.SetValue(par_info, value);
+		this->grf_config.SetValue(par_info, *value);
 		this->SetDirty();
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_NP_SETTING_DROPDOWN) return;
 		assert(this->clicked_dropdown);
@@ -453,7 +451,7 @@ struct NewGRFParametersWindow : public Window {
 		this->SetDirty();
 	}
 
-	void OnDropdownClose(Point, WidgetID widget, int, bool) override
+	void OnDropdownClose(Point, WidgetID widget, int, int, bool) override
 	{
 		if (widget != WID_NP_SETTING_DROPDOWN) return;
 		/* We cannot raise the dropdown button just yet. OnClick needs some hint, whether
@@ -523,9 +521,8 @@ static constexpr NWidgetPart _nested_newgrf_parameter_widgets[] = {
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_NP_ACCEPT), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_NEWGRF_PARAMETERS_CLOSE),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_NP_RESET), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_NEWGRF_PARAMETERS_RESET, STR_NEWGRF_PARAMETERS_RESET_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_NP_RESET), SetStringTip(STR_NEWGRF_PARAMETERS_RESET, STR_NEWGRF_PARAMETERS_RESET_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_MAUVE), SetResize(1, 0), SetFill(1, 0),
 		EndContainer(),
 		NWidget(WWT_RESIZEBOX, COLOUR_MAUVE),
 	EndContainer(),
@@ -549,7 +546,7 @@ void OpenGRFParameterWindow(bool is_baseset, GRFConfig &c, bool editable)
 struct NewGRFTextfileWindow : public TextfileWindow {
 	const GRFConfig *grf_config = nullptr; ///< View the textfile of this GRFConfig.
 
-	NewGRFTextfileWindow(TextfileType file_type, const GRFConfig *c) : TextfileWindow(file_type), grf_config(c)
+	NewGRFTextfileWindow(Window *parent, TextfileType file_type, const GRFConfig *c) : TextfileWindow(parent, file_type), grf_config(c)
 	{
 		this->ConstructWindow();
 
@@ -567,10 +564,10 @@ struct NewGRFTextfileWindow : public TextfileWindow {
 	}
 };
 
-void ShowNewGRFTextfileWindow(TextfileType file_type, const GRFConfig *c)
+void ShowNewGRFTextfileWindow(Window *parent, TextfileType file_type, const GRFConfig *c)
 {
-	CloseWindowById(WC_TEXTFILE, file_type);
-	new NewGRFTextfileWindow(file_type, c);
+	parent->CloseChildWindowById(WC_TEXTFILE, file_type);
+	new NewGRFTextfileWindow(parent, file_type, c);
 }
 
 typedef std::map<uint32_t, const GRFConfig *> GrfIdMap; ///< Map of grfid to the grf config.
@@ -588,7 +585,7 @@ static void FillGrfidMap(const GRFConfigList &lst, GrfIdMap &grfid_map)
 }
 
 static void NewGRFConfirmationCallback(Window *w, bool confirmed);
-static void ShowSavePresetWindow(const char *initial_text);
+static void ShowSavePresetWindow(std::string_view initial_text);
 
 /**
  * Window for showing NewGRF files
@@ -639,7 +636,8 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 		this->vscroll2 = this->GetScrollbar(WID_NS_SCROLL2BAR);
 
 		this->GetWidget<NWidgetStacked>(WID_NS_SHOW_REMOVE)->SetDisplayedPlane(this->editable ? 0 : 1);
-		this->GetWidget<NWidgetStacked>(WID_NS_SHOW_APPLY)->SetDisplayedPlane(this->editable ? 0 : this->show_params ? 1 : SZSP_HORIZONTAL);
+		this->GetWidget<NWidgetStacked>(WID_NS_SHOW_EDIT)->SetDisplayedPlane(this->editable ? 0 : (this->show_params ? 1 : SZSP_HORIZONTAL));
+		this->GetWidget<NWidgetStacked>(WID_NS_SHOW_APPLY)->SetDisplayedPlane(this->editable && this->execute ? 0 : SZSP_VERTICAL);
 		this->FinishInitNested(WN_GAME_OPTIONS_NEWGRF_STATE);
 
 		this->querystrings[WID_NS_FILTER] = &this->filter_editbox;
@@ -662,7 +660,6 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 	void Close([[maybe_unused]] int data = 0) override
 	{
 		CloseWindowByClass(WC_GRF_PARAMETERS);
-		CloseWindowByClass(WC_TEXTFILE);
 		CloseWindowByClass(WC_SAVE_PRESET);
 
 		if (this->editable && this->modified && !this->execute && !_exit_game) {
@@ -711,7 +708,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 
 			auto c = std::ranges::find_if(this->actives, [&iter](const auto &grfconfig) { return grfconfig.get() == iter->second; });
 			assert(c != std::end(this->actives));
-			auto d = std::make_unique<GRFConfig>(*iter->second);
+			auto d = std::make_unique<GRFConfig>(*a);
 			if (d->IsCompatible((*c)->version)) {
 				d->CopyParams(**c);
 			} else {
@@ -719,7 +716,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 			}
 			if (this->active_sel == c->get()) {
 				CloseWindowByClass(WC_GRF_PARAMETERS);
-				CloseWindowByClass(WC_TEXTFILE);
+				this->CloseChildWindows(WC_TEXTFILE);
 				this->active_sel = nullptr;
 			}
 			*c = std::move(d);
@@ -733,7 +730,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 			case WID_NS_FILE_LIST:
 			{
 				Dimension d = maxdim(GetScaledSpriteSize(SPR_SQUARE), GetScaledSpriteSize(SPR_WARNING_SIGN));
-				resize.height = std::max<uint>(d.height + 2U, GetCharacterHeight(FS_NORMAL));
+				fill.height = resize.height = std::max<uint>(d.height + 2U, GetCharacterHeight(FS_NORMAL));
 				size.height = std::max(size.height, padding.height + 6 * resize.height);
 				break;
 			}
@@ -741,7 +738,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 			case WID_NS_AVAIL_LIST:
 			{
 				Dimension d = maxdim(GetScaledSpriteSize(SPR_SQUARE), GetScaledSpriteSize(SPR_WARNING_SIGN));
-				resize.height = std::max<uint>(d.height + 2U, GetCharacterHeight(FS_NORMAL));
+				fill.height = resize.height = std::max<uint>(d.height + 2U, GetCharacterHeight(FS_NORMAL));
 				size.height = std::max(size.height, padding.height + 8 * resize.height);
 				break;
 			}
@@ -866,7 +863,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 							/* Get index of current selection. */
 							int active_sel_pos = this->GetCurrentActivePosition();
 							if (active_sel_pos != this->active_over) {
-								uint top = this->active_over < active_sel_pos ? tr.top + 1 : tr.top + step_height - 2;
+								uint top = (active_sel_pos < 0 || this->active_over < active_sel_pos) ? tr.top + 1 : tr.top + step_height - 2;
 								GfxFillRect(tr.left, top - 1, tr.right, top + 1, PC_GREY);
 							}
 						}
@@ -906,9 +903,9 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 			}
 
 			case WID_NS_NEWGRF_INFO_TITLE: {
-				/* Create the nice grayish rectangle at the details top. */
-				GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), PC_DARK_BLUE);
-				DrawString(r.left, r.right, CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), STR_NEWGRF_SETTINGS_INFO_TITLE, TC_FROMSTRING, SA_HOR_CENTER);
+				/* Create the nice darker rectangle at the details top. */
+				GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(COLOUR_MAUVE, SHADE_NORMAL));
+				DrawString(r.left, r.right, CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), STR_NEWGRF_SETTINGS_INFO_TITLE, TC_FROMSTRING, SA_HOR_CENTER);
 				break;
 			}
 
@@ -928,7 +925,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 		if (widget >= WID_NS_NEWGRF_TEXTFILE && widget < WID_NS_NEWGRF_TEXTFILE + TFT_CONTENT_END) {
 			if (this->active_sel == nullptr && this->avail_sel == nullptr) return;
 
-			ShowNewGRFTextfileWindow((TextfileType)(widget - WID_NS_NEWGRF_TEXTFILE), this->active_sel != nullptr ? this->active_sel : this->avail_sel);
+			ShowNewGRFTextfileWindow(this, (TextfileType)(widget - WID_NS_NEWGRF_TEXTFILE), this->active_sel != nullptr ? this->active_sel : this->avail_sel);
 			return;
 		}
 
@@ -956,13 +953,13 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 			}
 
 			case WID_NS_PRESET_SAVE:
-				ShowSavePresetWindow((this->preset == -1) ? nullptr : this->grf_presets[this->preset].c_str());
+				ShowSavePresetWindow((this->preset == -1) ? std::string_view{} : this->grf_presets[this->preset]);
 				break;
 
 			case WID_NS_PRESET_DELETE:
 				if (this->preset == -1) return;
 
-				DeleteGRFPresetFromConfig(this->grf_presets[this->preset].c_str());
+				DeleteGRFPresetFromConfig(this->grf_presets[this->preset]);
 				this->grf_presets = GetGRFPresetList();
 				this->preset = -1;
 				this->InvalidateData();
@@ -1009,7 +1006,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 				}
 				if (this->active_sel != old_sel) {
 					CloseWindowByClass(WC_GRF_PARAMETERS);
-					CloseWindowByClass(WC_TEXTFILE);
+					this->CloseChildWindows(WC_TEXTFILE);
 				}
 				this->avail_sel = nullptr;
 				this->avail_pos = -1;
@@ -1026,7 +1023,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 			case WID_NS_REMOVE: { // Remove GRF
 				if (this->active_sel == nullptr || !this->editable) break;
 				CloseWindowByClass(WC_GRF_PARAMETERS);
-				CloseWindowByClass(WC_TEXTFILE);
+				this->CloseChildWindows(WC_TEXTFILE);
 
 				/* Choose the next GRF file to be the selected file. */
 				int pos = this->GetCurrentActivePosition();
@@ -1063,7 +1060,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 				this->active_sel = nullptr;
 				CloseWindowByClass(WC_GRF_PARAMETERS);
 				if (it != std::end(this->avails)) {
-					if (this->avail_sel != *it) CloseWindowByClass(WC_TEXTFILE);
+					if (this->avail_sel != *it) this->CloseChildWindows(WC_TEXTFILE);
 					this->avail_sel = *it;
 					this->avail_pos = static_cast<int>(std::distance(std::begin(this->avails), it));
 				}
@@ -1084,19 +1081,14 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 
 			case WID_NS_APPLY_CHANGES: // Apply changes made to GRF list
 				if (!this->editable) break;
-				if (this->execute) {
-					ShowQuery(
-						GetEncodedString(STR_NEWGRF_POPUP_CAUTION_CAPTION),
-						GetEncodedString(STR_NEWGRF_CONFIRMATION_TEXT),
-						this,
-						NewGRFConfirmationCallback
-					);
-				} else {
-					CopyGRFConfigList(this->orig_list, this->actives, true);
-					ResetGRFConfig(false);
-					ReloadNewGRFData();
-					this->InvalidateData(GOID_NEWGRF_CHANGES_APPLIED);
-				}
+
+				ShowQuery(
+					GetEncodedString(STR_NEWGRF_POPUP_CAUTION_CAPTION),
+					GetEncodedString(STR_NEWGRF_CONFIRMATION_TEXT),
+					this,
+					NewGRFConfirmationCallback
+				);
+
 				this->CloseChildWindows(WC_QUERY_STRING); // Remove the parameter query window
 				break;
 
@@ -1137,14 +1129,14 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 
 	void OnNewGRFsScanned() override
 	{
-		if (this->active_sel == nullptr) CloseWindowByClass(WC_TEXTFILE);
+		if (this->active_sel == nullptr) this->CloseChildWindows(WC_TEXTFILE);
 		this->avail_sel = nullptr;
 		this->avail_pos = -1;
 		this->avails.ForceRebuild();
 		this->CloseChildWindows(WC_QUERY_STRING); // Remove the parameter query window
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_NS_PRESET_LIST) return;
 		if (!this->editable) return;
@@ -1153,13 +1145,13 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 		this->preset = index;
 
 		if (index != -1) {
-			this->actives = LoadGRFPresetFromConfig(this->grf_presets[index].c_str());
+			this->actives = LoadGRFPresetFromConfig(this->grf_presets[index]);
 		}
 		this->avails.ForceRebuild();
 
 		ResetObjectToPlace();
 		CloseWindowByClass(WC_GRF_PARAMETERS);
-		CloseWindowByClass(WC_TEXTFILE);
+		this->CloseChildWindows(WC_TEXTFILE);
 		this->active_sel = nullptr;
 		this->InvalidateData(GOID_NEWGRF_CHANGES_MADE);
 	}
@@ -1168,7 +1160,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 	{
 		if (!str.has_value()) return;
 
-		SaveGRFPresetToConfig(str->c_str(), this->actives);
+		SaveGRFPresetToConfig(*str, this->actives);
 		this->grf_presets = GetGRFPresetList();
 
 		/* Switch to this preset */
@@ -1237,11 +1229,6 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 				this->modified = true;
 
 				break;
-
-			case GOID_NEWGRF_CHANGES_APPLIED:
-				/* No changes have been made to the list of active NewGRFs since the last time the changes got applied */
-				this->modified = false;
-				break;
 		}
 
 		this->BuildAvailables();
@@ -1310,7 +1297,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
 		if (this->avail_pos >= 0) {
 			this->active_sel = nullptr;
 			CloseWindowByClass(WC_GRF_PARAMETERS);
-			if (this->avail_sel != this->avails[this->avail_pos]) CloseWindowByClass(WC_TEXTFILE);
+			if (this->avail_sel != this->avails[this->avail_pos]) this->CloseChildWindows(WC_TEXTFILE);
 			this->avail_sel = this->avails[this->avail_pos];
 			this->vscroll2->ScrollTowards(this->avail_pos);
 			this->InvalidateData(0);
@@ -1471,7 +1458,7 @@ private:
 	{
 		if (this->avail_sel == nullptr || !this->editable || this->avail_sel->flags.Test(GRFConfigFlag::Invalid)) return false;
 
-		CloseWindowByClass(WC_TEXTFILE);
+		this->CloseChildWindows(WC_TEXTFILE);
 
 		/* Get number of non-static NewGRFs. */
 		size_t count = std::ranges::count_if(this->actives, [](const auto &gc) { return !gc->flags.Test(GRFConfigFlag::Static); });
@@ -1517,13 +1504,13 @@ void ShowMissingContentWindow(const GRFConfigList &list)
 	for (const auto &c : list) {
 		if (c->status != GCS_NOT_FOUND && !c->flags.Test(GRFConfigFlag::Compatible)) continue;
 
-		ContentInfo *ci = new ContentInfo();
+		auto ci = std::make_unique<ContentInfo>();
 		ci->type = CONTENT_TYPE_NEWGRF;
-		ci->state = ContentInfo::DOES_NOT_EXIST;
+		ci->state = ContentInfo::State::DoesNotExist;
 		ci->name = c->GetName();
 		ci->unique_id = std::byteswap(c->ident.grfid);
 		ci->md5sum = c->flags.Test(GRFConfigFlag::Compatible) ? c->original_md5sum : c->ident.md5sum;
-		cv.push_back(ci);
+		cv.push_back(std::move(ci));
 	}
 	ShowNetworkContentListWindow(cv.empty() ? nullptr : &cv, CONTENT_TYPE_NEWGRF);
 }
@@ -1726,6 +1713,7 @@ public:
 
 	void FillWidgetLookup(WidgetLookup &widget_lookup) override
 	{
+		this->NWidgetBase::FillWidgetLookup(widget_lookup);
 		this->avs->FillWidgetLookup(widget_lookup);
 		this->acs->FillWidgetLookup(widget_lookup);
 		this->inf->FillWidgetLookup(widget_lookup);
@@ -1865,7 +1853,7 @@ static constexpr NWidgetPart _nested_newgrf_infopanel_widgets[] = {
 		EndContainer(),
 
 		/* Right side, config buttons. */
-		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NS_SHOW_APPLY),
+		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NS_SHOW_EDIT),
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
 				NWidget(NWID_VERTICAL),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NS_SET_PARAMETERS), SetFill(1, 0), SetResize(1, 0),
@@ -1873,8 +1861,10 @@ static constexpr NWidgetPart _nested_newgrf_infopanel_widgets[] = {
 					NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NS_TOGGLE_PALETTE), SetFill(1, 0), SetResize(1, 0),
 							SetStringTip(STR_NEWGRF_SETTINGS_TOGGLE_PALETTE, STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP),
 				EndContainer(),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NS_APPLY_CHANGES), SetFill(1, 0), SetResize(1, 0),
-						SetStringTip(STR_NEWGRF_SETTINGS_APPLY_CHANGES),
+				NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NS_SHOW_APPLY),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NS_APPLY_CHANGES), SetFill(1, 0), SetResize(1, 0),
+							SetStringTip(STR_NEWGRF_SETTINGS_APPLY_CHANGES),
+				EndContainer(),
 			EndContainer(),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NS_VIEW_PARAMETERS), SetFill(1, 0), SetResize(1, 0),
 					SetStringTip(STR_NEWGRF_SETTINGS_SHOW_PARAMETERS),
@@ -1926,7 +1916,7 @@ static void NewGRFConfirmationCallback(Window *w, bool confirmed)
 {
 	if (confirmed) {
 		CloseWindowByClass(WC_GRF_PARAMETERS);
-		CloseWindowByClass(WC_TEXTFILE);
+		w->CloseChildWindows(WC_TEXTFILE);
 		NewGRFWindow *nw = dynamic_cast<NewGRFWindow*>(w);
 		assert(nw != nullptr);
 
@@ -1995,7 +1985,6 @@ static constexpr NWidgetPart _nested_save_preset_widgets[] = {
 				SetStringTip(STR_SAVE_PRESET_TITLE, STR_SAVE_PRESET_EDITBOX_TOOLTIP),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SVP_CANCEL), SetStringTip(STR_SAVE_PRESET_CANCEL, STR_SAVE_PRESET_CANCEL_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SVP_SAVE), SetStringTip(STR_SAVE_PRESET_SAVE, STR_SAVE_PRESET_SAVE_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 		NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 	EndContainer(),
@@ -2018,12 +2007,12 @@ struct SavePresetWindow : public Window {
 
 	/**
 	 * Constructor of the save preset window.
-	 * @param initial_text Initial text to display in the edit box, or \c nullptr.
+	 * @param initial_text Initial text to display in the edit box.
 	 */
-	SavePresetWindow(const char *initial_text) : Window(_save_preset_desc), presetname_editbox(32)
+	SavePresetWindow(std::string_view initial_text) : Window(_save_preset_desc), presetname_editbox(32)
 	{
 		this->presets = GetGRFPresetList();
-		if (initial_text != nullptr) {
+		if (!initial_text.empty()) {
 			for (uint i = 0; i < this->presets.size(); i++) {
 				if (this->presets[i] == initial_text) {
 					this->selected = i;
@@ -2034,7 +2023,6 @@ struct SavePresetWindow : public Window {
 
 		this->querystrings[WID_SVP_EDITBOX] = &this->presetname_editbox;
 		this->presetname_editbox.ok_button = WID_SVP_SAVE;
-		this->presetname_editbox.cancel_button = WID_SVP_CANCEL;
 
 		this->CreateNestedTree();
 		this->vscroll = this->GetScrollbar(WID_SVP_SCROLLBAR);
@@ -2042,7 +2030,7 @@ struct SavePresetWindow : public Window {
 
 		this->vscroll->SetCount(this->presets.size());
 		this->SetFocusedWidget(WID_SVP_EDITBOX);
-		if (initial_text != nullptr) this->presetname_editbox.text.Assign(initial_text);
+		this->presetname_editbox.text.Assign(initial_text);
 	}
 
 	~SavePresetWindow()
@@ -2053,12 +2041,11 @@ struct SavePresetWindow : public Window {
 	{
 		switch (widget) {
 			case WID_SVP_PRESET_LIST: {
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				size.height = 0;
 				for (uint i = 0; i < this->presets.size(); i++) {
 					Dimension d = GetStringBoundingBox(this->presets[i]);
 					size.width = std::max(size.width, d.width + padding.width);
-					resize.height = std::max(resize.height, d.height);
 				}
 				size.height = ClampU((uint)this->presets.size(), 5, 20) * resize.height + padding.height;
 				break;
@@ -2104,13 +2091,12 @@ struct SavePresetWindow : public Window {
 				break;
 			}
 
-			case WID_SVP_CANCEL:
-				this->Close();
-				break;
-
 			case WID_SVP_SAVE: {
 				Window *w = FindWindowById(WC_GAME_OPTIONS, WN_GAME_OPTIONS_NEWGRF_STATE);
-				if (w != nullptr && !StrEmpty(this->presetname_editbox.text.GetText())) w->OnQueryTextFinished(this->presetname_editbox.text.GetText());
+				if (w != nullptr) {
+					auto text = this->presetname_editbox.text.GetText();
+					if (!text.empty()) w->OnQueryTextFinished(std::string{text});
+				}
 				this->Close();
 				break;
 			}
@@ -2127,7 +2113,7 @@ struct SavePresetWindow : public Window {
  * Open the window for saving a preset.
  * @param initial_text Initial text to display in the edit box, or \c nullptr.
  */
-static void ShowSavePresetWindow(const char *initial_text)
+static void ShowSavePresetWindow(std::string_view initial_text)
 {
 	CloseWindowByClass(WC_SAVE_PRESET);
 	new SavePresetWindow(initial_text);
@@ -2147,7 +2133,7 @@ static constexpr NWidgetPart _nested_scan_progress_widgets[] = {
 
 /** Description of the widgets and other settings of the window. */
 static WindowDesc _scan_progress_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_MODAL_PROGRESS, WC_NONE,
 	{},
 	_nested_scan_progress_widgets
@@ -2194,7 +2180,7 @@ struct ScanProgressWindow : public Window {
 				Rect ir = r.Shrink(WidgetDimensions::scaled.bevel);
 				uint percent = scanned * 100 / std::max(1U, _settings_client.gui.last_newgrf_count);
 				DrawFrameRect(ir.WithWidth(ir.Width() * percent / 100, _current_text_dir == TD_RTL), COLOUR_MAUVE, {});
-				DrawString(ir.left, ir.right, CenterBounds(ir.top, ir.bottom, GetCharacterHeight(FS_NORMAL)), GetString(STR_GENERATION_PROGRESS, percent), TC_FROMSTRING, SA_HOR_CENTER);
+				DrawString(ir.left, ir.right, CentreBounds(ir.top, ir.bottom, GetCharacterHeight(FS_NORMAL)), GetString(STR_GENERATION_PROGRESS, percent), TC_FROMSTRING, SA_HOR_CENTER);
 				break;
 			}
 
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index 3203688e43..565927aaa7 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -107,14 +107,14 @@ void ResetHouses()
 HouseResolverObject::HouseResolverObject(HouseID house_id, TileIndex tile, Town *town,
 		CallbackID callback, uint32_t param1, uint32_t param2,
 		bool not_yet_constructed, uint8_t initial_random_bits, CargoTypes watched_cargo_triggers, int view)
-	: ResolverObject(GetHouseSpecGrf(house_id), callback, param1, param2),
+	: SpecializedResolverObject<HouseRandomTriggers>(GetHouseSpecGrf(house_id), callback, param1, param2),
 	house_scope(*this, house_id, tile, town, not_yet_constructed, initial_random_bits, watched_cargo_triggers, view),
 	town_scope(*this, town, not_yet_constructed) // Don't access StorePSA if house is not yet constructed.
 {
 	/* Tile must be valid and a house tile, unless not yet constructed in which case it may also be INVALID_TILE. */
 	assert((IsValidTile(tile) && (not_yet_constructed || IsTileType(tile, MP_HOUSE))) || (not_yet_constructed && tile == INVALID_TILE));
 
-	this->root_spritegroup = HouseSpec::Get(house_id)->grf_prop.GetSpriteGroup();
+	this->root_spritegroup = HouseSpec::Get(house_id)->grf_prop.GetSpriteGroup(!not_yet_constructed);
 }
 
 GrfSpecFeature HouseResolverObject::GetFeature() const
@@ -226,10 +226,10 @@ void DecreaseBuildingCount(Town *t, HouseID house_id)
 	return this->not_yet_constructed ? this->initial_random_bits : GetHouseRandomBits(this->tile);
 }
 
-/* virtual */ uint32_t HouseScopeResolver::GetTriggers() const
+/* virtual */ uint32_t HouseScopeResolver::GetRandomTriggers() const
 {
 	/* Note: Towns build houses over houses. So during construction checks 'tile' may be a valid but unrelated house. */
-	return this->not_yet_constructed ? 0 : GetHouseTriggers(this->tile);
+	return this->not_yet_constructed ? 0 : GetHouseRandomTriggers(this->tile).base();
 }
 
 static uint32_t GetNumHouses(HouseID house_id, const Town *town)
@@ -257,113 +257,49 @@ static uint32_t GetNearbyTileInformation(uint8_t parameter, TileIndex tile, bool
 	return GetNearbyTileInformation(tile, grf_version8);
 }
 
-/** Structure with user-data for SearchNearbyHouseXXX - functions */
-struct SearchNearbyHouseData {
-	const HouseSpec *hs;  ///< Specs of the house that started the search.
-	TileIndex north_tile; ///< Northern tile of the house.
-};
-
-/**
- * Callback function to search a house by its HouseID
- * @param tile TileIndex to be examined
- * @param user_data SearchNearbyHouseData
- * @return true or false, if found or not
- */
-static bool SearchNearbyHouseID(TileIndex tile, void *user_data)
-{
-	if (IsTileType(tile, MP_HOUSE)) {
-		HouseID house = GetHouseType(tile); // tile been examined
-		const HouseSpec *hs = HouseSpec::Get(house);
-		if (hs->grf_prop.HasGrfFile()) { // must be one from a grf file
-			SearchNearbyHouseData *nbhd = (SearchNearbyHouseData *)user_data;
-
-			TileIndex north_tile = tile + GetHouseNorthPart(house); // modifies 'house'!
-			if (north_tile == nbhd->north_tile) return false; // Always ignore origin house
-
-			return hs->grf_prop.local_id == nbhd->hs->grf_prop.local_id &&  // same local id as the one requested
-				hs->grf_prop.grfid == nbhd->hs->grf_prop.grfid;  // from the same grf
-		}
-	}
-	return false;
-}
-
-/**
- * Callback function to search a house by its classID
- * @param tile TileIndex to be examined
- * @param user_data SearchNearbyHouseData
- * @return true or false, if found or not
- */
-static bool SearchNearbyHouseClass(TileIndex tile, void *user_data)
-{
-	if (IsTileType(tile, MP_HOUSE)) {
-		HouseID house = GetHouseType(tile); // tile been examined
-		const HouseSpec *hs = HouseSpec::Get(house);
-		if (hs->grf_prop.HasGrfFile()) { // must be one from a grf file
-			SearchNearbyHouseData *nbhd = (SearchNearbyHouseData *)user_data;
-
-			TileIndex north_tile = tile + GetHouseNorthPart(house); // modifies 'house'!
-			if (north_tile == nbhd->north_tile) return false; // Always ignore origin house
-
-			return hs->class_id == nbhd->hs->class_id &&  // same classid as the one requested
-				hs->grf_prop.grfid == nbhd->hs->grf_prop.grfid;  // from the same grf
-		}
-	}
-	return false;
-}
-
-/**
- * Callback function to search a house by its grfID
- * @param tile TileIndex to be examined
- * @param user_data SearchNearbyHouseData
- * @return true or false, if found or not
- */
-static bool SearchNearbyHouseGRFID(TileIndex tile, void *user_data)
-{
-	if (IsTileType(tile, MP_HOUSE)) {
-		HouseID house = GetHouseType(tile); // tile been examined
-		const HouseSpec *hs = HouseSpec::Get(house);
-		if (hs->grf_prop.HasGrfFile()) { // must be one from a grf file
-			SearchNearbyHouseData *nbhd = (SearchNearbyHouseData *)user_data;
-
-			TileIndex north_tile = tile + GetHouseNorthPart(house); // modifies 'house'!
-			if (north_tile == nbhd->north_tile) return false; // Always ignore origin house
-
-			return hs->grf_prop.grfid == nbhd->hs->grf_prop.grfid;  // from the same grf
-		}
-	}
-	return false;
-}
-
 /**
  * This function will activate a search around a central tile, looking for some houses
  * that fit the requested characteristics
  * @param parameter that is given by the callback.
  *                  bits 0..6 radius of the search
  *                  bits 7..8 search type i.e.: 0 = houseID/ 1 = classID/ 2 = grfID
- * @param tile TileIndex from which to start the search
- * @param house the HouseID that is associated to the house, the callback is called for
+ * @param start_tile TileIndex from which to start the search
+ * @param start_house the HouseID that is associated to the house, the callback is called for
  * @return the Manhattan distance from the center tile, if any, and 0 if failure
  */
-static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex tile, HouseID house)
+static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex start_tile, HouseID start_house)
 {
-	static TestTileOnSearchProc * const search_procs[3] = {
-		SearchNearbyHouseID,
-		SearchNearbyHouseClass,
-		SearchNearbyHouseGRFID,
-	};
-	TileIndex found_tile = tile;
 	uint8_t searchtype = GB(parameter, 6, 2);
 	uint8_t searchradius = GB(parameter, 0, 6);
-	if (searchtype >= lengthof(search_procs)) return 0;  // do not run on ill-defined code
 	if (searchradius < 1) return 0; // do not use a too low radius
 
-	SearchNearbyHouseData nbhd;
-	nbhd.hs = HouseSpec::Get(house);
-	nbhd.north_tile = tile + GetHouseNorthPart(house); // modifies 'house'!
+	const auto *start_hs = HouseSpec::Get(start_house);
+	const auto start_north_tile = start_tile + GetHouseNorthPart(start_house); // modifies 'start_house'!
 
-	/* Use a pointer for the tile to start the search. Will be required for calculating the distance*/
-	if (CircularTileSearch(&found_tile, 2 * searchradius + 1, search_procs[searchtype], &nbhd)) {
-		return DistanceManhattan(found_tile, tile);
+	for (auto tile : SpiralTileSequence(start_tile, 2 * searchradius + 1)) {
+		if (!IsTileType(tile, MP_HOUSE)) continue;
+		HouseID house = GetHouseType(tile);
+		const HouseSpec *hs = HouseSpec::Get(house);
+		if (!hs->grf_prop.HasGrfFile()) continue; // must be one from a grf file
+		if (start_north_tile == tile + GetHouseNorthPart(house)) continue; // Always ignore origin house
+
+		bool match;
+		switch (searchtype) {
+			case 0:
+				match = hs->grf_prop.local_id == start_hs->grf_prop.local_id &&  // same local id as the one requested
+						hs->grf_prop.grfid == start_hs->grf_prop.grfid;  // from the same grf
+				break;
+			case 1:
+				match = hs->class_id == start_hs->class_id &&  // same classid as the one requested
+						hs->grf_prop.grfid == start_hs->grf_prop.grfid;  // from the same grf
+				break;
+			case 2:
+				match = hs->grf_prop.grfid == start_hs->grf_prop.grfid;  // from the same grf
+				break;
+			default:
+				return 0;
+		}
+		if (match) return DistanceManhattan(tile, start_tile);
 	}
 	return 0;
 }
@@ -409,7 +345,7 @@ static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex tile, Ho
 		case 0x41: return IsTileType(this->tile, MP_HOUSE) ? GetHouseAge(this->tile).base() : 0;
 
 		/* Town zone */
-		case 0x42: return GetTownRadiusGroup(this->town, this->tile);
+		case 0x42: return to_underlying(GetTownRadiusGroup(this->town, this->tile));
 
 		/* Terrain type */
 		case 0x43: return GetTerrainType(this->tile);
@@ -453,8 +389,8 @@ static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex tile, Ho
 			if (!IsValidCargoType(cargo_type)) return 0;
 
 			/* Extract tile offset. */
-			int8_t x_offs = GB(GetRegister(0x100), 0, 8);
-			int8_t y_offs = GB(GetRegister(0x100), 8, 8);
+			int8_t x_offs = GB(this->ro.GetRegister(0x100), 0, 8);
+			int8_t y_offs = GB(this->ro.GetRegister(0x100), 8, 8);
 			TileIndex testtile = Map::WrapToMap(this->tile + TileDiffXY(x_offs, y_offs));
 
 			StationFinder stations(TileArea(testtile, 1, 1));
@@ -517,20 +453,18 @@ static uint32_t GetDistanceFromNearbyHouse(uint8_t parameter, TileIndex tile, Ho
 	return UINT_MAX;
 }
 
-uint16_t GetHouseCallback(CallbackID callback, uint32_t param1, uint32_t param2, HouseID house_id, Town *town, TileIndex tile,
+uint16_t GetHouseCallback(CallbackID callback, uint32_t param1, uint32_t param2, HouseID house_id, Town *town, TileIndex tile, std::span<int32_t> regs100,
 		bool not_yet_constructed, uint8_t initial_random_bits, CargoTypes watched_cargo_triggers, int view)
 {
 	HouseResolverObject object(house_id, tile, town, callback, param1, param2,
 			not_yet_constructed, initial_random_bits, watched_cargo_triggers, view);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
-static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, uint8_t stage, HouseID house_id)
+static void DrawTileLayout(const TileInfo *ti, const DrawTileSpriteSpan &dts, uint8_t stage, HouseID house_id)
 {
-	const DrawTileSprites *dts = group->ProcessRegisters(&stage);
-
 	const HouseSpec *hs = HouseSpec::Get(house_id);
-	PaletteID palette = GENERAL_SPRITE_COLOUR(hs->random_colour[TileHash2Bit(ti->x, ti->y)]);
+	PaletteID palette = GetColourPalette(hs->random_colour[TileHash2Bit(ti->x, ti->y)]);
 	if (hs->callback_mask.Test(HouseCallbackMask::Colour)) {
 		uint16_t callback = GetHouseCallback(CBID_HOUSE_COLOUR, 0, 0, house_id, Town::GetByTile(ti->tile), ti->tile);
 		if (callback != CALLBACK_FAILED) {
@@ -539,8 +473,8 @@ static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *grou
 		}
 	}
 
-	SpriteID image = dts->ground.sprite;
-	PaletteID pal  = dts->ground.pal;
+	SpriteID image = dts.ground.sprite;
+	PaletteID pal = dts.ground.pal;
 
 	if (HasBit(image, SPRITE_MODIFIER_CUSTOM_SPRITE)) image += stage;
 	if (HasBit(pal, SPRITE_MODIFIER_CUSTOM_SPRITE)) pal += stage;
@@ -549,7 +483,7 @@ static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *grou
 		DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, palette));
 	}
 
-	DrawNewGRFTileSeq(ti, dts, TO_HOUSES, stage, palette);
+	DrawNewGRFTileSeq(ti, &dts, TO_HOUSES, stage, palette);
 }
 
 void DrawNewHouseTile(TileInfo *ti, HouseID house_id)
@@ -569,19 +503,60 @@ void DrawNewHouseTile(TileInfo *ti, HouseID house_id)
 
 	HouseResolverObject object(house_id, ti->tile, Town::GetByTile(ti->tile));
 
-	const SpriteGroup *group = object.Resolve();
-	if (group != nullptr && group->type == SGT_TILELAYOUT) {
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group != nullptr) {
 		/* Limit the building stage to the number of stages supplied. */
-		const TileLayoutSpriteGroup *tlgroup = (const TileLayoutSpriteGroup *)group;
 		uint8_t stage = GetHouseBuildingStage(ti->tile);
-		DrawTileLayout(ti, tlgroup, stage, house_id);
+		auto processor = group->ProcessRegisters(object, &stage);
+		auto dts = processor.GetLayout();
+		DrawTileLayout(ti, dts, stage, house_id);
 	}
 }
 
-/* Simple wrapper for GetHouseCallback to keep the animation unified. */
-uint16_t GetSimpleHouseCallback(CallbackID callback, uint32_t param1, uint32_t param2, const HouseSpec *spec, Town *town, TileIndex tile, CargoTypes extra_data)
+/**
+ * Draw representation of a house tile for GUI purposes.
+ * @param x Position x of image.
+ * @param y Position y of image.
+ * @param spec House spec to draw.
+ * @param house_id House ID to draw.
+ * @param view The house's 'view'.
+ */
+void DrawNewHouseTileInGUI(int x, int y, const HouseSpec *spec, HouseID house_id, int view)
 {
-	return GetHouseCallback(callback, param1, param2, spec - HouseSpec::Get(0), town, tile, false, 0, extra_data);
+	HouseResolverObject object(house_id, INVALID_TILE, nullptr, CBID_NO_CALLBACK, 0, 0, true, view);
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) return;
+
+	uint8_t stage = TOWN_HOUSE_COMPLETED;
+	auto processor = group->ProcessRegisters(object, &stage);
+	auto dts = processor.GetLayout();
+
+	PaletteID palette = GetColourPalette(spec->random_colour[0]);
+	if (spec->callback_mask.Test(HouseCallbackMask::Colour)) {
+		uint16_t callback = GetHouseCallback(CBID_HOUSE_COLOUR, 0, 0, house_id, nullptr, INVALID_TILE, {}, true, view);
+		if (callback != CALLBACK_FAILED) {
+			/* If bit 14 is set, we should use a 2cc colour map, else use the callback value. */
+			palette = HasBit(callback, 14) ? GB(callback, 0, 8) + SPR_2CCMAP_BASE : callback;
+		}
+	}
+
+	SpriteID image = dts.ground.sprite;
+	PaletteID pal = dts.ground.pal;
+
+	if (HasBit(image, SPRITE_MODIFIER_CUSTOM_SPRITE)) image += stage;
+	if (HasBit(pal, SPRITE_MODIFIER_CUSTOM_SPRITE)) pal += stage;
+
+	if (GB(image, 0, SPRITE_WIDTH) != 0) {
+		DrawSprite(image, GroundSpritePaletteTransform(image, pal, palette), x, y);
+	}
+
+	DrawNewGRFTileSeqInGUI(x, y, &dts, stage, palette);
+}
+
+/* Simple wrapper for GetHouseCallback to keep the animation unified. */
+static uint16_t GetSimpleHouseCallback(CallbackID callback, uint32_t param1, uint32_t param2, const HouseSpec *spec, Town *town, TileIndex tile, CargoTypes extra_data)
+{
+	return GetHouseCallback(callback, param1, param2, spec - HouseSpec::Get(0), town, tile, {}, false, 0, extra_data);
 }
 
 /** Helper class for animation control. */
@@ -601,12 +576,12 @@ void AnimateNewHouseTile(TileIndex tile)
 	HouseAnimationBase::AnimateTile(hs, Town::GetByTile(tile), tile, hs->extra_flags.Test(HouseExtraFlag::Callback1ARandomBits));
 }
 
-void AnimateNewHouseConstruction(TileIndex tile)
+void TriggerHouseAnimation_ConstructionStageChanged(TileIndex tile, bool first_call)
 {
 	const HouseSpec *hs = HouseSpec::Get(GetHouseType(tile));
 
-	if (hs->callback_mask.Test(HouseCallbackMask::ConstructionStateChange)) {
-		HouseAnimationBase::ChangeAnimationFrame(CBID_HOUSE_CONSTRUCTION_STATE_CHANGE, hs, Town::GetByTile(tile), tile, 0, 0);
+	if (hs->callback_mask.Test(HouseCallbackMask::AnimationTriggerConstructionStageChanged)) {
+		HouseAnimationBase::ChangeAnimationFrame(CBID_HOUSE_ANIMATION_TRIGGER_CONSTRUCTION_STAGE_CHANGED, hs, Town::GetByTile(tile), tile, Random(), first_call ? 1 : 0);
 	}
 }
 
@@ -628,13 +603,21 @@ bool CanDeleteHouse(TileIndex tile)
 	}
 }
 
-static void AnimationControl(TileIndex tile, uint16_t random_bits)
+/**
+ * Call the tile loop animation trigger for houses, if enabled.
+ * @param tile House tile
+ * @param sync Whether to call the synchronized or the unsynchronized trigger.
+ * @param random_bits Shared random bits for the synchronized trigger.
+ */
+static void TriggerHouseAnimation_TileLoop(TileIndex tile, bool sync, uint16_t random_bits)
 {
 	const HouseSpec *hs = HouseSpec::Get(GetHouseType(tile));
 
-	if (hs->callback_mask.Test(HouseCallbackMask::AnimationStartStop)) {
-		uint32_t param = hs->extra_flags.Test(HouseExtraFlag::SynchronisedCallback1B) ? (GB(Random(), 0, 16) | random_bits << 16) : Random();
-		HouseAnimationBase::ChangeAnimationFrame(CBID_HOUSE_ANIMATION_START_STOP, hs, Town::GetByTile(tile), tile, param, 0);
+	/* Check whether the matching trigger is enabled */
+	if (hs->callback_mask.Test(HouseCallbackMask::AnimationTriggerTileLoop) &&
+			hs->extra_flags.Test(HouseExtraFlag::SynchronisedCallback1B) == sync) {
+		uint32_t param = sync ? (GB(Random(), 0, 16) | random_bits << 16) : Random();
+		HouseAnimationBase::ChangeAnimationFrame(CBID_HOUSE_ANIMATION_TRIGGER_TILE_LOOP, hs, Town::GetByTile(tile), tile, param, 0);
 	}
 }
 
@@ -647,24 +630,19 @@ bool NewHouseTileLoop(TileIndex tile)
 		return true;
 	}
 
-	TriggerHouse(tile, HOUSE_TRIGGER_TILE_LOOP);
-	if (hs->building_flags.Any(BUILDING_HAS_1_TILE)) TriggerHouse(tile, HOUSE_TRIGGER_TILE_LOOP_TOP);
+	TriggerHouseRandomisation(tile, HouseRandomTrigger::TileLoop);
+	if (hs->building_flags.Any(BUILDING_HAS_1_TILE)) TriggerHouseRandomisation(tile, HouseRandomTrigger::TileLoopNorth);
 
-	if (hs->callback_mask.Test(HouseCallbackMask::AnimationStartStop)) {
-		/* If this house is marked as having a synchronised callback, all the
-		 * tiles will have the callback called at once, rather than when the
-		 * tile loop reaches them. This should only be enabled for the northern
-		 * tile, or strange things will happen (here, and in TTDPatch). */
-		if (hs->extra_flags.Test(HouseExtraFlag::SynchronisedCallback1B)) {
-			uint16_t random = GB(Random(), 0, 16);
+	/* Call the unsynchronized tile loop trigger */
+	TriggerHouseAnimation_TileLoop(tile, false, 0);
 
-			if (hs->building_flags.Any(BUILDING_HAS_1_TILE))  AnimationControl(tile, random);
-			if (hs->building_flags.Any(BUILDING_2_TILES_Y))   AnimationControl(TileAddXY(tile, 0, 1), random);
-			if (hs->building_flags.Any(BUILDING_2_TILES_X))   AnimationControl(TileAddXY(tile, 1, 0), random);
-			if (hs->building_flags.Any(BUILDING_HAS_4_TILES)) AnimationControl(TileAddXY(tile, 1, 1), random);
-		} else {
-			AnimationControl(tile, 0);
-		}
+	/* Call the synchronized tile loop trigger, if this is the north tile */
+	if (hs->building_flags.Any(BUILDING_HAS_1_TILE)) {
+		uint16_t random = GB(Random(), 0, 16);
+		TriggerHouseAnimation_TileLoop(tile, true, random);
+		if (hs->building_flags.Any(BUILDING_2_TILES_Y)) TriggerHouseAnimation_TileLoop(TileAddXY(tile, 0, 1), true, random);
+		if (hs->building_flags.Any(BUILDING_2_TILES_X)) TriggerHouseAnimation_TileLoop(TileAddXY(tile, 1, 0), true, random);
+		if (hs->building_flags.Any(BUILDING_HAS_4_TILES)) TriggerHouseAnimation_TileLoop(TileAddXY(tile, 1, 1), true, random);
 	}
 
 	/* Check callback 21, which determines if a house should be destroyed. */
@@ -681,7 +659,7 @@ bool NewHouseTileLoop(TileIndex tile)
 	return true;
 }
 
-static void DoTriggerHouse(TileIndex tile, HouseTrigger trigger, uint8_t base_random, bool first)
+static void DoTriggerHouseRandomisation(TileIndex tile, HouseRandomTrigger trigger, uint8_t base_random, bool first)
 {
 	/* We can't trigger a non-existent building... */
 	assert(IsTileType(tile, MP_HOUSE));
@@ -689,17 +667,19 @@ static void DoTriggerHouse(TileIndex tile, HouseTrigger trigger, uint8_t base_ra
 	HouseID hid = GetHouseType(tile);
 	HouseSpec *hs = HouseSpec::Get(hid);
 
-	if (hs->grf_prop.GetSpriteGroup() == nullptr) return;
+	if (!hs->grf_prop.HasSpriteGroups()) return;
 
 	HouseResolverObject object(hid, tile, Town::GetByTile(tile), CBID_RANDOM_TRIGGER);
-	object.waiting_triggers = GetHouseTriggers(tile) | trigger;
-	SetHouseTriggers(tile, object.waiting_triggers); // store now for var 5F
+	auto waiting_random_triggers = GetHouseRandomTriggers(tile);
+	waiting_random_triggers.Set(trigger);
+	SetHouseRandomTriggers(tile, waiting_random_triggers); // store now for var 5F
+	object.SetWaitingRandomTriggers(waiting_random_triggers);
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return;
+	object.ResolveRerandomisation();
 
 	/* Store remaining triggers. */
-	SetHouseTriggers(tile, object.GetRemainingTriggers());
+	waiting_random_triggers.Reset(object.GetUsedRandomTriggers());
+	SetHouseRandomTriggers(tile, waiting_random_triggers);
 
 	/* Rerandomise bits. Scopes other than SELF are invalid for houses. For bug-to-bug-compatibility with TTDP we ignore the scope. */
 	uint8_t new_random_bits = Random();
@@ -710,27 +690,27 @@ static void DoTriggerHouse(TileIndex tile, HouseTrigger trigger, uint8_t base_ra
 	SetHouseRandomBits(tile, random_bits);
 
 	switch (trigger) {
-		case HOUSE_TRIGGER_TILE_LOOP:
+		case HouseRandomTrigger::TileLoop:
 			/* Random value already set. */
 			break;
 
-		case HOUSE_TRIGGER_TILE_LOOP_TOP:
+		case HouseRandomTrigger::TileLoopNorth:
 			if (!first) {
 				/* The top tile is marked dirty by the usual TileLoop */
 				MarkTileDirtyByTile(tile);
 				break;
 			}
 			/* Random value of first tile already set. */
-			if (hs->building_flags.Any(BUILDING_2_TILES_Y))   DoTriggerHouse(TileAddXY(tile, 0, 1), trigger, random_bits, false);
-			if (hs->building_flags.Any(BUILDING_2_TILES_X))   DoTriggerHouse(TileAddXY(tile, 1, 0), trigger, random_bits, false);
-			if (hs->building_flags.Any(BUILDING_HAS_4_TILES)) DoTriggerHouse(TileAddXY(tile, 1, 1), trigger, random_bits, false);
+			if (hs->building_flags.Any(BUILDING_2_TILES_Y))   DoTriggerHouseRandomisation(TileAddXY(tile, 0, 1), trigger, random_bits, false);
+			if (hs->building_flags.Any(BUILDING_2_TILES_X))   DoTriggerHouseRandomisation(TileAddXY(tile, 1, 0), trigger, random_bits, false);
+			if (hs->building_flags.Any(BUILDING_HAS_4_TILES)) DoTriggerHouseRandomisation(TileAddXY(tile, 1, 1), trigger, random_bits, false);
 			break;
 	}
 }
 
-void TriggerHouse(TileIndex t, HouseTrigger trigger)
+void TriggerHouseRandomisation(TileIndex t, HouseRandomTrigger trigger)
 {
-	DoTriggerHouse(t, trigger, 0, true);
+	DoTriggerHouseRandomisation(t, trigger, 0, true);
 }
 
 /**
@@ -740,11 +720,11 @@ void TriggerHouse(TileIndex t, HouseTrigger trigger)
  * @param trigger_cargoes Cargo types that triggered the callback.
  * @param random Random bits.
  */
-void DoWatchedCargoCallback(TileIndex tile, TileIndex origin, CargoTypes trigger_cargoes, uint16_t random)
+static void DoTriggerHouseAnimation_WatchedCargoAccepted(TileIndex tile, TileIndex origin, CargoTypes trigger_cargoes, uint16_t random)
 {
 	TileIndexDiffC diff = TileIndexToTileIndexDiffC(origin, tile);
 	uint32_t cb_info = random << 16 | (uint8_t)diff.y << 8 | (uint8_t)diff.x;
-	HouseAnimationBase::ChangeAnimationFrame(CBID_HOUSE_WATCHED_CARGO_ACCEPTED, HouseSpec::Get(GetHouseType(tile)), Town::GetByTile(tile), tile, 0, cb_info, trigger_cargoes);
+	HouseAnimationBase::ChangeAnimationFrame(CBID_HOUSE_ANIMATION_TRIGGER_WATCHED_CARGO_ACCEPTED, HouseSpec::Get(GetHouseType(tile)), Town::GetByTile(tile), tile, 0, cb_info, trigger_cargoes);
 }
 
 /**
@@ -753,7 +733,7 @@ void DoWatchedCargoCallback(TileIndex tile, TileIndex origin, CargoTypes trigger
  * @param trigger_cargoes Triggering cargo types.
  * @pre IsTileType(t, MP_HOUSE)
  */
-void WatchedCargoCallback(TileIndex tile, CargoTypes trigger_cargoes)
+void TriggerHouseAnimation_WatchedCargoAccepted(TileIndex tile, CargoTypes trigger_cargoes)
 {
 	assert(IsTileType(tile, MP_HOUSE));
 	HouseID id = GetHouseType(tile);
@@ -770,9 +750,9 @@ void WatchedCargoCallback(TileIndex tile, CargoTypes trigger_cargoes)
 	TileIndex north = tile + GetHouseNorthPart(id);
 	hs = HouseSpec::Get(id);
 
-	DoWatchedCargoCallback(north, tile, trigger_cargoes, r);
-	if (hs->building_flags.Any(BUILDING_2_TILES_Y))   DoWatchedCargoCallback(TileAddXY(north, 0, 1), tile, trigger_cargoes, r);
-	if (hs->building_flags.Any(BUILDING_2_TILES_X))   DoWatchedCargoCallback(TileAddXY(north, 1, 0), tile, trigger_cargoes, r);
-	if (hs->building_flags.Any(BUILDING_HAS_4_TILES)) DoWatchedCargoCallback(TileAddXY(north, 1, 1), tile, trigger_cargoes, r);
+	DoTriggerHouseAnimation_WatchedCargoAccepted(north, tile, trigger_cargoes, r);
+	if (hs->building_flags.Any(BUILDING_2_TILES_Y))   DoTriggerHouseAnimation_WatchedCargoAccepted(TileAddXY(north, 0, 1), tile, trigger_cargoes, r);
+	if (hs->building_flags.Any(BUILDING_2_TILES_X))   DoTriggerHouseAnimation_WatchedCargoAccepted(TileAddXY(north, 1, 0), tile, trigger_cargoes, r);
+	if (hs->building_flags.Any(BUILDING_HAS_4_TILES)) DoTriggerHouseAnimation_WatchedCargoAccepted(TileAddXY(north, 1, 1), tile, trigger_cargoes, r);
 }
 
diff --git a/src/newgrf_house.h b/src/newgrf_house.h
index 5ad224d004..56fbdb1dd0 100644
--- a/src/newgrf_house.h
+++ b/src/newgrf_house.h
@@ -45,11 +45,11 @@ struct HouseScopeResolver : public ScopeResolver {
 
 	uint32_t GetRandomBits() const override;
 	uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const override;
-	uint32_t GetTriggers() const override;
+	uint32_t GetRandomTriggers() const override;
 };
 
 /** Resolver object to be used for houses (feature 07 spritegroups). */
-struct HouseResolverObject : public ResolverObject {
+struct HouseResolverObject : public SpecializedResolverObject<HouseRandomTriggers> {
 	HouseScopeResolver house_scope;
 	TownScopeResolver  town_scope;
 
@@ -98,26 +98,19 @@ void DecreaseBuildingCount(Town *t, HouseID house_id);
 std::span<const uint> GetBuildingHouseIDCounts();
 
 void DrawNewHouseTile(TileInfo *ti, HouseID house_id);
+void DrawNewHouseTileInGUI(int x, int y, const HouseSpec *spec, HouseID house_id, int view);
 void AnimateNewHouseTile(TileIndex tile);
-void AnimateNewHouseConstruction(TileIndex tile);
+/* see also: void TriggerHouseAnimation_TileLoop(TileIndex tile, uint16_t random_bits) */
+void TriggerHouseAnimation_ConstructionStageChanged(TileIndex tile, bool first_call);
+void TriggerHouseAnimation_WatchedCargoAccepted(TileIndex tile, CargoTypes trigger_cargoes);
 
-uint16_t GetHouseCallback(CallbackID callback, uint32_t param1, uint32_t param2, HouseID house_id, Town *town, TileIndex tile,
+uint16_t GetHouseCallback(CallbackID callback, uint32_t param1, uint32_t param2, HouseID house_id, Town *town, TileIndex tile, std::span<int32_t> regs100 = {},
 		bool not_yet_constructed = false, uint8_t initial_random_bits = 0, CargoTypes watched_cargo_triggers = 0, int view = 0);
-void WatchedCargoCallback(TileIndex tile, CargoTypes trigger_cargoes);
 
 bool CanDeleteHouse(TileIndex tile);
 
 bool NewHouseTileLoop(TileIndex tile);
 
-enum HouseTrigger : uint8_t {
-	/* The tile of the house has been triggered during the tileloop. */
-	HOUSE_TRIGGER_TILE_LOOP     = 0x01,
-	/*
-	 * The top tile of a (multitile) building has been triggered during and all
-	 * the tileloop other tiles of the same building get the same random value.
-	 */
-	HOUSE_TRIGGER_TILE_LOOP_TOP = 0x02,
-};
-void TriggerHouse(TileIndex t, HouseTrigger trigger);
+void TriggerHouseRandomisation(TileIndex t, HouseRandomTrigger trigger);
 
 #endif /* NEWGRF_HOUSE_H */
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 4caf09557d..4f532ff1b2 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -79,7 +79,7 @@ uint32_t GetIndustryIDAtOffset(TileIndex tile, const Industry *i, uint32_t cur_g
 		}
 	}
 	/* Not an 'old type' tile */
-	if (indtsp->grf_prop.GetSpriteGroup() != nullptr) { // tile has a spritegroup ?
+	if (indtsp->grf_prop.HasSpriteGroups()) {
 		if (indtsp->grf_prop.grfid == cur_grfid) { // same industry, same grf ?
 			return indtsp->grf_prop.local_id;
 		} else {
@@ -107,15 +107,16 @@ static uint32_t GetClosestIndustry(TileIndex tile, IndustryType type, const Indu
  * Implementation of both var 67 and 68
  * since the mechanism is almost the same, it is easier to regroup them on the same
  * function.
+ * @param object ResolverObject owning the temporary storage.
  * @param param_set_id parameter given to the callback, which is the set id, or the local id, in our terminology
  * @param layout_filter on what layout do we filter?
  * @param town_filter Do we filter on the same town as the current industry?
  * @param current Industry for which the inquiry is made
  * @return the formatted answer to the callback : rr(reserved) cc(count) dddd(manhattan distance of closest sister)
  */
-static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_set_id, uint8_t layout_filter, bool town_filter, const Industry *current)
+static uint32_t GetCountAndDistanceOfClosestInstance(const ResolverObject &object, uint8_t param_set_id, uint8_t layout_filter, bool town_filter, const Industry *current)
 {
-	uint32_t grf_id = GetRegister(0x100);  ///< Get the GRFID of the definition to look for in register 100h
+	uint32_t grf_id = static_cast<uint32_t>(object.GetRegister(0x100)); ///< Get the GRFID of the definition to look for in register 100h
 	IndustryType industry_type;
 	uint32_t closest_dist = UINT32_MAX;
 	uint8_t count = 0;
@@ -185,7 +186,7 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_set_id, uint8
 			case 0x87: return GetTerrainType(this->tile);
 
 			/* Town zone */
-			case 0x88: return GetTownRadiusGroup(this->industry->town, this->tile);
+			case 0x88: return to_underlying(GetTownRadiusGroup(this->industry->town, this->tile));
 
 			/* Manhattan distance of the closest town */
 			case 0x89: return ClampTo<uint8_t>(DistanceManhattan(this->industry->town->xy, this->tile));
@@ -295,7 +296,7 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_set_id, uint8
 		case 0x65: {
 			if (this->tile == INVALID_TILE) break;
 			TileIndex tile = GetNearbyTile(parameter, this->tile, true);
-			return GetTownRadiusGroup(this->industry->town, tile) << 16 | ClampTo<uint16_t>(DistanceManhattan(tile, this->industry->town->xy));
+			return to_underlying(GetTownRadiusGroup(this->industry->town, tile)) << 16 | ClampTo<uint16_t>(DistanceManhattan(tile, this->industry->town->xy));
 		}
 		/* Get square of Euclidean distance of closest town */
 		case 0x66: {
@@ -311,11 +312,11 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_set_id, uint8
 			uint8_t layout_filter = 0;
 			bool town_filter = false;
 			if (variable == 0x68) {
-				uint32_t reg = GetRegister(0x101);
+				int32_t reg = this->ro.GetRegister(0x101);
 				layout_filter = GB(reg, 0, 8);
 				town_filter = HasBit(reg, 8);
 			}
-			return GetCountAndDistanceOfClosestInstance(parameter, layout_filter, town_filter, this->industry);
+			return GetCountAndDistanceOfClosestInstance(this->ro, parameter, layout_filter, town_filter, this->industry);
 		}
 
 		case 0x69:
@@ -433,7 +434,7 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t param_set_id, uint8
 	return this->industry != nullptr ? this->industry->random : 0;
 }
 
-/* virtual */ uint32_t IndustriesScopeResolver::GetTriggers() const
+/* virtual */ uint32_t IndustriesScopeResolver::GetRandomTriggers() const
 {
 	return 0;
 }
@@ -481,7 +482,7 @@ IndustriesResolverObject::IndustriesResolverObject(TileIndex tile, Industry *ind
 	: ResolverObject(GetGrffile(type), callback, callback_param1, callback_param2),
 	industries_scope(*this, tile, indus, type, random_bits)
 {
-	this->root_spritegroup = GetIndustrySpec(type)->grf_prop.GetSpriteGroup();
+	this->root_spritegroup = GetIndustrySpec(type)->grf_prop.GetSpriteGroup(indus != nullptr && indus->index != IndustryID::Invalid());
 }
 
 /**
@@ -523,12 +524,13 @@ uint32_t IndustriesResolverObject::GetDebugID() const
  * @param industry The industry to do the callback for.
  * @param type The type of industry to do the callback for.
  * @param tile The tile associated with the callback.
+ * @param[out] regs100 Additional result values from registers 100+
  * @return The callback result.
  */
-uint16_t GetIndustryCallback(CallbackID callback, uint32_t param1, uint32_t param2, Industry *industry, IndustryType type, TileIndex tile)
+uint16_t GetIndustryCallback(CallbackID callback, uint32_t param1, uint32_t param2, Industry *industry, IndustryType type, TileIndex tile, std::span<int32_t> regs100)
 {
 	IndustriesResolverObject object(tile, industry, type, 0, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
@@ -558,13 +560,14 @@ CommandCost CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, siz
 	ind.psa = nullptr;
 
 	IndustriesResolverObject object(tile, &ind, type, seed, CBID_INDUSTRY_LOCATION, 0, creation_type);
-	uint16_t result = object.ResolveCallback();
+	std::array<int32_t, 16> regs100;
+	uint16_t result = object.ResolveCallback(regs100);
 
 	/* Unlike the "normal" cases, not having a valid result means we allow
 	 * the building of the industry, as that's how it's done in TTDP. */
 	if (result == CALLBACK_FAILED) return CommandCost();
 
-	return GetErrorMessageFromLocationCallbackResult(result, indspec->grf_prop.grffile, STR_ERROR_SITE_UNSUITABLE);
+	return GetErrorMessageFromLocationCallbackResult(result, regs100, indspec->grf_prop.grffile, STR_ERROR_SITE_UNSUITABLE);
 }
 
 /**
@@ -596,11 +599,6 @@ uint32_t GetIndustryProbabilityCallback(IndustryType type, IndustryAvailabilityC
 	return default_prob;
 }
 
-static int32_t DerefIndProd(int field, bool use_register)
-{
-	return use_register ? (int32_t)GetRegister(field) : field;
-}
-
 /**
  * Get the industry production callback and apply it to the industry.
  * @param ind    the industry this callback has to be called for
@@ -615,6 +613,10 @@ void IndustryProductionCallback(Industry *ind, int reason)
 	if (spec->behaviour.Test(IndustryBehaviour::ProdMultiHandling)) multiplier = ind->prod_level;
 	object.callback_param2 = reason;
 
+	auto deref_ind_prod = [&object](int field, bool use_register) -> int32_t {
+		return use_register ? object.GetRegister(field) : field;
+	};
+
 	for (uint loop = 0;; loop++) {
 		/* limit the number of calls to break infinite loops.
 		 * 'loop' is provided as 16 bits to the newgrf, so abort when those are exceeded. */
@@ -629,9 +631,8 @@ void IndustryProductionCallback(Industry *ind, int reason)
 		}
 
 		SB(object.callback_param2, 8, 16, loop);
-		const SpriteGroup *tgroup = object.Resolve();
-		if (tgroup == nullptr || tgroup->type != SGT_INDUSTRY_PRODUCTION) break;
-		const IndustryProductionSpriteGroup *group = (const IndustryProductionSpriteGroup *)tgroup;
+		const auto *group = object.Resolve<IndustryProductionSpriteGroup>();
+		if (group == nullptr) break;
 
 		if (group->version == 0xFF) {
 			/* Result was marked invalid on load, display error message */
@@ -649,27 +650,27 @@ void IndustryProductionCallback(Industry *ind, int reason)
 			/* Callback parameters map directly to industry cargo slot indices */
 			for (uint i = 0; i < group->num_input && i < ind->accepted.size(); i++) {
 				if (!IsValidCargoType(ind->accepted[i].cargo)) continue;
-				ind->accepted[i].waiting = ClampTo<uint16_t>(ind->accepted[i].waiting - DerefIndProd(group->subtract_input[i], deref) * multiplier);
+				ind->accepted[i].waiting = ClampTo<uint16_t>(ind->accepted[i].waiting - deref_ind_prod(group->subtract_input[i], deref) * multiplier);
 			}
 			for (uint i = 0; i < group->num_output && i < ind->produced.size(); i++) {
 				if (!IsValidCargoType(ind->produced[i].cargo)) continue;
-				ind->produced[i].waiting = ClampTo<uint16_t>(ind->produced[i].waiting + std::max(DerefIndProd(group->add_output[i], deref), 0) * multiplier);
+				ind->produced[i].waiting = ClampTo<uint16_t>(ind->produced[i].waiting + std::max(deref_ind_prod(group->add_output[i], deref), 0) * multiplier);
 			}
 		} else {
 			/* Callback receives list of cargos to apply for, which need to have their cargo slots in industry looked up */
 			for (uint i = 0; i < group->num_input; i++) {
 				auto it = ind->GetCargoAccepted(group->cargo_input[i]);
 				if (it == std::end(ind->accepted)) continue;
-				it->waiting = ClampTo<uint16_t>(it->waiting - DerefIndProd(group->subtract_input[i], deref) * multiplier);
+				it->waiting = ClampTo<uint16_t>(it->waiting - deref_ind_prod(group->subtract_input[i], deref) * multiplier);
 			}
 			for (uint i = 0; i < group->num_output; i++) {
 				auto it = ind->GetCargoProduced(group->cargo_output[i]);
 				if (it == std::end(ind->produced)) continue;
-				it->waiting = ClampTo<uint16_t>(it->waiting + std::max(DerefIndProd(group->add_output[i], deref), 0) * multiplier);
+				it->waiting = ClampTo<uint16_t>(it->waiting + std::max(deref_ind_prod(group->add_output[i], deref), 0) * multiplier);
 			}
 		}
 
-		int32_t again = DerefIndProd(group->again, deref);
+		int32_t again = deref_ind_prod(group->again, deref);
 		if (again == 0) break;
 
 		SB(object.callback_param2, 24, 8, again);
diff --git a/src/newgrf_industries.h b/src/newgrf_industries.h
index c074f6e528..16444fd2ea 100644
--- a/src/newgrf_industries.h
+++ b/src/newgrf_industries.h
@@ -34,7 +34,7 @@ struct IndustriesScopeResolver : public ScopeResolver {
 
 	uint32_t GetRandomBits() const override;
 	uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const override;
-	uint32_t GetTriggers() const override;
+	uint32_t GetRandomTriggers() const override;
 	void StorePSA(uint pos, int32_t value) override;
 };
 
@@ -86,7 +86,7 @@ enum IndustryAvailabilityCallType : uint8_t {
 };
 
 /* in newgrf_industry.cpp */
-uint16_t GetIndustryCallback(CallbackID callback, uint32_t param1, uint32_t param2, Industry *industry, IndustryType type, TileIndex tile);
+uint16_t GetIndustryCallback(CallbackID callback, uint32_t param1, uint32_t param2, Industry *industry, IndustryType type, TileIndex tile, std::span<int32_t> regs100 = {});
 uint32_t GetIndustryIDAtOffset(TileIndex new_tile, const Industry *i, uint32_t cur_grfid);
 void IndustryProductionCallback(Industry *ind, int reason);
 CommandCost CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, size_t layout, uint32_t seed, uint16_t initial_random_bits, Owner founder, IndustryAvailabilityCallType creation_type);
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp
index 60988f6e1d..1c73b14b62 100644
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -69,7 +69,7 @@ uint32_t GetRelativePosition(TileIndex tile, TileIndex ind_tile)
 		case 0x41: return GetTerrainType(this->tile);
 
 		/* Current town zone of the tile in the nearest town */
-		case 0x42: return GetTownRadiusGroup(ClosestTownFromTile(this->tile, UINT_MAX), this->tile);
+		case 0x42: return to_underlying(GetTownRadiusGroup(ClosestTownFromTile(this->tile, UINT_MAX), this->tile));
 
 		/* Relative position */
 		case 0x43: return GetRelativePosition(this->tile, this->industry->location.tile);
@@ -110,12 +110,12 @@ uint32_t GetRelativePosition(TileIndex tile, TileIndex ind_tile)
 	return (this->industry->index != IndustryID::Invalid()) ? GetIndustryRandomBits(this->tile) : 0;
 }
 
-/* virtual */ uint32_t IndustryTileScopeResolver::GetTriggers() const
+/* virtual */ uint32_t IndustryTileScopeResolver::GetRandomTriggers() const
 {
 	assert(this->industry != nullptr && IsValidTile(this->tile));
 	assert(this->industry->index == IndustryID::Invalid() || IsTileType(this->tile, MP_INDUSTRY));
 	if (this->industry->index == IndustryID::Invalid()) return 0;
-	return GetIndustryTriggers(this->tile);
+	return GetIndustryRandomTriggers(this->tile).base();
 }
 
 /**
@@ -140,12 +140,12 @@ static const GRFFile *GetIndTileGrffile(IndustryGfx gfx)
  */
 IndustryTileResolverObject::IndustryTileResolverObject(IndustryGfx gfx, TileIndex tile, Industry *indus,
 			CallbackID callback, uint32_t callback_param1, uint32_t callback_param2)
-	: ResolverObject(GetIndTileGrffile(gfx), callback, callback_param1, callback_param2),
+	: SpecializedResolverObject<IndustryRandomTriggers>(GetIndTileGrffile(gfx), callback, callback_param1, callback_param2),
 	indtile_scope(*this, indus, tile),
 	ind_scope(*this, tile, indus, indus->type),
 	gfx(gfx)
 {
-	this->root_spritegroup = GetIndustryTileSpec(gfx)->grf_prop.GetSpriteGroup();
+	this->root_spritegroup = GetIndustryTileSpec(gfx)->grf_prop.GetSpriteGroup(indus->index != IndustryID::Invalid());
 }
 
 GrfSpecFeature IndustryTileResolverObject::GetFeature() const
@@ -158,12 +158,10 @@ uint32_t IndustryTileResolverObject::GetDebugID() const
 	return GetIndustryTileSpec(gfx)->grf_prop.local_id;
 }
 
-static void IndustryDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, uint8_t rnd_colour, uint8_t stage)
+static void IndustryDrawTileLayout(const TileInfo *ti, const DrawTileSpriteSpan &dts, Colours rnd_colour, uint8_t stage)
 {
-	const DrawTileSprites *dts = group->ProcessRegisters(&stage);
-
-	SpriteID image = dts->ground.sprite;
-	PaletteID pal  = dts->ground.pal;
+	SpriteID image = dts.ground.sprite;
+	PaletteID pal = dts.ground.pal;
 
 	if (HasBit(image, SPRITE_MODIFIER_CUSTOM_SPRITE)) image += stage;
 	if (HasBit(pal, SPRITE_MODIFIER_CUSTOM_SPRITE)) pal += stage;
@@ -174,20 +172,20 @@ static void IndustryDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGro
 		if (image == SPR_FLAT_WATER_TILE && IsTileOnWater(ti->tile)) {
 			DrawWaterClassGround(ti);
 		} else {
-			DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GENERAL_SPRITE_COLOUR(rnd_colour)));
+			DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GetColourPalette(rnd_colour)));
 		}
 	}
 
-	DrawNewGRFTileSeq(ti, dts, TO_INDUSTRIES, stage, GENERAL_SPRITE_COLOUR(rnd_colour));
+	DrawNewGRFTileSeq(ti, &dts, TO_INDUSTRIES, stage, GetColourPalette(rnd_colour));
 }
 
-uint16_t GetIndustryTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, IndustryGfx gfx_id, Industry *industry, TileIndex tile)
+uint16_t GetIndustryTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, IndustryGfx gfx_id, Industry *industry, TileIndex tile, std::span<int32_t> regs100)
 {
 	assert(industry != nullptr && IsValidTile(tile));
 	assert(industry->index == IndustryID::Invalid() || IsTileType(tile, MP_INDUSTRY));
 
 	IndustryTileResolverObject object(gfx_id, tile, industry, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 bool DrawNewIndustryTile(TileInfo *ti, Industry *i, IndustryGfx gfx, const IndustryTileSpec *inds)
@@ -205,13 +203,14 @@ bool DrawNewIndustryTile(TileInfo *ti, Industry *i, IndustryGfx gfx, const Indus
 
 	IndustryTileResolverObject object(gfx, ti->tile, i);
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_TILELAYOUT) return false;
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) return false;
 
 	/* Limit the building stage to the number of stages supplied. */
-	const TileLayoutSpriteGroup *tlgroup = (const TileLayoutSpriteGroup *)group;
 	uint8_t stage = GetIndustryConstructionStage(ti->tile);
-	IndustryDrawTileLayout(ti, tlgroup, i->random_colour, stage);
+	auto processor = group->ProcessRegisters(object, &stage);
+	auto dts = processor.GetLayout();
+	IndustryDrawTileLayout(ti, dts, i->random_colour, stage);
 	return true;
 }
 
@@ -240,7 +239,8 @@ CommandCost PerformIndustryTileSlopeCheck(TileIndex ind_base_tile, TileIndex ind
 	ind.random = initial_random_bits;
 	ind.founder = founder;
 
-	uint16_t callback_res = GetIndustryTileCallback(CBID_INDTILE_SHAPE_CHECK, 0, creation_type << 8 | (uint32_t)layout_index, gfx, &ind, ind_tile);
+	std::array<int32_t, 16> regs100;
+	uint16_t callback_res = GetIndustryTileCallback(CBID_INDTILE_SHAPE_CHECK, 0, creation_type << 8 | static_cast<uint32_t>(layout_index), gfx, &ind, ind_tile, regs100);
 	if (callback_res == CALLBACK_FAILED) {
 		if (!IsSlopeRefused(GetTileSlope(ind_tile), its->slopes_refused)) return CommandCost();
 		return CommandCost(STR_ERROR_SITE_UNSUITABLE);
@@ -250,7 +250,7 @@ CommandCost PerformIndustryTileSlopeCheck(TileIndex ind_base_tile, TileIndex ind
 		return CommandCost(STR_ERROR_SITE_UNSUITABLE);
 	}
 
-	return GetErrorMessageFromLocationCallbackResult(callback_res, its->grf_prop.grffile, STR_ERROR_SITE_UNSUITABLE);
+	return GetErrorMessageFromLocationCallbackResult(callback_res, regs100, its->grf_prop.grffile, STR_ERROR_SITE_UNSUITABLE);
 }
 
 /* Simple wrapper for GetHouseCallback to keep the animation unified. */
@@ -262,7 +262,7 @@ uint16_t GetSimpleIndustryCallback(CallbackID callback, uint32_t param1, uint32_
 /** Helper class for animation control. */
 struct IndustryAnimationBase : public AnimationBase<IndustryAnimationBase, IndustryTileSpec, Industry, int, GetSimpleIndustryCallback, TileAnimationFrameAnimationHelper<Industry> > {
 	static constexpr CallbackID cb_animation_speed      = CBID_INDTILE_ANIMATION_SPEED;
-	static constexpr CallbackID cb_animation_next_frame = CBID_INDTILE_ANIM_NEXT_FRAME;
+	static constexpr CallbackID cb_animation_next_frame = CBID_INDTILE_ANIMATION_NEXT_FRAME;
 
 	static constexpr IndustryTileCallbackMask cbm_animation_speed      = IndustryTileCallbackMask::AnimationSpeed;
 	static constexpr IndustryTileCallbackMask cbm_animation_next_frame = IndustryTileCallbackMask::AnimationNextFrame;
@@ -276,23 +276,34 @@ void AnimateNewIndustryTile(TileIndex tile)
 	IndustryAnimationBase::AnimateTile(itspec, Industry::GetByTile(tile), tile, itspec->special_flags.Test(IndustryTileSpecialFlag::NextFrameRandomBits));
 }
 
-bool StartStopIndustryTileAnimation(TileIndex tile, IndustryAnimationTrigger iat, uint32_t random)
+static bool DoTriggerIndustryTileAnimation(TileIndex tile, IndustryAnimationTrigger iat, uint32_t random, uint32_t var18_extra = 0)
 {
 	const IndustryTileSpec *itspec = GetIndustryTileSpec(GetIndustryGfx(tile));
+	if (!itspec->animation.triggers.Test(iat)) return false;
 
-	if (!HasBit(itspec->animation.triggers, iat)) return false;
-
-	IndustryAnimationBase::ChangeAnimationFrame(CBID_INDTILE_ANIM_START_STOP, itspec, Industry::GetByTile(tile), tile, random, iat);
+	IndustryAnimationBase::ChangeAnimationFrame(CBID_INDTILE_ANIMATION_TRIGGER, itspec, Industry::GetByTile(tile), tile, random, to_underlying(iat) | var18_extra);
 	return true;
 }
 
-bool StartStopIndustryTileAnimation(const Industry *ind, IndustryAnimationTrigger iat)
+bool TriggerIndustryTileAnimation_ConstructionStageChanged(TileIndex tile, bool first_call)
+{
+	auto iat = IndustryAnimationTrigger::ConstructionStageChanged;
+	return DoTriggerIndustryTileAnimation(tile, iat, Random(), first_call ? 0x100 : 0);
+}
+
+bool TriggerIndustryTileAnimation(TileIndex tile, IndustryAnimationTrigger iat)
+{
+	assert(iat != IndustryAnimationTrigger::ConstructionStageChanged);
+	return DoTriggerIndustryTileAnimation(tile, iat, Random());
+}
+
+bool TriggerIndustryAnimation(const Industry *ind, IndustryAnimationTrigger iat)
 {
 	bool ret = true;
 	uint32_t random = Random();
 	for (TileIndex tile : ind->location) {
 		if (ind->TileBelongsToIndustry(tile)) {
-			if (StartStopIndustryTileAnimation(tile, iat, random)) {
+			if (DoTriggerIndustryTileAnimation(tile, iat, random)) {
 				SB(random, 0, 16, Random());
 			} else {
 				ret = false;
@@ -310,24 +321,26 @@ bool StartStopIndustryTileAnimation(const Industry *ind, IndustryAnimationTrigge
  * @param ind Industry of the tile.
  * @param[in,out] reseed_industry Collects bits to reseed for the industry.
  */
-static void DoTriggerIndustryTile(TileIndex tile, IndustryTileTrigger trigger, Industry *ind, uint32_t &reseed_industry)
+static void DoTriggerIndustryTileRandomisation(TileIndex tile, IndustryRandomTrigger trigger, Industry *ind, uint32_t &reseed_industry)
 {
 	assert(IsValidTile(tile) && IsTileType(tile, MP_INDUSTRY));
 
 	IndustryGfx gfx = GetIndustryGfx(tile);
 	const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);
 
-	if (itspec->grf_prop.GetSpriteGroup() == nullptr) return;
+	if (!itspec->grf_prop.HasSpriteGroups()) return;
 
 	IndustryTileResolverObject object(gfx, tile, ind, CBID_RANDOM_TRIGGER);
-	object.waiting_triggers = GetIndustryTriggers(tile) | trigger;
-	SetIndustryTriggers(tile, object.waiting_triggers); // store now for var 5F
+	auto waiting_random_triggers = GetIndustryRandomTriggers(tile);
+	waiting_random_triggers.Set(trigger);
+	SetIndustryRandomTriggers(tile, waiting_random_triggers); // store now for var 5F
+	object.SetWaitingRandomTriggers(waiting_random_triggers);
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr) return;
+	object.ResolveRerandomisation();
 
 	/* Store remaining triggers. */
-	SetIndustryTriggers(tile, object.GetRemainingTriggers());
+	waiting_random_triggers.Reset(object.GetUsedRandomTriggers());
+	SetIndustryRandomTriggers(tile, waiting_random_triggers);
 
 	/* Rerandomise tile bits */
 	uint8_t new_random_bits = Random();
@@ -359,11 +372,11 @@ static void DoReseedIndustry(Industry *ind, uint32_t reseed)
  * @param tile Industry tile to trigger.
  * @param trigger Trigger to trigger.
  */
-void TriggerIndustryTile(TileIndex tile, IndustryTileTrigger trigger)
+void TriggerIndustryTileRandomisation(TileIndex tile, IndustryRandomTrigger trigger)
 {
 	uint32_t reseed_industry = 0;
 	Industry *ind = Industry::GetByTile(tile);
-	DoTriggerIndustryTile(tile, trigger, ind, reseed_industry);
+	DoTriggerIndustryTileRandomisation(tile, trigger, ind, reseed_industry);
 	DoReseedIndustry(ind, reseed_industry);
 }
 
@@ -372,12 +385,12 @@ void TriggerIndustryTile(TileIndex tile, IndustryTileTrigger trigger)
  * @param ind Industry to trigger.
  * @param trigger Trigger to trigger.
  */
-void TriggerIndustry(Industry *ind, IndustryTileTrigger trigger)
+void TriggerIndustryRandomisation(Industry *ind, IndustryRandomTrigger trigger)
 {
 	uint32_t reseed_industry = 0;
 	for (TileIndex tile : ind->location) {
 		if (ind->TileBelongsToIndustry(tile)) {
-			DoTriggerIndustryTile(tile, trigger, ind, reseed_industry);
+			DoTriggerIndustryTileRandomisation(tile, trigger, ind, reseed_industry);
 		}
 	}
 	DoReseedIndustry(ind, reseed_industry);
diff --git a/src/newgrf_industrytiles.h b/src/newgrf_industrytiles.h
index 3a10d72c96..358b12eb13 100644
--- a/src/newgrf_industrytiles.h
+++ b/src/newgrf_industrytiles.h
@@ -32,11 +32,11 @@ struct IndustryTileScopeResolver : public ScopeResolver {
 
 	uint32_t GetRandomBits() const override;
 	uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const override;
-	uint32_t GetTriggers() const override;
+	uint32_t GetRandomTriggers() const override;
 };
 
 /** Resolver for industry tiles. */
-struct IndustryTileResolverObject : public ResolverObject {
+struct IndustryTileResolverObject : public SpecializedResolverObject<IndustryRandomTriggers> {
 	IndustryTileScopeResolver indtile_scope; ///< Scope resolver for the industry tile.
 	IndustriesScopeResolver ind_scope;       ///< Scope resolver for the industry owning the tile.
 	IndustryGfx gfx;
@@ -58,21 +58,15 @@ struct IndustryTileResolverObject : public ResolverObject {
 };
 
 bool DrawNewIndustryTile(TileInfo *ti, Industry *i, IndustryGfx gfx, const IndustryTileSpec *inds);
-uint16_t GetIndustryTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, IndustryGfx gfx_id, Industry *industry, TileIndex tile);
+uint16_t GetIndustryTileCallback(CallbackID callback, uint32_t param1, uint32_t param2, IndustryGfx gfx_id, Industry *industry, TileIndex tile, std::span<int32_t> regs100 = {});
 CommandCost PerformIndustryTileSlopeCheck(TileIndex ind_base_tile, TileIndex ind_tile, const IndustryTileSpec *its, IndustryType type, IndustryGfx gfx, size_t layout_index, uint16_t initial_random_bits, Owner founder, IndustryAvailabilityCallType creation_type);
 
 void AnimateNewIndustryTile(TileIndex tile);
-bool StartStopIndustryTileAnimation(TileIndex tile, IndustryAnimationTrigger iat, uint32_t random = Random());
-bool StartStopIndustryTileAnimation(const Industry *ind, IndustryAnimationTrigger iat);
+bool TriggerIndustryTileAnimation(TileIndex tile, IndustryAnimationTrigger iat);
+bool TriggerIndustryTileAnimation_ConstructionStageChanged(TileIndex tile, bool first_call);
+bool TriggerIndustryAnimation(const Industry *ind, IndustryAnimationTrigger iat);
 
-
-/** Available industry tile triggers. */
-enum IndustryTileTrigger : uint8_t {
-	INDTILE_TRIGGER_TILE_LOOP       = 0x01, ///< The tile of the industry has been triggered during the tileloop.
-	INDUSTRY_TRIGGER_INDUSTRY_TICK  = 0x02, ///< The industry has been triggered via its tick.
-	INDUSTRY_TRIGGER_RECEIVED_CARGO = 0x04, ///< Cargo has been delivered.
-};
-void TriggerIndustryTile(TileIndex t, IndustryTileTrigger trigger);
-void TriggerIndustry(Industry *ind, IndustryTileTrigger trigger);
+void TriggerIndustryTileRandomisation(TileIndex t, IndustryRandomTrigger trigger);
+void TriggerIndustryRandomisation(Industry *ind, IndustryRandomTrigger trigger);
 
 #endif /* NEWGRF_INDUSTRYTILES_H */
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp
index c44ddaa12e..52963dc007 100644
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -225,15 +225,16 @@ static uint32_t GetClosestObject(TileIndex tile, ObjectType type, const Object *
 
 /**
  * Implementation of var 65
+ * @param object ResolverObject owning the temporary storage.
  * @param local_id Parameter given to the callback, which is the set id, or the local id, in our terminology.
  * @param grfid    The object's GRFID.
  * @param tile     The tile to look from.
  * @param current  Object for which the inquiry is made
  * @return The formatted answer to the callback : rr(reserved) cc(count) dddd(manhattan distance of closest sister)
  */
-static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t local_id, uint32_t grfid, TileIndex tile, const Object *current)
+static uint32_t GetCountAndDistanceOfClosestInstance(const ResolverObject &object, uint8_t local_id, uint32_t grfid, TileIndex tile, const Object *current)
 {
-	uint32_t grf_id = GetRegister(0x100);  // Get the GRFID of the definition to look for in register 100h
+	uint32_t grf_id = static_cast<uint32_t>(object.GetRegister(0x100)); // Get the GRFID of the definition to look for in register 100h
 	uint32_t idx;
 
 	/* Determine what will be the object type to look for */
@@ -331,7 +332,7 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t local_id, uint32_t
 		case 0x44: return GetTileOwner(this->tile).base();
 
 		/* Get town zone and Manhattan distance of closest town */
-		case 0x45: return GetTownRadiusGroup(t, this->tile) << 16 | ClampTo<uint16_t>(DistanceManhattan(this->tile, t->xy));
+		case 0x45: return to_underlying(GetTownRadiusGroup(t, this->tile)) << 16 | ClampTo<uint16_t>(DistanceManhattan(this->tile, t->xy));
 
 		/* Get square of Euclidean distance of closest town */
 		case 0x46: return DistanceSquare(this->tile, t->xy);
@@ -361,7 +362,7 @@ static uint32_t GetCountAndDistanceOfClosestInstance(uint8_t local_id, uint32_t
 		}
 
 		/* Count of object, distance of closest instance */
-		case 0x64: return GetCountAndDistanceOfClosestInstance(parameter, this->ro.grffile->grfid, this->tile, this->obj);
+		case 0x64: return GetCountAndDistanceOfClosestInstance(this->ro, parameter, this->ro.grffile->grfid, this->tile, this->obj);
 
 		case 0x7A: return GetBadgeVariableResult(*this->ro.grffile, this->spec->badges, parameter);
 	}
@@ -386,8 +387,7 @@ ObjectResolverObject::ObjectResolverObject(const ObjectSpec *spec, Object *obj,
 		CallbackID callback, uint32_t param1, uint32_t param2)
 	: ResolverObject(spec->grf_prop.grffile, callback, param1, param2), object_scope(*this, obj, spec, tile, view)
 {
-	this->root_spritegroup = (obj == nullptr) ? spec->grf_prop.GetSpriteGroup(OBJECT_SPRITE_GROUP_PURCHASE) : nullptr;
-	if (this->root_spritegroup == nullptr) this->root_spritegroup = spec->grf_prop.GetSpriteGroup(OBJECT_SPRITE_GROUP_DEFAULT);
+	this->root_spritegroup = spec->grf_prop.GetSpriteGroup(obj != nullptr);
 }
 
 /**
@@ -429,27 +429,27 @@ uint32_t ObjectResolverObject::GetDebugID() const
  * @param o        The object to call the callback for.
  * @param tile     The tile the callback is called for.
  * @param view     The view of the object (only used when o == nullptr).
+ * @param[out] regs100 Additional result values from registers 100+
  * @return The result of the callback.
  */
-uint16_t GetObjectCallback(CallbackID callback, uint32_t param1, uint32_t param2, const ObjectSpec *spec, Object *o, TileIndex tile, uint8_t view)
+uint16_t GetObjectCallback(CallbackID callback, uint32_t param1, uint32_t param2, const ObjectSpec *spec, Object *o, TileIndex tile, std::span<int32_t> regs100, uint8_t view)
 {
 	ObjectResolverObject object(spec, o, tile, view, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
  * Draw an group of sprites on the map.
  * @param ti    Information about the tile to draw on.
- * @param group The group of sprites to draw.
+ * @param dts   The sprite layout to draw.
  * @param spec  Object spec to draw.
  */
-static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, const ObjectSpec *spec)
+static void DrawTileLayout(const TileInfo *ti, const DrawTileSpriteSpan &dts, const ObjectSpec *spec)
 {
-	const DrawTileSprites *dts = group->ProcessRegisters(nullptr);
 	PaletteID palette = (spec->flags.Test(ObjectFlag::Uses2CC) ? SPR_2CCMAP_BASE : PALETTE_RECOLOUR_START) + Object::GetByTile(ti->tile)->colour;
 
-	SpriteID image = dts->ground.sprite;
-	PaletteID pal  = dts->ground.pal;
+	SpriteID image = dts.ground.sprite;
+	PaletteID pal = dts.ground.pal;
 
 	if (GB(image, 0, SPRITE_WIDTH) != 0) {
 		/* If the ground sprite is the default flat water sprite, draw also canal/river borders
@@ -461,7 +461,7 @@ static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *grou
 		}
 	}
 
-	DrawNewGRFTileSeq(ti, dts, TO_STRUCTURES, 0, palette);
+	DrawNewGRFTileSeq(ti, &dts, TO_STRUCTURES, 0, palette);
 }
 
 /**
@@ -474,10 +474,12 @@ void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec)
 	Object *o = Object::GetByTile(ti->tile);
 	ObjectResolverObject object(spec, o, ti->tile);
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_TILELAYOUT) return;
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) return;
 
-	DrawTileLayout(ti, (const TileLayoutSpriteGroup *)group, spec);
+	auto processor = group->ProcessRegisters(object, nullptr);
+	auto dts = processor.GetLayout();
+	DrawTileLayout(ti, dts, spec);
 }
 
 /**
@@ -490,10 +492,11 @@ void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec)
 void DrawNewObjectTileInGUI(int x, int y, const ObjectSpec *spec, uint8_t view)
 {
 	ObjectResolverObject object(spec, nullptr, INVALID_TILE, view);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_TILELAYOUT) return;
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) return;
 
-	const DrawTileSprites *dts = ((const TileLayoutSpriteGroup *)group)->ProcessRegisters(nullptr);
+	auto processor = group->ProcessRegisters(object, nullptr);
+	auto dts = processor.GetLayout();
 
 	PaletteID palette;
 	if (Company::IsValidID(_local_company)) {
@@ -502,21 +505,21 @@ void DrawNewObjectTileInGUI(int x, int y, const ObjectSpec *spec, uint8_t view)
 			const Livery &l = Company::Get(_local_company)->livery[0];
 			palette = SPR_2CCMAP_BASE + l.colour1 + l.colour2 * 16;
 		} else {
-			palette = COMPANY_SPRITE_COLOUR(_local_company);
+			palette = GetCompanyPalette(_local_company);
 		}
 	} else {
 		/* There's no company, so just take the base palette. */
 		palette = spec->flags.Test(ObjectFlag::Uses2CC) ? SPR_2CCMAP_BASE : PALETTE_RECOLOUR_START;
 	}
 
-	SpriteID image = dts->ground.sprite;
-	PaletteID pal  = dts->ground.pal;
+	SpriteID image = dts.ground.sprite;
+	PaletteID pal = dts.ground.pal;
 
 	if (GB(image, 0, SPRITE_WIDTH) != 0) {
 		DrawSprite(image, GroundSpritePaletteTransform(image, pal, palette), x, y);
 	}
 
-	DrawNewGRFTileSeqInGUI(x, y, dts, 0, palette);
+	DrawNewGRFTileSeqInGUI(x, y, &dts, 0, palette);
 }
 
 /**
@@ -555,6 +558,14 @@ void AnimateNewObjectTile(TileIndex tile)
 	ObjectAnimationBase::AnimateTile(spec, Object::GetByTile(tile), tile, spec->flags.Test(ObjectFlag::AnimRandomBits));
 }
 
+static bool DoTriggerObjectTileAnimation(Object *o, TileIndex tile, ObjectAnimationTrigger trigger, const ObjectSpec *spec, uint32_t random, uint32_t var18_extra = 0)
+{
+	if (!spec->animation.triggers.Test(trigger)) return false;
+
+	ObjectAnimationBase::ChangeAnimationFrame(CBID_OBJECT_ANIMATION_TRIGGER, spec, o, tile, random, to_underlying(trigger) | var18_extra);
+	return true;
+}
+
 /**
  * Trigger the update of animation on a single tile.
  * @param o       The object that got triggered.
@@ -562,11 +573,9 @@ void AnimateNewObjectTile(TileIndex tile)
  * @param trigger The trigger that is triggered.
  * @param spec    The spec associated with the object.
  */
-void TriggerObjectTileAnimation(Object *o, TileIndex tile, ObjectAnimationTrigger trigger, const ObjectSpec *spec)
+bool TriggerObjectTileAnimation(Object *o, TileIndex tile, ObjectAnimationTrigger trigger, const ObjectSpec *spec)
 {
-	if (!HasBit(spec->animation.triggers, trigger)) return;
-
-	ObjectAnimationBase::ChangeAnimationFrame(CBID_OBJECT_ANIMATION_START_STOP, spec, o, tile, Random(), trigger);
+	return DoTriggerObjectTileAnimation(o, tile, trigger, spec, Random());
 }
 
 /**
@@ -575,11 +584,19 @@ void TriggerObjectTileAnimation(Object *o, TileIndex tile, ObjectAnimationTrigge
  * @param trigger The trigger that is triggered.
  * @param spec    The spec associated with the object.
  */
-void TriggerObjectAnimation(Object *o, ObjectAnimationTrigger trigger, const ObjectSpec *spec)
+bool TriggerObjectAnimation(Object *o, ObjectAnimationTrigger trigger, const ObjectSpec *spec)
 {
-	if (!HasBit(spec->animation.triggers, trigger)) return;
+	if (!spec->animation.triggers.Test(trigger)) return false;
 
+	bool ret = true;
+	uint32_t random = Random();
 	for (TileIndex tile : o->location) {
-		TriggerObjectTileAnimation(o, tile, trigger, spec);
+		if (DoTriggerObjectTileAnimation(o, tile, trigger, spec, random)) {
+			SB(random, 0, 16, Random());
+		} else {
+			ret = false;
+		}
 	}
+
+	return ret;
 }
diff --git a/src/newgrf_object.h b/src/newgrf_object.h
index 74cf12e629..e49d355576 100644
--- a/src/newgrf_object.h
+++ b/src/newgrf_object.h
@@ -58,9 +58,9 @@ DECLARE_INCREMENT_DECREMENT_OPERATORS(ObjectClassID)
  * default objects in table/object_land.h
  */
 struct ObjectSpec : NewGRFSpecBase<ObjectClassID> {
-	/* 2 because of the "normal" and "buy" sprite stacks. */
-	FixedGRFFileProps<2> grf_prop; ///< Properties related the the grf file
-	AnimationInfo animation;      ///< Information about the animation.
+	StandardGRFFileProps grf_prop; ///< Properties related the the grf file
+	/* Animation speed default differs from other features */
+	AnimationInfo<ObjectAnimationTriggers> animation{0, AnimationStatus::NoAnimation, 0, {}};  ///< Information about the animation.
 	StringID name;                ///< The name for this object.
 
 	LandscapeTypes climate; ///< In which climates is this object available?
@@ -165,15 +165,12 @@ private:
 /** Class containing information relating to object classes. */
 using ObjectClass = NewGRFClass<ObjectSpec, ObjectClassID, OBJECT_CLASS_MAX>;
 
-static const size_t OBJECT_SPRITE_GROUP_DEFAULT = 0;
-static const size_t OBJECT_SPRITE_GROUP_PURCHASE = 1;
-
-uint16_t GetObjectCallback(CallbackID callback, uint32_t param1, uint32_t param2, const ObjectSpec *spec, Object *o, TileIndex tile, uint8_t view = 0);
+uint16_t GetObjectCallback(CallbackID callback, uint32_t param1, uint32_t param2, const ObjectSpec *spec, Object *o, TileIndex tile, std::span<int32_t> regs100 = {}, uint8_t view = 0);
 
 void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec);
 void DrawNewObjectTileInGUI(int x, int y, const ObjectSpec *spec, uint8_t view);
 void AnimateNewObjectTile(TileIndex tile);
-void TriggerObjectTileAnimation(Object *o, TileIndex tile, ObjectAnimationTrigger trigger, const ObjectSpec *spec);
-void TriggerObjectAnimation(Object *o, ObjectAnimationTrigger trigger, const ObjectSpec *spec);
+bool TriggerObjectTileAnimation(Object *o, TileIndex tile, ObjectAnimationTrigger trigger, const ObjectSpec *spec);
+bool TriggerObjectAnimation(Object *o, ObjectAnimationTrigger trigger, const ObjectSpec *spec);
 
 #endif /* NEWGRF_OBJECT_H */
diff --git a/src/newgrf_profiling.cpp b/src/newgrf_profiling.cpp
index 4e0cfec0f9..6426b4dd53 100644
--- a/src/newgrf_profiling.cpp
+++ b/src/newgrf_profiling.cpp
@@ -7,6 +7,8 @@
 
  /** @file newgrf_profiling.cpp Profiling of NewGRF action 2 handling. */
 
+#include "stdafx.h"
+
 #include "newgrf_profiling.h"
 #include "fileio_func.h"
 #include "string_func.h"
@@ -18,6 +20,7 @@
 
 #include <chrono>
 
+#include "safeguards.h"
 
 std::vector<NewGRFProfiler> _newgrf_profilers;
 
@@ -57,20 +60,28 @@ void NewGRFProfiler::BeginResolve(const ResolverObject &resolver)
 /**
  * Capture the completion of a sprite group resolution.
  */
-void NewGRFProfiler::EndResolve(const SpriteGroup *result)
+void NewGRFProfiler::EndResolve(const ResolverResult &result)
 {
 	using namespace std::chrono;
 	this->cur_call.time = (uint32_t)time_point_cast<microseconds>(high_resolution_clock::now()).time_since_epoch().count() - this->cur_call.time;
 
-	if (result == nullptr) {
-		this->cur_call.result = 0;
-	} else if (result->type == SGT_CALLBACK) {
-		this->cur_call.result = static_cast<const CallbackResultSpriteGroup *>(result)->result;
-	} else if (result->type == SGT_RESULT) {
-		this->cur_call.result = GetSpriteLocalID(static_cast<const ResultSpriteGroup *>(result)->sprite);
-	} else {
-		this->cur_call.result = result->nfo_line;
-	}
+	struct visitor {
+		uint32_t operator()(std::monostate)
+		{
+			return 0;
+		}
+		uint32_t operator()(CallbackResult cb_result)
+		{
+			return cb_result;
+		}
+		uint32_t operator()(const SpriteGroup *group)
+		{
+			if (group == nullptr) return 0;
+			if (group->type != SGT_RESULT) return group->nfo_line;
+			return GetSpriteLocalID(static_cast<const ResultSpriteGroup *>(group)->sprite);
+		}
+	};
+	this->cur_call.result = std::visit(visitor{}, result);
 
 	this->calls.push_back(this->cur_call);
 }
diff --git a/src/newgrf_profiling.h b/src/newgrf_profiling.h
index b08f7bda3a..89b1222cc9 100644
--- a/src/newgrf_profiling.h
+++ b/src/newgrf_profiling.h
@@ -10,7 +10,6 @@
 #ifndef NEWGRF_PROFILING_H
 #define NEWGRF_PROFILING_H
 
-#include "stdafx.h"
 #include "timer/timer_game_calendar.h"
 #include "newgrf.h"
 #include "newgrf_callbacks.h"
@@ -25,7 +24,7 @@ struct NewGRFProfiler {
 	~NewGRFProfiler();
 
 	void BeginResolve(const ResolverObject &resolver);
-	void EndResolve(const SpriteGroup *result);
+	void EndResolve(const ResolverResult &result);
 	void RecursiveResolve();
 
 	void Start();
diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp
index 8c4b5b8a1d..0d215971b8 100644
--- a/src/newgrf_railtype.cpp
+++ b/src/newgrf_railtype.cpp
@@ -11,6 +11,7 @@
 #include "core/container_func.hpp"
 #include "debug.h"
 #include "newgrf_railtype.h"
+#include "newgrf_roadtype.h"
 #include "timer/timer_game_calendar.h"
 #include "depot_base.h"
 #include "town.h"
@@ -32,7 +33,13 @@
 			case 0x41: return 0;
 			case 0x42: return 0;
 			case 0x43: return TimerGameCalendar::date.base();
-			case 0x44: return HZB_TOWN_EDGE;
+			case 0x44: return to_underlying(HouseZone::TownEdge);
+			case 0x45: {
+				auto rt = GetRailTypeInfoIndex(this->rti);
+				uint8_t local = GetReverseRailTypeTranslation(rt, this->ro.grffile);
+				if (local == 0xFF) local = 0xFE;
+				return 0xFFFF | local << 16;
+			}
 		}
 	}
 
@@ -50,8 +57,10 @@
 			} else if (IsLevelCrossingTile(this->tile)) {
 				t = ClosestTownFromTile(this->tile, UINT_MAX);
 			}
-			return t != nullptr ? GetTownRadiusGroup(t, this->tile) : HZB_TOWN_EDGE;
+			return to_underlying(t != nullptr ? GetTownRadiusGroup(t, this->tile) : HouseZone::TownEdge);
 		}
+		case 0x45:
+			return GetTrackTypes(this->tile, ro.grffile);
 	}
 
 	Debug(grf, 1, "Unhandled rail type tile variable 0x{:X}", variable);
@@ -101,12 +110,12 @@ SpriteID GetCustomRailSprite(const RailTypeInfo *rti, TileIndex tile, RailTypeSp
 	if (rti->group[rtsg] == nullptr) return 0;
 
 	RailTypeResolverObject object(rti, tile, context, rtsg);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->GetNumResults() == 0) return 0;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return 0;
 
-	if (num_results) *num_results = group->GetNumResults();
+	if (num_results) *num_results = group->num_sprites;
 
-	return group->GetResult();
+	return group->sprite;
 }
 
 /**
@@ -127,10 +136,10 @@ SpriteID GetCustomSignalSprite(const RailTypeInfo *rti, TileIndex tile, SignalTy
 	uint32_t param2 = (type << 16) | (var << 8) | state;
 	RailTypeResolverObject object(rti, tile, TCX_NORMAL, RTSG_SIGNALS, param1, param2);
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->GetNumResults() == 0) return 0;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return 0;
 
-	return group->GetResult();
+	return group->sprite;
 }
 
 /**
diff --git a/src/newgrf_roadstop.cpp b/src/newgrf_roadstop.cpp
index 188c93bde0..02db3fa33d 100644
--- a/src/newgrf_roadstop.cpp
+++ b/src/newgrf_roadstop.cpp
@@ -21,6 +21,7 @@
 #include "window_type.h"
 #include "timer/timer_game_calendar.h"
 #include "town.h"
+#include "tile_cmd.h"
 #include "viewport_func.h"
 #include "newgrf_animation_base.h"
 #include "newgrf_sound.h"
@@ -63,9 +64,9 @@ uint32_t RoadStopScopeResolver::GetRandomBits() const
 	return bits;
 }
 
-uint32_t RoadStopScopeResolver::GetTriggers() const
+uint32_t RoadStopScopeResolver::GetRandomTriggers() const
 {
-	return this->st == nullptr ? 0 : this->st->waiting_triggers;
+	return this->st == nullptr ? 0 : this->st->waiting_random_triggers.base();
 }
 
 uint32_t RoadStopScopeResolver::GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const
@@ -105,9 +106,9 @@ uint32_t RoadStopScopeResolver::GetVariable(uint8_t variable, [[maybe_unused]] u
 
 		/* Town zone and Manhattan distance of closest town */
 		case 0x45: {
-			if (this->tile == INVALID_TILE) return HZB_TOWN_EDGE << 16;
+			if (this->tile == INVALID_TILE) return to_underlying(HouseZone::TownEdge) << 16;
 			const Town *t = (this->st == nullptr) ? ClosestTownFromTile(this->tile, UINT_MAX) : this->st->town;
-			return t != nullptr ? (GetTownRadiusGroup(t, this->tile) << 16 | ClampTo<uint16_t>(DistanceManhattan(this->tile, t->xy))) : HZB_TOWN_EDGE << 16;
+			return t != nullptr ? (to_underlying(GetTownRadiusGroup(t, this->tile)) << 16 | ClampTo<uint16_t>(DistanceManhattan(this->tile, t->xy))) : to_underlying(HouseZone::TownEdge) << 16;
 		}
 
 		/* Get square of Euclidean distance of closest town */
@@ -217,23 +218,15 @@ uint32_t RoadStopScopeResolver::GetVariable(uint8_t variable, [[maybe_unused]] u
 	return UINT_MAX;
 }
 
-const SpriteGroup *RoadStopResolverObject::ResolveReal(const RealSpriteGroup *group) const
-{
-	if (group == nullptr) return nullptr;
-
-	return group->loading[0];
-}
-
 RoadStopResolverObject::RoadStopResolverObject(const RoadStopSpec *roadstopspec, BaseStation *st, TileIndex tile, RoadType roadtype, StationType type, uint8_t view,
 		CallbackID callback, uint32_t param1, uint32_t param2)
-	: ResolverObject(roadstopspec->grf_prop.grffile, callback, param1, param2), roadstop_scope(*this, st, roadstopspec, tile, roadtype, type, view)
+	: SpecializedResolverObject<StationRandomTriggers>(roadstopspec->grf_prop.grffile, callback, param1, param2), roadstop_scope(*this, st, roadstopspec, tile, roadtype, type, view)
 {
-	CargoType ctype = SpriteGroupCargo::SG_DEFAULT_NA;
+	CargoType ctype = CargoGRFFileProps::SG_DEFAULT_NA;
 
 	if (st == nullptr) {
 		/* No station, so we are in a purchase list */
-		ctype = SpriteGroupCargo::SG_PURCHASE;
-		this->root_spritegroup = roadstopspec->grf_prop.GetSpriteGroup(ctype);
+		ctype = CargoGRFFileProps::SG_PURCHASE;
 	} else if (Station::IsExpected(st)) {
 		const Station *station = Station::From(st);
 		/* Pick the first cargo that we have waiting */
@@ -244,16 +237,12 @@ RoadStopResolverObject::RoadStopResolverObject(const RoadStopSpec *roadstopspec,
 				break;
 			}
 		}
-
-		if (this->root_spritegroup == nullptr) {
-			ctype = SpriteGroupCargo::SG_DEFAULT_NA;
-			this->root_spritegroup = roadstopspec->grf_prop.GetSpriteGroup(ctype);
-		}
 	}
 
+	this->root_spritegroup = this->roadstop_scope.roadstopspec->grf_prop.GetSpriteGroup(ctype);
 	if (this->root_spritegroup == nullptr) {
-		ctype = SpriteGroupCargo::SG_DEFAULT;
-		this->root_spritegroup = roadstopspec->grf_prop.GetSpriteGroup(ctype);
+		ctype = CargoGRFFileProps::SG_DEFAULT;
+		this->root_spritegroup = this->roadstop_scope.roadstopspec->grf_prop.GetSpriteGroup(ctype);
 	}
 
 	/* Remember the cargo type we've picked */
@@ -275,10 +264,10 @@ TownScopeResolver *RoadStopResolverObject::GetTown()
 	return &*this->town_scope;
 }
 
-uint16_t GetRoadStopCallback(CallbackID callback, uint32_t param1, uint32_t param2, const RoadStopSpec *roadstopspec, BaseStation *st, TileIndex tile, RoadType roadtype, StationType type, uint8_t view)
+uint16_t GetRoadStopCallback(CallbackID callback, uint32_t param1, uint32_t param2, const RoadStopSpec *roadstopspec, BaseStation *st, TileIndex tile, RoadType roadtype, StationType type, uint8_t view, std::span<int32_t> regs100)
 {
 	RoadStopResolverObject object(roadstopspec, st, tile, roadtype, type, view, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
@@ -297,18 +286,19 @@ void DrawRoadStopTile(int x, int y, RoadType roadtype, const RoadStopSpec *spec,
 
 	const RoadTypeInfo *rti = GetRoadTypeInfo(roadtype);
 	RoadStopResolverObject object(spec, nullptr, INVALID_TILE, roadtype, type, view);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_TILELAYOUT) return;
-	const DrawTileSprites *dts = ((const TileLayoutSpriteGroup *)group)->ProcessRegisters(nullptr);
+	const auto *group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) return;
+	auto processor = group->ProcessRegisters(object, nullptr);
+	auto dts = processor.GetLayout();
 
-	PaletteID palette = COMPANY_SPRITE_COLOUR(_local_company);
+	PaletteID palette = GetCompanyPalette(_local_company);
 
-	SpriteID image = dts->ground.sprite;
-	PaletteID pal  = dts->ground.pal;
+	SpriteID image = dts.ground.sprite;
+	PaletteID pal = dts.ground.pal;
 
 	RoadStopDrawModes draw_mode;
 	if (spec->flags.Test(RoadStopSpecFlag::DrawModeRegister)) {
-		draw_mode = static_cast<RoadStopDrawMode>(GetRegister(0x100));
+		draw_mode = static_cast<RoadStopDrawMode>(object.GetRegister(0x100));
 	} else {
 		draw_mode = spec->draw_mode;
 	}
@@ -346,7 +336,18 @@ void DrawRoadStopTile(int x, int y, RoadType roadtype, const RoadStopSpec *spec,
 		}
 	}
 
-	DrawCommonTileSeqInGUI(x, y, dts, 0, 0, palette, true);
+	DrawCommonTileSeqInGUI(x, y, &dts, 0, 0, palette, true);
+}
+
+std::optional<SpriteLayoutProcessor> GetRoadStopLayout(TileInfo *ti, const RoadStopSpec *spec, BaseStation *st, StationType type, int view, std::span<int32_t> regs100)
+{
+	RoadStopResolverObject object(spec, st, ti->tile, INVALID_ROADTYPE, type, view);
+	auto group = object.Resolve<TileLayoutSpriteGroup>();
+	if (group == nullptr) return std::nullopt;
+	for (uint i = 0; i < regs100.size(); ++i) {
+		regs100[i] = object.GetRegister(0x100 + i);
+	}
+	return group->ProcessRegisters(object, nullptr);
 }
 
 /** Wrapper for animation control, see GetRoadStopCallback. */
@@ -363,7 +364,7 @@ struct RoadStopAnimationFrameAnimationHelper {
 /** Helper class for animation control. */
 struct RoadStopAnimationBase : public AnimationBase<RoadStopAnimationBase, RoadStopSpec, BaseStation, int, GetAnimRoadStopCallback, RoadStopAnimationFrameAnimationHelper> {
 	static constexpr CallbackID cb_animation_speed      = CBID_STATION_ANIMATION_SPEED;
-	static constexpr CallbackID cb_animation_next_frame = CBID_STATION_ANIM_NEXT_FRAME;
+	static constexpr CallbackID cb_animation_next_frame = CBID_STATION_ANIMATION_NEXT_FRAME;
 
 	static constexpr RoadStopCallbackMask cbm_animation_speed      = RoadStopCallbackMask::AnimationSpeed;
 	static constexpr RoadStopCallbackMask cbm_animation_next_frame = RoadStopCallbackMask::AnimationNextFrame;
@@ -379,28 +380,25 @@ void AnimateRoadStopTile(TileIndex tile)
 
 void TriggerRoadStopAnimation(BaseStation *st, TileIndex trigger_tile, StationAnimationTrigger trigger, CargoType cargo_type)
 {
-	/* Get Station if it wasn't supplied */
-	if (st == nullptr) st = BaseStation::GetByTile(trigger_tile);
+	assert(st != nullptr);
 
 	/* Check the cached animation trigger bitmask to see if we need
 	 * to bother with any further processing. */
-	if (!HasBit(st->cached_roadstop_anim_triggers, trigger)) return;
+	if (!st->cached_roadstop_anim_triggers.Test(trigger)) return;
 
 	uint16_t random_bits = Random();
 	auto process_tile = [&](TileIndex cur_tile) {
 		const RoadStopSpec *ss = GetRoadStopSpec(cur_tile);
-		if (ss != nullptr && HasBit(ss->animation.triggers, trigger)) {
-			uint8_t local_cargo;
-			if (!IsValidCargoType(cargo_type)) {
-				local_cargo = UINT8_MAX;
-			} else {
-				local_cargo = ss->grf_prop.grffile->cargo_map[cargo_type];
+		if (ss != nullptr && ss->animation.triggers.Test(trigger)) {
+			uint8_t var18_extra = 0;
+			if (IsValidCargoType(cargo_type)) {
+				var18_extra |= ss->grf_prop.grffile->cargo_map[cargo_type] << 8;
 			}
-			RoadStopAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIM_START_STOP, ss, st, cur_tile, (random_bits << 16) | Random(), (uint8_t)trigger | (local_cargo << 8));
+			RoadStopAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIMATION_TRIGGER, ss, st, cur_tile, (random_bits << 16) | GB(Random(), 0, 16), to_underlying(trigger) | var18_extra);
 		}
 	};
 
-	if (trigger == SAT_NEW_CARGO || trigger == SAT_CARGO_TAKEN || trigger == SAT_250_TICKS) {
+	if (trigger == StationAnimationTrigger::NewCargo || trigger == StationAnimationTrigger::CargoTaken || trigger == StationAnimationTrigger::AcceptanceTick) {
 		for (const RoadStopTileData &tile_data : st->custom_roadstop_tile_data) {
 			process_tile(tile_data.tile);
 		}
@@ -417,41 +415,44 @@ void TriggerRoadStopAnimation(BaseStation *st, TileIndex trigger_tile, StationAn
  * @param trigger trigger type
  * @param cargo_type cargo type causing the trigger
  */
-void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoType cargo_type)
+void TriggerRoadStopRandomisation(BaseStation *st, TileIndex tile, StationRandomTrigger trigger, CargoType cargo_type)
 {
-	if (st == nullptr) st = Station::GetByTile(tile);
+	assert(st != nullptr);
 
 	/* Check the cached cargo trigger bitmask to see if we need
-	 * to bother with any further processing. */
+	 * to bother with any further processing.
+	 * Note: cached_roadstop_cargo_triggers must be non-zero even for cargo-independent triggers. */
 	if (st->cached_roadstop_cargo_triggers == 0) return;
 	if (IsValidCargoType(cargo_type) && !HasBit(st->cached_roadstop_cargo_triggers, cargo_type)) return;
 
-	SetBit(st->waiting_triggers, trigger);
+	st->waiting_random_triggers.Set(trigger);
 
 	uint32_t whole_reseed = 0;
 
 	/* Bitmask of completely empty cargo types to be matched. */
-	CargoTypes empty_mask = (trigger == RSRT_CARGO_TAKEN) ? GetEmptyMask(st) : 0;
+	CargoTypes empty_mask{};
+	if (trigger == StationRandomTrigger::CargoTaken) {
+		empty_mask = GetEmptyMask(Station::From(st));
+	}
 
-	uint32_t used_triggers = 0;
+	StationRandomTriggers used_random_triggers;
 	auto process_tile = [&](TileIndex cur_tile) {
 		const RoadStopSpec *ss = GetRoadStopSpec(cur_tile);
 		if (ss == nullptr) return;
 
 		/* Cargo taken "will only be triggered if all of those
 		 * cargo types have no more cargo waiting." */
-		if (trigger == RSRT_CARGO_TAKEN) {
+		if (trigger == StationRandomTrigger::CargoTaken) {
 			if ((ss->cargo_triggers & ~empty_mask) != 0) return;
 		}
 
 		if (!IsValidCargoType(cargo_type) || HasBit(ss->cargo_triggers, cargo_type)) {
 			RoadStopResolverObject object(ss, st, cur_tile, INVALID_ROADTYPE, GetStationType(cur_tile), GetStationGfx(cur_tile));
-			object.waiting_triggers = st->waiting_triggers;
+			object.SetWaitingRandomTriggers(st->waiting_random_triggers);
 
-			const SpriteGroup *group = object.Resolve();
-			if (group == nullptr) return;
+			object.ResolveRerandomisation();
 
-			used_triggers |= object.used_triggers;
+			used_random_triggers.Set(object.GetUsedRandomTriggers());
 
 			uint32_t reseed = object.GetReseedSum();
 			if (reseed != 0) {
@@ -468,7 +469,7 @@ void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTri
 			}
 		}
 	};
-	if (trigger == RSRT_NEW_CARGO || trigger == RSRT_CARGO_TAKEN) {
+	if (trigger == StationRandomTrigger::NewCargo || trigger == StationRandomTrigger::CargoTaken) {
 		for (const RoadStopTileData &tile_data : st->custom_roadstop_tile_data) {
 			process_tile(tile_data.tile);
 		}
@@ -477,7 +478,7 @@ void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTri
 	}
 
 	/* Update whole station random bits */
-	st->waiting_triggers &= ~used_triggers;
+	st->waiting_random_triggers.Reset(used_random_triggers);
 	if ((whole_reseed & 0xFFFF) != 0) {
 		st->random_bits &= ~whole_reseed;
 		st->random_bits |= Random() & whole_reseed;
@@ -526,7 +527,7 @@ bool GetIfClassHasNewStopsByType(const RoadStopClass *roadstopclass, RoadStopTyp
  */
 bool GetIfStopIsForType(const RoadStopSpec *roadstopspec, RoadStopType rs, RoadType roadtype)
 {
-	// The roadstopspec is nullptr, must be the default station, always return true.
+	/* The roadstopspec is nullptr, must be the default station, always return true. */
 	if (roadstopspec == nullptr) return true;
 
 	if (roadstopspec->flags.Test(RoadStopSpecFlag::RoadOnly) && !RoadTypeIsRoad(roadtype)) return false;
@@ -619,7 +620,7 @@ void DeallocateSpecFromRoadStop(BaseStation *st, uint8_t specindex)
 			st->roadstop_speclist.resize(num_specs + 1);
 		} else {
 			st->roadstop_speclist.clear();
-			st->cached_roadstop_anim_triggers = 0;
+			st->cached_roadstop_anim_triggers = {};
 			st->cached_roadstop_cargo_triggers = 0;
 			return;
 		}
@@ -634,14 +635,14 @@ void DeallocateSpecFromRoadStop(BaseStation *st, uint8_t specindex)
  */
 void RoadStopUpdateCachedTriggers(BaseStation *st)
 {
-	st->cached_roadstop_anim_triggers = 0;
+	st->cached_roadstop_anim_triggers = {};
 	st->cached_roadstop_cargo_triggers = 0;
 
 	/* Combine animation trigger bitmask for all road stop specs
 	 * of this station. */
 	for (const auto &sm : GetStationSpecList<RoadStopSpec>(st)) {
 		if (sm.spec == nullptr) continue;
-		st->cached_roadstop_anim_triggers |= sm.spec->animation.triggers;
+		st->cached_roadstop_anim_triggers.Set(sm.spec->animation.triggers);
 		st->cached_roadstop_cargo_triggers |= sm.spec->cargo_triggers;
 	}
 }
diff --git a/src/newgrf_roadstop.h b/src/newgrf_roadstop.h
index ebc96cdb0c..690c9adadb 100644
--- a/src/newgrf_roadstop.h
+++ b/src/newgrf_roadstop.h
@@ -21,6 +21,8 @@
 #include "newgrf_town.h"
 #include "road.h"
 
+struct TileInfo;
+
 /** The maximum amount of roadstops a single GRF is allowed to add */
 static const int NUM_ROADSTOPS_PER_GRF = UINT16_MAX - 1;
 
@@ -35,15 +37,6 @@ enum RoadStopClassID : uint16_t {
 };
 DECLARE_INCREMENT_DECREMENT_OPERATORS(RoadStopClassID)
 
-/* Some Triggers etc. */
-enum RoadStopRandomTrigger : uint8_t {
-	RSRT_NEW_CARGO,       ///< Trigger roadstop on arrival of new cargo.
-	RSRT_CARGO_TAKEN,     ///< Trigger roadstop when cargo is completely taken.
-	RSRT_VEH_ARRIVES,     ///< Trigger roadstop when road vehicle arrives.
-	RSRT_VEH_DEPARTS,     ///< Trigger roadstop when road vehicle leaves.
-	RSRT_VEH_LOADS,       ///< Trigger roadstop when road vehicle loads.
-};
-
 /**
  * Various different options for availability, restricting
  * the roadstop to be only for busses or for trucks.
@@ -103,13 +96,13 @@ struct RoadStopScopeResolver : public ScopeResolver {
 	}
 
 	uint32_t GetRandomBits() const override;
-	uint32_t GetTriggers() const override;
+	uint32_t GetRandomTriggers() const override;
 
 	uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const override;
 };
 
 /** Road stop resolver. */
-struct RoadStopResolverObject : public ResolverObject {
+struct RoadStopResolverObject : public SpecializedResolverObject<StationRandomTriggers> {
 	RoadStopScopeResolver roadstop_scope; ///< The stop scope resolver.
 	std::optional<TownScopeResolver> town_scope = std::nullopt; ///< The town scope resolver (created on the first call).
 
@@ -129,19 +122,11 @@ struct RoadStopResolverObject : public ResolverObject {
 	}
 
 	TownScopeResolver *GetTown();
-
-	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
 };
 
 /** Road stop specification. */
 struct RoadStopSpec : NewGRFSpecBase<RoadStopClassID> {
-	/**
-	 * Properties related the the grf file.
-	 * NUM_CARGO real cargo plus three pseudo cargo sprite groups.
-	 * Used for obtaining the sprite offset of custom sprites, and for
-	 * evaluating callbacks.
-	 */
-	VariableGRFFileProps grf_prop;
+	CargoGRFFileProps grf_prop; ///< Link to NewGRF
 	StringID name;              ///< Name of this stop
 
 	RoadStopAvailabilityType stop_type = ROADSTOPTYPE_ALL;
@@ -151,7 +136,7 @@ struct RoadStopSpec : NewGRFSpecBase<RoadStopClassID> {
 
 	CargoTypes cargo_triggers = 0; ///< Bitmask of cargo types which cause trigger re-randomizing
 
-	AnimationInfo animation;
+	AnimationInfo<StationAnimationTriggers> animation;
 
 	uint8_t bridge_height[6];             ///< Minimum height for a bridge above, 0 for none
 	uint8_t bridge_disallowed_pillars[6]; ///< Disallowed pillar flags for a bridge above
@@ -178,14 +163,15 @@ struct RoadStopSpec : NewGRFSpecBase<RoadStopClassID> {
 
 using RoadStopClass = NewGRFClass<RoadStopSpec, RoadStopClassID, ROADSTOP_CLASS_MAX>;
 
+std::optional<SpriteLayoutProcessor> GetRoadStopLayout(TileInfo *ti, const RoadStopSpec *spec, BaseStation *st, StationType type, int view, std::span<int32_t> regs100 = {});
 void DrawRoadStopTile(int x, int y, RoadType roadtype, const RoadStopSpec *spec, StationType type, int view);
 
-uint16_t GetRoadStopCallback(CallbackID callback, uint32_t param1, uint32_t param2, const RoadStopSpec *roadstopspec, BaseStation *st, TileIndex tile, RoadType roadtype, StationType type, uint8_t view);
+uint16_t GetRoadStopCallback(CallbackID callback, uint32_t param1, uint32_t param2, const RoadStopSpec *roadstopspec, BaseStation *st, TileIndex tile, RoadType roadtype, StationType type, uint8_t view, std::span<int32_t> regs100 = {});
 
 void AnimateRoadStopTile(TileIndex tile);
 uint8_t GetRoadStopTileAnimationSpeed(TileIndex tile);
 void TriggerRoadStopAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
-void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTrigger trigger, CargoType cargo_type = INVALID_CARGO);
+void TriggerRoadStopRandomisation(BaseStation *st, TileIndex tile, StationRandomTrigger trigger, CargoType cargo_type = INVALID_CARGO);
 
 bool GetIfNewStopsByType(RoadStopType rs, RoadType roadtype);
 bool GetIfClassHasNewStopsByType(const RoadStopClass *roadstopclass, RoadStopType rs, RoadType roadtype);
diff --git a/src/newgrf_roadtype.cpp b/src/newgrf_roadtype.cpp
index a4ffa8f948..e48a67b11a 100644
--- a/src/newgrf_roadtype.cpp
+++ b/src/newgrf_roadtype.cpp
@@ -11,6 +11,7 @@
 #include "core/container_func.hpp"
 #include "debug.h"
 #include "newgrf_roadtype.h"
+#include "newgrf_railtype.h"
 #include "timer/timer_game_calendar.h"
 #include "depot_base.h"
 #include "town.h"
@@ -18,6 +19,40 @@
 
 #include "safeguards.h"
 
+/**
+ * Variable 0x45 of road-/tram-/rail-types to query track types on a tile.
+ *
+ * Format: __RRttrr
+ * - rr: Translated roadtype.
+ * - tt: Translated tramtype.
+ * - RR: Translated railtype.
+ *
+ * Special values for rr, tt, RR:
+ * - 0xFF: Track not present on tile.
+ * - 0xFE: Track present, but no matching entry in translation table.
+ */
+uint32_t GetTrackTypes(TileIndex tile, const GRFFile *grffile)
+{
+	uint8_t road = 0xFF;
+	uint8_t tram = 0xFF;
+	if (MayHaveRoad(tile)) {
+		if (auto tt = GetRoadTypeRoad(tile); tt != INVALID_ROADTYPE) {
+			road = GetReverseRoadTypeTranslation(tt, grffile);
+			if (road == 0xFF) road = 0xFE;
+		}
+		if (auto tt = GetRoadTypeTram(tile); tt != INVALID_ROADTYPE) {
+			tram = GetReverseRoadTypeTranslation(tt, grffile);
+			if (tram == 0xFF) tram = 0xFE;
+		}
+	}
+	uint8_t rail = 0xFF;
+	if (auto tt = GetTileRailType(tile); tt != INVALID_RAILTYPE) {
+		rail = GetReverseRailTypeTranslation(tt, grffile);
+		if (rail == 0xFF) rail = 0xFE;
+	}
+	return road | tram << 8 | rail << 16;
+}
+
 /* virtual */ uint32_t RoadTypeScopeResolver::GetRandomBits() const
 {
 	uint tmp = CountBits(this->tile.base() + (TileX(this->tile) + TileY(this->tile)) * TILE_SIZE);
@@ -32,7 +67,17 @@
 			case 0x41: return 0;
 			case 0x42: return 0;
 			case 0x43: return TimerGameCalendar::date.base();
-			case 0x44: return HZB_TOWN_EDGE;
+			case 0x44: return to_underlying(HouseZone::TownEdge);
+			case 0x45: {
+				auto rt = GetRoadTypeInfoIndex(this->rti);
+				uint8_t local = GetReverseRoadTypeTranslation(rt, this->ro.grffile);
+				if (local == 0xFF) local = 0xFE;
+				if (RoadTypeIsRoad(rt)) {
+					return 0xFFFF00 | local;
+				} else {
+					return 0xFF00FF | local << 8;
+				}
+			}
 		}
 	}
 
@@ -50,8 +95,10 @@
 			} else {
 				t = ClosestTownFromTile(this->tile, UINT_MAX);
 			}
-			return t != nullptr ? GetTownRadiusGroup(t, this->tile) : HZB_TOWN_EDGE;
+			return to_underlying(t != nullptr ? GetTownRadiusGroup(t, this->tile) : HouseZone::TownEdge);
 		}
+		case 0x45:
+			return GetTrackTypes(this->tile, ro.grffile);
 	}
 
 	Debug(grf, 1, "Unhandled road type tile variable 0x{:X}", variable);
@@ -106,12 +153,12 @@ SpriteID GetCustomRoadSprite(const RoadTypeInfo *rti, TileIndex tile, RoadTypeSp
 	if (rti->group[rtsg] == nullptr) return 0;
 
 	RoadTypeResolverObject object(rti, tile, context, rtsg);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->GetNumResults() == 0) return 0;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return 0;
 
-	if (num_results) *num_results = group->GetNumResults();
+	if (num_results) *num_results = group->num_sprites;
 
-	return group->GetResult();
+	return group->sprite;
 }
 
 /**
diff --git a/src/newgrf_roadtype.h b/src/newgrf_roadtype.h
index 3fef3bd112..e0fc039856 100644
--- a/src/newgrf_roadtype.h
+++ b/src/newgrf_roadtype.h
@@ -59,6 +59,8 @@ SpriteID GetCustomRoadSprite(const RoadTypeInfo *rti, TileIndex tile, RoadTypeSp
 RoadType GetRoadTypeTranslation(RoadTramType rtt, uint8_t tracktype, const GRFFile *grffile);
 uint8_t GetReverseRoadTypeTranslation(RoadType roadtype, const GRFFile *grffile);
 
+uint32_t GetTrackTypes(TileIndex tile, const GRFFile *grffile);
+
 void ConvertRoadTypes();
 void SetCurrentRoadTypeLabelList();
 void ClearRoadTypeLabelList();
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp
index a8a081c0c2..2a904b2916 100644
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -18,7 +18,7 @@
 SpriteGroupPool _spritegroup_pool("SpriteGroup");
 INSTANTIATE_POOL_METHODS(SpriteGroup)
 
-TemporaryStorageArray<int32_t, 0x110> _temp_store;
+/* static */ TemporaryStorageArray<int32_t, 0x110> ResolverObject::temp_store;
 
 
 /**
@@ -31,20 +31,18 @@ TemporaryStorageArray<int32_t, 0x110> _temp_store;
  * @param top_level true if this is a top-level SpriteGroup, false if used nested in another SpriteGroup.
  * @return the resolved group
  */
-/* static */ const SpriteGroup *SpriteGroup::Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level)
+/* static */ ResolverResult SpriteGroup::Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level)
 {
-	if (group == nullptr) return nullptr;
+	if (group == nullptr) return std::monostate{};
 
 	const GRFFile *grf = object.grffile;
 	auto profiler = std::ranges::find(_newgrf_profilers, grf, &NewGRFProfiler::grffile);
 
 	if (profiler == _newgrf_profilers.end() || !profiler->active) {
-		if (top_level) _temp_store.ClearChanges();
 		return group->Resolve(object);
 	} else if (top_level) {
 		profiler->BeginResolve(object);
-		_temp_store.ClearChanges();
-		const SpriteGroup *result = group->Resolve(object);
+		auto result = group->Resolve(object);
 		profiler->EndResolve(result);
 		return result;
 	} else {
@@ -62,9 +60,9 @@ static inline uint32_t GetVariable(const ResolverObject &object, ScopeResolver *
 		case 0x18: return object.callback_param2;
 		case 0x1C: return object.last_value;
 
-		case 0x5F: return (scope->GetRandomBits() << 8) | scope->GetTriggers();
+		case 0x5F: return (scope->GetRandomBits() << 8) | scope->GetRandomTriggers();
 
-		case 0x7D: return _temp_store.GetValue(parameter);
+		case 0x7D: return object.GetRegister(parameter);
 
 		case 0x7F:
 			if (object.grffile == nullptr) return 0;
@@ -91,7 +89,7 @@ static inline uint32_t GetVariable(const ResolverObject &object, ScopeResolver *
  * Get the triggers. Base class returns \c 0 to prevent trouble.
  * @return The triggers.
  */
-/* virtual */ uint32_t ScopeResolver::GetTriggers() const
+/* virtual */ uint32_t ScopeResolver::GetRandomTriggers() const
 {
 	return 0;
 }
@@ -120,10 +118,10 @@ static inline uint32_t GetVariable(const ResolverObject &object, ScopeResolver *
  * @param group Group to get.
  * @return The available sprite group.
  */
-/* virtual */ const SpriteGroup *ResolverObject::ResolveReal(const RealSpriteGroup *group) const
+/* virtual */ const SpriteGroup *ResolverObject::ResolveReal(const RealSpriteGroup &group) const
 {
-	if (!group->loaded.empty())  return group->loaded[0];
-	if (!group->loading.empty()) return group->loading[0];
+	if (!group.loaded.empty()) return group.loaded[0];
+	if (!group.loading.empty()) return group.loading[0];
 
 	return nullptr;
 }
@@ -140,7 +138,7 @@ static inline uint32_t GetVariable(const ResolverObject &object, ScopeResolver *
 /* Evaluate an adjustment for a variable of the given size.
  * U is the unsigned type and S is the signed type to use. */
 template <typename U, typename S>
-static U EvalAdjustT(const DeterministicSpriteGroupAdjust &adjust, ScopeResolver *scope, U last_value, uint32_t value)
+static U EvalAdjustT(const DeterministicSpriteGroupAdjust &adjust, ResolverObject &object, ScopeResolver *scope, U last_value, uint32_t value)
 {
 	value >>= adjust.shift_num;
 	value  &= adjust.and_mask;
@@ -166,7 +164,7 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust &adjust, ScopeResolver
 		case DSGA_OP_AND:  return last_value & value;
 		case DSGA_OP_OR:   return last_value | value;
 		case DSGA_OP_XOR:  return last_value ^ value;
-		case DSGA_OP_STO:  _temp_store.StoreValue((U)value, (S)last_value); return last_value;
+		case DSGA_OP_STO:  object.SetRegister((U)value, (S)last_value); return last_value;
 		case DSGA_OP_RST:  return value;
 		case DSGA_OP_STOP: scope->StorePSA((U)value, (S)last_value); return last_value;
 		case DSGA_OP_ROR:  return std::rotr<uint32_t>((U)last_value, (U)value & 0x1F); // mask 'value' to 5 bits, which should behave the same on all architectures.
@@ -185,7 +183,7 @@ static bool RangeHighComparator(const DeterministicSpriteGroupRange &range, uint
 	return range.high < value;
 }
 
-const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) const
+/* virtual */ ResolverResult DeterministicSpriteGroup::Resolve(ResolverObject &object) const
 {
 	uint32_t last_value = 0;
 	uint32_t value = 0;
@@ -196,12 +194,9 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con
 		/* Try to get the variable. We shall assume it is available, unless told otherwise. */
 		bool available = true;
 		if (adjust.variable == 0x7E) {
-			const SpriteGroup *subgroup = SpriteGroup::Resolve(adjust.subroutine, object, false);
-			if (subgroup == nullptr) {
-				value = CALLBACK_FAILED;
-			} else {
-				value = subgroup->GetCallbackResult();
-			}
+			auto subgroup = SpriteGroup::Resolve(adjust.subroutine, object, false);
+			auto *subvalue = std::get_if<CallbackResult>(&subgroup);
+			value = subvalue != nullptr ? *subvalue : UINT16_MAX;
 
 			/* Note: 'last_value' and 'reseed' are shared between the main chain and the procedure */
 		} else if (adjust.variable == 0x7B) {
@@ -217,9 +212,9 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con
 		}
 
 		switch (this->size) {
-			case DSG_SIZE_BYTE:  value = EvalAdjustT<uint8_t,  int8_t> (adjust, scope, last_value, value); break;
-			case DSG_SIZE_WORD:  value = EvalAdjustT<uint16_t, int16_t>(adjust, scope, last_value, value); break;
-			case DSG_SIZE_DWORD: value = EvalAdjustT<uint32_t, int32_t>(adjust, scope, last_value, value); break;
+			case DSG_SIZE_BYTE:  value = EvalAdjustT<uint8_t,  int8_t> (adjust, object, scope, last_value, value); break;
+			case DSG_SIZE_WORD:  value = EvalAdjustT<uint16_t, int16_t>(adjust, object, scope, last_value, value); break;
+			case DSG_SIZE_DWORD: value = EvalAdjustT<uint32_t, int32_t>(adjust, object, scope, last_value, value); break;
 			default: NOT_REACHED();
 		}
 		last_value = value;
@@ -227,42 +222,40 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject &object) con
 
 	object.last_value = last_value;
 
-	if (this->calculated_result) {
-		/* nvar == 0 is a special case -- we turn our value into a callback result */
-		if (value != CALLBACK_FAILED) value = GB(value, 0, 15);
-		static CallbackResultSpriteGroup nvarzero(0);
-		nvarzero.result = value;
-		return &nvarzero;
-	}
+	auto result = this->default_result;
 
 	if (this->ranges.size() > 4) {
 		const auto &lower = std::lower_bound(this->ranges.begin(), this->ranges.end(), value, RangeHighComparator);
 		if (lower != this->ranges.end() && lower->low <= value) {
 			assert(lower->low <= value && value <= lower->high);
-			return SpriteGroup::Resolve(lower->group, object, false);
+			result = lower->result;
 		}
 	} else {
 		for (const auto &range : this->ranges) {
 			if (range.low <= value && value <= range.high) {
-				return SpriteGroup::Resolve(range.group, object, false);
+				result = range.result;
+				break;
 			}
 		}
 	}
 
-	return SpriteGroup::Resolve(this->default_group, object, false);
+	if (result.calculated_result) {
+		return static_cast<CallbackResult>(GB(value, 0, 15));
+	}
+	return SpriteGroup::Resolve(result.group, object, false);
 }
 
 
-const SpriteGroup *RandomizedSpriteGroup::Resolve(ResolverObject &object) const
+/* virtual */ ResolverResult RandomizedSpriteGroup::Resolve(ResolverObject &object) const
 {
 	ScopeResolver *scope = object.GetScope(this->var_scope, this->count);
 	if (object.callback == CBID_RANDOM_TRIGGER) {
 		/* Handle triggers */
-		uint8_t match = this->triggers & object.waiting_triggers;
+		uint8_t match = this->triggers & object.GetWaitingRandomTriggers();
 		bool res = (this->cmp_mode == RSG_CMP_ANY) ? (match != 0) : (match == this->triggers);
 
 		if (res) {
-			object.used_triggers |= match;
+			object.AddUsedRandomTriggers(match);
 			object.reseed[this->var_scope] |= (this->groups.size() - 1) << this->lowest_randbit;
 		}
 	}
@@ -273,34 +266,40 @@ const SpriteGroup *RandomizedSpriteGroup::Resolve(ResolverObject &object) const
 	return SpriteGroup::Resolve(this->groups[index], object, false);
 }
 
-
-const SpriteGroup *RealSpriteGroup::Resolve(ResolverObject &object) const
+/* virtual */ ResolverResult CallbackResultSpriteGroup::Resolve(ResolverObject &) const
 {
-	return object.ResolveReal(this);
+	return this->result;
+}
+
+/* virtual */ ResolverResult RealSpriteGroup::Resolve(ResolverObject &object) const
+{
+	/* Call the feature specific evaluation via ResultSpriteGroup::ResolveReal.
+	 * The result is either ResultSpriteGroup, CallbackResultSpriteGroup, or nullptr.
+	 */
+	return SpriteGroup::Resolve(object.ResolveReal(*this), object, false);
 }
 
 /**
  * Process registers and the construction stage into the sprite layout.
  * The passed construction stage might get reset to zero, if it gets incorporated into the layout
  * during the preprocessing.
+ * @param object ResolverObject owning the temporary storage.
  * @param[in,out] stage Construction stage (0-3), or nullptr if not applicable.
  * @return sprite layout to draw.
  */
-const DrawTileSprites *TileLayoutSpriteGroup::ProcessRegisters(uint8_t *stage) const
+SpriteLayoutProcessor TileLayoutSpriteGroup::ProcessRegisters(const ResolverObject &object, uint8_t *stage) const
 {
 	if (!this->dts.NeedsPreprocessing()) {
 		if (stage != nullptr && this->dts.consistent_max_offset > 0) *stage = GetConstructionStageOffset(*stage, this->dts.consistent_max_offset);
-		return &this->dts;
+		return SpriteLayoutProcessor(this->dts);
 	}
 
-	static DrawTileSpriteSpan result;
 	uint8_t actual_stage = stage != nullptr ? *stage : 0;
-	this->dts.PrepareLayout(0, 0, 0, actual_stage, false);
-	this->dts.ProcessRegisters(0, 0, false);
-	result.seq = this->dts.GetLayout(&result.ground);
+	SpriteLayoutProcessor result(this->dts, 0, 0, 0, actual_stage, false);
+	result.ProcessRegisters(object, 0, 0);
 
 	/* Stage has been processed by PrepareLayout(), set it to zero. */
 	if (stage != nullptr) *stage = 0;
 
-	return &result;
+	return result;
 }
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 3827c5cd7b..76646304a4 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -10,6 +10,7 @@
 #ifndef NEWGRF_SPRITEGROUP_H
 #define NEWGRF_SPRITEGROUP_H
 
+#include "core/pool_type.hpp"
 #include "town_type.h"
 #include "engine_type.h"
 #include "house_type.h"
@@ -20,18 +21,6 @@
 #include "newgrf_storage.h"
 #include "newgrf_commons.h"
 
-/**
- * Gets the value of a so-called newgrf "register".
- * @param i index of the register
- * @pre i < 0x110
- * @return the value of the register
- */
-inline uint32_t GetRegister(uint i)
-{
-	extern TemporaryStorageArray<int32_t, 0x110> _temp_store;
-	return _temp_store.GetValue(i);
-}
-
 /* List of different sprite group types */
 enum SpriteGroupType : uint8_t {
 	SGT_REAL,
@@ -45,6 +34,15 @@ enum SpriteGroupType : uint8_t {
 
 struct SpriteGroup;
 struct ResolverObject;
+using CallbackResult = uint16_t;
+
+/**
+ * Result of resolving sprite groups:
+ * - std::monostate: Failure.
+ * - CallbackResult: Callback result.
+ * - SpriteGroup: ResultSpriteGroup, TileLayoutSpriteGroup, IndustryProductionSpriteGroup
+ */
+using ResolverResult = std::variant<std::monostate, CallbackResult, const SpriteGroup *>;
 
 /* SPRITE_WIDTH is 24. ECS has roughly 30 sprite groups per real sprite.
  * Adding an 'extra' margin would be assuming 64 sprite groups per real
@@ -58,7 +56,7 @@ struct SpriteGroup : SpriteGroupPool::PoolItem<&_spritegroup_pool> {
 protected:
 	SpriteGroup(SpriteGroupType type) : type(type) {}
 	/** Base sprite group resolver */
-	virtual const SpriteGroup *Resolve([[maybe_unused]] ResolverObject &object) const { return this; };
+	virtual ResolverResult Resolve([[maybe_unused]] ResolverObject &object) const { return this; };
 
 public:
 	virtual ~SpriteGroup() = default;
@@ -66,11 +64,7 @@ public:
 	uint32_t nfo_line = 0;
 	SpriteGroupType type{};
 
-	virtual SpriteID GetResult() const { return 0; }
-	virtual uint8_t GetNumResults() const { return 0; }
-	virtual uint16_t GetCallbackResult() const { return CALLBACK_FAILED; }
-
-	static const SpriteGroup *Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level = true);
+	static ResolverResult Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level = true);
 };
 
 
@@ -90,7 +84,7 @@ struct RealSpriteGroup : SpriteGroup {
 	std::vector<const SpriteGroup *> loading{}; ///< List of loading groups (can be SpriteIDs or Callback results)
 
 protected:
-	const SpriteGroup *Resolve(ResolverObject &object) const override;
+	ResolverResult Resolve(ResolverObject &object) const override;
 };
 
 /* Shared by deterministic and random groups. */
@@ -157,8 +151,15 @@ struct DeterministicSpriteGroupAdjust {
 };
 
 
-struct DeterministicSpriteGroupRange {
+struct DeterministicSpriteGroupResult {
+	bool calculated_result = false;
 	const SpriteGroup *group = nullptr;
+
+	bool operator==(const DeterministicSpriteGroupResult &) const = default;
+};
+
+struct DeterministicSpriteGroupRange {
+	DeterministicSpriteGroupResult result;
 	uint32_t low = 0;
 	uint32_t high = 0;
 };
@@ -169,17 +170,16 @@ struct DeterministicSpriteGroup : SpriteGroup {
 
 	VarSpriteGroupScope var_scope{};
 	DeterministicSpriteGroupSize size{};
-	bool calculated_result = false;
 	std::vector<DeterministicSpriteGroupAdjust> adjusts{};
 	std::vector<DeterministicSpriteGroupRange> ranges{}; // Dynamically allocated
 
 	/* Dynamically allocated, this is the sole owner */
-	const SpriteGroup *default_group = nullptr;
+	DeterministicSpriteGroupResult default_result;
 
 	const SpriteGroup *error_group = nullptr; // was first range, before sorting ranges
 
 protected:
-	const SpriteGroup *Resolve(ResolverObject &object) const override;
+	ResolverResult Resolve(ResolverObject &object) const override;
 };
 
 enum RandomizedSpriteGroupCompareMode : uint8_t {
@@ -201,7 +201,7 @@ struct RandomizedSpriteGroup : SpriteGroup {
 	std::vector<const SpriteGroup *> groups{}; ///< Take the group with appropriate index:
 
 protected:
-	const SpriteGroup *Resolve(ResolverObject &object) const override;
+	ResolverResult Resolve(ResolverObject &object) const override;
 };
 
 
@@ -212,16 +212,20 @@ struct CallbackResultSpriteGroup : SpriteGroup {
 	 * Creates a spritegroup representing a callback result
 	 * @param value The value that was used to represent this callback result
 	 */
-	explicit CallbackResultSpriteGroup(uint16_t value) : SpriteGroup(SGT_CALLBACK), result(value) {}
+	explicit CallbackResultSpriteGroup(CallbackResult value) : SpriteGroup(SGT_CALLBACK), result(value) {}
 
-	uint16_t result = 0;
-	uint16_t GetCallbackResult() const override { return this->result; }
+	CallbackResult result = 0;
+
+protected:
+	ResolverResult Resolve(ResolverObject &object) const override;
 };
 
 
 /* A result sprite group returns the first SpriteID and the number of
  * sprites in the set */
 struct ResultSpriteGroup : SpriteGroup {
+	static constexpr SpriteGroupType TYPE = SGT_RESULT;
+
 	/**
 	 * Creates a spritegroup representing a sprite number result.
 	 * @param sprite The sprite number.
@@ -229,7 +233,7 @@ struct ResultSpriteGroup : SpriteGroup {
 	 * @return A spritegroup representing the sprite number result.
 	 */
 	ResultSpriteGroup(SpriteID sprite, uint8_t num_sprites) :
-		SpriteGroup(SGT_RESULT),
+		SpriteGroup(TYPE),
 		num_sprites(num_sprites),
 		sprite(sprite)
 	{
@@ -237,25 +241,26 @@ struct ResultSpriteGroup : SpriteGroup {
 
 	uint8_t num_sprites = 0;
 	SpriteID sprite = 0;
-
-	SpriteID GetResult() const override { return this->sprite; }
-	uint8_t GetNumResults() const override { return this->num_sprites; }
 };
 
 /**
  * Action 2 sprite layout for houses, industry tiles, objects and airport tiles.
  */
 struct TileLayoutSpriteGroup : SpriteGroup {
-	TileLayoutSpriteGroup() : SpriteGroup(SGT_TILELAYOUT) {}
+	static constexpr SpriteGroupType TYPE = SGT_TILELAYOUT;
+
+	TileLayoutSpriteGroup() : SpriteGroup(TYPE) {}
 	~TileLayoutSpriteGroup() {}
 
 	NewGRFSpriteLayout dts{};
 
-	const DrawTileSprites *ProcessRegisters(uint8_t *stage) const;
+	SpriteLayoutProcessor ProcessRegisters(const ResolverObject &object, uint8_t *stage) const;
 };
 
 struct IndustryProductionSpriteGroup : SpriteGroup {
-	IndustryProductionSpriteGroup() : SpriteGroup(SGT_INDUSTRY_PRODUCTION) {}
+	static constexpr SpriteGroupType TYPE = SGT_INDUSTRY_PRODUCTION;
+
+	IndustryProductionSpriteGroup() : SpriteGroup(TYPE) {}
 
 	uint8_t version = 0; ///< Production callback version used, or 0xFF if marked invalid
 	uint8_t num_input = 0; ///< How many subtract_input values are valid
@@ -281,7 +286,7 @@ struct ScopeResolver {
 	virtual ~ScopeResolver() = default;
 
 	virtual uint32_t GetRandomBits() const;
-	virtual uint32_t GetTriggers() const;
+	virtual uint32_t GetRandomTriggers() const;
 
 	virtual uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const;
 	virtual void StorePSA(uint reg, int32_t value);
@@ -294,6 +299,10 @@ struct ScopeResolver {
  * to get the results of callbacks, rerandomisations or normal sprite lookups.
  */
 struct ResolverObject {
+private:
+	static TemporaryStorageArray<int32_t, 0x110> temp_store;
+
+public:
 	/**
 	 * Resolver constructor.
 	 * @param grffile NewGRF file associated with the object (or \c nullptr if none).
@@ -304,21 +313,53 @@ struct ResolverObject {
 	ResolverObject(const GRFFile *grffile, CallbackID callback = CBID_NO_CALLBACK, uint32_t callback_param1 = 0, uint32_t callback_param2 = 0)
 		: default_scope(*this), callback(callback), callback_param1(callback_param1), callback_param2(callback_param2), grffile(grffile), root_spritegroup(nullptr)
 	{
-		this->ResetState();
 	}
 
 	virtual ~ResolverObject() = default;
 
+	ResolverResult DoResolve()
+	{
+		temp_store.ClearChanges();
+		this->last_value = 0;
+		this->used_random_triggers = 0;
+		this->reseed.fill(0);
+		return SpriteGroup::Resolve(this->root_spritegroup, *this);
+	}
+
 	ScopeResolver default_scope; ///< Default implementation of the grf scope.
 
+	/**
+	 * Gets the value of a so-called newgrf "register".
+	 * @param i index of the register
+	 * @return the value of the register
+	 * @pre i < 0x110
+	 */
+	inline int32_t GetRegister(uint i) const
+	{
+		return temp_store.GetValue(i);
+	}
+
+	/**
+	 * Sets the value of a so-called newgrf "register".
+	 * @param i index of the register
+	 * @param value the value of the register
+	 * @pre i < 0x110
+	 */
+	inline void SetRegister(uint i, int32_t value)
+	{
+		temp_store.StoreValue(i, value);
+	}
+
 	CallbackID callback{}; ///< Callback being resolved.
 	uint32_t callback_param1 = 0; ///< First parameter (var 10) of the callback.
 	uint32_t callback_param2 = 0; ///< Second parameter (var 18) of the callback.
 
 	uint32_t last_value = 0; ///< Result of most recent DeterministicSpriteGroup (including procedure calls)
 
-	uint32_t waiting_triggers = 0; ///< Waiting triggers to be used by any rerandomisation. (scope independent)
-	uint32_t used_triggers = 0; ///< Subset of cur_triggers, which actually triggered some rerandomisation. (scope independent)
+protected:
+	uint32_t waiting_random_triggers = 0; ///< Waiting triggers to be used by any rerandomisation. (scope independent)
+	uint32_t used_random_triggers = 0; ///< Subset of cur_triggers, which actually triggered some rerandomisation. (scope independent)
+public:
 	std::array<uint32_t, VSG_END> reseed; ///< Collects bits to rerandomise while triggering triggers.
 
 	const GRFFile *grffile = nullptr; ///< GRFFile the resolved SpriteGroup belongs to
@@ -327,32 +368,65 @@ struct ResolverObject {
 	/**
 	 * Resolve SpriteGroup.
 	 * @return Result spritegroup.
+	 * @tparam TSpriteGroup Sprite group type
 	 */
-	const SpriteGroup *Resolve()
+	template <class TSpriteGroup>
+	inline const TSpriteGroup *Resolve()
 	{
-		return SpriteGroup::Resolve(this->root_spritegroup, *this);
+		auto result = this->DoResolve();
+		const auto *group = std::get_if<const SpriteGroup *>(&result);
+		if (group == nullptr || *group == nullptr || (*group)->type != TSpriteGroup::TYPE) return nullptr;
+		return static_cast<const TSpriteGroup *>(*group);
+	}
+
+	/**
+	 * Resolve bits to be rerandomised.
+	 * Access results via:
+	 * - reseed: Bits to rerandomise per scope, for features with proper PARENT rerandomisation. (only industry tiles)
+	 * - GetReseedSum: Bits to rerandomise for SELF scope, for features with broken-by-design PARENT randomisation. (all but industry tiles)
+	 * - GetUsedRandomTriggers: Consumed random triggers to be reset.
+	 */
+	inline void ResolveRerandomisation()
+	{
+		/* The Resolve result has no meaning.
+		 * It can be a SpriteSet, a callback result, or even an invalid SpriteGroup reference (nullptr). */
+		this->DoResolve();
 	}
 
 	/**
 	 * Resolve callback.
+	 * @param[out] regs100 Additional result values from registers 100+
 	 * @return Callback result.
 	 */
-	uint16_t ResolveCallback()
+	inline CallbackResult ResolveCallback(std::span<int32_t> regs100)
 	{
-		const SpriteGroup *result = Resolve();
-		return result != nullptr ? result->GetCallbackResult() : CALLBACK_FAILED;
+		auto result = this->DoResolve();
+		const auto *value = std::get_if<CallbackResult>(&result);
+		if (value == nullptr) return CALLBACK_FAILED;
+		for (uint i = 0; i < regs100.size(); ++i) {
+			regs100[i] = this->GetRegister(0x100 + i);
+		}
+		return *value;
 	}
 
-	virtual const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
+	virtual const SpriteGroup *ResolveReal(const RealSpriteGroup &group) const;
 
 	virtual ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, uint8_t relative = 0);
 
 	/**
-	 * Returns the waiting triggers that did not trigger any rerandomisation.
+	 * Used by RandomizedSpriteGroup: Triggers for rerandomisation
 	 */
-	uint32_t GetRemainingTriggers() const
+	uint32_t GetWaitingRandomTriggers() const
 	{
-		return this->waiting_triggers & ~this->used_triggers;
+		return this->waiting_random_triggers;
+	}
+
+	/**
+	 * Used by RandomizedSpriteGroup: Consume triggers.
+	 */
+	void AddUsedRandomTriggers(uint32_t triggers)
+	{
+		this->used_random_triggers |= triggers;
 	}
 
 	/**
@@ -369,18 +443,6 @@ struct ResolverObject {
 		return sum;
 	}
 
-	/**
-	 * Resets the dynamic state of the resolver object.
-	 * To be called before resolving an Action-1-2-3 chain.
-	 */
-	void ResetState()
-	{
-		this->last_value = 0;
-		this->waiting_triggers = 0;
-		this->used_triggers = 0;
-		this->reseed.fill(0);
-	}
-
 	/**
 	 * Get the feature number being resolved for.
 	 * This function is mainly intended for the callback profiling feature.
@@ -394,4 +456,30 @@ struct ResolverObject {
 	virtual uint32_t GetDebugID() const { return 0; }
 };
 
+/**
+ * Specialization of ResolverObject with type-safe access to RandomTriggers.
+ */
+template <class RandomTriggers>
+struct SpecializedResolverObject : public ResolverObject {
+	using ResolverObject::ResolverObject;
+
+	/**
+	 * Set waiting triggers for rerandomisation.
+	 * This is scope independent, even though this is broken-by-design in most cases.
+	 */
+	void SetWaitingRandomTriggers(RandomTriggers triggers)
+	{
+		this->waiting_random_triggers = triggers.base();
+	}
+
+	/**
+	 * Get the triggers, which were "consumed" by some rerandomisation.
+	 * This is scope independent, even though this is broken-by-design in most cases.
+	 */
+	RandomTriggers GetUsedRandomTriggers() const
+	{
+		return static_cast<RandomTriggers>(this->used_random_triggers);
+	}
+};
+
 #endif /* NEWGRF_SPRITEGROUP_H */
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index e24d45a5aa..4c16bb7155 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -244,27 +244,12 @@ static uint32_t GetRailContinuationInfo(TileIndex tile)
 }
 
 
-/* virtual */ uint32_t StationScopeResolver::GetTriggers() const
+/* virtual */ uint32_t StationScopeResolver::GetRandomTriggers() const
 {
-	return this->st == nullptr ? 0 : this->st->waiting_triggers;
+	return this->st == nullptr ? 0 : this->st->waiting_random_triggers.base();
 }
 
 
-/**
- * Station variable cache
- * This caches 'expensive' station variable lookups which iterate over
- * several tiles that may be called multiple times per Resolve().
- */
-static struct {
-	uint32_t v40;
-	uint32_t v41;
-	uint32_t v45;
-	uint32_t v46;
-	uint32_t v47;
-	uint32_t v49;
-	uint8_t valid; ///< Bits indicating what variable is valid (for each bit, \c 0 is invalid, \c 1 is valid).
-} _svc;
-
 /**
  * Get the town scope associated with a station, if it exists.
  * On the first call, the town scope is created (if possible).
@@ -322,31 +307,31 @@ TownScopeResolver *StationResolverObject::GetTown()
 	switch (variable) {
 		/* Calculated station variables */
 		case 0x40:
-			if (!HasBit(_svc.valid, 0)) { _svc.v40 = GetPlatformInfoHelper(this->tile, false, false, false); SetBit(_svc.valid, 0); }
-			return _svc.v40;
+			if (!this->cache.v40.has_value()) this->cache.v40 = GetPlatformInfoHelper(this->tile, false, false, false);
+			return *this->cache.v40;
 
 		case 0x41:
-			if (!HasBit(_svc.valid, 1)) { _svc.v41 = GetPlatformInfoHelper(this->tile, true,  false, false); SetBit(_svc.valid, 1); }
-			return _svc.v41;
+			if (!this->cache.v41.has_value()) this->cache.v41 = GetPlatformInfoHelper(this->tile, true,  false, false);
+			return *this->cache.v41;
 
 		case 0x42: return GetTerrainType(this->tile) | (GetReverseRailTypeTranslation(GetRailType(this->tile), this->statspec->grf_prop.grffile) << 8);
 		case 0x43: return GetCompanyInfo(this->st->owner); // Station owner
 		case 0x44: return HasStationReservation(this->tile) ? 7 : 4; // PBS status
 		case 0x45:
-			if (!HasBit(_svc.valid, 2)) { _svc.v45 = GetRailContinuationInfo(this->tile); SetBit(_svc.valid, 2); }
-			return _svc.v45;
+			if (!this->cache.v45.has_value()) this->cache.v45 = GetRailContinuationInfo(this->tile);
+			return *this->cache.v45;
 
 		case 0x46:
-			if (!HasBit(_svc.valid, 3)) { _svc.v46 = GetPlatformInfoHelper(this->tile, false, false, true); SetBit(_svc.valid, 3); }
-			return _svc.v46;
+			if (!this->cache.v46.has_value()) this->cache.v46 = GetPlatformInfoHelper(this->tile, false, false, true);
+			return *this->cache.v46;
 
 		case 0x47:
-			if (!HasBit(_svc.valid, 4)) { _svc.v47 = GetPlatformInfoHelper(this->tile, true,  false, true); SetBit(_svc.valid, 4); }
-			return _svc.v47;
+			if (!this->cache.v47.has_value()) this->cache.v47 = GetPlatformInfoHelper(this->tile, true,  false, true);
+			return *this->cache.v47;
 
 		case 0x49:
-			if (!HasBit(_svc.valid, 5)) { _svc.v49 = GetPlatformInfoHelper(this->tile, false, true, false); SetBit(_svc.valid, 5); }
-			return _svc.v49;
+			if (!this->cache.v49.has_value()) this->cache.v49 = GetPlatformInfoHelper(this->tile, false, true, false);
+			return *this->cache.v49;
 
 		case 0x4A: // Animation frame of tile
 			return GetAnimationFrame(this->tile);
@@ -436,8 +421,8 @@ uint32_t Station::GetNewGRFVariable(const ResolverObject &object, uint8_t variab
 
 		case 0x8A: return this->had_vehicle_of_type;
 		case 0xF1: return (this->airport.tile != INVALID_TILE) ? this->airport.GetSpec()->ttd_airport_type : ATP_TTDP_LARGE;
-		case 0xF2: return (this->truck_stops != nullptr) ? this->truck_stops->status : 0;
-		case 0xF3: return (this->bus_stops != nullptr)   ? this->bus_stops->status   : 0;
+		case 0xF2: return (this->truck_stops != nullptr) ? this->truck_stops->status.base() : 0;
+		case 0xF3: return (this->bus_stops != nullptr)   ? this->bus_stops->status.base()   : 0;
 		case 0xF6: return this->airport.blocks.base();
 		case 0xF7: return GB(this->airport.blocks.base(), 8, 8);
 	}
@@ -519,10 +504,11 @@ uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [
 	return UINT_MAX;
 }
 
-/* virtual */ const SpriteGroup *StationResolverObject::ResolveReal(const RealSpriteGroup *group) const
+/* virtual */ const SpriteGroup *StationResolverObject::ResolveReal(const RealSpriteGroup &group) const
 {
 	if (this->station_scope.st == nullptr || !Station::IsExpected(this->station_scope.st)) {
-		return group->loading[0];
+		if (!group.loading.empty()) return group.loading[0];
+		return nullptr;
 	}
 
 	uint cargo = 0;
@@ -530,12 +516,12 @@ uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [
 
 	switch (this->station_scope.cargo_type) {
 		case INVALID_CARGO:
-		case SpriteGroupCargo::SG_DEFAULT_NA:
-		case SpriteGroupCargo::SG_PURCHASE:
+		case CargoGRFFileProps::SG_DEFAULT_NA:
+		case CargoGRFFileProps::SG_PURCHASE:
 			cargo = 0;
 			break;
 
-		case SpriteGroupCargo::SG_DEFAULT:
+		case CargoGRFFileProps::SG_DEFAULT:
 			for (const GoodsEntry &ge : st->goods) {
 				if (!ge.HasData()) continue;
 				cargo += ge.GetData().cargo.TotalCount();
@@ -553,18 +539,19 @@ uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [
 	cargo = std::min(0xfffu, cargo);
 
 	if (cargo > this->station_scope.statspec->cargo_threshold) {
-		if (!group->loading.empty()) {
-			uint set = ((cargo - this->station_scope.statspec->cargo_threshold) * (uint)group->loading.size()) / (4096 - this->station_scope.statspec->cargo_threshold);
-			return group->loading[set];
+		if (!group.loading.empty()) {
+			uint set = ((cargo - this->station_scope.statspec->cargo_threshold) * static_cast<uint>(group.loading.size())) / (4096 - this->station_scope.statspec->cargo_threshold);
+			return group.loading[set];
 		}
 	} else {
-		if (!group->loaded.empty()) {
-			uint set = (cargo * (uint)group->loaded.size()) / (this->station_scope.statspec->cargo_threshold + 1);
-			return group->loaded[set];
+		if (!group.loaded.empty()) {
+			uint set = (cargo * static_cast<uint>(group.loaded.size())) / (this->station_scope.statspec->cargo_threshold + 1);
+			return group.loaded[set];
 		}
 	}
 
-	return group->loading[0];
+	if (!group.loading.empty()) return group.loading[0];
+	return nullptr;
 }
 
 GrfSpecFeature StationResolverObject::GetFeature() const
@@ -588,39 +575,29 @@ uint32_t StationResolverObject::GetDebugID() const
  */
 StationResolverObject::StationResolverObject(const StationSpec *statspec, BaseStation *base_station, TileIndex tile,
 		CallbackID callback, uint32_t callback_param1, uint32_t callback_param2)
-	: ResolverObject(statspec->grf_prop.grffile, callback, callback_param1, callback_param2),
+	: SpecializedResolverObject<StationRandomTriggers>(statspec->grf_prop.grffile, callback, callback_param1, callback_param2),
 	station_scope(*this, statspec, base_station, tile)
 {
-	/* Invalidate all cached vars */
-	_svc.valid = 0;
-
-	CargoType ctype = SpriteGroupCargo::SG_DEFAULT_NA;
+	CargoType ctype = CargoGRFFileProps::SG_DEFAULT_NA;
 
 	if (this->station_scope.st == nullptr) {
 		/* No station, so we are in a purchase list */
-		ctype = SpriteGroupCargo::SG_PURCHASE;
-		this->root_spritegroup = statspec->grf_prop.GetSpriteGroup(ctype);
+		ctype = CargoGRFFileProps::SG_PURCHASE;
 	} else if (Station::IsExpected(this->station_scope.st)) {
 		const Station *st = Station::From(this->station_scope.st);
 		/* Pick the first cargo that we have waiting */
 		for (const auto &[cargo, spritegroup] : statspec->grf_prop.spritegroups) {
 			if (cargo < NUM_CARGO && st->goods[cargo].HasData() && st->goods[cargo].GetData().cargo.TotalCount() > 0) {
 				ctype = cargo;
-				this->root_spritegroup = spritegroup;
 				break;
 			}
 		}
-
-		if (this->root_spritegroup == nullptr) {
-			ctype = SpriteGroupCargo::SG_DEFAULT_NA;
-			this->root_spritegroup = statspec->grf_prop.GetSpriteGroup(ctype);
-		}
 	}
 
-
+	this->root_spritegroup = this->station_scope.statspec->grf_prop.GetSpriteGroup(ctype);
 	if (this->root_spritegroup == nullptr) {
-		ctype = SpriteGroupCargo::SG_DEFAULT;
-		this->root_spritegroup = statspec->grf_prop.GetSpriteGroup(ctype);
+		ctype = CargoGRFFileProps::SG_DEFAULT;
+		this->root_spritegroup = this->station_scope.statspec->grf_prop.GetSpriteGroup(ctype);
 	}
 
 	/* Remember the cargo type we've picked */
@@ -633,14 +610,25 @@ StationResolverObject::StationResolverObject(const StationSpec *statspec, BaseSt
  * @param st Station (nullptr in GUI)
  * @param tile Station tile being drawn (INVALID_TILE in GUI)
  * @param var10 Value to put in variable 10; normally 0; 1 when resolving the groundsprite and StationSpecFlag::SeparateGround is set.
- * @return First sprite of the Action 1 spriteset to use, minus an offset of 0x42D to accommodate for weird NewGRF specs.
+ * @return First sprite of the Action 1 spriteset to use, minus an offset of SPR_RAIL_PLATFORM_Y_FRONT (0x42D) to accommodate for weird NewGRF specs.
  */
 SpriteID GetCustomStationRelocation(const StationSpec *statspec, BaseStation *st, TileIndex tile, uint32_t var10)
 {
 	StationResolverObject object(statspec, st, tile, CBID_NO_CALLBACK, var10);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_RESULT) return 0;
-	return group->GetResult() - 0x42D;
+	const auto *group = object.Resolve<ResultSpriteGroup>();
+	if (group == nullptr || group->num_sprites == 0) return 0;
+	return group->sprite - SPR_RAIL_PLATFORM_Y_FRONT;
+}
+
+void GetCustomStationRelocation(SpriteLayoutProcessor &processor, const StationSpec *statspec, BaseStation *st, TileIndex tile)
+{
+	StationResolverObject object(statspec, st, tile, CBID_NO_CALLBACK);
+	for (uint8_t var10 : processor.Var10Values()) {
+		object.callback_param1 = var10;
+		const auto *group = object.Resolve<ResultSpriteGroup>();
+		if (group == nullptr || group->num_sprites == 0) continue;
+		processor.ProcessRegisters(object, var10, group->sprite - SPR_RAIL_PLATFORM_Y_FRONT);
+	}
 }
 
 /**
@@ -657,18 +645,19 @@ SpriteID GetCustomStationFoundationRelocation(const StationSpec *statspec, BaseS
 	/* callback_param1 == 2 means  we are resolving the foundation sprites. */
 	StationResolverObject object(statspec, st, tile, CBID_NO_CALLBACK, 2, layout | (edge_info << 16));
 
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_RESULT) return 0;
-
+	const auto *group = object.Resolve<ResultSpriteGroup>();
 	/* Note: SpriteGroup::Resolve zeroes all registers, so register 0x100 is initialised to 0. (compatibility) */
-	return group->GetResult() + GetRegister(0x100);
+	uint32_t offset = static_cast<uint32_t>(object.GetRegister(0x100));
+	if (group == nullptr || group->num_sprites <= offset) return 0;
+
+	return group->sprite + offset;
 }
 
 
-uint16_t GetStationCallback(CallbackID callback, uint32_t param1, uint32_t param2, const StationSpec *statspec, BaseStation *st, TileIndex tile)
+uint16_t GetStationCallback(CallbackID callback, uint32_t param1, uint32_t param2, const StationSpec *statspec, BaseStation *st, TileIndex tile, std::span<int32_t> regs100)
 {
 	StationResolverObject object(statspec, st, tile, callback, param1, param2);
-	return object.ResolveCallback();
+	return object.ResolveCallback(regs100);
 }
 
 /**
@@ -691,14 +680,15 @@ CommandCost PerformStationTileSlopeCheck(TileIndex north_tile, TileIndex cur_til
 			(numtracks << 24) | (plat_len << 16) | (axis == AXIS_Y ? TileX(diff) << 8 | TileY(diff) : TileY(diff) << 8 | TileX(diff)));
 	object.station_scope.axis = axis;
 
-	uint16_t cb_res = object.ResolveCallback();
+	std::array<int32_t, 16> regs100;
+	uint16_t cb_res = object.ResolveCallback(regs100);
 
 	/* Failed callback means success. */
 	if (cb_res == CALLBACK_FAILED) return CommandCost();
 
 	/* The meaning of bit 10 is inverted for a grf version < 8. */
 	if (statspec->grf_prop.grffile->grf_version < 8) ToggleBit(cb_res, 10);
-	return GetErrorMessageFromLocationCallbackResult(cb_res, statspec->grf_prop.grffile, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
+	return GetErrorMessageFromLocationCallbackResult(cb_res, regs100, statspec->grf_prop.grffile, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 }
 
 
@@ -780,7 +770,7 @@ void DeallocateSpecFromStation(BaseStation *st, uint8_t specindex)
 			st->speclist.resize(num_specs + 1);
 		} else {
 			st->speclist.clear();
-			st->cached_anim_triggers = 0;
+			st->cached_anim_triggers = {};
 			st->cached_cargo_triggers = 0;
 			return;
 		}
@@ -803,7 +793,7 @@ bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID
 {
 	const DrawTileSprites *sprites = nullptr;
 	const RailTypeInfo *rti = GetRailTypeInfo(railtype);
-	PaletteID palette = COMPANY_SPRITE_COLOUR(_local_company);
+	PaletteID palette = GetCompanyPalette(_local_company);
 	uint tile = 2;
 
 	const StationSpec *statspec = StationClass::Get(sclass)->GetSpec(station);
@@ -818,6 +808,7 @@ bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID
 	uint32_t relocation = 0;
 	uint32_t ground_relocation = 0;
 	const NewGRFSpriteLayout *layout = nullptr;
+	SpriteLayoutProcessor processor; // owns heap, borrowed by tmp_rail_layout and sprites
 	DrawTileSpriteSpan tmp_rail_layout;
 
 	if (statspec->renderdata.empty()) {
@@ -833,13 +824,9 @@ bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID
 	if (layout != nullptr) {
 		/* Sprite layout which needs preprocessing */
 		bool separate_ground = statspec->flags.Test(StationSpecFlag::SeparateGround);
-		uint32_t var10_values = layout->PrepareLayout(total_offset, rti->fallback_railtype, 0, 0, separate_ground);
-		for (uint8_t var10 : SetBitIterator(var10_values)) {
-			uint32_t var10_relocation = GetCustomStationRelocation(statspec, nullptr, INVALID_TILE, var10);
-			layout->ProcessRegisters(var10, var10_relocation, separate_ground);
-		}
-
-		tmp_rail_layout.seq = layout->GetLayout(&tmp_rail_layout.ground);
+		processor = SpriteLayoutProcessor(*layout, total_offset, rti->fallback_railtype, 0, 0, separate_ground);
+		GetCustomStationRelocation(processor, statspec, nullptr, INVALID_TILE);
+		tmp_rail_layout = processor.GetLayout();
 		sprites = &tmp_rail_layout;
 		total_offset = 0;
 	} else {
@@ -888,7 +875,7 @@ uint16_t GetAnimStationCallback(CallbackID callback, uint32_t param1, uint32_t p
 /** Helper class for animation control. */
 struct StationAnimationBase : public AnimationBase<StationAnimationBase, StationSpec, BaseStation, int, GetAnimStationCallback, TileAnimationFrameAnimationHelper<BaseStation> > {
 	static constexpr CallbackID cb_animation_speed      = CBID_STATION_ANIMATION_SPEED;
-	static constexpr CallbackID cb_animation_next_frame = CBID_STATION_ANIM_NEXT_FRAME;
+	static constexpr CallbackID cb_animation_next_frame = CBID_STATION_ANIMATION_NEXT_FRAME;
 
 	static constexpr StationCallbackMask cbm_animation_speed      = StationCallbackMask::AnimationSpeed;
 	static constexpr StationCallbackMask cbm_animation_next_frame = StationCallbackMask::AnimationNextFrame;
@@ -906,31 +893,37 @@ void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAni
 {
 	/* List of coverage areas for each animation trigger */
 	static const TriggerArea tas[] = {
-		TA_TILE, TA_WHOLE, TA_WHOLE, TA_PLATFORM, TA_PLATFORM, TA_PLATFORM, TA_WHOLE
+		TA_TILE, // Built
+		TA_WHOLE, // NewCargo
+		TA_WHOLE, // CargoTaken
+		TA_PLATFORM, // VehicleArrives
+		TA_PLATFORM, // VehicleDeparts
+		TA_PLATFORM, // VehicleLoads
+		TA_WHOLE, // AcceptanceTick
+		TA_TILE, // TileLoop
+		TA_PLATFORM, // PathReservation
 	};
+	static_assert(std::size(tas) == static_cast<size_t>(StationAnimationTrigger::End));
 
-	/* Get Station if it wasn't supplied */
-	if (st == nullptr) st = BaseStation::GetByTile(trigger_tile);
+	assert(st != nullptr);
 
 	/* Check the cached animation trigger bitmask to see if we need
 	 * to bother with any further processing. */
-	if (!HasBit(st->cached_anim_triggers, trigger)) return;
+	if (!st->cached_anim_triggers.Test(trigger)) return;
 
 	uint16_t random_bits = Random();
-	ETileArea area = ETileArea(st, trigger_tile, tas[trigger]);
+	ETileArea area = ETileArea(st, trigger_tile, tas[static_cast<size_t>(trigger)]);
 
 	/* Check all tiles over the station to check if the specindex is still in use */
 	for (TileIndex tile : area) {
 		if (st->TileBelongsToRailStation(tile)) {
 			const StationSpec *ss = GetStationSpec(tile);
-			if (ss != nullptr && HasBit(ss->animation.triggers, trigger)) {
-				uint8_t local_cargo;
-				if (!IsValidCargoType(cargo_type)) {
-					local_cargo = UINT8_MAX;
-				} else {
-					local_cargo = ss->grf_prop.grffile->cargo_map[cargo_type];
+			if (ss != nullptr && ss->animation.triggers.Test(trigger)) {
+				uint8_t var18_extra = 0;
+				if (IsValidCargoType(cargo_type)) {
+					var18_extra |= ss->grf_prop.grffile->cargo_map[cargo_type] << 8;
 				}
-				StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIM_START_STOP, ss, st, tile, (random_bits << 16) | GB(Random(), 0, 16), (uint8_t)trigger | (local_cargo << 8));
+				StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIMATION_TRIGGER, ss, st, tile, (random_bits << 16) | GB(Random(), 0, 16), to_underlying(trigger) | var18_extra);
 			}
 		}
 	}
@@ -943,30 +936,33 @@ void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAni
  * @param trigger trigger type
  * @param cargo_type cargo type causing trigger
  */
-void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRandomTrigger trigger, CargoType cargo_type)
+void TriggerStationRandomisation(BaseStation *st, TileIndex trigger_tile, StationRandomTrigger trigger, CargoType cargo_type)
 {
 	/* List of coverage areas for each animation trigger */
 	static const TriggerArea tas[] = {
 		TA_WHOLE, TA_WHOLE, TA_PLATFORM, TA_PLATFORM, TA_PLATFORM, TA_PLATFORM
 	};
 
-	/* Get Station if it wasn't supplied */
-	if (st == nullptr) st = Station::GetByTile(trigger_tile);
+	assert(st != nullptr);
 
 	/* Check the cached cargo trigger bitmask to see if we need
-	 * to bother with any further processing. */
+	 * to bother with any further processing.
+	 * Note: cached_cargo_triggers must be non-zero even for cargo-independent triggers. */
 	if (st->cached_cargo_triggers == 0) return;
 	if (IsValidCargoType(cargo_type) && !HasBit(st->cached_cargo_triggers, cargo_type)) return;
 
 	uint32_t whole_reseed = 0;
-	ETileArea area = ETileArea(st, trigger_tile, tas[trigger]);
+	ETileArea area = ETileArea(st, trigger_tile, tas[static_cast<size_t>(trigger)]);
 
 	/* Bitmask of completely empty cargo types to be matched. */
-	CargoTypes empty_mask = (trigger == SRT_CARGO_TAKEN) ? GetEmptyMask(st) : 0;
+	CargoTypes empty_mask{};
+	if (trigger == StationRandomTrigger::CargoTaken) {
+		empty_mask = GetEmptyMask(Station::From(st));
+	}
 
 	/* Store triggers now for var 5F */
-	SetBit(st->waiting_triggers, trigger);
-	uint32_t used_triggers = 0;
+	st->waiting_random_triggers.Set(trigger);
+	StationRandomTriggers used_random_triggers;
 
 	/* Check all tiles over the station to check if the specindex is still in use */
 	for (TileIndex tile : area) {
@@ -976,18 +972,17 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
 
 			/* Cargo taken "will only be triggered if all of those
 			 * cargo types have no more cargo waiting." */
-			if (trigger == SRT_CARGO_TAKEN) {
+			if (trigger == StationRandomTrigger::CargoTaken) {
 				if ((ss->cargo_triggers & ~empty_mask) != 0) continue;
 			}
 
 			if (!IsValidCargoType(cargo_type) || HasBit(ss->cargo_triggers, cargo_type)) {
 				StationResolverObject object(ss, st, tile, CBID_RANDOM_TRIGGER, 0);
-				object.waiting_triggers = st->waiting_triggers;
+				object.SetWaitingRandomTriggers(st->waiting_random_triggers);
 
-				const SpriteGroup *group = object.Resolve();
-				if (group == nullptr) continue;
+				object.ResolveRerandomisation();
 
-				used_triggers |= object.used_triggers;
+				used_random_triggers.Set(object.GetUsedRandomTriggers());
 
 				uint32_t reseed = object.GetReseedSum();
 				if (reseed != 0) {
@@ -1007,7 +1002,7 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
 	}
 
 	/* Update whole station random bits */
-	st->waiting_triggers &= ~used_triggers;
+	st->waiting_random_triggers.Reset(used_random_triggers);
 	if ((whole_reseed & 0xFFFF) != 0) {
 		st->random_bits &= ~whole_reseed;
 		st->random_bits |= Random() & whole_reseed;
@@ -1020,14 +1015,14 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
  */
 void StationUpdateCachedTriggers(BaseStation *st)
 {
-	st->cached_anim_triggers = 0;
+	st->cached_anim_triggers = {};
 	st->cached_cargo_triggers = 0;
 
 	/* Combine animation trigger bitmask for all station specs
 	 * of this station. */
 	for (const auto &sm : GetStationSpecList<StationSpec>(st)) {
 		if (sm.spec == nullptr) continue;
-		st->cached_anim_triggers |= sm.spec->animation.triggers;
+		st->cached_anim_triggers.Set(sm.spec->animation.triggers);
 		st->cached_cargo_triggers |= sm.spec->cargo_triggers;
 	}
 }
diff --git a/src/newgrf_station.h b/src/newgrf_station.h
index bc66263700..1b74f90e80 100644
--- a/src/newgrf_station.h
+++ b/src/newgrf_station.h
@@ -30,6 +30,21 @@ struct StationScopeResolver : public ScopeResolver {
 	CargoType cargo_type;                 ///< Type of cargo of the station.
 	Axis axis;                          ///< Station axis, used only for the slope check callback.
 
+	/**
+	 * Station variable cache
+	 * This caches 'expensive' station variable lookups which iterate over
+	 * several tiles that may be called multiple times per Resolve().
+	 */
+	struct Cache {
+		std::optional<uint32_t> v40;
+		std::optional<uint32_t> v41;
+		std::optional<uint32_t> v45;
+		std::optional<uint32_t> v46;
+		std::optional<uint32_t> v47;
+		std::optional<uint32_t> v49;
+	};
+	mutable Cache cache;
+
 	/**
 	 * Constructor for station scopes.
 	 * @param ro Surrounding resolver.
@@ -43,13 +58,13 @@ struct StationScopeResolver : public ScopeResolver {
 	}
 
 	uint32_t GetRandomBits() const override;
-	uint32_t GetTriggers() const override;
+	uint32_t GetRandomTriggers() const override;
 
 	uint32_t GetVariable(uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const override;
 };
 
 /** Station resolver. */
-struct StationResolverObject : public ResolverObject {
+struct StationResolverObject : public SpecializedResolverObject<StationRandomTriggers> {
 	StationScopeResolver station_scope; ///< The station scope resolver.
 	std::optional<TownScopeResolver> town_scope = std::nullopt; ///< The town scope resolver (created on the first call).
 
@@ -75,7 +90,7 @@ struct StationResolverObject : public ResolverObject {
 		}
 	}
 
-	const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
+	const SpriteGroup *ResolveReal(const RealSpriteGroup &group) const override;
 
 	GrfSpecFeature GetFeature() const override;
 	uint32_t GetDebugID() const override;
@@ -103,30 +118,15 @@ enum class StationSpecFlag : uint8_t {
 };
 using StationSpecFlags = EnumBitSet<StationSpecFlag, uint8_t>;
 
-/** Randomisation triggers for stations */
-enum StationRandomTrigger : uint8_t {
-	SRT_NEW_CARGO,        ///< Trigger station on new cargo arrival.
-	SRT_CARGO_TAKEN,      ///< Trigger station when cargo is completely taken.
-	SRT_TRAIN_ARRIVES,    ///< Trigger platform when train arrives.
-	SRT_TRAIN_DEPARTS,    ///< Trigger platform when train leaves.
-	SRT_TRAIN_LOADS,      ///< Trigger platform when train loads/unloads.
-	SRT_PATH_RESERVATION, ///< Trigger platform when train reserves path.
-};
-
 /** Station specification. */
 struct StationSpec : NewGRFSpecBase<StationClassID> {
 	StationSpec() : name(0),
 		disallowed_platforms(0), disallowed_lengths(0),
 		cargo_threshold(0), cargo_triggers(0),
-		callback_mask(0), flags(0),
-		animation({0, 0, 0, 0}) {}
-	/**
-	 * Properties related the the grf file.
-	 * NUM_CARGO real cargo plus three pseudo cargo sprite groups.
-	 * Used for obtaining the sprite offset of custom sprites, and for
-	 * evaluating callbacks.
-	 */
-	VariableGRFFileProps grf_prop;
+		callback_mask(0), flags(0)
+	{}
+
+	CargoGRFFileProps grf_prop; ///< Link to NewGRF
 	StringID name;             ///< Name of this station.
 
 	/**
@@ -170,7 +170,7 @@ struct StationSpec : NewGRFSpecBase<StationClassID> {
 	using TileFlags = EnumBitSet<TileFlag, uint8_t>;
 	std::vector<TileFlags> tileflags; ///< List of tile flags.
 
-	AnimationInfo animation;
+	AnimationInfo<StationAnimationTriggers> animation;
 
 	/** Custom platform layouts, keyed by platform and length combined. */
 	std::unordered_map<uint16_t, std::vector<uint8_t>> layouts;
@@ -208,8 +208,9 @@ inline bool IsWaypointClass(const StationClass &cls)
 uint32_t GetPlatformInfo(Axis axis, uint8_t tile, int platforms, int length, int x, int y, bool centred);
 
 SpriteID GetCustomStationRelocation(const StationSpec *statspec, BaseStation *st, TileIndex tile, uint32_t var10 = 0);
+void GetCustomStationRelocation(SpriteLayoutProcessor &processor, const StationSpec *statspec, BaseStation *st, TileIndex tile);
 SpriteID GetCustomStationFoundationRelocation(const StationSpec *statspec, BaseStation *st, TileIndex tile, uint layout, uint edge_info);
-uint16_t GetStationCallback(CallbackID callback, uint32_t param1, uint32_t param2, const StationSpec *statspec, BaseStation *st, TileIndex tile);
+uint16_t GetStationCallback(CallbackID callback, uint32_t param1, uint32_t param2, const StationSpec *statspec, BaseStation *st, TileIndex tile, std::span<int32_t> regs100 = {});
 CommandCost PerformStationTileSlopeCheck(TileIndex north_tile, TileIndex cur_tile, const StationSpec *statspec, Axis axis, uint8_t plat_len, uint8_t numtracks);
 
 /* Allocate a StationSpec to a Station. This is called once per build operation. */
@@ -223,7 +224,7 @@ bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID
 
 void AnimateStationTile(TileIndex tile);
 void TriggerStationAnimation(BaseStation *st, TileIndex tile, StationAnimationTrigger trigger, CargoType cargo_type = INVALID_CARGO);
-void TriggerStationRandomisation(Station *st, TileIndex tile, StationRandomTrigger trigger, CargoType cargo_type = INVALID_CARGO);
+void TriggerStationRandomisation(BaseStation *st, TileIndex tile, StationRandomTrigger trigger, CargoType cargo_type = INVALID_CARGO);
 void StationUpdateCachedTriggers(BaseStation *st);
 
 #endif /* NEWGRF_STATION_H */
diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
index fdc7e14138..85f8047d79 100644
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -11,6 +11,7 @@
 #define NEWGRF_STORAGE_H
 
 #include "core/pool_type.hpp"
+#include "newgrf.h"
 #include "tile_type.h"
 
 /**
@@ -31,7 +32,7 @@ enum PersistentStorageMode : uint8_t {
  */
 struct BasePersistentStorageArray {
 	uint32_t grfid = 0; ///< GRFID associated to this persistent storage. A value of zero means "default".
-	uint8_t feature = 0; ///< NOSAVE: Used to identify in the owner of the array in debug output.
+	GrfSpecFeature feature = GSF_INVALID; ///< NOSAVE: Used to identify in the owner of the array in debug output.
 	TileIndex tile = INVALID_TILE; ///< NOSAVE: Used to identify in the owner of the array in debug output.
 
 	virtual ~BasePersistentStorageArray();
@@ -197,7 +198,7 @@ extern PersistentStoragePool _persistent_storage_pool;
  */
 struct PersistentStorage : PersistentStorageArray<int32_t, 256>, PersistentStoragePool::PoolItem<&_persistent_storage_pool> {
 	/** We don't want GCC to zero our struct! It already is zeroed and has an index! */
-	PersistentStorage(const uint32_t new_grfid, uint8_t feature, TileIndex tile)
+	PersistentStorage(const uint32_t new_grfid, GrfSpecFeature feature, TileIndex tile)
 	{
 		this->grfid = new_grfid;
 		this->feature = feature;
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp
index 3deb92a221..3480598032 100644
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -28,7 +28,9 @@
 #include "debug.h"
 #include "core/alloc_type.hpp"
 #include "core/string_builder.hpp"
+#include "core/string_consumer.hpp"
 #include "language.h"
+#include <ranges>
 
 #include "table/strings.h"
 #include "table/control_codes.h"
@@ -72,7 +74,7 @@ struct GRFTextEntry {
 };
 
 
-static ReferenceThroughBaseContainer<std::vector<GRFTextEntry>> _grf_text;
+static TypedIndexContainer<std::vector<GRFTextEntry>, StringIndexInTab> _grf_text;
 static uint8_t _current_lang_id = GRFLX_ENGLISH;  ///< by default, english is used.
 
 /**
@@ -238,17 +240,10 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 	/* Empty input string? Nothing to do here. */
 	if (str.empty()) return {};
 
-	std::string_view::const_iterator src = str.cbegin();
+	StringConsumer consumer(str);
 
 	/* Is this an unicode string? */
-	bool unicode = false;
-	char32_t marker;
-	size_t len = Utf8Decode(&marker, &*src);
-
-	if (marker == NFO_UTF8_IDENTIFIER) {
-		unicode = true;
-		src += len;
-	}
+	bool unicode = consumer.ReadUtf8If(NFO_UTF8_IDENTIFIER);
 
 	/* Helper variable for a possible (string) mapping of plural/gender and cases. */
 	std::optional<UnmappedChoiceList> mapping_pg, mapping_c;
@@ -256,29 +251,27 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 
 	std::string dest;
 	StringBuilder builder(dest);
-	while (src != str.cend()) {
+	while (consumer.AnyBytesLeft()) {
 		char32_t c;
-
-		if (unicode && Utf8EncodedCharLen(*src) != 0) {
-			c = Utf8Consume(src);
+		if (auto u = unicode ? consumer.TryReadUtf8() : std::nullopt; u.has_value()) {
+			c = *u;
 			/* 'Magic' range of control codes. */
-			if (GB(c, 8, 8) == 0xE0) {
-				c = GB(c, 0, 8);
+			if (0xE000 <= c && c <= 0xE0FF) {
+				c -= 0xE000;
 			} else if (c >= 0x20) {
 				if (!IsValidChar(c, CS_ALPHANUMERAL)) c = '?';
 				builder.PutUtf8(c);
 				continue;
 			}
 		} else {
-			c = static_cast<uint8_t>(*src++);
+			c = consumer.ReadUint8(); // read as unsigned, otherwise integer promotion breaks it
 		}
-
+		assert(c <= 0xFF);
 		if (c == '\0') break;
 
 		switch (c) {
 			case 0x01:
-				if (*src == '\0') goto string_end;
-				src++;
+				consumer.SkipUint8();
 				builder.PutChar(' ');
 				break;
 			case 0x0A: break;
@@ -292,8 +285,8 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 			case 0x0E: builder.PutUtf8(SCC_TINYFONT); break;
 			case 0x0F: builder.PutUtf8(SCC_BIGFONT); break;
 			case 0x1F:
-				if (src[0] == '\0' || src[1] == '\0') goto string_end;
-				src += 2;
+				consumer.SkipUint8();
+				consumer.SkipUint8();
 				builder.PutChar(' ');
 				break;
 			case 0x7B:
@@ -304,10 +297,7 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 			case 0x80: builder.PutUtf8(byte80); break;
 			case 0x81:
 			{
-				if (src[0] == '\0' || src[1] == '\0') goto string_end;
-				uint16_t string;
-				string = static_cast<uint8_t>(*src++);
-				string |= static_cast<uint8_t>(*src++) << 8;
+				uint16_t string = consumer.ReadUint16LE();
 				builder.PutUtf8(SCC_NEWGRF_STRINL);
 				builder.PutUtf8(MapGRFStringID(grfid, GRFStringID{string}));
 				break;
@@ -337,7 +327,7 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 			case 0x98: builder.PutUtf8(SCC_BLACK);   break;
 			case 0x9A:
 			{
-				int code = *src++;
+				uint8_t code = consumer.ReadUint8();
 				switch (code) {
 					case 0x00: goto string_end;
 					case 0x01: builder.PutUtf8(SCC_NEWGRF_PRINT_QWORD_CURRENCY); break;
@@ -350,9 +340,7 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 						 * support this. As such it is not implemented in OpenTTD. */
 					case 0x03:
 					{
-						if (src[0] == '\0' || src[1] == '\0') goto string_end;
-						uint16_t tmp = static_cast<uint8_t>(*src++);
-						tmp |= static_cast<uint8_t>(*src++) << 8;
+						uint16_t tmp = consumer.ReadUint16LE();
 						builder.PutUtf8(SCC_NEWGRF_PUSH_WORD);
 						builder.PutUtf8(tmp);
 						break;
@@ -367,9 +355,8 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 					case 0x0E:
 					case 0x0F:
 					{
-						if (str[0] == '\0') goto string_end;
 						const LanguageMap *lm = LanguageMap::GetLanguageMap(grfid, language_id);
-						int index = *src++;
+						int index = consumer.ReadUint8();
 						int mapped = lm != nullptr ? lm->GetMapping(index, code == 0x0E) : -1;
 						if (mapped >= 0) {
 							builder.PutUtf8(code == 0x0E ? SCC_GENDER_INDEX : SCC_SET_CASE);
@@ -380,14 +367,13 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 
 					case 0x10:
 					case 0x11:
-						if (str[0] == '\0') goto string_end;
 						if (!mapping_pg.has_value() && !mapping_c.has_value()) {
-							if (code == 0x10) src++; // Skip the index
+							if (code == 0x10) consumer.SkipUint8(); // Skip the index
 							GrfMsg(1, "choice list {} marker found when not expected", code == 0x10 ? "next" : "default");
 							break;
 						} else {
 							auto &mapping = mapping_pg ? mapping_pg : mapping_c;
-							int index = (code == 0x10 ? *src++ : 0);
+							int index = (code == 0x10 ? consumer.ReadUint8() : 0);
 							if (mapping->strings.find(index) != mapping->strings.end()) {
 								GrfMsg(1, "duplicate choice list string, ignoring");
 							} else {
@@ -416,14 +402,13 @@ std::string TranslateTTDPatchCodes(uint32_t grfid, uint8_t language_id, bool all
 					case 0x14:
 					case 0x15: {
 						auto &mapping = code == 0x14 ? mapping_c : mapping_pg;
-						if (src[0] == '\0') goto string_end;
 						/* Case mapping can have nested plural/gender mapping. Otherwise nesting is invalid. */
 						if (mapping.has_value() || mapping_pg.has_value()) {
 							GrfMsg(1, "choice lists can't be stacked, it's going to get messy now...");
-							if (code != 0x14) src++;
+							if (code != 0x14) consumer.SkipUint8();
 						} else {
 							static const StringControlCode mp[] = { SCC_GENDER_LIST, SCC_SWITCH_CASE, SCC_PLURAL_LIST };
-							mapping.emplace(mp[code - 0x13], code == 0x14 ? 0 : *src++);
+							mapping.emplace(mp[code - 0x13], code == 0x14 ? 0 : consumer.ReadUint8());
 						}
 						break;
 					}
@@ -692,26 +677,26 @@ void CleanUpStrings()
 }
 
 struct TextRefStack {
-	std::array<uint8_t, 0x30> stack{};
-	uint8_t position = 0;
+private:
+	std::vector<uint8_t> stack;
+public:
 	const GRFFile *grffile = nullptr;
 
-	TextRefStack(const GRFFile *grffile, uint8_t num_entries) : grffile(grffile)
+	TextRefStack(const GRFFile *grffile, std::span<const int32_t> textstack) : grffile(grffile)
 	{
-		extern TemporaryStorageArray<int32_t, 0x110> _temp_store;
-
-		assert(num_entries < sizeof(uint32_t) * std::size(stack));
-
-		auto stack_it = this->stack.begin();
-		for (uint i = 0; i < num_entries; i++) {
-			uint32_t value = _temp_store.GetValue(0x100 + i);
-			for (uint j = 0; j < 32; j += 8) {
-				*stack_it++ = GB(value, j, 8);
-			}
+		this->stack.reserve(textstack.size() * 4 + 6); // for translations it is reasonable to push 3 word and rotate them
+		for (int32_t value : std::ranges::reverse_view(textstack)) {
+			this->PushDWord(value);
 		}
 	}
 
-	uint8_t  PopUnsignedByte()  { assert(this->position < this->stack.size()); return this->stack[this->position++]; }
+	uint8_t PopUnsignedByte()
+	{
+		if (this->stack.empty()) return 0;
+		auto res = this->stack.back();
+		this->stack.pop_back();
+		return res;
+	}
 	int8_t   PopSignedByte()    { return (int8_t)this->PopUnsignedByte(); }
 
 	uint16_t PopUnsignedWord()
@@ -738,22 +723,31 @@ struct TextRefStack {
 	/** Rotate the top four words down: W1, W2, W3, W4 -> W4, W1, W2, W3 */
 	void RotateTop4Words()
 	{
-		uint8_t tmp[2];
-		for (int i = 0; i  < 2; i++) tmp[i] = this->stack[this->position + i + 6];
-		for (int i = 5; i >= 0; i--) this->stack[this->position + i + 2] = this->stack[this->position + i];
-		for (int i = 0; i  < 2; i++) this->stack[this->position + i] = tmp[i];
+		auto w1 = this->PopUnsignedWord();
+		auto w2 = this->PopUnsignedWord();
+		auto w3 = this->PopUnsignedWord();
+		auto w4 = this->PopUnsignedWord();
+		this->PushWord(w3);
+		this->PushWord(w2);
+		this->PushWord(w1);
+		this->PushWord(w4);
 	}
 
-	void PushWord(uint16_t word)
+	void PushByte(uint8_t b)
 	{
-		if (this->position >= 2) {
-			this->position -= 2;
-		} else {
-			// Rotate right 2 positions
-			std::rotate(this->stack.rbegin(), this->stack.rbegin() + 2, this->stack.rend());
-		}
-		this->stack[this->position]     = GB(word, 0, 8);
-		this->stack[this->position + 1] = GB(word, 8, 8);
+		this->stack.push_back(b);
+	}
+
+	void PushWord(uint16_t w)
+	{
+		this->PushByte(GB(w, 8, 8));
+		this->PushByte(GB(w, 0, 8));
+	}
+
+	void PushDWord(uint32_t dw)
+	{
+		this->PushWord(GB(dw, 16, 16));
+		this->PushWord(GB(dw, 0, 16));
 	}
 };
 
@@ -762,11 +756,11 @@ static void HandleNewGRFStringControlCodes(std::string_view str, TextRefStack &s
 /**
  * Process NewGRF string control code instructions.
  * @param scc The string control code that has been read.
- * @param str The string that we are reading from.
+ * @param consumer The string that we are reading from.
  * @param stack The TextRefStack.
  * @param[out] params Output parameters
  */
-static void ProcessNewGRFStringControlCode(char32_t scc, const char *&str, TextRefStack &stack, std::vector<StringParameter> &params)
+static void ProcessNewGRFStringControlCode(char32_t scc, StringConsumer &consumer, TextRefStack &stack, std::vector<StringParameter> &params)
 {
 	/* There is data on the NewGRF text stack, and we want to move them to OpenTTD's string stack.
 	 * After this call, a new call is made with `modify_parameters` set to false when the string is finally formatted. */
@@ -774,33 +768,35 @@ static void ProcessNewGRFStringControlCode(char32_t scc, const char *&str, TextR
 		default: return;
 
 		case SCC_PLURAL_LIST:
-			++str; // plural form
+			consumer.SkipUint8(); // plural form
 			[[fallthrough]];
 		case SCC_GENDER_LIST: {
-			++str; // offset
+			consumer.SkipUint8(); // offset
 			/* plural and gender choices cannot contain any string commands, so just skip the whole thing */
-			uint num = static_cast<uint8_t>(*str++);
+			uint num = consumer.ReadUint8();
 			uint total_len = 0;
 			for (uint i = 0; i != num; i++) {
-				total_len += static_cast<uint8_t>(*str++);
+				total_len += consumer.ReadUint8();
 			}
-			str += total_len;
+			consumer.Skip(total_len);
 			break;
 		}
 
 		case SCC_SWITCH_CASE: {
 			/* skip all cases and continue with default case */
-			uint num = static_cast<uint8_t>(*str++);
+			uint num = consumer.ReadUint8();
 			for (uint i = 0; i != num; i++) {
-				str += 3 + static_cast<uint8_t>(str[1]) + (static_cast<uint8_t>(str[2]) << 8);
+				consumer.SkipUint8();
+				auto len = consumer.ReadUint16LE();
+				consumer.Skip(len);
 			}
-			str += 2; // length of default
+			consumer.SkipUint16LE(); // length of default
 			break;
 		}
 
 		case SCC_GENDER_INDEX:
 		case SCC_SET_CASE:
-			++str;
+			consumer.SkipUint8();
 			break;
 
 		case SCC_ARG_INDEX:
@@ -840,7 +836,7 @@ static void ProcessNewGRFStringControlCode(char32_t scc, const char *&str, TextR
 		case SCC_NEWGRF_DISCARD_WORD:           stack.PopUnsignedWord(); break;
 
 		case SCC_NEWGRF_ROTATE_TOP_4_WORDS:     stack.RotateTop4Words(); break;
-		case SCC_NEWGRF_PUSH_WORD:              stack.PushWord(Utf8Consume(&str)); break;
+		case SCC_NEWGRF_PUSH_WORD:              stack.PushWord(consumer.ReadUtf8(0)); break;
 
 		case SCC_NEWGRF_PRINT_WORD_CARGO_LONG:
 		case SCC_NEWGRF_PRINT_WORD_CARGO_SHORT:
@@ -850,7 +846,7 @@ static void ProcessNewGRFStringControlCode(char32_t scc, const char *&str, TextR
 			break;
 
 		case SCC_NEWGRF_STRINL: {
-			StringID stringid = Utf8Consume(str);
+			StringID stringid = consumer.ReadUtf8(STR_NULL);
 			/* We also need to handle the substring's stack usage. */
 			HandleNewGRFStringControlCodes(GetStringPtr(stringid), stack, params);
 			break;
@@ -875,10 +871,10 @@ static void ProcessNewGRFStringControlCode(char32_t scc, const char *&str, TextR
 /**
  * Emit OpenTTD's internal string code for the different NewGRF string codes.
  * @param scc NewGRF string code.
- * @param[in,out] str String iterator, moved forward if SCC_NEWGRF_PUSH_WORD is found.
+ * @param consumer String consumer, moved forward if SCC_NEWGRF_PUSH_WORD is found.
  * @returns String code to use.
  */
-char32_t RemapNewGRFStringControlCode(char32_t scc, const char **str)
+char32_t RemapNewGRFStringControlCode(char32_t scc, StringConsumer &consumer)
 {
 	switch (scc) {
 		default:
@@ -946,7 +942,7 @@ char32_t RemapNewGRFStringControlCode(char32_t scc, const char **str)
 
 		/* These NewGRF string codes modify the NewGRF stack or otherwise do not map to OpenTTD string codes. */
 		case SCC_NEWGRF_PUSH_WORD:
-			Utf8Consume(str);
+			consumer.SkipUtf8();
 			return 0;
 
 		case SCC_NEWGRF_DISCARD_WORD:
@@ -963,10 +959,10 @@ char32_t RemapNewGRFStringControlCode(char32_t scc, const char **str)
  */
 static void HandleNewGRFStringControlCodes(std::string_view str, TextRefStack &stack, std::vector<StringParameter> &params)
 {
-	for (const char *p = str.data(), *end = str.data() + str.size(); p < end; /* nothing */) {
-		char32_t scc;
-		p += Utf8Decode(&scc, p);
-		ProcessNewGRFStringControlCode(scc, p, stack, params);
+	StringConsumer consumer(str);
+	while (consumer.AnyBytesLeft()) {
+		char32_t scc = consumer.ReadUtf8();
+		ProcessNewGRFStringControlCode(scc, consumer, stack, params);
 	}
 }
 
@@ -974,10 +970,10 @@ static void HandleNewGRFStringControlCodes(std::string_view str, TextRefStack &s
  * Process the text ref stack for a GRF String and return its parameters.
  * @param grffile GRFFile of string.
  * @param stringid StringID of string.
- * @param num_entries Number of temporary storage registers to import.
+ * @param textstack Text parameter stack.
  * @returns Parameters for GRF string.
  */
-std::vector<StringParameter> GetGRFSringTextStackParameters(const GRFFile *grffile, StringID stringid, uint8_t num_entries)
+std::vector<StringParameter> GetGRFSringTextStackParameters(const GRFFile *grffile, StringID stringid, std::span<const int32_t> textstack)
 {
 	if (stringid == INVALID_STRING_ID) return {};
 
@@ -986,7 +982,7 @@ std::vector<StringParameter> GetGRFSringTextStackParameters(const GRFFile *grffi
 	std::vector<StringParameter> params;
 	params.reserve(20);
 
-	TextRefStack stack{grffile, num_entries};
+	TextRefStack stack{grffile, textstack};
 	HandleNewGRFStringControlCodes(str, stack, params);
 
 	return params;
@@ -996,12 +992,12 @@ std::vector<StringParameter> GetGRFSringTextStackParameters(const GRFFile *grffi
  * Format a GRF string using the text ref stack for parameters.
  * @param grffile GRFFile of string.
  * @param grfstringid GRFStringID of string.
- * @param num_entries Number of temporary storage registers to import.
+ * @param textstack Text parameter stack.
  * @returns Formatted string.
  */
-std::string GetGRFStringWithTextStack(const struct GRFFile *grffile, GRFStringID grfstringid, uint8_t num_entries)
+std::string GetGRFStringWithTextStack(const struct GRFFile *grffile, GRFStringID grfstringid, std::span<const int32_t> textstack)
 {
 	StringID stringid = GetGRFStringID(grffile->grfid, grfstringid);
-	auto params = GetGRFSringTextStackParameters(grffile, stringid, num_entries);
+	auto params = GetGRFSringTextStackParameters(grffile, stringid, textstack);
 	return GetStringWithArgs(stringid, params);
 }
diff --git a/src/newgrf_text.h b/src/newgrf_text.h
index b9dffd81ad..7442c1f9ec 100644
--- a/src/newgrf_text.h
+++ b/src/newgrf_text.h
@@ -28,7 +28,7 @@ void AddGRFTextToList(GRFTextWrapper &list, std::string_view text_to_add);
 
 bool CheckGrfLangID(uint8_t lang_id, uint8_t grf_version);
 
-std::vector<StringParameter> GetGRFSringTextStackParameters(const struct GRFFile *grffile, StringID stringid, uint8_t num_entries);
-std::string GetGRFStringWithTextStack(const struct GRFFile *grffile, GRFStringID grfstringid, uint8_t num_entries);
+std::vector<StringParameter> GetGRFSringTextStackParameters(const struct GRFFile *grffile, StringID stringid, std::span<const int32_t> textstack);
+std::string GetGRFStringWithTextStack(const struct GRFFile *grffile, GRFStringID grfstringid, std::span<const int32_t> textstack);
 
 #endif /* NEWGRF_TEXT_H */
diff --git a/src/newgrf_town.cpp b/src/newgrf_town.cpp
index 74baa8e4c0..64ed6a800e 100644
--- a/src/newgrf_town.cpp
+++ b/src/newgrf_town.cpp
@@ -36,7 +36,7 @@
 		/* Get a variable from the persistent storage */
 		case 0x7C: {
 			/* Check the persistent storage for the GrfID stored in register 100h. */
-			uint32_t grfid = GetRegister(0x100);
+			uint32_t grfid = static_cast<uint32_t>(this->ro.GetRegister(0x100));
 			if (grfid == 0xFFFFFFFF) {
 				if (this->ro.grffile == nullptr) return 0;
 				grfid = this->ro.grffile->grfid;
@@ -57,16 +57,16 @@
 		case 0x8A: return this->t->grow_counter / Ticks::TOWN_GROWTH_TICKS;
 		case 0x92: return this->t->flags;  // In original game, 0x92 and 0x93 are really one word. Since flags is a byte, this is to adjust
 		case 0x93: return 0;
-		case 0x94: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_EDGE]);
-		case 0x95: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_EDGE]), 8, 8);
-		case 0x96: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_OUTSKIRT]);
-		case 0x97: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_OUTSKIRT]), 8, 8);
-		case 0x98: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_OUTER_SUBURB]);
-		case 0x99: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_OUTER_SUBURB]), 8, 8);
-		case 0x9A: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_INNER_SUBURB]);
-		case 0x9B: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_INNER_SUBURB]), 8, 8);
-		case 0x9C: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_CENTRE]);
-		case 0x9D: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[HZB_TOWN_CENTRE]), 8, 8);
+		case 0x94: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]);
+		case 0x95: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]), 8, 8);
+		case 0x96: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownOutskirt)]);
+		case 0x97: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownOutskirt)]), 8, 8);
+		case 0x98: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownOuterSuburb)]);
+		case 0x99: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownOuterSuburb)]), 8, 8);
+		case 0x9A: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownInnerSuburb)]);
+		case 0x9B: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownInnerSuburb)]), 8, 8);
+		case 0x9C: return ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownCentre)]);
+		case 0x9D: return GB(ClampTo<uint16_t>(this->t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownCentre)]), 8, 8);
 		case 0x9E: return this->t->ratings[0];
 		case 0x9F: return GB(this->t->ratings[0], 8, 8);
 		case 0xA0: return this->t->ratings[1];
@@ -132,7 +132,7 @@
 	if (this->ro.grffile == nullptr) return;
 
 	/* Check the persistent storage for the GrfID stored in register 100h. */
-	uint32_t grfid = GetRegister(0x100);
+	uint32_t grfid = static_cast<uint32_t>(this->ro.GetRegister(0x100));
 
 	/* A NewGRF can only write in the persistent storage associated to its own GRFID. */
 	if (grfid == 0xFFFFFFFF) grfid = this->ro.grffile->grfid;
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index f9ca7a3601..351f559561 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -127,7 +127,7 @@ static constexpr NWidgetPart _nested_normal_news_widgets[] = {
 };
 
 static WindowDesc _normal_news_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	{},
 	_nested_normal_news_widgets
@@ -175,7 +175,7 @@ static constexpr NWidgetPart _nested_vehicle_news_widgets[] = {
 };
 
 static WindowDesc _vehicle_news_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	{},
 	_nested_vehicle_news_widgets
@@ -220,7 +220,7 @@ static constexpr NWidgetPart _nested_company_news_widgets[] = {
 };
 
 static WindowDesc _company_news_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	{},
 	_nested_company_news_widgets
@@ -254,7 +254,7 @@ static constexpr NWidgetPart _nested_thin_news_widgets[] = {
 };
 
 static WindowDesc _thin_news_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	{},
 	_nested_thin_news_widgets
@@ -290,7 +290,7 @@ static constexpr NWidgetPart _nested_small_news_widgets[] = {
 };
 
 static WindowDesc _small_news_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	{},
 	_nested_small_news_widgets
@@ -317,7 +317,7 @@ static WindowDesc &GetNewsWindowLayout(NewsStyle style)
 /**
  * Per-NewsType data
  */
-static NewsTypeData _news_type_data[] = {
+static const NewsTypeData _news_type_data[] = {
 	/*            name,                           age, sound,          */
 	NewsTypeData("news_display.arrival_player",    60, SND_1D_APPLAUSE ),  ///< NewsType::ArrivalCompany
 	NewsTypeData("news_display.arrival_other",     60, SND_1D_APPLAUSE ),  ///< NewsType::ArrivalOther
@@ -395,9 +395,9 @@ struct NewsWindow : Window {
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_N_VIEWPORT);
 		if (nvp != nullptr) {
 			if (std::holds_alternative<VehicleID>(ni->ref1)) {
-				nvp->InitializeViewport(this, std::get<VehicleID>(ni->ref1), ScaleZoomGUI(ZOOM_LVL_NEWS));
+				nvp->InitializeViewport(this, std::get<VehicleID>(ni->ref1), ScaleZoomGUI(ZoomLevel::News));
 			} else {
-				nvp->InitializeViewport(this, GetReferenceTile(ni->ref1), ScaleZoomGUI(ZOOM_LVL_NEWS));
+				nvp->InitializeViewport(this, GetReferenceTile(ni->ref1), ScaleZoomGUI(ZoomLevel::News));
 			}
 			if (this->ni->flags.Test(NewsFlag::NoTransparency)) nvp->disp_flags.Set(NWidgetDisplayFlag::NoTransparency);
 			if (!this->ni->flags.Test(NewsFlag::InColour)) {
@@ -550,7 +550,7 @@ struct NewsWindow : Window {
 			case WID_N_VEH_SPR: {
 				assert(std::holds_alternative<EngineID>(ni->ref1));
 				EngineID engine = std::get<EngineID>(this->ni->ref1);
-				DrawVehicleEngine(r.left, r.right, CenterBounds(r.left, r.right, 0), CenterBounds(r.top, r.bottom, 0), engine, GetEnginePalette(engine, _local_company), EIT_PREVIEW);
+				DrawVehicleEngine(r.left, r.right, CentreBounds(r.left, r.right, 0), CentreBounds(r.top, r.bottom, 0), engine, GetEnginePalette(engine, _local_company), EIT_PREVIEW);
 				GfxFillRect(r, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR);
 				break;
 			}
@@ -652,7 +652,7 @@ struct NewsWindow : Window {
 	 *
 	 * The interval of 210ms is chosen to maintain 15ms at normal zoom: 210 / GetCharacterHeight(FS_NORMAL) = 15ms.
 	 */
-	IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(210) / GetCharacterHeight(FS_NORMAL), [this](uint count) {
+	const IntervalTimer<TimerWindow> scroll_interval = {std::chrono::milliseconds(210) / GetCharacterHeight(FS_NORMAL), [this](uint count) {
 		int newtop = std::max(this->top - 2 * static_cast<int>(count), _screen.height - this->height - this->status_height - this->chat_height);
 		this->SetWindowTop(newtop);
 	}};
@@ -1214,7 +1214,7 @@ struct MessageHistoryWindow : Window {
 	{
 		if (widget == WID_MH_BACKGROUND) {
 			this->line_height = GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal;
-			resize.height = this->line_height;
+			fill.height = resize.height = this->line_height;
 
 			/* Months are off-by-one, so it's actually 8. Not using
 			 * month 12 because the 1 is usually less wide. */
diff --git a/src/news_type.h b/src/news_type.h
index f8a9d525cb..87387a0f0b 100644
--- a/src/news_type.h
+++ b/src/news_type.h
@@ -106,7 +106,7 @@ enum class NewsDisplay : uint8_t {
  * Per-NewsType data
  */
 struct NewsTypeData {
-	const char * const name;    ///< Name
+	const std::string_view name; ///< Name
 	const uint8_t age;             ///< Maximum age of news items (in days)
 	const SoundFx sound;        ///< Sound
 
@@ -116,7 +116,7 @@ struct NewsTypeData {
 	 * @param age The maximum age for these messages.
 	 * @param sound The sound to play.
 	 */
-	NewsTypeData(const char *name, uint8_t age, SoundFx sound) :
+	NewsTypeData(std::string_view name, uint8_t age, SoundFx sound) :
 		name(name),
 		age(age),
 		sound(sound)
diff --git a/src/object_base.h b/src/object_base.h
index 163f771c65..3f87fa429f 100644
--- a/src/object_base.h
+++ b/src/object_base.h
@@ -45,7 +45,7 @@ struct Object : ObjectPool::PoolItem<&_object_pool> {
 	static inline void IncTypeCount(ObjectType type)
 	{
 		assert(type < NUM_OBJECTS);
-		counts[type]++;
+		Object::counts[type]++;
 	}
 
 	/**
@@ -56,7 +56,7 @@ struct Object : ObjectPool::PoolItem<&_object_pool> {
 	static inline void DecTypeCount(ObjectType type)
 	{
 		assert(type < NUM_OBJECTS);
-		counts[type]--;
+		Object::counts[type]--;
 	}
 
 	/**
@@ -67,17 +67,17 @@ struct Object : ObjectPool::PoolItem<&_object_pool> {
 	static inline uint16_t GetTypeCount(ObjectType type)
 	{
 		assert(type < NUM_OBJECTS);
-		return counts[type];
+		return Object::counts[type];
 	}
 
 	/** Resets object counts. */
 	static inline void ResetTypeCounts()
 	{
-		memset(&counts, 0, sizeof(counts));
+		Object::counts.fill(0);
 	}
 
 protected:
-	static uint16_t counts[NUM_OBJECTS]; ///< Number of objects per type ingame
+	static std::array<uint16_t, NUM_OBJECTS> counts; ///< Number of objects per type ingame
 };
 
 /**
diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp
index 94af931e8a..0d3c7554a0 100644
--- a/src/object_cmd.cpp
+++ b/src/object_cmd.cpp
@@ -45,7 +45,7 @@
 
 ObjectPool _object_pool("Object");
 INSTANTIATE_POOL_METHODS(Object)
-uint16_t Object::counts[NUM_OBJECTS];
+/* static */ std::array<uint16_t, NUM_OBJECTS> Object::counts;
 
 /**
  * Get the object associated with a tile.
@@ -130,26 +130,33 @@ void BuildObject(ObjectType type, TileIndex tile, CompanyID owner, Town *town, u
 	}
 
 	Object::IncTypeCount(type);
-	if (spec->flags.Test(ObjectFlag::Animation)) TriggerObjectAnimation(o, OAT_BUILT, spec);
+	if (spec->flags.Test(ObjectFlag::Animation)) TriggerObjectAnimation(o, ObjectAnimationTrigger::Built, spec);
 }
 
 /**
- * Increase the animation stage of a whole structure.
- * @param tile The tile of the structure.
+ * Increase the HQ size.
+ * @param tile The (northern) tile of the company HQ.
  */
-static void IncreaseAnimationStage(TileIndex tile)
+static void IncreaseCompanyHQSize(TileIndex tile)
 {
 	TileArea ta = Object::GetByTile(tile)->location;
 	for (TileIndex t : ta) {
+		/* We encode the company HQ size in the animation state. */
 		SetAnimationFrame(t, GetAnimationFrame(t) + 1);
 		MarkTileDirtyByTile(t);
 	}
 }
 
-/** We encode the company HQ size in the animation stage. */
-#define GetCompanyHQSize GetAnimationFrame
-/** We encode the company HQ size in the animation stage. */
-#define IncreaseCompanyHQSize IncreaseAnimationStage
+/**
+ * Get the size of the HQ.
+ * @param tile The (northern) tile of the company HQ.
+ * @return HQ size.
+ */
+static uint8_t GetCompanyHQSize(TileIndex tile)
+{
+	/* We encode the company HQ size in the animation state. */
+	return GetAnimationFrame(tile);
+}
 
 /**
  * Update the CompanyHQ to the state associated with the given score
@@ -191,7 +198,7 @@ void UpdateObjectColours(const Company *c)
 	}
 }
 
-extern CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z, bool allow_steep, bool check_bridge);
+extern CommandCost CheckBuildableTile(TileIndex tile, DiagDirections invalid_dirs, int &allowed_z, bool allow_steep, bool check_bridge);
 static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlags flags);
 
 /**
@@ -240,7 +247,7 @@ CommandCost CmdBuildObject(DoCommandFlags flags, TileIndex tile, ObjectType type
 				if (!IsWaterTile(t)) {
 					/* Normal water tiles don't have to be cleared. For all other tile types clear
 					 * the tile but leave the water. */
-					cost.AddCost(Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::NoWater).Reset(DoCommandFlag::Execute), t));
+					cost.AddCost(Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlags{flags}.Reset({DoCommandFlag::NoWater, DoCommandFlag::Execute}), t));
 				} else {
 					/* Can't build on water owned by another company. */
 					Owner o = GetTileOwner(t);
@@ -269,17 +276,18 @@ CommandCost CmdBuildObject(DoCommandFlags flags, TileIndex tile, ObjectType type
 
 		for (TileIndex t : ta) {
 			uint16_t callback = CALLBACK_FAILED;
+			std::array<int32_t, 16> regs100;
 			if (spec->callback_mask.Test(ObjectCallbackMask::SlopeCheck)) {
 				TileIndex diff = t - tile;
-				callback = GetObjectCallback(CBID_OBJECT_LAND_SLOPE_CHECK, GetTileSlope(t), TileY(diff) << 4 | TileX(diff), spec, nullptr, t, view);
+				callback = GetObjectCallback(CBID_OBJECT_LAND_SLOPE_CHECK, GetTileSlope(t), TileY(diff) << 4 | TileX(diff), spec, nullptr, t, regs100, view);
 			}
 
 			if (callback == CALLBACK_FAILED) {
-				cost.AddCost(CheckBuildableTile(t, 0, allowed_z, false, false));
+				cost.AddCost(CheckBuildableTile(t, {}, allowed_z, false, false));
 			} else {
 				/* The meaning of bit 10 is inverted for a grf version < 8. */
 				if (spec->grf_prop.grffile->grf_version < 8) ToggleBit(callback, 10);
-				CommandCost ret = GetErrorMessageFromLocationCallbackResult(callback, spec->grf_prop.grffile, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
+				CommandCost ret = GetErrorMessageFromLocationCallbackResult(callback, regs100, spec->grf_prop.grffile, STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
 				if (ret.Failed()) return ret;
 			}
 		}
@@ -443,7 +451,7 @@ static void DrawTile_Object(TileInfo *ti)
 	if (type < NEW_OBJECT_OFFSET) {
 		const DrawTileSprites *dts = nullptr;
 		Owner to = GetTileOwner(ti->tile);
-		PaletteID palette = to == OWNER_NONE ? PAL_NONE : COMPANY_SPRITE_COLOUR(to);
+		PaletteID palette = to == OWNER_NONE ? PAL_NONE : GetCompanyPalette(to);
 
 		if (type == OBJECT_HQ) {
 			TileIndex diff = ti->tile - Object::GetByTile(ti->tile)->location.tile;
@@ -564,7 +572,7 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlags flags)
 		} else if (CheckTileOwnership(tile).Failed()) {
 			/* We don't own it!. */
 			return CommandCost(STR_ERROR_OWNED_BY);
-		} else if (spec->flags.All({ObjectFlag::CannotRemove, ObjectFlag::Autoremove})) {
+		} else if (spec->flags.Test(ObjectFlag::CannotRemove) && !spec->flags.Test(ObjectFlag::Autoremove)) {
 			/* In the game editor or with cheats we can remove, otherwise we can't. */
 			if (!_cheats.magic_bulldozer.value) {
 				if (type == OBJECT_HQ) return CommandCost(STR_ERROR_COMPANY_HEADQUARTERS_IN);
@@ -669,8 +677,8 @@ static void TileLoop_Object(TileIndex tile)
 	const ObjectSpec *spec = ObjectSpec::GetByTile(tile);
 	if (spec->flags.Test(ObjectFlag::Animation)) {
 		Object *o = Object::GetByTile(tile);
-		TriggerObjectTileAnimation(o, tile, OAT_TILELOOP, spec);
-		if (o->location.tile == tile) TriggerObjectAnimation(o, OAT_256_TICKS, spec);
+		TriggerObjectTileAnimation(o, tile, ObjectAnimationTrigger::TileLoop, spec);
+		if (o->location.tile == tile) TriggerObjectAnimation(o, ObjectAnimationTrigger::TileLoopNorth, spec);
 	}
 
 	if (IsTileOnWater(tile)) TileLoop_Water(tile);
@@ -737,16 +745,6 @@ static void AnimateTile_Object(TileIndex tile)
 	AnimateNewObjectTile(tile);
 }
 
-/**
- * Helper function for \c CircularTileSearch.
- * @param tile The tile to check.
- * @return True iff the tile has a radio tower.
- */
-static bool HasTransmitter(TileIndex tile, void *)
-{
-	return IsObjectTypeTile(tile, OBJECT_TRANSMITTER);
-}
-
 /**
  * Try to build a lighthouse.
  * @return True iff building a lighthouse succeeded.
@@ -798,9 +796,9 @@ static bool TryBuildTransmitter()
 	TileIndex tile = RandomTile();
 	int h;
 	if (IsTileType(tile, MP_CLEAR) && IsTileFlat(tile, &h) && h >= 4 && !IsBridgeAbove(tile)) {
-		TileIndex t = tile;
-		if (CircularTileSearch(&t, 9, HasTransmitter, nullptr)) return false;
-
+		for (auto t : SpiralTileSequence(tile, 9)) {
+			if (IsObjectTypeTile(t, OBJECT_TRANSMITTER)) return false;
+		}
 		BuildObject(OBJECT_TRANSMITTER, tile);
 		return true;
 	}
diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index e02fa8faf0..dc80fbc8c6 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -12,7 +12,7 @@
 #include "company_func.h"
 #include "hotkeys.h"
 #include "newgrf.h"
-#include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "newgrf_object.h"
 #include "newgrf_text.h"
 #include "object.h"
@@ -187,6 +187,8 @@ public:
 
 			case WID_BO_INFO:
 				size.height = this->info_height;
+				fill.height = this->has_class_picker ? 0 : 1;
+				resize.height = this->has_class_picker ? 0 : 1;
 				break;
 
 			default:
@@ -237,15 +239,19 @@ public:
 
 				/* Get the extra message for the GUI */
 				if (spec->callback_mask.Test(ObjectCallbackMask::FundMoreText)) {
-					uint16_t callback_res = GetObjectCallback(CBID_OBJECT_FUND_MORE_TEXT, 0, 0, spec, nullptr, INVALID_TILE, _object_gui.sel_view);
+					std::array<int32_t, 16> regs100;
+					uint16_t callback_res = GetObjectCallback(CBID_OBJECT_FUND_MORE_TEXT, 0, 0, spec, nullptr, INVALID_TILE, regs100, _object_gui.sel_view);
 					if (callback_res != CALLBACK_FAILED && callback_res != 0x400) {
-						if (callback_res > 0x400) {
+						std::string str;
+						if (callback_res == 0x40F) {
+							str = GetGRFStringWithTextStack(spec->grf_prop.grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+						} else if (callback_res > 0x400) {
 							ErrorUnknownCallbackResult(spec->grf_prop.grfid, CBID_OBJECT_FUND_MORE_TEXT, callback_res);
 						} else {
-							std::string str = GetGRFStringWithTextStack(spec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback_res, 6);
-							if (!str.empty()) {
-								tr.top = DrawStringMultiLine(tr, str, TC_ORANGE);
-							}
+							str = GetGRFStringWithTextStack(spec->grf_prop.grffile, GRFSTR_MISC_GRF_TEXT + callback_res, regs100);
+						}
+						if (!str.empty()) {
+							tr.top = DrawStringMultiLine(tr, str, TC_ORANGE);
 						}
 					}
 				}
diff --git a/src/object_type.h b/src/object_type.h
index 8720f8dea3..fe5137d79a 100644
--- a/src/object_type.h
+++ b/src/object_type.h
@@ -32,4 +32,12 @@ using ObjectID = PoolID<uint32_t, struct ObjectIDTag, 0xFF0000, 0xFFFFFFFF>;
 struct Object;
 struct ObjectSpec;
 
+/** Animation triggers for objects. */
+enum class ObjectAnimationTrigger : uint8_t {
+	Built, ///< Triggered when the object is built (for all tiles at the same time).
+	TileLoop, ///< Triggered in the periodic tile loop.
+	TileLoopNorth, ///< Triggered every 256 ticks (for all tiles at the same time).
+};
+using ObjectAnimationTriggers = EnumBitSet<ObjectAnimationTrigger, uint16_t>;
+
 #endif /* OBJECT_TYPE_H */
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 6d5dd18ad9..10ea0951e0 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -27,6 +27,7 @@
 #include "saveload/saveload.h"
 #include "company_cmd.h"
 #include "company_func.h"
+#include "company_gui.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "fios.h"
@@ -79,6 +80,7 @@
 #include "timer/timer_game_realtime.h"
 #include "timer/timer_game_tick.h"
 #include "social_integration.h"
+#include "core/string_consumer.hpp"
 
 #include "linkgraph/linkgraphschedule.h"
 
@@ -102,7 +104,7 @@ bool HandleBootstrap();
 extern void CheckCaches();
 extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = CompanyID::Invalid());
 extern void OSOpenBrowser(const std::string &url);
-extern void ShowOSErrorBox(const char *buf, bool system);
+extern void ShowOSErrorBox(std::string_view buf, bool system);
 extern std::string _config_file;
 
 bool _save_config = false;
@@ -116,7 +118,7 @@ NewGRFScanCallback *_request_newgrf_scan_callback = nullptr;
  */
 void UserErrorI(const std::string &str)
 {
-	ShowOSErrorBox(str.c_str(), false);
+	ShowOSErrorBox(str, false);
 	if (VideoDriver::GetInstance() != nullptr) VideoDriver::GetInstance()->Stop();
 
 #ifdef __EMSCRIPTEN__
@@ -138,7 +140,7 @@ void UserErrorI(const std::string &str)
 void FatalErrorI(const std::string &str)
 {
 	if (VideoDriver::GetInstance() == nullptr || VideoDriver::GetInstance()->HasGUI()) {
-		ShowOSErrorBox(str.c_str(), true);
+		ShowOSErrorBox(str, true);
 	}
 
 	/* Set the error message for the crash log and then invoke it. */
@@ -236,19 +238,19 @@ static void WriteSavegameInfo(const std::string &name)
 
 	std::string message;
 	message.reserve(1024);
-	fmt::format_to(std::back_inserter(message), "Name:         {}\n", name);
-	fmt::format_to(std::back_inserter(message), "Savegame ver: {}\n", _sl_version);
-	fmt::format_to(std::back_inserter(message), "NewGRF ver:   0x{:08X}\n", last_ottd_rev);
-	fmt::format_to(std::back_inserter(message), "Modified:     {}\n", ever_modified);
+	format_append(message, "Name:         {}\n", name);
+	format_append(message, "Savegame ver: {}\n", _sl_version);
+	format_append(message, "NewGRF ver:   0x{:08X}\n", last_ottd_rev);
+	format_append(message, "Modified:     {}\n", ever_modified);
 
 	if (removed_newgrfs) {
-		fmt::format_to(std::back_inserter(message), "NewGRFs have been removed\n");
+		format_append(message, "NewGRFs have been removed\n");
 	}
 
 	message += "NewGRFs:\n";
 	if (_load_check_data.HasNewGrfs()) {
 		for (const auto &c : _load_check_data.grfconfig) {
-			fmt::format_to(std::back_inserter(message), "{:08X} {} {}\n", std::byteswap(c->ident.grfid),
+			format_append(message, "{:08X} {} {}\n", std::byteswap(c->ident.grfid),
 				FormatArrayAsHex(c->flags.Test(GRFConfigFlag::Compatible) ? c->original_md5sum : c->ident.md5sum), c->filename);
 		}
 	}
@@ -269,16 +271,19 @@ static void WriteSavegameInfo(const std::string &name)
  * @param res variable to store the resolution in.
  * @param s   the string to decompose.
  */
-static void ParseResolution(Dimension *res, const char *s)
+static void ParseResolution(Dimension &res, std::string_view s)
 {
-	const char *t = strchr(s, 'x');
-	if (t == nullptr) {
+	StringConsumer consumer(s);
+	auto width = consumer.TryReadIntegerBase<uint>(10);
+	auto valid = consumer.ReadIf("x");
+	auto height = consumer.TryReadIntegerBase<uint>(10);
+	if (!width.has_value() || !valid || !height.has_value() || consumer.AnyBytesLeft()) {
 		ShowInfo("Invalid resolution '{}'", s);
 		return;
 	}
 
-	res->width  = std::max(std::strtoul(s, nullptr, 0), 64UL);
-	res->height = std::max(std::strtoul(t + 1, nullptr, 0), 64UL);
+	res.width  = std::max<uint>(*width, 64);
+	res.height = std::max<uint>(*height, 64);
 }
 
 
@@ -492,7 +497,7 @@ static std::vector<OptionData> CreateOptions()
  * @param arguments The command line arguments passed to the application.
  * @return 0 when there is no error.
  */
-int openttd_main(std::span<char * const> arguments)
+int openttd_main(std::span<std::string_view> arguments)
 {
 	_game_session_stats.start_time = std::chrono::steady_clock::now();
 	_game_session_stats.savegame_size = std::nullopt;
@@ -536,7 +541,7 @@ int openttd_main(std::span<char * const> arguments)
 			blitter = "null";
 			dedicated = true;
 			SetDebugString("net=4", ShowInfoI);
-			if (mgo.opt != nullptr) {
+			if (!mgo.opt.empty()) {
 				scanner->dedicated_host = ParseFullConnectionString(mgo.opt, scanner->dedicated_port);
 			}
 			break;
@@ -547,13 +552,19 @@ int openttd_main(std::span<char * const> arguments)
 		case 'p':
 			scanner->join_server_password = mgo.opt;
 			break;
-		case 'r': ParseResolution(&resolution, mgo.opt); break;
-		case 't': scanner->startyear = TimerGameCalendar::Year(atoi(mgo.opt)); break;
+		case 'r': ParseResolution(resolution, mgo.opt); break;
+		case 't':
+			if (auto value = ParseInteger(mgo.opt); value.has_value()) {
+				scanner->startyear = TimerGameCalendar::Year(*value);
+			} else {
+				fmt::print(stderr, "Invalid start year: {}\n", mgo.opt);
+			}
+			break;
 		case 'd': {
 #if defined(_WIN32)
 				CreateConsole();
 #endif
-				if (mgo.opt != nullptr) SetDebugString(mgo.opt, ShowInfoI);
+				if (!mgo.opt.empty()) SetDebugString(mgo.opt, ShowInfoI);
 				break;
 			}
 		case 'e':
@@ -566,10 +577,10 @@ int openttd_main(std::span<char * const> arguments)
 			}
 			break;
 		case 'g':
-			if (mgo.opt != nullptr) {
+			if (!mgo.opt.empty()) {
 				_file_to_saveload.name = mgo.opt;
 
-				std::string extension = FS2OTTD(std::filesystem::path(OTTD2FS(_file_to_saveload.name)).extension());
+				std::string extension = FS2OTTD(std::filesystem::path(OTTD2FS(_file_to_saveload.name)).extension().native());
 				auto [ft, _] = FiosGetSavegameListCallback(SLO_LOAD, _file_to_saveload.name, extension);
 				if (ft == FIOS_TYPE_INVALID) {
 					std::tie(ft, _) = FiosGetScenarioListCallback(SLO_LOAD, _file_to_saveload.name, extension);
@@ -579,14 +590,14 @@ int openttd_main(std::span<char * const> arguments)
 				}
 
 				/* Allow for '-e' before or after '-g'. */
-				switch (GetAbstractFileType(ft)) {
+				switch (ft.abstract) {
 					case FT_SAVEGAME: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME); break;
 					case FT_SCENARIO: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME); break;
 					case FT_HEIGHTMAP: _switch_mode = (_switch_mode == SM_EDITOR ? SM_LOAD_HEIGHTMAP : SM_START_HEIGHTMAP); break;
 					default: break;
 				}
 
-				_file_to_saveload.SetMode(SLO_LOAD, GetAbstractFileType(ft), GetDetailedFileType(ft));
+				_file_to_saveload.SetMode(ft, SLO_LOAD);
 				break;
 			}
 
@@ -598,12 +609,12 @@ int openttd_main(std::span<char * const> arguments)
 			break;
 		case 'q': {
 			DeterminePaths(arguments[0], only_local_path);
-			if (StrEmpty(mgo.opt)) {
+			if (mgo.opt.empty()) {
 				ret = 1;
 				return ret;
 			}
 
-			std::string extension = FS2OTTD(std::filesystem::path(OTTD2FS(mgo.opt)).extension());
+			std::string extension = FS2OTTD(std::filesystem::path(OTTD2FS(mgo.opt)).extension().native());
 			auto [_, title] = FiosGetSavegameListCallback(SLO_LOAD, mgo.opt, extension);
 
 			_load_check_data.Clear();
@@ -625,7 +636,13 @@ int openttd_main(std::span<char * const> arguments)
 			_skip_all_newgrf_scanning += 1;
 			break;
 		}
-		case 'G': scanner->generation_seed = std::strtoul(mgo.opt, nullptr, 10); break;
+		case 'G':
+			if (auto value = ParseInteger(mgo.opt); value.has_value()) {
+				scanner->generation_seed = *value;
+			} else {
+				fmt::print(stderr, "Invalid generation seed: {}\n", mgo.opt);
+			}
+			break;
 		case 'c': _config_file = mgo.opt; break;
 		case 'x': scanner->save_config = false; break;
 		case 'X': only_local_path = true; break;
@@ -743,7 +760,7 @@ int openttd_main(std::span<char * const> arguments)
 	InitializeSpriteSorter();
 
 	/* Initialize the zoom level of the screen to normal */
-	_screen.zoom = ZOOM_LVL_MIN;
+	_screen.zoom = ZoomLevel::Min;
 
 	/* The video driver is now selected, now initialise GUI zoom */
 	UpdateGUIZoom();
@@ -886,7 +903,7 @@ static void MakeNewGame(bool from_heightmap, bool reset_settings)
 	_game_mode = GM_NORMAL;
 	if (!from_heightmap) {
 		/* "reload" command needs to know what mode we were in. */
-		_file_to_saveload.SetMode(SLO_INVALID, FT_INVALID, DFT_INVALID);
+		_file_to_saveload.SetMode(FIOS_TYPE_INVALID, SLO_INVALID);
 	}
 
 	ResetGRFConfig(true);
@@ -904,7 +921,7 @@ static void MakeNewEditorWorld()
 {
 	_game_mode = GM_EDITOR;
 	/* "reload" command needs to know what mode we were in. */
-	_file_to_saveload.SetMode(SLO_INVALID, FT_INVALID, DFT_INVALID);
+	_file_to_saveload.SetMode(FIOS_TYPE_INVALID, SLO_INVALID);
 
 	ResetGRFConfig(true);
 
@@ -1054,12 +1071,12 @@ void SwitchToMode(SwitchMode new_mode)
 			break;
 
 		case SM_RELOADGAME: // Reload with what-ever started the game
-			if (_file_to_saveload.abstract_ftype == FT_SAVEGAME || _file_to_saveload.abstract_ftype == FT_SCENARIO) {
+			if (_file_to_saveload.ftype.abstract == FT_SAVEGAME || _file_to_saveload.ftype.abstract == FT_SCENARIO) {
 				/* Reload current savegame/scenario */
 				_switch_mode = _game_mode == GM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME;
 				SwitchToMode(_switch_mode);
 				break;
-			} else if (_file_to_saveload.abstract_ftype == FT_HEIGHTMAP) {
+			} else if (_file_to_saveload.ftype.abstract == FT_HEIGHTMAP) {
 				/* Restart current heightmap */
 				_switch_mode = _game_mode == GM_EDITOR ? SM_LOAD_HEIGHTMAP : SM_RESTART_HEIGHTMAP;
 				SwitchToMode(_switch_mode);
@@ -1084,10 +1101,10 @@ void SwitchToMode(SwitchMode new_mode)
 			ResetGRFConfig(true);
 			ResetWindowSystem();
 
-			if (!SafeLoad(_file_to_saveload.name, _file_to_saveload.file_op, _file_to_saveload.detail_ftype, GM_NORMAL, NO_DIRECTORY)) {
+			if (!SafeLoad(_file_to_saveload.name, _file_to_saveload.file_op, _file_to_saveload.ftype.detailed, GM_NORMAL, NO_DIRECTORY)) {
 				ShowErrorMessage(GetSaveLoadErrorType(), GetSaveLoadErrorMessage(), WL_CRITICAL);
 			} else {
-				if (_file_to_saveload.abstract_ftype == FT_SCENARIO) {
+				if (_file_to_saveload.ftype.abstract == FT_SCENARIO) {
 					OnStartScenario();
 				}
 				OnStartGame(_network_dedicated);
@@ -1120,7 +1137,7 @@ void SwitchToMode(SwitchMode new_mode)
 			break;
 
 		case SM_LOAD_SCENARIO: { // Load scenario from scenario editor
-			if (SafeLoad(_file_to_saveload.name, _file_to_saveload.file_op, _file_to_saveload.detail_ftype, GM_EDITOR, NO_DIRECTORY)) {
+			if (SafeLoad(_file_to_saveload.name, _file_to_saveload.file_op, _file_to_saveload.ftype.detailed, GM_EDITOR, NO_DIRECTORY)) {
 				SetLocalCompany(OWNER_NONE);
 				GenerateSavegameId();
 				_settings_newgame.game_creation.starting_year = TimerGameCalendar::year;
@@ -1169,7 +1186,7 @@ void SwitchToMode(SwitchMode new_mode)
 			break;
 
 		case SM_SAVE_HEIGHTMAP: // Save heightmap.
-			MakeHeightmapScreenshot(_file_to_saveload.name.c_str());
+			MakeHeightmapScreenshot(_file_to_saveload.name);
 			CloseWindowById(WC_SAVELOAD, 0);
 			break;
 
@@ -1217,8 +1234,6 @@ void StateGameLoop()
 	PerformanceMeasurer framerate(PFE_GAMELOOP);
 	PerformanceAccumulator::Reset(PFE_GL_LANDSCAPE);
 
-	Layouter::ReduceLineCache();
-
 	if (_game_mode == GM_EDITOR) {
 		BasePersistentStorageArray::SwitchMode(PSM_ENTER_GAMELOOP);
 		RunTileLoop();
diff --git a/src/openttd.h b/src/openttd.h
index 6e2edb4b00..340f279d08 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -83,7 +83,7 @@ extern PauseModes _pause_mode;
 void AskExitGame();
 void AskExitToGameMenu();
 
-int openttd_main(std::span<char * const> arguments);
+int openttd_main(std::span<std::string_view> arguments);
 void StateGameLoop();
 void HandleExitGameRequest();
 
diff --git a/src/order_backup.cpp b/src/order_backup.cpp
index f71b46d29d..ae52f635c9 100644
--- a/src/order_backup.cpp
+++ b/src/order_backup.cpp
@@ -27,18 +27,7 @@
 OrderBackupPool _order_backup_pool("BackupOrder");
 INSTANTIATE_POOL_METHODS(OrderBackup)
 
-/** Free everything that is allocated. */
-OrderBackup::~OrderBackup()
-{
-	if (CleaningPool()) return;
-
-	Order *o = this->orders;
-	while (o != nullptr) {
-		Order *next = o->next;
-		delete o;
-		o = next;
-	}
-}
+OrderBackup::~OrderBackup() = default;
 
 /**
  * Create an order backup for the given vehicle.
@@ -54,15 +43,7 @@ OrderBackup::OrderBackup(const Vehicle *v, uint32_t user) : user(user), tile(v->
 		this->clone = (v->FirstShared() == v) ? v->NextShared() : v->FirstShared();
 	} else {
 		/* Else copy the orders */
-		Order **tail = &this->orders;
-
-		/* Count the number of orders */
-		for (const Order *order : v->Orders()) {
-			Order *copy = new Order();
-			copy->AssignOrder(*order);
-			*tail = copy;
-			tail = &copy->next;
-		}
+		this->orders.assign(std::begin(v->Orders()), std::end(v->Orders()));
 	}
 }
 
@@ -75,9 +56,8 @@ void OrderBackup::DoRestore(Vehicle *v)
 	/* If we had shared orders, recover that */
 	if (this->clone != nullptr) {
 		Command<CMD_CLONE_ORDER>::Do(DoCommandFlag::Execute, CO_SHARE, v->index, this->clone->index);
-	} else if (this->orders != nullptr && OrderList::CanAllocateItem()) {
-		v->orders = new OrderList(this->orders, v);
-		this->orders = nullptr;
+	} else if (!this->orders.empty() && OrderList::CanAllocateItem()) {
+		v->orders = new OrderList(std::move(this->orders), v);
 		/* Make sure buoys/oil rigs are updated in the station list. */
 		InvalidateWindowClassesData(WC_STATION_LIST, 0);
 	}
@@ -251,12 +231,12 @@ CommandCost CmdClearOrderBackup(DoCommandFlags flags, TileIndex tile, ClientID u
 /* static */ void OrderBackup::RemoveOrder(OrderType type, DestinationID destination, bool hangar)
 {
 	for (OrderBackup *ob : OrderBackup::Iterate()) {
-		for (Order *order = ob->orders; order != nullptr; order = order->next) {
-			OrderType ot = order->GetType();
-			if (ot == OT_GOTO_DEPOT && (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) != 0) continue;
+		for (Order &order : ob->orders) {
+			OrderType ot = order.GetType();
+			if (ot == OT_GOTO_DEPOT && (order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) != 0) continue;
 			if (ot == OT_GOTO_DEPOT && hangar && !IsHangarTile(ob->tile)) continue; // Not an aircraft? Can't have a hangar order.
 			if (ot == OT_IMPLICIT || (IsHangarTile(ob->tile) && ot == OT_GOTO_DEPOT && !hangar)) ot = OT_GOTO_STATION;
-			if (ot == type && order->GetDestination() == destination) {
+			if (ot == type && order.GetDestination() == destination) {
 				/* Remove the order backup! If a station/depot gets removed, we can't/shouldn't restore those broken orders. */
 				delete ob;
 				break;
diff --git a/src/order_backup.h b/src/order_backup.h
index 20eea9ee57..edeaf85e30 100644
--- a/src/order_backup.h
+++ b/src/order_backup.h
@@ -34,15 +34,19 @@ struct OrderBackup : OrderBackupPool::PoolItem<&_order_backup_pool>, BaseConsist
 private:
 	friend SaveLoadTable GetOrderBackupDescription(); ///< Saving and loading of order backups.
 	friend struct BKORChunkHandler; ///< Creating empty orders upon savegame loading.
+	template <typename T>
+	friend class SlOrders;
+
 	uint32_t user = 0; ///< The user that requested the backup.
 	TileIndex tile = INVALID_TILE; ///< Tile of the depot where the order was changed.
 	GroupID group = GroupID::Invalid(); ///< The group the vehicle was part of.
 
 	const Vehicle *clone = nullptr; ///< Vehicle this vehicle was a clone of.
-	Order *orders = nullptr; ///< The actual orders if the vehicle was not a clone.
+	std::vector<Order> orders; ///< The actual orders if the vehicle was not a clone.
+	uint32_t old_order_index = 0;
 
 	/** Creation for savegame restoration. */
-	OrderBackup() {}
+	OrderBackup() = default;
 	OrderBackup(const Vehicle *v, uint32_t user);
 
 	void DoRestore(Vehicle *v);
diff --git a/src/order_base.h b/src/order_base.h
index dd1cffcf17..1b0f6b1752 100644
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -20,9 +20,7 @@
 #include "timer/timer_game_tick.h"
 #include "saveload/saveload.h"
 
-using OrderPool = Pool<Order, OrderID, 256>;
 using OrderListPool = Pool<OrderList, OrderListID, 128>;
-extern OrderPool _order_pool;
 extern OrderListPool _orderlist_pool;
 
 template <typename, typename>
@@ -31,15 +29,16 @@ class EndianBufferWriter;
 /* If you change this, keep in mind that it is saved on 3 places:
  * - Load_ORDR, all the global orders
  * - Vehicle -> current_order
- * - REF_ORDER (all REFs are currently limited to 16 bits!!)
  */
-struct Order : OrderPool::PoolItem<&_order_pool> {
+struct Order {
 private:
 	friend struct VEHSChunkHandler;                             ///< Loading of ancient vehicles.
 	friend SaveLoadTable GetOrderDescription();                 ///< Saving and loading of orders.
 	/* So we can use private/protected variables in the saveload code */
 	friend class SlVehicleCommon;
 	friend class SlVehicleDisaster;
+	template <typename T>
+	friend class SlOrders;
 
 	template <typename Tcont, typename Titer>
 	friend EndianBufferWriter<Tcont, Titer> &operator <<(EndianBufferWriter<Tcont, Titer> &buffer, const Order &data);
@@ -56,11 +55,8 @@ private:
 	uint16_t max_speed = UINT16_MAX; ///< How fast the vehicle may go on the way to the destination.
 
 public:
-	Order *next = nullptr; ///< Pointer to next order. If nullptr, end of list
-
 	Order() {}
 	Order(uint8_t type, uint8_t flags, DestinationID dest) : type(type), flags(flags), dest(dest) {}
-	~Order();
 
 	/**
 	 * Check whether this order is of the given type.
@@ -248,7 +244,17 @@ public:
 	void ConvertFromOldSavegame();
 };
 
-void InsertOrder(Vehicle *v, Order *new_o, VehicleOrderID sel_ord);
+/** Compatibility struct to allow saveload of pool-based orders. */
+struct OldOrderSaveLoadItem {
+	uint32_t index = 0; ///< This order's index (1-based).
+	uint32_t next = 0; ///< The next order index (1-based).
+	Order order{}; ///< The order data.
+};
+
+OldOrderSaveLoadItem *GetOldOrder(size_t pool_index);
+OldOrderSaveLoadItem &AllocateOldOrder(size_t pool_index);
+
+void InsertOrder(Vehicle *v, Order &&new_o, VehicleOrderID sel_ord);
 void DeleteOrder(Vehicle *v, VehicleOrderID sel_ord);
 
 /**
@@ -259,31 +265,49 @@ struct OrderList : OrderListPool::PoolItem<&_orderlist_pool> {
 private:
 	friend void AfterLoadVehiclesPhase1(bool part_of_load); ///< For instantiating the shared vehicle chain
 	friend SaveLoadTable GetOrderListDescription(); ///< Saving and loading of order lists.
+	friend struct ORDLChunkHandler;
+	template <typename T>
+	friend class SlOrders;
 
-	VehicleOrderID num_orders = INVALID_VEH_ORDER_ID; ///< NOSAVE: How many orders there are in the list.
 	VehicleOrderID num_manual_orders = 0; ///< NOSAVE: How many manually added orders are there in the list.
 	uint num_vehicles = 0; ///< NOSAVE: Number of vehicles that share this order list.
 	Vehicle *first_shared = nullptr; ///< NOSAVE: pointer to the first vehicle in the shared order chain.
-	Order *first = nullptr; ///< First order of the order list.
+	std::vector<Order> orders; ///< Orders of the order list.
+	uint32_t old_order_index = 0;
 
 	TimerGameTick::Ticks timetable_duration{}; ///< NOSAVE: Total timetabled duration of the order list.
 	TimerGameTick::Ticks total_duration{}; ///< NOSAVE: Total (timetabled or not) duration of the order list.
 
 public:
 	/** Default constructor producing an invalid order list. */
-	OrderList(VehicleOrderID num_orders = INVALID_VEH_ORDER_ID) : num_orders(num_orders) { }
+	OrderList() {}
 
 	/**
 	 * Create an order list with the given order chain for the given vehicle.
 	 *  @param chain pointer to the first order of the order chain
 	 *  @param v any vehicle using this orderlist
 	 */
-	OrderList(Order *chain, Vehicle *v) { this->Initialize(chain, v); }
+	OrderList(Order &&order, Vehicle *v)
+	{
+		this->orders.emplace_back(std::move(order));
+		this->Initialize(v);
+	}
+
+	OrderList(std::vector<Order> &&orders, Vehicle *v)
+	{
+		this->orders = std::move(orders);
+		this->Initialize(v);
+	}
+
+	OrderList(Vehicle *v)
+	{
+		this->Initialize(v);
+	}
 
 	/** Destructor. Invalidates OrderList for re-usage by the pool. */
 	~OrderList() {}
 
-	void Initialize(Order *chain, Vehicle *v);
+	void Initialize(Vehicle *v);
 
 	void RecalculateTimetableDuration();
 
@@ -291,15 +315,33 @@ public:
 	 * Get the first order of the order chain.
 	 * @return the first order of the chain.
 	 */
-	inline Order *GetFirstOrder() const { return this->first; }
+	inline VehicleOrderID GetFirstOrder() const { return this->orders.empty() ? INVALID_VEH_ORDER_ID : 0; }
 
-	Order *GetOrderAt(int index) const;
+	inline std::span<const Order> GetOrders() const { return this->orders; }
+	inline std::span<Order> GetOrders() { return this->orders; }
+
+	/**
+	 * Get a certain order of the order chain.
+	 * @param index zero-based index of the order within the chain.
+	 * @return the order at position index.
+	 */
+	const Order *GetOrderAt(VehicleOrderID index) const
+	{
+		if (index >= this->GetNumOrders()) return nullptr;
+		return &this->orders[index];
+	}
+
+	Order *GetOrderAt(VehicleOrderID index)
+	{
+		if (index >= this->GetNumOrders()) return nullptr;
+		return &this->orders[index];
+	}
 
 	/**
 	 * Get the last order of the order chain.
 	 * @return the last order of the chain.
 	 */
-	inline Order *GetLastOrder() const { return this->GetOrderAt(this->num_orders - 1); }
+	inline VehicleOrderID GetLastOrder() const { return this->orders.empty() ? INVALID_VEH_ORDER_ID : (this->GetNumOrders() - 1); }
 
 	/**
 	 * Get the order after the given one or the first one, if the given one is the
@@ -307,13 +349,17 @@ public:
 	 * @param curr Order to find the next one for.
 	 * @return Next order.
 	 */
-	inline const Order *GetNext(const Order *curr) const { return (curr->next == nullptr) ? this->GetFirstOrder() : curr->next; }
+	inline VehicleOrderID GetNext(VehicleOrderID cur) const
+	{
+		if (this->orders.empty()) return INVALID_VEH_ORDER_ID;
+		return static_cast<VehicleOrderID>((cur + 1) % this->GetNumOrders());
+	}
 
 	/**
 	 * Get number of orders in the order list.
 	 * @return number of orders in the chain.
 	 */
-	inline VehicleOrderID GetNumOrders() const { return this->num_orders; }
+	inline VehicleOrderID GetNumOrders() const { return static_cast<VehicleOrderID>(std::size(this->orders)); }
 
 	/**
 	 * Get number of manually added orders in the order list.
@@ -321,12 +367,12 @@ public:
 	 */
 	inline VehicleOrderID GetNumManualOrders() const { return this->num_manual_orders; }
 
-	StationIDStack GetNextStoppingStation(const Vehicle *v, const Order *first = nullptr, uint hops = 0) const;
-	const Order *GetNextDecisionNode(const Order *next, uint hops) const;
+	StationIDStack GetNextStoppingStation(const Vehicle *v, VehicleOrderID first = INVALID_VEH_ORDER_ID, uint hops = 0) const;
+	VehicleOrderID GetNextDecisionNode(VehicleOrderID next, uint hops) const;
 
-	void InsertOrderAt(Order *new_order, int index);
-	void DeleteOrderAt(int index);
-	void MoveOrder(int from, int to);
+	void InsertOrderAt(Order &&order, VehicleOrderID index);
+	void DeleteOrderAt(VehicleOrderID index);
+	void MoveOrder(VehicleOrderID from, VehicleOrderID to);
 
 	/**
 	 * Is this a shared order list?
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 5ac05757b1..7b4b675d3c 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -38,24 +38,9 @@
 static_assert(sizeof(DestinationID) >= sizeof(DepotID));
 static_assert(sizeof(DestinationID) >= sizeof(StationID));
 
-OrderPool _order_pool("Order");
-INSTANTIATE_POOL_METHODS(Order)
 OrderListPool _orderlist_pool("OrderList");
 INSTANTIATE_POOL_METHODS(OrderList)
 
-/** Clean everything up. */
-Order::~Order()
-{
-	if (CleaningPool()) return;
-
-	/* We can visit oil rigs and buoys that are not our own. They will be shown in
-	 * the list of stations. So, we need to invalidate that window if needed. */
-	if (this->IsType(OT_GOTO_STATION) || this->IsType(OT_GOTO_WAYPOINT)) {
-		BaseStation *bs = BaseStation::GetIfValid(this->GetDestination().ToStationID());
-		if (bs != nullptr && bs->owner == OWNER_NONE) InvalidateWindowClassesData(WC_STATION_LIST, 0);
-	}
-}
-
 /**
  * 'Free' the order
  * @note ONLY use on "current_order" vehicle orders!
@@ -65,7 +50,6 @@ void Order::Free()
 	this->type  = OT_NOTHING;
 	this->flags = 0;
 	this->dest  = 0;
-	this->next  = nullptr;
 }
 
 /**
@@ -267,20 +251,17 @@ void Order::AssignOrder(const Order &other)
  * @param chain first order in the chain
  * @param v one of vehicle that is using this orderlist
  */
-void OrderList::Initialize(Order *chain, Vehicle *v)
+void OrderList::Initialize(Vehicle *v)
 {
-	this->first = chain;
 	this->first_shared = v;
 
-	this->num_orders = 0;
 	this->num_manual_orders = 0;
 	this->num_vehicles = 1;
 	this->timetable_duration = 0;
 
-	for (Order *o = this->first; o != nullptr; o = o->next) {
-		++this->num_orders;
-		if (!o->IsType(OT_IMPLICIT)) ++this->num_manual_orders;
-		this->total_duration += o->GetWaitTime() + o->GetTravelTime();
+	for (const Order &o : this->orders) {
+		if (!o.IsType(OT_IMPLICIT)) ++this->num_manual_orders;
+		this->total_duration += o.GetWaitTime() + o.GetTravelTime();
 	}
 
 	this->RecalculateTimetableDuration();
@@ -300,8 +281,8 @@ void OrderList::Initialize(Order *chain, Vehicle *v)
 void OrderList::RecalculateTimetableDuration()
 {
 	this->timetable_duration = 0;
-	for (Order *o = this->first; o != nullptr; o = o->next) {
-		this->timetable_duration += o->GetTimetabledWait() + o->GetTimetabledTravel();
+	for (const Order &o : this->orders) {
+		this->timetable_duration += o.GetTimetabledWait() + o.GetTimetabledTravel();
 	}
 }
 
@@ -312,15 +293,20 @@ void OrderList::RecalculateTimetableDuration()
  */
 void OrderList::FreeChain(bool keep_orderlist)
 {
-	Order *next;
-	for (Order *o = this->first; o != nullptr; o = next) {
-		next = o->next;
-		delete o;
+	/* We can visit oil rigs and buoys that are not our own. They will be shown in
+	 * the list of stations. So, we need to invalidate that window if needed. */
+	for (Order &order: this->orders) {
+		if (order.IsType(OT_GOTO_STATION) || order.IsType(OT_GOTO_WAYPOINT)) {
+			BaseStation *bs = BaseStation::GetIfValid(order.GetDestination().ToStationID());
+			if (bs != nullptr && bs->owner == OWNER_NONE) {
+				InvalidateWindowClassesData(WC_STATION_LIST, 0);
+				break;
+			}
+		}
 	}
 
 	if (keep_orderlist) {
-		this->first = nullptr;
-		this->num_orders = 0;
+		this->orders.clear();
 		this->num_manual_orders = 0;
 		this->timetable_duration = 0;
 	} else {
@@ -328,23 +314,6 @@ void OrderList::FreeChain(bool keep_orderlist)
 	}
 }
 
-/**
- * Get a certain order of the order chain.
- * @param index zero-based index of the order within the chain.
- * @return the order at position index.
- */
-Order *OrderList::GetOrderAt(int index) const
-{
-	if (index < 0) return nullptr;
-
-	Order *order = this->first;
-
-	while (order != nullptr && index-- > 0) {
-		order = order->next;
-	}
-	return order;
-}
-
 /**
  * Get the next order which will make the given vehicle stop at a station
  * or refit at a depot or evaluate a non-trivial condition.
@@ -354,28 +323,29 @@ Order *OrderList::GetOrderAt(int index) const
  *         \li a station order
  *         \li a refitting depot order
  *         \li a non-trivial conditional order
- *         \li nullptr  if the vehicle won't stop anymore.
+ *         \li INVALID_VEH_ORDER_ID if the vehicle won't stop anymore.
  */
-const Order *OrderList::GetNextDecisionNode(const Order *next, uint hops) const
+VehicleOrderID OrderList::GetNextDecisionNode(VehicleOrderID next, uint hops) const
 {
-	if (hops > this->GetNumOrders() || next == nullptr) return nullptr;
+	if (hops > this->GetNumOrders() || next >= this->GetNumOrders()) return INVALID_VEH_ORDER_ID;
 
-	if (next->IsType(OT_CONDITIONAL)) {
-		if (next->GetConditionVariable() != OCV_UNCONDITIONALLY) return next;
+	const Order &order_next = this->orders[next];
+	if (order_next.IsType(OT_CONDITIONAL)) {
+		if (order_next.GetConditionVariable() != OCV_UNCONDITIONALLY) return next;
 
 		/* We can evaluate trivial conditions right away. They're conceptually
 		 * the same as regular order progression. */
 		return this->GetNextDecisionNode(
-				this->GetOrderAt(next->GetConditionSkipToOrder()),
+				order_next.GetConditionSkipToOrder(),
 				hops + 1);
 	}
 
-	if (next->IsType(OT_GOTO_DEPOT)) {
-		if ((next->GetDepotActionType() & ODATFB_HALT) != 0) return nullptr;
-		if (next->IsRefit()) return next;
+	if (order_next.IsType(OT_GOTO_DEPOT)) {
+		if ((order_next.GetDepotActionType() & ODATFB_HALT) != 0) return INVALID_VEH_ORDER_ID;
+		if (order_next.IsRefit()) return next;
 	}
 
-	if (!next->CanLoadOrUnload()) {
+	if (!order_next.CanLoadOrUnload()) {
 		return this->GetNextDecisionNode(this->GetNext(next), hops + 1);
 	}
 
@@ -385,44 +355,42 @@ const Order *OrderList::GetNextDecisionNode(const Order *next, uint hops) const
 /**
  * Recursively determine the next deterministic station to stop at.
  * @param v The vehicle we're looking at.
- * @param first Order to start searching at or nullptr to start at cur_implicit_order_index + 1.
+ * @param first Order to start searching at or INVALID_VEH_ORDER_ID to start at cur_implicit_order_index + 1.
  * @param hops Number of orders we have already looked at.
  * @return Next stopping station or StationID::Invalid().
  * @pre The vehicle is currently loading and v->last_station_visited is meaningful.
  * @note This function may draw a random number. Don't use it from the GUI.
  */
-StationIDStack OrderList::GetNextStoppingStation(const Vehicle *v, const Order *first, uint hops) const
+StationIDStack OrderList::GetNextStoppingStation(const Vehicle *v, VehicleOrderID first, uint hops) const
 {
-
-	const Order *next = first;
-	if (first == nullptr) {
-		next = this->GetOrderAt(v->cur_implicit_order_index);
-		if (next == nullptr) {
+	VehicleOrderID next = first;
+	if (first == INVALID_VEH_ORDER_ID) {
+		next = v->cur_implicit_order_index;
+		if (next >= this->GetNumOrders()) {
 			next = this->GetFirstOrder();
-			if (next == nullptr) return StationID::Invalid().base();
+			if (next == INVALID_VEH_ORDER_ID) return StationID::Invalid().base();
 		} else {
-			/* GetNext never returns nullptr if there is a valid station in the list.
+			/* GetNext never returns INVALID_VEH_ORDER_ID if there is a valid station in the list.
 			 * As the given "next" is already valid and a station in the list, we
-			 * don't have to check for nullptr here. */
+			 * don't have to check for INVALID_VEH_ORDER_ID here. */
 			next = this->GetNext(next);
-			assert(next != nullptr);
+			assert(next != INVALID_VEH_ORDER_ID);
 		}
 	}
 
+	auto orders = v->Orders();
 	do {
 		next = this->GetNextDecisionNode(next, ++hops);
 
 		/* Resolve possibly nested conditionals by estimation. */
-		while (next != nullptr && next->IsType(OT_CONDITIONAL)) {
+		while (next != INVALID_VEH_ORDER_ID && orders[next].IsType(OT_CONDITIONAL)) {
 			/* We return both options of conditional orders. */
-			const Order *skip_to = this->GetNextDecisionNode(
-					this->GetOrderAt(next->GetConditionSkipToOrder()), hops);
-			const Order *advance = this->GetNextDecisionNode(
-					this->GetNext(next), hops);
-			if (advance == nullptr || advance == first || skip_to == advance) {
-				next = (skip_to == first) ? nullptr : skip_to;
-			} else if (skip_to == nullptr || skip_to == first) {
-				next = (advance == first) ? nullptr : advance;
+			VehicleOrderID skip_to = this->GetNextDecisionNode(orders[next].GetConditionSkipToOrder(), hops);
+			VehicleOrderID advance = this->GetNextDecisionNode(this->GetNext(next), hops);
+			if (advance == INVALID_VEH_ORDER_ID || advance == first || skip_to == advance) {
+				next = (skip_to == first) ? INVALID_VEH_ORDER_ID : skip_to;
+			} else if (skip_to == INVALID_VEH_ORDER_ID || skip_to == first) {
+				next = (advance == first) ? INVALID_VEH_ORDER_ID : advance;
 			} else {
 				StationIDStack st1 = this->GetNextStoppingStation(v, skip_to, hops);
 				StationIDStack st2 = this->GetNextStoppingStation(v, advance, hops);
@@ -433,14 +401,14 @@ StationIDStack OrderList::GetNextStoppingStation(const Vehicle *v, const Order *
 		}
 
 		/* Don't return a next stop if the vehicle has to unload everything. */
-		if (next == nullptr || ((next->IsType(OT_GOTO_STATION) || next->IsType(OT_IMPLICIT)) &&
-				next->GetDestination() == v->last_station_visited &&
-				(next->GetUnloadType() & (OUFB_TRANSFER | OUFB_UNLOAD)) != 0)) {
+		if (next == INVALID_VEH_ORDER_ID || ((orders[next].IsType(OT_GOTO_STATION) || orders[next].IsType(OT_IMPLICIT)) &&
+				orders[next].GetDestination() == v->last_station_visited &&
+				(orders[next].GetUnloadType() & (OUFB_TRANSFER | OUFB_UNLOAD)) != 0)) {
 			return StationID::Invalid().base();
 		}
-	} while (next->IsType(OT_GOTO_DEPOT) || next->GetDestination() == v->last_station_visited);
+	} while (orders[next].IsType(OT_GOTO_DEPOT) || orders[next].GetDestination() == v->last_station_visited);
 
-	return next->GetDestination().ToStationID().base();
+	return orders[next].GetDestination().ToStationID().base();
 }
 
 /**
@@ -448,26 +416,11 @@ StationIDStack OrderList::GetNextStoppingStation(const Vehicle *v, const Order *
  * @param new_order is the order to insert into the chain.
  * @param index is the position where the order is supposed to be inserted.
  */
-void OrderList::InsertOrderAt(Order *new_order, int index)
+void OrderList::InsertOrderAt(Order &&order, VehicleOrderID index)
 {
-	if (this->first == nullptr) {
-		this->first = new_order;
-	} else {
-		if (index == 0) {
-			/* Insert as first or only order */
-			new_order->next = this->first;
-			this->first = new_order;
-		} else if (index >= this->num_orders) {
-			/* index is after the last order, add it to the end */
-			this->GetLastOrder()->next = new_order;
-		} else {
-			/* Put the new order in between */
-			Order *order = this->GetOrderAt(index - 1);
-			new_order->next = order->next;
-			order->next = new_order;
-		}
-	}
-	++this->num_orders;
+	auto it = std::ranges::next(std::begin(this->orders), index, std::end(this->orders));
+	auto new_order = this->orders.emplace(it, std::move(order));
+
 	if (!new_order->IsType(OT_IMPLICIT)) ++this->num_manual_orders;
 	this->timetable_duration += new_order->GetTimetabledWait() + new_order->GetTimetabledTravel();
 	this->total_duration += new_order->GetWaitTime() + new_order->GetTravelTime();
@@ -478,7 +431,6 @@ void OrderList::InsertOrderAt(Order *new_order, int index)
 		BaseStation *bs = BaseStation::Get(new_order->GetDestination().ToStationID());
 		if (bs->owner == OWNER_NONE) InvalidateWindowClassesData(WC_STATION_LIST, 0);
 	}
-
 }
 
 
@@ -486,25 +438,17 @@ void OrderList::InsertOrderAt(Order *new_order, int index)
  * Remove an order from the order list and delete it.
  * @param index is the position of the order which is to be deleted.
  */
-void OrderList::DeleteOrderAt(int index)
+void OrderList::DeleteOrderAt(VehicleOrderID index)
 {
-	if (index >= this->num_orders) return;
+	auto to_remove = std::ranges::next(std::begin(this->orders), index, std::end(this->orders));
+	if (to_remove == std::end(this->orders)) return;
 
-	Order *to_remove;
-
-	if (index == 0) {
-		to_remove = this->first;
-		this->first = to_remove->next;
-	} else {
-		Order *prev = GetOrderAt(index - 1);
-		to_remove = prev->next;
-		prev->next = to_remove->next;
-	}
-	--this->num_orders;
 	if (!to_remove->IsType(OT_IMPLICIT)) --this->num_manual_orders;
+
 	this->timetable_duration -= (to_remove->GetTimetabledWait() + to_remove->GetTimetabledTravel());
 	this->total_duration -= (to_remove->GetWaitTime() + to_remove->GetTravelTime());
-	delete to_remove;
+
+	this->orders.erase(to_remove);
 }
 
 /**
@@ -512,30 +456,17 @@ void OrderList::DeleteOrderAt(int index)
  * @param from is the zero-based position of the order to move.
  * @param to is the zero-based position where the order is moved to.
  */
-void OrderList::MoveOrder(int from, int to)
+void OrderList::MoveOrder(VehicleOrderID from, VehicleOrderID to)
 {
-	if (from >= this->num_orders || to >= this->num_orders || from == to) return;
+	if (from == to) return;
+	if (from >= this->GetNumOrders()) return;
+	if (to >= this->GetNumOrders()) return;
 
-	Order *moving_one;
-
-	/* Take the moving order out of the pointer-chain */
-	if (from == 0) {
-		moving_one = this->first;
-		this->first = moving_one->next;
+	auto it = std::begin(this->orders);
+	if (from < to) {
+		std::rotate(it + from, it + from + 1, it + to + 1);
 	} else {
-		Order *one_before = GetOrderAt(from - 1);
-		moving_one = one_before->next;
-		one_before->next = moving_one->next;
-	}
-
-	/* Insert the moving_order again in the pointer-chain */
-	if (to == 0) {
-		moving_one->next = this->first;
-		this->first = moving_one;
-	} else {
-		Order *one_before = GetOrderAt(to - 1);
-		moving_one->next = one_before->next;
-		one_before->next = moving_one;
+		std::rotate(it + to, it + from, it + from + 1);
 	}
 }
 
@@ -556,10 +487,10 @@ void OrderList::RemoveVehicle(Vehicle *v)
  */
 bool OrderList::IsCompleteTimetable() const
 {
-	for (Order *o = this->first; o != nullptr; o = o->next) {
+	for (const Order &o : this->orders) {
 		/* Implicit orders are, by definition, not timetabled. */
-		if (o->IsType(OT_IMPLICIT)) continue;
-		if (!o->IsCompletelyTimetabled()) return false;
+		if (o.IsType(OT_IMPLICIT)) continue;
+		if (!o.IsCompletelyTimetabled()) return false;
 	}
 	return true;
 }
@@ -578,13 +509,13 @@ void OrderList::DebugCheckSanity() const
 
 	Debug(misc, 6, "Checking OrderList {} for sanity...", this->index);
 
-	for (const Order *o = this->first; o != nullptr; o = o->next) {
+	for (const Order &o : this->orders) {
 		++check_num_orders;
-		if (!o->IsType(OT_IMPLICIT)) ++check_num_manual_orders;
-		check_timetable_duration += o->GetTimetabledWait() + o->GetTimetabledTravel();
-		check_total_duration += o->GetWaitTime() + o->GetTravelTime();
+		if (!o.IsType(OT_IMPLICIT)) ++check_num_manual_orders;
+		check_timetable_duration += o.GetTimetabledWait() + o.GetTimetabledTravel();
+		check_total_duration += o.GetWaitTime() + o.GetTravelTime();
 	}
-	assert(this->num_orders == check_num_orders);
+	assert(this->GetNumOrders() == check_num_orders);
 	assert(this->num_manual_orders == check_num_manual_orders);
 	assert(this->timetable_duration == check_timetable_duration);
 	assert(this->total_duration == check_total_duration);
@@ -595,7 +526,7 @@ void OrderList::DebugCheckSanity() const
 	}
 	assert(this->num_vehicles == check_num_vehicles);
 	Debug(misc, 6, "... detected {} orders ({} manual), {} vehicles, {} timetabled, {} total",
-			(uint)this->num_orders, (uint)this->num_manual_orders,
+			(uint)this->GetNumOrders(), (uint)this->num_manual_orders,
 			this->num_vehicles, this->timetable_duration, this->total_duration);
 }
 #endif
@@ -607,10 +538,10 @@ void OrderList::DebugCheckSanity() const
  * @param o the order to check
  * @return true if the destination is a station
  */
-static inline bool OrderGoesToStation(const Vehicle *v, const Order *o)
+static inline bool OrderGoesToStation(const Vehicle *v, const Order &o)
 {
-	return o->IsType(OT_GOTO_STATION) ||
-			(v->type == VEH_AIRCRAFT && o->IsType(OT_GOTO_DEPOT) && o->GetDestination() != StationID::Invalid());
+	return o.IsType(OT_GOTO_STATION) ||
+			(v->type == VEH_AIRCRAFT && o.IsType(OT_GOTO_DEPOT) && o.GetDestination() != StationID::Invalid());
 }
 
 /**
@@ -657,20 +588,24 @@ TileIndex Order::GetLocation(const Vehicle *v, bool airport) const
  * @param conditional_depth Internal param for resolving conditional orders.
  * @return Maximum distance between the two orders.
  */
-uint GetOrderDistance(const Order *prev, const Order *cur, const Vehicle *v, int conditional_depth)
+uint GetOrderDistance(VehicleOrderID prev, VehicleOrderID cur, const Vehicle *v, int conditional_depth)
 {
-	if (cur->IsType(OT_CONDITIONAL)) {
+	assert(v->orders != nullptr);
+	const OrderList &orderlist = *v->orders;
+	auto orders = orderlist.GetOrders();
+
+	if (orders[cur].IsType(OT_CONDITIONAL)) {
 		if (conditional_depth > v->GetNumOrders()) return 0;
 
 		conditional_depth++;
 
-		int dist1 = GetOrderDistance(prev, v->GetOrder(cur->GetConditionSkipToOrder()), v, conditional_depth);
-		int dist2 = GetOrderDistance(prev, cur->next == nullptr ? v->orders->GetFirstOrder() : cur->next, v, conditional_depth);
+		int dist1 = GetOrderDistance(prev, orders[cur].GetConditionSkipToOrder(), v, conditional_depth);
+		int dist2 = GetOrderDistance(prev, orderlist.GetNext(cur), v, conditional_depth);
 		return std::max(dist1, dist2);
 	}
 
-	TileIndex prev_tile = prev->GetLocation(v, true);
-	TileIndex cur_tile = cur->GetLocation(v, true);
+	TileIndex prev_tile = orders[prev].GetLocation(v, true);
+	TileIndex cur_tile = orders[cur].GetLocation(v, true);
 	if (prev_tile == INVALID_TILE || cur_tile == INVALID_TILE) return 0;
 	return v->type == VEH_AIRCRAFT ? DistanceSquare(prev_tile, cur_tile) : DistanceManhattan(prev_tile, cur_tile);
 }
@@ -882,13 +817,10 @@ CommandCost CmdInsertOrder(DoCommandFlags flags, VehicleID veh, VehicleOrderID s
 	if (sel_ord > v->GetNumOrders()) return CMD_ERROR;
 
 	if (v->GetNumOrders() >= MAX_VEH_ORDER_ID) return CommandCost(STR_ERROR_TOO_MANY_ORDERS);
-	if (!Order::CanAllocateItem()) return CommandCost(STR_ERROR_NO_MORE_SPACE_FOR_ORDERS);
 	if (v->orders == nullptr && !OrderList::CanAllocateItem()) return CommandCost(STR_ERROR_NO_MORE_SPACE_FOR_ORDERS);
 
 	if (flags.Test(DoCommandFlag::Execute)) {
-		Order *new_o = new Order();
-		new_o->AssignOrder(new_order);
-		InsertOrder(v, new_o, sel_ord);
+		InsertOrder(v, Order(new_order), sel_ord);
 	}
 
 	return CommandCost();
@@ -900,13 +832,13 @@ CommandCost CmdInsertOrder(DoCommandFlags flags, VehicleID veh, VehicleOrderID s
  * @param new_o   The new order.
  * @param sel_ord The position the order should be inserted at.
  */
-void InsertOrder(Vehicle *v, Order *new_o, VehicleOrderID sel_ord)
+void InsertOrder(Vehicle *v, Order &&new_o, VehicleOrderID sel_ord)
 {
 	/* Create new order and link in list */
 	if (v->orders == nullptr) {
-		v->orders = new OrderList(new_o, v);
+		v->orders = new OrderList(std::move(new_o), v);
 	} else {
-		v->orders->InsertOrderAt(new_o, sel_ord);
+		v->orders->InsertOrderAt(std::move(new_o), sel_ord);
 	}
 
 	Vehicle *u = v->FirstShared();
@@ -948,14 +880,14 @@ void InsertOrder(Vehicle *v, Order *new_o, VehicleOrderID sel_ord)
 
 	/* As we insert an order, the order to skip to will be 'wrong'. */
 	VehicleOrderID cur_order_id = 0;
-	for (Order *order : v->Orders()) {
-		if (order->IsType(OT_CONDITIONAL)) {
-			VehicleOrderID order_id = order->GetConditionSkipToOrder();
+	for (Order &order : v->Orders()) {
+		if (order.IsType(OT_CONDITIONAL)) {
+			VehicleOrderID order_id = order.GetConditionSkipToOrder();
 			if (order_id >= sel_ord) {
-				order->SetConditionSkipToOrder(order_id + 1);
+				order.SetConditionSkipToOrder(order_id + 1);
 			}
 			if (order_id == cur_order_id) {
-				order->SetConditionSkipToOrder((order_id + 1) % v->GetNumOrders());
+				order.SetConditionSkipToOrder((order_id + 1) % v->GetNumOrders());
 			}
 		}
 		cur_order_id++;
@@ -1065,16 +997,16 @@ void DeleteOrder(Vehicle *v, VehicleOrderID sel_ord)
 
 	/* As we delete an order, the order to skip to will be 'wrong'. */
 	VehicleOrderID cur_order_id = 0;
-	for (Order *order : v->Orders()) {
-		if (order->IsType(OT_CONDITIONAL)) {
-			VehicleOrderID order_id = order->GetConditionSkipToOrder();
+	for (Order &order : v->Orders()) {
+		if (order.IsType(OT_CONDITIONAL)) {
+			VehicleOrderID order_id = order.GetConditionSkipToOrder();
 			if (order_id >= sel_ord) {
 				order_id = std::max(order_id - 1, 0);
 			}
 			if (order_id == cur_order_id) {
 				order_id = (order_id + 1) % v->GetNumOrders();
 			}
-			order->SetConditionSkipToOrder(order_id);
+			order.SetConditionSkipToOrder(order_id);
 		}
 		cur_order_id++;
 	}
@@ -1193,9 +1125,9 @@ CommandCost CmdMoveOrder(DoCommandFlags flags, VehicleID veh, VehicleOrderID mov
 		}
 
 		/* As we move an order, the order to skip to will be 'wrong'. */
-		for (Order *order : v->Orders()) {
-			if (order->IsType(OT_CONDITIONAL)) {
-				VehicleOrderID order_id = order->GetConditionSkipToOrder();
+		for (Order &order : v->Orders()) {
+			if (order.IsType(OT_CONDITIONAL)) {
+				VehicleOrderID order_id = order.GetConditionSkipToOrder();
 				if (order_id == moving_order) {
 					order_id = target_order;
 				} else if (order_id > moving_order && order_id <= target_order) {
@@ -1203,7 +1135,7 @@ CommandCost CmdMoveOrder(DoCommandFlags flags, VehicleID veh, VehicleOrderID mov
 				} else if (order_id < moving_order && order_id >= target_order) {
 					order_id++;
 				}
-				order->SetConditionSkipToOrder(order_id);
+				order.SetConditionSkipToOrder(order_id);
 			}
 		}
 
@@ -1480,19 +1412,24 @@ CommandCost CmdModifyOrder(DoCommandFlags flags, VehicleID veh, VehicleOrderID s
  * @param first First order in the source order list.
  * @return True if the aircraft has enough range for the orders, false otherwise.
  */
-static bool CheckAircraftOrderDistance(const Aircraft *v_new, const Vehicle *v_order, const Order *first)
+static bool CheckAircraftOrderDistance(const Aircraft *v_new, const Vehicle *v_order)
 {
-	if (first == nullptr || v_new->acache.cached_max_range == 0) return true;
+	assert(v_order->orders != nullptr);
+	const OrderList &orderlist = *v_order->orders;
+	if (v_new->acache.cached_max_range == 0) return true;
+	if (orderlist.GetNumOrders() == 0) return true;
+
+	auto orders = orderlist.GetOrders();
 
 	/* Iterate over all orders to check the distance between all
 	 * 'goto' orders and their respective next order (of any type). */
-	for (const Order *o = first; o != nullptr; o = o->next) {
-		switch (o->GetType()) {
+	for (VehicleOrderID cur = 0; cur < orderlist.GetNumOrders(); ++cur) {
+		switch (orders[cur].GetType()) {
 			case OT_GOTO_STATION:
 			case OT_GOTO_DEPOT:
 			case OT_GOTO_WAYPOINT:
 				/* If we don't have a next order, we've reached the end and must check the first order instead. */
-				if (GetOrderDistance(o, o->next != nullptr ? o->next : first, v_order) > v_new->acache.cached_max_range_sqr) return false;
+				if (GetOrderDistance(cur, orderlist.GetNext(cur), v_order) > v_new->acache.cached_max_range_sqr) return false;
 				break;
 
 			default: break;
@@ -1536,20 +1473,20 @@ CommandCost CmdCloneOrder(DoCommandFlags flags, CloneOptions action, VehicleID v
 			/* Is the vehicle already in the shared list? */
 			if (src->FirstShared() == dst->FirstShared()) return CMD_ERROR;
 
-			for (const Order *order : src->Orders()) {
+			for (const Order &order : src->Orders()) {
 				if (!OrderGoesToStation(dst, order)) continue;
 
 				/* Allow copying unreachable destinations if they were already unreachable for the source.
 				 * This is basically to allow cloning / autorenewing / autoreplacing vehicles, while the stations
 				 * are temporarily invalid due to reconstruction. */
-				const Station *st = Station::Get(order->GetDestination().ToStationID());
+				const Station *st = Station::Get(order.GetDestination().ToStationID());
 				if (CanVehicleUseStation(src, st) && !CanVehicleUseStation(dst, st)) {
 					return CommandCost(STR_ERROR_CAN_T_COPY_SHARE_ORDER, GetVehicleCannotUseStationReason(dst, st));
 				}
 			}
 
 			/* Check for aircraft range limits. */
-			if (dst->type == VEH_AIRCRAFT && !CheckAircraftOrderDistance(Aircraft::From(dst), src, src->GetFirstOrder())) {
+			if (dst->type == VEH_AIRCRAFT && !CheckAircraftOrderDistance(Aircraft::From(dst), src)) {
 				return CommandCost(STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE);
 			}
 
@@ -1587,49 +1524,44 @@ CommandCost CmdCloneOrder(DoCommandFlags flags, CloneOptions action, VehicleID v
 
 			/* Trucks can't copy all the orders from busses (and visa versa),
 			 * and neither can helicopters and aircraft. */
-			for (const Order *order : src->Orders()) {
+			for (const Order &order : src->Orders()) {
 				if (!OrderGoesToStation(dst, order)) continue;
-				Station *st = Station::Get(order->GetDestination().ToStationID());
+				Station *st = Station::Get(order.GetDestination().ToStationID());
 				if (!CanVehicleUseStation(dst, st)) {
 					return CommandCost(STR_ERROR_CAN_T_COPY_SHARE_ORDER, GetVehicleCannotUseStationReason(dst, st));
 				}
 			}
 
 			/* Check for aircraft range limits. */
-			if (dst->type == VEH_AIRCRAFT && !CheckAircraftOrderDistance(Aircraft::From(dst), src, src->GetFirstOrder())) {
+			if (dst->type == VEH_AIRCRAFT && !CheckAircraftOrderDistance(Aircraft::From(dst), src)) {
 				return CommandCost(STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE);
 			}
 
 			/* make sure there are orders available */
-			if (!Order::CanAllocateItem(src->GetNumOrders()) || !OrderList::CanAllocateItem()) {
+			if (!OrderList::CanAllocateItem()) {
 				return CommandCost(STR_ERROR_NO_MORE_SPACE_FOR_ORDERS);
 			}
 
 			if (flags.Test(DoCommandFlag::Execute)) {
-				Order *first = nullptr;
-				Order **order_dst;
-
 				/* If the destination vehicle had an order list, destroy the chain but keep the OrderList.
 				 * We only reset the order indices, if the new orders are obviously different.
 				 * (We mainly do this to keep the order indices valid and in range.) */
 				DeleteVehicleOrders(dst, true, dst->GetNumOrders() != src->GetNumOrders());
 
-				order_dst = &first;
-				for (const Order *order : src->Orders()) {
-					*order_dst = new Order();
-					(*order_dst)->AssignOrder(*order);
-					order_dst = &(*order_dst)->next;
+				std::vector<Order> dst_orders;
+				for (const Order &order : src->Orders()) {
+					dst_orders.emplace_back(order);
 				}
-				if (dst->orders == nullptr) {
-					dst->orders = new OrderList(first, dst);
-				} else {
-					assert(dst->orders->GetFirstOrder() == nullptr);
+
+				if (dst->orders != nullptr) {
+					assert(dst->orders->GetNumOrders() == 0);
 					assert(!dst->orders->IsShared());
 					delete dst->orders;
-					assert(OrderList::CanAllocateItem());
-					dst->orders = new OrderList(first, dst);
 				}
 
+				assert(OrderList::CanAllocateItem());
+				dst->orders = new OrderList(std::move(dst_orders), dst);
+
 				InvalidateVehicleOrder(dst, VIWD_REMOVE_ALL_ORDERS);
 
 				InvalidateWindowClassesData(GetWindowClassForVehicleType(dst->type), 0);
@@ -1720,15 +1652,15 @@ void CheckOrders(const Vehicle *v)
 		/* Check the order list */
 		int n_st = 0;
 
-		for (const Order *order : v->Orders()) {
+		for (const Order &order : v->Orders()) {
 			/* Dummy order? */
-			if (order->IsType(OT_DUMMY)) {
+			if (order.IsType(OT_DUMMY)) {
 				message = STR_NEWS_VEHICLE_HAS_VOID_ORDER;
 				break;
 			}
 			/* Does station have a load-bay for this vehicle? */
-			if (order->IsType(OT_GOTO_STATION)) {
-				const Station *st = Station::Get(order->GetDestination().ToStationID());
+			if (order.IsType(OT_GOTO_STATION)) {
+				const Station *st = Station::Get(order.GetDestination().ToStationID());
 
 				n_st++;
 				if (!CanVehicleUseStation(v, st)) {
@@ -1745,9 +1677,9 @@ void CheckOrders(const Vehicle *v)
 
 		/* Check if the last and the first order are the same */
 		if (v->GetNumOrders() > 1) {
-			const Order *last = v->GetLastOrder();
+			auto orders = v->Orders();
 
-			if (v->orders->GetFirstOrder()->Equals(*last)) {
+			if (orders.front().Equals(orders.back())) {
 				message = STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY;
 			}
 		}
@@ -1788,12 +1720,12 @@ void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination, bool
 			SetWindowDirty(WC_VEHICLE_VIEW, v->index);
 		}
 
-		/* Clear the order from the order-list */
-		int id = -1;
-		for (Order *order : v->Orders()) {
-			id++;
-restart:
+		if (v->orders == nullptr) continue;
 
+		/* Clear the order from the order-list */
+		for (VehicleOrderID id = 0, next_id = 0; id < v->GetNumOrders(); id = next_id) {
+			next_id = id + 1;
+			Order *order = v->orders->GetOrderAt(id);
 			OrderType ot = order->GetType();
 			if (ot == OT_GOTO_DEPOT && (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) != 0) continue;
 			if (ot == OT_GOTO_DEPOT && hangar && v->type != VEH_AIRCRAFT) continue; // Not an aircraft? Can't have a hangar order.
@@ -1803,10 +1735,9 @@ restart:
 				 * dummy orders. They should just vanish. Also check the actual order
 				 * type as ot is currently OT_GOTO_STATION. */
 				if (order->IsType(OT_IMPLICIT)) {
-					order = order->next; // DeleteOrder() invalidates current order
 					DeleteOrder(v, id);
-					if (order != nullptr) goto restart;
-					break;
+					next_id = id;
+					continue;
 				}
 
 				/* Clear wait time */
@@ -1840,11 +1771,7 @@ restart:
  */
 bool Vehicle::HasDepotOrder() const
 {
-	for (const Order *order : this->Orders()) {
-		if (order->IsType(OT_GOTO_DEPOT)) return true;
-	}
-
-	return false;
+	return std::ranges::any_of(this->Orders(), [](const Order &order) { return order.IsType(OT_GOTO_DEPOT); });
 }
 
 /**
@@ -1910,19 +1837,7 @@ uint16_t GetServiceIntervalClamped(int interval, bool ispercent)
  */
 static bool CheckForValidOrders(const Vehicle *v)
 {
-	for (const Order *order : v->Orders()) {
-		switch (order->GetType()) {
-			case OT_GOTO_STATION:
-			case OT_GOTO_DEPOT:
-			case OT_GOTO_WAYPOINT:
-				return true;
-
-			default:
-				break;
-		}
-	}
-
-	return false;
+	return std::ranges::any_of(v->Orders(), [](const Order &order) { return order.IsGotoOrder(); });
 }
 
 /**
diff --git a/src/order_func.h b/src/order_func.h
index 12f7d4684a..ff7d865f1a 100644
--- a/src/order_func.h
+++ b/src/order_func.h
@@ -22,9 +22,9 @@ void DeleteVehicleOrders(Vehicle *v, bool keep_orderlist = false, bool reset_ord
 bool ProcessOrders(Vehicle *v);
 bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0, bool pbs_look_ahead = false);
 VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v);
-uint GetOrderDistance(const Order *prev, const Order *cur, const Vehicle *v, int conditional_depth = 0);
+uint GetOrderDistance(VehicleOrderID prev, VehicleOrderID cur, const Vehicle *v, int conditional_depth = 0);
 
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int middle, int right);
+void DrawOrderString(const Vehicle *v, const Order *order, VehicleOrderID order_index, int y, bool selected, bool timetable, int left, int middle, int right);
 
 static const uint DEF_SERVINT_DAYS_TRAINS   = 150;
 static const uint DEF_SERVINT_DAYS_ROADVEH  = 150;
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index a3a285ca35..b09f97588d 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -34,6 +34,7 @@
 #include "error.h"
 #include "order_cmd.h"
 #include "company_cmd.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/order_widget.h"
 
@@ -224,7 +225,7 @@ static StringID GetOrderGoToString(const Order &order)
  * @param middle X position between order index and order text
  * @param right Right border for text drawing
  */
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int middle, int right)
+void DrawOrderString(const Vehicle *v, const Order *order, VehicleOrderID order_index, int y, bool selected, bool timetable, int left, int middle, int right)
 {
 	bool rtl = _current_text_dir == TD_RTL;
 
@@ -354,8 +355,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
 
 	/* Check range for aircraft. */
 	if (v->type == VEH_AIRCRAFT && Aircraft::From(v)->GetRange() > 0 && order->IsGotoOrder()) {
-		const Order *next = order->next != nullptr ? order->next : v->GetFirstOrder();
-		if (GetOrderDistance(order, next, v) > Aircraft::From(v)->acache.cached_max_range_sqr) {
+		if (GetOrderDistance(order_index, v->orders->GetNext(order_index), v) > Aircraft::From(v)->acache.cached_max_range_sqr) {
 			line += GetString(STR_ORDER_OUT_OF_RANGE);
 		}
 	}
@@ -371,9 +371,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
  */
 static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
 {
-	/* Override the index as it is not coming from a pool, so would not be initialised correctly. */
-	Order order;
-	order.index = OrderID::Begin();
+	Order order{};
 
 	/* check depot first */
 	if (IsDepotTypeTile(tile, (TransportType)(uint)v->type) && IsTileOwner(tile, _local_company)) {
@@ -656,9 +654,7 @@ private:
 	 */
 	void OrderClick_NearestDepot()
 	{
-		Order order;
-		order.next = nullptr;
-		order.index = OrderID::Begin();
+		Order order{};
 		order.MakeGoToDepot(DepotID::Invalid(), ODTFB_PART_OF_ORDERS,
 				_settings_client.gui.new_nonstop && this->vehicle->IsGroundVehicle() ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE);
 		order.SetDepotActionType(ODATFB_NEAREST_DEPOT);
@@ -815,10 +811,7 @@ public:
 
 		if (_settings_client.gui.quick_goto && v->owner == _local_company) {
 			/* If there are less than 2 station, make Go To active. */
-			int station_orders = 0;
-			for (const Order *order : v->Orders()) {
-				if (order->IsType(OT_GOTO_STATION)) station_orders++;
-			}
+			int station_orders = std::ranges::count_if(v->Orders(), [](const Order &order) { return order.IsType(OT_GOTO_STATION); });
 
 			if (station_orders < 2) this->OrderClick_Goto(OPOS_GOTO);
 		}
@@ -829,7 +822,7 @@ public:
 	{
 		switch (widget) {
 			case WID_O_ORDER_LIST:
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				size.height = 6 * resize.height + padding.height;
 				break;
 
@@ -1113,11 +1106,12 @@ public:
 		int y = ir.top;
 		int line_height = this->GetWidget<NWidgetBase>(WID_O_ORDER_LIST)->resize_y;
 
-		int i = this->vscroll->GetPosition();
-		const Order *order = this->vehicle->GetOrder(i);
+		VehicleOrderID i = this->vscroll->GetPosition();
+		VehicleOrderID num_orders = this->vehicle->GetNumOrders();
+
 		/* First draw the highlighting underground if it exists. */
 		if (this->order_over != INVALID_VEH_ORDER_ID) {
-			while (order != nullptr) {
+			while (i < num_orders) {
 				/* Don't draw anything if it extends past the end of the window. */
 				if (!this->vscroll->IsVisible(i)) break;
 
@@ -1132,25 +1126,22 @@ public:
 				y += line_height;
 
 				i++;
-				order = order->next;
 			}
 
 			/* Reset counters for drawing the orders. */
 			y = ir.top;
 			i = this->vscroll->GetPosition();
-			order = this->vehicle->GetOrder(i);
 		}
 
 		/* Draw the orders. */
-		while (order != nullptr) {
+		while (i < num_orders) {
 			/* Don't draw anything if it extends past the end of the window. */
 			if (!this->vscroll->IsVisible(i)) break;
 
-			DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, ir.left, middle, ir.right);
+			DrawOrderString(this->vehicle, this->vehicle->GetOrder(i), i, y, i == this->selected_order, false, ir.left, middle, ir.right);
 			y += line_height;
 
 			i++;
-			order = order->next;
 		}
 
 		if (this->vscroll->IsVisible(i)) {
@@ -1202,9 +1193,7 @@ public:
 				if (this->goto_type == OPOS_CONDITIONAL) {
 					VehicleOrderID order_id = this->GetOrderFromPt(_cursor.pos.y - this->top);
 					if (order_id != INVALID_VEH_ORDER_ID) {
-						Order order;
-						order.next = nullptr;
-						order.index = OrderID::Begin();
+						Order order{};
 						order.MakeConditional(order_id);
 
 						Command<CMD_INSERT_ORDER>::Post(STR_ERROR_CAN_T_INSERT_NEW_ORDER, this->vehicle->tile, this->vehicle->index, this->OrderGetSel(), order);
@@ -1227,8 +1216,8 @@ public:
 				if (sel == INVALID_VEH_ORDER_ID || this->vehicle->owner != _local_company) {
 					/* Deselect clicked order */
 					this->selected_order = -1;
-				} else if (sel == this->selected_order) {
-					if (click_count > 1 && this->vehicle->type == VEH_TRAIN && sel < this->vehicle->GetNumOrders()) {
+				} else if (sel == this->selected_order && click_count > 1) {
+					if (this->vehicle->type == VEH_TRAIN && sel < this->vehicle->GetNumOrders()) {
 						Command<CMD_MODIFY_ORDER>::Post(STR_ERROR_CAN_T_MODIFY_THIS_ORDER,
 								this->vehicle->tile, this->vehicle->index, sel,
 								MOF_STOP_LOCATION, (this->vehicle->GetOrder(sel)->GetStopLocation() + 1) % OSL_END);
@@ -1362,25 +1351,26 @@ public:
 		if (!str.has_value() || str->empty()) return;
 
 		VehicleOrderID sel = this->OrderGetSel();
-		uint value = atoi(str->c_str());
+		auto value = ParseInteger(*str, 10, true);
+		if (!value.has_value()) return;
 
 		switch (this->vehicle->GetOrder(sel)->GetConditionVariable()) {
 			case OCV_MAX_SPEED:
-				value = ConvertDisplaySpeedToSpeed(value, this->vehicle->type);
+				value = ConvertDisplaySpeedToSpeed(*value, this->vehicle->type);
 				break;
 
 			case OCV_RELIABILITY:
 			case OCV_LOAD_PERCENTAGE:
-				value = Clamp(value, 0, 100);
+				value = Clamp(*value, 0, 100);
 				break;
 
 			default:
 				break;
 		}
-		Command<CMD_MODIFY_ORDER>::Post(STR_ERROR_CAN_T_MODIFY_THIS_ORDER, this->vehicle->tile, this->vehicle->index, sel, MOF_COND_VALUE, Clamp(value, 0, 2047));
+		Command<CMD_MODIFY_ORDER>::Post(STR_ERROR_CAN_T_MODIFY_THIS_ORDER, this->vehicle->tile, this->vehicle->index, sel, MOF_COND_VALUE, Clamp(*value, 0, 2047));
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_O_NON_STOP:
diff --git a/src/order_type.h b/src/order_type.h
index aa3bbbfccd..d52b33599b 100644
--- a/src/order_type.h
+++ b/src/order_type.h
@@ -16,7 +16,6 @@
 #include "station_type.h"
 
 typedef uint8_t VehicleOrderID;  ///< The index of an order within its current vehicle (not pool related)
-using OrderID = PoolID<uint32_t, struct OrderIDTag, 0xFF0000, 0xFFFFFF>;
 using OrderListID = PoolID<uint16_t, struct OrderListIDTag, 64000, 0xFFFF>;
 
 struct DestinationID {
diff --git a/src/os/macosx/crashlog_osx.cpp b/src/os/macosx/crashlog_osx.cpp
index 8e3f4c224b..c22f602286 100644
--- a/src/os/macosx/crashlog_osx.cpp
+++ b/src/os/macosx/crashlog_osx.cpp
@@ -130,7 +130,7 @@ public:
 				 "{}\n{}\n{}\n{}",
 				 this->crashlog_filename, this->crashdump_filename, this->savegame_filename, this->screenshot_filename);
 
-		ShowMacDialog(crash_title, message.c_str(), "Quit");
+		ShowMacDialog(crash_title, message, "Quit");
 	}
 
 	/** Buffer to track the long jump set setup. */
@@ -159,8 +159,7 @@ static sigset_t SetSignals(void(*handler)(int))
 		sigaddset(&sigs, signum);
 	}
 
-	struct sigaction sa;
-	memset(&sa, 0, sizeof(sa));
+	struct sigaction sa{};
 	sa.sa_flags = SA_RESTART;
 
 	sigemptyset(&sa.sa_mask);
diff --git a/src/os/macosx/font_osx.cpp b/src/os/macosx/font_osx.cpp
index 829c0c2607..6588eb7507 100644
--- a/src/os/macosx/font_osx.cpp
+++ b/src/os/macosx/font_osx.cpp
@@ -73,9 +73,9 @@ bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_is
 			if (((symbolic_traits & kCTFontMonoSpaceTrait) == kCTFontMonoSpaceTrait) != callback->Monospace()) continue;
 
 			/* Get font name. */
-			char name[128];
+			char buffer[128];
 			CFAutoRelease<CFStringRef> font_name((CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontDisplayNameAttribute));
-			CFStringGetCString(font_name.get(), name, lengthof(name), kCFStringEncodingUTF8);
+			CFStringGetCString(font_name.get(), buffer, std::size(buffer), kCFStringEncodingUTF8);
 
 			/* Serif fonts usually look worse on-screen with only small
 			 * font sizes. As such, we try for a sans-serif font first.
@@ -84,7 +84,8 @@ bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_is
 
 			/* There are some special fonts starting with an '.' and the last
 			 * resort font that aren't usable. Skip them. */
-			if (name[0] == '.' || strncmp(name, "LastResort", 10) == 0) continue;
+			std::string_view name{buffer};
+			if (name.starts_with(".") || name.starts_with("LastResort")) continue;
 
 			/* Save result. */
 			callback->SetFontNames(settings, name);
@@ -228,9 +229,8 @@ const Sprite *CoreTextFontCache::InternalGetGlyph(GlyphID key, bool use_aa)
 	if (width > MAX_GLYPH_DIM || height > MAX_GLYPH_DIM) UserError("Font glyph is too large");
 
 	SpriteLoader::SpriteCollection spritecollection;
-	SpriteLoader::Sprite &sprite = spritecollection[ZOOM_LVL_MIN];
-	sprite.AllocateData(ZOOM_LVL_MIN, width * height);
-	sprite.type = SpriteType::Font;
+	SpriteLoader::Sprite &sprite = spritecollection[ZoomLevel::Min];
+	sprite.AllocateData(ZoomLevel::Min, width * height);
 	sprite.colours = SpriteComponent::Palette;
 	if (use_aa) sprite.colours.Set(SpriteComponent::Alpha);
 	sprite.width = width;
@@ -278,7 +278,7 @@ const Sprite *CoreTextFontCache::InternalGetGlyph(GlyphID key, bool use_aa)
 	}
 
 	UniquePtrSpriteAllocator allocator;
-	BlitterFactory::GetCurrentBlitter()->Encode(spritecollection, allocator);
+	BlitterFactory::GetCurrentBlitter()->Encode(SpriteType::Font, spritecollection, allocator);
 
 	GlyphEntry new_glyph;
 	new_glyph.data = std::move(allocator.data);
diff --git a/src/os/macosx/macos.h b/src/os/macosx/macos.h
index 33f016a34b..5c9e6a52a9 100644
--- a/src/os/macosx/macos.h
+++ b/src/os/macosx/macos.h
@@ -11,7 +11,7 @@
 #define MACOS_H
 
 /** Helper function displaying a message the best possible way. */
-void ShowMacDialog(const char *title, const char *message, const char *button_label);
+void ShowMacDialog(std::string_view title, std::string_view message, std::string_view button_label);
 
 void GetMacOSVersion(int *return_major, int *return_minor, int *return_bugfix);
 
@@ -36,7 +36,7 @@ inline bool MacOSVersionIsAtLeast(long major, long minor, long bugfix)
 
 bool IsMonospaceFont(CFStringRef name);
 
-void MacOSSetThreadName(const char *name);
+void MacOSSetThreadName(const std::string &name);
 
 uint64_t MacOSGetPhysicalMemory();
 
diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm
index 1b1beacab4..d644d1232b 100644
--- a/src/os/macosx/macos.mm
+++ b/src/os/macosx/macos.mm
@@ -95,7 +95,7 @@ void GetMacOSVersion(int *return_major, int *return_minor, int *return_bugfix)
 
 #ifdef WITH_COCOA
 
-extern void CocoaDialog(const char *title, const char *message, const char *buttonLabel);
+extern void CocoaDialog(std::string_view title, std::string_view message, std::string_view buttonLabel);
 
 /**
  * Show the system dialogue message (Cocoa on MacOSX).
@@ -104,7 +104,7 @@ extern void CocoaDialog(const char *title, const char *message, const char *butt
  * @param message Message text.
  * @param buttonLabel Button text.
  */
-void ShowMacDialog(const char *title, const char *message, const char *buttonLabel)
+void ShowMacDialog(std::string_view title, std::string_view message, std::string_view buttonLabel)
 {
 	CocoaDialog(title, message, buttonLabel);
 }
@@ -119,7 +119,7 @@ void ShowMacDialog(const char *title, const char *message, const char *buttonLab
  * @param message Message text.
  * @param buttonLabel Button text.
  */
-void ShowMacDialog(const char *title, const char *message, const char *buttonLabel)
+void ShowMacDialog(std::string_view title, std::string_view message, std::string_view buttonLabel)
 {
 	fmt::print(stderr, "{}: {}\n", title, message);
 }
@@ -133,7 +133,7 @@ void ShowMacDialog(const char *title, const char *message, const char *buttonLab
  * @param buf error message text.
  * @param system message text originates from OS.
  */
-void ShowOSErrorBox(const char *buf, bool system)
+void ShowOSErrorBox(std::string_view buf, bool system)
 {
 	/* Display the error in the best way possible. */
 	if (system) {
@@ -151,16 +151,18 @@ void OSOpenBrowser(const std::string &url)
 /**
  * Determine and return the current user's locale.
  */
-const char *GetCurrentLocale(const char *)
+std::optional<std::string> GetCurrentLocale(const char *)
 {
-	static char retbuf[32] = { '\0' };
 	NSUserDefaults *defs = [ NSUserDefaults standardUserDefaults ];
 	NSArray *languages = [ defs objectForKey:@"AppleLanguages" ];
 	NSString *preferredLang = [ languages objectAtIndex:0 ];
 	/* preferredLang is either 2 or 5 characters long ("xx" or "xx_YY"). */
 
-	[ preferredLang getCString:retbuf maxLength:32 encoding:NSASCIIStringEncoding ];
-
+	std::string retbuf{32, '\0'};
+	[ preferredLang getCString:retbuf.data() maxLength:retbuf.size() encoding:NSASCIIStringEncoding ];
+	auto end = retbuf.find('\0');
+	if (end == 0) return std::nullopt;
+	if (end != std::string::npos) retbuf.erase(end);
 	return retbuf;
 }
 
@@ -242,15 +244,15 @@ bool IsMonospaceFont(CFStringRef name)
  * Set the name of the current thread for the debugger.
  * @param name The new name of the current thread.
  */
-void MacOSSetThreadName(const char *name)
+void MacOSSetThreadName(const std::string &name)
 {
 	if (MacOSVersionIsAtLeast(10, 6, 0)) {
-		pthread_setname_np(name);
+		pthread_setname_np(name.c_str());
 	}
 
 	NSThread *cur = [ NSThread currentThread ];
 	if (cur != nil && [ cur respondsToSelector:@selector(setName:) ]) {
-		[ cur performSelector:@selector(setName:) withObject:[ NSString stringWithUTF8String:name ] ];
+		[ cur performSelector:@selector(setName:) withObject:[ NSString stringWithUTF8String:name.c_str() ] ];
 	}
 }
 
diff --git a/src/os/macosx/osx_main.cpp b/src/os/macosx/osx_main.cpp
index 7d8a7994e9..12385d072d 100644
--- a/src/os/macosx/osx_main.cpp
+++ b/src/os/macosx/osx_main.cpp
@@ -26,13 +26,16 @@ void CocoaReleaseAutoreleasePool();
 int CDECL main(int argc, char *argv[])
 {
 	/* Make sure our arguments contain only valid UTF-8 characters. */
-	for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]);
+	std::vector<std::string_view> params;
+	for (int i = 0; i < argc; ++i) {
+		StrMakeValidInPlace(argv[i]);
+		params.emplace_back(argv[i]);
+	}
 
 	CocoaSetupAutoreleasePool();
 	/* This is passed if we are launched by double-clicking */
-	if (argc >= 2 && strncmp(argv[1], "-psn", 4) == 0) {
-		argv[1] = nullptr;
-		argc = 1;
+	if (params.size() >= 2 && params[1].starts_with("-psn")) {
+		params.resize(1);
 	}
 
 	CrashLog::InitialiseCrashLog();
@@ -41,7 +44,7 @@ int CDECL main(int argc, char *argv[])
 
 	signal(SIGPIPE, SIG_IGN);
 
-	int ret = openttd_main(std::span(argv, argc));
+	int ret = openttd_main(params);
 
 	CocoaReleaseAutoreleasePool();
 
diff --git a/src/os/macosx/string_osx.cpp b/src/os/macosx/string_osx.cpp
index 1487884e81..25cf921af7 100644
--- a/src/os/macosx/string_osx.cpp
+++ b/src/os/macosx/string_osx.cpp
@@ -18,6 +18,7 @@
 #include "macos.h"
 
 #include <CoreFoundation/CoreFoundation.h>
+#include "../../safeguards.h"
 
 
 /* CTRunDelegateCreate is supported since MacOS X 10.5, but was only included in the SDKs starting with the 10.9 SDK. */
@@ -144,7 +145,7 @@ static CGFloat SpriteFontGetWidth(void *ref_con)
 	return GetGlyphWidth(fs, c);
 }
 
-static CTRunDelegateCallbacks _sprite_font_callback = {
+static const CTRunDelegateCallbacks _sprite_font_callback = {
 	kCTRunDelegateCurrentVersion, nullptr, nullptr, nullptr,
 	&SpriteFontGetWidth
 };
@@ -301,22 +302,22 @@ void MacOSResetScriptCache(FontSize size)
 }
 
 /** Register an external font file with the CoreText system. */
-void MacOSRegisterExternalFont(const char *file_path)
+void MacOSRegisterExternalFont(std::string_view file_path)
 {
 	if (!MacOSVersionIsAtLeast(10, 6, 0)) return;
 
-	CFAutoRelease<CFStringRef> path(CFStringCreateWithCString(kCFAllocatorDefault, file_path, kCFStringEncodingUTF8));
+	CFAutoRelease<CFStringRef> path(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(file_path.data()), file_path.size(), kCFStringEncodingUTF8, false));
 	CFAutoRelease<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(), kCFURLPOSIXPathStyle, false));
 
 	CTFontManagerRegisterFontsForURL(url.get(), kCTFontManagerScopeProcess, nullptr);
 }
 
 /** Store current language locale as a CoreFoundation locale. */
-void MacOSSetCurrentLocaleName(const char *iso_code)
+void MacOSSetCurrentLocaleName(std::string_view iso_code)
 {
 	if (!MacOSVersionIsAtLeast(10, 5, 0)) return;
 
-	CFAutoRelease<CFStringRef> iso(CFStringCreateWithCString(kCFAllocatorDefault, iso_code, kCFStringEncodingUTF8));
+	CFAutoRelease<CFStringRef> iso(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(iso_code.data()), iso_code.size(), kCFStringEncodingUTF8, false));
 	_osx_locale.reset(CFLocaleCreate(kCFAllocatorDefault, iso.get()));
 }
 
@@ -329,7 +330,7 @@ void MacOSSetCurrentLocaleName(const char *iso_code)
  */
 int MacOSStringCompare(std::string_view s1, std::string_view s2)
 {
-	static bool supported = MacOSVersionIsAtLeast(10, 5, 0);
+	static const bool supported = MacOSVersionIsAtLeast(10, 5, 0);
 	if (!supported) return 0;
 
 	CFStringCompareFlags flags = kCFCompareCaseInsensitive | kCFCompareNumerically | kCFCompareLocalized | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
@@ -351,9 +352,9 @@ int MacOSStringCompare(std::string_view s1, std::string_view s2)
  * @param case_insensitive Search case-insensitive.
  * @return 1 if value was found, 0 if it was not found, or -1 if not supported by the OS.
  */
-int MacOSStringContains(const std::string_view str, const std::string_view value, bool case_insensitive)
+int MacOSStringContains(std::string_view str, std::string_view value, bool case_insensitive)
 {
-	static bool supported = MacOSVersionIsAtLeast(10, 5, 0);
+	static const bool supported = MacOSVersionIsAtLeast(10, 5, 0);
 	if (!supported) return -1;
 
 	CFStringCompareFlags flags = kCFCompareLocalized | kCFCompareWidthInsensitive;
diff --git a/src/os/macosx/string_osx.h b/src/os/macosx/string_osx.h
index 03bc549f83..973bf05b3d 100644
--- a/src/os/macosx/string_osx.h
+++ b/src/os/macosx/string_osx.h
@@ -82,10 +82,10 @@ public:
 };
 
 void MacOSResetScriptCache(FontSize size);
-void MacOSSetCurrentLocaleName(const char *iso_code);
+void MacOSSetCurrentLocaleName(std::string_view iso_code);
 int MacOSStringCompare(std::string_view s1, std::string_view s2);
-int MacOSStringContains(const std::string_view str, const std::string_view value, bool case_insensitive);
+int MacOSStringContains(std::string_view str, std::string_view value, bool case_insensitive);
 
-void MacOSRegisterExternalFont(const char *file_path);
+void MacOSRegisterExternalFont(std::string_view file_path);
 
 #endif /* STRING_OSX_H */
diff --git a/src/os/unix/crashlog_unix.cpp b/src/os/unix/crashlog_unix.cpp
index d60ddb79f8..9ec7d70a5e 100644
--- a/src/os/unix/crashlog_unix.cpp
+++ b/src/os/unix/crashlog_unix.cpp
@@ -146,8 +146,7 @@ static sigset_t SetSignals(void(*handler)(int))
 		sigaddset(&sigs, signum);
 	}
 
-	struct sigaction sa;
-	memset(&sa, 0, sizeof(sa));
+	struct sigaction sa{};
 	sa.sa_flags = SA_RESTART;
 
 	sigemptyset(&sa.sa_mask);
diff --git a/src/os/unix/font_unix.cpp b/src/os/unix/font_unix.cpp
index efaaa3e056..37567537e1 100644
--- a/src/os/unix/font_unix.cpp
+++ b/src/os/unix/font_unix.cpp
@@ -8,6 +8,8 @@
 /** @file font_unix.cpp Functions related to font handling on Unix/Fontconfig. */
 
 #include "../../stdafx.h"
+
+#include "../../misc/autorelease.hpp"
 #include "../../debug.h"
 #include "../../fontdetection.h"
 #include "../../string_func.h"
@@ -20,7 +22,27 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-extern FT_Library _library;
+extern FT_Library _ft_library;
+
+/**
+ * Get a FontConfig-style string from a std::string.
+ * @param str String to be passed to FontConfig.
+ * @return FontConfig-style string.
+ */
+static const FcChar8 *ToFcString(const std::string &str)
+{
+	return reinterpret_cast<const FcChar8 *>(str.c_str());
+}
+
+/**
+ * Get a C-style string from a FontConfig-style string.
+ * @param str String from FontConfig.
+ * @return C-style string.
+ */
+static const char *FromFcString(const FcChar8 *str)
+{
+	return reinterpret_cast<const char *>(str);
+}
 
 /**
  * Split the font name into the font family and style. These fields are separated by a comma,
@@ -39,7 +61,7 @@ static std::tuple<std::string, std::string> SplitFontFamilyAndStyle(std::string_
 	return { std::string(font_name.substr(0, separator)), std::string(font_name.substr(begin)) };
 }
 
-FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
+FT_Error GetFontByFaceName(std::string_view font_name, FT_Face *face)
 {
 	FT_Error err = FT_Err_Cannot_Open_Resource;
 
@@ -48,53 +70,50 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
 		return err;
 	}
 
-	auto fc_instance = FcConfigReference(nullptr);
+	auto fc_instance = AutoRelease<FcConfig, FcConfigDestroy>(FcConfigReference(nullptr));
 	assert(fc_instance != nullptr);
 
 	/* Split & strip the font's style */
 	auto [font_family, font_style] = SplitFontFamilyAndStyle(font_name);
 
 	/* Resolve the name and populate the information structure */
-	FcPattern *pat = FcPatternCreate();
-	if (!font_family.empty()) FcPatternAddString(pat, FC_FAMILY, reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (!font_style.empty()) FcPatternAddString(pat, FC_STYLE, reinterpret_cast<const FcChar8 *>(font_style.c_str()));
-	FcConfigSubstitute(nullptr, pat, FcMatchPattern);
-	FcDefaultSubstitute(pat);
-	FcFontSet *fs = FcFontSetCreate();
-	FcResult  result;
-	FcPattern *match = FcFontMatch(nullptr, pat, &result);
+	auto pat = AutoRelease<FcPattern, FcPatternDestroy>(FcPatternCreate());
+	if (!font_family.empty()) FcPatternAddString(pat.get(), FC_FAMILY, ToFcString(font_family));
+	if (!font_style.empty()) FcPatternAddString(pat.get(), FC_STYLE, ToFcString(font_style));
+	FcConfigSubstitute(nullptr, pat.get(), FcMatchPattern);
+	FcDefaultSubstitute(pat.get());
+	auto fs = AutoRelease<FcFontSet, FcFontSetDestroy>(FcFontSetCreate());
+	FcResult result;
+	FcPattern *match = FcFontMatch(nullptr, pat.get(), &result);
 
-	if (fs != nullptr && match != nullptr) {
+	if (fs == nullptr || match == nullptr) return err;
+
+	FcFontSetAdd(fs.get(), match);
+
+	for (FcPattern *font : std::span(fs->fonts, fs->nfont)) {
 		FcChar8 *family;
 		FcChar8 *style;
 		FcChar8 *file;
 		int32_t index;
-		FcFontSetAdd(fs, match);
 
-		for (int i = 0; err != FT_Err_Ok && i < fs->nfont; i++) {
-			/* Try the new filename */
-			if (FcPatternGetString(fs->fonts[i], FC_FILE, 0, &file) == FcResultMatch &&
-				FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch &&
-				FcPatternGetString(fs->fonts[i], FC_STYLE, 0, &style) == FcResultMatch &&
-				FcPatternGetInteger(fs->fonts[i], FC_INDEX, 0, &index) == FcResultMatch) {
+		/* Try the new filename */
+		if (FcPatternGetString(font, FC_FILE, 0, &file) != FcResultMatch) continue;
+		if (FcPatternGetString(font, FC_FAMILY, 0, &family) != FcResultMatch) continue;
+		if (FcPatternGetString(font, FC_STYLE, 0, &style) != FcResultMatch) continue;
+		if (FcPatternGetInteger(font, FC_INDEX, 0, &index) != FcResultMatch) continue;
 
-				/* The correct style? */
-				if (!font_style.empty() && !StrEqualsIgnoreCase(font_style, (char *)style)) continue;
+		/* The correct style? */
+		if (!font_style.empty() && !StrEqualsIgnoreCase(font_style, FromFcString(style))) continue;
 
-				/* Font config takes the best shot, which, if the family name is spelled
-				 * wrongly a 'random' font, so check whether the family name is the
-				 * same as the supplied name */
-				if (StrEqualsIgnoreCase(font_family, (char *)family)) {
-					err = FT_New_Face(_library, (char *)file, index, face);
-				}
-			}
+		/* Font config takes the best shot, which, if the family name is spelled
+		 * wrongly a 'random' font, so check whether the family name is the
+		 * same as the supplied name */
+		if (StrEqualsIgnoreCase(font_family, FromFcString(family))) {
+			err = FT_New_Face(_ft_library, FromFcString(file), index, face);
+			if (err == FT_Err_Ok) return err;
 		}
 	}
 
-	FcPatternDestroy(pat);
-	FcFontSetDestroy(fs);
-	FcConfigDestroy(fc_instance);
-
 	return err;
 }
 
@@ -104,7 +123,7 @@ bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_is
 
 	if (!FcInit()) return ret;
 
-	auto fc_instance = FcConfigReference(nullptr);
+	auto fc_instance = AutoRelease<FcConfig, FcConfigDestroy>(FcConfigReference(nullptr));
 	assert(fc_instance != nullptr);
 
 	/* Fontconfig doesn't handle full language isocodes, only the part
@@ -113,70 +132,56 @@ bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_is
 	std::string lang = fmt::format(":lang={}", language_isocode.substr(0, language_isocode.find('_')));
 
 	/* First create a pattern to match the wanted language. */
-	FcPattern *pat = FcNameParse((const FcChar8 *)lang.c_str());
+	auto pat = AutoRelease<FcPattern, FcPatternDestroy>(FcNameParse(ToFcString(lang)));
 	/* We only want to know these attributes. */
-	FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_INDEX, FC_SPACING, FC_SLANT, FC_WEIGHT, nullptr);
+	auto os = AutoRelease<FcObjectSet, FcObjectSetDestroy>(FcObjectSetBuild(FC_FILE, FC_INDEX, FC_SPACING, FC_SLANT, FC_WEIGHT, nullptr));
 	/* Get the list of filenames matching the wanted language. */
-	FcFontSet *fs = FcFontList(nullptr, pat, os);
+	auto fs = AutoRelease<FcFontSet, FcFontSetDestroy>(FcFontList(nullptr, pat.get(), os.get()));
 
-	/* We don't need these anymore. */
-	FcObjectSetDestroy(os);
-	FcPatternDestroy(pat);
+	if (fs == nullptr) return ret;
 
-	if (fs != nullptr) {
-		int best_weight = -1;
-		const char *best_font = nullptr;
-		int best_index = 0;
+	int best_weight = -1;
+	const char *best_font = nullptr;
+	int best_index = 0;
 
-		for (int i = 0; i < fs->nfont; i++) {
-			FcPattern *font = fs->fonts[i];
+	for (FcPattern *font : std::span(fs->fonts, fs->nfont)) {
+		FcChar8 *file = nullptr;
+		FcResult res = FcPatternGetString(font, FC_FILE, 0, &file);
+		if (res != FcResultMatch || file == nullptr) continue;
 
-			FcChar8 *file = nullptr;
-			FcResult res = FcPatternGetString(font, FC_FILE, 0, &file);
-			if (res != FcResultMatch || file == nullptr) {
-				continue;
-			}
+		/* Get a font with the right spacing .*/
+		int value = 0;
+		FcPatternGetInteger(font, FC_SPACING, 0, &value);
+		if (callback->Monospace() != (value == FC_MONO) && value != FC_DUAL) continue;
 
-			/* Get a font with the right spacing .*/
-			int value = 0;
-			FcPatternGetInteger(font, FC_SPACING, 0, &value);
-			if (callback->Monospace() != (value == FC_MONO) && value != FC_DUAL) continue;
+		/* Do not use those that explicitly say they're slanted. */
+		FcPatternGetInteger(font, FC_SLANT, 0, &value);
+		if (value != 0) continue;
 
-			/* Do not use those that explicitly say they're slanted. */
-			FcPatternGetInteger(font, FC_SLANT, 0, &value);
-			if (value != 0) continue;
+		/* We want the fatter font as they look better at small sizes. */
+		FcPatternGetInteger(font, FC_WEIGHT, 0, &value);
+		if (value <= best_weight) continue;
 
-			/* We want the fatter font as they look better at small sizes. */
-			FcPatternGetInteger(font, FC_WEIGHT, 0, &value);
-			if (value <= best_weight) continue;
+		/* Possible match based on attributes, get index. */
+		int32_t index;
+		res = FcPatternGetInteger(font, FC_INDEX, 0, &index);
+		if (res != FcResultMatch) continue;
 
-			/* Possible match based on attributes, get index. */
-			int32_t index;
-			res = FcPatternGetInteger(font, FC_INDEX, 0, &index);
-			if (res != FcResultMatch) continue;
+		callback->SetFontNames(settings, FromFcString(file), &index);
 
-			callback->SetFontNames(settings, (const char *)file, &index);
+		bool missing = callback->FindMissingGlyphs();
+		Debug(fontcache, 1, "Font \"{}\" misses{} glyphs", FromFcString(file), missing ? "" : " no");
 
-			bool missing = callback->FindMissingGlyphs();
-			Debug(fontcache, 1, "Font \"{}\" misses{} glyphs", (char *)file, missing ? "" : " no");
-
-			if (!missing) {
-				best_weight = value;
-				best_font = (const char *)file;
-				best_index = index;
-			}
+		if (!missing) {
+			best_weight = value;
+			best_font = FromFcString(file);
+			best_index = index;
 		}
-
-		if (best_font != nullptr) {
-			ret = true;
-			callback->SetFontNames(settings, best_font, &best_index);
-			InitFontCache(callback->Monospace());
-		}
-
-		/* Clean up the list of filenames. */
-		FcFontSetDestroy(fs);
 	}
 
-	FcConfigDestroy(fc_instance);
-	return ret;
+	if (best_font == nullptr) return false;
+
+	callback->SetFontNames(settings, best_font, &best_index);
+	InitFontCache(callback->Monospace());
+	return true;
 }
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 1cfce1cd2b..36ee069637 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -89,7 +89,7 @@ bool FiosIsHiddenFile(const std::filesystem::path &path)
 #include "../../debug.h"
 #include "../../string_func.h"
 
-const char *GetCurrentLocale(const char *param);
+std::optional<std::string> GetCurrentLocale(const char *param);
 
 #define INTERNALCODE "UTF-8"
 
@@ -98,16 +98,18 @@ const char *GetCurrentLocale(const char *param);
  * variables. MacOSX is hardcoded, other OS's are dynamic. If no suitable
  * locale can be found, don't do any conversion ""
  */
-static const char *GetLocalCode()
+static std::string GetLocalCode()
 {
 #if defined(__APPLE__)
 	return "UTF-8-MAC";
 #else
 	/* Strip locale (eg en_US.UTF-8) to only have UTF-8 */
-	const char *locale = GetCurrentLocale("LC_CTYPE");
-	if (locale != nullptr) locale = strchr(locale, '.');
-
-	return (locale == nullptr) ? "" : locale + 1;
+	auto locale = GetCurrentLocale("LC_CTYPE");
+	if (!locale.has_value()) return "";
+	auto pos = locale->find('.');
+	if (pos == std::string_view::npos) return "";
+	locale.erase(0, pos + 1);
+	return locale;
 #endif
 }
 
@@ -115,13 +117,13 @@ static const char *GetLocalCode()
  * Convert between locales, which from and which to is set in the calling
  * functions OTTD2FS() and FS2OTTD().
  */
-static std::string convert_tofrom_fs(iconv_t convd, const std::string &name)
+static std::string convert_tofrom_fs(iconv_t convd, std::string_view name)
 {
 	/* There are different implementations of iconv. The older ones,
 	 * e.g. SUSv2, pass a const pointer, whereas the newer ones, e.g.
 	 * IEEE 1003.1 (2004), pass a non-const pointer. */
 #ifdef HAVE_NON_CONST_ICONV
-	char *inbuf = const_cast<char*>(name.data());
+	char *inbuf = const_cast<char *>(name.data());
 #else
 	const char *inbuf = name.data();
 #endif
@@ -135,31 +137,37 @@ static std::string convert_tofrom_fs(iconv_t convd, const std::string &name)
 	iconv(convd, nullptr, nullptr, nullptr, nullptr);
 	if (iconv(convd, &inbuf, &inlen, &outbuf, &outlen) == SIZE_MAX) {
 		Debug(misc, 0, "[iconv] error converting '{}'. Errno {}", name, errno);
-		return name;
+		return std::string{name};
 	}
 
 	buf.resize(outbuf - buf.data());
 	return buf;
 }
 
+/**
+ * Open iconv converter.
+ */
+static std::optional<iconv_t> OpenIconv(std::string from, std::string to)
+{
+	iconv_t convd = iconv_open(from.c_str(), to.c_str());
+	if (convd == reinterpret_cast<iconv_t>(-1)) {
+		Debug(misc, 0, "[iconv] conversion from codeset '{}' to '{}' unsupported", from, to);
+		return std::nullopt;
+	}
+	return convd;
+}
+
 /**
  * Convert from OpenTTD's encoding to that of the local environment
  * @param name pointer to a valid string that will be converted
  * @return pointer to a new stringbuffer that contains the converted string
  */
-std::string OTTD2FS(const std::string &name)
+std::string OTTD2FS(std::string_view name)
 {
-	static iconv_t convd = (iconv_t)(-1);
-	if (convd == (iconv_t)(-1)) {
-		const char *env = GetLocalCode();
-		convd = iconv_open(env, INTERNALCODE);
-		if (convd == (iconv_t)(-1)) {
-			Debug(misc, 0, "[iconv] conversion from codeset '{}' to '{}' unsupported", INTERNALCODE, env);
-			return name;
-		}
-	}
+	static const auto convd = OpenIconv(GetLocalCode(), INTERNALCODE);
+	if (!convd.has_value()) return std::string{name};
 
-	return convert_tofrom_fs(convd, name);
+	return convert_tofrom_fs(*convd, name);
 }
 
 /**
@@ -167,30 +175,23 @@ std::string OTTD2FS(const std::string &name)
  * @param name valid string that will be converted
  * @return pointer to a new stringbuffer that contains the converted string
  */
-std::string FS2OTTD(const std::string &name)
+std::string FS2OTTD(std::string_view name)
 {
-	static iconv_t convd = (iconv_t)(-1);
-	if (convd == (iconv_t)(-1)) {
-		const char *env = GetLocalCode();
-		convd = iconv_open(INTERNALCODE, env);
-		if (convd == (iconv_t)(-1)) {
-			Debug(misc, 0, "[iconv] conversion from codeset '{}' to '{}' unsupported", env, INTERNALCODE);
-			return name;
-		}
-	}
+	static const auto convd = OpenIconv(INTERNALCODE, GetLocalCode());
+	if (!convd.has_value()) return std::string{name};
 
-	return convert_tofrom_fs(convd, name);
+	return convert_tofrom_fs(*convd, name);
 }
 
 #endif /* WITH_ICONV */
 
-void ShowInfoI(const std::string &str)
+void ShowInfoI(std::string_view str)
 {
 	fmt::print(stderr, "{}\n", str);
 }
 
 #if !defined(__APPLE__)
-void ShowOSErrorBox(const char *buf, bool)
+void ShowOSErrorBox(std::string_view buf, bool)
 {
 	/* All unix systems, except OSX. Only use escape codes on a TTY. */
 	if (isatty(fileno(stderr))) {
@@ -224,7 +225,7 @@ std::optional<std::string> GetClipboardContents()
 void OSOpenBrowser(const std::string &url)
 {
 	/* Implementation in pre.js */
-	EM_ASM({ if (window["openttd_open_url"]) window.openttd_open_url($0, $1) }, url.c_str(), url.size());
+	EM_ASM({ if (window["openttd_open_url"]) window.openttd_open_url($0, $1) }, url.data(), url.size());
 }
 #elif !defined( __APPLE__)
 void OSOpenBrowser(const std::string &url)
@@ -242,12 +243,12 @@ void OSOpenBrowser(const std::string &url)
 }
 #endif /* __APPLE__ */
 
-void SetCurrentThreadName([[maybe_unused]] const char *threadName)
+void SetCurrentThreadName([[maybe_unused]] const std::string &thread_name)
 {
 #if defined(__GLIBC__)
-	if (threadName) pthread_setname_np(pthread_self(), threadName);
+	pthread_setname_np(pthread_self(), thread_name.c_str());
 #endif /* defined(__GLIBC__) */
 #if defined(__APPLE__)
-	MacOSSetThreadName(threadName);
+	MacOSSetThreadName(thread_name);
 #endif /* defined(__APPLE__) */
 }
diff --git a/src/os/unix/unix_main.cpp b/src/os/unix/unix_main.cpp
index 4a71b886b3..046a46d2b5 100644
--- a/src/os/unix/unix_main.cpp
+++ b/src/os/unix/unix_main.cpp
@@ -21,7 +21,11 @@
 int CDECL main(int argc, char *argv[])
 {
 	/* Make sure our arguments contain only valid UTF-8 characters. */
-	for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]);
+	std::vector<std::string_view> params;
+	for (int i = 0; i < argc; ++i) {
+		StrMakeValidInPlace(argv[i]);
+		params.emplace_back(argv[i]);
+	}
 
 	CrashLog::InitialiseCrashLog();
 
@@ -29,5 +33,5 @@ int CDECL main(int argc, char *argv[])
 
 	signal(SIGPIPE, SIG_IGN);
 
-	return openttd_main(std::span(argv, argc));
+	return openttd_main(params);
 }
diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp
index c23bb4150a..9adc822c41 100644
--- a/src/os/windows/crashlog_win.cpp
+++ b/src/os/windows/crashlog_win.cpp
@@ -212,8 +212,7 @@ static const uint MAX_FRAMES     = 64;
 		proc.pSymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_FAIL_CRITICAL_ERRORS | SYMOPT_UNDNAME);
 
 		/* Initialize starting stack frame from context record. */
-		STACKFRAME64 frame;
-		memset(&frame, 0, sizeof(frame));
+		STACKFRAME64 frame{};
 #ifdef _M_AMD64
 		frame.AddrPC.Offset = ep->ContextRecord->Rip;
 		frame.AddrFrame.Offset = ep->ContextRecord->Rbp;
@@ -232,8 +231,7 @@ static const uint MAX_FRAMES     = 64;
 		frame.AddrStack.Mode = AddrModeFlat;
 
 		/* Copy context record as StackWalk64 may modify it. */
-		CONTEXT ctx;
-		memcpy(&ctx, ep->ContextRecord, sizeof(ctx));
+		CONTEXT ctx = *ep->ContextRecord;
 
 		/* Allocate space for symbol info.
 		 * The total initialised size must be sufficient for a null-terminating char at sym_info->Name[sym_info->MaxNameLength],
@@ -260,7 +258,7 @@ static const uint MAX_FRAMES     = 64;
 			}
 
 			/* Get module name. */
-			const char *mod_name = "???";
+			std::string_view mod_name = "???";
 
 			IMAGEHLP_MODULE64 module;
 			module.SizeOfStruct = sizeof(module);
@@ -269,18 +267,18 @@ static const uint MAX_FRAMES     = 64;
 			}
 
 			/* Print module and instruction pointer. */
-			std::string message = fmt::format("{:20s} {:X}",  mod_name, frame.AddrPC.Offset);
+			std::string message = fmt::format("{:20s} {:X}", mod_name, frame.AddrPC.Offset);
 
 			/* Get symbol name and line info if possible. */
 			DWORD64 offset;
 			if (proc.pSymGetSymFromAddr64(hCur, frame.AddrPC.Offset, &offset, sym_info)) {
-				message += fmt::format(" {} + {}", sym_info->Name, offset);
+				format_append(message, " {} + {}", sym_info->Name, offset);
 
 				DWORD line_offs;
 				IMAGEHLP_LINE64 line;
 				line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
 				if (proc.pSymGetLineFromAddr64(hCur, frame.AddrPC.Offset, &line_offs, &line)) {
-					message += fmt::format(" ({}:{})", line.FileName, line.LineNumber);
+					format_append(message, " ({}:{})", line.FileName, line.LineNumber);
 				}
 			}
 
diff --git a/src/os/windows/font_win32.cpp b/src/os/windows/font_win32.cpp
index 5e2bbce4a4..6358ca4d3d 100644
--- a/src/os/windows/font_win32.cpp
+++ b/src/os/windows/font_win32.cpp
@@ -11,7 +11,6 @@
 #include "../../debug.h"
 #include "../../blitter/factory.hpp"
 #include "../../core/math_func.hpp"
-#include "../../core/mem_func.hpp"
 #include "../../error_func.h"
 #include "../../fileio_func.h"
 #include "../../fontcache.h"
@@ -225,9 +224,8 @@ void Win32FontCache::ClearFontCache()
 
 	/* GDI has rendered the glyph, now we allocate a sprite and copy the image into it. */
 	SpriteLoader::SpriteCollection spritecollection;
-	SpriteLoader::Sprite &sprite = spritecollection[ZOOM_LVL_MIN];
-	sprite.AllocateData(ZOOM_LVL_MIN, width * height);
-	sprite.type = SpriteType::Font;
+	SpriteLoader::Sprite &sprite = spritecollection[ZoomLevel::Min];
+	sprite.AllocateData(ZoomLevel::Min, width * height);
 	sprite.colours = SpriteComponent::Palette;
 	if (aa) sprite.colours.Set(SpriteComponent::Alpha);
 	sprite.width = width;
@@ -266,7 +264,7 @@ void Win32FontCache::ClearFontCache()
 	}
 
 	UniquePtrSpriteAllocator allocator;
-	BlitterFactory::GetCurrentBlitter()->Encode(spritecollection, allocator);
+	BlitterFactory::GetCurrentBlitter()->Encode(SpriteType::Font, spritecollection, allocator);
 
 	GlyphEntry new_glyph;
 	new_glyph.data = std::move(allocator.data);
@@ -369,8 +367,7 @@ void LoadWin32Font(FontSize fs)
 	std::string font = GetFontCacheFontName(fs);
 	if (font.empty()) return;
 
-	LOGFONT logfont;
-	MemSetT(&logfont, 0);
+	LOGFONT logfont{};
 	logfont.lfPitchAndFamily = fs == FS_MONO ? FIXED_PITCH : VARIABLE_PITCH;
 	logfont.lfCharSet = DEFAULT_CHARSET;
 	logfont.lfOutPrecision = OUT_OUTLINE_PRECIS;
diff --git a/src/os/windows/string_uniscribe.cpp b/src/os/windows/string_uniscribe.cpp
index 9ba43d5bdd..210e7a17f0 100644
--- a/src/os/windows/string_uniscribe.cpp
+++ b/src/os/windows/string_uniscribe.cpp
@@ -143,8 +143,7 @@ static HFONT HFontFromFont(Font *font)
 {
 	if (font->fc->GetOSHandle() != nullptr) return CreateFontIndirect(reinterpret_cast<PLOGFONT>(const_cast<void *>(font->fc->GetOSHandle())));
 
-	LOGFONT logfont;
-	ZeroMemory(&logfont, sizeof(LOGFONT));
+	LOGFONT logfont{};
 	logfont.lfHeight = font->fc->GetHeight();
 	logfont.lfWeight = FW_NORMAL;
 	logfont.lfCharSet = DEFAULT_CHARSET;
@@ -249,12 +248,10 @@ static bool UniscribeShapeRun(const UniscribeParagraphLayoutFactory::CharType *b
 static std::vector<SCRIPT_ITEM> UniscribeItemizeString(UniscribeParagraphLayoutFactory::CharType *buff, int32_t length)
 {
 	/* Itemize text. */
-	SCRIPT_CONTROL control;
-	ZeroMemory(&control, sizeof(SCRIPT_CONTROL));
+	SCRIPT_CONTROL control{};
 	control.uDefaultLanguage = _current_language->winlangid;
 
-	SCRIPT_STATE state;
-	ZeroMemory(&state, sizeof(SCRIPT_STATE));
+	SCRIPT_STATE state{};
 	state.uBidiLevel = _current_text_dir == TD_RTL ? 1 : 0;
 
 	std::vector<SCRIPT_ITEM> items(16);
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index 8ac0a5ccc9..107436a1d8 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -47,7 +47,7 @@ bool MyShowCursor(bool show, bool toggle)
 	return !show;
 }
 
-void ShowOSErrorBox(const char *buf, bool)
+void ShowOSErrorBox(std::string_view buf, bool)
 {
 	MyShowCursor(true);
 	MessageBox(GetActiveWindow(), OTTD2FS(buf).c_str(), L"Error!", MB_ICONSTOP | MB_TASKMODAL);
@@ -198,7 +198,7 @@ static INT_PTR CALLBACK HelpDialogFunc(HWND wnd, UINT msg, WPARAM wParam, LPARAM
 	return FALSE;
 }
 
-void ShowInfoI(const std::string &str)
+void ShowInfoI(std::string_view str)
 {
 	if (_has_console) {
 		fmt::print(stderr, "{}\n", str);
@@ -231,7 +231,7 @@ char *getcwd(char *buf, size_t size)
 
 extern std::string _config_file;
 
-void DetermineBasePaths(const char *exe)
+void DetermineBasePaths(std::string_view exe)
 {
 	extern std::array<std::string, NUM_SEARCHPATHS> _searchpaths;
 
@@ -334,13 +334,13 @@ std::optional<std::string> GetClipboardContents()
  * @see the current code-page comes from video\win32_v.cpp, event-notification
  * WM_INPUTLANGCHANGE
  */
-std::string FS2OTTD(const std::wstring &name)
+std::string FS2OTTD(std::wstring_view name)
 {
-	int name_len = (name.length() >= INT_MAX) ? INT_MAX : (int)name.length();
-	int len = WideCharToMultiByte(CP_UTF8, 0, name.c_str(), name_len, nullptr, 0, nullptr, nullptr);
+	int name_len = (name.length() >= INT_MAX) ? INT_MAX : static_cast<int>(name.length());
+	int len = WideCharToMultiByte(CP_UTF8, 0, name.data(), name_len, nullptr, 0, nullptr, nullptr);
 	if (len <= 0) return std::string();
 	std::string utf8_buf(len, '\0'); // len includes terminating null
-	WideCharToMultiByte(CP_UTF8, 0, name.c_str(), name_len, utf8_buf.data(), len, nullptr, nullptr);
+	WideCharToMultiByte(CP_UTF8, 0, name.data(), name_len, utf8_buf.data(), len, nullptr, nullptr);
 	return utf8_buf;
 }
 
@@ -351,13 +351,13 @@ std::string FS2OTTD(const std::wstring &name)
  * @param console_cp convert to the console encoding instead of the normal system encoding.
  * @return converted string; if failed string is of zero-length
  */
-std::wstring OTTD2FS(const std::string &name)
+std::wstring OTTD2FS(std::string_view name)
 {
-	int name_len = (name.length() >= INT_MAX) ? INT_MAX : (int)name.length();
-	int len = MultiByteToWideChar(CP_UTF8, 0, name.c_str(), name_len, nullptr, 0);
+	int name_len = (name.length() >= INT_MAX) ? INT_MAX : static_cast<int>(name.length());
+	int len = MultiByteToWideChar(CP_UTF8, 0, name.data(), name_len, nullptr, 0);
 	if (len <= 0) return std::wstring();
 	std::wstring system_buf(len, L'\0'); // len includes terminating null
-	MultiByteToWideChar(CP_UTF8, 0, name.c_str(), name_len, system_buf.data(), len);
+	MultiByteToWideChar(CP_UTF8, 0, name.data(), name_len, system_buf.data(), len);
 	return system_buf;
 }
 
@@ -369,13 +369,13 @@ std::wstring OTTD2FS(const std::string &name)
  * @param dst_buf span of valid char buffer that will receive the converted string
  * @return pointer to dst_buf. If conversion fails the string is of zero-length
  */
-char *convert_from_fs(const std::wstring_view src, std::span<char> dst_buf)
+std::string_view convert_from_fs(const std::wstring_view src, std::span<char> dst_buf)
 {
 	/* Convert UTF-16 string to UTF-8. */
 	int len = WideCharToMultiByte(CP_UTF8, 0, src.data(), static_cast<int>(src.size()), dst_buf.data(), static_cast<int>(dst_buf.size() - 1U), nullptr, nullptr);
 	dst_buf[len] = '\0';
 
-	return dst_buf.data();
+	return std::string_view(dst_buf.data(), len);
 }
 
 
@@ -386,7 +386,7 @@ char *convert_from_fs(const std::wstring_view src, std::span<char> dst_buf)
  * @param dst_buf span of valid wide-char buffer that will receive the converted string
  * @return pointer to dst_buf. If conversion fails the string is of zero-length
  */
-wchar_t *convert_to_fs(const std::string_view src, std::span<wchar_t> dst_buf)
+wchar_t *convert_to_fs(std::string_view src, std::span<wchar_t> dst_buf)
 {
 	int len = MultiByteToWideChar(CP_UTF8, 0, src.data(), static_cast<int>(src.size()), dst_buf.data(), static_cast<int>(dst_buf.size() - 1U));
 	dst_buf[len] = '\0';
@@ -395,7 +395,7 @@ wchar_t *convert_to_fs(const std::string_view src, std::span<wchar_t> dst_buf)
 }
 
 /** Determine the current user's locale. */
-const char *GetCurrentLocale(const char *)
+std::optional<std::string> GetCurrentLocale(const char *)
 {
 	const LANGID userUiLang = GetUserDefaultUILanguage();
 	const LCID userUiLocale = MAKELCID(userUiLang, SORT_DEFAULT);
@@ -407,8 +407,7 @@ const char *GetCurrentLocale(const char *)
 		return nullptr;
 	}
 	/* Format it as 'en_us'. */
-	static char retbuf[6] = {lang[0], lang[1], '_', country[0], country[1], 0};
-	return retbuf;
+	return fmt::format("{}_{}", std::string_view{lang, 2}, std::string_view{country, 2});
 }
 
 
@@ -428,14 +427,19 @@ void Win32SetCurrentLocaleName(std::string iso_code)
 		}
 	}
 
-	MultiByteToWideChar(CP_UTF8, 0, iso_code.c_str(), -1, _cur_iso_locale, static_cast<int>(std::size(_cur_iso_locale)));
+	MultiByteToWideChar(CP_UTF8, 0, iso_code.data(), static_cast<int>(iso_code.size()), _cur_iso_locale, static_cast<int>(std::size(_cur_iso_locale)));
+}
+
+static LibraryLoader::Function GetKernel32Function(const std::string &symbol_name)
+{
+	static LibraryLoader _kernel32("Kernel32.dll");
+	return _kernel32.GetFunction(symbol_name);
 }
 
 int OTTDStringCompare(std::string_view s1, std::string_view s2)
 {
 	typedef int (WINAPI *PFNCOMPARESTRINGEX)(LPCWSTR, DWORD, LPCWCH, int, LPCWCH, int, LPVOID, LPVOID, LPARAM);
-	static PFNCOMPARESTRINGEX _CompareStringEx = nullptr;
-	static bool first_time = true;
+	static const PFNCOMPARESTRINGEX _CompareStringEx = GetKernel32Function("CompareStringEx");
 
 #ifndef SORT_DIGITSASNUMBERS
 #	define SORT_DIGITSASNUMBERS 0x00000008  // use digits as numbers sort method
@@ -444,12 +448,6 @@ int OTTDStringCompare(std::string_view s1, std::string_view s2)
 #	define LINGUISTIC_IGNORECASE 0x00000010 // linguistically appropriate 'ignore case'
 #endif
 
-	if (first_time) {
-		static LibraryLoader _kernel32("Kernel32.dll");
-		_CompareStringEx = _kernel32.GetFunction("CompareStringEx");
-		first_time = false;
-	}
-
 	int len_s1 = MultiByteToWideChar(CP_UTF8, 0, s1.data(), (int)s1.size(), nullptr, 0);
 	int len_s2 = MultiByteToWideChar(CP_UTF8, 0, s2.data(), (int)s2.size(), nullptr, 0);
 
@@ -461,11 +459,11 @@ int OTTDStringCompare(std::string_view s1, std::string_view s2)
 
 	/* CompareStringEx takes UTF-16 strings, even in ANSI-builds. */
 	if (_CompareStringEx != nullptr) {
-		int result = _CompareStringEx(_cur_iso_locale, LINGUISTIC_IGNORECASE | SORT_DIGITSASNUMBERS, str_s1.c_str(), len_s1, str_s2.c_str(), len_s2, nullptr, nullptr, 0);
+		int result = _CompareStringEx(_cur_iso_locale, LINGUISTIC_IGNORECASE | SORT_DIGITSASNUMBERS, str_s1.data(), len_s1, str_s2.data(), len_s2, nullptr, nullptr, 0);
 		if (result != 0) return result;
 	}
 
-	return CompareString(MAKELCID(_current_language->winlangid, SORT_DEFAULT), NORM_IGNORECASE, str_s1.c_str(), len_s1, str_s2.c_str(), len_s2);
+	return CompareString(MAKELCID(_current_language->winlangid, SORT_DEFAULT), NORM_IGNORECASE, str_s1.data(), len_s1, str_s2.data(), len_s2);
 }
 
 /**
@@ -476,17 +474,10 @@ int OTTDStringCompare(std::string_view s1, std::string_view s2)
  * @param case_insensitive Search case-insensitive.
  * @return 1 if value was found, 0 if it was not found, or -1 if not supported by the OS.
  */
-int Win32StringContains(const std::string_view str, const std::string_view value, bool case_insensitive)
+int Win32StringContains(std::string_view str, std::string_view value, bool case_insensitive)
 {
 	typedef int (WINAPI *PFNFINDNLSSTRINGEX)(LPCWSTR, DWORD, LPCWSTR, int, LPCWSTR, int, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM);
-	static PFNFINDNLSSTRINGEX _FindNLSStringEx = nullptr;
-	static bool first_time = true;
-
-	if (first_time) {
-		static LibraryLoader _kernel32("Kernel32.dll");
-		_FindNLSStringEx = _kernel32.GetFunction("FindNLSStringEx");
-		first_time = false;
-	}
+	static const PFNFINDNLSSTRINGEX _FindNLSStringEx = GetKernel32Function("FindNLSStringEx");
 
 	if (_FindNLSStringEx != nullptr) {
 		int len_str = MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), nullptr, 0);
@@ -520,11 +511,11 @@ PACK_N(struct THREADNAME_INFO {
 /**
  * Signal thread name to any attached debuggers.
  */
-void SetCurrentThreadName(const char *threadName)
+void SetCurrentThreadName(const std::string &thread_name)
 {
 	THREADNAME_INFO info;
 	info.dwType = 0x1000;
-	info.szName = threadName;
+	info.szName = thread_name.c_str();
 	info.dwThreadID = -1;
 	info.dwFlags = 0;
 
@@ -537,5 +528,5 @@ void SetCurrentThreadName(const char *threadName)
 #pragma warning(pop)
 }
 #else
-void SetCurrentThreadName(const char *) {}
+void SetCurrentThreadName(const std::string &) {}
 #endif
diff --git a/src/os/windows/win32.h b/src/os/windows/win32.h
index a6b3798a1e..8f4d8bd06b 100644
--- a/src/os/windows/win32.h
+++ b/src/os/windows/win32.h
@@ -12,11 +12,10 @@
 
 bool MyShowCursor(bool show, bool toggle = false);
 
-char *convert_from_fs(const std::wstring_view src, std::span<char> dst_buf);
-wchar_t *convert_to_fs(const std::string_view src, std::span<wchar_t> dst_buf);
+std::string_view convert_from_fs(const std::wstring_view src, std::span<char> dst_buf);
+wchar_t *convert_to_fs(std::string_view src, std::span<wchar_t> dst_buf);
 
-void Win32SetCurrentLocaleName(const char *iso_code);
 int OTTDStringCompare(std::string_view s1, std::string_view s2);
-int Win32StringContains(const std::string_view str, const std::string_view value, bool case_insensitive);
+int Win32StringContains(std::string_view str, std::string_view value, bool case_insensitive);
 
 #endif /* WIN32_H */
diff --git a/src/os/windows/win32_main.cpp b/src/os/windows/win32_main.cpp
index 9b5c815e3a..7a1c275fc3 100644
--- a/src/os/windows/win32_main.cpp
+++ b/src/os/windows/win32_main.cpp
@@ -12,37 +12,31 @@
 #include <mmsystem.h>
 #include "../../openttd.h"
 #include "../../core/random_func.hpp"
+#include "../../core/string_consumer.hpp"
 #include "../../string_func.h"
 #include "../../crashlog.h"
 #include "../../debug.h"
 
 #include "../../safeguards.h"
 
-static auto ParseCommandLine(char *line)
+static auto ParseCommandLine(std::string_view line)
 {
-	std::vector<char *> arguments;
-	for (;;) {
-		/* skip whitespace */
-		while (*line == ' ' || *line == '\t') line++;
+	std::vector<std::string_view> arguments;
 
-		/* end? */
-		if (*line == '\0') break;
+	StringConsumer consumer{line};
+	while (consumer.AnyBytesLeft()) {
+		consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+		if (!consumer.AnyBytesLeft()) break;
 
-		/* special handling when quoted */
-		if (*line == '"') {
-			arguments.push_back(++line);
-			while (*line != '"') {
-				if (*line == '\0') return arguments;
-				line++;
-			}
+		std::string_view argument;
+		if (consumer.ReadIf("\"")) {
+			/* special handling when quoted */
+			argument = consumer.ReadUntil("\"", StringConsumer::SKIP_ONE_SEPARATOR);
 		} else {
-			arguments.push_back(line);
-			while (*line != ' ' && *line != '\t') {
-				if (*line == '\0') return arguments;
-				line++;
-			}
+			argument = consumer.ReadUntilCharIn(StringConsumer::WHITESPACE_NO_NEWLINE);
 		}
-		*line++ = '\0';
+
+		arguments.push_back(argument);
 	};
 
 	return arguments;
@@ -57,8 +51,8 @@ int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 
 	CrashLog::InitialiseCrashLog();
 
-	/* Convert the command line to UTF-8. */
-	std::string cmdline = FS2OTTD(GetCommandLine());
+	/* Convert the command line to valid UTF-8. */
+	std::string cmdline = StrMakeValid(FS2OTTD(GetCommandLine()));
 
 	/* Set the console codepage to UTF-8. */
 	SetConsoleOutputCP(CP_UTF8);
@@ -72,11 +66,7 @@ int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 	/* setup random seed to something quite random */
 	SetRandomSeed(GetTickCount());
 
-	auto arguments = ParseCommandLine(cmdline.data());
-
-	/* Make sure our arguments contain only valid UTF-8 characters. */
-	for (auto argument : arguments) StrMakeValidInPlace(argument);
-
+	auto arguments = ParseCommandLine(cmdline);
 	int ret = openttd_main(arguments);
 
 	/* Restore system timer resolution. */
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index 4763321ba9..0e67c0a09e 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -16,6 +16,7 @@
 #include "querystring_gui.h"
 #include "video/video_driver.hpp"
 #include "zoom_func.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/osk_widget.h"
 
@@ -338,7 +339,7 @@ static constexpr NWidgetPart _nested_osk_widgets[] = {
 };
 
 static WindowDesc _osk_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_OSK, WC_NONE,
 	{},
 	_nested_osk_widgets
@@ -358,17 +359,10 @@ void GetKeyboardLayout()
 	keyboard[1] = _keyboard_opt[1].empty() ? GetString(STR_OSK_KEYBOARD_LAYOUT_CAPS) : _keyboard_opt[1];
 
 	for (uint j = 0; j < 2; j++) {
-		auto kbd = keyboard[j].begin();
-		bool ended = false;
+		StringConsumer consumer(keyboard[j]);
 		for (uint i = 0; i < OSK_KEYBOARD_ENTRIES; i++) {
-			_keyboard[j][i] = Utf8Consume(kbd);
-
 			/* Be lenient when the last characters are missing (is quite normal) */
-			if (_keyboard[j][i] == '\0' || ended) {
-				ended = true;
-				_keyboard[j][i] = ' ';
-				continue;
-			}
+			_keyboard[j][i] = consumer.AnyBytesLeft() ? consumer.ReadUtf8() : ' ';
 
 			if (IsPrintable(_keyboard[j][i])) {
 				errormark[j] += ' ';
diff --git a/src/palette.cpp b/src/palette.cpp
index 96ab905d83..84fed51898 100644
--- a/src/palette.cpp
+++ b/src/palette.cpp
@@ -209,7 +209,7 @@ void DoPaletteAnimations();
 void GfxInitPalettes()
 {
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
-	memcpy(&_cur_palette, &_palette, sizeof(_cur_palette));
+	_cur_palette = _palette;
 	DoPaletteAnimations();
 }
 
@@ -253,7 +253,6 @@ void DoPaletteAnimations()
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	const Colour *s;
 	const ExtraPaletteValues *ev = &_extra_palette_values;
-	Colour old_val[PALETTE_ANIM_SIZE];
 	const uint old_tc = palette_animation_counter;
 	uint j;
 
@@ -261,10 +260,12 @@ void DoPaletteAnimations()
 		palette_animation_counter = 0;
 	}
 
-	Colour *palette_pos = &_cur_palette.palette[PALETTE_ANIM_START];  // Points to where animations are taking place on the palette
+	std::span<Colour> current_palette{&_cur_palette.palette[PALETTE_ANIM_START], PALETTE_ANIM_SIZE};
 	/* Makes a copy of the current animation palette in old_val,
 	 * so the work on the current palette could be compared, see if there has been any changes */
-	memcpy(old_val, palette_pos, sizeof(old_val));
+	std::array<Colour, PALETTE_ANIM_SIZE> original_palette;
+	std::ranges::copy(current_palette, original_palette.begin());
+	auto palette_pos = current_palette.begin(); // Points to where animations are taking place on the palette
 
 	/* Fizzy Drink bubbles animation */
 	s = ev->fizzy_drink;
@@ -344,7 +345,7 @@ void DoPaletteAnimations()
 
 	if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PaletteAnimation::None) {
 		palette_animation_counter = old_tc;
-	} else if (_cur_palette.count_dirty == 0 && memcmp(old_val, &_cur_palette.palette[PALETTE_ANIM_START], sizeof(old_val)) != 0) {
+	} else if (_cur_palette.count_dirty == 0 && !std::ranges::equal(current_palette, original_palette)) {
 		/* Did we changed anything on the palette? Seems so.  Mark it as dirty */
 		_cur_palette.first_dirty = PALETTE_ANIM_START;
 		_cur_palette.count_dirty = PALETTE_ANIM_SIZE;
diff --git a/src/palette_func.h b/src/palette_func.h
index aabf92120d..eba770b9d5 100644
--- a/src/palette_func.h
+++ b/src/palette_func.h
@@ -91,7 +91,7 @@ void SetColourGradient(Colours colour, ColourShade shade, uint8_t palette_colour
  * @param level Intensity, 0 = black, 15 = white
  * @return colour
  */
-#define GREY_SCALE(level) (level)
+constexpr uint8_t GREY_SCALE(uint8_t level) { return level; }
 
 static const uint8_t PC_BLACK              = GREY_SCALE(1);  ///< Black palette colour.
 static const uint8_t PC_DARK_GREY          = GREY_SCALE(6);  ///< Dark grey palette colour.
diff --git a/src/pathfinder/aystar.cpp b/src/pathfinder/aystar.cpp
index 7e8fecfe3f..b885c76c43 100644
--- a/src/pathfinder/aystar.cpp
+++ b/src/pathfinder/aystar.cpp
@@ -41,7 +41,7 @@ void AyStar::CheckTile(AyStarNode *current, PathNode *parent)
 	if (this->nodes.FindClosedNode(*current) != nullptr) return;
 
 	/* Calculate the G-value for this node */
-	int new_g = this->CalculateG(this, current, parent);
+	int new_g = this->CalculateG(*current, *parent);
 	/* If the value was INVALID_NODE, we don't do anything with this node */
 	if (new_g == AYSTAR_INVALID_NODE) return;
 
@@ -49,10 +49,9 @@ void AyStar::CheckTile(AyStarNode *current, PathNode *parent)
 	assert(new_g >= 0);
 	/* Add the parent g-value to the new g-value */
 	new_g += parent->cost;
-	if (this->max_path_cost != 0 && new_g > this->max_path_cost) return;
 
 	/* Calculate the h-value */
-	int new_h = this->CalculateH(this, current, parent);
+	int new_h = this->CalculateH(*current, *parent);
 	/* There should not be given any error-code.. */
 	assert(new_h >= 0);
 
@@ -97,10 +96,8 @@ AyStarStatus AyStar::Loop()
 	if (current == nullptr) return AyStarStatus::EmptyOpenList;
 
 	/* Check for end node and if found, return that code */
-	if (this->EndNodeCheck(this, current) == AyStarStatus::FoundEndNode && current->parent != nullptr) {
-		if (this->FoundEndNode != nullptr) {
-			this->FoundEndNode(this, current);
-		}
+	if (this->EndNodeCheck(*current) == AyStarStatus::FoundEndNode && current->parent != nullptr) {
+		this->FoundEndNode(*current);
 		return AyStarStatus::FoundEndNode;
 	}
 
@@ -108,7 +105,7 @@ AyStarStatus AyStar::Loop()
 	this->nodes.InsertClosedNode(*current);
 
 	/* Load the neighbours */
-	this->GetNeighbours(this, current);
+	this->GetNeighbours(*current, this->neighbours);
 
 	/* Go through all neighbours */
 	for (auto &neighbour : this->neighbours) {
@@ -116,7 +113,7 @@ AyStarStatus AyStar::Loop()
 		this->CheckTile(&neighbour, current);
 	}
 
-	if (this->max_search_nodes != 0 && this->nodes.ClosedCount() >= this->max_search_nodes) {
+	if (this->nodes.ClosedCount() >= AYSTAR_DEF_MAX_SEARCH_NODES) {
 		/* We've expanded enough nodes */
 		return AyStarStatus::LimitReached;
 	} else {
@@ -131,16 +128,13 @@ AyStarStatus AyStar::Loop()
  *  - #AyStarStatus::FoundEndNode
  *  - #AyStarStatus::NoPath
  *  - #AyStarStatus::StillBusy
- * @note When the algorithm is done (when the return value is not #AyStarStatus::StillBusy) #Clear() is called automatically.
- *       When you stop the algorithm halfway, you should call #Clear() yourself!
  */
 AyStarStatus AyStar::Main()
 {
-	AyStarStatus r = AyStarStatus::FoundEndNode;
-	int i = 0;
-	/* Loop through the OpenList
-	 *  Quit if result is no AyStarStatus::StillBusy or is more than loops_per_tick */
-	while ((r = this->Loop()) == AyStarStatus::StillBusy && (this->loops_per_tick == 0 || ++i < this->loops_per_tick)) { }
+	AyStarStatus r;
+	do {
+		r = this->Loop();
+	} while (r == AyStarStatus::StillBusy);
 #ifdef AYSTAR_DEBUG
 	switch (r) {
 		case AyStarStatus::FoundEndNode: Debug(misc, 0, "[AyStar] Found path!"); break;
@@ -160,9 +154,7 @@ AyStarStatus AyStar::Main()
 
 /**
  * Adds a node from where to start an algorithm. Multiple nodes can be added
- * if wanted. You should make sure that #Clear() is called before adding nodes
- * if the #AyStar has been used before (though the normal main loop calls
- * #Clear() automatically when the algorithm finishes.
+ * if wanted.
  * @param start_node Node to start with.
  * @param g the cost for starting with this node.
  */
diff --git a/src/pathfinder/aystar.h b/src/pathfinder/aystar.h
index d88e15f257..e74d1f3476 100644
--- a/src/pathfinder/aystar.h
+++ b/src/pathfinder/aystar.h
@@ -27,7 +27,7 @@ enum class AyStarStatus : uint8_t {
 	EmptyOpenList, ///< All items are tested, and no path has been found.
 	StillBusy, ///< Some checking was done, but no path found yet, and there are still items left to try.
 	NoPath, ///< No path to the goal was found.
-	LimitReached, ///< The #AyStar::max_search_nodes limit has been reached, aborting search.
+	LimitReached, ///< The AYSTAR_DEF_MAX_SEARCH_NODES limit has been reached, aborting search.
 	Done, ///< Not an end-tile, or wrong direction.
 };
 
@@ -38,99 +38,61 @@ using AyStarNode = CYapfNodeKeyTrackDir;
 struct PathNode : CYapfNodeT<AyStarNode, PathNode> {
 };
 
-struct AyStar;
-
-/**
- * Check whether the end-tile is found.
- * @param aystar %AyStar search algorithm data.
- * @param current Node to exam one.
- * @note The 2nd parameter should be #OpenListNode, and \em not #AyStarNode. #AyStarNode is
- * part of #OpenListNode and so it could be accessed without any problems.
- * The good part about #OpenListNode is, and how AIs use it, that you can
- * access the parent of the current node, and so check if you, for example
- * don't try to enter the file tile with a 90-degree curve. So please, leave
- * this an #OpenListNode, it works just fine.
- * @return Status of the node:
- *  - #AyStarStatus::FoundEndNode : indicates this is the end tile
- *  - #AyStarStatus::Done : indicates this is not the end tile (or direction was wrong)
- */
-typedef AyStarStatus AyStar_EndNodeCheck(const AyStar *aystar, const PathNode *current);
-
-/**
- * Calculate the G-value for the %AyStar algorithm.
- * @return G value of the node:
- *  - #AYSTAR_INVALID_NODE : indicates an item is not valid (e.g.: unwalkable)
- *  - Any value >= 0 : the g-value for this tile
- */
-typedef int32_t AyStar_CalculateG(AyStar *aystar, AyStarNode *current, PathNode *parent);
-
-/**
- * Calculate the H-value for the %AyStar algorithm.
- * Mostly, this must return the distance (Manhattan way) between the current point and the end point.
- * @return The h-value for this tile (any value >= 0)
- */
-typedef int32_t AyStar_CalculateH(AyStar *aystar, AyStarNode *current, PathNode *parent);
-
-/**
- * This function requests the tiles around the current tile and put them in #neighbours.
- * #neighbours is never reset, so if you are not using directions, just leave it alone.
- * @warning Never add more #neighbours than memory allocated for it.
- */
-typedef void AyStar_GetNeighbours(AyStar *aystar, PathNode *current);
-
-/**
- * If the End Node is found, this function is called.
- * It can do, for example, calculate the route and put that in an array.
- */
-typedef void AyStar_FoundEndNode(AyStar *aystar, PathNode *current);
-
 /**
  * %AyStar search algorithm struct.
- * Before calling #Init(), fill #CalculateG, #CalculateH, #GetNeighbours, #EndNodeCheck, and #FoundEndNode.
- * If you want to change them after calling #Init(), first call #Free() !
- *
- * The #user_path, #user_target, and #user_data[10] are intended to be used by the user routines. The data not accessed by the #AyStar code itself.
- * The user routines can change any moment they like.
  */
-struct AyStar {
-/* These fields should be filled before initing the AyStar, but not changed
- * afterwards (except for user_data)! (free and init again to change them) */
-
-	/* These should point to the application specific routines that do the
-	 * actual work */
-	AyStar_CalculateG *CalculateG;
-	AyStar_CalculateH *CalculateH;
-	AyStar_GetNeighbours *GetNeighbours;
-	AyStar_EndNodeCheck *EndNodeCheck;
-	AyStar_FoundEndNode *FoundEndNode;
-
-	/* These are completely untouched by AyStar, they can be accessed by
-	 * the application specific routines to input and output data.
-	 * user_path should typically contain data about the resulting path
-	 * afterwards, user_target should typically contain information about
-	 * what you where looking for, and user_data can contain just about
-	 * everything */
-	void *user_target;
-	void *user_data;
-
-	uint8_t loops_per_tick;   ///< How many loops are there called before Main() gives control back to the caller. 0 = until done.
-	int max_path_cost;    ///< If the g-value goes over this number, it stops searching, 0 = infinite.
-	int max_search_nodes = AYSTAR_DEF_MAX_SEARCH_NODES; ///< The maximum number of nodes that will be expanded, 0 = infinite.
-
-	/* These should be filled with the neighbours of a tile by GetNeighbours */
-	std::vector<AyStarNode> neighbours;
-
-	/* These will contain the methods for manipulating the AyStar. Only
-	 * Main() should be called externally */
-	void AddStartNode(AyStarNode *start_node, int g);
-	AyStarStatus Main();
-	AyStarStatus Loop();
-	void CheckTile(AyStarNode *current, PathNode *parent);
-
+class AyStar {
 protected:
-	NodeList<PathNode, 8, 10> nodes;
+	/**
+	 * Calculate the G-value for the %AyStar algorithm.
+	 * @return G value of the node:
+	 *  - #AYSTAR_INVALID_NODE : indicates an item is not valid (e.g.: unwalkable)
+	 *  - Any value >= 0 : the g-value for this tile
+	 */
+	virtual int32_t CalculateG(const AyStarNode &current, const PathNode &parent) const = 0;
 
+	/**
+	 * Calculate the H-value for the %AyStar algorithm.
+	 * Mostly, this must return the distance (Manhattan way) between the current point and the end point.
+	 * @return The h-value for this tile (any value >= 0)
+	 */
+	virtual int32_t CalculateH(const AyStarNode &current, const PathNode &parent) const = 0;
+
+	/**
+	 * This function requests the tiles around the current tile.
+	 * #neighbours is never reset, so if you are not using directions, just leave it alone.
+	 */
+	virtual void GetNeighbours(const PathNode &current, std::vector<AyStarNode> &neighours) const = 0;
+
+	 /**
+	 * Check whether the end-tile is found.
+	 * @param current Node to exam.
+	 * @return Status of the node:
+	 *  - #AyStarStatus::FoundEndNode : indicates this is the end tile
+	 *  - #AyStarStatus::Done : indicates this is not the end tile (or direction was wrong)
+	 */
+	virtual AyStarStatus EndNodeCheck(const PathNode &current) const = 0;
+
+	/**
+	 * If the End Node is found, this function is called.
+	 * It can do, for example, calculate the route and put that in an array.
+	 */
+	virtual void FoundEndNode(const PathNode &current) = 0;
+
+	void AddStartNode(AyStarNode *start_node, int g);
+
+	AyStarStatus Main();
+
+public:
+	virtual ~AyStar() = default;
+
+private:
+	NodeList<PathNode, 8, 10> nodes;
+	mutable std::vector<AyStarNode> neighbours;
+
+	AyStarStatus Loop();
 	void OpenListAdd(PathNode *parent, const AyStarNode *node, int f, int g);
+	void CheckTile(AyStarNode *current, PathNode *parent);
 };
 
 #endif /* AYSTAR_H */
diff --git a/src/pathfinder/follow_track.hpp b/src/pathfinder/follow_track.hpp
index 4e10328512..51feff2888 100644
--- a/src/pathfinder/follow_track.hpp
+++ b/src/pathfinder/follow_track.hpp
@@ -93,8 +93,8 @@ struct CFollowTrackT
 	debug_inline static bool IsRailTT() { return TT() == TRANSPORT_RAIL; }
 	inline bool IsTram() { return IsRoadTT() && RoadTypeIsTram(RoadVehicle::From(this->veh)->roadtype); }
 	debug_inline static bool IsRoadTT() { return TT() == TRANSPORT_ROAD; }
-	inline static bool Allow90degTurns() { return T90deg_turns_allowed_; }
-	inline static bool DoTrackMasking() { return Tmask_reserved_tracks; }
+	static inline bool Allow90degTurns() { return T90deg_turns_allowed_; }
+	static inline bool DoTrackMasking() { return Tmask_reserved_tracks; }
 
 	/** Tests if a tile is a road tile with a single tramtrack (tram can reverse) */
 	inline DiagDirection GetSingleTramBit(TileIndex tile)
@@ -331,7 +331,7 @@ protected:
 		}
 
 		/* rail transport is possible only on compatible rail types */
-		if (IsRailTT()) {
+		if (IsRailTT() && this->railtypes.Any()) {
 			RailType rail_type = GetTileRailType(this->new_tile);
 			if (!this->railtypes.Test(rail_type)) {
 				/* incompatible rail type */
diff --git a/src/pathfinder/water_regions.cpp b/src/pathfinder/water_regions.cpp
index f2e1753e9d..4ef9694af1 100644
--- a/src/pathfinder/water_regions.cpp
+++ b/src/pathfinder/water_regions.cpp
@@ -19,12 +19,14 @@
 #include "../ship.h"
 #include "../debug.h"
 #include "../3rdparty/fmt/ranges.h"
+#include "../core/convertible_through_base.hpp"
+#include "../safeguards.h"
 
-using TWaterRegionTraversabilityBits = uint16_t;
-constexpr TWaterRegionPatchLabel FIRST_REGION_LABEL = 1;
+using WaterRegionTraversabilityBits = uint16_t;
+constexpr WaterRegionPatchLabel FIRST_REGION_LABEL{1};
 
-static_assert(sizeof(TWaterRegionTraversabilityBits) * 8 == WATER_REGION_EDGE_LENGTH);
-static_assert(sizeof(TWaterRegionPatchLabel) == sizeof(uint8_t)); // Important for the hash calculation.
+static_assert(sizeof(WaterRegionTraversabilityBits) * 8 == WATER_REGION_EDGE_LENGTH);
+static_assert(sizeof(WaterRegionPatchLabel) == sizeof(uint8_t)); // Important for the hash calculation.
 
 static inline TrackBits GetWaterTracks(TileIndex tile) { return TrackStatusToTrackBits(GetTileTrackStatus(tile, TRANSPORT_WATER, 0)); }
 static inline bool IsAqueductTile(TileIndex tile) { return IsBridgeTile(tile) && GetTunnelBridgeTransportType(tile) == TRANSPORT_WATER; }
@@ -35,10 +37,10 @@ static inline int GetWaterRegionY(TileIndex tile) { return TileY(tile) / WATER_R
 static inline int GetWaterRegionMapSizeX() { return Map::SizeX() / WATER_REGION_EDGE_LENGTH; }
 static inline int GetWaterRegionMapSizeY() { return Map::SizeY() / WATER_REGION_EDGE_LENGTH; }
 
-static inline TWaterRegionIndex GetWaterRegionIndex(int region_x, int region_y) { return GetWaterRegionMapSizeX() * region_y + region_x; }
-static inline TWaterRegionIndex GetWaterRegionIndex(TileIndex tile) { return GetWaterRegionIndex(GetWaterRegionX(tile), GetWaterRegionY(tile)); }
+static inline WaterRegionIndex GetWaterRegionIndex(int region_x, int region_y) { return WaterRegionIndex(GetWaterRegionMapSizeX() * region_y + region_x); }
+static inline WaterRegionIndex GetWaterRegionIndex(TileIndex tile) { return GetWaterRegionIndex(GetWaterRegionX(tile), GetWaterRegionY(tile)); }
 
-using TWaterRegionPatchLabelArray = std::array<TWaterRegionPatchLabel, WATER_REGION_NUMBER_OF_TILES>;
+using WaterRegionPatchLabelArray = std::array<WaterRegionPatchLabel, WATER_REGION_NUMBER_OF_TILES>;
 
 /**
  * The data stored for each water region.
@@ -46,10 +48,10 @@ using TWaterRegionPatchLabelArray = std::array<TWaterRegionPatchLabel, WATER_REG
 class WaterRegionData {
 	friend class WaterRegion;
 
-	std::array<TWaterRegionTraversabilityBits, DIAGDIR_END> edge_traversability_bits{};
-	std::unique_ptr<TWaterRegionPatchLabelArray> tile_patch_labels; // Tile patch labels, this may be nullptr in the following trivial cases: region is invalid, region is only land (0 patches), region is only water (1 patch)
+	std::array<WaterRegionTraversabilityBits, DIAGDIR_END> edge_traversability_bits{};
+	std::unique_ptr<WaterRegionPatchLabelArray> tile_patch_labels; // Tile patch labels, this may be nullptr in the following trivial cases: region is invalid, region is only land (0 patches), region is only water (1 patch)
 	bool has_cross_region_aqueducts = false;
-	TWaterRegionPatchLabel number_of_patches = 0; // 0 = no water, 1 = one single patch of water, etc...
+	WaterRegionPatchLabel::BaseType number_of_patches{0}; // 0 = no water, 1 = one single patch of water, etc...
 };
 
 /**
@@ -92,7 +94,7 @@ public:
 	 * @param side Which side of the region we want to know the edge traversability of.
 	 * @returns A value holding the edge traversability bits.
 	 */
-	TWaterRegionTraversabilityBits GetEdgeTraversabilityBits(DiagDirection side) const { return this->data.edge_traversability_bits[side]; }
+	WaterRegionTraversabilityBits GetEdgeTraversabilityBits(DiagDirection side) const { return this->data.edge_traversability_bits[side]; }
 
 	/**
 	 * @returns The amount of individual water patches present within the water region. A value of
@@ -110,7 +112,7 @@ public:
 	 * @param tile The tile of which we want to retrieve the label.
 	 * @returns The label assigned to the tile.
 	 */
-	TWaterRegionPatchLabel GetLabel(TileIndex tile) const
+	WaterRegionPatchLabel GetLabel(TileIndex tile) const
 	{
 		assert(this->tile_area.Contains(tile));
 		if (this->data.tile_patch_labels == nullptr) {
@@ -130,14 +132,14 @@ public:
 
 		/* Acquire a tile patch label array if this region does not already have one */
 		if (this->data.tile_patch_labels == nullptr) {
-			this->data.tile_patch_labels = std::make_unique<TWaterRegionPatchLabelArray>();
+			this->data.tile_patch_labels = std::make_unique<WaterRegionPatchLabelArray>();
 		}
 
 		this->data.tile_patch_labels->fill(INVALID_WATER_REGION_PATCH);
 		this->data.edge_traversability_bits.fill(0);
 
-		TWaterRegionPatchLabel current_label = FIRST_REGION_LABEL;
-		TWaterRegionPatchLabel highest_assigned_label = INVALID_WATER_REGION_PATCH;
+		WaterRegionPatchLabel current_label = FIRST_REGION_LABEL;
+		WaterRegionPatchLabel highest_assigned_label = INVALID_WATER_REGION_PATCH;
 
 		/* Perform connected component labeling. This uses a flooding algorithm that expands until no
 		 * additional tiles can be added. Only tiles inside the water region are considered. */
@@ -154,7 +156,7 @@ public:
 				const TrackdirBits valid_dirs = TrackBitsToTrackdirBits(GetWaterTracks(tile));
 				if (valid_dirs == TRACKDIR_BIT_NONE) continue;
 
-				TWaterRegionPatchLabel &tile_patch = (*this->data.tile_patch_labels)[this->GetLocalIndex(tile)];
+				WaterRegionPatchLabel &tile_patch = (*this->data.tile_patch_labels)[this->GetLocalIndex(tile)];
 				if (tile_patch != INVALID_WATER_REGION_PATCH) continue;
 
 				tile_patch = current_label;
@@ -182,10 +184,10 @@ public:
 			if (increase_label) current_label++;
 		}
 
-		this->data.number_of_patches = highest_assigned_label;
+		this->data.number_of_patches = highest_assigned_label.base();
 
 		if (this->NumberOfPatches() == 0 || (this->NumberOfPatches() == 1 &&
-				std::all_of(this->data.tile_patch_labels->begin(), this->data.tile_patch_labels->end(), [](TWaterRegionPatchLabel label) { return label == FIRST_REGION_LABEL; }))) {
+				std::all_of(this->data.tile_patch_labels->begin(), this->data.tile_patch_labels->end(), [](WaterRegionPatchLabel label) { return label == FIRST_REGION_LABEL; }))) {
 			/* No need for patch storage: trivial cases */
 			this->data.tile_patch_labels.reset();
 		}
@@ -195,7 +197,7 @@ public:
 	{
 		Debug(map, 9, "Water region {},{} labels and edge traversability = ...", GetWaterRegionX(this->tile_area.tile), GetWaterRegionY(this->tile_area.tile));
 
-		const size_t max_element_width = std::to_string(this->NumberOfPatches()).size();
+		const size_t max_element_width = fmt::format("{}", this->NumberOfPatches()).size();
 
 		std::string traversability = fmt::format("{:0{}b}", this->GetEdgeTraversabilityBits(DIAGDIR_NW), WATER_REGION_EDGE_LENGTH);
 		Debug(map, 9, "    {:{}}", fmt::join(traversability, " "), max_element_width);
@@ -205,8 +207,11 @@ public:
 			std::string line{};
 			for (int x = 0; x < WATER_REGION_EDGE_LENGTH; ++x) {
 				const auto label = this->GetLabel(TileAddXY(this->tile_area.tile, x, y));
-				const std::string label_str = label == INVALID_WATER_REGION_PATCH ? "." : std::to_string(label);
-				line = fmt::format("{:{}}", label_str, max_element_width) + " " + line;
+				if (label == INVALID_WATER_REGION_PATCH) {
+					line = fmt::format("{:{}} {}", ".", max_element_width, line);
+				} else {
+					line = fmt::format("{:{}} {}", label, max_element_width, line);
+				}
 			}
 			Debug(map, 9, "{} | {}| {}", GB(this->GetEdgeTraversabilityBits(DIAGDIR_SW), y, 1), line, GB(this->GetEdgeTraversabilityBits(DIAGDIR_NE), y, 1));
 		}
@@ -217,8 +222,8 @@ public:
 	}
 };
 
-std::vector<WaterRegionData> _water_region_data;
-std::vector<bool> _is_water_region_valid;
+TypedIndexContainer<std::vector<WaterRegionData>, WaterRegionIndex> _water_region_data;
+TypedIndexContainer<std::vector<bool>, WaterRegionIndex> _is_water_region_valid;
 
 static TileIndex GetTileIndexFromLocalCoordinate(int region_x, int region_y, int local_x, int local_y)
 {
@@ -241,7 +246,7 @@ static TileIndex GetEdgeTileCoordinate(int region_x, int region_y, DiagDirection
 
 static WaterRegion GetUpdatedWaterRegion(uint16_t region_x, uint16_t region_y)
 {
-	const TWaterRegionIndex index = GetWaterRegionIndex(region_x, region_y);
+	const WaterRegionIndex index = GetWaterRegionIndex(region_x, region_y);
 	WaterRegion water_region(region_x, region_y, _water_region_data[index]);
 	if (!_is_water_region_valid[index]) {
 		water_region.ForceUpdate();
@@ -259,7 +264,7 @@ static WaterRegion GetUpdatedWaterRegion(TileIndex tile)
  * Returns the index of the water region.
  * @param water_region The water region to return the index for.
  */
-static TWaterRegionIndex GetWaterRegionIndex(const WaterRegionDesc &water_region)
+static WaterRegionIndex GetWaterRegionIndex(const WaterRegionDesc &water_region)
 {
 	return GetWaterRegionIndex(water_region.x, water_region.y);
 }
@@ -270,7 +275,7 @@ static TWaterRegionIndex GetWaterRegionIndex(const WaterRegionDesc &water_region
  */
 int CalculateWaterRegionPatchHash(const WaterRegionPatchDesc &water_region_patch)
 {
-	return water_region_patch.label | GetWaterRegionIndex(water_region_patch) << 8;
+	return water_region_patch.label.base() | GetWaterRegionIndex(water_region_patch).base() << 8;
 }
 
 /**
@@ -311,7 +316,7 @@ void InvalidateWaterRegion(TileIndex tile)
 	if (!IsValidTile(tile)) return;
 
 	auto invalidate_region = [](TileIndex tile) {
-		const TWaterRegionIndex water_region_index = GetWaterRegionIndex(tile);
+		const WaterRegionIndex water_region_index = GetWaterRegionIndex(tile);
 		if (!_is_water_region_valid[water_region_index]) Debug(map, 3, "Invalidated water region ({},{})", GetWaterRegionX(tile), GetWaterRegionY(tile));
 		_is_water_region_valid[water_region_index] = false;
 	};
@@ -335,7 +340,7 @@ void InvalidateWaterRegion(TileIndex tile)
  * @param side Side of the water region to look for neighbouring patches of water
  * @param callback The function that will be called for each neighbour that is found
  */
-static inline void VisitAdjacentWaterRegionPatchNeighbours(const WaterRegionPatchDesc &water_region_patch, DiagDirection side, TVisitWaterRegionPatchCallBack &func)
+static inline void VisitAdjacentWaterRegionPatchNeighbours(const WaterRegionPatchDesc &water_region_patch, DiagDirection side, VisitWaterRegionPatchCallback &func)
 {
 	if (water_region_patch.label == INVALID_WATER_REGION_PATCH) return;
 
@@ -351,7 +356,7 @@ static inline void VisitAdjacentWaterRegionPatchNeighbours(const WaterRegionPatc
 	const DiagDirection opposite_side = ReverseDiagDir(side);
 
 	/* Indicates via which local x or y coordinates (depends on the "side" parameter) we can cross over into the adjacent region. */
-	const TWaterRegionTraversabilityBits traversability_bits = current_region.GetEdgeTraversabilityBits(side)
+	const WaterRegionTraversabilityBits traversability_bits = current_region.GetEdgeTraversabilityBits(side)
 		& neighbouring_region.GetEdgeTraversabilityBits(opposite_side);
 	if (traversability_bits == 0) return;
 
@@ -361,21 +366,21 @@ static inline void VisitAdjacentWaterRegionPatchNeighbours(const WaterRegionPatc
 	}
 
 	/* Multiple water patches can be reached from the current patch. Check each edge tile individually. */
-	static std::vector<TWaterRegionPatchLabel> unique_labels; // static and vector-instead-of-map for performance reasons
+	static std::vector<WaterRegionPatchLabel> unique_labels; // static and vector-instead-of-map for performance reasons
 	unique_labels.clear();
 	for (int x_or_y = 0; x_or_y < WATER_REGION_EDGE_LENGTH; ++x_or_y) {
 		if (!HasBit(traversability_bits, x_or_y)) continue;
 
 		const TileIndex current_edge_tile = GetEdgeTileCoordinate(water_region_patch.x, water_region_patch.y, side, x_or_y);
-		const TWaterRegionPatchLabel current_label = current_region.GetLabel(current_edge_tile);
+		const WaterRegionPatchLabel current_label = current_region.GetLabel(current_edge_tile);
 		if (current_label != water_region_patch.label) continue;
 
 		const TileIndex neighbour_edge_tile = GetEdgeTileCoordinate(nx, ny, opposite_side, x_or_y);
-		const TWaterRegionPatchLabel neighbour_label = neighbouring_region.GetLabel(neighbour_edge_tile);
+		const WaterRegionPatchLabel neighbour_label = neighbouring_region.GetLabel(neighbour_edge_tile);
 		assert(neighbour_label != INVALID_WATER_REGION_PATCH);
 		if (std::ranges::find(unique_labels, neighbour_label) == unique_labels.end()) unique_labels.push_back(neighbour_label);
 	}
-	for (TWaterRegionPatchLabel unique_label : unique_labels) func(WaterRegionPatchDesc{ nx, ny, unique_label });
+	for (WaterRegionPatchLabel unique_label : unique_labels) func(WaterRegionPatchDesc{ nx, ny, unique_label });
 }
 
 /**
@@ -384,7 +389,7 @@ static inline void VisitAdjacentWaterRegionPatchNeighbours(const WaterRegionPatc
  * @param water_region_patch Water patch within the water region to start searching from
  * @param callback The function that will be called for each accessible water patch that is found
  */
-void VisitWaterRegionPatchNeighbours(const WaterRegionPatchDesc &water_region_patch, TVisitWaterRegionPatchCallBack &callback)
+void VisitWaterRegionPatchNeighbours(const WaterRegionPatchDesc &water_region_patch, VisitWaterRegionPatchCallback &callback)
 {
 	if (water_region_patch.label == INVALID_WATER_REGION_PATCH) return;
 
diff --git a/src/pathfinder/water_regions.h b/src/pathfinder/water_regions.h
index 3cccc6dc37..4e35f7090c 100644
--- a/src/pathfinder/water_regions.h
+++ b/src/pathfinder/water_regions.h
@@ -10,15 +10,16 @@
 #ifndef WATER_REGIONS_H
 #define WATER_REGIONS_H
 
+#include "../core/strong_typedef_type.hpp"
 #include "../tile_type.h"
 #include "../map_func.h"
 
-using TWaterRegionPatchLabel = uint8_t;
-using TWaterRegionIndex = uint;
+using WaterRegionIndex = StrongType::Typedef<uint, struct TWaterRegionIndexTag, StrongType::Compare>;
+using WaterRegionPatchLabel = StrongType::Typedef<uint8_t, struct TWaterRegionPatchLabelTag, StrongType::Compare, StrongType::Integer>;
 
 constexpr int WATER_REGION_EDGE_LENGTH = 16;
 constexpr int WATER_REGION_NUMBER_OF_TILES = WATER_REGION_EDGE_LENGTH * WATER_REGION_EDGE_LENGTH;
-constexpr TWaterRegionPatchLabel INVALID_WATER_REGION_PATCH = 0;
+constexpr WaterRegionPatchLabel INVALID_WATER_REGION_PATCH{0};
 
 /**
  * Describes a single interconnected patch of water within a particular water region.
@@ -27,7 +28,7 @@ struct WaterRegionPatchDesc
 {
 	int x; ///< The X coordinate of the water region, i.e. X=2 is the 3rd water region along the X-axis
 	int y; ///< The Y coordinate of the water region, i.e. Y=2 is the 3rd water region along the Y-axis
-	TWaterRegionPatchLabel label; ///< Unique label identifying the patch within the region
+	WaterRegionPatchLabel label; ///< Unique label identifying the patch within the region
 
 	bool operator==(const WaterRegionPatchDesc &other) const { return x == other.x && y == other.y && label == other.label; }
 };
@@ -56,8 +57,8 @@ WaterRegionPatchDesc GetWaterRegionPatchInfo(TileIndex tile);
 
 void InvalidateWaterRegion(TileIndex tile);
 
-using TVisitWaterRegionPatchCallBack = std::function<void(const WaterRegionPatchDesc &)>;
-void VisitWaterRegionPatchNeighbours(const WaterRegionPatchDesc &water_region_patch, TVisitWaterRegionPatchCallBack &callback);
+using VisitWaterRegionPatchCallback = std::function<void(const WaterRegionPatchDesc &)>;
+void VisitWaterRegionPatchNeighbours(const WaterRegionPatchDesc &water_region_patch, VisitWaterRegionPatchCallback &callback);
 
 void AllocateWaterRegions();
 
diff --git a/src/pathfinder/yapf/yapf_costbase.hpp b/src/pathfinder/yapf/yapf_costbase.hpp
index 66579e01b6..8211ddee12 100644
--- a/src/pathfinder/yapf/yapf_costbase.hpp
+++ b/src/pathfinder/yapf/yapf_costbase.hpp
@@ -24,7 +24,7 @@ struct CYapfCostBase {
 	 * @param td   The track direction to check.
 	 * @return True if there's a slope, otherwise false.
 	 */
-	inline static bool stSlopeCost(TileIndex tile, Trackdir td)
+	static inline bool stSlopeCost(TileIndex tile, Trackdir td)
 	{
 		if (IsDiagonalTrackdir(td)) {
 			if (IsBridgeTile(tile)) {
diff --git a/src/pathfinder/yapf/yapf_costcache.hpp b/src/pathfinder/yapf/yapf_costcache.hpp
index 3e5a51dab1..43f3f31b21 100644
--- a/src/pathfinder/yapf/yapf_costcache.hpp
+++ b/src/pathfinder/yapf/yapf_costcache.hpp
@@ -124,7 +124,7 @@ protected:
 		return *static_cast<Tpf *>(this);
 	}
 
-	inline static Cache &stGetGlobalCache()
+	static inline Cache &stGetGlobalCache()
 	{
 		static int last_rail_change_counter = 0;
 		static Cache C;
diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.hpp
index 65e0c59648..1c2b1e61fb 100644
--- a/src/pathfinder/yapf/yapf_costrail.hpp
+++ b/src/pathfinder/yapf/yapf_costrail.hpp
@@ -517,8 +517,7 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th
 					end_segment_reason.Set(EndSegmentReason::SafeTile);
 				} else if (HasSignalOnTrackdir(next.tile, ReverseTrackdir(next.td)) && GetSignalType(next.tile, TrackdirToTrack(next.td)) == SIGTYPE_PBS_ONEWAY) {
 					/* Possible safe tile, but not so good as it's the back of a signal... */
-					end_segment_reason.Set(EndSegmentReason::SafeTile);
-					end_segment_reason.Set(EndSegmentReason::DeadEnd);
+					end_segment_reason.Set({EndSegmentReason::SafeTile, EndSegmentReason::DeadEnd});
 					extra_cost += Yapf().PfGetSettings().rail_lastred_exit_penalty;
 				}
 			}
diff --git a/src/pathfinder/yapf/yapf_rail.cpp b/src/pathfinder/yapf/yapf_rail.cpp
index 39f6dffd6c..df31a27b93 100644
--- a/src/pathfinder/yapf/yapf_rail.cpp
+++ b/src/pathfinder/yapf/yapf_rail.cpp
@@ -24,12 +24,12 @@ template <typename Tpf> void DumpState(Tpf &pf1, Tpf &pf2)
 	DumpTarget dmp1, dmp2;
 	pf1.DumpBase(dmp1);
 	pf2.DumpBase(dmp2);
-	auto f1 = FileHandle::Open("yapf1.txt", "wt");
-	auto f2 = FileHandle::Open("yapf2.txt", "wt");
+	auto f1 = FileHandle::Open("yapf1.txt"sv, "wt");
+	auto f2 = FileHandle::Open("yapf2.txt"sv, "wt");
 	assert(f1.has_value());
 	assert(f2.has_value());
-	fwrite(dmp1.m_out.c_str(), 1, dmp1.m_out.size(), *f1);
-	fwrite(dmp2.m_out.c_str(), 1, dmp2.m_out.size(), *f2);
+	fwrite(dmp1.m_out.data(), 1, dmp1.m_out.size(), *f1);
+	fwrite(dmp2.m_out.data(), 1, dmp2.m_out.size(), *f2);
 }
 
 template <class Types>
@@ -80,7 +80,9 @@ private:
 			tile = TileAdd(tile, diff);
 		} while (IsCompatibleTrainStationTile(tile, start) && tile != this->origin_tile);
 
-		TriggerStationRandomisation(nullptr, start, SRT_PATH_RESERVATION);
+		auto *st = Station::GetByTile(start);
+		TriggerStationRandomisation(st, start, StationRandomTrigger::PathReservation);
+		TriggerStationAnimation(st, start, StationAnimationTrigger::PathReservation);
 
 		return true;
 	}
@@ -109,6 +111,12 @@ private:
 				SetSignalStateByTrackdir(tile, rev_td, SIGNAL_STATE_RED);
 				MarkTileDirtyByTile(tile);
 			}
+
+			if (IsRailWaypointTile(tile)) {
+				auto *st = BaseStation::GetByTile(tile);
+				TriggerStationRandomisation(st, tile, StationRandomTrigger::PathReservation);
+				TriggerStationAnimation(st, tile, StationAnimationTrigger::PathReservation);
+			}
 		}
 
 		return tile != this->res_dest_tile || td != this->res_dest_td;
diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp
index cacf74751d..cb240b79ed 100644
--- a/src/pathfinder/yapf/yapf_road.cpp
+++ b/src/pathfinder/yapf/yapf_road.cpp
@@ -80,8 +80,8 @@ protected:
 						if (!RoadStop::IsDriveThroughRoadStopContinuation(tile, tile - TileOffsByDiagDir(dir))) {
 							/* When we're the first road stop in a 'queue' of them we increase
 							 * cost based on the fill percentage of the whole queue. */
-							const RoadStop::Entry *entry = rs->GetEntry(dir);
-							cost += entry->GetOccupied() * Yapf().PfGetSettings().road_stop_occupied_penalty / entry->GetLength();
+							const RoadStop::Entry &entry = rs->GetEntry(dir);
+							cost += entry.GetOccupied() * Yapf().PfGetSettings().road_stop_occupied_penalty / entry.GetLength();
 						}
 					} else {
 						/* Increase cost for filled road stops */
diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp
index 6a34d5dc89..a47df5abb3 100644
--- a/src/pathfinder/yapf/yapf_ship.cpp
+++ b/src/pathfinder/yapf/yapf_ship.cpp
@@ -355,15 +355,6 @@ public:
 		return 0;
 	}
 
-	static Vehicle *CountShipProc(Vehicle *v, void *data)
-	{
-		uint *count = (uint*)data;
-		/* Ignore other vehicles (aircraft) and ships inside depot. */
-		if (v->type == VEH_SHIP && !v->vehstatus.Test(VehState::Hidden)) (*count)++;
-
-		return nullptr;
-	}
-
 	/**
 	 * Called by YAPF to calculate the cost from the origin to the given node.
 	 * Calculates only the cost of given node, adds it to the parent node cost
@@ -378,8 +369,10 @@ public:
 
 		if (IsDockingTile(n.GetTile())) {
 			/* Check docking tile for occupancy. */
-			uint count = 0;
-			HasVehicleOnPos(n.GetTile(), &count, &CountShipProc);
+			uint count = std::ranges::count_if(VehiclesOnTile(n.GetTile()), [](const Vehicle *v) {
+				/* Ignore other vehicles (aircraft) and ships inside depot. */
+				return v->type == VEH_SHIP && !v->vehstatus.Test(VehState::Hidden);
+			});
 			c += count * 3 * YAPF_TILE_LENGTH;
 		}
 
diff --git a/src/pathfinder/yapf/yapf_ship_regions.cpp b/src/pathfinder/yapf/yapf_ship_regions.cpp
index dad76757c1..0a1a831a05 100644
--- a/src/pathfinder/yapf/yapf_ship_regions.cpp
+++ b/src/pathfinder/yapf/yapf_ship_regions.cpp
@@ -164,7 +164,7 @@ protected:
 public:
 	inline void PfFollowNode(Node &old_node)
 	{
-		TVisitWaterRegionPatchCallBack visit_func = [&](const WaterRegionPatchDesc &water_region_patch)
+		VisitWaterRegionPatchCallback visit_func = [&](const WaterRegionPatchDesc &water_region_patch)
 		{
 			Node &node = Yapf().CreateNewNode();
 			node.Set(&old_node, water_region_patch);
diff --git a/src/pathfinder/yapf/yapf_ship_regions.h b/src/pathfinder/yapf/yapf_ship_regions.h
index 8b75773cc8..dc488754b4 100644
--- a/src/pathfinder/yapf/yapf_ship_regions.h
+++ b/src/pathfinder/yapf/yapf_ship_regions.h
@@ -10,7 +10,6 @@
 #ifndef YAPF_SHIP_REGIONS_H
 #define YAPF_SHIP_REGIONS_H
 
-#include "../../stdafx.h"
 #include "../../tile_type.h"
 #include "../water_regions.h"
 
diff --git a/src/pathfinder/yapf/yapf_type.hpp b/src/pathfinder/yapf/yapf_type.hpp
index a39304fcfd..2a045e0785 100644
--- a/src/pathfinder/yapf/yapf_type.hpp
+++ b/src/pathfinder/yapf/yapf_type.hpp
@@ -66,7 +66,7 @@ static constexpr EndSegmentReasons ESRF_ABORT_PF_MASK = {
 
 inline std::string ValueStr(EndSegmentReasons flags)
 {
-	static const std::initializer_list<std::string_view> end_segment_reason_names = {
+	static const std::initializer_list<const std::string_view> end_segment_reason_names = {
 		"DEAD_END", "RAIL_TYPE", "INFINITE_LOOP", "SEGMENT_TOO_LONG", "CHOICE_FOLLOWS",
 		"DEPOT", "WAYPOINT", "STATION", "SAFE_TILE",
 		"PATH_TOO_LONG", "FIRST_TWO_WAY_RED", "LOOK_AHEAD_END", "TARGET_REACHED"
diff --git a/src/pbs.cpp b/src/pbs.cpp
index 9e37633a04..8537c17aa5 100644
--- a/src/pbs.cpp
+++ b/src/pbs.cpp
@@ -113,7 +113,11 @@ bool TryReserveRailTrack(TileIndex tile, Track t, bool trigger_stations)
 		case MP_STATION:
 			if (HasStationRail(tile) && !HasStationReservation(tile)) {
 				SetRailStationReservation(tile, true);
-				if (trigger_stations && IsRailStation(tile)) TriggerStationRandomisation(nullptr, tile, SRT_PATH_RESERVATION);
+				if (trigger_stations) {
+					auto *st = BaseStation::GetByTile(tile);
+					TriggerStationRandomisation(st, tile, StationRandomTrigger::PathReservation);
+					TriggerStationAnimation(st, tile, StationAnimationTrigger::PathReservation);
+				}
 				MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track
 				return true;
 			}
@@ -259,23 +263,20 @@ struct FindTrainOnTrackInfo {
 	FindTrainOnTrackInfo() : best(nullptr) {}
 };
 
-/** Callback for Has/FindVehicleOnPos to find a train on a specific track. */
-static Vehicle *FindTrainOnTrackEnum(Vehicle *v, void *data)
+/** Find the best matching vehicle on a tile. */
+static void CheckTrainsOnTrack(FindTrainOnTrackInfo &info, TileIndex tile)
 {
-	FindTrainOnTrackInfo *info = (FindTrainOnTrackInfo *)data;
+	for (Vehicle *v : VehiclesOnTile(tile)) {
+		if (v->type != VEH_TRAIN || v->vehstatus.Test(VehState::Crashed)) continue;
 
-	if (v->type != VEH_TRAIN || v->vehstatus.Test(VehState::Crashed)) return nullptr;
+		Train *t = Train::From(v);
+		if (t->track == TRACK_BIT_WORMHOLE || HasBit(static_cast<TrackBits>(t->track), TrackdirToTrack(info.res.trackdir))) {
+			t = t->First();
 
-	Train *t = Train::From(v);
-	if (t->track == TRACK_BIT_WORMHOLE || HasBit((TrackBits)t->track, TrackdirToTrack(info->res.trackdir))) {
-		t = t->First();
-
-		/* ALWAYS return the lowest ID (anti-desync!) */
-		if (info->best == nullptr || t->index < info->best->index) info->best = t;
-		return t;
+			/* ALWAYS return the lowest ID (anti-desync!) */
+			if (info.best == nullptr || t->index < info.best->index) info.best = t;
+		}
 	}
-
-	return nullptr;
 }
 
 /**
@@ -298,7 +299,7 @@ PBSTileInfo FollowTrainReservation(const Train *v, Vehicle **train_on_res)
 	ftoti.res = FollowReservation(v->owner, GetRailTypeInfo(v->railtype)->compatible_railtypes, tile, trackdir);
 	ftoti.res.okay = IsSafeWaitingPosition(v, ftoti.res.tile, ftoti.res.trackdir, true, _settings_game.pf.forbid_90_deg);
 	if (train_on_res != nullptr) {
-		FindVehicleOnPos(ftoti.res.tile, &ftoti, FindTrainOnTrackEnum);
+		CheckTrainsOnTrack(ftoti, ftoti.res.tile);
 		if (ftoti.best != nullptr) *train_on_res = ftoti.best->First();
 		if (*train_on_res == nullptr && IsRailStationTile(ftoti.res.tile)) {
 			/* The target tile is a rail station. The track follower
@@ -307,13 +308,13 @@ PBSTileInfo FollowTrainReservation(const Train *v, Vehicle **train_on_res)
 			 * for a possible train. */
 			TileIndexDiff diff = TileOffsByDiagDir(TrackdirToExitdir(ReverseTrackdir(ftoti.res.trackdir)));
 			for (TileIndex st_tile = ftoti.res.tile + diff; *train_on_res == nullptr && IsCompatibleTrainStationTile(st_tile, ftoti.res.tile); st_tile += diff) {
-				FindVehicleOnPos(st_tile, &ftoti, FindTrainOnTrackEnum);
+				CheckTrainsOnTrack(ftoti, st_tile);
 				if (ftoti.best != nullptr) *train_on_res = ftoti.best->First();
 			}
 		}
 		if (*train_on_res == nullptr && IsTileType(ftoti.res.tile, MP_TUNNELBRIDGE)) {
 			/* The target tile is a bridge/tunnel, also check the other end tile. */
-			FindVehicleOnPos(GetOtherTunnelBridgeEnd(ftoti.res.tile), &ftoti, FindTrainOnTrackEnum);
+			CheckTrainsOnTrack(ftoti, GetOtherTunnelBridgeEnd(ftoti.res.tile));
 			if (ftoti.best != nullptr) *train_on_res = ftoti.best->First();
 		}
 	}
@@ -345,21 +346,21 @@ Train *GetTrainForReservation(TileIndex tile, Track track)
 		FindTrainOnTrackInfo ftoti;
 		ftoti.res = FollowReservation(GetTileOwner(tile), rts, tile, trackdir, true);
 
-		FindVehicleOnPos(ftoti.res.tile, &ftoti, FindTrainOnTrackEnum);
+		CheckTrainsOnTrack(ftoti, ftoti.res.tile);
 		if (ftoti.best != nullptr) return ftoti.best;
 
 		/* Special case for stations: check the whole platform for a vehicle. */
 		if (IsRailStationTile(ftoti.res.tile)) {
 			TileIndexDiff diff = TileOffsByDiagDir(TrackdirToExitdir(ReverseTrackdir(ftoti.res.trackdir)));
 			for (TileIndex st_tile = ftoti.res.tile + diff; IsCompatibleTrainStationTile(st_tile, ftoti.res.tile); st_tile += diff) {
-				FindVehicleOnPos(st_tile, &ftoti, FindTrainOnTrackEnum);
+				CheckTrainsOnTrack(ftoti, st_tile);
 				if (ftoti.best != nullptr) return ftoti.best;
 			}
 		}
 
 		/* Special case for bridges/tunnels: check the other end as well. */
 		if (IsTileType(ftoti.res.tile, MP_TUNNELBRIDGE)) {
-			FindVehicleOnPos(GetOtherTunnelBridgeEnd(ftoti.res.tile), &ftoti, FindTrainOnTrackEnum);
+			CheckTrainsOnTrack(ftoti, GetOtherTunnelBridgeEnd(ftoti.res.tile));
 			if (ftoti.best != nullptr) return ftoti.best;
 		}
 	}
@@ -435,8 +436,9 @@ bool IsWaitingPositionFree(const Train *v, TileIndex tile, Trackdir trackdir, bo
 	if (IsRailDepotTile(tile)) return true;
 	if (IsTileType(tile, MP_RAILWAY) && HasSignalOnTrackdir(tile, trackdir) && !IsPbsSignal(GetSignalType(tile, track))) return true;
 
-	/* Check the next tile, if it's a PBS signal, it has to be free as well. */
-	CFollowTrackRail ft(v, GetRailTypeInfo(v->railtype)->compatible_railtypes);
+	/* Check the next tile, it has to be free as well. Do not filter for compatible railtypes
+	 * to make sure we never accidentally join up reservations. */
+	CFollowTrackRail ft(v, RailTypes{});
 
 	if (!ft.Follow(tile, trackdir)) return true;
 
diff --git a/src/picker_gui.cpp b/src/picker_gui.cpp
index e2a116c6ff..ecfc4dbc22 100644
--- a/src/picker_gui.cpp
+++ b/src/picker_gui.cpp
@@ -14,6 +14,8 @@
 #include "hotkeys.h"
 #include "ini_type.h"
 #include "newgrf_badge.h"
+#include "newgrf_badge_config.h"
+#include "newgrf_badge_gui.h"
 #include "picker_gui.h"
 #include "querystring_gui.h"
 #include "settings_type.h"
@@ -148,7 +150,9 @@ static bool TypeIDSorter(PickerItem const &a, PickerItem const &b)
 /** Filter types by class name. */
 static bool TypeTagNameFilter(PickerItem const *item, PickerFilterData &filter)
 {
-	if (filter.btf.has_value() && filter.btf->Filter(filter.callbacks->GetTypeBadges(item->class_index, item->index))) return true;
+	auto badges = filter.callbacks->GetTypeBadges(item->class_index, item->index);
+	if (filter.bdf.has_value() && !filter.bdf->Filter(badges)) return false;
+	if (filter.btf.has_value() && filter.btf->Filter(badges)) return true;
 
 	filter.ResetState();
 	filter.AddLine(GetString(filter.callbacks->GetTypeName(item->class_index, item->index)));
@@ -245,6 +249,12 @@ void PickerWindow::ConstructWindow()
 void PickerWindow::OnInit()
 {
 	this->badge_classes = GUIBadgeClasses(this->callbacks.GetFeature());
+
+	auto container = this->GetWidget<NWidgetContainer>(WID_PW_BADGE_FILTER);
+	this->badge_filters = AddBadgeDropdownFilters(*container, WID_PW_BADGE_FILTER, COLOUR_DARK_GREEN, this->callbacks.GetFeature());
+
+	this->widget_lookup.clear();
+	this->nested_root->FillWidgetLookup(this->widget_lookup);
 }
 
 void PickerWindow::Close(int data)
@@ -258,7 +268,7 @@ void PickerWindow::UpdateWidgetSize(WidgetID widget, Dimension &size, const Dime
 	switch (widget) {
 		/* Class picker */
 		case WID_PW_CLASS_LIST:
-			resize.height = GetCharacterHeight(FS_NORMAL) + padding.height;
+			fill.height = resize.height = GetCharacterHeight(FS_NORMAL) + padding.height;
 			size.height = 5 * resize.height;
 			break;
 
@@ -278,9 +288,23 @@ void PickerWindow::UpdateWidgetSize(WidgetID widget, Dimension &size, const Dime
 			size.width  = ScaleGUITrad(PREVIEW_WIDTH) + WidgetDimensions::scaled.fullbevel.Horizontal();
 			size.height = ScaleGUITrad(PREVIEW_HEIGHT) + WidgetDimensions::scaled.fullbevel.Vertical();
 			break;
+
+		case WID_PW_CONFIGURE_BADGES:
+			/* Hide the configuration button if no configurable badges are present. */
+			if (this->badge_classes.GetClasses().empty()) size = {0, 0};
+			break;
 	}
 }
 
+std::string PickerWindow::GetWidgetString(WidgetID widget, StringID stringid) const
+{
+	if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+		return this->GetWidget<NWidgetBadgeFilter>(widget)->GetStringParameter(this->badge_filter_choices);
+	}
+
+	return this->Window::GetWidgetString(widget, stringid);
+}
+
 void PickerWindow::DrawWidget(const Rect &r, WidgetID widget) const
 {
 	switch (widget) {
@@ -400,6 +424,48 @@ void PickerWindow::OnClick(Point pt, WidgetID widget, int)
 			CloseWindowById(WC_SELECT_STATION, 0);
 			break;
 		}
+
+		case WID_PW_CONFIGURE_BADGES:
+			if (this->badge_classes.GetClasses().empty()) break;
+			ShowDropDownList(this, BuildBadgeClassConfigurationList(this->badge_classes, 1, {}), -1, widget, 0, false, true);
+			break;
+
+		default:
+			if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+				ShowDropDownList(this, this->GetWidget<NWidgetBadgeFilter>(widget)->GetDropDownList(), -1, widget, 0, false);
+			}
+			break;
+	}
+}
+
+void PickerWindow::OnDropdownSelect(WidgetID widget, int index, int click_result)
+{
+	switch (widget) {
+		case WID_PW_CONFIGURE_BADGES: {
+			bool reopen = HandleBadgeConfigurationDropDownClick(this->callbacks.GetFeature(), 1, index, click_result);
+
+			this->ReInit();
+
+			if (reopen) {
+				ReplaceDropDownList(this, BuildBadgeClassConfigurationList(this->badge_classes, 1, {}), -1);
+			} else {
+				this->CloseChildWindows(WC_DROPDOWN_MENU);
+			}
+			break;
+		}
+
+		default:
+			if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+				if (index < 0) {
+					ResetBadgeFilter(this->badge_filter_choices, this->GetWidget<NWidgetBadgeFilter>(widget)->GetBadgeClassID());
+				} else {
+					SetBadgeFilter(this->badge_filter_choices, BadgeID(index));
+				}
+				this->type_string_filter.bdf.emplace(this->badge_filter_choices);
+				this->types.SetFilterState(!type_string_filter.IsEmpty() || type_string_filter.bdf.has_value());
+				this->InvalidateData(PickerInvalidation::Type);
+			}
+			break;
 	}
 }
 
@@ -460,7 +526,7 @@ void PickerWindow::OnEditboxChanged(WidgetID wid)
 			} else {
 				this->type_string_filter.btf.reset();
 			}
-			this->types.SetFilterState(!type_string_filter.IsEmpty());
+			this->types.SetFilterState(!type_string_filter.IsEmpty() || type_string_filter.bdf.has_value());
 			this->InvalidateData(PickerInvalidation::Type);
 			break;
 
@@ -670,9 +736,14 @@ std::unique_ptr<NWidgetBase> MakePickerTypeWidgets()
 	static constexpr NWidgetPart picker_type_widgets[] = {
 		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_PW_TYPE_SEL),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_PANEL, COLOUR_DARK_GREEN),
-					NWidget(WWT_EDITBOX, COLOUR_DARK_GREEN, WID_PW_TYPE_FILTER), SetPadding(2), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
+				NWidget(NWID_HORIZONTAL),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN),
+						NWidget(WWT_EDITBOX, COLOUR_DARK_GREEN, WID_PW_TYPE_FILTER), SetPadding(2), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
+					EndContainer(),
+					NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_PW_CONFIGURE_BADGES), SetAspect(WidgetDimensions::ASPECT_UP_DOWN_BUTTON), SetResize(0, 0), SetFill(0, 1), SetSpriteTip(SPR_EXTRA_MENU, STR_BADGE_CONFIG_MENU_TOOLTIP),
 				EndContainer(),
+				NWidget(NWID_VERTICAL, NWidContainerFlag{}, WID_PW_BADGE_FILTER),
+			EndContainer(),
 				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
 					NWidget(WWT_TEXTBTN, COLOUR_DARK_GREEN, WID_PW_MODE_ALL), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_PICKER_MODE_ALL, STR_PICKER_MODE_ALL_TOOLTIP),
 					NWidget(WWT_TEXTBTN, COLOUR_DARK_GREEN, WID_PW_MODE_USED), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_PICKER_MODE_USED, STR_PICKER_MODE_USED_TOOLTIP),
diff --git a/src/picker_gui.h b/src/picker_gui.h
index dc27648185..908d060706 100644
--- a/src/picker_gui.h
+++ b/src/picker_gui.h
@@ -11,6 +11,7 @@
 #define PICKER_GUI_H
 
 #include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "querystring_gui.h"
 #include "sortlist_type.h"
 #include "stringfilter_type.h"
@@ -145,6 +146,7 @@ public:
 struct PickerFilterData : StringFilter {
 	const PickerCallbacks *callbacks; ///< Callbacks for filter functions to access to callbacks.
 	std::optional<BadgeTextFilter> btf;
+	std::optional<BadgeDropdownFilter> bdf;
 };
 
 using PickerClassList = GUIList<int, std::nullptr_t, PickerFilterData &>; ///< GUIList holding classes to display.
@@ -182,7 +184,9 @@ public:
 	void OnInit() override;
 	void Close(int data = 0) override;
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, const Dimension &padding, Dimension &fill, Dimension &resize) override;
+	std::string GetWidgetString(WidgetID widget, StringID stringid) const override;
 	void DrawWidget(const Rect &r, WidgetID widget) const override;
+	void OnDropdownSelect(WidgetID widget, int index, int click_result) override;
 	void OnResize() override;
 	void OnClick(Point pt, WidgetID widget, int click_count) override;
 	void OnInvalidateData(int data = 0, bool gui_scope = true) override;
@@ -220,12 +224,14 @@ private:
 	void EnsureSelectedTypeIsVisible();
 
 	GUIBadgeClasses badge_classes;
+	std::pair<WidgetID, WidgetID> badge_filters{};
+	BadgeFilterChoices badge_filter_choices{};
 
-	IntervalTimer<TimerGameCalendar> yearly_interval = {{TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [this](auto) {
+	const IntervalTimer<TimerGameCalendar> yearly_interval = {{TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [this](auto) {
 		this->SetDirty();
 	}};
 
-	IntervalTimer<TimerWindow> refresh_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> refresh_interval = {std::chrono::seconds(3), [this](auto) {
 		RefreshUsedTypeList();
 	}};
 };
diff --git a/src/querystring_gui.h b/src/querystring_gui.h
index 52febfbb91..07df9255f4 100644
--- a/src/querystring_gui.h
+++ b/src/querystring_gui.h
@@ -45,7 +45,7 @@ public:
 	void HandleEditBox(Window *w, WidgetID wid);
 
 	Point GetCaretPosition(const Window *w, WidgetID wid) const;
-	Rect GetBoundingRect(const Window *w, WidgetID wid, const char *from, const char *to) const;
+	Rect GetBoundingRect(const Window *w, WidgetID wid, size_t from, size_t to) const;
 	ptrdiff_t GetCharAtPosition(const Window *w, WidgetID wid, const Point &pt) const;
 };
 
diff --git a/src/rail.h b/src/rail.h
index 5b896f8e9f..323dd00c24 100644
--- a/src/rail.h
+++ b/src/rail.h
@@ -304,6 +304,19 @@ inline const RailTypeInfo *GetRailTypeInfo(RailType railtype)
 	return &_railtypes[railtype];
 }
 
+/**
+ * Returns the railtype for a Railtype information.
+ * @param rti Pointer to static RailTypeInfo
+ * @return Railtype in static railtype definitions
+ */
+inline RailType GetRailTypeInfoIndex(const RailTypeInfo *rti)
+{
+	extern RailTypeInfo _railtypes[RAILTYPE_END];
+	size_t index = rti - _railtypes;
+	assert(index < RAILTYPE_END && rti == _railtypes + index);
+	return static_cast<RailType>(index);
+}
+
 /**
  * Checks if an engine of the given RailType can drive on a tile with a given
  * RailType. This would normally just be an equality check, but for electric
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 1287eac16b..35ed96ade6 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -888,11 +888,11 @@ static CommandCost CmdRailTrackHelper(DoCommandFlags flags, TileIndex tile, Tile
 	CommandCost last_error = CMD_ERROR;
 	for (;;) {
 		ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals);
-		if (!remove && ret.Failed() && ret.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) ret = CommandCost(); // Treat "already built" as success
+		if (!remove && !fail_on_obstacle && last_error.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) had_success = true;
 
 		if (ret.Failed()) {
 			last_error = std::move(ret);
-			if (!remove) {
+			if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
 				if (fail_on_obstacle) return last_error;
 				if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag
 			}
@@ -1528,17 +1528,6 @@ CommandCost CmdRemoveSignalTrack(DoCommandFlags flags, TileIndex tile, TileIndex
 	return CmdSignalTrackHelper(flags, tile, end_tile, track, SIGTYPE_BLOCK, SIG_ELECTRIC, false, true, autofill, false, 1); // bit 5 is remove bit
 }
 
-/** Update power of train under which is the railtype being converted */
-static Vehicle *UpdateTrainPowerProc(Vehicle *v, void *data)
-{
-	if (v->type != VEH_TRAIN) return nullptr;
-
-	TrainList *affected_trains = static_cast<TrainList*>(data);
-	include(*affected_trains, Train::From(v)->First());
-
-	return nullptr;
-}
-
 /**
  * Convert one rail type to the other. You can convert normal rail to
  * monorail/maglev easily or vice-versa.
@@ -1640,7 +1629,9 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_
 				SetRailType(tile, totype);
 				MarkTileDirtyByTile(tile);
 				/* update power of train on this tile */
-				FindVehicleOnPos(tile, &affected_trains, &UpdateTrainPowerProc);
+				for (Vehicle *v : VehiclesOnTile(tile)) {
+					if (v->type == VEH_TRAIN) include(affected_trains, Train::From(v)->First());
+				}
 			}
 		}
 
@@ -1717,8 +1708,12 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_
 					SetRailType(tile, totype);
 					SetRailType(endtile, totype);
 
-					FindVehicleOnPos(tile, &affected_trains, &UpdateTrainPowerProc);
-					FindVehicleOnPos(endtile, &affected_trains, &UpdateTrainPowerProc);
+					for (Vehicle *v : VehiclesOnTile(tile)) {
+						if (v->type == VEH_TRAIN) include(affected_trains, Train::From(v)->First());
+					}
+					for (Vehicle *v : VehiclesOnTile(endtile)) {
+						if (v->type == VEH_TRAIN) include(affected_trains, Train::From(v)->First());
+					}
 
 					YapfNotifyTrackLayoutChange(tile, track);
 					YapfNotifyTrackLayoutChange(endtile, track);
@@ -1921,7 +1916,7 @@ struct FenceOffset {
 };
 
 /** Offsets for drawing fences */
-static FenceOffset _fence_offsets[] = {
+static const FenceOffset _fence_offsets[] = {
 	{ CORNER_INVALID,  0,  1, 16,  1 }, // RFO_FLAT_X_NW
 	{ CORNER_INVALID,  1,  0,  1, 16 }, // RFO_FLAT_Y_NE
 	{ CORNER_W,        8,  8,  1,  1 }, // RFO_FLAT_LEFT
@@ -2422,7 +2417,7 @@ static void DrawTile_Track(TileInfo *ti)
 {
 	const RailTypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
 
-	_drawtile_track_palette = COMPANY_SPRITE_COLOUR(GetTileOwner(ti->tile));
+	_drawtile_track_palette = GetCompanyPalette(GetTileOwner(ti->tile));
 
 	if (IsPlainRail(ti->tile)) {
 		TrackBits rails = GetTrackBits(ti->tile);
@@ -2547,7 +2542,7 @@ void DrawTrainDepotSprite(int x, int y, int dir, RailType railtype)
 	uint32_t offset = rti->GetRailtypeSpriteOffset();
 
 	if (image != SPR_FLAT_GRASS_TILE) image += offset;
-	PaletteID palette = COMPANY_SPRITE_COLOUR(_local_company);
+	PaletteID palette = GetCompanyPalette(_local_company);
 
 	DrawSprite(image, PAL_NONE, x, y);
 
@@ -2669,7 +2664,7 @@ static void TileLoop_Track(TileIndex tile)
 		TrackBits rail = GetTrackBits(tile);
 
 		Owner owner = GetTileOwner(tile);
-		uint8_t fences = 0;
+		DiagDirections fences{};
 
 		for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 			static const TrackBits dir_to_trackbits[DIAGDIR_END] = {TRACK_BIT_3WAY_NE, TRACK_BIT_3WAY_SE, TRACK_BIT_3WAY_SW, TRACK_BIT_3WAY_NW};
@@ -2682,22 +2677,22 @@ static void TileLoop_Track(TileIndex tile)
 			/* Show fences if it's a house, industry, object, road, tunnelbridge or not owned by us. */
 			if (!IsValidTile(tile2) || IsTileType(tile2, MP_HOUSE) || IsTileType(tile2, MP_INDUSTRY) ||
 					IsTileType(tile2, MP_ROAD) || (IsTileType(tile2, MP_OBJECT) && !IsObjectType(tile2, OBJECT_OWNED_LAND)) || IsTileType(tile2, MP_TUNNELBRIDGE) || !IsTileOwner(tile2, owner)) {
-				fences |= 1 << d;
+				fences.Set(d);
 			}
 		}
 
-		switch (fences) {
-			case 0: break;
-			case (1 << DIAGDIR_NE): new_ground = RAIL_GROUND_FENCE_NE; break;
-			case (1 << DIAGDIR_SE): new_ground = RAIL_GROUND_FENCE_SE; break;
-			case (1 << DIAGDIR_SW): new_ground = RAIL_GROUND_FENCE_SW; break;
-			case (1 << DIAGDIR_NW): new_ground = RAIL_GROUND_FENCE_NW; break;
-			case (1 << DIAGDIR_NE) | (1 << DIAGDIR_SW): new_ground = RAIL_GROUND_FENCE_NESW; break;
-			case (1 << DIAGDIR_SE) | (1 << DIAGDIR_NW): new_ground = RAIL_GROUND_FENCE_SENW; break;
-			case (1 << DIAGDIR_NE) | (1 << DIAGDIR_SE): new_ground = RAIL_GROUND_FENCE_VERT1; break;
-			case (1 << DIAGDIR_NE) | (1 << DIAGDIR_NW): new_ground = RAIL_GROUND_FENCE_HORIZ2; break;
-			case (1 << DIAGDIR_SE) | (1 << DIAGDIR_SW): new_ground = RAIL_GROUND_FENCE_HORIZ1; break;
-			case (1 << DIAGDIR_SW) | (1 << DIAGDIR_NW): new_ground = RAIL_GROUND_FENCE_VERT2; break;
+		switch (fences.base()) {
+			case DiagDirections{}.base(): break;
+			case DiagDirections{DIAGDIR_NE}.base(): new_ground = RAIL_GROUND_FENCE_NE; break;
+			case DiagDirections{DIAGDIR_SE}.base(): new_ground = RAIL_GROUND_FENCE_SE; break;
+			case DiagDirections{DIAGDIR_SW}.base(): new_ground = RAIL_GROUND_FENCE_SW; break;
+			case DiagDirections{DIAGDIR_NW}.base(): new_ground = RAIL_GROUND_FENCE_NW; break;
+			case DiagDirections{DIAGDIR_NE, DIAGDIR_SW}.base(): new_ground = RAIL_GROUND_FENCE_NESW; break;
+			case DiagDirections{DIAGDIR_SE, DIAGDIR_NW}.base(): new_ground = RAIL_GROUND_FENCE_SENW; break;
+			case DiagDirections{DIAGDIR_NE, DIAGDIR_SE}.base(): new_ground = RAIL_GROUND_FENCE_VERT1; break;
+			case DiagDirections{DIAGDIR_NE, DIAGDIR_NW}.base(): new_ground = RAIL_GROUND_FENCE_HORIZ2; break;
+			case DiagDirections{DIAGDIR_SE, DIAGDIR_SW}.base(): new_ground = RAIL_GROUND_FENCE_HORIZ1; break;
+			case DiagDirections{DIAGDIR_SW, DIAGDIR_NW}.base(): new_ground = RAIL_GROUND_FENCE_VERT2; break;
 			default: NOT_REACHED();
 		}
 	}
@@ -2933,10 +2928,10 @@ int TicksToLeaveDepot(const Train *v)
  * Tile callback routine when vehicle enters tile
  * @see vehicle_enter_tile_proc
  */
-static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *u, TileIndex tile, int x, int y)
+static VehicleEnterTileStates VehicleEnter_Track(Vehicle *u, TileIndex tile, int x, int y)
 {
 	/* This routine applies only to trains in depot tiles. */
-	if (u->type != VEH_TRAIN || !IsRailDepotTile(tile)) return VETSB_CONTINUE;
+	if (u->type != VEH_TRAIN || !IsRailDepotTile(tile)) return {};
 
 	/* Depot direction. */
 	DiagDirection dir = GetRailDepotDirection(tile);
@@ -2944,7 +2939,7 @@ static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *u, TileIndex tile, int
 	uint8_t fract_coord = (x & 0xF) + ((y & 0xF) << 4);
 
 	/* Make sure a train is not entering the tile from behind. */
-	if (_fractcoords_behind[dir] == fract_coord) return VETSB_CANNOT_ENTER;
+	if (_fractcoords_behind[dir] == fract_coord) return VehicleEnterTileState::CannotEnter;
 
 	Train *v = Train::From(u);
 
@@ -2976,10 +2971,10 @@ static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *u, TileIndex tile, int
 		v->tile = tile;
 
 		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
-		return VETSB_ENTERED_WORMHOLE;
+		return VehicleEnterTileState::EnteredWormhole;
 	}
 
-	return VETSB_CONTINUE;
+	return {};
 }
 
 /**
@@ -3032,14 +3027,6 @@ static CommandCost TestAutoslopeOnRailTile(TileIndex tile, DoCommandFlags flags,
 	return  cost;
 }
 
-/**
- * Test-procedure for HasVehicleOnPos to check for a ship.
- */
-static Vehicle *EnsureNoShipProc(Vehicle *v, void *)
-{
-	return v->type == VEH_SHIP ? v : nullptr;
-}
-
 static CommandCost TerraformTile_Track(TileIndex tile, DoCommandFlags flags, int z_new, Slope tileh_new)
 {
 	auto [tileh_old, z_old] = GetTileSlopeZ(tile);
@@ -3049,7 +3036,9 @@ static CommandCost TerraformTile_Track(TileIndex tile, DoCommandFlags flags, int
 		bool was_water = (GetRailGroundType(tile) == RAIL_GROUND_WATER && IsSlopeWithOneCornerRaised(tileh_old));
 
 		/* Allow clearing the water only if there is no ship */
-		if (was_water && HasVehicleOnPos(tile, nullptr, &EnsureNoShipProc)) return CommandCost(STR_ERROR_SHIP_IN_THE_WAY);
+		if (was_water && HasVehicleOnTile(tile, [](const Vehicle *v) {
+				return v->type == VEH_SHIP;
+			})) return CommandCost(STR_ERROR_SHIP_IN_THE_WAY);
 
 		/* First test autoslope. However if it succeeds we still have to test the rest, because non-autoslope terraforming is cheaper. */
 		CommandCost autoslope_result = TestAutoslopeOnRailTile(tile, flags, z_old, tileh_old, z_new, tileh_new, rail_bits);
diff --git a/src/rail_cmd.h b/src/rail_cmd.h
index fc27e50b8a..eb78df1d1c 100644
--- a/src/rail_cmd.h
+++ b/src/rail_cmd.h
@@ -12,6 +12,7 @@
 
 #include "command_type.h"
 #include "track_type.h"
+#include "direction_type.h"
 #include "rail_type.h"
 #include "signal_type.h"
 
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 09c551a344..6d859033c1 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -18,6 +18,7 @@
 #include "command_func.h"
 #include "waypoint_func.h"
 #include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "newgrf_station.h"
 #include "company_base.h"
 #include "strings_func.h"
@@ -865,36 +866,36 @@ static constexpr NWidgetPart _nested_build_rail_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_NS),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_RAIL_NS, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_RAIL_NS, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_X),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_RAIL_NE, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_RAIL_NE, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_EW),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_RAIL_EW, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_RAIL_EW, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_Y),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_RAIL_NW, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_RAIL_NW, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_AUTORAIL),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_AUTORAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_AUTORAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL),
 
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(4, 22), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), EndContainer(),
 
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_DEMOLISH),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_DEPOT),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DEPOT_RAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DEPOT_RAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_WAYPOINT),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_WAYPOINT, STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_WAYPOINT, STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_STATION),
-						SetFill(0, 1), SetMinimalSize(42, 22), SetSpriteTip(SPR_IMG_RAIL_STATION, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION),
+						SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_RAIL_STATION, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_SIGNALS),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_RAIL_SIGNALS, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_RAIL_SIGNALS, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_BRIDGE),
-						SetFill(0, 1), SetMinimalSize(42, 22), SetSpriteTip(SPR_IMG_BRIDGE, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE),
+						SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_BRIDGE, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_BUILD_TUNNEL),
-						SetFill(0, 1), SetMinimalSize(20, 22), SetSpriteTip(SPR_IMG_TUNNEL_RAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TUNNEL_RAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_REMOVE),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_REMOVE, STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_REMOVE, STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_CONVERT_RAIL),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_CONVERT_RAIL, STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_CONVERT_RAIL, STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL),
 	EndContainer(),
 };
 
@@ -1465,7 +1466,7 @@ private:
 		Point offset;
 		Dimension sprite_size = GetSpriteSize(image, &offset);
 		Rect ir = r.Shrink(WidgetDimensions::scaled.imgbtn);
-		int x = CenterBounds(ir.left, ir.right, sprite_size.width - offset.x) - offset.x; // centered
+		int x = CentreBounds(ir.left, ir.right, sprite_size.width - offset.x) - offset.x; // centered
 		int y = ir.top - sig_sprite_bottom_offset +
 				(ir.Height() + sig_sprite_size.height) / 2; // aligned to bottom
 
@@ -1644,37 +1645,37 @@ static constexpr NWidgetPart _nested_signal_builder_widgets[] = {
 			NWidget(NWID_VERTICAL, NWidContainerFlag::EqualSize),
 				/* Semaphore block signals. */
 				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_NORM), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_ENTRY), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_EXIT), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_COMBO), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_NORM), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_ENTRY), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_EXIT), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_COMBO), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
 				EndContainer(),
 				/* Electric block signals. */
 				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_NORM), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_ENTRY), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_EXIT), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_COMBO), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_NORM), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_ENTRY), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_EXIT), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+					NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_COMBO), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
 				EndContainer(),
 			EndContainer(),
 		EndContainer(),
 
 		/* Divider (only shown if block signals visible). */
 		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_BS_BLOCK_SPACER_SEL),
-			NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(0, 0), SetMinimalSize(4, 0), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(0, 0), SetToolbarSpacerMinimalSize(), EndContainer(),
 		EndContainer(),
 
 		/* Path signals. */
 		NWidget(NWID_VERTICAL, NWidContainerFlag::EqualSize),
 			/* Semaphore path signals. */
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_PBS), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_PBS_OWAY), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
+				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_PBS), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_SEMAPHORE_PBS_OWAY), SetToolTip(STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
 			EndContainer(),
 			/* Electric path signals. */
 			NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_PBS), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
-				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_PBS_OWAY), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP), SetMinimalSize(22, 22), EndContainer(),
+				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_PBS), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
+				NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BS_ELECTRIC_PBS_OWAY), SetToolTip(STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP), SetToolbarMinimalSize(1), EndContainer(),
 			EndContainer(),
 		EndContainer(),
 
@@ -1696,7 +1697,7 @@ static constexpr NWidgetPart _nested_signal_builder_widgets[] = {
 
 /** Signal selection window description */
 static WindowDesc _signal_builder_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_signal_builder_widgets
@@ -1777,7 +1778,7 @@ static constexpr NWidgetPart _nested_build_depot_widgets[] = {
 };
 
 static WindowDesc _build_depot_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_build_depot_widgets
@@ -2001,7 +2002,7 @@ void ResetSignalVariant(int32_t)
 	}
 }
 
-static IntervalTimer<TimerGameCalendar> _check_reset_signal({TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [](auto)
+static const IntervalTimer<TimerGameCalendar> _check_reset_signal({TimerGameCalendar::YEAR, TimerGameCalendar::Priority::NONE}, [](auto)
 {
 	if (TimerGameCalendar::year != _settings_client.gui.semaphore_build_before) return;
 
diff --git a/src/random_access_file.cpp b/src/random_access_file.cpp
index 397f729bd8..ba41f8481d 100644
--- a/src/random_access_file.cpp
+++ b/src/random_access_file.cpp
@@ -22,7 +22,7 @@
  * @param filename Name of the file at the disk.
  * @param subdir   The sub directory to search this file in.
  */
-RandomAccessFile::RandomAccessFile(const std::string &filename, Subdirectory subdir) : filename(filename)
+RandomAccessFile::RandomAccessFile(std::string_view filename, Subdirectory subdir) : filename(filename)
 {
 	size_t file_size;
 	this->file_handle = FioFOpenFile(filename, "rb", subdir, &file_size);
@@ -38,7 +38,7 @@ RandomAccessFile::RandomAccessFile(const std::string &filename, Subdirectory sub
 
 	/* Store the filename without path and extension */
 	auto t = filename.rfind(PATHSEPCHAR);
-	std::string name_without_path = filename.substr(t != std::string::npos ? t + 1 : 0);
+	std::string name_without_path{filename.substr(t != std::string::npos ? t + 1 : 0)};
 	this->simplified_filename = name_without_path.substr(0, name_without_path.rfind('.'));
 	strtolower(this->simplified_filename);
 
@@ -146,7 +146,7 @@ void RandomAccessFile::ReadBlock(void *ptr, size_t size)
 {
 	if (this->buffer != this->buffer_end) {
 		size_t to_copy = std::min<size_t>(size, this->buffer_end - this->buffer);
-		memcpy(ptr, this->buffer, to_copy);
+		std::copy_n(this->buffer, to_copy, static_cast<uint8_t *>(ptr));
 		this->buffer += to_copy;
 		size -= to_copy;
 		if (size == 0) return;
diff --git a/src/random_access_file_type.h b/src/random_access_file_type.h
index 95a4d94ad0..8ad5f10f93 100644
--- a/src/random_access_file_type.h
+++ b/src/random_access_file_type.h
@@ -36,7 +36,7 @@ class RandomAccessFile {
 	uint8_t buffer_start[BUFFER_SIZE];  ///< Local buffer when read from file.
 
 public:
-	RandomAccessFile(const std::string &filename, Subdirectory subdir);
+	RandomAccessFile(std::string_view filename, Subdirectory subdir);
 	RandomAccessFile(const RandomAccessFile&) = delete;
 	void operator=(const RandomAccessFile&) = delete;
 
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 4ccd03eca2..9b7cd17ccc 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -35,7 +35,7 @@ bool IsReleasedVersion()
  *
  * <modified> shows a "M", if the binary is made from modified source code.
  */
-const char _openttd_revision[] = "${REV_VERSION}";
+const std::string _openttd_revision = "${REV_VERSION}";
 
 /**
  * The text version of OpenTTD's build date.
@@ -43,17 +43,17 @@ const char _openttd_revision[] = "${REV_VERSION}";
  * updated for each revision in contrary to most other files that only see
  * updates when they are actually changed themselves.
  */
-const char _openttd_build_date[] = __DATE__ " " __TIME__;
+const std::string_view _openttd_build_date = __DATE__ " " __TIME__;
 
 /**
  * The git revision hash of this version.
  */
-const char _openttd_revision_hash[] = "${REV_HASH}";
+const std::string_view _openttd_revision_hash = "${REV_HASH}";
 
 /**
  * The year of this version.
  */
-const char _openttd_revision_year[] = "${REV_YEAR}";
+const std::string_view _openttd_revision_year = "${REV_YEAR}";
 
 /**
  * Let us know if current build was modified. This detection
@@ -77,7 +77,7 @@ const uint8_t _openttd_revision_tagged = ${REV_ISTAG};
  * It should never contain things like "beta", but only the release version
  * we are compatible with.
  */
-const char _openttd_content_version[] = "${REV_MAJOR}.${REV_MINOR}";
+const std::string_view _openttd_content_version = "${REV_MAJOR}.${REV_MINOR}";
 
 /**
  * The NewGRF revision of OTTD:
diff --git a/src/rev.h b/src/rev.h
index 450a8984ba..cb4b7931f1 100644
--- a/src/rev.h
+++ b/src/rev.h
@@ -10,13 +10,13 @@
 #ifndef REV_H
 #define REV_H
 
-extern const char _openttd_revision[];
-extern const char _openttd_build_date[];
-extern const char _openttd_revision_hash[];
-extern const char _openttd_revision_year[];
+extern const std::string _openttd_revision;
+extern const std::string_view _openttd_build_date;
+extern const std::string_view _openttd_revision_hash;
+extern const std::string_view _openttd_revision_year;
 extern const uint8_t _openttd_revision_modified;
 extern const uint8_t _openttd_revision_tagged;
-extern const char _openttd_content_version[];
+extern const std::string_view _openttd_content_version;
 extern const uint32_t _openttd_newgrf_version;
 
 bool IsReleasedVersion();
diff --git a/src/road.h b/src/road.h
index 07da18d97e..68c1aefdcf 100644
--- a/src/road.h
+++ b/src/road.h
@@ -234,6 +234,19 @@ inline const RoadTypeInfo *GetRoadTypeInfo(RoadType roadtype)
 	return &_roadtypes[roadtype];
 }
 
+/**
+ * Returns the railtype for a Railtype information.
+ * @param rti Pointer to static RailTypeInfo
+ * @return Railtype in static railtype definitions
+ */
+inline RoadType GetRoadTypeInfoIndex(const RoadTypeInfo *rti)
+{
+	extern RoadTypeInfo _roadtypes[ROADTYPE_END];
+	size_t index = rti - _roadtypes;
+	assert(index < ROADTYPE_END && rti == _roadtypes + index);
+	return static_cast<RoadType>(index);
+}
+
 /**
  * Checks if an engine of the given RoadType got power on a tile with a given
  * RoadType. This would normally just be an equality check, but for electrified
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 211186114c..07d8238a57 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -540,7 +540,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlags flags, RoadBits pie
 static CommandCost CheckRoadSlope(Slope tileh, RoadBits *pieces, RoadBits existing, RoadBits other)
 {
 	/* Remove already build pieces */
-	CLRBITS(*pieces, existing);
+	*pieces &= ~existing;
 
 	/* If we can't build anything stop here */
 	if (*pieces == ROAD_NONE) return CMD_ERROR;
@@ -621,7 +621,7 @@ CommandCost CmdBuildRoad(DoCommandFlags flags, TileIndex tile, RoadBits pieces,
 			company = OWNER_TOWN;
 
 			/* If we are not within a town, we are not owned by the town */
-			if (town == nullptr || DistanceSquare(tile, town->xy) > town->cache.squared_town_zone_radius[HZB_TOWN_EDGE]) {
+			if (town == nullptr || DistanceSquare(tile, town->xy) > town->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]) {
 				company = OWNER_NONE;
 			}
 		}
@@ -857,7 +857,7 @@ do_clear:;
 				if (HasPowerOnRoad(rt, existing_rt)) {
 					rt = existing_rt;
 				} else if (HasPowerOnRoad(existing_rt, rt)) {
-					ret = Command<CMD_CONVERT_ROAD>::Do(flags, tile, tile, rt);
+					ret = Command<CMD_CONVERT_ROAD>::Do(flags, tile, tile, rt, false);
 					if (ret.Failed()) return ret;
 					cost.AddCost(ret.GetCost());
 				} else {
@@ -1020,12 +1020,13 @@ CommandCost CmdBuildLongRoad(DoCommandFlags flags, TileIndex end_tile, TileIndex
 		}
 
 		CommandCost ret = Command<CMD_BUILD_ROAD>::Do(flags, tile, bits, rt, drd, TownID::Invalid());
-		if (ret.Failed() && ret.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) ret = CommandCost(); // Treat "already built" as success
-
+		if (!is_ai && ret.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) had_success = true;
 		if (ret.Failed()) {
 			last_error = std::move(ret);
-			if (is_ai) return last_error;
-			if (had_success) break; // Keep going if we haven't constructed any road yet, skipping the start of the drag
+			if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) {
+				if (is_ai) return last_error;
+				if (had_success) break; // Keep going if we haven't constructed any road yet, skipping the start of the drag
+			}
 		} else {
 			had_success = true;
 			/* Only pay for the upgrade on one side of the bridges and tunnels */
@@ -1355,7 +1356,7 @@ static uint GetRoadSpriteOffset(Slope slope, RoadBits bits)
  * @param roadside What sort of road this is
  * @return True if snow/desert road sprites should be used.
  */
-static bool DrawRoadAsSnowDesert(bool snow_or_desert, Roadside roadside)
+static bool DrawRoadAsSnowOrDesert(bool snow_or_desert, Roadside roadside)
 {
 	return (snow_or_desert &&
 			!(_settings_game.game_creation.landscape == LandscapeType::Tropic && HasGrfMiscBit(GrfMiscBit::DesertPavedRoads) &&
@@ -1416,7 +1417,7 @@ void DrawRoadTypeCatenary(const TileInfo *ti, RoadType rt, RoadBits rb)
 	/* Catenary uses 1st company colour to help identify owner.
 	 * For tiles with OWNER_TOWN or OWNER_NONE, recolour CC to grey as a neutral colour. */
 	Owner owner = GetRoadOwner(ti->tile, GetRoadTramType(rt));
-	PaletteID pal = (owner == OWNER_NONE || owner == OWNER_TOWN ? GENERAL_SPRITE_COLOUR(COLOUR_GREY) : COMPANY_SPRITE_COLOUR(owner));
+	PaletteID pal = (owner == OWNER_NONE || owner == OWNER_TOWN ? GetColourPalette(COLOUR_GREY) : GetCompanyPalette(owner));
 	int z_wires = (ti->tileh == SLOPE_FLAT ? 0 : TILE_HEIGHT) + BB_HEIGHT_UNDER_BRIDGE;
 	if (back != 0) {
 		/* The "back" sprite contains the west, north and east pillars.
@@ -1462,7 +1463,7 @@ void DrawRoadCatenary(const TileInfo *ti)
 			}
 		}
 	} else {
-		// No road here, no catenary to draw
+		/* No road here, no catenary to draw */
 		return;
 	}
 
@@ -1555,7 +1556,7 @@ static SpriteID GetRoadGroundSprite(const TileInfo *ti, Roadside roadside, const
 {
 	/* Draw bare ground sprite if no road or road uses overlay system. */
 	if (rti == nullptr || rti->UsesOverlay()) {
-		if (DrawRoadAsSnowDesert(snow_or_desert, roadside)) {
+		if (DrawRoadAsSnowOrDesert(snow_or_desert, roadside)) {
 			return SPR_FLAT_SNOW_DESERT_TILE + SlopeToSpriteOffset(ti->tileh);
 		}
 
@@ -1570,7 +1571,7 @@ static SpriteID GetRoadGroundSprite(const TileInfo *ti, Roadside roadside, const
 
 	/* Draw original road base sprite */
 	SpriteID image = SPR_ROAD_Y + offset;
-	if (DrawRoadAsSnowDesert(snow_or_desert, roadside)) {
+	if (DrawRoadAsSnowOrDesert(snow_or_desert, roadside)) {
 		image += 19;
 	} else {
 		switch (roadside) {
@@ -1627,7 +1628,7 @@ static void DrawRoadBits(TileInfo *ti)
 		/* DrawFoundation() modifies ti. */
 	}
 
-	DrawRoadGroundSprites(ti, road, tram, road_rti, tram_rti, GetRoadside(ti->tile), IsOnSnow(ti->tile));
+	DrawRoadGroundSprites(ti, road, tram, road_rti, tram_rti, GetRoadside(ti->tile), IsOnSnowOrDesert(ti->tile));
 
 	/* Draw one way */
 	if (road_rti != nullptr) {
@@ -1657,7 +1658,7 @@ static void DrawRoadBits(TileInfo *ti)
 	DrawRoadCatenary(ti);
 
 	/* Return if full detail is disabled, or we are zoomed fully out. */
-	if (!HasBit(_display_opt, DO_FULL_DETAIL) || _cur_dpi->zoom > ZOOM_LVL_DETAIL) return;
+	if (!HasBit(_display_opt, DO_FULL_DETAIL) || _cur_dpi->zoom > ZoomLevel::Detail) return;
 
 	/* Do not draw details (street lights, trees) under low bridge */
 	Roadside roadside = GetRoadside(ti->tile);
@@ -1719,7 +1720,7 @@ static void DrawTile_Road(TileInfo *ti)
 				SpriteID image = SPR_ROAD_Y + axis;
 
 				Roadside roadside = GetRoadside(ti->tile);
-				if (DrawRoadAsSnowDesert(IsOnSnow(ti->tile), roadside)) {
+				if (DrawRoadAsSnowOrDesert(IsOnSnowOrDesert(ti->tile), roadside)) {
 					image += 19;
 				} else {
 					switch (roadside) {
@@ -1735,7 +1736,7 @@ static void DrawTile_Road(TileInfo *ti)
 				if (IsCrossingBarred(ti->tile)) image += 2;
 
 				Roadside roadside = GetRoadside(ti->tile);
-				if (DrawRoadAsSnowDesert(IsOnSnow(ti->tile), roadside)) {
+				if (DrawRoadAsSnowOrDesert(IsOnSnowOrDesert(ti->tile), roadside)) {
 					image += 8;
 				} else {
 					switch (roadside) {
@@ -1760,32 +1761,32 @@ static void DrawTile_Road(TileInfo *ti)
 				const Axis road_axis = GetCrossingRoadAxis(ti->tile);
 				const DiagDirection dir1 = AxisToDiagDir(road_axis);
 				const DiagDirection dir2 = ReverseDiagDir(dir1);
-				uint adjacent_diagdirs = 0;
+				DiagDirections adjacent_diagdirs{};
 				for (DiagDirection dir : { dir1, dir2 }) {
 					const TileIndex t = TileAddByDiagDir(ti->tile, dir);
 					if (t < Map::Size() && IsLevelCrossingTile(t) && GetCrossingRoadAxis(t) == road_axis) {
-						SetBit(adjacent_diagdirs, dir);
+						adjacent_diagdirs.Set(dir);
 					}
 				}
 
-				switch (adjacent_diagdirs) {
-					case 0:
+				switch (adjacent_diagdirs.base()) {
+					case DiagDirections{}.base():
 						DrawRailTileSeq(ti, &_crossing_layout, TO_CATENARY, rail, 0, PAL_NONE);
 						break;
 
-					case (1 << DIAGDIR_NE):
+					case DiagDirections{DIAGDIR_NE}.base():
 						DrawRailTileSeq(ti, &_crossing_layout_SW, TO_CATENARY, rail, 0, PAL_NONE);
 						break;
 
-					case (1 << DIAGDIR_SE):
+					case DiagDirections{DIAGDIR_SE}.base():
 						DrawRailTileSeq(ti, &_crossing_layout_NW, TO_CATENARY, rail, 0, PAL_NONE);
 						break;
 
-					case (1 << DIAGDIR_SW):
+					case DiagDirections{DIAGDIR_SW}.base():
 						DrawRailTileSeq(ti, &_crossing_layout_NE, TO_CATENARY, rail, 0, PAL_NONE);
 						break;
 
-					case (1 << DIAGDIR_NW):
+					case DiagDirections{DIAGDIR_NW}.base():
 						DrawRailTileSeq(ti, &_crossing_layout_SE, TO_CATENARY, rail, 0, PAL_NONE);
 						break;
 
@@ -1813,7 +1814,7 @@ static void DrawTile_Road(TileInfo *ti)
 		case ROAD_TILE_DEPOT: {
 			if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED);
 
-			PaletteID palette = COMPANY_SPRITE_COLOUR(GetTileOwner(ti->tile));
+			PaletteID palette = GetCompanyPalette(GetTileOwner(ti->tile));
 
 			RoadType road_rt = GetRoadTypeRoad(ti->tile);
 			RoadType tram_rt = GetRoadTypeTram(ti->tile);
@@ -1866,7 +1867,7 @@ static void DrawTile_Road(TileInfo *ti)
  */
 void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt)
 {
-	PaletteID palette = COMPANY_SPRITE_COLOUR(_local_company);
+	PaletteID palette = GetCompanyPalette(_local_company);
 
 	const RoadTypeInfo *rti = GetRoadTypeInfo(rt);
 	int relocation = GetCustomRoadSprite(rti, INVALID_TILE, ROTSG_DEPOT);
@@ -1955,7 +1956,7 @@ static const Roadside _town_road_types[][2] = {
 	{ ROADSIDE_STREET_LIGHTS, ROADSIDE_PAVED }
 };
 
-static_assert(lengthof(_town_road_types) == HZB_END);
+static_assert(lengthof(_town_road_types) == NUM_HOUSE_ZONES);
 
 static const Roadside _town_road_types_2[][2] = {
 	{ ROADSIDE_GRASS,         ROADSIDE_GRASS },
@@ -1965,7 +1966,7 @@ static const Roadside _town_road_types_2[][2] = {
 	{ ROADSIDE_STREET_LIGHTS, ROADSIDE_PAVED }
 };
 
-static_assert(lengthof(_town_road_types_2) == HZB_END);
+static_assert(lengthof(_town_road_types_2) == NUM_HOUSE_ZONES);
 
 
 static void TileLoop_Road(TileIndex tile)
@@ -1974,16 +1975,16 @@ static void TileLoop_Road(TileIndex tile)
 		case LandscapeType::Arctic: {
 			/* Roads on flat foundations use the snow level of the height they are elevated to. All others use the snow level of their minimum height. */
 			int tile_z = (std::get<Slope>(GetFoundationSlope(tile)) == SLOPE_FLAT) ? GetTileMaxZ(tile) : GetTileZ(tile);
-			if (IsOnSnow(tile) != (tile_z > GetSnowLine())) {
-				ToggleSnow(tile);
+			if (IsOnSnowOrDesert(tile) != (tile_z > GetSnowLine())) {
+				ToggleSnowOrDesert(tile);
 				MarkTileDirtyByTile(tile);
 			}
 			break;
 		}
 
 		case LandscapeType::Tropic:
-			if (GetTropicZone(tile) == TROPICZONE_DESERT && !IsOnDesert(tile)) {
-				ToggleDesert(tile);
+			if (GetTropicZone(tile) == TROPICZONE_DESERT && !IsOnSnowOrDesert(tile)) {
+				ToggleSnowOrDesert(tile);
 				MarkTileDirtyByTile(tile);
 			}
 			break;
@@ -1996,14 +1997,14 @@ static void TileLoop_Road(TileIndex tile)
 
 	const Town *t = ClosestTownFromTile(tile, UINT_MAX);
 	if (!HasRoadWorks(tile)) {
-		HouseZonesBits grp = HZB_TOWN_EDGE;
+		HouseZone grp = HouseZone::TownEdge;
 
 		if (t != nullptr) {
 			grp = GetTownRadiusGroup(t, tile);
 
 			/* Show an animation to indicate road work */
 			if (t->road_build_months != 0 &&
-					(DistanceManhattan(t->xy, tile) < 8 || grp != HZB_TOWN_EDGE) &&
+					(DistanceManhattan(t->xy, tile) < 8 || grp != HouseZone::TownEdge) &&
 					IsNormalRoad(tile) && !HasAtMostOneBit(GetAllRoadBits(tile))) {
 				if (std::get<0>(GetFoundationSlope(tile)) == SLOPE_FLAT && EnsureNoVehicleOnGround(tile).Succeeded() && Chance16(1, 40)) {
 					StartRoadWorks(tile);
@@ -2022,7 +2023,7 @@ static void TileLoop_Road(TileIndex tile)
 
 		{
 			/* Adjust road ground type depending on 'grp' (grp is the distance to the center) */
-			const Roadside *new_rs = (_settings_game.game_creation.landscape == LandscapeType::Toyland) ? _town_road_types_2[grp] : _town_road_types[grp];
+			const Roadside *new_rs = (_settings_game.game_creation.landscape == LandscapeType::Toyland) ? _town_road_types_2[to_underlying(grp)] : _town_road_types[to_underlying(grp)];
 			Roadside cur_rs = GetRoadside(tile);
 
 			/* We have our desired type, do nothing */
@@ -2249,7 +2250,7 @@ static const uint8_t _roadveh_enter_depot_dir[4] = {
 	TRACKDIR_X_SW, TRACKDIR_Y_NW, TRACKDIR_X_NE, TRACKDIR_Y_SE
 };
 
-static VehicleEnterTileStatus VehicleEnter_Road(Vehicle *v, TileIndex tile, int, int)
+static VehicleEnterTileStates VehicleEnter_Road(Vehicle *v, TileIndex tile, int, int)
 {
 	switch (GetRoadTileType(tile)) {
 		case ROAD_TILE_DEPOT: {
@@ -2265,14 +2266,14 @@ static VehicleEnterTileStatus VehicleEnter_Road(Vehicle *v, TileIndex tile, int,
 				rv->tile = tile;
 
 				InvalidateWindowData(WC_VEHICLE_DEPOT, rv->tile);
-				return VETSB_ENTERED_WORMHOLE;
+				return VehicleEnterTileState::EnteredWormhole;
 			}
 			break;
 		}
 
 		default: break;
 	}
-	return VETSB_CONTINUE;
+	return {};
 }
 
 
@@ -2369,17 +2370,6 @@ static CommandCost TerraformTile_Road(TileIndex tile, DoCommandFlags flags, int
 	return Command<CMD_LANDSCAPE_CLEAR>::Do(flags, tile);
 }
 
-/** Update power of road vehicle under which is the roadtype being converted */
-static Vehicle *UpdateRoadVehPowerProc(Vehicle *v, void *data)
-{
-	if (v->type != VEH_ROAD) return nullptr;
-
-	RoadVehicleList *affected_rvs = static_cast<RoadVehicleList*>(data);
-	include(*affected_rvs, RoadVehicle::From(v)->First());
-
-	return nullptr;
-}
-
 /**
  * Checks the tile and returns whether the current player is allowed to convert the roadtype to another roadtype without taking ownership
  * @param owner the tile owner.
@@ -2401,10 +2391,10 @@ static bool CanConvertUnownedRoadType(Owner owner, RoadTramType rtt)
  */
 static void ConvertRoadTypeOwner(TileIndex tile, uint num_pieces, Owner owner, RoadType from_type, RoadType to_type)
 {
-	// Scenario editor, maybe? Don't touch the owners when converting roadtypes...
+	/* Scenario editor, maybe? Don't touch the owners when converting roadtypes... */
 	if (_current_company >= MAX_COMPANIES) return;
 
-	// We can't get a company from invalid owners but we can get ownership of roads without an owner
+	/* We can't get a company from invalid owners but we can get ownership of roads without an owner */
 	if (owner >= MAX_COMPANIES && owner != OWNER_NONE) return;
 
 	Company *c;
@@ -2434,7 +2424,7 @@ static void ConvertRoadTypeOwner(TileIndex tile, uint num_pieces, Owner owner, R
  * @param to_type new roadtype to convert to.
  * @return the cost of this operation or an error
  */
-CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_start, RoadType to_type)
+CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_start, RoadType to_type, bool diagonal)
 {
 	TileIndex area_end = tile;
 
@@ -2448,7 +2438,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
 	CommandCost error = CommandCost((rtt == RTT_TRAM) ? STR_ERROR_NO_SUITABLE_TRAMWAY : STR_ERROR_NO_SUITABLE_ROAD); // by default, there is no road to convert.
 	bool found_convertible_road = false; // whether we actually did convert any road/tram (see bug #7633)
 
-	std::unique_ptr<TileIterator> iter = std::make_unique<OrthogonalTileIterator>(area_start, area_end);
+	std::unique_ptr<TileIterator> iter = TileIterator::Create(area_start, area_end, diagonal);
 	for (; (tile = *iter) != INVALID_TILE; ++(*iter)) {
 		/* Is road present on tile? */
 		if (!MayHaveRoad(tile)) continue;
@@ -2537,7 +2527,9 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
 				MarkTileDirtyByTile(tile);
 
 				/* update power of train on this tile */
-				FindVehicleOnPos(tile, &affected_rvs, &UpdateRoadVehPowerProc);
+				for (Vehicle *v : VehiclesOnTile(tile)) {
+					if (v->type == VEH_ROAD) include(affected_rvs, RoadVehicle::From(v)->First());
+				}
 
 				if (IsRoadDepotTile(tile)) {
 					/* Update build vehicle window related to this depot */
@@ -2551,7 +2543,11 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
 			/* If both ends of tunnel/bridge are in the range, do not try to convert twice -
 			 * it would cause assert because of different test and exec runs */
 			if (endtile < tile) {
-				if (OrthogonalTileArea(area_start, area_end).Contains(endtile)) continue;
+				if (diagonal) {
+					if (DiagonalTileArea(area_start, area_end).Contains(endtile)) continue;
+				} else {
+					if (OrthogonalTileArea(area_start, area_end).Contains(endtile)) continue;
+				}
 			}
 
 			/* When not converting rail <-> el. rail, any vehicle cannot be in tunnel/bridge */
@@ -2590,8 +2586,12 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
 				SetRoadType(tile,    rtt, to_type);
 				SetRoadType(endtile, rtt, to_type);
 
-				FindVehicleOnPos(tile, &affected_rvs, &UpdateRoadVehPowerProc);
-				FindVehicleOnPos(endtile, &affected_rvs, &UpdateRoadVehPowerProc);
+				for (Vehicle *v : VehiclesOnTile(tile)) {
+					if (v->type == VEH_ROAD) include(affected_rvs, RoadVehicle::From(v)->First());
+				}
+				for (Vehicle *v : VehiclesOnTile(endtile)) {
+					if (v->type == VEH_ROAD) include(affected_rvs, RoadVehicle::From(v)->First());
+				}
 
 				if (IsBridge(tile)) {
 					MarkBridgeDirty(tile);
diff --git a/src/road_cmd.h b/src/road_cmd.h
index ad53a3e111..24b4c2b636 100644
--- a/src/road_cmd.h
+++ b/src/road_cmd.h
@@ -13,6 +13,8 @@
 #include "direction_type.h"
 #include "road_type.h"
 #include "command_type.h"
+#include "station_type.h"
+#include "town_type.h"
 
 enum RoadStopClassID : uint16_t;
 
@@ -23,7 +25,7 @@ CommandCost CmdBuildLongRoad(DoCommandFlags flags, TileIndex end_tile, TileIndex
 std::tuple<CommandCost, Money> CmdRemoveLongRoad(DoCommandFlags flags, TileIndex end_tile, TileIndex start_tile, RoadType rt, Axis axis, bool start_half, bool end_half);
 CommandCost CmdBuildRoad(DoCommandFlags flags, TileIndex tile, RoadBits pieces, RoadType rt, DisallowedRoadDirections toggle_drd, TownID town_id);
 CommandCost CmdBuildRoadDepot(DoCommandFlags flags, TileIndex tile, RoadType rt, DiagDirection dir);
-CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_start, RoadType to_type);
+CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_start, RoadType to_type, bool diagonal);
 
 DEF_CMD_TRAIT(CMD_BUILD_LONG_ROAD,  CmdBuildLongRoad,  CommandFlags({CommandFlag::Auto, CommandFlag::NoWater, CommandFlag::Deity}), CMDT_LANDSCAPE_CONSTRUCTION)
 DEF_CMD_TRAIT(CMD_REMOVE_LONG_ROAD, CmdRemoveLongRoad, CommandFlags({CommandFlag::Auto, CommandFlag::NoTest}),              CMDT_LANDSCAPE_CONSTRUCTION) // towns may disallow removing road bits (as they are connected) in test, but in exec they're removed and thus removing is allowed.
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 70406eaecf..d53b21668d 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -39,7 +39,7 @@
 #include "waypoint_cmd.h"
 #include "road_cmd.h"
 #include "tunnelbridge_cmd.h"
-#include "newgrf_badge.h"
+#include "newgrf_badge_gui.h"
 #include "newgrf_roadstop.h"
 #include "picker_gui.h"
 #include "timer/timer.h"
@@ -586,7 +586,7 @@ struct BuildRoadToolbarWindow : Window {
 				break;
 
 			case WID_ROT_CONVERT_ROAD:
-				HandlePlacePushButton(this, WID_ROT_CONVERT_ROAD, GetRoadTypeInfo(this->roadtype)->cursor.convert_road, HT_RECT);
+				HandlePlacePushButton(this, WID_ROT_CONVERT_ROAD, GetRoadTypeInfo(this->roadtype)->cursor.convert_road, HT_RECT | HT_DIAGONAL);
 				this->last_started_action = widget;
 				break;
 
@@ -805,7 +805,7 @@ struct BuildRoadToolbarWindow : Window {
 					break;
 
 				case DDSP_CONVERT_ROAD:
-					Command<CMD_CONVERT_ROAD>::Post(GetRoadTypeInfo(this->roadtype)->strings.err_convert_road, CcPlaySound_CONSTRUCTION_OTHER, end_tile, start_tile, _cur_roadtype);
+					Command<CMD_CONVERT_ROAD>::Post(GetRoadTypeInfo(this->roadtype)->strings.err_convert_road, CcPlaySound_CONSTRUCTION_OTHER, end_tile, start_tile, _cur_roadtype, _ctrl_pressed);
 					break;
 			}
 		}
@@ -907,32 +907,34 @@ static constexpr NWidgetPart _nested_build_road_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_X),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_Y),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_AUTOROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_AUTOROAD, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_AUTOROAD, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_DEMOLISH),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_DEPOT),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_DEPOT, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_DEPOT, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_WAYPOINT),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_WAYPOINT, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_WAYPOINT, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUS_STATION),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_BUS_STATION, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_BUS_STATION, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_TRUCK_STATION),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_TRUCK_BAY, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TRUCK_BAY, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY),
+
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(1, 1), EndContainer(),
+
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ONE_WAY),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_ONE_WAY, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_ONE_WAY, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_BRIDGE),
-						SetFill(0, 1), SetMinimalSize(43, 22), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE),
+						SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_TUNNEL),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_REMOVE),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_CONVERT_ROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD),
 	EndContainer(),
 };
 
@@ -952,30 +954,32 @@ static constexpr NWidgetPart _nested_build_tramway_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_X),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_TRAMWAY_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TRAMWAY_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_Y),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_TRAMWAY_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TRAMWAY_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_AUTOROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_AUTOTRAM, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_AUTOTRAM, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_DEMOLISH),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_DEPOT),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_DEPOT, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_DEPOT, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_WAYPOINT),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_WAYPOINT, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_WAYPOINT, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUS_STATION),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_BUS_STATION, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_BUS_STATION, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_TRUCK_STATION),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_TRUCK_BAY, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TRUCK_BAY, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION),
+
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(1, 1), EndContainer(),
+
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_BRIDGE),
-						SetFill(0, 1), SetMinimalSize(43, 22), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE),
+						SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_TUNNEL),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_REMOVE),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_CONVERT_ROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM),
 	EndContainer(),
 };
 
@@ -1013,24 +1017,26 @@ static constexpr NWidgetPart _nested_build_road_scen_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_X),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_Y),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_AUTOROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_AUTOROAD, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_AUTOROAD, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_DEMOLISH),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(1, 1), EndContainer(),
+
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ONE_WAY),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_ONE_WAY, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_ONE_WAY, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_BRIDGE),
-						SetFill(0, 1), SetMinimalSize(43, 22), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE),
+						SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_TUNNEL),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_REMOVE),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_CONVERT_ROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD),
 	EndContainer(),
 };
 
@@ -1050,22 +1056,24 @@ static constexpr NWidgetPart _nested_build_tramway_scen_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_X),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_TRAMWAY_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TRAMWAY_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_ROAD_Y),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_TRAMWAY_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_TRAMWAY_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_AUTOROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_AUTOTRAM, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_AUTOTRAM, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_DEMOLISH),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(1, 1), EndContainer(),
+
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_BRIDGE),
-						SetFill(0, 1), SetMinimalSize(43, 22), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE),
+						SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_BUILD_TUNNEL),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_REMOVE),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_ROT_CONVERT_ROAD),
-						SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM),
+						SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_CONVERT_ROAD, STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM),
 	EndContainer(),
 };
 
@@ -1167,7 +1175,7 @@ static constexpr NWidgetPart _nested_build_road_depot_widgets[] = {
 };
 
 static WindowDesc _build_road_depot_desc(
-	WDP_AUTO, nullptr, 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_build_road_depot_widgets
diff --git a/src/road_gui.h b/src/road_gui.h
index fefce6b534..7dcf1c99d4 100644
--- a/src/road_gui.h
+++ b/src/road_gui.h
@@ -10,6 +10,7 @@
 #ifndef ROAD_GUI_H
 #define ROAD_GUI_H
 
+#include "road.h"
 #include "road_type.h"
 #include "tile_type.h"
 #include "direction_type.h"
diff --git a/src/road_map.h b/src/road_map.h
index 4d53bfdbe5..f8436d4258 100644
--- a/src/road_map.h
+++ b/src/road_map.h
@@ -433,25 +433,21 @@ inline void BarCrossing(Tile t)
 	SetCrossingBarred(t, true);
 }
 
-/** Check if a road tile has snow/desert. */
-#define IsOnDesert IsOnSnow
 /**
  * Check if a road tile has snow/desert.
  * @param t The tile to query.
  * @return True if the tile has snow/desert.
  */
-inline bool IsOnSnow(Tile t)
+inline bool IsOnSnowOrDesert(Tile t)
 {
 	return HasBit(t.m7(), 5);
 }
 
-/** Toggle the snow/desert state of a road tile. */
-#define ToggleDesert ToggleSnow
 /**
  * Toggle the snow/desert state of a road tile.
  * @param t The tile to change.
  */
-inline void ToggleSnow(Tile t)
+inline void ToggleSnowOrDesert(Tile t)
 {
 	ToggleBit(t.m7(), 5);
 }
@@ -463,7 +459,7 @@ enum Roadside : uint8_t {
 	ROADSIDE_GRASS            = 1, ///< Road on grass
 	ROADSIDE_PAVED            = 2, ///< Road with paved sidewalks
 	ROADSIDE_STREET_LIGHTS    = 3, ///< Road with street lights on paved sidewalks
-	// 4 is unused for historical reasons
+	/* 4 is unused for historical reasons */
 	ROADSIDE_TREES            = 5, ///< Road with trees on paved sidewalks
 	ROADSIDE_GRASS_ROAD_WORKS = 6, ///< Road on grass with road works
 	ROADSIDE_PAVED_ROAD_WORKS = 7, ///< Road with sidewalks and road works
diff --git a/src/roadstop.cpp b/src/roadstop.cpp
index 4c68e2688f..cd9a3b1152 100644
--- a/src/roadstop.cpp
+++ b/src/roadstop.cpp
@@ -10,6 +10,7 @@
 #include "stdafx.h"
 #include "roadveh.h"
 #include "core/pool_func.hpp"
+#include "core/container_func.hpp"
 #include "roadstop_base.h"
 #include "station_base.h"
 #include "vehicle_func.h"
@@ -26,9 +27,8 @@ INSTANTIATE_POOL_METHODS(RoadStop)
 RoadStop::~RoadStop()
 {
 	/* When we are the head we need to free the entries */
-	if (HasBit(this->status, RSSFB_BASE_ENTRY)) {
-		delete this->east;
-		delete this->west;
+	if (this->status.Test(RoadStopStatusFlag::BaseEntry)) {
+		delete this->entries;
 	}
 
 	if (CleaningPool()) return;
@@ -61,7 +61,7 @@ RoadStop *RoadStop::GetNextRoadStop(const RoadVehicle *v) const
  */
 void RoadStop::MakeDriveThrough()
 {
-	assert(this->east == nullptr && this->west == nullptr);
+	assert(this->entries == nullptr);
 
 	RoadStopType rst = GetRoadStopType(this->xy);
 	Axis axis = GetDriveThroughStopAxis(this->xy);
@@ -78,48 +78,43 @@ void RoadStop::MakeDriveThrough()
 	RoadStop *rs_south = south ? RoadStop::GetByTile(south_tile, rst) : nullptr;
 
 	/* Amount of road stops that will be added to the 'northern' head */
-	int added = 1;
-	if (north && rs_north->east != nullptr) { // (east != nullptr) == (west != nullptr)
+	uint16_t added = 1;
+	if (north && rs_north->entries != nullptr) {
 		/* There is a more northern one, so this can join them */
-		this->east = rs_north->east;
-		this->west = rs_north->west;
+		this->entries = rs_north->entries;
 
-		if (south && rs_south->east != nullptr) { // (east != nullptr) == (west != nullptr)
+		if (south && rs_south->entries != nullptr) {
 			/* There more southern tiles too, they must 'join' us too */
-			ClrBit(rs_south->status, RSSFB_BASE_ENTRY);
-			this->east->occupied += rs_south->east->occupied;
-			this->west->occupied += rs_south->west->occupied;
+			rs_south->status.Reset(RoadStopStatusFlag::BaseEntry);
+			this->entries->east.occupied += rs_south->entries->east.occupied;
+			this->entries->west.occupied += rs_south->entries->west.occupied;
 
-			/* Free the now unneeded entry structs */
-			delete rs_south->east;
-			delete rs_south->west;
+			/* Free the now unneeded entries struct */
+			delete rs_south->entries;
 
 			/* Make all 'children' of the southern tile take the new master */
 			for (; IsDriveThroughRoadStopContinuation(this->xy, south_tile); south_tile += offset) {
 				rs_south = RoadStop::GetByTile(south_tile, rst);
-				if (rs_south->east == nullptr) break;
-				rs_south->east = rs_north->east;
-				rs_south->west = rs_north->west;
+				if (rs_south->entries == nullptr) break;
+				rs_south->entries = rs_north->entries;
 				added++;
 			}
 		}
-	} else if (south && rs_south->east != nullptr) { // (east != nullptr) == (west != nullptr)
+	} else if (south && rs_south->entries != nullptr) {
 		/* There is one to the south, but not to the north... so we become 'parent' */
-		this->east = rs_south->east;
-		this->west = rs_south->west;
-		SetBit(this->status, RSSFB_BASE_ENTRY);
-		ClrBit(rs_south->status, RSSFB_BASE_ENTRY);
+		this->entries = rs_south->entries;
+		this->status.Set(RoadStopStatusFlag::BaseEntry);
+		rs_south->status.Reset(RoadStopStatusFlag::BaseEntry);
 	} else {
 		/* We are the only... so we are automatically the master */
-		this->east = new Entry();
-		this->west = new Entry();
-		SetBit(this->status, RSSFB_BASE_ENTRY);
+		this->entries = new Entries();
+		this->status.Set(RoadStopStatusFlag::BaseEntry);
 	}
 
 	/* Now update the lengths */
 	added *= TILE_SIZE;
-	this->east->length += added;
-	this->west->length += added;
+	this->entries->east.length += added;
+	this->entries->west.length += added;
 }
 
 /**
@@ -128,7 +123,7 @@ void RoadStop::MakeDriveThrough()
  */
 void RoadStop::ClearDriveThrough()
 {
-	assert(this->east != nullptr && this->west != nullptr);
+	assert(this->entries != nullptr);
 
 	RoadStopType rst = GetRoadStopType(this->xy);
 	Axis axis = GetDriveThroughStopAxis(this->xy);
@@ -153,9 +148,8 @@ void RoadStop::ClearDriveThrough()
 		if (south) {
 			/* There are more southern tiles too, they must be split;
 			 * first make the new southern 'base' */
-			SetBit(rs_south->status, RSSFB_BASE_ENTRY);
-			rs_south->east = new Entry();
-			rs_south->west = new Entry();
+			rs_south->status.Set(RoadStopStatusFlag::BaseEntry);
+			rs_south->entries = new Entries();
 
 			/* Keep track of the base because we need it later on */
 			RoadStop *rs_south_base = rs_south;
@@ -164,8 +158,7 @@ void RoadStop::ClearDriveThrough()
 			/* Make all (even more) southern stops part of the new entry queue */
 			for (south_tile += offset; IsDriveThroughRoadStopContinuation(base_tile, south_tile); south_tile += offset) {
 				rs_south = RoadStop::GetByTile(south_tile, rst);
-				rs_south->east = rs_south_base->east;
-				rs_south->west = rs_south_base->west;
+				rs_south->entries = rs_south_base->entries;
 			}
 
 			/* Find the other end; the northern most tile */
@@ -179,32 +172,30 @@ void RoadStop::ClearDriveThrough()
 			 * rebuild it from scratch as that removes lots of maintenance code
 			 * for the vehicle list and it's faster in real games as long as you
 			 * do not keep split and merge road stop every tick by the millions. */
-			rs_south_base->east->Rebuild(rs_south_base);
-			rs_south_base->west->Rebuild(rs_south_base);
+			rs_south_base->entries->east.Rebuild(rs_south_base);
+			rs_south_base->entries->west.Rebuild(rs_south_base);
 
-			assert(HasBit(rs_north->status, RSSFB_BASE_ENTRY));
-			rs_north->east->Rebuild(rs_north);
-			rs_north->west->Rebuild(rs_north);
+			assert(rs_north->status.Test(RoadStopStatusFlag::BaseEntry));
+			rs_north->entries->east.Rebuild(rs_north);
+			rs_north->entries->west.Rebuild(rs_north);
 		} else {
 			/* Only we left, so simple update the length. */
-			rs_north->east->length -= TILE_SIZE;
-			rs_north->west->length -= TILE_SIZE;
+			rs_north->entries->east.length -= TILE_SIZE;
+			rs_north->entries->west.length -= TILE_SIZE;
 		}
 	} else if (south) {
 		/* There is only something to the south. Hand over the base entry */
-		SetBit(rs_south->status, RSSFB_BASE_ENTRY);
-		rs_south->east->length -= TILE_SIZE;
-		rs_south->west->length -= TILE_SIZE;
+		rs_south->status.Set(RoadStopStatusFlag::BaseEntry);
+		rs_south->entries->east.length -= TILE_SIZE;
+		rs_south->entries->west.length -= TILE_SIZE;
 	} else {
 		/* We were the last */
-		delete this->east;
-		delete this->west;
+		delete this->entries;
 	}
 
 	/* Make sure we don't get used for something 'incorrect' */
-	ClrBit(this->status, RSSFB_BASE_ENTRY);
-	this->east = nullptr;
-	this->west = nullptr;
+	this->status.Reset(RoadStopStatusFlag::BaseEntry);
+	this->entries = nullptr;
 }
 
 /**
@@ -219,7 +210,7 @@ void RoadStop::Leave(RoadVehicle *rv)
 		this->SetEntranceBusy(false);
 	} else {
 		/* Otherwise just leave the drive through's entry cache. */
-		this->GetEntry(DirToDiagDir(rv->direction))->Leave(rv);
+		this->GetEntry(DirToDiagDir(rv->direction)).Leave(rv);
 	}
 }
 
@@ -247,7 +238,7 @@ bool RoadStop::Enter(RoadVehicle *rv)
 	}
 
 	/* Vehicles entering a drive-through stop from the 'normal' side use first bay (bay 0). */
-	this->GetEntry(DirToDiagDir(rv->direction))->Enter(rv);
+	this->GetEntry(DirToDiagDir(rv->direction)).Enter(rv);
 
 	/* Indicate a drive-through stop */
 	SetBit(rv->state, RVS_IN_DT_ROAD_STOP);
@@ -277,8 +268,8 @@ bool RoadStop::Enter(RoadVehicle *rv)
  */
 void RoadStop::Entry::Leave(const RoadVehicle *rv)
 {
+	assert(this->occupied >= rv->gcache.cached_total_length);
 	this->occupied -= rv->gcache.cached_total_length;
-	assert(this->occupied >= 0);
 }
 
 /**
@@ -309,39 +300,6 @@ void RoadStop::Entry::Enter(const RoadVehicle *rv)
 			GetDriveThroughStopAxis(next) == GetDriveThroughStopAxis(rs);
 }
 
-typedef std::list<const RoadVehicle *> RVList; ///< A list of road vehicles
-
-/** Helper for finding RVs in a road stop. */
-struct RoadStopEntryRebuilderHelper {
-	RVList vehicles;   ///< The list of vehicles to possibly add to.
-	DiagDirection dir; ///< The direction the vehicle has to face to be added.
-};
-
-/**
- * Add road vehicles to the station's list if needed.
- * @param v the found vehicle
- * @param data the extra data used to make our decision
- * @return always nullptr
- */
-Vehicle *FindVehiclesInRoadStop(Vehicle *v, void *data)
-{
-	RoadStopEntryRebuilderHelper *rserh = (RoadStopEntryRebuilderHelper*)data;
-	/* Not a RV or not in the right direction or crashed :( */
-	if (v->type != VEH_ROAD || DirToDiagDir(v->direction) != rserh->dir || !v->IsPrimaryVehicle() || v->vehstatus.Test(VehState::Crashed)) return nullptr;
-
-	RoadVehicle *rv = RoadVehicle::From(v);
-	/* Don't add ones not in a road stop */
-	if (rv->state < RVSB_IN_ROAD_STOP) return nullptr;
-
-	/* Do not add duplicates! */
-	for (const auto &it : rserh->vehicles) {
-		if (rv == it) return nullptr;
-	}
-
-	rserh->vehicles.push_back(rv);
-	return nullptr;
-}
-
 /**
  * Get the DiagDirection for entering the drive through stop from the given 'side' (east or west) on the given axis.
  * @param east Enter from the east when true or from the west when false.
@@ -364,23 +322,32 @@ static DiagDirection GetEntryDirection(bool east, Axis axis)
  */
 void RoadStop::Entry::Rebuild(const RoadStop *rs, int side)
 {
-	assert(HasBit(rs->status, RSSFB_BASE_ENTRY));
+	assert(rs->status.Test(RoadStopStatusFlag::BaseEntry));
 
 	Axis axis = GetDriveThroughStopAxis(rs->xy);
-	if (side == -1) side = (rs->east == this);
+	if (side == -1) side = (&rs->entries->east == this);
 
-	RoadStopEntryRebuilderHelper rserh;
-	rserh.dir = GetEntryDirection(side, axis);
+	auto entry_dir = GetEntryDirection(side, axis);
+	std::vector<const RoadVehicle *> vehicles;
 
 	this->length = 0;
 	TileIndexDiff offset = TileOffsByAxis(axis);
 	for (TileIndex tile = rs->xy; IsDriveThroughRoadStopContinuation(rs->xy, tile); tile += offset) {
 		this->length += TILE_SIZE;
-		FindVehicleOnPos(tile, &rserh, FindVehiclesInRoadStop);
+		for (const Vehicle *v : VehiclesOnTile(tile)) {
+			/* Not a RV or not in the right direction or crashed :( */
+			if (v->type != VEH_ROAD || DirToDiagDir(v->direction) != entry_dir || !v->IsPrimaryVehicle() || v->vehstatus.Test(VehState::Crashed)) continue;
+
+			const RoadVehicle *rv = RoadVehicle::From(v);
+			/* Don't add ones not in a road stop */
+			if (rv->state < RVSB_IN_ROAD_STOP) continue;
+
+			include(vehicles, rv);
+		}
 	}
 
 	this->occupied = 0;
-	for (const auto &it : rserh.vehicles) {
+	for (const auto &it : vehicles) {
 		this->occupied += it->gcache.cached_total_length;
 	}
 }
@@ -392,13 +359,13 @@ void RoadStop::Entry::Rebuild(const RoadStop *rs, int side)
  */
 void RoadStop::Entry::CheckIntegrity(const RoadStop *rs) const
 {
-	if (!HasBit(rs->status, RSSFB_BASE_ENTRY)) return;
+	if (!rs->status.Test(RoadStopStatusFlag::BaseEntry)) return;
 
 	/* The tile 'before' the road stop must not be part of this 'line' */
 	assert(IsDriveThroughStopTile(rs->xy));
 	assert(!IsDriveThroughRoadStopContinuation(rs->xy, rs->xy - TileOffsByAxis(GetDriveThroughStopAxis(rs->xy))));
 
 	Entry temp;
-	temp.Rebuild(rs, rs->east == this);
+	temp.Rebuild(rs, &rs->entries->east == this);
 	if (temp.length != this->length || temp.occupied != this->occupied) NOT_REACHED();
 }
diff --git a/src/roadstop_base.h b/src/roadstop_base.h
index 6dc957286d..dc48ae527e 100644
--- a/src/roadstop_base.h
+++ b/src/roadstop_base.h
@@ -20,27 +20,23 @@ extern RoadStopPool _roadstop_pool;
 
 /** A Stop for a Road Vehicle */
 struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
-	enum RoadStopStatusFlags : uint8_t {
-		RSSFB_BAY0_FREE  = 0, ///< Non-zero when bay 0 is free
-		RSSFB_BAY1_FREE  = 1, ///< Non-zero when bay 1 is free
-		RSSFB_BASE_ENTRY = 6, ///< Non-zero when the entries on this road stop are the primary, i.e. the ones to delete
-		RSSFB_ENTRY_BUSY = 7, ///< Non-zero when roadstop entry is busy
+	enum class RoadStopStatusFlag : uint8_t {
+		Bay0Free  = 0, ///< Non-zero when bay 0 is free
+		Bay1Free  = 1, ///< Non-zero when bay 1 is free
+		BaseEntry = 6, ///< Non-zero when the entries on this road stop are the primary, i.e. the ones to delete
+		EntryBusy = 7, ///< Non-zero when roadstop entry is busy
 	};
-
-	static constexpr uint8_t BAY_COUNT = 2; ///< Max. number of bays
+	using RoadStopStatusFlags = EnumBitSet<RoadStopStatusFlag, uint8_t>;
 
 	/** Container for each entry point of a drive through road stop */
 	struct Entry {
 	private:
-		int length = 0; ///< The length of the stop in tile 'units'
-		int occupied = 0; ///< The amount of occupied stop in tile 'units'
+		uint16_t length = 0; ///< The length of the stop in tile 'units'
+		uint16_t occupied = 0; ///< The amount of occupied stop in tile 'units'
 
 	public:
 		friend struct RoadStop; ///< Oh yeah, the road stop may play with me.
 
-		/** Create an entry */
-		Entry() {}
-
 		/**
 		 * Get the length of this drive through stop.
 		 * @return the length in tile units.
@@ -65,15 +61,18 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 		void Rebuild(const RoadStop *rs, int side = -1);
 	};
 
-	uint8_t status = 0; ///< Current status of the Stop, @see RoadStopSatusFlag. Access using *Bay and *Busy functions.
+	/** Container for both east and west entry points. */
+	struct Entries {
+		Entry east{}; ///< Information for vehicles that entered from the east
+		Entry west{}; ///< Information for vehicles that entered from the west
+	};
+
+	RoadStopStatusFlags status{RoadStopStatusFlag::Bay0Free, RoadStopStatusFlag::Bay1Free}; ///< Current status of the Stop. Access using *Bay and *Busy functions.
 	TileIndex xy = INVALID_TILE; ///< Position on the map
 	RoadStop *next = nullptr; ///< Next stop of the given type at this station
 
 	/** Initializes a RoadStop */
-	inline RoadStop(TileIndex tile = INVALID_TILE) :
-		status((1 << BAY_COUNT) - 1),
-		xy(tile)
-	{ }
+	inline RoadStop(TileIndex tile = INVALID_TILE) : xy(tile) { }
 
 	~RoadStop();
 
@@ -83,7 +82,7 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	 */
 	inline bool HasFreeBay() const
 	{
-		return GB(this->status, 0, BAY_COUNT) != 0;
+		return this->status.Any({RoadStopStatusFlag::Bay0Free, RoadStopStatusFlag::Bay1Free});
 	}
 
 	/**
@@ -93,8 +92,11 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	 */
 	inline bool IsFreeBay(uint nr) const
 	{
-		assert(nr < BAY_COUNT);
-		return HasBit(this->status, nr);
+		switch (nr) {
+			case 0: return this->status.Test(RoadStopStatusFlag::Bay0Free);
+			case 1: return this->status.Test(RoadStopStatusFlag::Bay1Free);
+			default: NOT_REACHED();
+		}
 	}
 
 	/**
@@ -103,7 +105,7 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	 */
 	inline bool IsEntranceBusy() const
 	{
-		return HasBit(this->status, RSSFB_ENTRY_BUSY);
+		return this->status.Test(RoadStopStatusFlag::EntryBusy);
 	}
 
 	/**
@@ -112,7 +114,7 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	 */
 	inline void SetEntranceBusy(bool busy)
 	{
-		SB(this->status, RSSFB_ENTRY_BUSY, 1, busy);
+		this->status.Set(RoadStopStatusFlag::EntryBusy, busy);
 	}
 
 	/**
@@ -120,9 +122,9 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	 * @param dir The direction to get the entry for.
 	 * @return the entry
 	 */
-	inline const Entry *GetEntry(DiagDirection dir) const
+	inline const Entry &GetEntry(DiagDirection dir) const
 	{
-		return HasBit((int)dir, 1) ? this->west : this->east;
+		return dir >= DIAGDIR_SW ? this->entries->west : this->entries->east;
 	}
 
 	/**
@@ -130,9 +132,9 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	 * @param dir The direction to get the entry for.
 	 * @return the entry
 	 */
-	inline Entry *GetEntry(DiagDirection dir)
+	inline Entry &GetEntry(DiagDirection dir)
 	{
-		return HasBit((int)dir, 1) ? this->west : this->east;
+		return dir >= DIAGDIR_SW ? this->entries->west : this->entries->east;
 	}
 
 	void MakeDriveThrough();
@@ -148,8 +150,7 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 	static bool IsDriveThroughRoadStopContinuation(TileIndex rs, TileIndex next);
 
 private:
-	Entry *east = nullptr; ///< The vehicles that entered from the east
-	Entry *west = nullptr; ///< The vehicles that entered from the west
+	Entries *entries = nullptr; ///< Information about available and allocated bays.
 
 	/**
 	 * Allocates a bay
@@ -160,11 +161,11 @@ private:
 	{
 		assert(this->HasFreeBay());
 
-		/* Find the first free bay. If the bit is set, the bay is free. */
+		/* Find the first free bay. */
 		uint bay_nr = 0;
-		while (!HasBit(this->status, bay_nr)) bay_nr++;
+		while (!this->IsFreeBay(bay_nr)) ++bay_nr;
 
-		ClrBit(this->status, bay_nr);
+		this->AllocateDriveThroughBay(bay_nr);
 		return bay_nr;
 	}
 
@@ -174,8 +175,11 @@ private:
 	 */
 	inline void AllocateDriveThroughBay(uint nr)
 	{
-		assert(nr < BAY_COUNT);
-		ClrBit(this->status, nr);
+		switch (nr) {
+			case 0: this->status.Reset(RoadStopStatusFlag::Bay0Free); break;
+			case 1: this->status.Reset(RoadStopStatusFlag::Bay1Free); break;
+			default: NOT_REACHED();
+		}
 	}
 
 	/**
@@ -184,8 +188,11 @@ private:
 	 */
 	inline void FreeBay(uint nr)
 	{
-		assert(nr < BAY_COUNT);
-		SetBit(this->status, nr);
+		switch (nr) {
+			case 0: this->status.Set(RoadStopStatusFlag::Bay0Free); break;
+			case 1: this->status.Set(RoadStopStatusFlag::Bay1Free); break;
+			default: NOT_REACHED();
+		}
 	}
 };
 
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 069c4fbbb7..e3564f0991 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -37,6 +37,7 @@
 #include "framerate_type.h"
 #include "roadveh_cmd.h"
 #include "road_cmd.h"
+#include "newgrf_roadstop.h"
 
 #include "table/strings.h"
 
@@ -106,7 +107,7 @@ static void GetRoadVehIcon(EngineID engine, EngineImageType image_type, VehicleS
 	const Engine *e = Engine::Get(engine);
 	uint8_t spritenum = e->u.road.image_index;
 
-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleIcon(engine, DIR_W, image_type, result);
 		if (result->IsValid()) return;
 
@@ -121,8 +122,9 @@ void RoadVehicle::GetImage(Direction direction, EngineImageType image_type, Vehi
 {
 	uint8_t spritenum = this->spritenum;
 
-	if (is_custom_sprite(spritenum)) {
-		GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(spritenum)), image_type, result);
+	if (IsCustomVehicleSpriteNum(spritenum)) {
+		if (spritenum == CUSTOM_VEHICLE_SPRITENUM_REVERSED) direction = ReverseDir(direction);
+		GetCustomVehicleSprite(this, direction, image_type, result);
 		if (result->IsValid()) return;
 
 		spritenum = this->GetEngine()->original_image_index;
@@ -509,22 +511,6 @@ static bool RoadVehIsCrashed(RoadVehicle *v)
 	return true;
 }
 
-/**
- * Check routine whether a road and a train vehicle have collided.
- * @param v    %Train vehicle to test.
- * @param data Road vehicle to test.
- * @return %Train vehicle if the vehicles collided, else \c nullptr.
- */
-static Vehicle *EnumCheckRoadVehCrashTrain(Vehicle *v, void *data)
-{
-	const Vehicle *u = (Vehicle*)data;
-
-	return (v->type == VEH_TRAIN &&
-			abs(v->z_pos - u->z_pos) <= 6 &&
-			abs(v->x_pos - u->x_pos) <= 4 &&
-			abs(v->y_pos - u->y_pos) <= 4) ? v : nullptr;
-}
-
 uint RoadVehicle::Crash(bool flooded)
 {
 	uint victims = this->GroundVehicleBase::Crash(flooded);
@@ -567,7 +553,9 @@ static bool RoadVehCheckTrainCrash(RoadVehicle *v)
 
 		if (!IsLevelCrossingTile(tile)) continue;
 
-		if (HasVehicleOnPosXY(v->x_pos, v->y_pos, u, EnumCheckRoadVehCrashTrain)) {
+		if (HasVehicleNearTileXY(v->x_pos, v->y_pos, 4, [&u](const Vehicle *t) {
+				return t->type == VEH_TRAIN && abs(t->z_pos - u->z_pos) <= 6;
+			})) {
 			RoadVehCrash(v);
 			return true;
 		}
@@ -610,25 +598,23 @@ struct RoadVehFindData {
 	Direction dir;
 };
 
-static Vehicle *EnumCheckRoadVehClose(Vehicle *v, void *data)
+static void FindClosestBlockingRoadVeh(Vehicle *v, RoadVehFindData *rvf)
 {
 	static const int8_t dist_x[] = { -4, -8, -4, -1, 4, 8, 4, 1 };
 	static const int8_t dist_y[] = { -4, -1, 4, 8, 4, 1, -4, -8 };
 
-	RoadVehFindData *rvf = (RoadVehFindData*)data;
-
 	int x_diff = v->x_pos - rvf->x;
 	int y_diff = v->y_pos - rvf->y;
 
 	/* Not a close Road vehicle when it's not a road vehicle, in the depot, or ourself. */
-	if (v->type != VEH_ROAD || v->IsInDepot() || rvf->veh->First() == v->First()) return nullptr;
+	if (v->type != VEH_ROAD || v->IsInDepot() || rvf->veh->First() == v->First()) return;
 
 	/* Not close when at a different height or when going in a different direction. */
-	if (abs(v->z_pos - rvf->veh->z_pos) >= 6 || v->direction != rvf->dir) return nullptr;
+	if (abs(v->z_pos - rvf->veh->z_pos) >= 6 || v->direction != rvf->dir) return;
 
 	/* We 'return' the closest vehicle, in distance and then VehicleID as tie-breaker. */
 	uint diff = abs(x_diff) + abs(y_diff);
-	if (diff > rvf->best_diff || (diff == rvf->best_diff && v->index > rvf->best->index)) return nullptr;
+	if (diff > rvf->best_diff || (diff == rvf->best_diff && v->index > rvf->best->index)) return;
 
 	auto IsCloseOnAxis = [](int dist, int diff) {
 		if (dist < 0) return diff > dist && diff <= 0;
@@ -639,8 +625,6 @@ static Vehicle *EnumCheckRoadVehClose(Vehicle *v, void *data)
 		rvf->best = v;
 		rvf->best_diff = diff;
 	}
-
-	return nullptr;
 }
 
 static RoadVehicle *RoadVehFindCloseTo(RoadVehicle *v, int x, int y, Direction dir, bool update_blocked_ctr = true)
@@ -657,10 +641,16 @@ static RoadVehicle *RoadVehFindCloseTo(RoadVehicle *v, int x, int y, Direction d
 	rvf.best_diff = UINT_MAX;
 
 	if (front->state == RVSB_WORMHOLE) {
-		FindVehicleOnPos(v->tile, &rvf, EnumCheckRoadVehClose);
-		FindVehicleOnPos(GetOtherTunnelBridgeEnd(v->tile), &rvf, EnumCheckRoadVehClose);
+		for (Vehicle *u : VehiclesOnTile(v->tile)) {
+			FindClosestBlockingRoadVeh(u, &rvf);
+		}
+		for (Vehicle *u : VehiclesOnTile(GetOtherTunnelBridgeEnd(v->tile))) {
+			FindClosestBlockingRoadVeh(u, &rvf);
+		}
 	} else {
-		FindVehicleOnPosXY(x, y, &rvf, EnumCheckRoadVehClose);
+		for (Vehicle *u : VehiclesNearTileXY(x, y, 8)) {
+			FindClosestBlockingRoadVeh(u, &rvf);
+		}
 	}
 
 	/* This code protects a roadvehicle from being blocked for ever
@@ -765,13 +755,6 @@ struct OvertakeData {
 	Trackdir trackdir;
 };
 
-static Vehicle *EnumFindVehBlockingOvertake(Vehicle *v, void *data)
-{
-	const OvertakeData *od = (OvertakeData*)data;
-
-	return (v->type == VEH_ROAD && v->First() == v && v != od->u && v != od->v) ? v : nullptr;
-}
-
 /**
  * Check if overtaking is possible on a piece of track
  *
@@ -790,7 +773,9 @@ static bool CheckRoadBlockedForOvertaking(OvertakeData *od)
 	if (!HasBit(trackdirbits, od->trackdir) || (trackbits & ~TRACK_BIT_CROSS) || (red_signals != TRACKDIR_BIT_NONE)) return true;
 
 	/* Are there more vehicles on the tile except the two vehicles involved in overtaking */
-	return HasVehicleOnPos(od->tile, od, EnumFindVehBlockingOvertake);
+	return HasVehicleOnTile(od->tile, [&](const Vehicle *v) {
+		return v->type == VEH_ROAD && v->First() == v && v != od->u && v != od->v;
+	});
 }
 
 static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u)
@@ -1162,7 +1147,7 @@ bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *prev)
 			}
 		}
 
-		if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
+		if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && VehicleEnterTile(v, gp.new_tile, gp.x, gp.y).Test(VehicleEnterTileState::EnteredWormhole)) {
 			/* Vehicle has just entered a bridge or tunnel */
 			v->x_pos = gp.x;
 			v->y_pos = gp.y;
@@ -1282,8 +1267,8 @@ again:
 			}
 		}
 
-		uint32_t r = VehicleEnterTile(v, tile, x, y);
-		if (HasBit(r, VETS_CANNOT_ENTER)) {
+		auto vets = VehicleEnterTile(v, tile, x, y);
+		if (vets.Test(VehicleEnterTileState::CannotEnter)) {
 			if (!IsTileType(tile, MP_TUNNELBRIDGE)) {
 				v->cur_speed = 0;
 				return false;
@@ -1319,7 +1304,7 @@ again:
 			}
 		}
 
-		if (!HasBit(r, VETS_ENTERED_WORMHOLE)) {
+		if (!vets.Test(VehicleEnterTileState::EnteredWormhole)) {
 			TileIndex old_tile = v->tile;
 
 			v->tile = tile;
@@ -1397,8 +1382,8 @@ again:
 			}
 		}
 
-		uint32_t r = VehicleEnterTile(v, v->tile, x, y);
-		if (HasBit(r, VETS_CANNOT_ENTER)) {
+		auto vets = VehicleEnterTile(v, v->tile, x, y);
+		if (vets.Test(VehicleEnterTileState::CannotEnter)) {
 			v->cur_speed = 0;
 			return false;
 		}
@@ -1453,6 +1438,8 @@ again:
 				v->last_station_visited = st->index;
 				RoadVehArrivesAt(v, st);
 				v->BeginLoading();
+				TriggerRoadStopRandomisation(st, v->tile, StationRandomTrigger::VehicleArrives);
+				TriggerRoadStopAnimation(st, v->tile, StationAnimationTrigger::VehicleArrives);
 			}
 			return false;
 		}
@@ -1515,6 +1502,8 @@ again:
 			if (IsDriveThroughStopTile(v->tile) || (v->current_order.IsType(OT_GOTO_STATION) && v->current_order.GetDestination() == st->index)) {
 				RoadVehArrivesAt(v, st);
 				v->BeginLoading();
+				TriggerRoadStopRandomisation(st, v->tile, StationRandomTrigger::VehicleArrives);
+				TriggerRoadStopAnimation(st, v->tile, StationAnimationTrigger::VehicleArrives);
 				return false;
 			}
 		} else {
@@ -1535,8 +1524,8 @@ again:
 
 	/* Check tile position conditions - i.e. stop position in depot,
 	 * entry onto bridge or into tunnel */
-	uint32_t r = VehicleEnterTile(v, v->tile, x, y);
-	if (HasBit(r, VETS_CANNOT_ENTER)) {
+	auto vets = VehicleEnterTile(v, v->tile, x, y);
+	if (vets.Test(VehicleEnterTileState::CannotEnter)) {
 		v->cur_speed = 0;
 		return false;
 	}
@@ -1547,7 +1536,7 @@ again:
 
 	/* Move to next frame unless vehicle arrived at a stop position
 	 * in a depot or entered a tunnel/bridge */
-	if (!HasBit(r, VETS_ENTERED_WORMHOLE)) v->frame++;
+	if (!vets.Test(VehicleEnterTileState::EnteredWormhole)) v->frame++;
 	v->x_pos = x;
 	v->y_pos = y;
 	v->UpdatePosition();
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp
index 4a98d58dfa..b7fedf2495 100644
--- a/src/roadveh_gui.cpp
+++ b/src/roadveh_gui.cpp
@@ -152,6 +152,6 @@ void DrawRoadVehImage(const Vehicle *v, const Rect &r, VehicleID selection, Engi
 	if (v->index == selection) {
 		int height = ScaleSpriteTrad(12);
 		Rect hr = {(rtl ? px : 0), 0, (rtl ? max_width : px) - 1, height - 1};
-		DrawFrameRect(hr.Translate(r.left, CenterBounds(r.top, r.bottom, height)).Expand(WidgetDimensions::scaled.bevel), COLOUR_WHITE, FrameFlag::BorderOnly);
+		DrawFrameRect(hr.Translate(r.left, CentreBounds(r.top, r.bottom, height)).Expand(WidgetDimensions::scaled.bevel), COLOUR_WHITE, FrameFlag::BorderOnly);
 	}
 }
diff --git a/src/safeguards.h b/src/safeguards.h
index ba8ab24eb5..c8bf2d2e0e 100644
--- a/src/safeguards.h
+++ b/src/safeguards.h
@@ -21,31 +21,60 @@
 #define calloc    SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define realloc   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
-/* Use std::string instead. */
+/* Use std::string/std::string_view instead. */
 #define strdup    SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define strndup   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
-/* Use strecpy instead. */
 #define strcpy    SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define strncpy   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
-/* Use std::string concatenation/fmt::format instead. */
 #define strcat    SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define strncat   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
-/* Use fmt::format instead. */
 #define sprintf   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define snprintf  SAFEGUARD_DO_NOT_USE_THIS_METHOD
-
-/* Use fmt::format instead. */
 #define vsprintf  SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define vsnprintf SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
+#define strcmp SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define strncmp SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#ifdef strcasecmp
+#undef strcasecmp
+#endif
+#define strcasecmp SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#ifdef stricmp
+#undef stricmp
+#endif
+#define stricmp SAFEGUARD_DO_NOT_USE_THIS_METHOD
+
+#define memcmp SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define memcpy SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define memmove SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define memset SAFEGUARD_DO_NOT_USE_THIS_METHOD
+
 /* Use fgets instead. */
 #define gets      SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
-/* No clear replacement. */
+/* Use StringConsumer instead. */
 #define strtok    SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define sscanf    SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define from_string SAFEGUARD_DO_NOT_USE_THIS_METHOD
+
+/* Use ParseInteger or StringConsumer instead. */
+#define atoi      SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define atol      SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define atoll     SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define strtol    SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define strtoll   SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define strtoul   SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define strtoull  SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stoi      SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stol      SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stoll     SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stoul     SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stoull    SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stoimax   SAFEGUARD_DO_NOT_USE_THIS_METHOD
+#define stoumax   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
 /* Use fmt::print instead. */
 #define printf    SAFEGUARD_DO_NOT_USE_THIS_METHOD
@@ -54,6 +83,9 @@
 #define fputs     SAFEGUARD_DO_NOT_USE_THIS_METHOD
 #define putchar   SAFEGUARD_DO_NOT_USE_THIS_METHOD
 
+/* Use fmt::format instead */
+#define to_string SAFEGUARD_DO_NOT_USE_THIS_METHOD
+
 /* Use our own templated implementation instead of a macro or function with only one type. */
 #ifdef min
 #undef min
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 23de2d9de1..4e6899ea36 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -76,6 +76,7 @@
 #include "../safeguards.h"
 
 extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = CompanyID::Invalid());
+extern void ClearOldOrders();
 
 /**
  * Makes a tile canal or water depending on the surroundings.
@@ -256,7 +257,7 @@ static void InitializeWindowsAndCaches()
 		/* For each company, verify (while loading a scenario) that the inauguration date is the current year and set it
 		 * accordingly if it is not the case.  No need to set it on companies that are not been used already,
 		 * thus the MIN_YEAR (which is really nothing more than Zero, initialized value) test */
-		if (_file_to_saveload.abstract_ftype == FT_SCENARIO && c->inaugurated_year != EconomyTime::MIN_YEAR) {
+		if (_file_to_saveload.ftype.abstract == FT_SCENARIO && c->inaugurated_year != EconomyTime::MIN_YEAR) {
 			c->inaugurated_year = TimerGameEconomy::year;
 		}
 	}
@@ -383,11 +384,11 @@ static void CDECL HandleSavegameLoadCrash(int signum)
 		for (const auto &c : _grfconfig) {
 			if (c->flags.Test(GRFConfigFlag::Compatible)) {
 				const GRFIdentifier &replaced = _gamelog.GetOverriddenIdentifier(*c);
-				fmt::format_to(std::back_inserter(message), "NewGRF {:08X} (checksum {}) not found.\n  Loaded NewGRF \"{}\" (checksum {}) with same GRF ID instead.\n",
+				format_append(message, "NewGRF {:08X} (checksum {}) not found.\n  Loaded NewGRF \"{}\" (checksum {}) with same GRF ID instead.\n",
 						std::byteswap(c->ident.grfid), FormatArrayAsHex(c->original_md5sum), c->filename, FormatArrayAsHex(replaced.md5sum));
 			}
 			if (c->status == GCS_NOT_FOUND) {
-				fmt::format_to(std::back_inserter(message), "NewGRF {:08X} ({}) not found; checksum {}.\n",
+				format_append(message, "NewGRF {:08X} ({}) not found; checksum {}.\n",
 						std::byteswap(c->ident.grfid), c->filename, FormatArrayAsHex(c->ident.md5sum));
 			}
 		}
@@ -575,6 +576,9 @@ bool AfterLoadGame()
 	 * that otherwise won't exist in the tree. */
 	RebuildViewportKdtree();
 
+	/* Group hierarchy may be evaluated during conversion, so ensure its correct early on. */
+	UpdateGroupChildren();
+
 	if (IsSavegameVersionBefore(SLV_98)) _gamelog.GRFAddList(_grfconfig);
 
 	if (IsSavegameVersionBefore(SLV_119)) {
@@ -815,6 +819,9 @@ bool AfterLoadGame()
 	/* Update all vehicles: Phase 1 */
 	AfterLoadVehiclesPhase1(true);
 
+	/* Old orders are no longer needed. */
+	ClearOldOrders();
+
 	/* make sure there is a town in the game */
 	if (_game_mode == GM_NORMAL && Town::GetNumItems() == 0) {
 		SetSaveLoadError(STR_ERROR_NO_TOWN_IN_SCENARIO);
@@ -1482,8 +1489,10 @@ bool AfterLoadGame()
 
 	/* Setting no refit flags to all orders in savegames from before refit in orders were added */
 	if (IsSavegameVersionBefore(SLV_36)) {
-		for (Order *order : Order::Iterate()) {
-			order->SetRefit(CARGO_NO_REFIT);
+		for (OrderList *orderlist : OrderList::Iterate()) {
+			for (Order &order : orderlist->GetOrders()) {
+				order.SetRefit(CARGO_NO_REFIT);
+			}
 		}
 
 		for (Vehicle *v : Vehicle::Iterate()) {
@@ -1778,25 +1787,31 @@ bool AfterLoadGame()
 
 	if (IsSavegameVersionBefore(SLV_93)) {
 		/* Rework of orders. */
-		for (Order *order : Order::Iterate()) order->ConvertFromOldSavegame();
+		for (OrderList *orderlist : OrderList::Iterate()) {
+			for (Order &o : orderlist->GetOrders()) {
+				o.ConvertFromOldSavegame();
+			}
+		}
 
 		for (Vehicle *v : Vehicle::Iterate()) {
-			if (v->orders != nullptr && v->orders->GetFirstOrder() != nullptr && v->orders->GetFirstOrder()->IsType(OT_NOTHING)) {
+			if (v->orders != nullptr && v->GetFirstOrder() != nullptr && v->GetFirstOrder()->IsType(OT_NOTHING)) {
 				v->orders->FreeChain();
 				v->orders = nullptr;
 			}
 
 			v->current_order.ConvertFromOldSavegame();
 			if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->FirstShared() == v) {
-				for (Order *order : v->Orders()) order->SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
+				for (Order &order : v->Orders()) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
 			}
 		}
 	} else if (IsSavegameVersionBefore(SLV_94)) {
 		/* Unload and transfer are now mutual exclusive. */
-		for (Order *order : Order::Iterate()) {
-			if ((order->GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) {
-				order->SetUnloadType(OUFB_TRANSFER);
-				order->SetLoadType(OLFB_NO_LOAD);
+		for (OrderList *orderlist : OrderList::Iterate()) {
+			for (Order &order : orderlist->GetOrders()) {
+				if ((order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) {
+					order.SetUnloadType(OUFB_TRANSFER);
+					order.SetLoadType(OLFB_NO_LOAD);
+				}
 			}
 		}
 
@@ -1808,9 +1823,11 @@ bool AfterLoadGame()
 		}
 	} else if (IsSavegameVersionBefore(SLV_DEPOT_UNBUNCHING)) {
 		/* OrderDepotActionFlags were moved, instead of starting at bit 4 they now start at bit 3. */
-		for (Order *order : Order::Iterate()) {
-			if (!order->IsType(OT_GOTO_DEPOT)) continue;
-			order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() >> 1));
+		for (OrderList *orderlist : OrderList::Iterate()) {
+			for (Order &order : orderlist->GetOrders()) {
+				if (!order.IsType(OT_GOTO_DEPOT)) continue;
+				order.SetDepotActionType((OrderDepotActionFlags)(order.GetDepotActionType() >> 1));
+			}
 		}
 
 		for (Vehicle *v : Vehicle::Iterate()) {
@@ -2172,8 +2189,10 @@ bool AfterLoadGame()
 
 	/* Trains could now stop in a specific location. */
 	if (IsSavegameVersionBefore(SLV_117)) {
-		for (Order *o : Order::Iterate()) {
-			if (o->IsType(OT_GOTO_STATION)) o->SetStopLocation(OSL_PLATFORM_FAR_END);
+		for (OrderList *orderlist : OrderList::Iterate()) {
+			for (Order &o : orderlist->GetOrders()) {
+				if (o.IsType(OT_GOTO_STATION)) o.SetStopLocation(OSL_PLATFORM_FAR_END);
+			}
 		}
 	}
 
@@ -2655,9 +2674,9 @@ bool AfterLoadGame()
 	if (IsSavegameVersionBefore(SLV_156)) {
 		/* The train's pathfinder lost flag got moved. */
 		for (Train *t : Train::Iterate()) {
-			if (!HasBit(t->flags, 5)) continue;
+			if (!t->flags.Test(VehicleRailFlag{5})) continue;
 
-			ClrBit(t->flags, 5);
+			t->flags.Reset(VehicleRailFlag{5});
 			t->vehicle_flags.Set(VehicleFlag::PathfinderLost);
 		}
 
@@ -2696,8 +2715,8 @@ bool AfterLoadGame()
 					 * It was changed in savegame version 139, but savegame
 					 * version 158 doesn't use these bits, so it doesn't hurt
 					 * to clear them unconditionally. */
-					ClrBit(t->flags, 1);
-					ClrBit(t->flags, 2);
+					t->flags.Reset(VehicleRailFlag{1});
+					t->flags.Reset(VehicleRailFlag{2});
 
 					/* Clear both bits first. */
 					ClrBit(t->gv_flags, GVF_GOINGUP_BIT);
@@ -2898,7 +2917,7 @@ bool AfterLoadGame()
 
 	if (IsSavegameVersionBefore(SLV_165)) {
 		/* Adjust zoom level to account for new levels */
-		_saved_scrollpos_zoom = static_cast<ZoomLevel>(_saved_scrollpos_zoom + ZOOM_BASE_SHIFT);
+		_saved_scrollpos_zoom += ZOOM_BASE_SHIFT;
 		_saved_scrollpos_x *= ZOOM_BASE;
 		_saved_scrollpos_y *= ZOOM_BASE;
 	}
@@ -3051,11 +3070,11 @@ bool AfterLoadGame()
 	}
 
 	if (IsSavegameVersionBefore(SLV_190)) {
-		for (Order *order : Order::Iterate()) {
-			order->SetTravelTimetabled(order->GetTravelTime() > 0);
-			order->SetWaitTimetabled(order->GetWaitTime() > 0);
-		}
 		for (OrderList *orderlist : OrderList::Iterate()) {
+			for (Order &order : orderlist->GetOrders()) {
+				order.SetTravelTimetabled(order.GetTravelTime() > 0);
+				order.SetWaitTimetabled(order.GetWaitTime() > 0);
+			}
 			orderlist->RecalculateTimetableDuration();
 		}
 	}
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp
index 2b80659d47..810f977fdf 100644
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -246,8 +246,8 @@ struct CompanyOldAI {
 
 class SlCompanyOldAIBuildRec : public DefaultSaveLoadHandler<SlCompanyOldAIBuildRec, CompanyOldAI> {
 public:
-	inline static const SaveLoad description[] = {{}}; // Needed to keep DefaultSaveLoadHandler happy.
-	inline const static SaveLoadCompatTable compat_description = _company_old_ai_buildrec_compat;
+	static inline const SaveLoad description[] = {{}}; // Needed to keep DefaultSaveLoadHandler happy.
+	static inline const SaveLoadCompatTable compat_description = _company_old_ai_buildrec_compat;
 
 	SaveLoadTable GetDescription() const override { return {}; }
 
@@ -263,11 +263,11 @@ public:
 
 class SlCompanyOldAI : public DefaultSaveLoadHandler<SlCompanyOldAI, CompanyProperties> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(CompanyOldAI, num_build_rec, SLE_UINT8, SL_MIN_VERSION, SLV_107),
 		SLEG_STRUCTLIST("buildrec", SlCompanyOldAIBuildRec),
 	};
-	inline const static SaveLoadCompatTable compat_description = _company_old_ai_compat;
+	static inline const SaveLoadCompatTable compat_description = _company_old_ai_compat;
 
 	void Load(CompanyProperties *c) const override
 	{
@@ -282,7 +282,7 @@ public:
 
 class SlCompanySettings : public DefaultSaveLoadHandler<SlCompanySettings, CompanyProperties> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		/* Engine renewal settings */
 		SLE_CONDREF(CompanyProperties, engine_renew_list,            REF_ENGINE_RENEWS,   SLV_19, SL_MAX_VERSION),
 		SLE_CONDVAR(CompanyProperties, settings.engine_renew,        SLE_BOOL,            SLV_16, SL_MAX_VERSION),
@@ -297,7 +297,7 @@ public:
 		SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_aircraft,  SLE_UINT16,     SLV_120, SL_MAX_VERSION),
 		SLE_CONDVAR(CompanyProperties, settings.vehicle.servint_ships,     SLE_UINT16,     SLV_120, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _company_settings_compat;
+	static inline const SaveLoadCompatTable compat_description = _company_settings_compat;
 
 	void Save(CompanyProperties *c) const override
 	{
@@ -319,7 +319,7 @@ public:
 
 class SlCompanyEconomy : public DefaultSaveLoadHandler<SlCompanyEconomy, CompanyProperties> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(CompanyEconomyEntry, income,              SLE_FILE_I32 | SLE_VAR_I64, SL_MIN_VERSION, SLV_2),
 		SLE_CONDVAR(CompanyEconomyEntry, income,              SLE_INT64,                  SLV_2, SL_MAX_VERSION),
 		SLE_CONDVAR(CompanyEconomyEntry, expenses,            SLE_FILE_I32 | SLE_VAR_I64, SL_MIN_VERSION, SLV_2),
@@ -332,7 +332,7 @@ public:
 		SLE_CONDARR(CompanyEconomyEntry, delivered_cargo,     SLE_UINT32, NUM_CARGO,    SLV_EXTEND_CARGOTYPES, SL_MAX_VERSION),
 		    SLE_VAR(CompanyEconomyEntry, performance_history, SLE_INT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _company_economy_compat;
+	static inline const SaveLoadCompatTable compat_description = _company_economy_compat;
 
 	void Save(CompanyProperties *c) const override
 	{
@@ -379,12 +379,12 @@ public:
 
 class SlCompanyLiveries : public DefaultSaveLoadHandler<SlCompanyLiveries, CompanyProperties> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(Livery, in_use,  SLE_UINT8, SLV_34, SL_MAX_VERSION),
 		SLE_CONDVAR(Livery, colour1, SLE_UINT8, SLV_34, SL_MAX_VERSION),
 		SLE_CONDVAR(Livery, colour2, SLE_UINT8, SLV_34, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _company_liveries_compat;
+	static inline const SaveLoadCompatTable compat_description = _company_liveries_compat;
 
 	/**
 	 * Get the number of liveries used by this savegame version.
@@ -426,7 +426,7 @@ public:
 
 		if (IsSavegameVersionBefore(SLV_85)) {
 			/* We want to insert some liveries somewhere in between. This means some have to be moved. */
-			memmove(&c->livery[LS_FREIGHT_WAGON], &c->livery[LS_PASSENGER_WAGON_MONORAIL], (LS_END - LS_FREIGHT_WAGON) * sizeof(c->livery[0]));
+			std::move_backward(&c->livery[LS_FREIGHT_WAGON - 2], &c->livery[LS_END - 2], &c->livery[LS_END]);
 			c->livery[LS_PASSENGER_WAGON_MONORAIL] = c->livery[LS_MONORAIL];
 			c->livery[LS_PASSENGER_WAGON_MAGLEV]   = c->livery[LS_MAGLEV];
 		}
@@ -447,10 +447,10 @@ public:
 		std::string key;
 	};
 
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_SSTR(KeyWrapper, key, SLE_STR),
 	};
-	inline const static SaveLoadCompatTable compat_description = {};
+	static inline const SaveLoadCompatTable compat_description = {};
 
 	std::vector<std::string> &GetVector(CompanyProperties *cprops) const override { return cprops->allow_list; }
 
diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp
index 3c7e07fa36..8be236866d 100644
--- a/src/saveload/engine_sl.cpp
+++ b/src/saveload/engine_sl.cpp
@@ -41,7 +41,7 @@ static const SaveLoad _engine_desc[] = {
 	SLE_CONDSSTR(Engine, name,                SLE_STR,                    SLV_84, SL_MAX_VERSION),
 };
 
-static ReferenceThroughBaseContainer<std::vector<Engine>> _temp_engine;
+static TypedIndexContainer<std::vector<Engine>, EngineID> _temp_engine;
 
 Engine *GetTempDataEngine(EngineID index)
 {
@@ -134,7 +134,7 @@ struct ENGSChunkHandler : ChunkHandler {
 	{
 		/* Load old separate String ID list into a temporary array. This
 		 * was always 256 entries. */
-		ReferenceThroughBaseContainer<std::array<StringID, 256>> names{};
+		TypedIndexContainer<std::array<StringID, 256>, EngineID> names{};
 
 		SlCopy(names.data(), std::size(names), SLE_STRINGID);
 
diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp
index af9512c22b..d6a35ffa20 100644
--- a/src/saveload/game_sl.cpp
+++ b/src/saveload/game_sl.cpp
@@ -113,17 +113,17 @@ struct GSDTChunkHandler : ChunkHandler {
 	}
 };
 
-extern std::shared_ptr<GameStrings> _current_data;
+extern std::shared_ptr<GameStrings> _current_gamestrings_data;
 
 static std::string _game_saveload_string;
 static uint32_t _game_saveload_strings;
 
 class SlGameLanguageString : public DefaultSaveLoadHandler<SlGameLanguageString, LanguageStrings> {
 public:
-	inline static const SaveLoad description[] = {
-		SLEG_SSTR("string", _game_saveload_string, SLE_STR | SLF_ALLOW_CONTROL),
+	static inline const SaveLoad description[] = {
+		SLEG_SSTR("string", _game_saveload_string, SLE_STR | SLF_ALLOW_CONTROL | SLF_REPLACE_TABCRLF),
 	};
-	inline const static SaveLoadCompatTable compat_description = _game_language_string_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _game_language_string_sl_compat;
 
 	void Save(LanguageStrings *ls) const override
 	{
@@ -159,21 +159,21 @@ struct GSTRChunkHandler : ChunkHandler {
 	{
 		const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_language_desc, _game_language_sl_compat);
 
-		_current_data = std::make_shared<GameStrings>();
+		_current_gamestrings_data = std::make_shared<GameStrings>();
 
 		while (SlIterateArray() != -1) {
 			LanguageStrings ls;
 			SlObject(&ls, slt);
-			_current_data->raw_strings.push_back(std::move(ls));
+			_current_gamestrings_data->raw_strings.push_back(std::move(ls));
 		}
 
 		/* If there were no strings in the savegame, set GameStrings to nullptr */
-		if (_current_data->raw_strings.empty()) {
-			_current_data.reset();
+		if (_current_gamestrings_data->raw_strings.empty()) {
+			_current_gamestrings_data.reset();
 			return;
 		}
 
-		_current_data->Compile();
+		_current_gamestrings_data->Compile();
 		ReconsiderGameScriptLanguage();
 	}
 
@@ -181,11 +181,11 @@ struct GSTRChunkHandler : ChunkHandler {
 	{
 		SlTableHeader(_game_language_desc);
 
-		if (_current_data == nullptr) return;
+		if (_current_gamestrings_data == nullptr) return;
 
-		for (uint i = 0; i < _current_data->raw_strings.size(); i++) {
+		for (uint i = 0; i < _current_gamestrings_data->raw_strings.size(); i++) {
 			SlSetArrayIndex(i);
-			SlObject(&_current_data->raw_strings[i], _game_language_desc);
+			SlObject(&_current_gamestrings_data->raw_strings[i], _game_language_desc);
 		}
 	}
 };
diff --git a/src/saveload/gamelog_sl.cpp b/src/saveload/gamelog_sl.cpp
index fe85af5727..c0c904ae6a 100644
--- a/src/saveload/gamelog_sl.cpp
+++ b/src/saveload/gamelog_sl.cpp
@@ -21,11 +21,11 @@
 
 class SlGamelogMode : public DefaultSaveLoadHandler<SlGamelogMode, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeMode, mode,      "mode.mode",      SLE_UINT8),
 		SLE_VARNAME(LoggedChangeMode, landscape, "mode.landscape", SLE_UINT8),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_mode_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_mode_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -47,14 +47,14 @@ public:
 	static const size_t GAMELOG_REVISION_LENGTH = 15;
 	static char revision_text[GAMELOG_REVISION_LENGTH];
 
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLEG_CONDARR("revision.text", SlGamelogRevision::revision_text,   SLE_UINT8, GAMELOG_REVISION_LENGTH, SL_MIN_VERSION,     SLV_STRING_GAMELOG),
 		SLE_CONDSSTRNAME(LoggedChangeRevision, text,     "revision.text",     SLE_STR,                            SLV_STRING_GAMELOG, SL_MAX_VERSION),
 		     SLE_VARNAME(LoggedChangeRevision, newgrf,   "revision.newgrf",   SLE_UINT32),
 		     SLE_VARNAME(LoggedChangeRevision, slver,    "revision.slver",    SLE_UINT16),
 		     SLE_VARNAME(LoggedChangeRevision, modified, "revision.modified", SLE_UINT8),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_revision_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_revision_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -79,11 +79,11 @@ public:
 
 class SlGamelogOldver : public DefaultSaveLoadHandler<SlGamelogOldver, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeOldVersion, type,    "oldver.type",    SLE_UINT32),
 		SLE_VARNAME(LoggedChangeOldVersion, version, "oldver.version", SLE_UINT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_oldver_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_oldver_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -102,12 +102,12 @@ public:
 
 class SlGamelogSetting : public DefaultSaveLoadHandler<SlGamelogSetting, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_SSTRNAME(LoggedChangeSettingChanged, name,   "setting.name",   SLE_STR),
 		 SLE_VARNAME(LoggedChangeSettingChanged, oldval, "setting.oldval", SLE_INT32),
 		 SLE_VARNAME(LoggedChangeSettingChanged, newval, "setting.newval", SLE_INT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_setting_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_setting_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -126,11 +126,11 @@ public:
 
 class SlGamelogGrfadd : public DefaultSaveLoadHandler<SlGamelogGrfadd, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeGRFAdd, grfid,  "grfadd.grfid",  SLE_UINT32    ),
 		SLE_ARRNAME(LoggedChangeGRFAdd, md5sum, "grfadd.md5sum", SLE_UINT8,  16),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_grfadd_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_grfadd_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -149,10 +149,10 @@ public:
 
 class SlGamelogGrfrem : public DefaultSaveLoadHandler<SlGamelogGrfrem, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeGRFRemoved, grfid, "grfrem.grfid", SLE_UINT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_grfrem_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_grfrem_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -171,11 +171,11 @@ public:
 
 class SlGamelogGrfcompat : public DefaultSaveLoadHandler<SlGamelogGrfcompat, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeGRFChanged, grfid,  "grfcompat.grfid",  SLE_UINT32    ),
 		SLE_ARRNAME(LoggedChangeGRFChanged, md5sum, "grfcompat.md5sum", SLE_UINT8,  16),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_grfcompat_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_grfcompat_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -194,10 +194,10 @@ public:
 
 class SlGamelogGrfparam : public DefaultSaveLoadHandler<SlGamelogGrfparam, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeGRFParameterChanged, grfid, "grfparam.grfid", SLE_UINT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_grfparam_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_grfparam_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -216,11 +216,11 @@ public:
 
 class SlGamelogGrfmove : public DefaultSaveLoadHandler<SlGamelogGrfmove, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeGRFMoved, grfid,  "grfmove.grfid",  SLE_UINT32),
 		SLE_VARNAME(LoggedChangeGRFMoved, offset, "grfmove.offset", SLE_INT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_grfmove_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_grfmove_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -239,12 +239,12 @@ public:
 
 class SlGamelogGrfbug : public DefaultSaveLoadHandler<SlGamelogGrfbug, LoggedChange> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VARNAME(LoggedChangeGRFBug, data,  "grfbug.data",  SLE_UINT64),
 		SLE_VARNAME(LoggedChangeGRFBug, grfid, "grfbug.grfid", SLE_UINT32),
 		SLE_VARNAME(LoggedChangeGRFBug, bug,   "grfbug.bug",   SLE_UINT8),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_grfbug_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_grfbug_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -266,10 +266,10 @@ static bool _is_emergency_save = true;
 class SlGamelogEmergency : public DefaultSaveLoadHandler<SlGamelogEmergency, LoggedChange> {
 public:
 	/* We need to store something, so store a "true" value. */
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLEG_CONDVAR("is_emergency_save", _is_emergency_save, SLE_BOOL, SLV_RIFF_TO_ARRAY, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_emergency_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_emergency_sl_compat;
 
 	void Save(LoggedChange *lc) const override
 	{
@@ -312,7 +312,7 @@ static std::unique_ptr<LoggedChange> MakeLoggedChange(GamelogChangeType type)
 
 class SlGamelogAction : public DefaultSaveLoadHandler<SlGamelogAction, LoggedAction> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_SAVEBYTE(LoggedChange, ct),
 		SLEG_STRUCT("mode", SlGamelogMode),
 		SLEG_STRUCT("revision", SlGamelogRevision),
@@ -326,7 +326,7 @@ public:
 		SLEG_STRUCT("grfbug", SlGamelogGrfbug),
 		SLEG_STRUCT("emergency", SlGamelogEmergency),
 	};
-	inline const static SaveLoadCompatTable compat_description = _gamelog_action_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _gamelog_action_sl_compat;
 
 	void Save(LoggedAction *la) const override
 	{
diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp
index 17b61c5b8b..750a729136 100644
--- a/src/saveload/industry_sl.cpp
+++ b/src/saveload/industry_sl.cpp
@@ -21,12 +21,12 @@ static OldPersistentStorage _old_ind_persistent_storage;
 
 class SlIndustryAccepted : public VectorSaveLoadHandler<SlIndustryAccepted, Industry, Industry::AcceptedCargo, INDUSTRY_NUM_INPUTS> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		 SLE_VAR(Industry::AcceptedCargo, cargo, SLE_UINT8),
 		 SLE_VAR(Industry::AcceptedCargo, waiting, SLE_UINT16),
 		 SLE_VAR(Industry::AcceptedCargo, last_accepted, SLE_INT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = _industry_accepts_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _industry_accepts_sl_compat;
 
 	std::vector<Industry::AcceptedCargo> &GetVector(Industry *i) const override { return i->accepted; }
 
@@ -45,11 +45,11 @@ public:
 
 class SlIndustryProducedHistory : public DefaultSaveLoadHandler<SlIndustryProducedHistory, Industry::ProducedCargo> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		 SLE_VAR(Industry::ProducedHistory, production, SLE_UINT16),
 		 SLE_VAR(Industry::ProducedHistory, transported, SLE_UINT16),
 	};
-	inline const static SaveLoadCompatTable compat_description = _industry_produced_history_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _industry_produced_history_sl_compat;
 
 	void Save(Industry::ProducedCargo *p) const override
 	{
@@ -79,13 +79,13 @@ public:
 
 class SlIndustryProduced : public VectorSaveLoadHandler<SlIndustryProduced, Industry, Industry::ProducedCargo, INDUSTRY_NUM_OUTPUTS> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		 SLE_VAR(Industry::ProducedCargo, cargo, SLE_UINT8),
 		 SLE_VAR(Industry::ProducedCargo, waiting, SLE_UINT16),
 		 SLE_VAR(Industry::ProducedCargo, rate, SLE_UINT8),
 		SLEG_STRUCTLIST("history", SlIndustryProducedHistory),
 	};
-	inline const static SaveLoadCompatTable compat_description = _industry_produced_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _industry_produced_sl_compat;
 
 	std::vector<Industry::ProducedCargo> &GetVector(Industry *i) const override { return i->produced; }
 
@@ -220,7 +220,7 @@ struct INDYChunkHandler : ChunkHandler {
 			if (IsSavegameVersionBefore(SLV_161) && !IsSavegameVersionBefore(SLV_76)) {
 				/* Store the old persistent storage. The GRFID will be added later. */
 				assert(PersistentStorage::CanAllocateItem());
-				i->psa = new PersistentStorage(0, 0, TileIndex{});
+				i->psa = new PersistentStorage(0, GSF_INVALID, TileIndex{});
 				std::copy(std::begin(_old_ind_persistent_storage.storage), std::end(_old_ind_persistent_storage.storage), std::begin(i->psa->storage));
 			}
 			if (IsSavegameVersionBefore(SLV_EXTEND_INDUSTRY_CARGO_SLOTS)) {
@@ -228,7 +228,7 @@ struct INDYChunkHandler : ChunkHandler {
 			} else if (IsSavegameVersionBefore(SLV_INDUSTRY_CARGO_REORGANISE)) {
 				LoadMoveAcceptsProduced(i, INDUSTRY_NUM_INPUTS, INDUSTRY_NUM_OUTPUTS);
 			}
-			Industry::industries[i->type].push_back(i->index); // Assume savegame indices are sorted.
+			Industry::industries[i->type].insert(i->index);
 		}
 	}
 
diff --git a/src/saveload/linkgraph_sl.cpp b/src/saveload/linkgraph_sl.cpp
index 793eaa1298..00533f4afc 100644
--- a/src/saveload/linkgraph_sl.cpp
+++ b/src/saveload/linkgraph_sl.cpp
@@ -30,7 +30,7 @@ static NodeID _linkgraph_from; ///< Contains the current "from" node being saved
 
 class SlLinkgraphEdge : public DefaultSaveLoadHandler<SlLinkgraphEdge, Node> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLE_VAR(Edge, capacity,                 SLE_UINT32),
 		    SLE_VAR(Edge, usage,                    SLE_UINT32),
 		SLE_CONDVAR(Edge, travel_time_sum,          SLE_UINT64, SLV_LINKGRAPH_TRAVEL_TIME, SL_MAX_VERSION),
@@ -39,7 +39,7 @@ public:
 		    SLE_VAR(Edge, dest_node,                SLE_UINT16),
 		SLE_CONDVARNAME(Edge, dest_node, "next_edge", SLE_UINT16, SL_MIN_VERSION, SLV_LINKGRAPH_EDGES),
 	};
-	inline const static SaveLoadCompatTable compat_description = _linkgraph_edge_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _linkgraph_edge_sl_compat;
 
 	void Save(Node *bn) const override
 	{
@@ -95,7 +95,7 @@ public:
 
 class SlLinkgraphNode : public DefaultSaveLoadHandler<SlLinkgraphNode, LinkGraph> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(Node, xy,          SLE_UINT32, SLV_191, SL_MAX_VERSION),
 		    SLE_VAR(Node, supply,      SLE_UINT32),
 		    SLE_VAR(Node, demand,      SLE_UINT32),
@@ -103,7 +103,7 @@ public:
 		    SLE_VAR(Node, last_update, SLE_INT32),
 		SLEG_STRUCTLIST("edges", SlLinkgraphEdge),
 	};
-	inline const static SaveLoadCompatTable compat_description = _linkgraph_node_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _linkgraph_node_sl_compat;
 
 	void Save(LinkGraph *lg) const override
 	{
@@ -153,9 +153,9 @@ SaveLoadTable GetLinkGraphDesc()
  */
 class SlLinkgraphJobProxy : public DefaultSaveLoadHandler<SlLinkgraphJobProxy, LinkGraphJob> {
 public:
-	inline static const SaveLoad description[] = {{}}; // Needed to keep DefaultSaveLoadHandler happy.
+	static inline const SaveLoad description[] = {{}}; // Needed to keep DefaultSaveLoadHandler happy.
 	SaveLoadTable GetDescription() const override { return GetLinkGraphDesc(); }
-	inline const static SaveLoadCompatTable compat_description = _linkgraph_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _linkgraph_sl_compat;
 
 	void Save(LinkGraphJob *lgj) const override
 	{
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index 78b160314f..4094211f88 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -43,7 +43,7 @@ void SaveViewportBeforeSaveGame()
 		/* Ensure saved position is clearly invalid. */
 		_saved_scrollpos_x = INT_MAX;
 		_saved_scrollpos_y = INT_MAX;
-		_saved_scrollpos_zoom = ZOOM_LVL_END;
+		_saved_scrollpos_zoom = ZoomLevel::End;
 	} else {
 		_saved_scrollpos_x = w->viewport->scrollpos_x;
 		_saved_scrollpos_y = w->viewport->scrollpos_y;
@@ -61,12 +61,12 @@ void ResetViewportAfterLoadGame()
 	w->viewport->dest_scrollpos_y = _saved_scrollpos_y;
 
 	Viewport &vp = *w->viewport;
-	vp.zoom = std::min(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
+	vp.zoom = std::min(_saved_scrollpos_zoom, ZoomLevel::Max);
 	vp.virtual_width = ScaleByZoom(vp.width, vp.zoom);
 	vp.virtual_height = ScaleByZoom(vp.height, vp.zoom);
 
-	/* If zoom_max is ZOOM_LVL_MIN then the setting has not been loaded yet, therefore all levels are allowed. */
-	if (_settings_client.gui.zoom_max != ZOOM_LVL_MIN) {
+	/* If zoom_max is ZoomLevel::Min then the setting has not been loaded yet, therefore all levels are allowed. */
+	if (_settings_client.gui.zoom_max != ZoomLevel::Min) {
 		/* Ensure zoom level is allowed */
 		while (vp.zoom < _settings_client.gui.zoom_min) DoZoomInOutWindow(ZOOM_OUT, w);
 		while (vp.zoom > _settings_client.gui.zoom_max) DoZoomInOutWindow(ZOOM_IN, w);
diff --git a/src/saveload/newgrf_sl.h b/src/saveload/newgrf_sl.h
index ee6fe98ad3..78a058bc25 100644
--- a/src/saveload/newgrf_sl.h
+++ b/src/saveload/newgrf_sl.h
@@ -11,6 +11,7 @@
 #define SAVELOAD_NEWGRF_SL_H
 
 #include "../newgrf_commons.h"
+#include "saveload.h"
 
 struct NewGRFMappingChunkHandler : ChunkHandler {
 	OverrideManagerBase &mapping;
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index 01c1d600a3..5361a000e1 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -231,7 +231,7 @@ static std::tuple<SavegameType, std::string> DetermineOldSavegameTypeAndName(Fil
 
 typedef bool LoadOldMainProc(LoadgameState &ls);
 
-bool LoadOldSaveGame(const std::string &file)
+bool LoadOldSaveGame(std::string_view file)
 {
 	LoadgameState ls{};
 
@@ -282,7 +282,7 @@ bool LoadOldSaveGame(const std::string &file)
 	return true;
 }
 
-std::string GetOldSaveGameName(const std::string &file)
+std::string GetOldSaveGameName(std::string_view file)
 {
 	auto f = FioFOpenFile(file, "rb", NO_DIRECTORY);
 	if (!f.has_value()) return {};
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index f6956f49f3..46585f0eab 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -108,10 +108,12 @@ static void FixTTDDepots()
 	}
 }
 
-#define FIXNUM(x, y, z) (((((x) << 16) / (y)) + 1) << z)
-
 static uint32_t RemapOldTownName(uint32_t townnameparts, uint8_t old_town_name_type)
 {
+	auto fix_num = [](uint32_t i, uint32_t n, uint8_t s) -> uint32_t {
+		return ((i << 16) / n + 1) << s;
+	};
+
 	switch (old_town_name_type) {
 		case 0: case 3: // English, American
 			/* Already OK */
@@ -120,7 +122,7 @@ static uint32_t RemapOldTownName(uint32_t townnameparts, uint8_t old_town_name_t
 		case 1: // French
 			/* For some reason 86 needs to be subtracted from townnameparts
 			 * 0000 0000 0000 0000 0000 0000 1111 1111 */
-			return FIXNUM(townnameparts - 86, lengthof(_name_french_real), 0);
+			return fix_num(townnameparts - 86, lengthof(_name_french_real), 0);
 
 		case 2: // German
 			Debug(misc, 0, "German Townnames are buggy ({})", townnameparts);
@@ -128,19 +130,17 @@ static uint32_t RemapOldTownName(uint32_t townnameparts, uint8_t old_town_name_t
 
 		case 4: // Latin-American
 			/* 0000 0000 0000 0000 0000 0000 1111 1111 */
-			return FIXNUM(townnameparts, lengthof(_name_spanish_real), 0);
+			return fix_num(townnameparts, lengthof(_name_spanish_real), 0);
 
 		case 5: // Silly
 			/* NUM_SILLY_1 - lower 16 bits
 			 * NUM_SILLY_2 - upper 16 bits without leading 1 (first 8 bytes)
 			 * 1000 0000 2222 2222 0000 0000 1111 1111 */
-			return FIXNUM(townnameparts, lengthof(_name_silly_1), 0) | FIXNUM(GB(townnameparts, 16, 8), lengthof(_name_silly_2), 16);
+			return fix_num(townnameparts, lengthof(_name_silly_1), 0) | fix_num(GB(townnameparts, 16, 8), lengthof(_name_silly_2), 16);
 	}
 	return 0;
 }
 
-#undef FIXNUM
-
 static void FixOldTowns()
 {
 	/* Convert town-names if needed */
@@ -643,16 +643,14 @@ static bool LoadOldOrder(LoadgameState &ls, int num)
 {
 	if (!LoadChunk(ls, nullptr, order_chunk)) return false;
 
-	Order *o = new (OrderID(num)) Order();
-	o->AssignOrder(UnpackOldOrder(_old_order));
+	OldOrderSaveLoadItem &o = AllocateOldOrder(num);
+	o.order.AssignOrder(UnpackOldOrder(_old_order));
 
-	if (o->IsType(OT_NOTHING)) {
-		delete o;
-	} else {
+	if (!o.order.IsType(OT_NOTHING) && num > 0) {
 		/* Relink the orders to each other (in the orders for one vehicle are behind each other,
 		 * with an invalid order (OT_NOTHING) as indication that it is the last order */
-		Order *prev = Order::GetIfValid(num - 1);
-		if (prev != nullptr) prev->next = o;
+		OldOrderSaveLoadItem *prev = GetOldOrder(num + 1 - 1);
+		if (prev != nullptr) prev->next = num + 1; // next is 1-based.
 	}
 
 	return true;
@@ -875,7 +873,7 @@ static bool LoadOldIndustry(LoadgameState &ls, int num)
 			i->random_colour = RemapTTOColour(i->random_colour);
 		}
 
-		Industry::industries[i->type].push_back(i->index); // Assume savegame indices are sorted.
+		Industry::industries[i->type].insert(i->index);
 	} else {
 		delete i;
 	}
@@ -1364,7 +1362,7 @@ bool LoadOldVehicle(LoadgameState &ls, int num)
 		if (_old_order_ptr != 0 && _old_order_ptr != 0xFFFFFFFF) {
 			uint max = _savegame_type == SGT_TTO ? 3000 : 5000;
 			uint old_id = RemapOrderIndex(_old_order_ptr);
-			if (old_id < max) v->old_orders = Order::Get(old_id); // don't accept orders > max number of orders
+			if (old_id < max) v->old_orders = old_id + 1;
 		}
 		v->current_order.AssignOrder(UnpackOldOrder(_old_order));
 
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp
index 4d84ba9c7a..2e1ecaea76 100644
--- a/src/saveload/order_sl.cpp
+++ b/src/saveload/order_sl.cpp
@@ -102,35 +102,61 @@ Order UnpackOldOrder(uint16_t packed)
 	return order;
 }
 
+/** Temporary storage for conversion from old order pool. */
+static std::vector<OldOrderSaveLoadItem> _old_order_saveload_pool;
+
+/**
+ * Clear all old orders.
+ */
+void ClearOldOrders()
+{
+	_old_order_saveload_pool.clear();
+	_old_order_saveload_pool.shrink_to_fit();
+}
+
+/**
+ * Get a pointer to an old order with the given reference index.
+ * @param ref_index Reference index (one-based) to get.
+ * @return Pointer to old order, or nullptr if not present.
+ */
+OldOrderSaveLoadItem *GetOldOrder(size_t ref_index)
+{
+	if (ref_index == 0) return nullptr;
+	assert(ref_index <= _old_order_saveload_pool.size());
+	return &_old_order_saveload_pool[ref_index - 1];
+}
+
+/**
+ * Allocate an old order with the given pool index.
+ * @param pool_index Pool index (zero-based) to allocate.
+ * @return Reference to allocated old order.
+ */
+OldOrderSaveLoadItem &AllocateOldOrder(size_t pool_index)
+{
+	assert(pool_index < UINT32_MAX);
+	if (pool_index >= _old_order_saveload_pool.size()) _old_order_saveload_pool.resize(pool_index + 1);
+	return _old_order_saveload_pool[pool_index];
+}
+
 SaveLoadTable GetOrderDescription()
 {
 	static const SaveLoad _order_desc[] = {
-		     SLE_VAR(Order, type,           SLE_UINT8),
-		     SLE_VAR(Order, flags,          SLE_UINT8),
-		     SLE_VAR(Order, dest,           SLE_UINT16),
-		     SLE_REF(Order, next,           REF_ORDER),
-		 SLE_CONDVAR(Order, refit_cargo,    SLE_UINT8,   SLV_36, SL_MAX_VERSION),
-		 SLE_CONDVAR(Order, wait_time,      SLE_UINT16,  SLV_67, SL_MAX_VERSION),
-		 SLE_CONDVAR(Order, travel_time,    SLE_UINT16,  SLV_67, SL_MAX_VERSION),
-		 SLE_CONDVAR(Order, max_speed,      SLE_UINT16, SLV_172, SL_MAX_VERSION),
+		     SLE_VARNAME(OldOrderSaveLoadItem, order.type,  "type",  SLE_UINT8),
+		     SLE_VARNAME(OldOrderSaveLoadItem, order.flags, "flags", SLE_UINT8),
+		     SLE_VARNAME(OldOrderSaveLoadItem, order.dest,  "dest",  SLE_UINT16),
+		 SLE_CONDVARNAME(OldOrderSaveLoadItem, next,        "next",  SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_69),
+		 SLE_CONDVARNAME(OldOrderSaveLoadItem, next,        "next",  SLE_UINT32,                 SLV_69, SL_MAX_VERSION),
+		 SLE_CONDVARNAME(OldOrderSaveLoadItem, order.refit_cargo, "refit_cargo", SLE_UINT8,   SLV_36, SL_MAX_VERSION),
+		 SLE_CONDVARNAME(OldOrderSaveLoadItem, order.wait_time,   "wait_time",   SLE_UINT16,  SLV_67, SL_MAX_VERSION),
+		 SLE_CONDVARNAME(OldOrderSaveLoadItem, order.travel_time, "travel_time", SLE_UINT16,  SLV_67, SL_MAX_VERSION),
+		 SLE_CONDVARNAME(OldOrderSaveLoadItem, order.max_speed,   "max_speed",   SLE_UINT16, SLV_172, SL_MAX_VERSION),
 	};
 
 	return _order_desc;
 }
 
 struct ORDRChunkHandler : ChunkHandler {
-	ORDRChunkHandler() : ChunkHandler('ORDR', CH_TABLE) {}
-
-	void Save() const override
-	{
-		const SaveLoadTable slt = GetOrderDescription();
-		SlTableHeader(slt);
-
-		for (Order *order : Order::Iterate()) {
-			SlSetArrayIndex(order->index);
-			SlObject(order, slt);
-		}
-	}
+	ORDRChunkHandler() : ChunkHandler('ORDR', CH_READONLY) {}
 
 	void Load() const override
 	{
@@ -148,8 +174,8 @@ struct ORDRChunkHandler : ChunkHandler {
 				SlCopy(&orders[0], len, SLE_UINT16);
 
 				for (size_t i = 0; i < len; ++i) {
-					Order *o = new (OrderID(static_cast<uint32_t>(i))) Order();
-					o->AssignOrder(UnpackVersion4Order(orders[i]));
+					auto &item = AllocateOldOrder(i);
+					item.order.AssignOrder(UnpackVersion4Order(orders[i]));
 				}
 			} else if (IsSavegameVersionBefore(SLV_5, 2)) {
 				len /= sizeof(uint32_t);
@@ -158,22 +184,19 @@ struct ORDRChunkHandler : ChunkHandler {
 				SlCopy(&orders[0], len, SLE_UINT32);
 
 				for (size_t i = 0; i < len; ++i) {
-					new (OrderID(static_cast<uint32_t>(i))) Order(GB(orders[i], 0, 8), GB(orders[i], 8, 8), GB(orders[i], 16, 16));
+					auto &item = AllocateOldOrder(i);
+					item.order = Order(GB(orders[i], 0, 8), GB(orders[i], 8, 8), GB(orders[i], 16, 16));
 				}
 			}
 
-			/* Update all the next pointer */
-			for (Order *o : Order::Iterate()) {
-				size_t order_index = o->index.base();
-				/* Delete invalid orders */
-				if (o->IsType(OT_NOTHING)) {
-					delete o;
-					continue;
+			/* Update all the next pointer. The orders were built like this:
+			 * While the order is valid, the previous order will get its next pointer set */
+			for (uint32_t num = 1; OldOrderSaveLoadItem item : _old_order_saveload_pool) {
+				if (!item.order.IsType(OT_NOTHING) && num > 1) {
+					OldOrderSaveLoadItem *prev = GetOldOrder(num - 1);
+					if (prev != nullptr) prev->next = num;
 				}
-				/* The orders were built like this:
-				 * While the order is valid, set the previous will get its next pointer set */
-				Order *prev = Order::GetIfValid(order_index - 1);
-				if (prev != nullptr) prev->next = o;
+				++num;
 			}
 		} else {
 			const std::vector<SaveLoad> slt = SlCompatTableHeader(GetOrderDescription(), _order_sl_compat);
@@ -181,27 +204,42 @@ struct ORDRChunkHandler : ChunkHandler {
 			int index;
 
 			while ((index = SlIterateArray()) != -1) {
-				Order *order = new (OrderID(index)) Order();
-				SlObject(order, slt);
+				auto &item = AllocateOldOrder(index);
+				SlObject(&item, slt);
 			}
 		}
 	}
-
-	void FixPointers() const override
-	{
-		/* Orders from old savegames have pointers corrected in Load_ORDR */
-		if (IsSavegameVersionBefore(SLV_5, 2)) return;
-
-		for (Order *o : Order::Iterate()) {
-			SlObject(o, GetOrderDescription());
-		}
-	}
 };
 
+template <typename T>
+class SlOrders : public VectorSaveLoadHandler<SlOrders<T>, T, Order> {
+public:
+	static inline const SaveLoad description[] = {
+		SLE_VAR(Order, type,        SLE_UINT8),
+		SLE_VAR(Order, flags,       SLE_UINT8),
+		SLE_VAR(Order, dest,        SLE_UINT16),
+		SLE_VAR(Order, refit_cargo, SLE_UINT8),
+		SLE_VAR(Order, wait_time,   SLE_UINT16),
+		SLE_VAR(Order, travel_time, SLE_UINT16),
+		SLE_VAR(Order, max_speed,   SLE_UINT16),
+	};
+	static inline const SaveLoadCompatTable compat_description = {};
+
+	std::vector<Order> &GetVector(T *container) const override { return container->orders; }
+
+	void LoadCheck(T *container) const override { this->Load(container); }
+};
+
+/* Instantiate SlOrders classes. */
+template class SlOrders<OrderList>;
+template class SlOrders<OrderBackup>;
+
 SaveLoadTable GetOrderListDescription()
 {
 	static const SaveLoad _orderlist_desc[] = {
-		SLE_REF(OrderList, first,              REF_ORDER),
+		SLE_CONDVARNAME(OrderList, old_order_index, "first", SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_69),
+		SLE_CONDVARNAME(OrderList, old_order_index, "first", SLE_UINT32,                 SLV_69, SLV_ORDERS_OWNED_BY_ORDERLIST),
+		SLEG_CONDSTRUCTLIST("orders", SlOrders<OrderList>, SLV_ORDERS_OWNED_BY_ORDERLIST, SL_MAX_VERSION),
 	};
 
 	return _orderlist_desc;
@@ -228,8 +266,7 @@ struct ORDLChunkHandler : ChunkHandler {
 		int index;
 
 		while ((index = SlIterateArray()) != -1) {
-			/* set num_orders to 0 so it's a valid OrderList */
-			OrderList *list = new (OrderListID(index)) OrderList(0);
+			OrderList *list = new (OrderListID(index)) OrderList();
 			SlObject(list, slt);
 		}
 
@@ -237,8 +274,18 @@ struct ORDLChunkHandler : ChunkHandler {
 
 	void FixPointers() const override
 	{
+		bool migrate_orders = IsSavegameVersionBefore(SLV_ORDERS_OWNED_BY_ORDERLIST);
+
 		for (OrderList *list : OrderList::Iterate()) {
 			SlObject(list, GetOrderListDescription());
+
+			if (migrate_orders) {
+				std::vector<Order> orders;
+				for (OldOrderSaveLoadItem *old_order = GetOldOrder(list->old_order_index); old_order != nullptr; old_order = GetOldOrder(old_order->next)) {
+					orders.push_back(std::move(old_order->order));
+				}
+				list->orders = std::move(orders);
+			}
 		}
 	}
 };
@@ -261,7 +308,9 @@ SaveLoadTable GetOrderBackupDescription()
 		 SLE_CONDVAR(OrderBackup, timetable_start,          SLE_UINT64,                 SLV_TIMETABLE_START_TICKS_FIX, SL_MAX_VERSION),
 		 SLE_CONDVAR(OrderBackup, vehicle_flags,            SLE_FILE_U8 | SLE_VAR_U16, SLV_176, SLV_180),
 		 SLE_CONDVAR(OrderBackup, vehicle_flags,            SLE_UINT16,                SLV_180, SL_MAX_VERSION),
-		     SLE_REF(OrderBackup, orders,                   REF_ORDER),
+		SLE_CONDVARNAME(OrderBackup, old_order_index, "orders", SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_69),
+		SLE_CONDVARNAME(OrderBackup, old_order_index, "orders", SLE_UINT32,                 SLV_69, SLV_ORDERS_OWNED_BY_ORDERLIST),
+		SLEG_CONDSTRUCTLIST("orders", SlOrders<OrderBackup>, SLV_ORDERS_OWNED_BY_ORDERLIST, SL_MAX_VERSION),
 	};
 
 	return _order_backup_desc;
@@ -301,8 +350,18 @@ struct BKORChunkHandler : ChunkHandler {
 
 	void FixPointers() const override
 	{
+		bool migrate_orders = IsSavegameVersionBefore(SLV_ORDERS_OWNED_BY_ORDERLIST);
+
 		for (OrderBackup *ob : OrderBackup::Iterate()) {
 			SlObject(ob, GetOrderBackupDescription());
+
+			if (migrate_orders) {
+				std::vector<Order> orders;
+				for (OldOrderSaveLoadItem *old_order = GetOldOrder(ob->old_order_index); old_order != nullptr; old_order = GetOldOrder(old_order->next)) {
+					orders.push_back(std::move(old_order->order));
+				}
+				ob->orders = std::move(orders);
+			}
 		}
 	}
 };
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 5b743ba20d..f602bd1524 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -30,6 +30,7 @@
 #include "../strings_func.h"
 #include "../core/endian_func.hpp"
 #include "../core/string_builder.hpp"
+#include "../core/string_consumer.hpp"
 #include "../vehicle_base.h"
 #include "../company_func.h"
 #include "../timer/timer_game_economy.h"
@@ -935,13 +936,14 @@ void FixSCCEncoded(std::string &str, bool fix_code)
 	bool in_string = false; // Set if we in a string, between double-quotes.
 	bool need_type = true; // Set if a parameter type needs to be emitted.
 
-	for (auto it = std::begin(str); it != std::end(str); /* nothing */) {
-		size_t len = Utf8EncodedCharLen(*it);
-		if (len == 0 || it + len > std::end(str)) break;
-
+	StringConsumer consumer(str);
+	while (consumer.AnyBytesLeft()) {
 		char32_t c;
-		Utf8Decode(&c, &*it);
-		it += len;
+		if (auto r = consumer.TryReadUtf8(); r.has_value()) {
+			c = *r;
+		} else {
+			break;
+		}
 		if (c == SCC_ENCODED || (fix_code && (c == 0xE028 || c == 0xE02A))) {
 			builder.PutUtf8(SCC_ENCODED);
 			need_type = false;
@@ -979,6 +981,43 @@ void FixSCCEncoded(std::string &str, bool fix_code)
 	str = std::move(result);
 }
 
+/**
+ * Scan the string for SCC_ENCODED_NUMERIC with negative values, and reencode them as uint64_t.
+ * @param str the string to fix.
+ */
+void FixSCCEncodedNegative(std::string &str)
+{
+	if (str.empty()) return;
+
+	StringConsumer consumer(str);
+
+	/* Check whether this is an encoded string */
+	if (!consumer.ReadUtf8If(SCC_ENCODED)) return;
+
+	std::string result;
+	StringBuilder builder(result);
+	builder.PutUtf8(SCC_ENCODED);
+	while (consumer.AnyBytesLeft()) {
+		/* Copy until next record */
+		builder.Put(consumer.ReadUntilUtf8(SCC_RECORD_SEPARATOR, StringConsumer::READ_ONE_SEPARATOR));
+
+		/* Check whether this is a numeric parameter */
+		if (!consumer.ReadUtf8If(SCC_ENCODED_NUMERIC)) continue;
+		builder.PutUtf8(SCC_ENCODED_NUMERIC);
+
+		/* First try unsigned */
+		if (auto u = consumer.TryReadIntegerBase<uint64_t>(16); u.has_value()) {
+			builder.PutIntegerBase<uint64_t>(*u, 16);
+		} else {
+			/* Read as signed, store as unsigned */
+			auto s = consumer.ReadIntegerBase<int64_t>(16);
+			builder.PutIntegerBase<uint64_t>(static_cast<uint64_t>(s), 16);
+		}
+	}
+
+	str = std::move(result);
+}
+
 /**
  * Read the given amount of bytes from the buffer into the string.
  * @param str The string to write to.
@@ -1004,7 +1043,7 @@ static void SlStdString(void *ptr, VarType conv)
 		case SLA_SAVE: {
 			size_t len = str->length();
 			SlWriteArrayLength(len);
-			SlCopyBytes(const_cast<void *>(static_cast<const void *>(str->c_str())), len);
+			SlCopyBytes(const_cast<void *>(static_cast<const void *>(str->data())), len);
 			break;
 		}
 
@@ -1022,10 +1061,14 @@ static void SlStdString(void *ptr, VarType conv)
 			if ((conv & SLF_ALLOW_CONTROL) != 0) {
 				settings.Set(StringValidationSetting::AllowControlCode);
 				if (IsSavegameVersionBefore(SLV_ENCODED_STRING_FORMAT)) FixSCCEncoded(*str, IsSavegameVersionBefore(SLV_169));
+				if (IsSavegameVersionBefore(SLV_FIX_SCC_ENCODED_NEGATIVE)) FixSCCEncodedNegative(*str);
 			}
 			if ((conv & SLF_ALLOW_NEWLINE) != 0) {
 				settings.Set(StringValidationSetting::AllowNewline);
 			}
+			if ((conv & SLF_REPLACE_TABCRLF) != 0) {
+				settings.Set(StringValidationSetting::ReplaceTabCrNlWithSpace);
+			}
 			StrMakeValidInPlace(*str, settings);
 		}
 
@@ -1179,7 +1222,6 @@ static size_t ReferenceToInt(const void *obj, SLRefType rt)
 		case REF_VEHICLE:   return ((const  Vehicle*)obj)->index + 1;
 		case REF_STATION:   return ((const  Station*)obj)->index + 1;
 		case REF_TOWN:      return ((const     Town*)obj)->index + 1;
-		case REF_ORDER:     return ((const    Order*)obj)->index + 1;
 		case REF_ROADSTOPS: return ((const RoadStop*)obj)->index + 1;
 		case REF_ENGINE_RENEWS:  return ((const       EngineRenew*)obj)->index + 1;
 		case REF_CARGO_PACKET:   return ((const       CargoPacket*)obj)->index + 1;
@@ -1225,12 +1267,6 @@ static void *IntToReference(size_t index, SLRefType rt)
 			if (OrderList::IsValidID(index)) return OrderList::Get(index);
 			SlErrorCorrupt("Referencing invalid OrderList");
 
-		case REF_ORDER:
-			if (Order::IsValidID(index)) return Order::Get(index);
-			/* in old versions, invalid order was used to mark end of order list */
-			if (IsSavegameVersionBefore(SLV_5, 2)) return nullptr;
-			SlErrorCorrupt("Referencing invalid Order");
-
 		case REF_VEHICLE_OLD:
 		case REF_VEHICLE:
 			if (Vehicle::IsValidID(index)) return Vehicle::Get(index);
@@ -2514,7 +2550,7 @@ struct NoCompSaveFilter : SaveFilter {
 
 /** Filter using Zlib compression. */
 struct ZlibLoadFilter : LoadFilter {
-	z_stream z;                        ///< Stream state we are reading from.
+	z_stream z{}; ///< Stream state we are reading from.
 	uint8_t fread_buf[MEMORY_CHUNK_SIZE]; ///< Buffer for reading from the file.
 
 	/**
@@ -2523,7 +2559,6 @@ struct ZlibLoadFilter : LoadFilter {
 	 */
 	ZlibLoadFilter(std::shared_ptr<LoadFilter> chain) : LoadFilter(std::move(chain))
 	{
-		memset(&this->z, 0, sizeof(this->z));
 		if (inflateInit(&this->z) != Z_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize decompressor");
 	}
 
@@ -2558,7 +2593,7 @@ struct ZlibLoadFilter : LoadFilter {
 
 /** Filter using Zlib compression. */
 struct ZlibSaveFilter : SaveFilter {
-	z_stream z; ///< Stream state we are writing to.
+	z_stream z{}; ///< Stream state we are writing to.
 	uint8_t fwrite_buf[MEMORY_CHUNK_SIZE]; ///< Buffer for writing to the file.
 
 	/**
@@ -2568,7 +2603,6 @@ struct ZlibSaveFilter : SaveFilter {
 	 */
 	ZlibSaveFilter(std::shared_ptr<SaveFilter> chain, uint8_t compression_level) : SaveFilter(std::move(chain))
 	{
-		memset(&this->z, 0, sizeof(this->z));
 		if (deflateInit(&this->z, compression_level) != Z_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor");
 	}
 
@@ -2751,7 +2785,7 @@ struct LZMASaveFilter : SaveFilter {
 
 /** The format for a reader/writer type of a savegame */
 struct SaveLoadFormat {
-	const char *name;                     ///< name of the compressor/decompressor (debug-only)
+	std::string_view name; ///< name of the compressor/decompressor (debug-only)
 	uint32_t tag;                           ///< the 4-letter tag by which it is identified in the savegame
 
 	std::shared_ptr<LoadFilter> (*init_load)(std::shared_ptr<LoadFilter> chain); ///< Constructor for the load filter.
@@ -2803,7 +2837,7 @@ static const SaveLoadFormat _saveload_formats[] = {
  * @param full_name Name of the savegame format. If empty it picks the first available one
  * @return Pair containing reference to SaveLoadFormat struct giving all characteristics of this type of savegame, and a compression level to use.
  */
-static std::pair<const SaveLoadFormat &, uint8_t> GetSavegameFormat(const std::string &full_name)
+static std::pair<const SaveLoadFormat &, uint8_t> GetSavegameFormat(std::string_view full_name)
 {
 	/* Find default savegame format, the highest one with which files can be written. */
 	auto it = std::find_if(std::rbegin(_saveload_formats), std::rend(_saveload_formats), [](const auto &slf) { return slf.init_write != nullptr; });
@@ -2815,23 +2849,22 @@ static std::pair<const SaveLoadFormat &, uint8_t> GetSavegameFormat(const std::s
 		/* Get the ":..." of the compression level out of the way */
 		size_t separator = full_name.find(':');
 		bool has_comp_level = separator != std::string::npos;
-		const std::string name(full_name, 0, has_comp_level ? separator : full_name.size());
+		std::string_view name = has_comp_level ? full_name.substr(0, separator) : full_name;
 
 		for (const auto &slf : _saveload_formats) {
 			if (slf.init_write != nullptr && name.compare(slf.name) == 0) {
 				if (has_comp_level) {
-					const std::string complevel(full_name, separator + 1);
+					auto complevel = full_name.substr(separator + 1);
 
 					/* Get the level and determine whether all went fine. */
-					size_t processed;
-					long level = std::stol(complevel, &processed, 10);
-					if (processed == 0 || level != Clamp(level, slf.min_compression, slf.max_compression)) {
+					auto level = ParseInteger<uint8_t>(complevel);
+					if (!level.has_value() || *level != Clamp(*level, slf.min_compression, slf.max_compression)) {
 						ShowErrorMessage(
 							GetEncodedString(STR_CONFIG_ERROR),
 							GetEncodedString(STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL, complevel),
 							WL_CRITICAL);
 					} else {
-						return {slf, ClampTo<uint8_t>(level)};
+						return {slf, *level};
 					}
 				}
 				return {slf, slf.default_compression};
@@ -2849,7 +2882,7 @@ static std::pair<const SaveLoadFormat &, uint8_t> GetSavegameFormat(const std::s
 /* actual loader/saver function */
 void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settings);
 extern bool AfterLoadGame();
-extern bool LoadOldSaveGame(const std::string &file);
+extern bool LoadOldSaveGame(std::string_view file);
 
 /**
  * Reset all settings to their default, so any settings missing in the savegame
@@ -2867,11 +2900,14 @@ static void ResetSettings()
 	}
 }
 
+extern void ClearOldOrders();
+
 /**
  * Clear temporary data that is passed between various saveload phases.
  */
 static void ResetSaveloadData()
 {
+	ClearOldOrders();
 	ResetTempEngineData();
 	ClearRailTypeLabelList();
 	ClearRoadTypeLabelList();
@@ -3210,7 +3246,7 @@ SaveOrLoadResult LoadWithFilter(std::shared_ptr<LoadFilter> reader)
  * @param threaded True when threaded saving is allowed
  * @return Return the result of the action. #SL_OK, #SL_ERROR, or #SL_REINIT ("unload" the game)
  */
-SaveOrLoadResult SaveOrLoad(const std::string &filename, SaveLoadOperation fop, DetailedFileType dft, Subdirectory sb, bool threaded)
+SaveOrLoadResult SaveOrLoad(std::string_view filename, SaveLoadOperation fop, DetailedFileType dft, Subdirectory sb, bool threaded)
 {
 	/* An instance of saving is already active, so don't go saving again */
 	if (_sl.saveinprogress && fop == SLO_SAVE && dft == DFT_GAME_FILE && threaded) {
@@ -3368,33 +3404,21 @@ std::string GenerateDefaultSaveName()
 	return filename;
 }
 
-/**
- * Set the mode and file type of the file to save or load based on the type of file entry at the file system.
- * @param ft Type of file entry of the file system.
- */
-void FileToSaveLoad::SetMode(FiosType ft)
-{
-	this->SetMode(SLO_LOAD, GetAbstractFileType(ft), GetDetailedFileType(ft));
-}
-
 /**
  * Set the mode and file type of the file to save or load.
+ * @param ft File type.
  * @param fop File operation being performed.
- * @param aft Abstract file type.
- * @param dft Detailed file type.
  */
-void FileToSaveLoad::SetMode(SaveLoadOperation fop, AbstractFileType aft, DetailedFileType dft)
+void FileToSaveLoad::SetMode(const FiosType &ft, SaveLoadOperation fop)
 {
-	if (aft == FT_INVALID || aft == FT_NONE) {
+	if (ft.abstract == FT_INVALID || ft.abstract == FT_NONE) {
 		this->file_op = SLO_INVALID;
-		this->detail_ftype = DFT_INVALID;
-		this->abstract_ftype = FT_INVALID;
+		this->ftype = FIOS_TYPE_INVALID;
 		return;
 	}
 
 	this->file_op = fop;
-	this->detail_ftype = dft;
-	this->abstract_ftype = aft;
+	this->ftype = ft;
 }
 
 /**
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index b665661d7d..ec78153db1 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -400,6 +400,8 @@ enum SaveLoadVersion : uint16_t {
 	SLV_ENCODED_STRING_FORMAT,              ///< 350  PR#13499 Encoded String format changed.
 	SLV_PROTECT_PLACED_HOUSES,              ///< 351  PR#13270 Houses individually placed by players can be protected from town/AI removal.
 	SLV_SCRIPT_SAVE_INSTANCES,              ///< 352  PR#13556 Scripts are allowed to save instances.
+	SLV_FIX_SCC_ENCODED_NEGATIVE,           ///< 353  PR#14049 Fix encoding of negative parameters.
+	SLV_ORDERS_OWNED_BY_ORDERLIST,          ///< 354  PR#13948 Orders stored in OrderList, pool removed.
 
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 };
@@ -414,13 +416,11 @@ enum SaveOrLoadResult : uint8_t {
 /** Deals with the type of the savegame, independent of extension */
 struct FileToSaveLoad {
 	SaveLoadOperation file_op;       ///< File operation to perform.
-	DetailedFileType detail_ftype;   ///< Concrete file type (PNG, BMP, old save, etc).
-	AbstractFileType abstract_ftype; ///< Abstract type of file (scenario, heightmap, etc).
+	FiosType ftype;                  ///< File type.
 	std::string name;                ///< Name of the file.
 	std::string title;               ///< Internal name of the game.
 
-	void SetMode(FiosType ft);
-	void SetMode(SaveLoadOperation fop, AbstractFileType aft, DetailedFileType dft);
+	void SetMode(const FiosType &ft, SaveLoadOperation fop = SLO_LOAD);
 	void Set(const FiosItem &item);
 };
 
@@ -440,7 +440,7 @@ std::string GenerateDefaultSaveName();
 void SetSaveLoadError(StringID str);
 EncodedString GetSaveLoadErrorType();
 EncodedString GetSaveLoadErrorMessage();
-SaveOrLoadResult SaveOrLoad(const std::string &filename, SaveLoadOperation fop, DetailedFileType dft, Subdirectory sb, bool threaded = true);
+SaveOrLoadResult SaveOrLoad(std::string_view filename, SaveLoadOperation fop, DetailedFileType dft, Subdirectory sb, bool threaded = true);
 void WaitTillSaved();
 void ProcessAsyncSaveFinish();
 void DoExitSave();
@@ -603,7 +603,6 @@ public:
 
 /** Type of reference (#SLE_REF, #SLE_CONDREF). */
 enum SLRefType : uint8_t {
-	REF_ORDER          =  0, ///< Load/save a reference to an order.
 	REF_VEHICLE        =  1, ///< Load/save a reference to a vehicle.
 	REF_STATION        =  2, ///< Load/save a reference to a station.
 	REF_TOWN           =  3, ///< Load/save a reference to a town.
@@ -658,7 +657,7 @@ enum VarTypes : uint16_t {
 	SLE_VAR_NULL  =  9 << 4, ///< useful to write zeros in savegame.
 	SLE_VAR_STR   = 12 << 4, ///< string pointer
 	SLE_VAR_STRQ  = 13 << 4, ///< string pointer enclosed in quotes
-	SLE_VAR_NAME  = 14 << 4, ///< old custom name to be converted to a char pointer
+	SLE_VAR_NAME  = 14 << 4, ///< old custom name to be converted to a string pointer
 	/* 1 more possible memory-primitives */
 
 	/* Shortcut values */
@@ -692,6 +691,7 @@ enum VarTypes : uint16_t {
 	 * Flags directing saving/loading of a variable */
 	SLF_ALLOW_CONTROL   = 1 << 8, ///< Allow control codes in the strings.
 	SLF_ALLOW_NEWLINE   = 1 << 9, ///< Allow new lines in the strings.
+	SLF_REPLACE_TABCRLF = 1 << 10, ///< Replace tabs, cr and lf in the string with spaces.
 };
 
 typedef uint32_t VarType;
diff --git a/src/saveload/settings_sl.cpp b/src/saveload/settings_sl.cpp
index f8f82ae797..75f53ada6b 100644
--- a/src/saveload/settings_sl.cpp
+++ b/src/saveload/settings_sl.cpp
@@ -25,7 +25,7 @@
  */
 void PrepareOldDiffCustom()
 {
-	memset(_old_diff_custom, 0, sizeof(_old_diff_custom));
+	_old_diff_custom.fill(0);
 }
 
 /**
diff --git a/src/saveload/signs_sl.cpp b/src/saveload/signs_sl.cpp
index 698bd9f176..e8c1061374 100644
--- a/src/saveload/signs_sl.cpp
+++ b/src/saveload/signs_sl.cpp
@@ -62,7 +62,7 @@ struct SIGNChunkHandler : ChunkHandler {
 			}
 
 			/* Signs placed in scenario editor shall now be OWNER_DEITY */
-			if (IsSavegameVersionBefore(SLV_171) && si->owner == OWNER_NONE && _file_to_saveload.abstract_ftype == FT_SCENARIO) {
+			if (IsSavegameVersionBefore(SLV_171) && si->owner == OWNER_NONE && _file_to_saveload.ftype.abstract == FT_SCENARIO) {
 				si->owner = OWNER_DEITY;
 			}
 		}
diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp
index 15356140ea..901c939dde 100644
--- a/src/saveload/station_sl.cpp
+++ b/src/saveload/station_sl.cpp
@@ -28,14 +28,14 @@
  * Update the buoy orders to be waypoint orders.
  * @param o the order 'list' to check.
  */
-static void UpdateWaypointOrder(Order *o)
+static void UpdateWaypointOrder(Order &o)
 {
-	if (!o->IsType(OT_GOTO_STATION)) return;
+	if (!o.IsType(OT_GOTO_STATION)) return;
 
-	const Station *st = Station::Get(o->GetDestination().ToStationID());
+	const Station *st = Station::Get(o.GetDestination().ToStationID());
 	if ((st->had_vehicle_of_type & HVOT_WAYPOINT) == 0) return;
 
-	o->MakeGoToWaypoint(o->GetDestination().ToStationID());
+	o.MakeGoToWaypoint(o.GetDestination().ToStationID());
 }
 
 /**
@@ -49,14 +49,14 @@ void MoveBuoysToWaypoints()
 		VehicleType vt = ol->GetFirstSharedVehicle()->type;
 		if (vt != VEH_SHIP && vt != VEH_TRAIN) continue;
 
-		for (Order *o = ol->GetFirstOrder(); o != nullptr; o = o->next) UpdateWaypointOrder(o);
+		for (Order &o : ol->GetOrders()) UpdateWaypointOrder(o);
 	}
 
 	for (Vehicle *v : Vehicle::Iterate()) {
 		VehicleType vt = v->type;
 		if (vt != VEH_SHIP && vt != VEH_TRAIN) continue;
 
-		UpdateWaypointOrder(&v->current_order);
+		UpdateWaypointOrder(v->current_order);
 	}
 
 	/* Now make the stations waypoints */
@@ -149,10 +149,10 @@ void AfterLoadRoadStops()
 	}
 	/* And then rebuild the data in those entries */
 	for (RoadStop *rs : RoadStop::Iterate()) {
-		if (!HasBit(rs->status, RoadStop::RSSFB_BASE_ENTRY)) continue;
+		if (!rs->status.Test(RoadStop::RoadStopStatusFlag::BaseEntry)) continue;
 
-		rs->GetEntry(DIAGDIR_NE)->Rebuild(rs);
-		rs->GetEntry(DIAGDIR_NW)->Rebuild(rs);
+		rs->GetEntry(DIAGDIR_NE).Rebuild(rs);
+		rs->GetEntry(DIAGDIR_NW).Rebuild(rs);
 	}
 }
 
@@ -208,12 +208,12 @@ static void SwapPackets(GoodsEntry *ge)
 template <typename T>
 class SlStationSpecList : public VectorSaveLoadHandler<SlStationSpecList<T>, BaseStation, SpecMapping<T>> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(SpecMapping<T>, grfid,    SLE_UINT32,                SLV_27,                    SL_MAX_VERSION),
 		SLE_CONDVAR(SpecMapping<T>, localidx, SLE_FILE_U8 | SLE_VAR_U16, SLV_27,                    SLV_EXTEND_ENTITY_MAPPING),
 		SLE_CONDVAR(SpecMapping<T>, localidx, SLE_UINT16,                SLV_EXTEND_ENTITY_MAPPING, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _station_spec_list_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_spec_list_sl_compat;
 
 	static inline uint8_t last_num_specs; ///< Number of specs of the last loaded station.
 
@@ -231,11 +231,11 @@ template class SlStationSpecList<RoadStopSpec>;
 
 class SlStationCargo : public DefaultSaveLoadHandler<SlStationCargo, GoodsEntry> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLE_VAR(StationCargoPair, first,  SLE_UINT16),
 		SLE_REFLIST(StationCargoPair, second, REF_CARGO_PACKET),
 	};
-	inline const static SaveLoadCompatTable compat_description = _station_cargo_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_cargo_sl_compat;
 
 	void Save(GoodsEntry *ge) const override
 	{
@@ -277,13 +277,13 @@ public:
 
 class SlStationFlow : public DefaultSaveLoadHandler<SlStationFlow, GoodsEntry> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLE_VAR(FlowSaveLoad, source,     SLE_UINT16),
 		    SLE_VAR(FlowSaveLoad, via,        SLE_UINT16),
 		    SLE_VAR(FlowSaveLoad, share,      SLE_UINT32),
 		SLE_CONDVAR(FlowSaveLoad, restricted, SLE_BOOL, SLV_187, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _station_flow_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_flow_sl_compat;
 
 	void Save(GoodsEntry *ge) const override
 	{
@@ -339,7 +339,7 @@ class SlStationGoods : public DefaultSaveLoadHandler<SlStationGoods, BaseStation
 public:
 	static inline uint cargo_reserved_count;
 
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLEG_CONDVAR("waiting_acceptance", _waiting_acceptance, SLE_UINT16,        SL_MIN_VERSION, SLV_68),
 		 SLE_CONDVAR(GoodsEntry, status,               SLE_UINT8,                  SLV_68, SL_MAX_VERSION),
 		     SLE_VAR(GoodsEntry, time_since_pickup,    SLE_UINT8),
@@ -364,7 +364,7 @@ public:
 		SLEG_CONDSTRUCTLIST("cargo", SlStationCargo,                              SLV_183, SL_MAX_VERSION),
 	};
 
-	inline const static SaveLoadCompatTable compat_description = _station_goods_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_goods_sl_compat;
 
 	/**
 	 * Get the number of cargoes used by this savegame version.
@@ -399,7 +399,7 @@ public:
 		if (IsSavegameVersionBefore(SLV_161) && !IsSavegameVersionBefore(SLV_145) && st->facilities.Test(StationFacility::Airport)) {
 			/* Store the old persistent storage. The GRFID will be added later. */
 			assert(PersistentStorage::CanAllocateItem());
-			st->airport.psa = new PersistentStorage(0, 0, TileIndex{});
+			st->airport.psa = new PersistentStorage(0, GSF_INVALID, TileIndex{});
 			std::copy(std::begin(_old_st_persistent_storage.storage), std::end(_old_st_persistent_storage.storage), std::begin(st->airport.psa->storage));
 		}
 
@@ -490,7 +490,7 @@ static const SaveLoad _old_station_desc[] = {
 
 	/* Used by newstations for graphic variations */
 	SLE_CONDVAR(Station, random_bits,                SLE_UINT16,                 SLV_27, SL_MAX_VERSION),
-	SLE_CONDVAR(Station, waiting_triggers,           SLE_UINT8,                  SLV_27, SL_MAX_VERSION),
+	SLE_CONDVARNAME(Station, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SLV_27, SL_MAX_VERSION),
 	SLEG_CONDVAR("num_specs", SlStationSpecList<StationSpec>::last_num_specs, SLE_UINT8, SLV_27, SL_MAX_VERSION),
 
 	SLE_CONDREFLIST(Station, loading_vehicles,       REF_VEHICLE,                SLV_57, SL_MAX_VERSION),
@@ -534,12 +534,12 @@ struct STNSChunkHandler : ChunkHandler {
 
 class SlRoadStopTileData : public VectorSaveLoadHandler<SlRoadStopTileData, BaseStation, RoadStopTileData> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 	    SLE_VAR(RoadStopTileData, tile,            SLE_UINT32),
 	    SLE_VAR(RoadStopTileData, random_bits,     SLE_UINT8),
 	    SLE_VAR(RoadStopTileData, animation_frame, SLE_UINT8),
 	};
-	inline const static SaveLoadCompatTable compat_description = {};
+	static inline const SaveLoadCompatTable compat_description = {};
 
 	std::vector<RoadStopTileData> &GetVector(BaseStation *bst) const override { return bst->custom_roadstop_tile_data; }
 };
@@ -550,7 +550,7 @@ public:
  */
 class SlStationBase : public DefaultSaveLoadHandler<SlStationBase, BaseStation> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLE_VAR(BaseStation, xy,                     SLE_UINT32),
 		    SLE_REF(BaseStation, town,                   REF_TOWN),
 		    SLE_VAR(BaseStation, string_id,              SLE_STRINGID),
@@ -562,10 +562,10 @@ public:
 
 		/* Used by newstations for graphic variations */
 		    SLE_VAR(BaseStation, random_bits,            SLE_UINT16),
-		    SLE_VAR(BaseStation, waiting_triggers,       SLE_UINT8),
+		    SLE_VARNAME(BaseStation, waiting_random_triggers, "waiting_triggers", SLE_UINT8),
 	   SLEG_CONDVAR("num_specs", SlStationSpecList<StationSpec>::last_num_specs, SLE_UINT8, SL_MIN_VERSION, SLV_SAVELOAD_LIST_LENGTH),
 	};
-	inline const static SaveLoadCompatTable compat_description = _station_base_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_base_sl_compat;
 
 	void Save(BaseStation *bst) const override
 	{
@@ -588,7 +588,7 @@ public:
  */
 class SlStationNormal : public DefaultSaveLoadHandler<SlStationNormal, BaseStation> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLEG_STRUCT("base", SlStationBase),
 		    SLE_VAR(Station, train_station.tile,         SLE_UINT32),
 		    SLE_VAR(Station, train_station.w,            SLE_FILE_U8 | SLE_VAR_U16),
@@ -624,7 +624,7 @@ public:
 		SLEG_CONDSTRUCTLIST("speclist", SlRoadStopTileData,                          SLV_NEWGRF_ROAD_STOPS, SLV_ROAD_STOP_TILE_DATA),
 		SLEG_STRUCTLIST("goods", SlStationGoods),
 	};
-	inline const static SaveLoadCompatTable compat_description = _station_normal_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_normal_sl_compat;
 
 	void Save(BaseStation *bst) const override
 	{
@@ -647,7 +647,7 @@ public:
 
 class SlStationWaypoint : public DefaultSaveLoadHandler<SlStationWaypoint, BaseStation> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLEG_STRUCT("base", SlStationBase),
 		    SLE_VAR(Waypoint, town_cn,                   SLE_UINT16),
 
@@ -659,7 +659,7 @@ public:
 		SLE_CONDVAR(Waypoint, road_waypoint_area.w,      SLE_FILE_U8 | SLE_VAR_U16,   SLV_ROAD_WAYPOINTS, SL_MAX_VERSION),
 		SLE_CONDVAR(Waypoint, road_waypoint_area.h,      SLE_FILE_U8 | SLE_VAR_U16,   SLV_ROAD_WAYPOINTS, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _station_waypoint_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _station_waypoint_sl_compat;
 
 	void Save(BaseStation *bst) const override
 	{
diff --git a/src/saveload/storage_sl.cpp b/src/saveload/storage_sl.cpp
index 34fe441621..6a9b673afa 100644
--- a/src/saveload/storage_sl.cpp
+++ b/src/saveload/storage_sl.cpp
@@ -35,7 +35,7 @@ struct PSACChunkHandler : ChunkHandler {
 
 		while ((index = SlIterateArray()) != -1) {
 			assert(PersistentStorage::CanAllocateItem());
-			PersistentStorage *ps = new (PersistentStorageID(index)) PersistentStorage(0, 0, TileIndex{});
+			PersistentStorage *ps = new (PersistentStorageID(index)) PersistentStorage(0, GSF_INVALID, TileIndex{});
 			SlObject(ps, slt);
 		}
 	}
diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index c446b18cea..fdf92738a6 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -114,13 +114,13 @@ void UpdateHousesAndTowns()
 
 class SlTownSupplied : public DefaultSaveLoadHandler<SlTownSupplied, Town> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(TransportedCargoStat<uint32_t>, old_max, SLE_UINT32, SLV_165, SL_MAX_VERSION),
 		SLE_CONDVAR(TransportedCargoStat<uint32_t>, new_max, SLE_UINT32, SLV_165, SL_MAX_VERSION),
 		SLE_CONDVAR(TransportedCargoStat<uint32_t>, old_act, SLE_UINT32, SLV_165, SL_MAX_VERSION),
 		SLE_CONDVAR(TransportedCargoStat<uint32_t>, new_act, SLE_UINT32, SLV_165, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _town_supplied_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _town_supplied_sl_compat;
 
 	/**
 	 * Get the number of cargoes used by this savegame version.
@@ -153,13 +153,13 @@ public:
 
 class SlTownReceived : public DefaultSaveLoadHandler<SlTownReceived, Town> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_CONDVAR(TransportedCargoStat<uint16_t>, old_max, SLE_UINT16, SLV_165, SL_MAX_VERSION),
 		SLE_CONDVAR(TransportedCargoStat<uint16_t>, new_max, SLE_UINT16, SLV_165, SL_MAX_VERSION),
 		SLE_CONDVAR(TransportedCargoStat<uint16_t>, old_act, SLE_UINT16, SLV_165, SL_MAX_VERSION),
 		SLE_CONDVAR(TransportedCargoStat<uint16_t>, new_act, SLE_UINT16, SLV_165, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _town_received_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _town_received_sl_compat;
 
 	void Save(Town *t) const override
 	{
@@ -186,12 +186,12 @@ private:
 		static const uint GRID = 4;
 	};
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VAR(AcceptanceMatrix, area.tile, SLE_UINT32),
 		SLE_VAR(AcceptanceMatrix, area.w,    SLE_UINT16),
 		SLE_VAR(AcceptanceMatrix, area.h,    SLE_UINT16),
 	};
-	inline const static SaveLoadCompatTable compat_description = _town_acceptance_matrix_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _town_acceptance_matrix_sl_compat;
 
 	void Load(Town *) const override
 	{
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index c98f8df68a..908793dc5c 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -274,10 +274,10 @@ void AfterLoadVehiclesPhase1(bool part_of_load)
 		 * a) both next_shared and previous_shared are not set for pre 5,2 games
 		 * b) both next_shared and previous_shared are set for later games
 		 */
-		std::map<Order*, OrderList*> mapping;
+		std::map<uint32_t, OrderList *> mapping;
 
 		for (Vehicle *v : Vehicle::Iterate()) {
-			if (v->old_orders != nullptr) {
+			if (v->orders != nullptr) {
 				if (IsSavegameVersionBefore(SLV_105)) { // Pre-105 didn't save an OrderList
 					if (mapping[v->old_orders] == nullptr) {
 						/* This adds the whole shared vehicle chain for case b */
@@ -286,7 +286,11 @@ void AfterLoadVehiclesPhase1(bool part_of_load)
 						 * allowed in these savegames matches the number of OrderLists. As
 						 * such each vehicle can get an OrderList and it will (still) fit. */
 						assert(OrderList::CanAllocateItem());
-						v->orders = mapping[v->old_orders] = new OrderList(v->old_orders, v);
+						std::vector<Order> orders;
+						for (const OldOrderSaveLoadItem *old_order = GetOldOrder(v->old_orders); old_order != nullptr; old_order = GetOldOrder(old_order->next)) {
+							orders.push_back(std::move(old_order->order));
+						}
+						v->orders = mapping[v->old_orders] = new OrderList(std::move(orders), v);
 					} else {
 						v->orders = mapping[v->old_orders];
 						/* For old games (case a) we must create the shared vehicle chain */
@@ -296,7 +300,7 @@ void AfterLoadVehiclesPhase1(bool part_of_load)
 					}
 				} else { // OrderList was saved as such, only recalculate not saved values
 					if (v->PreviousShared() == nullptr) {
-						v->orders->Initialize(v->orders->first, v);
+						v->orders->Initialize(v);
 					}
 				}
 			}
@@ -320,7 +324,8 @@ void AfterLoadVehiclesPhase1(bool part_of_load)
 
 				/* As above, allocating OrderList here is safe. */
 				assert(OrderList::CanAllocateItem());
-				v->orders = new OrderList(nullptr, v);
+				v->orders = new OrderList();
+				v->orders->first_shared = v;
 				for (Vehicle *u = v; u != nullptr; u = u->next_shared) {
 					u->orders = v->orders;
 				}
@@ -536,7 +541,7 @@ void AfterLoadVehiclesPhase2(bool part_of_load)
 		v->UpdateDeltaXY();
 		v->coord.left = INVALID_COORD;
 		v->sprite_cache.old_coord.left = INVALID_COORD;
-		v->UpdatePosition();
+		if (v->type != VEH_EFFECT) v->UpdatePosition();
 		v->UpdateViewport(false);
 	}
 }
@@ -639,7 +644,7 @@ static Money  _cargo_feeder_share;
 
 class SlVehicleCommon : public DefaultSaveLoadHandler<SlVehicleCommon, Vehicle> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLE_VAR(Vehicle, subtype,               SLE_UINT8),
 
 		    SLE_REF(Vehicle, next,                  REF_VEHICLE_OLD),
@@ -715,7 +720,8 @@ public:
 		SLE_CONDVAR(Vehicle, timetable_start,       SLE_FILE_I32 | SLE_VAR_U64, SLV_129, SLV_TIMETABLE_START_TICKS),
 		SLE_CONDVAR(Vehicle, timetable_start,       SLE_UINT64,                 SLV_TIMETABLE_START_TICKS, SL_MAX_VERSION),
 
-		SLE_CONDREF(Vehicle, orders,                REF_ORDER,                    SL_MIN_VERSION, SLV_105),
+		SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_FILE_U16 | SLE_VAR_U32, SL_MIN_VERSION, SLV_69),
+		SLE_CONDVARNAME(Vehicle, old_orders, "orders", SLE_UINT32,                 SLV_69, SLV_105),
 		SLE_CONDREF(Vehicle, orders,                REF_ORDERLIST,              SLV_105, SL_MAX_VERSION),
 
 		SLE_CONDVAR(Vehicle, age,                   SLE_FILE_U16 | SLE_VAR_I32,   SL_MIN_VERSION,  SLV_31),
@@ -754,7 +760,7 @@ public:
 
 		SLE_CONDVAR(Vehicle, random_bits,           SLE_FILE_U8 | SLE_VAR_U16,    SLV_2, SLV_EXTEND_VEHICLE_RANDOM),
 		SLE_CONDVAR(Vehicle, random_bits,           SLE_UINT16,                   SLV_EXTEND_VEHICLE_RANDOM, SL_MAX_VERSION),
-		SLE_CONDVAR(Vehicle, waiting_triggers,      SLE_UINT8,                    SLV_2, SL_MAX_VERSION),
+		SLE_CONDVARNAME(Vehicle, waiting_random_triggers, "waiting_triggers", SLE_UINT8, SLV_2, SL_MAX_VERSION),
 
 		SLE_CONDREF(Vehicle, next_shared,           REF_VEHICLE,                  SLV_2, SL_MAX_VERSION),
 		SLE_CONDVAR(Vehicle, group_id,              SLE_UINT16,                  SLV_60, SL_MAX_VERSION),
@@ -769,7 +775,7 @@ public:
 		SLE_CONDVAR(Vehicle, round_trip_time,       SLE_INT32,                   SLV_DEPOT_UNBUNCHING, SL_MAX_VERSION),
 	};
 
-	inline const static SaveLoadCompatTable compat_description = _vehicle_common_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_common_sl_compat;
 
 	void Save(Vehicle *v) const override
 	{
@@ -789,7 +795,7 @@ public:
 
 class SlVehicleTrain : public DefaultSaveLoadHandler<SlVehicleTrain, Vehicle> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		 SLEG_STRUCT("common", SlVehicleCommon),
 		     SLE_VAR(Train, crash_anim_pos,      SLE_UINT16),
 		     SLE_VAR(Train, force_proceed,       SLE_UINT8),
@@ -801,7 +807,7 @@ public:
 		 SLE_CONDVAR(Train, wait_counter,        SLE_UINT16,                 SLV_136, SL_MAX_VERSION),
 		 SLE_CONDVAR(Train, gv_flags,            SLE_UINT16,                 SLV_139, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _vehicle_train_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_train_sl_compat;
 
 	void Save(Vehicle *v) const override
 	{
@@ -824,11 +830,11 @@ public:
 
 class SlVehicleRoadVehPath : public VectorSaveLoadHandler<SlVehicleRoadVehPath, RoadVehicle, RoadVehPathElement> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VAR(RoadVehPathElement, trackdir, SLE_UINT8),
 		SLE_VAR(RoadVehPathElement, tile, SLE_UINT32),
 	};
-	inline const static SaveLoadCompatTable compat_description = {};
+	static inline const SaveLoadCompatTable compat_description = {};
 
 	std::vector<RoadVehPathElement> &GetVector(RoadVehicle *rv) const override { return rv->path; }
 };
@@ -839,7 +845,7 @@ public:
 	static inline std::vector<Trackdir> rv_path_td;
 	static inline std::vector<TileIndex> rv_path_tile;
 
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		  SLEG_STRUCT("common", SlVehicleCommon),
 		      SLE_VAR(RoadVehicle, state,                SLE_UINT8),
 		      SLE_VAR(RoadVehicle, frame,                SLE_UINT8),
@@ -853,7 +859,7 @@ public:
 		SLEG_CONDSTRUCTLIST("path", SlVehicleRoadVehPath, SLV_PATH_CACHE_FORMAT, SL_MAX_VERSION),
 		  SLE_CONDVAR(RoadVehicle, gv_flags,             SLE_UINT16,                 SLV_139, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _vehicle_roadveh_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_roadveh_sl_compat;
 
 	static void ConvertPathCache(RoadVehicle &rv)
 	{
@@ -898,10 +904,10 @@ public:
 
 class SlVehicleShipPath : public VectorSaveLoadHandler<SlVehicleShipPath, Ship, ShipPathElement> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		SLE_VAR(ShipPathElement, trackdir, SLE_UINT8),
 	};
-	inline const static SaveLoadCompatTable compat_description = {};
+	static inline const SaveLoadCompatTable compat_description = {};
 
 	std::vector<ShipPathElement> &GetVector(Ship *s) const override { return s->path; }
 };
@@ -910,14 +916,14 @@ class SlVehicleShip : public DefaultSaveLoadHandler<SlVehicleShip, Vehicle> {
 public:
 	static inline std::vector<Trackdir> ship_path_td;
 
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		  SLEG_STRUCT("common", SlVehicleCommon),
 		      SLE_VAR(Ship, state,                     SLE_UINT8),
 		SLEG_CONDVECTOR("path", ship_path_td, SLE_UINT8, SLV_SHIP_PATH_CACHE, SLV_PATH_CACHE_FORMAT),
 		SLEG_CONDSTRUCTLIST("path", SlVehicleShipPath, SLV_PATH_CACHE_FORMAT, SL_MAX_VERSION),
 		  SLE_CONDVAR(Ship, rotation,                  SLE_UINT8,                  SLV_SHIP_ROTATION, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _vehicle_ship_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_ship_sl_compat;
 
 	void Save(Vehicle *v) const override
 	{
@@ -946,7 +952,7 @@ public:
 
 class SlVehicleAircraft : public DefaultSaveLoadHandler<SlVehicleAircraft, Vehicle> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		 SLEG_STRUCT("common", SlVehicleCommon),
 		     SLE_VAR(Aircraft, crashed_counter,       SLE_UINT16),
 		     SLE_VAR(Aircraft, pos,                   SLE_UINT8),
@@ -963,7 +969,7 @@ public:
 		 SLE_CONDVAR(Aircraft, turn_counter,          SLE_UINT8,                  SLV_136, SL_MAX_VERSION),
 		 SLE_CONDVAR(Aircraft, flags,                 SLE_UINT8,                  SLV_167, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _vehicle_aircraft_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_aircraft_sl_compat;
 
 	void Save(Vehicle *v) const override
 	{
@@ -986,7 +992,7 @@ public:
 
 class SlVehicleEffect : public DefaultSaveLoadHandler<SlVehicleEffect, Vehicle> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		     SLE_VAR(Vehicle, subtype,               SLE_UINT8),
 
 		 SLE_CONDVAR(Vehicle, tile,                  SLE_FILE_U16 | SLE_VAR_U32,   SL_MIN_VERSION,   SLV_6),
@@ -1008,7 +1014,7 @@ public:
 
 		 SLE_CONDVAR(Vehicle, spritenum,             SLE_UINT8,                    SLV_2, SL_MAX_VERSION),
 	};
-	inline const static SaveLoadCompatTable compat_description = _vehicle_effect_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_effect_sl_compat;
 
 	void Save(Vehicle *v) const override
 	{
@@ -1031,7 +1037,7 @@ public:
 
 class SlVehicleDisaster : public DefaultSaveLoadHandler<SlVehicleDisaster, Vehicle> {
 public:
-	inline static const SaveLoad description[] = {
+	static inline const SaveLoad description[] = {
 		    SLE_REF(Vehicle, next,                  REF_VEHICLE_OLD),
 
 		    SLE_VAR(Vehicle, subtype,               SLE_UINT8),
@@ -1066,7 +1072,7 @@ public:
 		SLE_CONDVAR(DisasterVehicle, flags,                     SLE_UINT8,                  SLV_194, SL_MAX_VERSION),
 	};
 
-	inline const static SaveLoadCompatTable compat_description = _vehicle_disaster_sl_compat;
+	static inline const SaveLoadCompatTable compat_description = _vehicle_disaster_sl_compat;
 
 	void Save(Vehicle *v) const override
 	{
@@ -1087,7 +1093,7 @@ public:
 	}
 };
 
-const static SaveLoad _vehicle_desc[] = {
+static const SaveLoad _vehicle_desc[] = {
 	SLE_SAVEBYTE(Vehicle, type),
 	SLEG_STRUCT("train", SlVehicleTrain),
 	SLEG_STRUCT("roadveh", SlVehicleRoadVeh),
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index ef8b401598..74c51befcb 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -49,14 +49,14 @@ static std::vector<OldWaypoint> _old_waypoints;
  * Update the waypoint orders to get the new waypoint ID.
  * @param o the order 'list' to check.
  */
-static void UpdateWaypointOrder(Order *o)
+static void UpdateWaypointOrder(Order &o)
 {
-	if (!o->IsType(OT_GOTO_WAYPOINT)) return;
+	if (!o.IsType(OT_GOTO_WAYPOINT)) return;
 
 	for (OldWaypoint &wp : _old_waypoints) {
-		if (wp.index != o->GetDestination()) continue;
+		if (wp.index != o.GetDestination()) continue;
 
-		o->SetDestination(wp.new_index);
+		o.SetDestination(wp.new_index);
 		return;
 	}
 }
@@ -147,13 +147,13 @@ void MoveWaypointsToBaseStations()
 	for (OrderList *ol : OrderList::Iterate()) {
 		if (ol->GetFirstSharedVehicle()->type != VEH_TRAIN) continue;
 
-		for (Order *o = ol->GetFirstOrder(); o != nullptr; o = o->next) UpdateWaypointOrder(o);
+		for (Order &o : ol->GetOrders()) UpdateWaypointOrder(o);
 	}
 
 	for (Vehicle *v : Vehicle::Iterate()) {
 		if (v->type != VEH_TRAIN) continue;
 
-		UpdateWaypointOrder(&v->current_order);
+		UpdateWaypointOrder(v->current_order);
 	}
 
 	ResetOldWaypoints();
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index 7e11fde2ae..a2779fa58a 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -33,8 +33,8 @@
 
 #include "safeguards.h"
 
-static const char * const SCREENSHOT_NAME = "screenshot"; ///< Default filename of a saved screenshot.
-static const char * const HEIGHTMAP_NAME  = "heightmap";  ///< Default filename of a saved heightmap.
+static const std::string_view SCREENSHOT_NAME = "screenshot"; ///< Default filename of a saved screenshot.
+static const std::string_view HEIGHTMAP_NAME  = "heightmap";  ///< Default filename of a saved heightmap.
 
 std::string _screenshot_format_name;  ///< Extension of the current screenshot format.
 static std::string _screenshot_name;  ///< Filename of the screenshot file.
@@ -70,7 +70,7 @@ std::string_view GetCurrentScreenshotExtension()
  * Callback of the screenshot generator that dumps the current video buffer.
  * @see ScreenshotCallback
  */
-static void CurrentScreenCallback(void *, void *buf, uint y, uint pitch, uint n)
+static void CurrentScreenCallback(void *buf, uint y, uint pitch, uint n)
 {
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	void *src = blitter->MoveTo(_screen.dst_ptr, 0, y);
@@ -79,55 +79,50 @@ static void CurrentScreenCallback(void *, void *buf, uint y, uint pitch, uint n)
 
 /**
  * generate a large piece of the world
- * @param userdata Viewport area to draw
+ * @param vp Viewport area to draw
  * @param buf Videobuffer with same bitdepth as current blitter
  * @param y First line to render
  * @param pitch Pitch of the videobuffer
  * @param n Number of lines to render
  */
-static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, uint n)
+static void LargeWorldCallback(Viewport &vp, void *buf, uint y, uint pitch, uint n)
 {
-	Viewport *vp = (Viewport *)userdata;
-	DrawPixelInfo dpi;
-	int wx, left;
+	DrawPixelInfo dpi{
+		.dst_ptr = buf,
+		.left = 0,
+		.top = static_cast<int>(y),
+		.width = vp.width,
+		.height = static_cast<int>(n),
+		.pitch = static_cast<int>(pitch),
+		.zoom = ZoomLevel::WorldScreenshot
+	};
 
 	/* We are no longer rendering to the screen */
-	DrawPixelInfo old_screen = _screen;
-	bool old_disable_anim = _screen_disable_anim;
-
-	_screen.dst_ptr = buf;
-	_screen.width = pitch;
-	_screen.height = n;
-	_screen.pitch = pitch;
-	_screen_disable_anim = true;
-
+	AutoRestoreBackup screen_backup(_screen, {
+		.dst_ptr = buf,
+		.left = 0,
+		.top = 0,
+		.width = static_cast<int>(pitch),
+		.height = static_cast<int>(n),
+		.pitch = static_cast<int>(pitch),
+		.zoom = ZoomLevel::Min
+	});
+	AutoRestoreBackup disable_anim_backup(_screen_disable_anim, true);
 	AutoRestoreBackup dpi_backup(_cur_dpi, &dpi);
 
-	dpi.dst_ptr = buf;
-	dpi.height = n;
-	dpi.width = vp->width;
-	dpi.pitch = pitch;
-	dpi.zoom = ZOOM_LVL_WORLD_SCREENSHOT;
-	dpi.left = 0;
-	dpi.top = y;
-
 	/* Render viewport in blocks of 1600 pixels width */
-	left = 0;
-	while (vp->width - left != 0) {
-		wx = std::min(vp->width - left, 1600);
+	int left = 0;
+	while (vp.width - left != 0) {
+		int wx = std::min(vp.width - left, 1600);
 		left += wx;
 
-		ViewportDoDraw(*vp,
-			ScaleByZoom(left - wx - vp->left, vp->zoom) + vp->virtual_left,
-			ScaleByZoom(y - vp->top, vp->zoom) + vp->virtual_top,
-			ScaleByZoom(left - vp->left, vp->zoom) + vp->virtual_left,
-			ScaleByZoom((y + n) - vp->top, vp->zoom) + vp->virtual_top
+		ViewportDoDraw(vp,
+			ScaleByZoom(left - wx - vp.left, vp.zoom) + vp.virtual_left,
+			ScaleByZoom(y - vp.top, vp.zoom) + vp.virtual_top,
+			ScaleByZoom(left - vp.left, vp.zoom) + vp.virtual_left,
+			ScaleByZoom((y + n) - vp.top, vp.zoom) + vp.virtual_top
 		);
 	}
-
-	/* Switch back to rendering to the screen */
-	_screen = old_screen;
-	_screen_disable_anim = old_disable_anim;
 }
 
 /**
@@ -137,7 +132,7 @@ static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, ui
  * @param crashlog   Create path for crash.png
  * @return Pathname for a screenshot file.
  */
-static const char *MakeScreenshotName(std::string_view default_fn, std::string_view ext, bool crashlog = false)
+static std::string_view MakeScreenshotName(std::string_view default_fn, std::string_view ext, bool crashlog = false)
 {
 	bool generate = _screenshot_name.empty();
 
@@ -157,9 +152,9 @@ static const char *MakeScreenshotName(std::string_view default_fn, std::string_v
 
 	size_t len = _screenshot_name.size();
 	/* Add extension to screenshot file */
-	_screenshot_name += fmt::format(".{}", ext);
+	format_append(_screenshot_name, ".{}", ext);
 
-	const char *screenshot_dir = crashlog ? _personal_dir.c_str() : FiosGetScreenshotDir();
+	std::string_view screenshot_dir = crashlog ? _personal_dir : FiosGetScreenshotDir();
 
 	for (uint serial = 1;; serial++) {
 		_full_screenshot_path = fmt::format("{}{}", screenshot_dir, _screenshot_name);
@@ -168,10 +163,10 @@ static const char *MakeScreenshotName(std::string_view default_fn, std::string_v
 		if (!FileExists(_full_screenshot_path)) break;
 		/* If file exists try another one with same name, but just with a higher index */
 		_screenshot_name.erase(len);
-		_screenshot_name += fmt::format("#{}.{}", serial, ext);
+		format_append(_screenshot_name, "#{}.{}", serial, ext);
 	}
 
-	return _full_screenshot_path.c_str();
+	return _full_screenshot_path;
 }
 
 /** Make a screenshot of the current screen. */
@@ -180,7 +175,7 @@ static bool MakeSmallScreenshot(bool crashlog)
 	auto provider = GetScreenshotProvider();
 	if (provider == nullptr) return false;
 
-	return provider->MakeImage(MakeScreenshotName(SCREENSHOT_NAME, provider->GetName(), crashlog), CurrentScreenCallback, nullptr, _screen.width, _screen.height,
+	return provider->MakeImage(MakeScreenshotName(SCREENSHOT_NAME, provider->GetName(), crashlog), CurrentScreenCallback, _screen.width, _screen.height,
 			BlitterFactory::GetCurrentBlitter()->GetScreenDepth(), _cur_palette.palette);
 }
 
@@ -218,7 +213,7 @@ static Viewport SetupScreenshotViewport(ScreenshotType t, uint32_t width = 0, ui
 			assert(width == 0 && height == 0);
 
 			/* Determine world coordinates of screenshot */
-			vp.zoom = ZOOM_LVL_WORLD_SCREENSHOT;
+			vp.zoom = ZoomLevel::WorldScreenshot;
 
 			TileIndex north_tile = _settings_game.construction.freeform_edges ? TileXY(1, 1) : TileXY(0, 0);
 			TileIndex south_tile{Map::Size() - 1};
@@ -242,7 +237,7 @@ static Viewport SetupScreenshotViewport(ScreenshotType t, uint32_t width = 0, ui
 			break;
 		}
 		default: {
-			vp.zoom = (t == SC_ZOOMEDIN) ? _settings_client.gui.zoom_min : ZOOM_LVL_VIEWPORT;
+			vp.zoom = (t == SC_ZOOMEDIN) ? _settings_client.gui.zoom_min : ZoomLevel::Viewport;
 
 			Window *w = GetMainWindow();
 			vp.virtual_left   = w->viewport->virtual_left;
@@ -252,8 +247,8 @@ static Viewport SetupScreenshotViewport(ScreenshotType t, uint32_t width = 0, ui
 				vp.virtual_width  = w->viewport->virtual_width;
 				vp.virtual_height = w->viewport->virtual_height;
 			} else {
-				vp.virtual_width = width << vp.zoom;
-				vp.virtual_height = height << vp.zoom;
+				vp.virtual_width = width << to_underlying(vp.zoom);
+				vp.virtual_height = height << to_underlying(vp.zoom);
 			}
 
 			/* Compute pixel coordinates */
@@ -283,8 +278,10 @@ static bool MakeLargeWorldScreenshot(ScreenshotType t, uint32_t width = 0, uint3
 
 	Viewport vp = SetupScreenshotViewport(t, width, height);
 
-	return provider->MakeImage(MakeScreenshotName(SCREENSHOT_NAME, provider->GetName()), LargeWorldCallback, &vp, vp.width, vp.height,
-			BlitterFactory::GetCurrentBlitter()->GetScreenDepth(), _cur_palette.palette);
+	return provider->MakeImage(MakeScreenshotName(SCREENSHOT_NAME, provider->GetName()),
+			[&](void *buf, uint y, uint pitch, uint n) {
+				LargeWorldCallback(vp, buf, y, pitch, n);
+			}, vp.width, vp.height, BlitterFactory::GetCurrentBlitter()->GetScreenDepth(), _cur_palette.palette);
 }
 
 /**
@@ -294,7 +291,7 @@ static bool MakeLargeWorldScreenshot(ScreenshotType t, uint32_t width = 0, uint3
  * @param n        Number of lines to write.
  * @see ScreenshotCallback
  */
-static void HeightmapCallback(void *, void *buffer, uint y, uint, uint n)
+static void HeightmapCallback(void *buffer, uint y, uint, uint n)
 {
 	uint8_t *buf = (uint8_t *)buffer;
 	while (n > 0) {
@@ -314,7 +311,7 @@ static void HeightmapCallback(void *, void *buffer, uint y, uint, uint n)
  * Make a heightmap of the current map.
  * @param filename Filename to use for saving.
  */
-bool MakeHeightmapScreenshot(const char *filename)
+bool MakeHeightmapScreenshot(std::string_view filename)
 {
 	auto provider = GetScreenshotProvider();
 	if (provider == nullptr) return false;
@@ -333,7 +330,7 @@ bool MakeHeightmapScreenshot(const char *filename)
 		_heightmap_highest_peak = std::max(h, _heightmap_highest_peak);
 	}
 
-	return provider->MakeImage(filename, HeightmapCallback, nullptr, Map::SizeX(), Map::SizeY(), 8, palette);
+	return provider->MakeImage(filename, HeightmapCallback, Map::SizeX(), Map::SizeY(), 8, palette);
 }
 
 static ScreenshotType _confirmed_screenshot_type; ///< Screenshot type the current query is about to confirm.
@@ -473,7 +470,7 @@ bool MakeScreenshot(ScreenshotType t, const std::string &name, uint32_t width, u
 }
 
 
-static void MinimapScreenCallback(void *, void *buf, uint y, uint pitch, uint n)
+static void MinimapScreenCallback(void *buf, uint y, uint pitch, uint n)
 {
 	uint32_t *ubuf = (uint32_t *)buf;
 	uint num = (pitch * n);
@@ -502,5 +499,5 @@ bool MakeMinimapWorldScreenshot()
 	auto provider = GetScreenshotProvider();
 	if (provider == nullptr) return false;
 
-	return provider->MakeImage(MakeScreenshotName(SCREENSHOT_NAME, provider->GetName()), MinimapScreenCallback, nullptr, Map::SizeX(), Map::SizeY(), 32, _cur_palette.palette);
+	return provider->MakeImage(MakeScreenshotName(SCREENSHOT_NAME, provider->GetName()), MinimapScreenCallback, Map::SizeX(), Map::SizeY(), 32, _cur_palette.palette);
 }
diff --git a/src/screenshot.h b/src/screenshot.h
index 4c9669cb34..2cbd827b1a 100644
--- a/src/screenshot.h
+++ b/src/screenshot.h
@@ -23,7 +23,7 @@ enum ScreenshotType : uint8_t {
 	SC_MINIMAP,     ///< Minimap screenshot.
 };
 
-bool MakeHeightmapScreenshot(const char *filename);
+bool MakeHeightmapScreenshot(std::string_view filename);
 void MakeScreenshotWithConfirm(ScreenshotType t);
 bool MakeScreenshot(ScreenshotType t, const std::string &name, uint32_t width = 0, uint32_t height = 0);
 bool MakeMinimapWorldScreenshot();
diff --git a/src/screenshot_bmp.cpp b/src/screenshot_bmp.cpp
index f86f2d7e4a..a47058bc15 100644
--- a/src/screenshot_bmp.cpp
+++ b/src/screenshot_bmp.cpp
@@ -43,7 +43,7 @@ class ScreenshotProvider_Bmp : public ScreenshotProvider {
 public:
 	ScreenshotProvider_Bmp() : ScreenshotProvider("bmp", "BMP", 10) {}
 
-	bool MakeImage(const char *name, ScreenshotCallback *callb, void *userdata, uint w, uint h, int pixelformat, const Colour *palette) override
+	bool MakeImage(std::string_view name, const ScreenshotCallback &callb, uint w, uint h, int pixelformat, const Colour *palette) override
 	{
 		uint bpp; // bytes per pixel
 		switch (pixelformat) {
@@ -117,13 +117,13 @@ public:
 			h -= n;
 
 			/* Render the pixels */
-			callb(userdata, buff.data(), h, w, n);
+			callb(buff.data(), h, w, n);
 
 			/* Write each line */
 			while (n-- != 0) {
 				if (pixelformat == 8) {
 					/* Move to 'line', leave last few pixels in line zeroed */
-					memcpy(line.data(), buff.data() + n * w, w);
+					std::copy_n(buff.data() + n * w, w, line.data());
 				} else {
 					/* Convert from 'native' 32bpp to BMP-like 24bpp.
 					 * Works for both big and little endian machines */
diff --git a/src/screenshot_pcx.cpp b/src/screenshot_pcx.cpp
index eedb9e0e2f..7e9b1f89d3 100644
--- a/src/screenshot_pcx.cpp
+++ b/src/screenshot_pcx.cpp
@@ -41,11 +41,10 @@ class ScreenshotProvider_Pcx : public ScreenshotProvider {
 public:
 	ScreenshotProvider_Pcx() : ScreenshotProvider("pcx", "PCX", 20) {}
 
-	bool MakeImage(const char *name, ScreenshotCallback *callb, void *userdata, uint w, uint h, int pixelformat, const Colour *palette) override
+	bool MakeImage(std::string_view name, const ScreenshotCallback &callb, uint w, uint h, int pixelformat, const Colour *palette) override
 	{
 		uint maxlines;
 		uint y;
-		PcxHeader pcx;
 		bool success;
 
 		if (pixelformat == 32) {
@@ -58,9 +57,8 @@ public:
 		if (!of.has_value()) return false;
 		auto &f = *of;
 
-		memset(&pcx, 0, sizeof(pcx));
-
 		/* setup pcx header */
+		PcxHeader pcx{};
 		pcx.manufacturer = 10;
 		pcx.version = 5;
 		pcx.rle = 1;
@@ -93,7 +91,7 @@ public:
 			uint i;
 
 			/* render the pixels into the buffer */
-			callb(userdata, buff.data(), y, w, n);
+			callb(buff.data(), y, w, n);
 			y += n;
 
 			/* write them to pcx */
@@ -153,4 +151,4 @@ public:
 	}
 };
 
-static ScreenshotProvider_Pcx s_screenshot_provider_pcx;
+static const ScreenshotProvider_Pcx s_screenshot_provider_pcx;
diff --git a/src/screenshot_png.cpp b/src/screenshot_png.cpp
index 116eed4883..9c526de1e4 100644
--- a/src/screenshot_png.cpp
+++ b/src/screenshot_png.cpp
@@ -12,6 +12,7 @@
 #include "debug.h"
 #include "fileio_func.h"
 #include "screenshot_type.h"
+#include "3rdparty/fmt/ranges.h"
 
 #include <png.h>
 
@@ -30,7 +31,7 @@ class ScreenshotProvider_Png : public ScreenshotProvider {
 public:
 	ScreenshotProvider_Png() : ScreenshotProvider("png", "PNG", 0) {}
 
-	bool MakeImage(const char *name, ScreenshotCallback *callb, void *userdata, uint w, uint h, int pixelformat, const Colour *palette) override
+	bool MakeImage(std::string_view name, const ScreenshotCallback &callb, uint w, uint h, int pixelformat, const Colour *palette) override
 	{
 		png_color rq[256];
 		uint i, y, n;
@@ -46,7 +47,7 @@ public:
 		if (!of.has_value()) return false;
 		auto &f = *of;
 
-		png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, const_cast<char *>(name), png_my_error, png_my_warning);
+		png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, &name, png_my_error, png_my_warning);
 
 		if (png_ptr == nullptr) {
 			return false;
@@ -74,28 +75,27 @@ public:
 
 		/* Try to add some game metadata to the PNG screenshot so
 		 * it's more useful for debugging and archival purposes. */
-		png_text_struct text[2];
-		memset(text, 0, sizeof(text));
+		png_text_struct text[2]{};
 		text[0].key = const_cast<char *>("Software");
-		text[0].text = const_cast<char *>(_openttd_revision);
-		text[0].text_length = strlen(_openttd_revision);
+		text[0].text = const_cast<char *>(_openttd_revision.c_str());
+		text[0].text_length = _openttd_revision.size();
 		text[0].compression = PNG_TEXT_COMPRESSION_NONE;
 
 		std::string message;
 		message.reserve(1024);
-		fmt::format_to(std::back_inserter(message), "Graphics set: {} ({})\n", BaseGraphics::GetUsedSet()->name, BaseGraphics::GetUsedSet()->version);
+		format_append(message, "Graphics set: {} ({})\n", BaseGraphics::GetUsedSet()->name, fmt::join(BaseGraphics::GetUsedSet()->version, "."));
 		message += "NewGRFs:\n";
 		if (_game_mode != GM_MENU) {
 			for (const auto &c : _grfconfig) {
-				fmt::format_to(std::back_inserter(message), "{:08X} {} {}\n", std::byteswap(c->ident.grfid), FormatArrayAsHex(c->ident.md5sum), c->filename);
+				format_append(message, "{:08X} {} {}\n", std::byteswap(c->ident.grfid), FormatArrayAsHex(c->ident.md5sum), c->filename);
 			}
 		}
 		message += "\nCompanies:\n";
 		for (const Company *c : Company::Iterate()) {
 			if (c->ai_info == nullptr) {
-				fmt::format_to(std::back_inserter(message), "{:2d}: Human\n", c->index);
+				format_append(message, "{:2d}: Human\n", c->index);
 			} else {
-				fmt::format_to(std::back_inserter(message), "{:2d}: {} (v{})\n", c->index, c->ai_info->GetName(), c->ai_info->GetVersion());
+				format_append(message, "{:2d}: {} (v{})\n", c->index, c->ai_info->GetName(), c->ai_info->GetVersion());
 			}
 		}
 		text[1].key = const_cast<char *>("Description");
@@ -151,7 +151,7 @@ public:
 			n = std::min(h - y, maxlines);
 
 			/* render the pixels into the buffer */
-			callb(userdata, buff.data(), y, w, n);
+			callb(buff.data(), y, w, n);
 			y += n;
 
 			/* write them to png */
@@ -169,13 +169,13 @@ public:
 private:
 	static void PNGAPI png_my_error(png_structp png_ptr, png_const_charp message)
 	{
-		Debug(misc, 0, "[libpng] error: {} - {}", message, (const char *)png_get_error_ptr(png_ptr));
+		Debug(misc, 0, "[libpng] error: {} - {}", message, *static_cast<std::string_view *>(png_get_error_ptr(png_ptr)));
 		longjmp(png_jmpbuf(png_ptr), 1);
 	}
 
 	static void PNGAPI png_my_warning(png_structp png_ptr, png_const_charp message)
 	{
-		Debug(misc, 1, "[libpng] warning: {} - {}", message, (const char *)png_get_error_ptr(png_ptr));
+		Debug(misc, 1, "[libpng] warning: {} - {}", message, *static_cast<std::string_view *>(png_get_error_ptr(png_ptr)));
 	}
 };
 
diff --git a/src/screenshot_type.h b/src/screenshot_type.h
index ed9c8afede..d93f7c20bb 100644
--- a/src/screenshot_type.h
+++ b/src/screenshot_type.h
@@ -21,7 +21,7 @@
  * @param pitch    Number of pixels to write (1 byte for 8bpp, 4 bytes for 32bpp). @see Colour
  * @param n        Number of lines to write.
  */
-using ScreenshotCallback = void(void *userdata, void *buf, uint y, uint pitch, uint n);
+using ScreenshotCallback = std::function<void (void *buf, uint y, uint pitch, uint n)>;
 
 /** Base interface for a SoundLoader implementation. */
 class ScreenshotProvider : public PriorityBaseProvider<ScreenshotProvider> {
@@ -36,7 +36,7 @@ public:
 		ProviderManager<ScreenshotProvider>::Unregister(*this);
 	}
 
-	virtual bool MakeImage(const char *name, ScreenshotCallback *callb, void *userdata, uint w, uint h, int pixelformat, const Colour *palette) = 0;
+	virtual bool MakeImage(std::string_view name, const ScreenshotCallback &callb, uint w, uint h, int pixelformat, const Colour *palette) = 0;
 };
 
 #endif /* SCREENSHOT_TYPE_H */
diff --git a/src/script/api/CMakeLists.txt b/src/script/api/CMakeLists.txt
index f41efd068c..28fd71128a 100644
--- a/src/script/api/CMakeLists.txt
+++ b/src/script/api/CMakeLists.txt
@@ -43,23 +43,23 @@ foreach(API "ai;AI" "game;GS" "template;Template")
         if("${SCRIPT_API_FILE}" MATCHES ".*script_controller.*")
             continue()
         endif()
-        get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
+        get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME_WE)
         string(REPLACE "script_" "${APILC}_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
-        set(SCRIPT_API_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${SCRIPT_API_FILE_NAME}.sq")
+        set(SCRIPT_API_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${SCRIPT_API_FILE_NAME}.sq.hpp")
 
         add_custom_command_timestamp(OUTPUT ${SCRIPT_API_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND}
-                        -DSCRIPT_API_SOURCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.hpp.sq.in
+                        -DSCRIPT_API_SOURCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.sq.hpp.in
                         -DSCRIPT_API_BINARY_FILE=${SCRIPT_API_BINARY_FILE}
                         -DSCRIPT_API_FILE=${SCRIPT_API_FILE}
                         -DAPIUC=${APIUC}
                         -DAPILC=${APILC}
                         -P ${CMAKE_SOURCE_DIR}/cmake/scripts/SquirrelExport.cmake
                 MAIN_DEPENDENCY ${SCRIPT_API_FILE}
-                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.hpp.sq.in
+                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.sq.hpp.in
                         ${CMAKE_SOURCE_DIR}/cmake/scripts/SquirrelExport.cmake
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                COMMENT "Generating ${APILC}/${SCRIPT_API_FILE_NAME}.sq"
+                COMMENT "Generating ${APILC}/${SCRIPT_API_FILE_NAME}.sq.hpp"
         )
         list(APPEND SCRIPT_${APIUC}_BINARY_FILES ${SCRIPT_API_BINARY_FILE})
     endforeach()
@@ -73,7 +73,7 @@ foreach(API "ai;AI" "game;GS" "template;Template")
     )
 
     if(NOT "${APILC}" STREQUAL "template")
-        list(APPEND SCRIPT_${APIUC}_BINARY_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${APILC}/${APILC}_controller.hpp.sq")
+        list(APPEND SCRIPT_${APIUC}_BINARY_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${APILC}/${APILC}_controller.sq.hpp")
         set(INCLUDES_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${APILC}_includes.hpp")
         set(API_FILES "${CMAKE_CURRENT_BINARY_DIR}/${APILC}.files")
         file(GENERATE OUTPUT ${API_FILES} CONTENT "${SCRIPT_${APIUC}_BINARY_FILES}")
diff --git a/src/script/api/ai/ai_controller.hpp.sq b/src/script/api/ai/ai_controller.sq.hpp
similarity index 73%
rename from src/script/api/ai/ai_controller.hpp.sq
rename to src/script/api/ai/ai_controller.sq.hpp
index c1363fb20b..04cbb209ff 100644
--- a/src/script/api/ai/ai_controller.hpp.sq
+++ b/src/script/api/ai/ai_controller.sq.hpp
@@ -7,24 +7,24 @@
 
 #include "../script_controller.hpp"
 
-template <> SQInteger PushClassName<ScriptController, ScriptType::AI>(HSQUIRRELVM vm) { sq_pushstring(vm, "AIController", -1); return 1; }
+template <> SQInteger PushClassName<ScriptController, ScriptType::AI>(HSQUIRRELVM vm) { sq_pushstring(vm, "AIController"); return 1; }
 
-void SQAIController_Register(Squirrel *engine)
+void SQAIController_Register(Squirrel &engine)
 {
 	DefSQClass<ScriptController, ScriptType::AI> SQAIController("AIController");
 	SQAIController.PreRegister(engine);
 
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetTick,           "GetTick",           1, ".");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetOpsTillSuspend, "GetOpsTillSuspend", 1, ".");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::SetCommandDelay,   "SetCommandDelay",   2, ".i");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::Sleep,             "Sleep",             2, ".i");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::Break,             "Break",             2, ".s");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetSetting,        "GetSetting",        2, ".s");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetVersion,        "GetVersion",        1, ".");
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::Print,             "Print",             3, ".bs");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetTick,           "GetTick",           ".");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetOpsTillSuspend, "GetOpsTillSuspend", ".");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::SetCommandDelay,   "SetCommandDelay",   ".i");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::Sleep,             "Sleep",             ".i");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::Break,             "Break",             ".s");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetSetting,        "GetSetting",        ".s");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::GetVersion,        "GetVersion",        ".");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::Print,             "Print",             ".bs");
 
 	SQAIController.PostRegister(engine);
 
 	/* Register the import statement to the global scope */
-	SQAIController.DefSQStaticMethod(engine, &ScriptController::Import,            "import",            4, ".ssi");
+	SQAIController.DefSQStaticMethod(engine, &ScriptController::Import,            "import",            ".ssi");
 }
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index a3da2a077d..f76a586f07 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -27,11 +27,14 @@
  * \li AICargo::CC_NON_POURABLE
  * \li AICargo::CC_POTABLE
  * \li AICargo::CC_NON_POTABLE
+ * \li AIVehicleList_Waypoint
  *
  * Other changes:
  * \li AIBridge::GetBridgeID renamed to AIBridge::GetBridgeType
  * \li AIWaypoint::GetWaypointID now returns the StationID of any type of waypoint
  * \li AIList instances can now be saved
+ * \li AIVehicleList_Station accepts an optional AIVehicle::VehicleType parameter
+ * \li AIList instances can now be cloned
  *
  * \b 14.0
  *
diff --git a/src/script/api/doxygen_filter.awk b/src/script/api/doxygen_filter.awk
index 086cecd864..6316efcf0d 100644
--- a/src/script/api/doxygen_filter.awk
+++ b/src/script/api/doxygen_filter.awk
@@ -80,7 +80,7 @@ BEGIN {
 /^(	*)class/     {
 	if (cls_level == 0) {
 		if (api_selected == "") {
-			print "Class '"$2"' has no @api. It won't be published to any API." > "/dev/stderr"
+			printf "%s:%d: %s\n", FILENAME, NR, "Class '"$2"' has no @api. It won't be published to any API." > "/dev/stderr"
 			api_selected = "false"
 		}
 		public = "false"
@@ -105,7 +105,7 @@ BEGIN {
 		}
 		api_selected = ""
 	} else {
-		print "Classes nested too deep" > "/dev/stderr"
+		printf "%s:%d: %s\n", FILENAME, NR, "Classes nested too deep" > "/dev/stderr"
 		exit 1
 	}
 	cls_level++
@@ -279,7 +279,7 @@ BEGIN {
 	}
 	if (match($0, "~")) {
 		if (api_selected != "") {
-			print "Destructor for '"cls"' has @api. Tag ignored." > "/dev/stderr"
+			printf "%s:%d: %s\n", FILENAME, NR, "Destructor for '"cls"' has @api. Tag ignored." > "/dev/stderr"
 			api_selected = ""
 		}
 		next
diff --git a/src/script/api/game/game_controller.hpp.sq b/src/script/api/game/game_controller.sq.hpp
similarity index 73%
rename from src/script/api/game/game_controller.hpp.sq
rename to src/script/api/game/game_controller.sq.hpp
index 2ac9148426..20cc6aafa4 100644
--- a/src/script/api/game/game_controller.hpp.sq
+++ b/src/script/api/game/game_controller.sq.hpp
@@ -7,24 +7,24 @@
 
 #include "../script_controller.hpp"
 
-template <> SQInteger PushClassName<ScriptController, ScriptType::GS>(HSQUIRRELVM vm) { sq_pushstring(vm, "GSController", -1); return 1; }
+template <> SQInteger PushClassName<ScriptController, ScriptType::GS>(HSQUIRRELVM vm) { sq_pushstring(vm, "GSController"); return 1; }
 
-void SQGSController_Register(Squirrel *engine)
+void SQGSController_Register(Squirrel &engine)
 {
 	DefSQClass<ScriptController, ScriptType::GS> SQGSController("GSController");
 	SQGSController.PreRegister(engine);
 
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetTick,           "GetTick",           1, ".");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetOpsTillSuspend, "GetOpsTillSuspend", 1, ".");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::SetCommandDelay,   "SetCommandDelay",   2, ".i");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::Sleep,             "Sleep",             2, ".i");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::Break,             "Break",             2, ".s");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetSetting,        "GetSetting",        2, ".s");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetVersion,        "GetVersion",        1, ".");
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::Print,             "Print",             3, ".bs");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetTick,           "GetTick",           ".");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetOpsTillSuspend, "GetOpsTillSuspend", ".");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::SetCommandDelay,   "SetCommandDelay",   ".i");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::Sleep,             "Sleep",             ".i");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::Break,             "Break",             ".s");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetSetting,        "GetSetting",        ".s");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::GetVersion,        "GetVersion",        ".");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::Print,             "Print",             ".bs");
 
 	SQGSController.PostRegister(engine);
 
 	/* Register the import statement to the global scope */
-	SQGSController.DefSQStaticMethod(engine, &ScriptController::Import,            "import",            4, ".ssi");
+	SQGSController.DefSQStaticMethod(engine, &ScriptController::Import,            "import",            ".ssi");
 }
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 13498b62e4..7bb7203d20 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -27,11 +27,15 @@
  * \li GSCargo::CC_NON_POURABLE
  * \li GSCargo::CC_POTABLE
  * \li GSCargo::CC_NON_POTABLE
+ * \li GSVehicleList_Waypoint
+ * \li GSBaseStation::GetOwner
  *
  * Other changes:
  * \li GSBridge::GetBridgeID renamed to GSBridge::GetBridgeType
  * \li GSWaypoint::GetWaypointID now returns the StationID of any type of waypoint
  * \li GSList instances can now be saved
+ * \li GSVehicleList_Station accepts an optional GSVehicle::VehicleType parameter
+ * \li GSList instances can now be cloned
  *
  * \b 14.0
  *
diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp
index 5f11aa18cb..664b035ef6 100644
--- a/src/script/api/script_admin.cpp
+++ b/src/script/api/script_admin.cpp
@@ -45,10 +45,10 @@ bool ScriptAdminMakeJSON(nlohmann::json &json, HSQUIRRELVM vm, SQInteger index,
 		}
 
 		case OT_STRING: {
-			const SQChar *buf;
-			sq_getstring(vm, index, &buf);
+			std::string_view view;
+			sq_getstring(vm, index, view);
 
-			json = std::string(buf);
+			json = view;
 			return true;
 		}
 
@@ -78,9 +78,9 @@ bool ScriptAdminMakeJSON(nlohmann::json &json, HSQUIRRELVM vm, SQInteger index,
 			sq_pushnull(vm);
 			while (SQ_SUCCEEDED(sq_next(vm, index - 1))) {
 				sq_tostring(vm, -2);
-				const SQChar *buf;
-				sq_getstring(vm, -1, &buf);
-				std::string key = std::string(buf);
+				std::string_view view;
+				sq_getstring(vm, -1, view);
+				std::string key{view};
 				sq_pop(vm, 1);
 
 				nlohmann::json value;
diff --git a/src/script/api/script_airport.cpp b/src/script/api/script_airport.cpp
index 054c3f4add..05e5a7d728 100644
--- a/src/script/api/script_airport.cpp
+++ b/src/script/api/script_airport.cpp
@@ -139,7 +139,7 @@
 	if (_settings_game.economy.station_noise_level) {
 		uint dist;
 		const auto &layout = as->layouts[0];
-		AirportGetNearestTown(as, layout.rotation, tile, AirportTileTableIterator(layout.tiles.data(), tile), dist);
+		AirportGetNearestTown(as, layout.rotation, tile, AirportTileTableIterator(layout.tiles, tile), dist);
 		return GetAirportNoiseLevelForDistance(as, dist);
 	}
 
@@ -156,7 +156,7 @@
 
 	uint dist;
 	const auto &layout = as->layouts[0];
-	return AirportGetNearestTown(as, layout.rotation, tile, AirportTileTableIterator(layout.tiles.data(), tile), dist)->index;
+	return AirportGetNearestTown(as, layout.rotation, tile, AirportTileTableIterator(layout.tiles, tile), dist)->index;
 }
 
 /* static */ SQInteger ScriptAirport::GetMaintenanceCostFactor(AirportType type)
diff --git a/src/script/api/script_asyncmode.cpp b/src/script/api/script_asyncmode.cpp
index 4e95460e72..144d7c666b 100644
--- a/src/script/api/script_asyncmode.cpp
+++ b/src/script/api/script_asyncmode.cpp
@@ -49,7 +49,7 @@ void ScriptAsyncMode::FinalRelease()
 {
 	if (this->GetDoCommandAsyncModeInstance() != this) {
 		/* Ignore this error if the script is not alive. */
-		if (ScriptObject::GetActiveInstance()->IsAlive()) {
+		if (ScriptObject::GetActiveInstance().IsAlive()) {
 			throw Script_FatalError("Asyncmode object was removed while it was not the latest *Mode object created.");
 		}
 	}
diff --git a/src/script/api/script_basestation.cpp b/src/script/api/script_basestation.cpp
index 91ff72e152..e7bea4ec29 100644
--- a/src/script/api/script_basestation.cpp
+++ b/src/script/api/script_basestation.cpp
@@ -28,11 +28,17 @@
 	return st != nullptr && (st->owner == ScriptObject::GetCompany() || ScriptCompanyMode::IsDeity() || st->owner == OWNER_NONE);
 }
 
+/* static */ ScriptCompany::CompanyID ScriptBaseStation::GetOwner(StationID station_id)
+{
+	if (!IsValidBaseStation(station_id)) return ScriptCompany::COMPANY_INVALID;
+	return ScriptCompany::ToScriptCompanyID(::BaseStation::Get(station_id)->owner);
+}
+
 /* static */ std::optional<std::string> ScriptBaseStation::GetName(StationID station_id)
 {
 	if (!IsValidBaseStation(station_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(::Station::IsValidID(station_id) ? STR_STATION_NAME : STR_WAYPOINT_NAME, station_id));
+	return ::StrMakeValid(::GetString(::Station::IsValidID(station_id) ? STR_STATION_NAME : STR_WAYPOINT_NAME, station_id), {});
 }
 
 /* static */ bool ScriptBaseStation::SetName(StationID station_id, Text *name)
diff --git a/src/script/api/script_basestation.hpp b/src/script/api/script_basestation.hpp
index c46326cdfb..646bec13ab 100644
--- a/src/script/api/script_basestation.hpp
+++ b/src/script/api/script_basestation.hpp
@@ -11,6 +11,7 @@
 #define SCRIPT_BASESTATION_HPP
 
 #include "script_text.hpp"
+#include "script_company.hpp"
 #include "script_date.hpp"
 #include "../../station_type.h"
 
@@ -32,6 +33,15 @@ public:
 	 */
 	static bool IsValidBaseStation(StationID station_id);
 
+	/**
+	 * Get the owner of a basestation.
+	 * @param station_id The basestation to get the owner of.
+	 * @pre IsValidBaseStation(station_id).
+	 * @return The owner the basestation has.
+	 * @api -ai
+	 */
+	static ScriptCompany::CompanyID GetOwner(StationID station_id);
+
 	/**
 	 * Get the name of a basestation.
 	 * @param station_id The basestation to get the name of.
diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp
index eaf7b8325c..f96aaca887 100644
--- a/src/script/api/script_bridge.cpp
+++ b/src/script/api/script_bridge.cpp
@@ -43,7 +43,7 @@
  * Helper function to connect a just built bridge to nearby roads.
  * @param instance The script instance we have to built the road for.
  */
-static void _DoCommandReturnBuildBridge2(class ScriptInstance *instance)
+static void _DoCommandReturnBuildBridge2(class ScriptInstance &instance)
 {
 	if (!ScriptBridge::_BuildBridgeRoad2()) {
 		ScriptInstance::DoCommandReturn(instance);
@@ -59,7 +59,7 @@ static void _DoCommandReturnBuildBridge2(class ScriptInstance *instance)
  * Helper function to connect a just built bridge to nearby roads.
  * @param instance The script instance we have to built the road for.
  */
-static void _DoCommandReturnBuildBridge1(class ScriptInstance *instance)
+static void _DoCommandReturnBuildBridge1(class ScriptInstance &instance)
 {
 	if (!ScriptBridge::_BuildBridgeRoad1()) {
 		ScriptInstance::DoCommandReturn(instance);
@@ -135,7 +135,7 @@ static void _DoCommandReturnBuildBridge1(class ScriptInstance *instance)
 	EnforcePrecondition(std::nullopt, vehicle_type == ScriptVehicle::VT_ROAD || vehicle_type == ScriptVehicle::VT_RAIL || vehicle_type == ScriptVehicle::VT_WATER);
 	if (!IsValidBridge(bridge_type)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(vehicle_type == ScriptVehicle::VT_WATER ? STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT : ::GetBridgeSpec(bridge_type)->transport_name[vehicle_type]));
+	return ::StrMakeValid(::GetString(vehicle_type == ScriptVehicle::VT_WATER ? STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT : ::GetBridgeSpec(bridge_type)->transport_name[vehicle_type]), {});
 }
 
 /* static */ SQInteger ScriptBridge::GetMaxSpeed(BridgeType bridge_type)
diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp
index 63c86a7695..d38ff9300a 100644
--- a/src/script/api/script_cargo.cpp
+++ b/src/script/api/script_cargo.cpp
@@ -32,7 +32,7 @@
 {
 	if (!IsValidCargo(cargo_type)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_JUST_CARGO_LIST, 1ULL << cargo_type));
+	return ::StrMakeValid(::GetString(STR_JUST_CARGO_LIST, 1ULL << cargo_type), {});
 }
 
 /* static */ std::optional<std::string> ScriptCargo::GetCargoLabel(CargoType cargo_type)
diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp
index 577a9a96a2..9def32f0d8 100644
--- a/src/script/api/script_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -78,7 +78,7 @@
 	company = ResolveCompanyID(company);
 	if (company == ScriptCompany::COMPANY_INVALID) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_COMPANY_NAME, ScriptCompany::FromScriptCompanyID(company)));
+	return ::StrMakeValid(::GetString(STR_COMPANY_NAME, ScriptCompany::FromScriptCompanyID(company)), {});
 }
 
 /* static */ bool ScriptCompany::SetPresidentName(Text *name)
@@ -99,7 +99,7 @@
 	company = ResolveCompanyID(company);
 	if (company == ScriptCompany::COMPANY_INVALID) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_PRESIDENT_NAME, ScriptCompany::FromScriptCompanyID(company)));
+	return ::StrMakeValid(::GetString(STR_PRESIDENT_NAME, ScriptCompany::FromScriptCompanyID(company)), {});
 }
 
 /* static */ bool ScriptCompany::SetPresidentGender(Gender gender)
diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp
index 0f4160c8b4..84b7c1ae73 100644
--- a/src/script/api/script_controller.cpp
+++ b/src/script/api/script_controller.cpp
@@ -49,7 +49,7 @@
 {
 	if (_network_dedicated || !_settings_client.gui.ai_developer_tools) return;
 
-	ScriptObject::GetActiveInstance()->Pause();
+	ScriptObject::GetActiveInstance().Pause();
 
 	ScriptLog::Log(ScriptLogTypes::LOG_SQ_ERROR, fmt::format("Break: {}", message));
 
@@ -76,17 +76,17 @@ ScriptController::ScriptController(::CompanyID company) :
 
 /* static */ uint ScriptController::GetTick()
 {
-	return ScriptObject::GetActiveInstance()->GetController()->ticks;
+	return ScriptObject::GetActiveInstance().GetController()->ticks;
 }
 
 /* static */ int ScriptController::GetOpsTillSuspend()
 {
-	return ScriptObject::GetActiveInstance()->GetOpsTillSuspend();
+	return ScriptObject::GetActiveInstance().GetOpsTillSuspend();
 }
 
 /* static */ int ScriptController::GetSetting(const std::string &name)
 {
-	return ScriptObject::GetActiveInstance()->GetSetting(name);
+	return ScriptObject::GetActiveInstance().GetSetting(name);
 }
 
 /* static */ uint ScriptController::GetVersion()
@@ -96,11 +96,11 @@ ScriptController::ScriptController(::CompanyID company) :
 
 /* static */ HSQOBJECT ScriptController::Import(const std::string &library, const std::string &class_name, int version)
 {
-	ScriptController *controller = ScriptObject::GetActiveInstance()->GetController();
-	Squirrel *engine = ScriptObject::GetActiveInstance()->engine;
+	ScriptController *controller = ScriptObject::GetActiveInstance().GetController();
+	Squirrel *engine = ScriptObject::GetActiveInstance().engine;
 	HSQUIRRELVM vm = engine->GetVM();
 
-	ScriptInfo *lib = ScriptObject::GetActiveInstance()->FindLibrary(library, version);
+	ScriptInfo *lib = ScriptObject::GetActiveInstance().FindLibrary(library, version);
 	if (lib == nullptr) {
 		throw sq_throwerror(vm, fmt::format("couldn't find library '{}' with version {}", library, version));
 	}
@@ -125,7 +125,7 @@ ScriptController::ScriptController(::CompanyID company) :
 
 		/* Load the library in a 'fake' namespace, so we can link it to the name the user requested */
 		sq_pushroottable(vm);
-		sq_pushstring(vm, fake_class, -1);
+		sq_pushstring(vm, fake_class);
 		sq_newclass(vm, SQFalse);
 		/* Load the library */
 		if (!engine->LoadScript(vm, lib->GetMainScript(), false)) {
@@ -140,11 +140,11 @@ ScriptController::ScriptController(::CompanyID company) :
 
 	/* Find the real class inside the fake class (like 'sets.Vector') */
 	sq_pushroottable(vm);
-	sq_pushstring(vm, fake_class, -1);
+	sq_pushstring(vm, fake_class);
 	if (SQ_FAILED(sq_get(vm, -2))) {
 		throw sq_throwerror(vm, "internal error assigning library class");
 	}
-	sq_pushstring(vm, lib->GetInstanceName(), -1);
+	sq_pushstring(vm, lib->GetInstanceName());
 	if (SQ_FAILED(sq_get(vm, -2))) {
 		throw sq_throwerror(vm, fmt::format("unable to find class '{}' in the library '{}' version {}", lib->GetInstanceName(), library, version));
 	}
@@ -156,7 +156,7 @@ ScriptController::ScriptController(::CompanyID company) :
 
 	/* Now link the name the user wanted to our 'fake' class */
 	sq_pushobject(vm, parent);
-	sq_pushstring(vm, class_name, -1);
+	sq_pushstring(vm, class_name);
 	sq_pushobject(vm, obj);
 	sq_newclass(vm, SQTrue);
 	sq_newslot(vm, -3, SQFalse);
diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.hpp
index b1d38d6a6d..59c61f553e 100644
--- a/src/script/api/script_controller.hpp
+++ b/src/script/api/script_controller.hpp
@@ -11,6 +11,7 @@
 #define SCRIPT_CONTROLLER_HPP
 
 #include "script_types.hpp"
+#include "../../string_func.h"
 #include "../../company_type.h"
 
 /**
diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp
index f13cf5654b..e7cf0a025a 100644
--- a/src/script/api/script_engine.cpp
+++ b/src/script/api/script_engine.cpp
@@ -47,7 +47,7 @@
 {
 	if (!IsValidEngine(engine_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_ENGINE_NAME, engine_id));
+	return ::StrMakeValid(::GetString(STR_ENGINE_NAME, engine_id), {});
 }
 
 /* static */ CargoType ScriptEngine::GetCargoType(EngineID engine_id)
diff --git a/src/script/api/script_error.cpp b/src/script/api/script_error.cpp
index 4c82dfd8bd..953e9d8d38 100644
--- a/src/script/api/script_error.cpp
+++ b/src/script/api/script_error.cpp
@@ -27,7 +27,7 @@ ScriptError::ScriptErrorMapString ScriptError::error_map_string = ScriptError::S
 {
 	auto it = ScriptError::error_map_string.find(ScriptError::GetLastError());
 	assert(it != ScriptError::error_map_string.end());
-	return it->second;
+	return std::string{it->second};
 }
 
 /* static */ ScriptErrorType ScriptError::StringToError(StringID internal_string_id)
@@ -62,7 +62,7 @@ ScriptError::ScriptErrorMapString ScriptError::error_map_string = ScriptError::S
 	error_map[internal_string_id] = ai_error_msg;
 }
 
-/* static */ void ScriptError::RegisterErrorMapString(ScriptErrorType ai_error_msg, const char *message)
+/* static */ void ScriptError::RegisterErrorMapString(ScriptErrorType ai_error_msg, std::string_view message)
 {
 	error_map_string[ai_error_msg] = message;
 }
diff --git a/src/script/api/script_error.hpp b/src/script/api/script_error.hpp
index 84f2d6e86f..a0ee424f30 100644
--- a/src/script/api/script_error.hpp
+++ b/src/script/api/script_error.hpp
@@ -218,11 +218,11 @@ public:
 	 * @param ai_error_msg The script error message representation.
 	 * @param message The string representation of this error message, used for debug purposes.
 	 */
-	static void RegisterErrorMapString(ScriptErrorType ai_error_msg, const char *message);
+	static void RegisterErrorMapString(ScriptErrorType ai_error_msg, std::string_view message);
 
 private:
-	typedef std::map<StringID, ScriptErrorType> ScriptErrorMap;           ///< The type for mapping between error (internal OpenTTD) StringID to the script error type.
-	typedef std::map<ScriptErrorType, const char *> ScriptErrorMapString; ///< The type for mapping between error type and textual representation.
+	using ScriptErrorMap = std::map<StringID, ScriptErrorType>; ///< The type for mapping between error (internal OpenTTD) StringID to the script error type.
+	using ScriptErrorMapString = std::map<ScriptErrorType, std::string_view>; ///< The type for mapping between error type and textual representation.
 
 	static ScriptErrorMap error_map;              ///< The mapping between error (internal OpenTTD) StringID to the script error type.
 	static ScriptErrorMapString error_map_string; ///< The mapping between error type and textual representation.
diff --git a/src/script/api/script_event.cpp b/src/script/api/script_event.cpp
index efdc720cf3..758794a729 100644
--- a/src/script/api/script_event.cpp
+++ b/src/script/api/script_event.cpp
@@ -9,64 +9,27 @@
 
 #include "../../stdafx.h"
 #include "script_event_types.hpp"
-
-#include <queue>
+#include "../script_storage.hpp"
 
 #include "../../safeguards.h"
 
-/** The queue of events for a script. */
-struct ScriptEventData {
-	std::queue<ScriptEvent *> stack; ///< The actual queue.
-};
-
-/* static */ void ScriptEventController::CreateEventPointer()
-{
-	assert(ScriptObject::GetEventPointer() == nullptr);
-
-	ScriptObject::GetEventPointer() = new ScriptEventData();
-}
-
-/* static */ void ScriptEventController::FreeEventPointer()
-{
-	ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer();
-
-	/* Free all waiting events (if any) */
-	while (!data->stack.empty()) {
-		ScriptEvent *e = data->stack.front();
-		data->stack.pop();
-		e->Release();
-	}
-
-	/* Now kill our data pointer */
-	delete data;
-}
-
 /* static */ bool ScriptEventController::IsEventWaiting()
 {
-	if (ScriptObject::GetEventPointer() == nullptr) ScriptEventController::CreateEventPointer();
-	ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer();
-
-	return !data->stack.empty();
+	return !ScriptObject::GetEventQueue().empty();
 }
 
 /* static */ ScriptEvent *ScriptEventController::GetNextEvent()
 {
-	if (ScriptObject::GetEventPointer() == nullptr) ScriptEventController::CreateEventPointer();
-	ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer();
+	auto &queue = ScriptObject::GetEventQueue();
+	if (queue.empty()) return nullptr;
 
-	if (data->stack.empty()) return nullptr;
-
-	ScriptEvent *e = data->stack.front();
-	data->stack.pop();
-	return e;
+	auto *result = queue.front().release();
+	queue.pop();
+	return result;
 }
 
 /* static */ void ScriptEventController::InsertEvent(ScriptEvent *event)
 {
-	if (ScriptObject::GetEventPointer() == nullptr) ScriptEventController::CreateEventPointer();
-	ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer();
-
-	event->AddRef();
-	data->stack.push(event);
+	ScriptObject::GetEventQueue().push(event);
 }
 
diff --git a/src/script/api/script_event.hpp b/src/script/api/script_event.hpp
index 09fbb643eb..e706151b74 100644
--- a/src/script/api/script_event.hpp
+++ b/src/script/api/script_event.hpp
@@ -61,6 +61,7 @@ public:
 		ET_PRESIDENT_RENAMED,
 	};
 
+#ifndef DOXYGEN_API
 	/**
 	 * Constructor of ScriptEvent, to get the type of event.
 	 * @param type The type of event to construct.
@@ -68,6 +69,7 @@ public:
 	ScriptEvent(ScriptEvent::ScriptEventType type) :
 		type(type)
 	{}
+#endif /* DOXYGEN_API */
 
 	/**
 	 * Get the event-type.
diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp
index 541e124e38..c29cfa3a7d 100644
--- a/src/script/api/script_event_types.cpp
+++ b/src/script/api/script_event_types.cpp
@@ -34,7 +34,7 @@ std::optional<std::string> ScriptEventEnginePreview::GetName()
 {
 	if (!this->IsEngineValid()) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_ENGINE_NAME, this->engine));
+	return ::StrMakeValid(::GetString(STR_ENGINE_NAME, this->engine), {});
 }
 
 CargoType ScriptEventEnginePreview::GetCargoType()
@@ -139,7 +139,7 @@ static bool ScriptEventAdminPortReadValue(HSQUIRRELVM vm, nlohmann::json &json)
 
 		case nlohmann::json::value_t::string: {
 			auto value = json.get<std::string>();
-			sq_pushstring(vm, value.data(), value.size());
+			sq_pushstring(vm, value);
 			break;
 		}
 
@@ -152,7 +152,7 @@ static bool ScriptEventAdminPortReadValue(HSQUIRRELVM vm, nlohmann::json &json)
 			sq_newtable(vm);
 
 			for (auto &[key, value] : json.items()) {
-				sq_pushstring(vm, key.data(), key.size());
+				sq_pushstring(vm, key);
 
 				if (!ScriptEventAdminPortReadValue(vm, value)) {
 					return false;
diff --git a/src/script/api/script_event_types.hpp b/src/script/api/script_event_types.hpp
index 0b67ce9376..25ba6d5bb9 100644
--- a/src/script/api/script_event_types.hpp
+++ b/src/script/api/script_event_types.hpp
@@ -62,7 +62,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventVehicleCrashed *Convert(ScriptEvent *instance) { return (ScriptEventVehicleCrashed *)instance; }
+	static ScriptEventVehicleCrashed *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventVehicleCrashed *>(instance); }
 
 	/**
 	 * Get the VehicleID of the crashed vehicle.
@@ -123,7 +123,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventSubsidyOffer *Convert(ScriptEvent *instance) { return (ScriptEventSubsidyOffer *)instance; }
+	static ScriptEventSubsidyOffer *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventSubsidyOffer *>(instance); }
 
 	/**
 	 * Get the SubsidyID of the subsidy.
@@ -156,7 +156,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventSubsidyOfferExpired *Convert(ScriptEvent *instance) { return (ScriptEventSubsidyOfferExpired *)instance; }
+	static ScriptEventSubsidyOfferExpired *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventSubsidyOfferExpired *>(instance); }
 
 	/**
 	 * Get the SubsidyID of the subsidy.
@@ -189,7 +189,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventSubsidyAwarded *Convert(ScriptEvent *instance) { return (ScriptEventSubsidyAwarded *)instance; }
+	static ScriptEventSubsidyAwarded *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventSubsidyAwarded *>(instance); }
 
 	/**
 	 * Get the SubsidyID of the subsidy.
@@ -222,7 +222,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventSubsidyExpired *Convert(ScriptEvent *instance) { return (ScriptEventSubsidyExpired *)instance; }
+	static ScriptEventSubsidyExpired *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventSubsidyExpired *>(instance); }
 
 	/**
 	 * Get the SubsidyID of the subsidy.
@@ -257,7 +257,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventEnginePreview *Convert(ScriptEvent *instance) { return (ScriptEventEnginePreview *)instance; }
+	static ScriptEventEnginePreview *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventEnginePreview *>(instance); }
 
 	/**
 	 * Get the name of the offered engine.
@@ -349,7 +349,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyNew *Convert(ScriptEvent *instance) { return (ScriptEventCompanyNew *)instance; }
+	static ScriptEventCompanyNew *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyNew *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that has been created.
@@ -383,7 +383,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyRenamed *Convert(ScriptEvent *instance) { return static_cast<ScriptEventCompanyRenamed *>(instance); }
+	static ScriptEventCompanyRenamed *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyRenamed *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that has been renamed.
@@ -425,7 +425,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyInTrouble *Convert(ScriptEvent *instance) { return (ScriptEventCompanyInTrouble *)instance; }
+	static ScriptEventCompanyInTrouble *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyInTrouble *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that is in trouble.
@@ -460,7 +460,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyAskMerger *Convert(ScriptEvent *instance) { return (ScriptEventCompanyAskMerger *)instance; }
+	static ScriptEventCompanyAskMerger *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyAskMerger *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that can be bought.
@@ -511,7 +511,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyMerger *Convert(ScriptEvent *instance) { return (ScriptEventCompanyMerger *)instance; }
+	static ScriptEventCompanyMerger *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyMerger *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that has been bought.
@@ -554,7 +554,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyBankrupt *Convert(ScriptEvent *instance) { return (ScriptEventCompanyBankrupt *)instance; }
+	static ScriptEventCompanyBankrupt *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyBankrupt *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that has gone bankrupt.
@@ -587,7 +587,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventVehicleLost *Convert(ScriptEvent *instance) { return (ScriptEventVehicleLost *)instance; }
+	static ScriptEventVehicleLost *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventVehicleLost *>(instance); }
 
 	/**
 	 * Get the VehicleID of the vehicle that is lost.
@@ -620,7 +620,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventVehicleWaitingInDepot *Convert(ScriptEvent *instance) { return (ScriptEventVehicleWaitingInDepot *)instance; }
+	static ScriptEventVehicleWaitingInDepot *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventVehicleWaitingInDepot *>(instance); }
 
 	/**
 	 * Get the VehicleID of the vehicle that is waiting in a depot.
@@ -653,7 +653,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventVehicleUnprofitable *Convert(ScriptEvent *instance) { return (ScriptEventVehicleUnprofitable *)instance; }
+	static ScriptEventVehicleUnprofitable *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventVehicleUnprofitable *>(instance); }
 
 	/**
 	 * Get the VehicleID of the vehicle that lost money.
@@ -686,7 +686,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventIndustryOpen *Convert(ScriptEvent *instance) { return (ScriptEventIndustryOpen *)instance; }
+	static ScriptEventIndustryOpen *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventIndustryOpen *>(instance); }
 
 	/**
 	 * Get the IndustryID of the new industry.
@@ -719,7 +719,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventIndustryClose *Convert(ScriptEvent *instance) { return (ScriptEventIndustryClose *)instance; }
+	static ScriptEventIndustryClose *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventIndustryClose *>(instance); }
 
 	/**
 	 * Get the IndustryID of the closing industry.
@@ -752,7 +752,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventEngineAvailable *Convert(ScriptEvent *instance) { return (ScriptEventEngineAvailable *)instance; }
+	static ScriptEventEngineAvailable *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventEngineAvailable *>(instance); }
 
 	/**
 	 * Get the EngineID of the new engine.
@@ -787,7 +787,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventStationFirstVehicle *Convert(ScriptEvent *instance) { return (ScriptEventStationFirstVehicle *)instance; }
+	static ScriptEventStationFirstVehicle *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventStationFirstVehicle *>(instance); }
 
 	/**
 	 * Get the StationID of the visited station.
@@ -827,7 +827,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventDisasterZeppelinerCrashed *Convert(ScriptEvent *instance) { return (ScriptEventDisasterZeppelinerCrashed *)instance; }
+	static ScriptEventDisasterZeppelinerCrashed *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventDisasterZeppelinerCrashed *>(instance); }
 
 	/**
 	 * Get the StationID of the station containing the affected airport.
@@ -860,7 +860,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventDisasterZeppelinerCleared *Convert(ScriptEvent *instance) { return (ScriptEventDisasterZeppelinerCleared *)instance; }
+	static ScriptEventDisasterZeppelinerCleared *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventDisasterZeppelinerCleared *>(instance); }
 
 	/**
 	 * Get the StationID of the station containing the affected airport.
@@ -893,7 +893,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventTownFounded *Convert(ScriptEvent *instance) { return (ScriptEventTownFounded *)instance; }
+	static ScriptEventTownFounded *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventTownFounded *>(instance); }
 
 	/**
 	 * Get the TownID of the town.
@@ -928,7 +928,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventAircraftDestTooFar *Convert(ScriptEvent *instance) { return (ScriptEventAircraftDestTooFar *)instance; }
+	static ScriptEventAircraftDestTooFar *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventAircraftDestTooFar *>(instance); }
 
 	/**
 	 * Get the VehicleID of the aircraft whose destination is too far away.
@@ -958,7 +958,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventAdminPort *Convert(ScriptEvent *instance) { return (ScriptEventAdminPort *)instance; }
+	static ScriptEventAdminPort *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventAdminPort *>(instance); }
 
 #ifndef DOXYGEN_API
 	/**
@@ -1003,7 +1003,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventWindowWidgetClick *Convert(ScriptEvent *instance) { return (ScriptEventWindowWidgetClick *)instance; }
+	static ScriptEventWindowWidgetClick *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventWindowWidgetClick *>(instance); }
 
 	/**
 	 * Get the class of the window that was clicked.
@@ -1056,7 +1056,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventGoalQuestionAnswer *Convert(ScriptEvent *instance) { return (ScriptEventGoalQuestionAnswer *)instance; }
+	static ScriptEventGoalQuestionAnswer *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventGoalQuestionAnswer *>(instance); }
 
 	/**
 	 * Get the unique id of the question.
@@ -1106,7 +1106,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventCompanyTown *Convert(ScriptEvent *instance) { return (ScriptEventCompanyTown *)instance; }
+	static ScriptEventCompanyTown *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventCompanyTown *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company.
@@ -1147,7 +1147,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventExclusiveTransportRights *Convert(ScriptEventCompanyTown *instance) { return (ScriptEventExclusiveTransportRights *)instance; }
+	static ScriptEventExclusiveTransportRights *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventExclusiveTransportRights *>(instance); }
 };
 
 /**
@@ -1172,7 +1172,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventRoadReconstruction *Convert(ScriptEventCompanyTown *instance) { return (ScriptEventRoadReconstruction *)instance; }
+	static ScriptEventRoadReconstruction *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventRoadReconstruction *>(instance); }
 };
 
 /**
@@ -1198,7 +1198,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventVehicleAutoReplaced *Convert(ScriptEvent *instance) { return (ScriptEventVehicleAutoReplaced *)instance; }
+	static ScriptEventVehicleAutoReplaced *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventVehicleAutoReplaced *>(instance); }
 
 	/**
 	 * Get the VehicleID of the vehicle that has been replaced.
@@ -1242,7 +1242,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventStoryPageButtonClick *Convert(ScriptEvent *instance) { return (ScriptEventStoryPageButtonClick *)instance; }
+	static ScriptEventStoryPageButtonClick *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventStoryPageButtonClick *>(instance); }
 
 	/**
 	 * Get the CompanyID of the player that selected a tile.
@@ -1295,7 +1295,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventStoryPageTileSelect *Convert(ScriptEvent *instance) { return (ScriptEventStoryPageTileSelect *)instance; }
+	static ScriptEventStoryPageTileSelect *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventStoryPageTileSelect *>(instance); }
 
 	/**
 	 * Get the CompanyID of the player that selected a tile.
@@ -1355,7 +1355,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventStoryPageVehicleSelect *Convert(ScriptEvent *instance) { return (ScriptEventStoryPageVehicleSelect *)instance; }
+	static ScriptEventStoryPageVehicleSelect *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventStoryPageVehicleSelect *>(instance); }
 
 	/**
 	 * Get the CompanyID of the player that selected a tile.
@@ -1413,7 +1413,7 @@ public:
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static ScriptEventPresidentRenamed *Convert(ScriptEvent *instance) { return static_cast<ScriptEventPresidentRenamed *>(instance); }
+	static ScriptEventPresidentRenamed *Convert(ScriptEvent *instance) { return dynamic_cast<ScriptEventPresidentRenamed *>(instance); }
 
 	/**
 	 * Get the CompanyID of the company that got its president renamed.
diff --git a/src/script/api/script_execmode.cpp b/src/script/api/script_execmode.cpp
index 007dd1ef58..81275cb49d 100644
--- a/src/script/api/script_execmode.cpp
+++ b/src/script/api/script_execmode.cpp
@@ -32,7 +32,7 @@ void ScriptExecMode::FinalRelease()
 {
 	if (this->GetDoCommandModeInstance() != this) {
 		/* Ignore this error if the script is not alive. */
-		if (ScriptObject::GetActiveInstance()->IsAlive()) {
+		if (ScriptObject::GetActiveInstance().IsAlive()) {
 			throw Script_FatalError("ScriptExecMode object was removed while it was not the latest *Mode object created.");
 		}
 	}
diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp
index 352e78b28f..486032cd70 100644
--- a/src/script/api/script_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -73,7 +73,7 @@
 {
 	if (!IsValidGroup(group_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_GROUP_NAME, group_id));
+	return ::StrMakeValid(::GetString(STR_GROUP_NAME, group_id), {});
 }
 
 /* static */ bool ScriptGroup::SetParent(GroupID group_id, GroupID parent_group_id)
diff --git a/src/script/api/script_includes.hpp.in b/src/script/api/script_includes.hpp.in
index 6b2f27e5cb..7bb7092c74 100644
--- a/src/script/api/script_includes.hpp.in
+++ b/src/script/api/script_includes.hpp.in
@@ -11,22 +11,12 @@
 
 ${SQUIRREL_INCLUDES}
 
-static SQInteger ${APIUC}ObjectConstructor(HSQUIRRELVM vm)
-{
-	return sq_throwerror(vm, "${APIUC}Object is not instantiable");
-}
-
-static SQInteger ${APIUC}ObjectCloned(HSQUIRRELVM)
-{
-	throw Script_FatalError("This instance is not cloneable");
-}
-
-void SQ${APIUC}_RegisterAll(Squirrel *engine)
+void SQ${APIUC}_RegisterAll(Squirrel &engine)
 {
 	DefSQClass<ScriptObject, ScriptType::${APIUC}> SQ${APIUC}Object("${APIUC}Object");
 	SQ${APIUC}Object.PreRegister(engine);
-	SQ${APIUC}Object.DefSQAdvancedStaticMethod(engine, &${APIUC}ObjectConstructor, "constructor");
-	SQ${APIUC}Object.DefSQAdvancedStaticMethod(engine, &${APIUC}ObjectCloned, "_cloned");
+	SQ${APIUC}Object.DefSQAdvancedStaticMethod(engine, &ScriptObject::Constructor, "constructor");
+	SQ${APIUC}Object.DefSQAdvancedStaticMethod(engine, &ScriptObject::_cloned, "_cloned");
 	SQ${APIUC}Object.PostRegister(engine);
 
 ${SQUIRREL_REGISTER}
diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp
index b04e5a47a9..dfaccb8b40 100644
--- a/src/script/api/script_industry.cpp
+++ b/src/script/api/script_industry.cpp
@@ -46,7 +46,7 @@
 {
 	if (!IsValidIndustry(industry_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_INDUSTRY_NAME, industry_id));
+	return ::StrMakeValid(::GetString(STR_INDUSTRY_NAME, industry_id), {});
 }
 
 /* static */ ScriptDate::Date ScriptIndustry::GetConstructionDate(IndustryID industry_id)
diff --git a/src/script/api/script_industrytype.cpp b/src/script/api/script_industrytype.cpp
index b6a89e86b5..5a6929deec 100644
--- a/src/script/api/script_industrytype.cpp
+++ b/src/script/api/script_industrytype.cpp
@@ -61,7 +61,7 @@
 {
 	if (!IsValidIndustryType(industry_type)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(::GetIndustrySpec(industry_type)->name));
+	return ::StrMakeValid(::GetString(::GetIndustrySpec(industry_type)->name), {});
 }
 
 /* static */ ScriptList *ScriptIndustryType::GetProducedCargo(IndustryType industry_type)
diff --git a/src/script/api/script_list.cpp b/src/script/api/script_list.cpp
index 70deef82a0..134b80287b 100644
--- a/src/script/api/script_list.cpp
+++ b/src/script/api/script_list.cpp
@@ -453,6 +453,20 @@ bool ScriptList::LoadObject(HSQUIRRELVM vm)
 	return true;
 }
 
+ScriptObject *ScriptList::CloneObject()
+{
+	ScriptList *clone = new ScriptList();
+	clone->CopyList(this);
+	return clone;
+}
+
+void ScriptList::CopyList(const ScriptList *list)
+{
+	this->Sort(list->sorter_type, list->sort_ascending);
+	this->items = list->items;
+	this->buckets = list->buckets;
+}
+
 ScriptList::ScriptList()
 {
 	/* Default sorter */
@@ -910,8 +924,7 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
 
 	/* Don't allow docommand from a Valuator, as we can't resume in
 	 * mid C++-code. */
-	bool backup_allow = ScriptObject::GetAllowDoCommand();
-	ScriptObject::SetAllowDoCommand(false);
+	ScriptObject::DisableDoCommandScope disabler{};
 
 	/* Limit the total number of ops that can be consumed by a valuate operation */
 	SQOpsLimiter limiter(vm, MAX_VALUATE_OPS, "valuator function");
@@ -932,8 +945,7 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
 		}
 
 		/* Call the function. Squirrel pops all parameters and pushes the return value. */
-		if (SQ_FAILED(sq_call(vm, nparam + 1, SQTrue, SQTrue))) {
-			ScriptObject::SetAllowDoCommand(backup_allow);
+		if (SQ_FAILED(sq_call(vm, nparam + 1, SQTrue, SQFalse))) {
 			return SQ_ERROR;
 		}
 
@@ -956,7 +968,6 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
 				/* See below for explanation. The extra pop is the return value. */
 				sq_pop(vm, nparam + 4);
 
-				ScriptObject::SetAllowDoCommand(backup_allow);
 				return sq_throwerror(vm, "return value of valuator is not valid (not integer/bool)");
 			}
 		}
@@ -966,7 +977,6 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
 			/* See below for explanation. The extra pop is the return value. */
 			sq_pop(vm, nparam + 4);
 
-			ScriptObject::SetAllowDoCommand(backup_allow);
 			return sq_throwerror(vm, "modifying valuated list outside of valuator function");
 		}
 
@@ -984,6 +994,5 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
 	 * 4. The ScriptList instance object. */
 	sq_pop(vm, nparam + 3);
 
-	ScriptObject::SetAllowDoCommand(backup_allow);
 	return 0;
 }
diff --git a/src/script/api/script_list.hpp b/src/script/api/script_list.hpp
index a2f16eb272..6027ea6273 100644
--- a/src/script/api/script_list.hpp
+++ b/src/script/api/script_list.hpp
@@ -88,11 +88,9 @@ protected:
 			sq_push(vm, 2);
 		}
 
-		/* Don't allow docommand from a Valuator, as we can't resume in
+		/* Don't allow docommand from a filter, as we can't resume in
 		 * mid C++-code. */
-		bool backup_allow = ScriptObject::GetAllowDoCommand();
-		ScriptObject::SetAllowDoCommand(false);
-
+		ScriptObject::DisableDoCommandScope disabler{};
 
 		if (nparam < 1) {
 			ScriptList::FillList<T>(list, item_valid);
@@ -101,7 +99,7 @@ protected:
 			SQOpsLimiter limiter(vm, MAX_VALUATE_OPS, "list filter function");
 
 			ScriptList::FillList<T>(list, item_valid,
-				[vm, nparam, backup_allow](const T *item) {
+				[vm, nparam](const T *item) {
 					/* Push the root table as instance object, this is what squirrel does for meta-functions. */
 					sq_pushroottable(vm);
 					/* Push all arguments for the valuator function. */
@@ -111,9 +109,8 @@ protected:
 					}
 
 					/* Call the function. Squirrel pops all parameters and pushes the return value. */
-					if (SQ_FAILED(sq_call(vm, nparam + 1, SQTrue, SQTrue))) {
-						ScriptObject::SetAllowDoCommand(backup_allow);
-						throw sq_throwerror(vm, "failed to run filter");
+					if (SQ_FAILED(sq_call(vm, nparam + 1, SQTrue, SQFalse))) {
+						throw static_cast<SQInteger>(SQ_ERROR);
 					}
 
 					SQBool add = SQFalse;
@@ -125,7 +122,6 @@ protected:
 							break;
 
 						default:
-							ScriptObject::SetAllowDoCommand(backup_allow);
 							throw sq_throwerror(vm, "return value of filter is not valid (not bool)");
 					}
 
@@ -139,8 +135,6 @@ protected:
 			/* Pop the filter function */
 			sq_poptop(vm);
 		}
-
-		ScriptObject::SetAllowDoCommand(backup_allow);
 	}
 
 	template <typename T>
@@ -151,6 +145,13 @@ protected:
 
 	virtual bool SaveObject(HSQUIRRELVM vm) override;
 	virtual bool LoadObject(HSQUIRRELVM vm) override;
+	virtual ScriptObject *CloneObject() override;
+
+	/**
+	 * Copy the content of a list.
+	 * @param list The list that will be copied.
+	 */
+	void CopyList(const ScriptList *list);
 
 public:
 	typedef std::set<SQInteger> ScriptItemList;                   ///< The list of items inside the bucket
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index a7caf017b9..b656a95c09 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -22,6 +22,7 @@
 #include "../script_fatalerror.hpp"
 #include "script_error.hpp"
 #include "../../debug.h"
+#include "../squirrel_helper.hpp"
 
 #include "../../safeguards.h"
 
@@ -46,16 +47,16 @@ void SimpleCountedObject::Release()
  */
 static ScriptStorage *GetStorage()
 {
-	return ScriptObject::GetActiveInstance()->GetStorage();
+	return ScriptObject::GetActiveInstance().GetStorage();
 }
 
 
 /* static */ ScriptInstance *ScriptObject::ActiveInstance::active = nullptr;
 
-ScriptObject::ActiveInstance::ActiveInstance(ScriptInstance *instance) : alc_scope(instance->engine)
+ScriptObject::ActiveInstance::ActiveInstance(ScriptInstance &instance) : alc_scope(instance.engine)
 {
 	this->last_active = ScriptObject::ActiveInstance::active;
-	ScriptObject::ActiveInstance::active = instance;
+	ScriptObject::ActiveInstance::active = &instance;
 }
 
 ScriptObject::ActiveInstance::~ActiveInstance()
@@ -63,10 +64,14 @@ ScriptObject::ActiveInstance::~ActiveInstance()
 	ScriptObject::ActiveInstance::active = this->last_active;
 }
 
-/* static */ ScriptInstance *ScriptObject::GetActiveInstance()
+ScriptObject::DisableDoCommandScope::DisableDoCommandScope()
+	: AutoRestoreBackup(GetStorage()->allow_do_command, false)
+{}
+
+/* static */ ScriptInstance &ScriptObject::GetActiveInstance()
 {
 	assert(ScriptObject::ActiveInstance::active != nullptr);
-	return ScriptObject::ActiveInstance::active;
+	return *ScriptObject::ActiveInstance::active;
 }
 
 
@@ -205,16 +210,6 @@ ScriptObject::ActiveInstance::~ActiveInstance()
 	return GetStorage()->last_cmd_ret;
 }
 
-/* static */ void ScriptObject::SetAllowDoCommand(bool allow)
-{
-	GetStorage()->allow_do_command = allow;
-}
-
-/* static */ bool ScriptObject::GetAllowDoCommand()
-{
-	return GetStorage()->allow_do_command;
-}
-
 /* static */ void ScriptObject::SetCompany(::CompanyID company)
 {
 	if (GetStorage()->root_company == INVALID_OWNER) GetStorage()->root_company = company;
@@ -235,13 +230,13 @@ ScriptObject::ActiveInstance::~ActiveInstance()
 
 /* static */ bool ScriptObject::CanSuspend()
 {
-	Squirrel *squirrel = ScriptObject::GetActiveInstance()->engine;
+	Squirrel *squirrel = ScriptObject::GetActiveInstance().engine;
 	return GetStorage()->allow_do_command && squirrel->CanSuspend();
 }
 
-/* static */ void *&ScriptObject::GetEventPointer()
+/* static */ ScriptEventQueue &ScriptObject::GetEventQueue()
 {
-	return GetStorage()->event_data;
+	return GetStorage()->event_queue;
 }
 
 /* static */ ScriptLogTypes::LogData &ScriptObject::GetLogData()
@@ -262,10 +257,10 @@ ScriptObject::ActiveInstance::~ActiveInstance()
 
 /* static */ CommandCallbackData *ScriptObject::GetDoCommandCallback()
 {
-	return ScriptObject::GetActiveInstance()->GetDoCommandCallback();
+	return ScriptObject::GetActiveInstance().GetDoCommandCallback();
 }
 
-std::tuple<bool, bool, bool, bool> ScriptObject::DoCommandPrep()
+/* static */ std::tuple<bool, bool, bool, bool> ScriptObject::DoCommandPrep()
 {
 	if (!ScriptObject::CanSuspend()) {
 		throw Script_FatalError("You are not allowed to execute any DoCommand (even indirect) in your constructor, Save(), Load(), and any valuator.");
@@ -287,7 +282,7 @@ std::tuple<bool, bool, bool, bool> ScriptObject::DoCommandPrep()
 	return { false, estimate_only, asynchronous, networking };
 }
 
-bool ScriptObject::DoCommandProcessResult(const CommandCost &res, Script_SuspendCallbackProc *callback, bool estimate_only, bool asynchronous)
+/* static */ bool ScriptObject::DoCommandProcessResult(const CommandCost &res, Script_SuspendCallbackProc *callback, bool estimate_only, bool asynchronous)
 {
 	/* Set the default callback to return a true/false result of the DoCommand */
 	if (callback == nullptr) callback = &ScriptInstance::DoCommandReturn;
@@ -315,7 +310,7 @@ bool ScriptObject::DoCommandProcessResult(const CommandCost &res, Script_Suspend
 		IncreaseDoCommandCosts(res.GetCost());
 		if (!_generating_world) {
 			/* Charge a nominal fee for asynchronously executed commands */
-			Squirrel *engine = ScriptObject::GetActiveInstance()->engine;
+			Squirrel *engine = ScriptObject::GetActiveInstance().engine;
 			Squirrel::DecreaseOps(engine->GetVM(), 100);
 		}
 		if (callback != nullptr) {
@@ -344,15 +339,33 @@ bool ScriptObject::DoCommandProcessResult(const CommandCost &res, Script_Suspend
 
 /* static */ ScriptObject::RandomizerArray ScriptObject::random_states;
 
-Randomizer &ScriptObject::GetRandomizer(Owner owner)
+/* static */ Randomizer &ScriptObject::GetRandomizer(Owner owner)
 {
 	return ScriptObject::random_states[owner];
 }
 
-void ScriptObject::InitializeRandomizers()
+/* static */ void ScriptObject::InitializeRandomizers()
 {
 	Randomizer random = _random;
 	for (Owner owner = OWNER_BEGIN; owner < OWNER_END; ++owner) {
 		ScriptObject::GetRandomizer(owner).SetSeed(random.Next());
 	}
 }
+
+/* static */ SQInteger ScriptObject::Constructor(HSQUIRRELVM)
+{
+	throw Script_FatalError("This class is not instantiable");
+}
+
+/* static */ SQInteger ScriptObject::_cloned(HSQUIRRELVM vm)
+{
+	ScriptObject *original = static_cast<ScriptObject *>(Squirrel::GetRealInstance(vm, 2, "Object"));
+	if (ScriptObject *clone = original->CloneObject(); clone != nullptr) {
+		clone->AddRef();
+		sq_setinstanceup(vm, 1, clone);
+		sq_setreleasehook(vm, 1, SQConvert::DefSQDestructorCallback<ScriptObject>);
+		return 0;
+	}
+
+	throw Script_FatalError("This instance is not cloneable");
+}
diff --git a/src/script/api/script_object.hpp b/src/script/api/script_object.hpp
index 9a8cf7b226..d7f4aaae11 100644
--- a/src/script/api/script_object.hpp
+++ b/src/script/api/script_object.hpp
@@ -75,7 +75,7 @@ protected:
 	class ActiveInstance {
 	friend class ScriptObject;
 	public:
-		ActiveInstance(ScriptInstance *instance);
+		ActiveInstance(ScriptInstance &instance);
 		~ActiveInstance();
 	private:
 		ScriptInstance *last_active;    ///< The active instance before we go instantiated.
@@ -84,6 +84,11 @@ protected:
 		static ScriptInstance *active;  ///< The global current active instance.
 	};
 
+	class DisableDoCommandScope : private AutoRestoreBackup<bool> {
+	public:
+		DisableDoCommandScope();
+	};
+
 	/**
 	 * Save this object.
 	 * Must push 2 elements on the stack:
@@ -100,6 +105,12 @@ protected:
 	 */
 	virtual bool LoadObject(HSQUIRRELVM) { return false; }
 
+	/**
+	 * Clone an object.
+	 * @return The clone if cloning this type is supported, nullptr otherwise.
+	 */
+	virtual ScriptObject *CloneObject() { return nullptr; }
+
 public:
 	/**
 	 * Store the latest result of a DoCommand per company.
@@ -117,7 +128,7 @@ public:
 	 * Get the currently active instance.
 	 * @return The instance.
 	 */
-	static class ScriptInstance *GetActiveInstance();
+	static class ScriptInstance &GetActiveInstance();
 
 	/**
 	 * Get a reference of the randomizer that brings this script random values.
@@ -131,6 +142,16 @@ public:
 	 */
 	static void InitializeRandomizers();
 
+	/**
+	 * Used when trying to instanciate ScriptObject from squirrel.
+	 */
+	static SQInteger Constructor(HSQUIRRELVM);
+
+	/**
+	 * Used for 'clone' from squirrel.
+	 */
+	static SQInteger _cloned(HSQUIRRELVM);
+
 protected:
 	template <Commands TCmd, typename T> struct ScriptDoCommandHelper;
 
@@ -265,21 +286,6 @@ protected:
 	 */
 	static const CommandDataBuffer &GetLastCommandResData();
 
-	/**
-	 * Store a allow_do_command per company.
-	 * @param allow The new allow.
-	 */
-	static void SetAllowDoCommand(bool allow);
-
-	/**
-	 * Get the internal value of allow_do_command. This can differ
-	 * from CanSuspend() if the reason we are not allowed
-	 * to execute a DoCommand is in squirrel and not the API.
-	 * In that case use this function to restore the previous value.
-	 * @return True iff DoCommands are allowed in the current scope.
-	 */
-	static bool GetAllowDoCommand();
-
 	/**
 	 * Set the current company to execute commands for or request
 	 *  information about.
@@ -327,12 +333,12 @@ protected:
 	static bool CanSuspend();
 
 	/**
-	 * Get the pointer to store event data in.
+	 * Get the reference to the event queue.
 	 */
-	static void *&GetEventPointer();
+	static struct ScriptEventQueue &GetEventQueue();
 
 	/**
-	 * Get the pointer to store log message in.
+	 * Get the reference to the log message storage.
 	 */
 	static ScriptLogTypes::LogData &GetLogData();
 
@@ -341,7 +347,7 @@ private:
 	static std::tuple<bool, bool, bool, bool> DoCommandPrep();
 	static bool DoCommandProcessResult(const CommandCost &res, Script_SuspendCallbackProc *callback, bool estimate_only, bool asynchronous);
 	static CommandCallbackData *GetDoCommandCallback();
-	using RandomizerArray = ReferenceThroughBaseContainer<std::array<Randomizer, OWNER_END.base()>>;
+	using RandomizerArray = TypedIndexContainer<std::array<Randomizer, OWNER_END.base()>, Owner>;
 	static RandomizerArray random_states; ///< Random states for each of the scripts (game script uses OWNER_DEITY)
 };
 
@@ -467,6 +473,14 @@ public:
 		if (this->data != nullptr) this->data->Release();
 	}
 
+	/**
+	 * Transfer ownership to the caller.
+	 */
+	[[nodiscard]] T *release()
+	{
+		return std::exchange(this->data, nullptr);
+	}
+
 	/**
 	 * Dereferencing this reference returns a reference to the reference
 	 * counted object
diff --git a/src/script/api/script_objecttype.cpp b/src/script/api/script_objecttype.cpp
index a0a7ee6e51..82303b331c 100644
--- a/src/script/api/script_objecttype.cpp
+++ b/src/script/api/script_objecttype.cpp
@@ -28,7 +28,7 @@
 {
 	EnforcePrecondition(std::nullopt, IsValidObjectType(object_type));
 
-	return ::StrMakeValid(::GetString(ObjectSpec::Get(object_type)->name));
+	return ::StrMakeValid(::GetString(ObjectSpec::Get(object_type)->name), {});
 }
 
 /* static */ SQInteger ScriptObjectType::GetViews(ObjectType object_type)
diff --git a/src/script/api/script_order.cpp b/src/script/api/script_order.cpp
index bab0603ea5..f43b5305cb 100644
--- a/src/script/api/script_order.cpp
+++ b/src/script/api/script_order.cpp
@@ -8,6 +8,7 @@
 /** @file script_order.cpp Implementation of ScriptOrder. */
 
 #include "../../stdafx.h"
+#include <ranges>
 #include "script_order.hpp"
 #include "script_cargo.hpp"
 #include "script_map.hpp"
@@ -34,7 +35,7 @@ static OrderType GetOrderTypeByTile(TileIndex t)
 	switch (::GetTileType(t)) {
 		default: break;
 		case MP_STATION:
-			if (IsBuoy(t) || IsRailWaypoint(t)) return OT_GOTO_WAYPOINT;
+			if (IsBuoy(t) || IsRailWaypoint(t) || IsRoadWaypoint(t)) return OT_GOTO_WAYPOINT;
 			if (IsHangar(t)) return OT_GOTO_DEPOT;
 			return OT_GOTO_STATION;
 
@@ -67,15 +68,12 @@ static const Order *ResolveOrder(VehicleID vehicle_id, ScriptOrder::OrderPositio
 		order_position = ScriptOrder::ResolveOrderPosition(vehicle_id, order_position);
 		if (order_position == ScriptOrder::ORDER_INVALID) return nullptr;
 	}
-	const Order *order = v->GetFirstOrder();
-	assert(order != nullptr);
-	while (order->GetType() == OT_IMPLICIT) order = order->next;
-	while (order_position > 0) {
-		order_position = (ScriptOrder::OrderPosition)(order_position - 1);
-		order = order->next;
-		while (order->GetType() == OT_IMPLICIT) order = order->next;
-	}
-	return order;
+
+	auto real_orders = v->Orders() | std::views::filter([](const Order &order) { return !order.IsType(OT_IMPLICIT); });
+	auto it = std::ranges::next(std::begin(real_orders), order_position, std::end(real_orders));
+	if (it != std::end(real_orders)) return &*it;
+
+	return nullptr;
 }
 
 /**
@@ -91,17 +89,10 @@ static int ScriptOrderPositionToRealOrderPosition(VehicleID vehicle_id, ScriptOr
 
 	assert(ScriptOrder::IsValidVehicleOrder(vehicle_id, order_position));
 
-	int res = (int)order_position;
-	const Order *order = v->orders->GetFirstOrder();
-	assert(order != nullptr);
-	for (; order->GetType() == OT_IMPLICIT; order = order->next) res++;
-	while (order_position > 0) {
-		order_position = (ScriptOrder::OrderPosition)(order_position - 1);
-		order = order->next;
-		for (; order->GetType() == OT_IMPLICIT; order = order->next) res++;
-	}
-
-	return res;
+	auto orders = v->Orders();
+	auto real_orders = orders | std::views::filter([](const Order &order) { return !order.IsType(OT_IMPLICIT); });
+	auto it = std::ranges::next(std::begin(real_orders), order_position, std::end(real_orders));
+	return static_cast<int>(std::distance(std::begin(orders), it.base()));
 }
 
 /**
@@ -111,14 +102,13 @@ static int ScriptOrderPositionToRealOrderPosition(VehicleID vehicle_id, ScriptOr
  */
 static ScriptOrder::OrderPosition RealOrderPositionToScriptOrderPosition(VehicleID vehicle_id, int order_position)
 {
-	const Order *order = ::Vehicle::Get(vehicle_id)->GetFirstOrder();
-	assert(order != nullptr);
-	int num_implicit_orders = 0;
-	for (int i = 0; i < order_position; i++) {
-		if (order->GetType() == OT_IMPLICIT) num_implicit_orders++;
-		order = order->next;
-	}
-	return static_cast<ScriptOrder::OrderPosition>(order_position - num_implicit_orders);
+	const Vehicle *v = ::Vehicle::Get(vehicle_id);
+
+	auto orders = v->Orders();
+	auto first = std::begin(orders);
+	auto last = std::ranges::next(first, order_position, std::end(orders));
+	int num_implicit = static_cast<int>(std::count_if(first, last, [](const Order &order) { return order.IsType(OT_IMPLICIT); }));
+	return static_cast<ScriptOrder::OrderPosition>(order_position - num_implicit);
 }
 
 /* static */ bool ScriptOrder::IsGotoStationOrder(VehicleID vehicle_id, OrderPosition order_position)
@@ -296,8 +286,12 @@ static ScriptOrder::OrderPosition RealOrderPositionToScriptOrderPosition(Vehicle
 				for (TileIndex t : wp->train_station) {
 					if (wp->TileBelongsToRailStation(t)) return t;
 				}
+			} else if (wp->road_waypoint_area.tile != INVALID_TILE) {
+				for (TileIndex t : wp->road_waypoint_area) {
+					if (::IsRoadWaypointTile(t) && ::GetStationIndex(t) == wp->index) return t;
+				}
 			}
-			/* If the waypoint has no rail waypoint tiles, it must have a buoy */
+			/* If the waypoint has no rail or road waypoint tiles, it must have a buoy */
 			return wp->xy;
 		}
 		default:               return INVALID_TILE;
@@ -579,7 +573,7 @@ static ScriptOrder::OrderPosition RealOrderPositionToScriptOrderPosition(Vehicle
  * between the wanted and the current order.
  * @param instance The script instance we are doing the callback for.
  */
-static void _DoCommandReturnSetOrderFlags(class ScriptInstance *instance)
+static void _DoCommandReturnSetOrderFlags(class ScriptInstance &instance)
 {
 	ScriptObject::SetLastCommandRes(ScriptOrder::_SetOrderFlags());
 	ScriptInstance::DoCommandReturn(instance);
diff --git a/src/script/api/script_priorityqueue.cpp b/src/script/api/script_priorityqueue.cpp
index c9cdc82862..14fe6d59f2 100644
--- a/src/script/api/script_priorityqueue.cpp
+++ b/src/script/api/script_priorityqueue.cpp
@@ -26,9 +26,9 @@ static bool operator==(const ScriptPriorityQueue::PriorityItem &lhs, const HSQOB
 ScriptPriorityQueue::~ScriptPriorityQueue()
 {
 	/* Release reference to stored objects. */
-	auto inst = ScriptObject::GetActiveInstance();
-	if (!inst->InShutdown()) {
-		for (auto &i : this->queue) inst->ReleaseSQObject(const_cast<HSQOBJECT *>(&i.second));
+	auto &inst = ScriptObject::GetActiveInstance();
+	if (!inst.InShutdown()) {
+		for (auto &i : this->queue) inst.ReleaseSQObject(const_cast<HSQOBJECT *>(&i.second));
 	}
 }
 
diff --git a/src/script/api/script_rail.cpp b/src/script/api/script_rail.cpp
index a1edc6c510..592fed196a 100644
--- a/src/script/api/script_rail.cpp
+++ b/src/script/api/script_rail.cpp
@@ -28,7 +28,7 @@
 {
 	if (!IsRailTypeAvailable(rail_type)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(GetRailTypeInfo((::RailType)rail_type)->strings.menu_text));
+	return ::StrMakeValid(::GetString(GetRailTypeInfo((::RailType)rail_type)->strings.menu_text), {});
 }
 
 /* static */ bool ScriptRail::IsRailTile(TileIndex tile)
@@ -175,8 +175,7 @@
 	EnforcePrecondition(false, source_industry == ScriptIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == ScriptIndustryType::INDUSTRYTYPE_TOWN || ScriptIndustryType::IsValidIndustryType(source_industry));
 	EnforcePrecondition(false, goal_industry   == ScriptIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry   == ScriptIndustryType::INDUSTRYTYPE_TOWN || ScriptIndustryType::IsValidIndustryType(goal_industry));
 
-	const GRFFile *file;
-	uint16_t res = GetAiPurchaseCallbackResult(
+	auto res = GetAiPurchaseCallbackResult(
 		GSF_STATIONS,
 		cargo_type,
 		0,
@@ -185,17 +184,16 @@
 		ClampTo<uint8_t>(distance / 2),
 		AICE_STATION_GET_STATION_ID,
 		source_station ? 0 : 1,
-		std::min<SQInteger>(15u, num_platforms) << 4 | std::min<SQInteger>(15u, platform_length),
-		&file
+		std::min<SQInteger>(15u, num_platforms) << 4 | std::min<SQInteger>(15u, platform_length)
 	);
 
 	Axis axis = direction == RAILTRACK_NW_SE ? AXIS_Y : AXIS_X;
 	bool adjacent = station_id != ScriptStation::STATION_JOIN_ADJACENT;
 	StationID to_join = ScriptStation::IsValidStation(station_id) ? station_id : StationID::Invalid();
-	if (res != CALLBACK_FAILED) {
-		const StationSpec *spec = StationClass::GetByGrf(file->grfid, res);
+	if (res.second != CALLBACK_FAILED) {
+		const StationSpec *spec = StationClass::GetByGrf(res.first->grfid, res.second);
 		if (spec == nullptr) {
-			Debug(grf, 1, "{} returned an invalid station ID for 'AI construction/purchase selection (18)' callback", file->filename);
+			Debug(grf, 1, "{} returned an invalid station ID for 'AI construction/purchase selection (18)' callback", res.first->filename);
 		} else {
 			/* We might have gotten an usable station spec. Try to build it, but if it fails we'll fall back to the original station. */
 			if (ScriptObject::Command<CMD_BUILD_RAIL_STATION>::Do(tile, (::RailType)GetCurrentRailType(), axis, num_platforms, platform_length, spec->class_index, spec->index, to_join, adjacent)) return true;
diff --git a/src/script/api/script_road.cpp b/src/script/api/script_road.cpp
index b2152b409b..1a689f8647 100644
--- a/src/script/api/script_road.cpp
+++ b/src/script/api/script_road.cpp
@@ -30,7 +30,7 @@
 {
 	if (!IsRoadTypeAvailable(road_type)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(GetRoadTypeInfo((::RoadType)road_type)->strings.name));
+	return ::StrMakeValid(::GetString(GetRoadTypeInfo((::RoadType)road_type)->strings.name), {});
 }
 
 /* static */ bool ScriptRoad::IsRoadTile(TileIndex tile)
@@ -132,7 +132,7 @@
 	EnforcePrecondition(false, ::IsValidTile(end_tile));
 	EnforcePrecondition(false, IsRoadTypeAvailable(road_type));
 
-	return ScriptObject::Command<CMD_CONVERT_ROAD>::Do(start_tile, end_tile, (::RoadType)road_type);
+	return ScriptObject::Command<CMD_CONVERT_ROAD>::Do(start_tile, end_tile, (::RoadType)road_type, false);
 }
 
 /* Helper functions for ScriptRoad::CanBuildConnectedRoadParts(). */
diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp
index ea4cfddbb6..10f73adc1f 100644
--- a/src/script/api/script_sign.cpp
+++ b/src/script/api/script_sign.cpp
@@ -52,7 +52,7 @@
 {
 	if (!IsValidSign(sign_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_SIGN_NAME, sign_id));
+	return ::StrMakeValid(::GetString(STR_SIGN_NAME, sign_id), {});
 }
 
 /* static */ TileIndex ScriptSign::GetLocation(SignID sign_id)
diff --git a/src/script/api/script_station.cpp b/src/script/api/script_station.cpp
index 551831d633..07100981c2 100644
--- a/src/script/api/script_station.cpp
+++ b/src/script/api/script_station.cpp
@@ -26,13 +26,6 @@
 	return st != nullptr && (st->owner == ScriptObject::GetCompany() || ScriptCompanyMode::IsDeity() || st->owner == OWNER_NONE);
 }
 
-/* static */ ScriptCompany::CompanyID ScriptStation::GetOwner(StationID station_id)
-{
-	if (!IsValidStation(station_id)) return ScriptCompany::COMPANY_INVALID;
-
-	return ScriptCompany::ToScriptCompanyID(::Station::Get(station_id)->owner);
-}
-
 /* static */ StationID ScriptStation::GetStationID(TileIndex tile)
 {
 	if (!::IsValidTile(tile) || !::IsTileType(tile, MP_STATION)) return StationID::Invalid();
diff --git a/src/script/api/script_station.hpp b/src/script/api/script_station.hpp
index 0c43deef3c..32bd2827ed 100644
--- a/src/script/api/script_station.hpp
+++ b/src/script/api/script_station.hpp
@@ -59,15 +59,6 @@ public:
 	 */
 	static bool IsValidStation(StationID station_id);
 
-	/**
-	 * Get the owner of a station.
-	 * @param station_id The station to get the owner of.
-	 * @pre IsValidStation(station_id).
-	 * @return The owner the station has.
-	 * @api -ai
-	 */
-	static ScriptCompany::CompanyID GetOwner(StationID station_id);
-
 	/**
 	 * Get the StationID of a tile, if there is a station.
 	 * @param tile The tile to find the stationID of
diff --git a/src/script/api/script_stationlist.cpp b/src/script/api/script_stationlist.cpp
index 564fbe5766..459c9100f5 100644
--- a/src/script/api/script_stationlist.cpp
+++ b/src/script/api/script_stationlist.cpp
@@ -34,8 +34,8 @@ ScriptStationList_Vehicle::ScriptStationList_Vehicle(VehicleID vehicle_id)
 
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 
-	for (Order *o = v->GetFirstOrder(); o != nullptr; o = o->next) {
-		if (o->IsType(OT_GOTO_STATION)) this->AddItem(o->GetDestination().ToStationID().base());
+	for (const Order &o : v->Orders()) {
+		if (o.IsType(OT_GOTO_STATION)) this->AddItem(o.GetDestination().ToStationID().base());
 	}
 }
 
diff --git a/src/script/api/script_testmode.cpp b/src/script/api/script_testmode.cpp
index a38deff548..5d7e2eadd8 100644
--- a/src/script/api/script_testmode.cpp
+++ b/src/script/api/script_testmode.cpp
@@ -32,7 +32,7 @@ void ScriptTestMode::FinalRelease()
 {
 	if (this->GetDoCommandModeInstance() != this) {
 		/* Ignore this error if the script is not alive. */
-		if (ScriptObject::GetActiveInstance()->IsAlive()) {
+		if (ScriptObject::GetActiveInstance().IsAlive()) {
 			throw Script_FatalError("Testmode object was removed while it was not the latest *Mode object created.");
 		}
 	}
diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
index 89333e6982..a546be61c0 100644
--- a/src/script/api/script_text.cpp
+++ b/src/script/api/script_text.cpp
@@ -14,6 +14,7 @@
 #include "script_text.hpp"
 #include "script_log.hpp"
 #include "../script_fatalerror.hpp"
+#include "../../core/string_consumer.hpp"
 #include "../../table/control_codes.h"
 
 #include "table/strings.h"
@@ -56,14 +57,14 @@ ScriptText::ScriptText(HSQUIRRELVM vm)
 
 SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm)
 {
-	if (parameter >= SCRIPT_TEXT_MAX_PARAMETERS) return SQ_ERROR;
+	if (static_cast<size_t>(parameter) >= std::size(this->param)) this->param.resize(parameter + 1);
 
 	switch (sq_gettype(vm, -1)) {
 		case OT_STRING: {
-			const SQChar *value;
-			sq_getstring(vm, -1, &value);
+			std::string_view view;
+			sq_getstring(vm, -1, view);
 
-			this->param[parameter] = StrMakeValid(value);
+			this->param[parameter] = StrMakeValid(view);
 			break;
 		}
 
@@ -83,7 +84,7 @@ SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm)
 
 			/* Validate if it is a GSText instance */
 			sq_pushroottable(vm);
-			sq_pushstring(vm, "GSText", -1);
+			sq_pushstring(vm, "GSText");
 			sq_get(vm, -2);
 			sq_pushobject(vm, instance);
 			if (sq_instanceof(vm) != SQTrue) return SQ_ERROR;
@@ -98,10 +99,13 @@ SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm)
 			break;
 		}
 
+		case OT_NULL:
+			this->param[parameter] = {};
+			break;
+
 		default: return SQ_ERROR;
 	}
 
-	if (this->paramc <= parameter) this->paramc = parameter + 1;
 	return 0;
 }
 
@@ -112,7 +116,6 @@ SQInteger ScriptText::SetParam(HSQUIRRELVM vm)
 	SQInteger k;
 	sq_getinteger(vm, 2, &k);
 
-	if (k > SCRIPT_TEXT_MAX_PARAMETERS) return SQ_ERROR;
 	if (k < 1) return SQ_ERROR;
 	k--;
 
@@ -122,7 +125,7 @@ SQInteger ScriptText::SetParam(HSQUIRRELVM vm)
 SQInteger ScriptText::AddParam(HSQUIRRELVM vm)
 {
 	SQInteger res;
-	res = this->_SetParam(this->paramc, vm);
+	res = this->_SetParam(static_cast<int>(std::size(this->param)), vm);
 	if (res != 0) return res;
 
 	/* Push our own instance back on top of the stack */
@@ -135,13 +138,15 @@ SQInteger ScriptText::_set(HSQUIRRELVM vm)
 	int32_t k;
 
 	if (sq_gettype(vm, 2) == OT_STRING) {
-		const SQChar *key_string;
-		sq_getstring(vm, 2, &key_string);
+		std::string_view view;
+		sq_getstring(vm, 2, view);
 
-		std::string str = StrMakeValid(key_string);
-		if (!str.starts_with("param_") || str.size() > 8) return SQ_ERROR;
+		std::string str = StrMakeValid(view);
+		if (!str.starts_with("param_")) return SQ_ERROR;
 
-		k = stoi(str.substr(6));
+		auto key = ParseInteger<int32_t>(str.substr(6));
+		if (!key.has_value()) return SQ_ERROR;
+		k = *key;
 	} else if (sq_gettype(vm, 2) == OT_INTEGER) {
 		SQInteger key;
 		sq_getinteger(vm, 2, &key);
@@ -150,13 +155,35 @@ SQInteger ScriptText::_set(HSQUIRRELVM vm)
 		return SQ_ERROR;
 	}
 
-	if (k > SCRIPT_TEXT_MAX_PARAMETERS) return SQ_ERROR;
 	if (k < 1) return SQ_ERROR;
 	k--;
 
 	return this->_SetParam(k, vm);
 }
 
+/**
+ * Set the number of padding parameters to use, for compatibility with old scripts.
+ * This is called during RegisterGameTranslation.
+ */
+void ScriptText::SetPadParameterCount(HSQUIRRELVM vm)
+{
+	ScriptText::pad_parameter_count = 0;
+
+	SQInteger top = sq_gettop(vm);
+	sq_pushroottable(vm);
+	sq_pushstring(vm, "GSText");
+	if (!SQ_FAILED(sq_get(vm, -2))) {
+		sq_pushstring(vm, "SCRIPT_TEXT_MAX_PARAMETERS");
+		if (!SQ_FAILED(sq_get(vm, -2))) {
+			SQInteger value;
+			if (!SQ_FAILED(sq_getinteger(vm, -1, &value))) {
+				ScriptText::pad_parameter_count = value;
+			}
+		}
+	}
+	sq_pop(vm, top);
+}
+
 EncodedString ScriptText::GetEncodedText()
 {
 	ScriptTextList seen_texts;
@@ -166,7 +193,6 @@ EncodedString ScriptText::GetEncodedText()
 	StringBuilder builder(result);
 	this->_FillParamList(params, seen_texts);
 	this->_GetEncodedText(builder, param_count, params, true);
-	if (param_count > SCRIPT_TEXT_MAX_PARAMETERS) throw Script_FatalError(fmt::format("{}: Too many parameters", GetGameStringName(this->string)));
 	return ::EncodedString{std::move(result)};
 }
 
@@ -175,21 +201,21 @@ void ScriptText::_FillParamList(ParamList &params, ScriptTextList &seen_texts)
 	if (std::ranges::find(seen_texts, this) != seen_texts.end()) throw Script_FatalError(fmt::format("{}: Circular reference detected", GetGameStringName(this->string)));
 	seen_texts.push_back(this);
 
-	for (int i = 0; i < this->paramc; i++) {
-		Param *p = &this->param[i];
-		params.emplace_back(this->string, i, p);
-		if (!std::holds_alternative<ScriptTextRef>(*p)) continue;
-		std::get<ScriptTextRef>(*p)->_FillParamList(params, seen_texts);
+	for (int idx = 0; Param &p : this->param) {
+		params.emplace_back(this->string, idx, &p);
+		++idx;
+		if (!std::holds_alternative<ScriptTextRef>(p)) continue;
+		std::get<ScriptTextRef>(p)->_FillParamList(params, seen_texts);
 	}
 
 	seen_texts.pop_back();
 
-	/* Fill with dummy parameters to match FormatString() behaviour. */
-	if (seen_texts.empty()) {
-		static Param dummy = 0;
-		int nb_extra = SCRIPT_TEXT_MAX_PARAMETERS - (int)params.size();
-		for (int i = 0; i < nb_extra; i++)
-			params.emplace_back(StringIndexInTab(-1), i, &dummy);
+	/* Fill with dummy parameters to match old FormatString() compatibility behaviour. */
+	if (seen_texts.empty() && ScriptText::pad_parameter_count > 0) {
+		static Param dummy = {};
+		for (int idx = static_cast<int>(std::size(this->param)); idx < ScriptText::pad_parameter_count; ++idx) {
+			params.emplace_back(StringIndexInTab(-1), idx, &dummy);
+		}
 	}
 }
 
@@ -201,6 +227,8 @@ void ScriptText::ParamCheck::Encode(StringBuilder &builder, std::string_view cmd
 	struct visitor {
 		StringBuilder &builder;
 
+		void operator()(const std::monostate &) { }
+
 		void operator()(std::string value)
 		{
 			this->builder.PutUtf8(SCC_ENCODED_STRING);
@@ -211,7 +239,8 @@ void ScriptText::ParamCheck::Encode(StringBuilder &builder, std::string_view cmd
 		void operator()(const SQInteger &value)
 		{
 			this->builder.PutUtf8(SCC_ENCODED_NUMERIC);
-			this->builder.PutIntegerBase(value, 16);
+			/* Sign-extend the value, then store as unsigned */
+			this->builder.PutIntegerBase<uint64_t>(static_cast<uint64_t>(static_cast<int64_t>(value)), 16);
 		}
 
 		void operator()(const ScriptTextRef &value)
diff --git a/src/script/api/script_text.hpp b/src/script/api/script_text.hpp
index 50f4864358..62fd3ba587 100644
--- a/src/script/api/script_text.hpp
+++ b/src/script/api/script_text.hpp
@@ -75,8 +75,6 @@ private:
  */
 class ScriptText : public Text {
 public:
-	static const int SCRIPT_TEXT_MAX_PARAMETERS = 20; ///< The maximum amount of parameters you can give to one object.
-
 #ifndef DOXYGEN_API
 	/**
 	 * The constructor wrapper from Squirrel.
@@ -128,10 +126,15 @@ public:
 	 */
 	EncodedString GetEncodedText() override;
 
+	/**
+	 * @api -all
+	 */
+	static void SetPadParameterCount(HSQUIRRELVM vm);
+
 private:
 	using ScriptTextRef = ScriptObjectRef<ScriptText>;
 	using ScriptTextList = std::vector<ScriptText *>;
-	using Param = std::variant<SQInteger, std::string, ScriptTextRef>;
+	using Param = std::variant<std::monostate, SQInteger, std::string, ScriptTextRef>;
 
 	struct ParamCheck {
 		StringIndexInTab owner;
@@ -149,8 +152,9 @@ private:
 	using ParamSpan = std::span<ParamCheck>;
 
 	StringIndexInTab string;
-	std::array<Param, SCRIPT_TEXT_MAX_PARAMETERS> param = {};
-	int paramc = 0;
+	std::vector<Param> param{};
+
+	static inline int pad_parameter_count = 0; ///< Pad parameters for relaxed string validation.
 
 	/**
 	 * Internal function to recursively fill a list of parameters.
diff --git a/src/script/api/script_tilelist.cpp b/src/script/api/script_tilelist.cpp
index 83596d22bc..9f89ae0c6d 100644
--- a/src/script/api/script_tilelist.cpp
+++ b/src/script/api/script_tilelist.cpp
@@ -23,6 +23,13 @@ bool ScriptTileList::SaveObject(HSQUIRRELVM vm)
 	return true;
 }
 
+ScriptObject *ScriptTileList::CloneObject()
+{
+	ScriptTileList *clone = new ScriptTileList();
+	clone->CopyList(this);
+	return clone;
+}
+
 void ScriptTileList::AddRectangle(TileIndex t1, TileIndex t2)
 {
 	if (!::IsValidTile(t1)) return;
@@ -144,8 +151,8 @@ ScriptTileList_StationType::ScriptTileList_StationType(StationID station_id, Scr
 	if ((station_type & ScriptStation::STATION_TRAIN) != 0)      station_types.Set(::StationType::Rail);
 	if ((station_type & ScriptStation::STATION_TRUCK_STOP) != 0) station_types.Set(::StationType::Truck);
 	if ((station_type & ScriptStation::STATION_BUS_STOP) != 0)   station_types.Set(::StationType::Bus);
-	if ((station_type & ScriptStation::STATION_AIRPORT) != 0)    station_types.Set(::StationType::Airport).Set(::StationType::Oilrig);
-	if ((station_type & ScriptStation::STATION_DOCK) != 0)       station_types.Set(::StationType::Dock).Set(::StationType::Oilrig);
+	if ((station_type & ScriptStation::STATION_AIRPORT) != 0)    station_types.Set({::StationType::Airport, ::StationType::Oilrig});
+	if ((station_type & ScriptStation::STATION_DOCK) != 0)       station_types.Set({::StationType::Dock, ::StationType::Oilrig});
 
 	TileArea ta(::TileXY(rect->left, rect->top), rect->Width(), rect->Height());
 	for (TileIndex cur_tile : ta) {
diff --git a/src/script/api/script_tilelist.hpp b/src/script/api/script_tilelist.hpp
index a6308ec182..4b2a2ef9f6 100644
--- a/src/script/api/script_tilelist.hpp
+++ b/src/script/api/script_tilelist.hpp
@@ -22,6 +22,7 @@
 class ScriptTileList : public ScriptList {
 protected:
 	virtual bool SaveObject(HSQUIRRELVM) override;
+	virtual ScriptObject *CloneObject() override;
 public:
 	/**
 	 * Adds the rectangle between tile_from and tile_to to the to-be-evaluated tiles.
diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp
index 832851571b..35b84d84af 100644
--- a/src/script/api/script_town.cpp
+++ b/src/script/api/script_town.cpp
@@ -37,7 +37,7 @@
 {
 	if (!IsValidTown(town_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_TOWN_NAME, town_id));
+	return ::StrMakeValid(::GetString(STR_TOWN_NAME, town_id), {});
 }
 
 /* static */ bool ScriptTown::SetName(TownID town_id, Text *name)
@@ -206,7 +206,7 @@
 	if (!IsValidTown(town_id)) return false;
 
 	const Town *t = ::Town::Get(town_id);
-	return ((uint32_t)GetDistanceSquareToTile(town_id, tile) <= t->cache.squared_town_zone_radius[HZB_TOWN_EDGE]);
+	return ((uint32_t)GetDistanceSquareToTile(town_id, tile) <= t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]);
 }
 
 /* static */ bool ScriptTown::HasStatue(TownID town_id)
@@ -278,7 +278,7 @@
 
 	houses = std::min<SQInteger>(houses, UINT32_MAX);
 
-	return ScriptObject::Command<CMD_EXPAND_TOWN>::Do(town_id, houses);
+	return ScriptObject::Command<CMD_EXPAND_TOWN>::Do(town_id, houses, {TownExpandMode::Buildings, TownExpandMode::Roads});
 }
 
 /* static */ bool ScriptTown::FoundTown(TileIndex tile, TownSize size, bool city, RoadLayout layout, Text *name)
diff --git a/src/script/api/script_tunnel.cpp b/src/script/api/script_tunnel.cpp
index 2703922d27..ce7877dd8a 100644
--- a/src/script/api/script_tunnel.cpp
+++ b/src/script/api/script_tunnel.cpp
@@ -51,7 +51,7 @@
  * Helper function to connect a just built tunnel to nearby roads.
  * @param instance The script instance we have to built the road for.
  */
-static void _DoCommandReturnBuildTunnel2(class ScriptInstance *instance)
+static void _DoCommandReturnBuildTunnel2(class ScriptInstance &instance)
 {
 	if (!ScriptTunnel::_BuildTunnelRoad2()) {
 		ScriptInstance::DoCommandReturn(instance);
@@ -67,7 +67,7 @@ static void _DoCommandReturnBuildTunnel2(class ScriptInstance *instance)
  * Helper function to connect a just built tunnel to nearby roads.
  * @param instance The script instance we have to built the road for.
  */
-static void _DoCommandReturnBuildTunnel1(class ScriptInstance *instance)
+static void _DoCommandReturnBuildTunnel1(class ScriptInstance &instance)
 {
 	if (!ScriptTunnel::_BuildTunnelRoad1()) {
 		ScriptInstance::DoCommandReturn(instance);
diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp
index 0f491fb966..ccc869fcdc 100644
--- a/src/script/api/script_vehicle.cpp
+++ b/src/script/api/script_vehicle.cpp
@@ -304,7 +304,7 @@
 {
 	if (!IsPrimaryVehicle(vehicle_id)) return std::nullopt;
 
-	return ::StrMakeValid(::GetString(STR_VEHICLE_NAME, vehicle_id));
+	return ::StrMakeValid(::GetString(STR_VEHICLE_NAME, vehicle_id), {});
 }
 
 /* static */ SQInteger ScriptVehicle::GetAge(VehicleID vehicle_id)
diff --git a/src/script/api/script_vehiclelist.cpp b/src/script/api/script_vehiclelist.cpp
index 68113654e5..9b52e90934 100644
--- a/src/script/api/script_vehiclelist.cpp
+++ b/src/script/api/script_vehiclelist.cpp
@@ -12,6 +12,7 @@
 #include "script_group.hpp"
 #include "script_map.hpp"
 #include "script_station.hpp"
+#include "script_waypoint.hpp"
 #include "../../depot_map.h"
 #include "../../vehicle_base.h"
 #include "../../vehiclelist_func.h"
@@ -33,17 +34,52 @@ ScriptVehicleList::ScriptVehicleList(HSQUIRRELVM vm)
 	);
 }
 
-ScriptVehicleList_Station::ScriptVehicleList_Station(StationID station_id)
+ScriptVehicleList_Station::ScriptVehicleList_Station(HSQUIRRELVM vm)
 {
 	EnforceDeityOrCompanyModeValid_Void();
+
+	int nparam = sq_gettop(vm) - 1;
+
+	if (nparam < 1 || nparam > 2) throw sq_throwerror(vm, "wrong number of parameters");
+
+	SQInteger sqstationid;
+	if (SQ_FAILED(sq_getinteger(vm, 2, &sqstationid))) {
+		throw sq_throwerror(vm, "parameter 1 must be an integer");
+	}
+	StationID station_id = static_cast<StationID>(sqstationid);
 	if (!ScriptBaseStation::IsValidBaseStation(station_id)) return;
 
+	bool is_deity = ScriptCompanyMode::IsDeity();
+	::CompanyID owner = ScriptObject::GetCompany();
+	::VehicleType type = VEH_INVALID;
+
+	if (nparam == 2) {
+		SQInteger sqtype;
+		if (SQ_FAILED(sq_getinteger(vm, 3, &sqtype))) {
+			throw sq_throwerror(vm, "parameter 2 must be an integer");
+		}
+		if (sqtype < ScriptVehicle::VT_RAIL || sqtype > ScriptVehicle::VT_AIR) return;
+		type = static_cast<::VehicleType>(sqtype);
+	}
+
+	FindVehiclesWithOrder(
+		[is_deity, owner, type](const Vehicle *v) { return (is_deity || v->owner == owner) && (type == VEH_INVALID || v->type == type); },
+		[station_id](const Order *order) { return (order->IsType(OT_GOTO_STATION) || order->IsType(OT_GOTO_WAYPOINT)) && order->GetDestination() == station_id; },
+		[this](const Vehicle *v) { this->AddItem(v->index.base()); }
+	);
+}
+
+ScriptVehicleList_Waypoint::ScriptVehicleList_Waypoint(StationID waypoint_id)
+{
+	EnforceDeityOrCompanyModeValid_Void();
+	if (!ScriptWaypoint::IsValidWaypoint(waypoint_id)) return;
+
 	bool is_deity = ScriptCompanyMode::IsDeity();
 	::CompanyID owner = ScriptObject::GetCompany();
 
 	FindVehiclesWithOrder(
 		[is_deity, owner](const Vehicle *v) { return is_deity || v->owner == owner; },
-		[station_id](const Order *order) { return (order->IsType(OT_GOTO_STATION) || order->IsType(OT_GOTO_WAYPOINT)) && order->GetDestination() == station_id; },
+		[waypoint_id](const Order *order) { return order->IsType(OT_GOTO_WAYPOINT) && order->GetDestination() == waypoint_id; },
 		[this](const Vehicle *v) { this->AddItem(v->index.base()); }
 	);
 }
diff --git a/src/script/api/script_vehiclelist.hpp b/src/script/api/script_vehiclelist.hpp
index ad4b3cb0ef..a6b7330626 100644
--- a/src/script/api/script_vehiclelist.hpp
+++ b/src/script/api/script_vehiclelist.hpp
@@ -58,11 +58,39 @@ public:
  */
 class ScriptVehicleList_Station : public ScriptList {
 public:
+#ifdef DOXYGEN_API
 	/**
 	 * @param station_id The station to get the list of vehicles from, which have orders to it.
 	 * @pre ScriptBaseStation::IsValidBaseStation(station_id)
 	 */
 	ScriptVehicleList_Station(StationID station_id);
+
+	/**
+	 * @param station_id The station to get the list of vehicles from, which have orders to it.
+	 * @param vehicle_type The VehicleType to get the list of vehicles for.
+	 * @pre ScriptBaseStation::IsValidBaseStation(station_id)
+	 */
+	ScriptVehicleList_Station(StationID station_id, ScriptVehicle::VehicleType vehicle_type);
+#else
+	/**
+	* The constructor wrapper from Squirrel.
+	*/
+	ScriptVehicleList_Station(HSQUIRRELVM vm);
+#endif /* DOXYGEN_API */
+};
+
+/**
+ * Creates a list of vehicles that have orders to a given waypoint.
+ * @api ai game
+ * @ingroup ScriptList
+ */
+class ScriptVehicleList_Waypoint : public ScriptList {
+public:
+	/**
+	 * @param waypoint_id The waypoint to get the list of vehicles from, which have orders to it.
+	 * @pre ScriptWaypoint::IsValidWaypoint(waypoint_id)
+	 */
+	ScriptVehicleList_Waypoint(StationID waypoint_id);
 };
 
 /**
diff --git a/src/script/api/script_waypointlist.cpp b/src/script/api/script_waypointlist.cpp
index 1fb0f4bf8c..ad6ed72513 100644
--- a/src/script/api/script_waypointlist.cpp
+++ b/src/script/api/script_waypointlist.cpp
@@ -34,7 +34,7 @@ ScriptWaypointList_Vehicle::ScriptWaypointList_Vehicle(VehicleID vehicle_id)
 
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 
-	for (const Order *o = v->GetFirstOrder(); o != nullptr; o = o->next) {
-		if (o->IsType(OT_GOTO_WAYPOINT)) this->AddItem(o->GetDestination().ToStationID().base());
+	for (const Order &o : v->Orders()) {
+		if (o.IsType(OT_GOTO_WAYPOINT)) this->AddItem(o.GetDestination().ToStationID().base());
 	}
 }
diff --git a/src/script/api/squirrel_export.hpp.sq.in b/src/script/api/squirrel_export.sq.hpp.in
similarity index 100%
rename from src/script/api/squirrel_export.hpp.sq.in
rename to src/script/api/squirrel_export.sq.hpp.in
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
index c5d8d136c8..a599a7e30a 100644
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -20,10 +20,10 @@
 
 #include "../safeguards.h"
 
-void ScriptConfig::Change(std::optional<std::string> name, int version, bool force_exact_match)
+void ScriptConfig::Change(std::optional<std::string_view> name, int version, bool force_exact_match)
 {
 	if (name.has_value()) {
-		this->name = std::move(name.value());
+		this->name = name.value();
 		this->info = this->FindInfo(this->name, version, force_exact_match);
 	} else {
 		this->info = nullptr;
@@ -88,7 +88,7 @@ int ScriptConfig::GetSetting(const std::string &name) const
 	return (*it).second;
 }
 
-void ScriptConfig::SetSetting(const std::string_view name, int value)
+void ScriptConfig::SetSetting(std::string_view name, int value)
 {
 	/* You can only set Script specific settings if an Script is selected. */
 	if (this->info == nullptr) return;
@@ -140,7 +140,7 @@ int ScriptConfig::GetVersion() const
 	return this->version;
 }
 
-void ScriptConfig::StringToSettings(const std::string &value)
+void ScriptConfig::StringToSettings(std::string_view value)
 {
 	std::string_view to_process = value;
 	for (;;) {
@@ -168,7 +168,7 @@ std::string ScriptConfig::SettingsToString() const
 
 	std::string result;
 	for (const auto &item : this->settings) {
-		fmt::format_to(std::back_inserter(result), "{}={},", item.first, item.second);
+		format_append(result, "{}={},", item.first, item.second);
 	}
 
 	/* Remove the last ','. */
diff --git a/src/script/script_config.hpp b/src/script/script_config.hpp
index cb019d90ab..76da137bcf 100644
--- a/src/script/script_config.hpp
+++ b/src/script/script_config.hpp
@@ -19,7 +19,7 @@ static const int INT32_DIGITS_WITH_SIGN_AND_TERMINATION = 10 + 1 + 1;
 
 /** Flags for Script settings. */
 enum class ScriptConfigFlag : uint8_t {
-	// Unused flag 0x1.
+	/* Unused flag 0x1. */
 	Boolean   = 1, ///< This value is a boolean (either 0 (false) or 1 (true) ).
 	InGame    = 2, ///< This setting can be changed while the Script is running.
 	Developer = 3, ///< This setting will only be visible when the Script development tools are active.
@@ -78,7 +78,7 @@ public:
 	 * @param force_exact_match If true try to find the exact same version
 	 *   as specified. If false any compatible version is ok.
 	 */
-	void Change(std::optional<std::string> name, int version = -1, bool force_exact_match = false);
+	void Change(std::optional<std::string_view> name, int version = -1, bool force_exact_match = false);
 
 	/**
 	 * Get the ScriptInfo linked to this ScriptConfig.
@@ -122,7 +122,7 @@ public:
 	/**
 	 * Set the value of a setting for this config.
 	 */
-	void SetSetting(const std::string_view name, int value);
+	void SetSetting(std::string_view name, int value);
 
 	/**
 	 * Reset all settings to their default value.
@@ -154,7 +154,7 @@ public:
 	 * Convert a string which is stored in the config file or savegames to
 	 *  custom settings of this Script.
 	 */
-	void StringToSettings(const std::string &value);
+	void StringToSettings(std::string_view value);
 
 	/**
 	 * Convert the custom settings to a string that can be stored in the config
diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp
index 28c9f2f379..ece3632c6f 100644
--- a/src/script/script_gui.cpp
+++ b/src/script/script_gui.cpp
@@ -25,6 +25,7 @@
 #include "../strings_func.h"
 #include "../timer/timer.h"
 #include "../timer/timer_window.h"
+#include "../core/string_consumer.hpp"
 
 #include "script_gui.h"
 #include "script_log.hpp"
@@ -70,7 +71,7 @@ struct ScriptListWindow : public Window {
 	ScriptListWindow(WindowDesc &desc, CompanyID slot, bool show_all) : Window(desc),
 		slot(slot), show_all(show_all)
 	{
-		if (slot == OWNER_DEITY) {
+		if (this->slot == OWNER_DEITY) {
 			this->info_list = this->show_all ? Game::GetInfoList() : Game::GetUniqueInfoList();
 		} else {
 			this->info_list = this->show_all ? AI::GetInfoList() : AI::GetUniqueInfoList();
@@ -83,8 +84,8 @@ struct ScriptListWindow : public Window {
 		this->vscroll->SetCount(this->info_list->size() + 1);
 
 		/* Try if we can find the currently selected AI */
-		if (GetConfig(slot)->HasScript()) {
-			ScriptInfo *info = GetConfig(slot)->GetInfo();
+		if (GetConfig(this->slot)->HasScript()) {
+			ScriptInfo *info = GetConfig(this->slot)->GetInfo();
 			int i = 0;
 			for (const auto &item : *this->info_list) {
 				if (item.second == info) {
@@ -111,7 +112,7 @@ struct ScriptListWindow : public Window {
 		this->line_height = GetCharacterHeight(FS_NORMAL) + padding.height;
 
 		resize.width = 1;
-		resize.height = this->line_height;
+		fill.height = resize.height = this->line_height;
 		size.height = 5 * this->line_height;
 	}
 
@@ -167,25 +168,25 @@ struct ScriptListWindow : public Window {
 	void ChangeScript()
 	{
 		if (this->selected == -1) {
-			GetConfig(slot)->Change(std::nullopt);
+			GetConfig(this->slot)->Change(std::nullopt);
 		} else {
 			ScriptInfoList::const_iterator it = this->info_list->cbegin();
 			std::advance(it, this->selected);
-			GetConfig(slot)->Change(it->second->GetName(), it->second->GetVersion());
+			GetConfig(this->slot)->Change(it->second->GetName(), it->second->GetVersion());
 		}
 		if (_game_mode == GM_EDITOR) {
-			if (slot == OWNER_DEITY) {
+			if (this->slot == OWNER_DEITY) {
 				if (Game::GetInstance() != nullptr) Game::ResetInstance();
 				Game::StartNew();
 			} else {
-				Company *c = Company::GetIfValid(slot);
+				Company *c = Company::GetIfValid(this->slot);
 				if (c != nullptr && c->ai_instance != nullptr) {
 					c->ai_instance.reset();
-					AI::StartNew(slot);
+					AI::StartNew(this->slot);
 				}
 			}
 		}
-		InvalidateWindowData(WC_GAME_OPTIONS, slot == OWNER_DEITY ? WN_GAME_OPTIONS_GS : WN_GAME_OPTIONS_AI);
+		InvalidateWindowData(WC_GAME_OPTIONS, this->slot == OWNER_DEITY ? WN_GAME_OPTIONS_GS : WN_GAME_OPTIONS_AI);
 		InvalidateWindowClassesData(WC_SCRIPT_SETTINGS);
 		InvalidateWindowClassesData(WC_SCRIPT_DEBUG, -1);
 		CloseWindowByClass(WC_QUERY_STRING);
@@ -197,7 +198,7 @@ struct ScriptListWindow : public Window {
 		switch (widget) {
 			case WID_SCRL_LIST: { // Select one of the Scripts
 				int sel = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_SCRL_LIST) - 1;
-				if (sel < (int)this->info_list->size()) {
+				if (sel < static_cast<int>(this->info_list->size())) {
 					this->selected = sel;
 					this->SetDirty();
 					if (click_count > 1) {
@@ -213,10 +214,6 @@ struct ScriptListWindow : public Window {
 				this->Close();
 				break;
 			}
-
-			case WID_SCRL_CANCEL:
-				this->Close();
-				break;
 		}
 	}
 
@@ -260,10 +257,7 @@ static constexpr NWidgetPart _nested_script_list_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_MAUVE, WID_SCRL_INFO_BG), SetMinimalTextLines(8, WidgetDimensions::unscaled.framerect.Vertical() + WidgetDimensions::unscaled.vsep_normal * 3), SetResize(1, 0),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_SCRL_ACCEPT), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_AI_LIST_ACCEPT, STR_AI_LIST_ACCEPT_TOOLTIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_SCRL_CANCEL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_AI_LIST_CANCEL, STR_AI_LIST_CANCEL_TOOLTIP),
-		EndContainer(),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_SCRL_ACCEPT), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_AI_LIST_ACCEPT, STR_AI_LIST_ACCEPT_TOOLTIP),
 		NWidget(WWT_RESIZEBOX, COLOUR_MAUVE),
 	EndContainer(),
 };
@@ -313,7 +307,7 @@ struct ScriptSettingsWindow : public Window {
 	{
 		this->CreateNestedTree();
 		this->vscroll = this->GetScrollbar(WID_SCRS_SCROLLBAR);
-		this->FinishInitNested(slot);  // Initializes 'this->line_height' as side effect.
+		this->FinishInitNested(this->slot);  // Initializes 'this->line_height' as side effect.
 
 		this->OnInvalidateData();
 	}
@@ -325,12 +319,12 @@ struct ScriptSettingsWindow : public Window {
 	 */
 	void RebuildVisibleSettings()
 	{
-		visible_settings.clear();
+		this->visible_settings.clear();
 
 		for (const auto &item : *this->script_config->GetConfigList()) {
 			bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer);
 			if (no_hide || _settings_client.gui.ai_developer_tools) {
-				visible_settings.push_back(&item);
+				this->visible_settings.push_back(&item);
 			}
 		}
 
@@ -351,7 +345,7 @@ struct ScriptSettingsWindow : public Window {
 		this->line_height = std::max(SETTING_BUTTON_HEIGHT, GetCharacterHeight(FS_NORMAL)) + padding.height;
 
 		resize.width = 1;
-		resize.height = this->line_height;
+		fill.height = resize.height = this->line_height;
 		size.height = 5 * this->line_height;
 	}
 
@@ -359,7 +353,7 @@ struct ScriptSettingsWindow : public Window {
 	{
 		if (widget != WID_SCRS_BACKGROUND) return;
 
-		Rect ir = r.Shrink(WidgetDimensions::scaled.framerect);
+		Rect ir = r.Shrink(WidgetDimensions::scaled.frametext, RectPadding::zero);
 		bool rtl = _current_text_dir == TD_RTL;
 		Rect br = ir.WithWidth(SETTING_BUTTON_WIDTH, rtl);
 		Rect tr = ir.Indent(SETTING_BUTTON_WIDTH + WidgetDimensions::scaled.hsep_wide, rtl);
@@ -375,11 +369,11 @@ struct ScriptSettingsWindow : public Window {
 			bool editable = this->IsEditableItem(config_item);
 
 			if (config_item.flags.Test(ScriptConfigFlag::Boolean)) {
-				DrawBoolButton(br.left, y + button_y_offset, current_value != 0, editable);
+				DrawBoolButton(br.left, y + button_y_offset, COLOUR_YELLOW, COLOUR_MAUVE, current_value != 0, editable);
 			} else {
 				int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it));
 				if (config_item.complete_labels) {
-					DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && clicked_dropdown, editable);
+					DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && this->clicked_dropdown, editable);
 				} else {
 					DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value);
 				}
@@ -419,7 +413,7 @@ struct ScriptSettingsWindow : public Window {
 
 				bool bool_item = config_item.flags.Test(ScriptConfigFlag::Boolean);
 
-				Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix, RectPadding::zero);
+				Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.frametext, RectPadding::zero);
 				int x = pt.x - r.left;
 				if (_current_text_dir == TD_RTL) x = r.Width() - 1 - x;
 
@@ -482,10 +476,6 @@ struct ScriptSettingsWindow : public Window {
 				break;
 			}
 
-			case WID_SCRS_ACCEPT:
-				this->Close();
-				break;
-
 			case WID_SCRS_RESET:
 				this->script_config->ResetEditableSettings(_game_mode == GM_MENU || ((this->slot != OWNER_DEITY) && !Company::IsValidID(this->slot)));
 				this->SetDirty();
@@ -495,20 +485,20 @@ struct ScriptSettingsWindow : public Window {
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
-		if (!str.has_value() || str->empty()) return;
-		int32_t value = atoi(str->c_str());
-
-		SetValue(value);
+		if (!str.has_value()) return;
+		auto value = ParseInteger<int32_t>(*str, 10, true);
+		if (!value.has_value()) return;
+		this->SetValue(*value);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_SCRS_SETTING_DROPDOWN) return;
 		assert(this->clicked_dropdown);
-		SetValue(index);
+		this->SetValue(index);
 	}
 
-	void OnDropdownClose(Point, WidgetID widget, int, bool) override
+	void OnDropdownClose(Point, WidgetID widget, int, int, bool) override
 	{
 		if (widget != WID_SCRS_SETTING_DROPDOWN) return;
 		/* We cannot raise the dropdown button just yet. OnClick needs some hint, whether
@@ -576,9 +566,8 @@ static constexpr NWidgetPart _nested_script_settings_widgets[] = {
 		NWidget(NWID_VSCROLLBAR, COLOUR_MAUVE, WID_SCRS_SCROLLBAR),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_SCRS_ACCEPT), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_AI_SETTINGS_CLOSE),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_SCRS_RESET), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_AI_SETTINGS_RESET),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_SCRS_RESET), SetStringTip(STR_AI_SETTINGS_RESET),
+		NWidget(WWT_PANEL, COLOUR_MAUVE), SetResize(1, 0), SetFill(1, 0),
 		EndContainer(),
 		NWidget(WWT_RESIZEBOX, COLOUR_MAUVE),
 	EndContainer(),
@@ -608,7 +597,7 @@ void ShowScriptSettingsWindow(CompanyID slot)
 struct ScriptTextfileWindow : public TextfileWindow {
 	CompanyID slot{}; ///< View the textfile of this CompanyID slot.
 
-	ScriptTextfileWindow(TextfileType file_type, CompanyID slot) : TextfileWindow(file_type), slot(slot)
+	ScriptTextfileWindow(Window *parent, TextfileType file_type, CompanyID slot) : TextfileWindow(parent, file_type), slot(slot)
 	{
 		this->ConstructWindow();
 		this->OnInvalidateData();
@@ -617,7 +606,7 @@ struct ScriptTextfileWindow : public TextfileWindow {
 	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
 	{
 		if (widget == WID_TF_CAPTION) {
-			return GetString(stringid, (slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI, GetConfig(slot)->GetInfo()->GetName());
+			return GetString(stringid, (this->slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI, GetConfig(this->slot)->GetInfo()->GetName());
 		}
 
 		return this->Window::GetWidgetString(widget, stringid);
@@ -625,11 +614,11 @@ struct ScriptTextfileWindow : public TextfileWindow {
 
 	void OnInvalidateData([[maybe_unused]] int data = 0, [[maybe_unused]] bool gui_scope = true) override
 	{
-		auto textfile = GetConfig(slot)->GetTextfile(file_type, slot);
+		auto textfile = GetConfig(this->slot)->GetTextfile(file_type, this->slot);
 		if (!textfile.has_value()) {
 			this->Close();
 		} else {
-			this->LoadTextfile(textfile.value(), (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
+			this->LoadTextfile(textfile.value(), (this->slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
 		}
 	}
 };
@@ -639,10 +628,10 @@ struct ScriptTextfileWindow : public TextfileWindow {
  * @param file_type The type of textfile to display.
  * @param slot The slot the Script is using.
  */
-void ShowScriptTextfileWindow(TextfileType file_type, CompanyID slot)
+void ShowScriptTextfileWindow(Window *parent, TextfileType file_type, CompanyID slot)
 {
-	CloseWindowById(WC_TEXTFILE, file_type);
-	new ScriptTextfileWindow(file_type, slot);
+	parent->CloseChildWindowById(WC_TEXTFILE, file_type);
+	new ScriptTextfileWindow(parent, file_type, slot);
 }
 
 
@@ -743,13 +732,13 @@ struct ScriptDebugWindow : public Window {
 
 		for (const Company *c : Company::Iterate()) {
 			if (c->is_ai) {
-				ChangeToScript(c->index);
+				this->ChangeToScript(c->index);
 				return;
 			}
 		}
 
 		/* If no AI is available, see if there is a game script. */
-		if (Game::GetInstance() != nullptr) ChangeToScript(OWNER_DEITY);
+		if (Game::GetInstance() != nullptr) this->ChangeToScript(OWNER_DEITY);
 	}
 
 	/**
@@ -800,7 +789,7 @@ struct ScriptDebugWindow : public Window {
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
 	{
 		if (widget == WID_SCRD_LOG_PANEL) {
-			resize.height = GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal;
+			fill.height = resize.height = GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal;
 			size.height = 14 * resize.height + WidgetDimensions::scaled.framerect.Vertical();
 		}
 	}
@@ -855,9 +844,9 @@ struct ScriptDebugWindow : public Window {
 	void DrawWidgetCompanyButton(const Rect &r, WidgetID widget, int start) const
 	{
 		if (this->IsWidgetDisabled(widget)) return;
-		CompanyID cid = (CompanyID)(widget - start);
+		CompanyID cid = static_cast<CompanyID>(widget - start);
 		Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON);
-		DrawCompanyIcon(cid, CenterBounds(r.left, r.right, sprite_size.width), CenterBounds(r.top, r.bottom, sprite_size.height));
+		DrawCompanyIcon(cid, CentreBounds(r.left, r.right, sprite_size.width), CentreBounds(r.top, r.bottom, sprite_size.height));
 	}
 
 	/**
@@ -920,7 +909,7 @@ struct ScriptDebugWindow : public Window {
 
 		ScriptLogTypes::LogData &log = this->GetLogData();
 
-		int scroll_count = (int)log.size();
+		int scroll_count = static_cast<int>(log.size());
 		if (this->vscroll->GetCount() != scroll_count) {
 			this->vscroll->SetCount(scroll_count);
 
@@ -932,10 +921,10 @@ struct ScriptDebugWindow : public Window {
 
 		/* Detect when the user scrolls the window. Enable autoscroll when the bottom-most line becomes visible. */
 		if (this->last_vscroll_pos != this->vscroll->GetPosition()) {
-			this->autoscroll = this->vscroll->GetPosition() + this->vscroll->GetCapacity() >= (int)log.size();
+			this->autoscroll = this->vscroll->GetPosition() + this->vscroll->GetCapacity() >= static_cast<int>(log.size());
 		}
 
-		if (this->autoscroll && this->vscroll->SetPosition((int)log.size())) {
+		if (this->autoscroll && this->vscroll->SetPosition(static_cast<int>(log.size()))) {
 			/* We need a repaint */
 			this->SetWidgetDirty(WID_SCRD_VSCROLLBAR);
 			this->SetWidgetDirty(WID_SCRD_LOG_PANEL);
@@ -1014,12 +1003,12 @@ struct ScriptDebugWindow : public Window {
 
 		/* Check which button is clicked */
 		if (IsInsideMM(widget, WID_SCRD_COMPANY_BUTTON_START, WID_SCRD_COMPANY_BUTTON_END + 1)) {
-			ChangeToScript((CompanyID)(widget - WID_SCRD_COMPANY_BUTTON_START), _ctrl_pressed);
+			this->ChangeToScript(static_cast<CompanyID>(widget - WID_SCRD_COMPANY_BUTTON_START), _ctrl_pressed);
 		}
 
 		switch (widget) {
 			case WID_SCRD_SCRIPT_GAME:
-				ChangeToScript(OWNER_DEITY, _ctrl_pressed);
+				this->ChangeToScript(OWNER_DEITY, _ctrl_pressed);
 				break;
 
 			case WID_SCRD_RELOAD_TOGGLE:
@@ -1122,7 +1111,7 @@ struct ScriptDebugWindow : public Window {
 					}
 
 					/* Highlight row that matched */
-					this->highlight_row = (int)(log.size() - 1);
+					this->highlight_row = static_cast<int>(log.size() - 1);
 				}
 			}
 		}
diff --git a/src/script/script_gui.h b/src/script/script_gui.h
index e2adceb40c..abb2063679 100644
--- a/src/script/script_gui.h
+++ b/src/script/script_gui.h
@@ -13,10 +13,12 @@
 #include "../company_type.h"
 #include "../textfile_type.h"
 
+struct Window;
+
 void ShowScriptListWindow(CompanyID slot, bool show_all);
 Window *ShowScriptDebugWindow(CompanyID show_company = CompanyID::Invalid(), bool new_window = false);
 void ShowScriptSettingsWindow(CompanyID slot);
-void ShowScriptTextfileWindow(TextfileType file_type, CompanyID slot);
+void ShowScriptTextfileWindow(Window *parent, TextfileType file_type, CompanyID slot);
 void ShowScriptDebugWindowIfScriptError();
 void InitializeScriptGui();
 
diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp
index ffb74bea5f..65d23fe0ea 100644
--- a/src/script/script_info.cpp
+++ b/src/script/script_info.cpp
@@ -14,11 +14,12 @@
 
 #include "script_info.hpp"
 #include "script_scanner.hpp"
+#include "../core/string_consumer.hpp"
 #include "../3rdparty/fmt/format.h"
 
 #include "../safeguards.h"
 
-bool ScriptInfo::CheckMethod(const char *name) const
+bool ScriptInfo::CheckMethod(std::string_view name) const
 {
 	if (!this->engine->MethodExists(this->SQ_instance, name)) {
 		this->engine->ThrowError(fmt::format("your info.nut/library.nut doesn't have the method '{}'", name));
@@ -27,18 +28,18 @@ bool ScriptInfo::CheckMethod(const char *name) const
 	return true;
 }
 
-/* static */ SQInteger ScriptInfo::Constructor(HSQUIRRELVM vm, ScriptInfo *info)
+/* static */ SQInteger ScriptInfo::Constructor(HSQUIRRELVM vm, ScriptInfo &info)
 {
 	/* Set some basic info from the parent */
-	Squirrel::GetInstance(vm, &info->SQ_instance, 2);
+	Squirrel::GetInstance(vm, &info.SQ_instance, 2);
 	/* Make sure the instance stays alive over time */
-	sq_addref(vm, &info->SQ_instance);
+	sq_addref(vm, &info.SQ_instance);
 
-	info->scanner = (ScriptScanner *)Squirrel::GetGlobalPointer(vm);
-	info->engine = info->scanner->GetEngine();
+	info.scanner = (ScriptScanner *)Squirrel::GetGlobalPointer(vm);
+	info.engine = info.scanner->GetEngine();
 
 	/* Ensure the mandatory functions exist */
-	static const char * const required_functions[] = {
+	static const std::string_view required_functions[] = {
 		"GetAuthor",
 		"GetName",
 		"GetShortName",
@@ -48,30 +49,31 @@ bool ScriptInfo::CheckMethod(const char *name) const
 		"CreateInstance",
 	};
 	for (const auto &required_function : required_functions) {
-		if (!info->CheckMethod(required_function)) return SQ_ERROR;
+		if (!info.CheckMethod(required_function)) return SQ_ERROR;
 	}
 
 	/* Get location information of the scanner */
-	info->main_script = info->scanner->GetMainScript();
-	info->tar_file = info->scanner->GetTarFile();
+	info.main_script = info.scanner->GetMainScript();
+	info.tar_file = info.scanner->GetTarFile();
 
 	/* Cache the data the info file gives us. */
-	if (!info->engine->CallStringMethod(info->SQ_instance, "GetAuthor", &info->author, MAX_GET_OPS)) return SQ_ERROR;
-	if (!info->engine->CallStringMethod(info->SQ_instance, "GetName", &info->name, MAX_GET_OPS)) return SQ_ERROR;
-	if (!info->engine->CallStringMethod(info->SQ_instance, "GetShortName", &info->short_name, MAX_GET_OPS)) return SQ_ERROR;
-	if (!info->engine->CallStringMethod(info->SQ_instance, "GetDescription", &info->description, MAX_GET_OPS)) return SQ_ERROR;
-	if (!info->engine->CallStringMethod(info->SQ_instance, "GetDate", &info->date, MAX_GET_OPS)) return SQ_ERROR;
-	if (!info->engine->CallIntegerMethod(info->SQ_instance, "GetVersion", &info->version, MAX_GET_OPS)) return SQ_ERROR;
-	if (!info->engine->CallStringMethod(info->SQ_instance, "CreateInstance", &info->instance_name, MAX_CREATEINSTANCE_OPS)) return SQ_ERROR;
+	if (!info.engine->CallStringMethod(info.SQ_instance, "GetAuthor", &info.author, MAX_GET_OPS)) return SQ_ERROR;
+	if (!info.engine->CallStringMethod(info.SQ_instance, "GetName", &info.name, MAX_GET_OPS)) return SQ_ERROR;
+	if (!info.engine->CallStringMethod(info.SQ_instance, "GetShortName", &info.short_name, MAX_GET_OPS)) return SQ_ERROR;
+	if (!info.engine->CallStringMethod(info.SQ_instance, "GetDescription", &info.description, MAX_GET_OPS)) return SQ_ERROR;
+	if (!info.engine->CallStringMethod(info.SQ_instance, "GetDate", &info.date, MAX_GET_OPS)) return SQ_ERROR;
+	if (!info.engine->CallIntegerMethod(info.SQ_instance, "GetVersion", &info.version, MAX_GET_OPS)) return SQ_ERROR;
+	if (info.version < 0) return SQ_ERROR;
+	if (!info.engine->CallStringMethod(info.SQ_instance, "CreateInstance", &info.instance_name, MAX_CREATEINSTANCE_OPS)) return SQ_ERROR;
 
 	/* The GetURL function is optional. */
-	if (info->engine->MethodExists(info->SQ_instance, "GetURL")) {
-		if (!info->engine->CallStringMethod(info->SQ_instance, "GetURL", &info->url, MAX_GET_OPS)) return SQ_ERROR;
+	if (info.engine->MethodExists(info.SQ_instance, "GetURL")) {
+		if (!info.engine->CallStringMethod(info.SQ_instance, "GetURL", &info.url, MAX_GET_OPS)) return SQ_ERROR;
 	}
 
 	/* Check if we have settings */
-	if (info->engine->MethodExists(info->SQ_instance, "GetSettings")) {
-		if (!info->GetSettings()) return SQ_ERROR;
+	if (info.engine->MethodExists(info.SQ_instance, "GetSettings")) {
+		if (!info.GetSettings()) return SQ_ERROR;
 	}
 
 	return 0;
@@ -82,65 +84,74 @@ bool ScriptInfo::GetSettings()
 	return this->engine->CallMethod(this->SQ_instance, "GetSettings", nullptr, MAX_GET_SETTING_OPS);
 }
 
+enum class ScriptConfigItemKey : uint8_t {
+	Name,
+	Description,
+	MinValue,
+	MaxValue,
+	MediumValue,
+	DefaultValue,
+	Flags,
+};
+using ScriptConfigItemKeys = EnumBitSet<ScriptConfigItemKey, uint8_t>;
+
 SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
 {
 	ScriptConfigItem config;
-	uint items = 0;
+	ScriptConfigItemKeys present{};
 
 	int medium_value = INT32_MIN;
 
 	/* Read the table, and find all properties we care about */
 	sq_pushnull(vm);
 	while (SQ_SUCCEEDED(sq_next(vm, -2))) {
-		const SQChar *key_string;
-		if (SQ_FAILED(sq_getstring(vm, -2, &key_string))) return SQ_ERROR;
+		std::string_view key_string;
+		if (SQ_FAILED(sq_getstring(vm, -2, key_string))) return SQ_ERROR;
 		std::string key = StrMakeValid(key_string);
 
 		if (key == "name") {
-			const SQChar *sqvalue;
-			if (SQ_FAILED(sq_getstring(vm, -1, &sqvalue))) return SQ_ERROR;
+			std::string_view sqvalue;
+			if (SQ_FAILED(sq_getstring(vm, -1, sqvalue))) return SQ_ERROR;
 
 			/* Don't allow '=' and ',' in configure setting names, as we need those
 			 *  2 chars to nicely store the settings as a string. */
 			auto replace_with_underscore = [](auto c) { return c == '=' || c == ','; };
 			config.name = StrMakeValid(sqvalue);
 			std::replace_if(config.name.begin(), config.name.end(), replace_with_underscore, '_');
-			items |= 0x001;
+			present.Set(ScriptConfigItemKey::Name);
 		} else if (key == "description") {
-			const SQChar *sqdescription;
-			if (SQ_FAILED(sq_getstring(vm, -1, &sqdescription))) return SQ_ERROR;
+			std::string_view sqdescription;
+			if (SQ_FAILED(sq_getstring(vm, -1, sqdescription))) return SQ_ERROR;
 			config.description = StrMakeValid(sqdescription);
-			items |= 0x002;
+			present.Set(ScriptConfigItemKey::Description);
 		} else if (key == "min_value") {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.min_value = ClampTo<int32_t>(res);
-			items |= 0x004;
+			present.Set(ScriptConfigItemKey::MinValue);
 		} else if (key == "max_value") {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.max_value = ClampTo<int32_t>(res);
-			items |= 0x008;
+			present.Set(ScriptConfigItemKey::MaxValue);
 		} else if (key == "easy_value") {
-			// No longer parsed.
-			items |= 0x010;
+			/* No longer parsed. */
 		} else if (key == "medium_value") {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			medium_value = ClampTo<int32_t>(res);
-			items |= 0x020;
+			present.Set(ScriptConfigItemKey::MediumValue);
 		} else if (key == "hard_value") {
-			// No longer parsed.
-			items |= 0x040;
+			/* No longer parsed. */
 		} else if (key == "custom_value") {
-			// No longer parsed.
+			/* No longer parsed. */
 		} else if (key == "default_value") {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.default_value = ClampTo<int32_t>(res);
-			items |= 0x080;
+			present.Set(ScriptConfigItemKey::DefaultValue);
 		} else if (key == "random_deviation") {
-			// No longer parsed.
+			/* No longer parsed. */
 		} else if (key == "step_size") {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
@@ -148,8 +159,8 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
 		} else if (key == "flags") {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
-			config.flags = (ScriptConfigFlags)res;
-			items |= 0x100;
+			config.flags = static_cast<ScriptConfigFlags>(res);
+			present.Set(ScriptConfigItemKey::Flags);
 		} else {
 			this->engine->ThrowError(fmt::format("unknown setting property '{}'", key));
 			return SQ_ERROR;
@@ -162,23 +173,22 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
 	/* Check if default_value is set. Although required, this was changed with
 	 * 14.0, and as such, older AIs don't use it yet. So we convert the older
 	 * values into a default_value. */
-	if ((items & 0x080) == 0) {
+	if (!present.Test(ScriptConfigItemKey::DefaultValue)) {
 		/* Easy/medium/hard should all three be defined. */
-		if ((items & 0x010) == 0 || (items & 0x020) == 0 || (items & 0x040) == 0) {
+		if (!present.Test(ScriptConfigItemKey::MediumValue)) {
 			this->engine->ThrowError("please define all properties of a setting (min/max not allowed for booleans)");
 			return SQ_ERROR;
 		}
 
 		config.default_value = medium_value;
-		items |= 0x080;
-	} else {
-		/* For compatibility, also act like the default sets the easy/medium/hard. */
-		items |= 0x010 | 0x020 | 0x040;
+		present.Set(ScriptConfigItemKey::DefaultValue);
 	}
 
-	/* Make sure all properties are defined */
-	uint mask = config.flags.Test(ScriptConfigFlag::Boolean) ? 0x1F3 : 0x1FF;
-	if (items != mask) {
+	/* Make sure all required properties are defined */
+	ScriptConfigItemKeys required = {ScriptConfigItemKey::Name, ScriptConfigItemKey::Description, ScriptConfigItemKey::DefaultValue, ScriptConfigItemKey::Flags};
+	if (!config.flags.Test(ScriptConfigFlag::Boolean)) required.Set({ScriptConfigItemKey::MinValue, ScriptConfigItemKey::MaxValue});
+
+	if (!present.All(required)) {
 		this->engine->ThrowError("please define all properties of a setting (min/max not allowed for booleans)");
 		return SQ_ERROR;
 	}
@@ -189,9 +199,9 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
 
 SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm)
 {
-	const SQChar *setting_name_str;
-	if (SQ_FAILED(sq_getstring(vm, -2, &setting_name_str))) return SQ_ERROR;
-	std::string setting_name = StrMakeValid(setting_name_str);
+	std::string_view setting_name_view;
+	if (SQ_FAILED(sq_getstring(vm, -2, setting_name_view))) return SQ_ERROR;
+	std::string setting_name = StrMakeValid(setting_name_view);
 
 	ScriptConfigItem *config = nullptr;
 	for (auto &item : this->config_list) {
@@ -207,21 +217,22 @@ SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm)
 	/* Read the table and find all labels */
 	sq_pushnull(vm);
 	while (SQ_SUCCEEDED(sq_next(vm, -2))) {
-		const SQChar *key_string;
-		const SQChar *label;
-		if (SQ_FAILED(sq_getstring(vm, -2, &key_string))) return SQ_ERROR;
-		if (SQ_FAILED(sq_getstring(vm, -1, &label))) return SQ_ERROR;
+		std::string_view key_string;
+		std::string_view label;
+		if (SQ_FAILED(sq_getstring(vm, -2, key_string))) return SQ_ERROR;
+		if (SQ_FAILED(sq_getstring(vm, -1, label))) return SQ_ERROR;
 		/* Because squirrel doesn't support identifiers starting with a digit,
 		 * we skip the first character. */
-		key_string++;
+		key_string.remove_prefix(1);
 		int sign = 1;
-		if (*key_string == '_') {
+		if (key_string.starts_with('_')) {
 			/* When the second character is '_', it indicates the value is negative. */
 			sign = -1;
-			key_string++;
+			key_string.remove_prefix(1);
 		}
-		int key = atoi(key_string) * sign;
-		config->labels[key] = StrMakeValid(label);
+		auto key = ParseInteger<int>(key_string);
+		if (!key.has_value()) return SQ_ERROR;
+		config->labels[*key * sign] = StrMakeValid(label);
 
 		sq_pop(vm, 2);
 	}
@@ -244,7 +255,7 @@ const ScriptConfigItemList *ScriptInfo::GetConfigList() const
 	return &this->config_list;
 }
 
-const ScriptConfigItem *ScriptInfo::GetConfigItem(const std::string_view name) const
+const ScriptConfigItem *ScriptInfo::GetConfigItem(std::string_view name) const
 {
 	for (const auto &item : this->config_list) {
 		if (item.name == name) return &item;
diff --git a/src/script/script_info.hpp b/src/script/script_info.hpp
index 20c7d28b81..f1920aa120 100644
--- a/src/script/script_info.hpp
+++ b/src/script/script_info.hpp
@@ -82,12 +82,12 @@ public:
 	/**
 	 * Check if a given method exists.
 	 */
-	bool CheckMethod(const char *name) const;
+	bool CheckMethod(std::string_view name) const;
 
 	/**
 	 * Process the creation of a FileInfo object.
 	 */
-	static SQInteger Constructor(HSQUIRRELVM vm, ScriptInfo *info);
+	static SQInteger Constructor(HSQUIRRELVM vm, ScriptInfo &info);
 
 	/**
 	 * Get the scanner which has found this ScriptInfo.
@@ -107,7 +107,7 @@ public:
 	/**
 	 * Get the description of a certain Script config option.
 	 */
-	const ScriptConfigItem *GetConfigItem(const std::string_view name) const;
+	const ScriptConfigItem *GetConfigItem(std::string_view name) const;
 
 	/**
 	 * Set a setting.
@@ -149,7 +149,7 @@ private:
 	class ScriptScanner *scanner = nullptr; ///< ScriptScanner object that was used to scan this script info.
 };
 
-void Script_CreateDummyInfo(HSQUIRRELVM vm, const char *type, const char *dir);
-void Script_CreateDummy(HSQUIRRELVM vm, StringID string, const char *type);
+void Script_CreateDummyInfo(HSQUIRRELVM vm, std::string_view type, std::string_view dir);
+void Script_CreateDummy(HSQUIRRELVM vm, StringID string, std::string_view type);
 
 #endif /* SCRIPT_INFO_HPP */
diff --git a/src/script/script_info_dummy.cpp b/src/script/script_info_dummy.cpp
index 46654721e1..df7519bcaf 100644
--- a/src/script/script_info_dummy.cpp
+++ b/src/script/script_info_dummy.cpp
@@ -12,7 +12,7 @@
 
 #include "../string_func.h"
 #include "../strings_func.h"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"
 
@@ -26,7 +26,7 @@
  */
 
 /** Run the dummy info.nut. */
-void Script_CreateDummyInfo(HSQUIRRELVM vm, const char *type, const char *dir)
+void Script_CreateDummyInfo(HSQUIRRELVM vm, std::string_view type, std::string_view dir)
 {
 	std::string dummy_script = fmt::format(
 			"class Dummy{0} extends {0}Info {{\n"
@@ -42,7 +42,7 @@ void Script_CreateDummyInfo(HSQUIRRELVM vm, const char *type, const char *dir)
 	sq_pushroottable(vm);
 
 	/* Load and run the script */
-	if (SQ_SUCCEEDED(sq_compilebuffer(vm, dummy_script.c_str(), dummy_script.size(), "dummy", SQTrue))) {
+	if (SQ_SUCCEEDED(sq_compilebuffer(vm, dummy_script, "dummy", SQTrue))) {
 		sq_push(vm, -2);
 		if (SQ_SUCCEEDED(sq_call(vm, 1, SQFalse, SQTrue))) {
 			sq_pop(vm, 1);
@@ -78,7 +78,7 @@ static std::vector<std::string> EscapeQuotesAndSlashesAndSplitOnNewLines(const s
 }
 
 /** Run the dummy AI and let it generate an error message. */
-void Script_CreateDummy(HSQUIRRELVM vm, StringID string, const char *type)
+void Script_CreateDummy(HSQUIRRELVM vm, StringID string, std::string_view type)
 {
 	/* We want to translate the error message.
 	 * We do this in three steps:
@@ -90,19 +90,18 @@ void Script_CreateDummy(HSQUIRRELVM vm, StringID string, const char *type)
 
 	/* 2) We construct the AI's code. This is done by merging a header, body and footer */
 	std::string dummy_script;
-	auto back_inserter = std::back_inserter(dummy_script);
 	/* Just a rough ballpark estimate. */
 	dummy_script.reserve(error_message.size() + 128 + 64 * messages.size());
 
-	fmt::format_to(back_inserter, "class Dummy{0} extends {0}Controller {{\n  function Start()\n  {{\n", type);
+	format_append(dummy_script, "class Dummy{0} extends {0}Controller {{\n  function Start()\n  {{\n", type);
 	for (std::string &message : messages) {
-		fmt::format_to(back_inserter, "    {}Log.Error(\"{}\");\n", type, message);
+		format_append(dummy_script, "    {}Log.Error(\"{}\");\n", type, message);
 	}
 	dummy_script += "  }\n}\n";
 
 	/* 3) Finally we load and run the script */
 	sq_pushroottable(vm);
-	if (SQ_SUCCEEDED(sq_compilebuffer(vm, dummy_script.c_str(), dummy_script.size(), "dummy", SQTrue))) {
+	if (SQ_SUCCEEDED(sq_compilebuffer(vm, dummy_script, "dummy", SQTrue))) {
 		sq_push(vm, -2);
 		if (SQ_SUCCEEDED(sq_call(vm, 1, SQFalse, SQTrue))) {
 			sq_pop(vm, 1);
diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp
index ab38f5d977..58ba727b62 100644
--- a/src/script/script_instance.cpp
+++ b/src/script/script_instance.cpp
@@ -32,33 +32,30 @@
 
 #include "../safeguards.h"
 
-ScriptStorage::~ScriptStorage()
-{
-	/* Free our pointers */
-	if (event_data != nullptr) ScriptEventController::FreeEventPointer();
-}
+ScriptStorage::ScriptStorage() = default;
+ScriptStorage::~ScriptStorage() = default;
 
 /**
  * Callback called by squirrel when a script uses "print" and for error messages.
  * @param error_msg Is this an error message?
  * @param message The actual message text.
  */
-static void PrintFunc(bool error_msg, const std::string &message)
+static void PrintFunc(bool error_msg, std::string_view message)
 {
 	/* Convert to OpenTTD internal capable string */
-	ScriptController::Print(error_msg, message);
+	ScriptController::Print(error_msg, std::string{message});
 }
 
-ScriptInstance::ScriptInstance(const char *APIName)
+ScriptInstance::ScriptInstance(std::string_view api_name)
 {
 	this->storage = new ScriptStorage();
-	this->engine  = new Squirrel(APIName);
+	this->engine  = new Squirrel(api_name);
 	this->engine->SetPrintFunction(&PrintFunc);
 }
 
 void ScriptInstance::Initialize(const std::string &main_script, const std::string &instance_name, CompanyID company)
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	this->controller = new ScriptController(company);
 
@@ -71,7 +68,7 @@ void ScriptInstance::Initialize(const std::string &main_script, const std::strin
 	}
 
 	try {
-		ScriptObject::SetAllowDoCommand(false);
+		ScriptObject::DisableDoCommandScope disabler{};
 		/* Load and execute the script for this script */
 		if (main_script == "%_dummy") {
 			this->LoadDummyScript();
@@ -91,7 +88,6 @@ void ScriptInstance::Initialize(const std::string &main_script, const std::strin
 			this->Died();
 			return;
 		}
-		ScriptObject::SetAllowDoCommand(true);
 	} catch (Script_FatalError &e) {
 		this->is_dead = true;
 		this->engine->ThrowError(e.GetErrorMessage());
@@ -145,7 +141,7 @@ bool ScriptInstance::LoadCompatibilityScripts(Subdirectory dir, std::span<const
 
 ScriptInstance::~ScriptInstance()
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 	this->in_shutdown = true;
 
 	if (instance != nullptr) this->engine->ReleaseObject(this->instance);
@@ -178,7 +174,7 @@ void ScriptInstance::Died()
 
 void ScriptInstance::GameLoop()
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	if (this->IsDead()) return;
 	if (this->engine->HasScriptCrashed()) {
@@ -202,7 +198,7 @@ void ScriptInstance::GameLoop()
 			this->is_save_data_on_stack = false;
 		}
 		try {
-			this->callback(this);
+			this->callback(*this);
 		} catch (Script_Suspend &e) {
 			this->suspend  = e.GetSuspendTime();
 			this->callback = e.GetSuspendCallback();
@@ -216,21 +212,22 @@ void ScriptInstance::GameLoop()
 
 	if (!this->is_started) {
 		try {
-			ScriptObject::SetAllowDoCommand(false);
-			/* Run the constructor if it exists. Don't allow any DoCommands in it. */
-			if (this->engine->MethodExists(*this->instance, "constructor")) {
-				if (!this->engine->CallMethod(*this->instance, "constructor", MAX_CONSTRUCTOR_OPS) || this->engine->IsSuspended()) {
-					if (this->engine->IsSuspended()) ScriptLog::Error("This script took too long to initialize. Script is not started.");
+			{
+				ScriptObject::DisableDoCommandScope disabler{};
+				/* Run the constructor if it exists. Don't allow any DoCommands in it. */
+				if (this->engine->MethodExists(*this->instance, "constructor")) {
+					if (!this->engine->CallMethod(*this->instance, "constructor", MAX_CONSTRUCTOR_OPS) || this->engine->IsSuspended()) {
+						if (this->engine->IsSuspended()) ScriptLog::Error("This script took too long to initialize. Script is not started.");
+						this->Died();
+						return;
+					}
+				}
+				if (!this->CallLoad() || this->engine->IsSuspended()) {
+					if (this->engine->IsSuspended()) ScriptLog::Error("This script took too long in the Load function. Script is not started.");
 					this->Died();
 					return;
 				}
 			}
-			if (!this->CallLoad() || this->engine->IsSuspended()) {
-				if (this->engine->IsSuspended()) ScriptLog::Error("This script took too long in the Load function. Script is not started.");
-				this->Died();
-				return;
-			}
-			ScriptObject::SetAllowDoCommand(true);
 			/* Start the script by calling Start() */
 			if (!this->engine->CallMethod(*this->instance, "Start",  _settings_game.script.script_max_opcode_till_suspend) || !this->engine->IsSuspended()) this->Died();
 		} catch (Script_Suspend &e) {
@@ -268,54 +265,54 @@ void ScriptInstance::GameLoop()
 void ScriptInstance::CollectGarbage()
 {
 	if (this->is_started && !this->IsDead()) {
-		ScriptObject::ActiveInstance active(this);
+		ScriptObject::ActiveInstance active(*this);
 		this->engine->CollectGarbage();
 	}
 }
 
-/* static */ void ScriptInstance::DoCommandReturn(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturn(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(ScriptObject::GetLastCommandRes());
+	instance.engine->InsertResult(ScriptObject::GetLastCommandRes());
 }
 
-/* static */ void ScriptInstance::DoCommandReturnVehicleID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnVehicleID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<VehicleID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<VehicleID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnSignID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnSignID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<SignID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<SignID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnGroupID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnGroupID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<GroupID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<GroupID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnGoalID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnGoalID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<GoalID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<GoalID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnStoryPageID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnStoryPageID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<StoryPageID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<StoryPageID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnStoryPageElementID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnStoryPageElementID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<StoryPageElementID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<StoryPageElementID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnLeagueTableElementID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnLeagueTableElementID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<LeagueTableElementID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<LeagueTableElementID>(ScriptObject::GetLastCommandResData()));
 }
 
-/* static */ void ScriptInstance::DoCommandReturnLeagueTableID(ScriptInstance *instance)
+/* static */ void ScriptInstance::DoCommandReturnLeagueTableID(ScriptInstance &instance)
 {
-	instance->engine->InsertResult(EndianBufferReader::ToValue<LeagueTableID>(ScriptObject::GetLastCommandResData()));
+	instance.engine->InsertResult(EndianBufferReader::ToValue<LeagueTableID>(ScriptObject::GetLastCommandResData()));
 }
 
 
@@ -326,7 +323,7 @@ ScriptStorage *ScriptInstance::GetStorage()
 
 ScriptLogTypes::LogData &ScriptInstance::GetLogData()
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	return ScriptObject::GetLogData();
 }
@@ -386,9 +383,9 @@ static const SaveLoad _script_byte[] = {
 				_script_sl_byte = SQSL_STRING;
 				SlObject(nullptr, _script_byte);
 			}
-			const SQChar *buf;
-			sq_getstring(vm, index, &buf);
-			size_t len = strlen(buf) + 1;
+			std::string_view view;
+			sq_getstring(vm, index, view);
+			size_t len = view.size() + 1;
 			if (len >= 255) {
 				ScriptLog::Error("Maximum string length is 254 chars. No data saved.");
 				return false;
@@ -396,7 +393,7 @@ static const SaveLoad _script_byte[] = {
 			if (!test) {
 				_script_sl_byte = (uint8_t)len;
 				SlObject(nullptr, _script_byte);
-				SlCopy(const_cast<char *>(buf), len, SLE_CHAR);
+				SlCopy(const_cast<char *>(view.data()), len, SLE_CHAR);
 			}
 			return true;
 		}
@@ -504,7 +501,7 @@ static const SaveLoad _script_byte[] = {
 
 void ScriptInstance::Save()
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	/* Don't save data if the script didn't start yet or if it crashed. */
 	if (this->engine == nullptr || this->engine->HasScriptCrashed()) {
@@ -523,10 +520,9 @@ void ScriptInstance::Save()
 		return;
 	} else if (this->engine->MethodExists(*this->instance, "Save")) {
 		HSQOBJECT savedata;
-		/* We don't want to be interrupted during the save function. */
-		bool backup_allow = ScriptObject::GetAllowDoCommand();
-		ScriptObject::SetAllowDoCommand(false);
 		try {
+			/* We don't want to be interrupted during the save function. */
+			ScriptObject::DisableDoCommandScope disabler{};
 			if (!this->engine->CallMethod(*this->instance, "Save", &savedata, MAX_SL_OPS)) {
 				/* The script crashed in the Save function. We can't kill
 				 * it here, but do so in the next script tick. */
@@ -547,10 +543,9 @@ void ScriptInstance::Save()
 			this->engine->CrashOccurred();
 			return;
 		}
-		ScriptObject::SetAllowDoCommand(backup_allow);
 
 		if (!sq_istable(savedata)) {
-			ScriptLog::Error(this->engine->IsSuspended() ? "This script took too long to Save." : "Save function should return a table.");
+			ScriptLog::Error(this->GetOpsTillSuspend() <= 0 ? "This script took too long to Save." : "Save function should return a table.");
 			SaveEmpty();
 			this->engine->CrashOccurred();
 			return;
@@ -652,7 +647,7 @@ bool ScriptInstance::IsPaused()
 		ScriptData *data;
 
 		bool operator()(const SQInteger &value) { sq_pushinteger(this->vm, value); return true; }
-		bool operator()(const std::string &value) { sq_pushstring(this->vm, value, -1); return true; }
+		bool operator()(const std::string &value) { sq_pushstring(this->vm, value); return true; }
 		bool operator()(const SQBool &value) { sq_pushbool(this->vm, value); return true; }
 		bool operator()(const SQSaveLoadType &type)
 		{
@@ -681,10 +676,10 @@ bool ScriptInstance::IsPaused()
 				case SQSL_INSTANCE: {
 					SQInteger top = sq_gettop(this->vm);
 					LoadObjects(this->vm, this->data);
-					const SQChar *buf;
-					sq_getstring(this->vm, -1, &buf);
+					std::string_view view;
+					sq_getstring(this->vm, -1, view);
 					Squirrel *engine = static_cast<Squirrel *>(sq_getforeignptr(this->vm));
-					std::string class_name = fmt::format("{}{}", engine->GetAPIName(), buf);
+					std::string class_name = fmt::format("{}{}", engine->GetAPIName(), view);
 					sq_pushroottable(this->vm);
 					sq_pushstring(this->vm, class_name);
 					if (SQ_FAILED(sq_get(this->vm, -2))) throw Script_FatalError(fmt::format("'{}' doesn't exist", class_name));
@@ -742,7 +737,7 @@ bool ScriptInstance::IsPaused()
 
 void ScriptInstance::LoadOnStack(ScriptData *data)
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	if (this->IsDead() || data == nullptr) return;
 
@@ -781,7 +776,7 @@ bool ScriptInstance::CallLoad()
 	/* Go to the instance-root */
 	sq_pushobject(vm, *this->instance);
 	/* Find the function-name inside the script */
-	sq_pushstring(vm, "Load", -1);
+	sq_pushstring(vm, "Load");
 	/* Change the "Load" string in a function pointer */
 	sq_get(vm, -2);
 	/* Push the main instance as "this" object */
@@ -806,7 +801,7 @@ SQInteger ScriptInstance::GetOpsTillSuspend()
 
 bool ScriptInstance::DoCommandCallback(const CommandCost &result, const CommandDataBuffer &data, CommandDataBuffer result_data, Commands cmd)
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	if (!ScriptObject::CheckLastCommand(data, cmd)) {
 		Debug(script, 1, "DoCommandCallback terminating a script, last command does not match expected command");
@@ -830,7 +825,7 @@ bool ScriptInstance::DoCommandCallback(const CommandCost &result, const CommandD
 
 void ScriptInstance::InsertEvent(class ScriptEvent *event)
 {
-	ScriptObject::ActiveInstance active(this);
+	ScriptObject::ActiveInstance active(*this);
 
 	ScriptEventController::InsertEvent(event);
 }
diff --git a/src/script/script_instance.hpp b/src/script/script_instance.hpp
index c871c432c1..247d89363a 100644
--- a/src/script/script_instance.hpp
+++ b/src/script/script_instance.hpp
@@ -46,7 +46,7 @@ public:
 	/**
 	 * Create a new script.
 	 */
-	ScriptInstance(const char *APIName);
+	ScriptInstance(std::string_view api_name);
 	virtual ~ScriptInstance();
 
 	/**
@@ -101,47 +101,47 @@ public:
 	/**
 	 * Return a true/false reply for a DoCommand.
 	 */
-	static void DoCommandReturn(ScriptInstance *instance);
+	static void DoCommandReturn(ScriptInstance &instance);
 
 	/**
 	 * Return a VehicleID reply for a DoCommand.
 	 */
-	static void DoCommandReturnVehicleID(ScriptInstance *instance);
+	static void DoCommandReturnVehicleID(ScriptInstance &instance);
 
 	/**
 	 * Return a SignID reply for a DoCommand.
 	 */
-	static void DoCommandReturnSignID(ScriptInstance *instance);
+	static void DoCommandReturnSignID(ScriptInstance &instance);
 
 	/**
 	 * Return a GroupID reply for a DoCommand.
 	 */
-	static void DoCommandReturnGroupID(ScriptInstance *instance);
+	static void DoCommandReturnGroupID(ScriptInstance &instance);
 
 	/**
 	 * Return a GoalID reply for a DoCommand.
 	 */
-	static void DoCommandReturnGoalID(ScriptInstance *instance);
+	static void DoCommandReturnGoalID(ScriptInstance &instance);
 
 	/**
 	 * Return a StoryPageID reply for a DoCommand.
 	 */
-	static void DoCommandReturnStoryPageID(ScriptInstance *instance);
+	static void DoCommandReturnStoryPageID(ScriptInstance &instance);
 
 	/**
 	 * Return a StoryPageElementID reply for a DoCommand.
 	 */
-	static void DoCommandReturnStoryPageElementID(ScriptInstance *instance);
+	static void DoCommandReturnStoryPageElementID(ScriptInstance &instance);
 
 	/**
 	 * Return a LeagueTableID reply for a DoCommand.
 	 */
-	static void DoCommandReturnLeagueTableID(ScriptInstance *instance);
+	static void DoCommandReturnLeagueTableID(ScriptInstance &instance);
 
 	/**
 	 * Return a LeagueTableElementID reply for a DoCommand.
 	 */
-	static void DoCommandReturnLeagueTableElementID(ScriptInstance *instance);
+	static void DoCommandReturnLeagueTableElementID(ScriptInstance &instance);
 
 	/**
 	 * Get the controller attached to the instance.
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index f21ffa1dc5..0aea257240 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -53,10 +53,10 @@ void ScriptScanner::ResetEngine()
 {
 	this->engine->Reset();
 	this->engine->SetGlobalPointer(this);
-	this->RegisterAPI(this->engine);
+	this->RegisterAPI(*this->engine);
 }
 
-void ScriptScanner::Initialize(const char *name)
+void ScriptScanner::Initialize(std::string_view name)
 {
 	this->engine = new Squirrel(name);
 
@@ -93,7 +93,7 @@ void ScriptScanner::Reset()
 
 void ScriptScanner::RegisterScript(ScriptInfo *info)
 {
-	std::string script_original_name = this->GetScriptName(info);
+	std::string script_original_name = this->GetScriptName(*info);
 	std::string script_name = fmt::format("{}.{}", script_original_name, info->GetVersion());
 
 	/* Check if GetShortName follows the rules */
@@ -103,20 +103,20 @@ void ScriptScanner::RegisterScript(ScriptInfo *info)
 		return;
 	}
 
-	if (this->info_list.find(script_name) != this->info_list.end()) {
+	if (auto it = this->info_list.find(script_name); it != this->info_list.end()) {
 		/* This script was already registered */
 #ifdef _WIN32
 		/* Windows doesn't care about the case */
-		if (StrEqualsIgnoreCase(this->info_list[script_name]->GetMainScript(), info->GetMainScript())) {
+		if (StrEqualsIgnoreCase(it->second->GetMainScript(), info->GetMainScript())) {
 #else
-		if (this->info_list[script_name]->GetMainScript() == info->GetMainScript()) {
+		if (it->second->GetMainScript() == info->GetMainScript()) {
 #endif
 			delete info;
 			return;
 		}
 
 		Debug(script, 1, "Registering two scripts with the same name and version");
-		Debug(script, 1, "  1: {}", this->info_list[script_name]->GetMainScript());
+		Debug(script, 1, "  1: {}", it->second->GetMainScript());
 		Debug(script, 1, "  2: {}", info->GetMainScript());
 		Debug(script, 1, "The first is taking precedence.");
 
@@ -195,13 +195,13 @@ struct ScriptFileChecksumCreator : FileScanner {
  * @param info The script to get the shortname and md5 sum from.
  * @return True iff they're the same.
  */
-static bool IsSameScript(const ContentInfo *ci, bool md5sum, ScriptInfo *info, Subdirectory dir)
+static bool IsSameScript(const ContentInfo &ci, bool md5sum, ScriptInfo *info, Subdirectory dir)
 {
 	uint32_t id = 0;
-	const char *str = info->GetShortName().c_str();
-	for (int j = 0; j < 4 && *str != '\0'; j++, str++) id |= *str << (8 * j);
+	auto str = std::string_view{info->GetShortName()}.substr(0, 4);
+	for (size_t j = 0; j < str.size(); j++) id |= static_cast<uint8_t>(str[j]) << (8 * j);
 
-	if (id != ci->unique_id) return false;
+	if (id != ci.unique_id) return false;
 	if (!md5sum) return true;
 
 	ScriptFileChecksumCreator checksum(dir);
@@ -215,8 +215,8 @@ static bool IsSameScript(const ContentInfo *ci, bool md5sum, ScriptInfo *info, S
 			if (tar.second.tar_filename != iter->first) continue;
 
 			/* Check the extension. */
-			const char *ext = strrchr(tar.first.c_str(), '.');
-			if (ext == nullptr || !StrEqualsIgnoreCase(ext, ".nut")) continue;
+			auto ext = tar.first.rfind('.');
+			if (ext == std::string_view::npos || !StrEqualsIgnoreCase(tar.first.substr(ext), ".nut")) continue;
 
 			checksum.AddFile(tar.first, 0, tar_filename);
 		}
@@ -229,10 +229,10 @@ static bool IsSameScript(const ContentInfo *ci, bool md5sum, ScriptInfo *info, S
 		checksum.Scan(".nut", path);
 	}
 
-	return ci->md5sum == checksum.md5sum;
+	return ci.md5sum == checksum.md5sum;
 }
 
-bool ScriptScanner::HasScript(const ContentInfo *ci, bool md5sum)
+bool ScriptScanner::HasScript(const ContentInfo &ci, bool md5sum)
 {
 	for (const auto &item : this->info_list) {
 		if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return true;
@@ -240,10 +240,10 @@ bool ScriptScanner::HasScript(const ContentInfo *ci, bool md5sum)
 	return false;
 }
 
-const char *ScriptScanner::FindMainScript(const ContentInfo *ci, bool md5sum)
+std::optional<std::string_view> ScriptScanner::FindMainScript(const ContentInfo &ci, bool md5sum)
 {
 	for (const auto &item : this->info_list) {
-		if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return item.second->GetMainScript().c_str();
+		if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return item.second->GetMainScript();
 	}
-	return nullptr;
+	return std::nullopt;
 }
diff --git a/src/script/script_scanner.hpp b/src/script/script_scanner.hpp
index 1f5dca0485..e05da0b2ba 100644
--- a/src/script/script_scanner.hpp
+++ b/src/script/script_scanner.hpp
@@ -66,7 +66,7 @@ public:
 	 * @param md5sum Whether to check the MD5 checksum.
 	 * @return True iff we have a script matching.
 	 */
-	bool HasScript(const struct ContentInfo *ci, bool md5sum);
+	bool HasScript(const struct ContentInfo &ci, bool md5sum);
 
 	/**
 	 * Find a script of a #ContentInfo
@@ -74,7 +74,7 @@ public:
 	 * @param md5sum Whether to check the MD5 checksum.
 	 * @return A filename of a file of the content, else \c nullptr.
 	 */
-	const char *FindMainScript(const ContentInfo *ci, bool md5sum);
+	std::optional<std::string_view> FindMainScript(const ContentInfo &ci, bool md5sum);
 
 	bool AddFile(const std::string &filename, size_t basepath_length, const std::string &tar_filename) override;
 
@@ -95,17 +95,17 @@ protected:
 	 * Initialize the scanner.
 	 * @param name The name of the scanner ("AIScanner", "GSScanner", ..).
 	 */
-	void Initialize(const char *name);
+	void Initialize(std::string_view name);
 
 	/**
 	 * Get the script name how to store the script in memory.
 	 */
-	virtual std::string GetScriptName(ScriptInfo *info) = 0;
+	virtual std::string GetScriptName(ScriptInfo &info) = 0;
 
 	/**
 	 * Get the filename to scan for this type of script.
 	 */
-	virtual const char *GetFileName() const = 0;
+	virtual std::string_view GetFileName() const = 0;
 
 	/**
 	 * Get the directory to scan in.
@@ -115,12 +115,12 @@ protected:
 	/**
 	 * Register the API for this ScriptInfo.
 	 */
-	virtual void RegisterAPI(class Squirrel *engine) = 0;
+	virtual void RegisterAPI(class Squirrel &engine) = 0;
 
 	/**
 	 * Get the type of the script, in plural.
 	 */
-	virtual const char *GetScannerName() const = 0;
+	virtual std::string_view GetScannerName() const = 0;
 
 	/**
 	 * Reset all allocated lists.
diff --git a/src/script/script_storage.hpp b/src/script/script_storage.hpp
index 3e52605823..554a3cb9a5 100644
--- a/src/script/script_storage.hpp
+++ b/src/script/script_storage.hpp
@@ -10,6 +10,8 @@
 #ifndef SCRIPT_STORAGE_HPP
 #define SCRIPT_STORAGE_HPP
 
+#include <queue>
+
 #include "../signs_func.h"
 #include "../vehicle_func.h"
 #include "../road_type.h"
@@ -19,6 +21,13 @@
 
 #include "script_types.hpp"
 #include "script_log_types.hpp"
+#include "script_object.hpp"
+
+class ScriptEvent;
+
+/* This is a "struct", so we can forward declare it, and use as incomplete type. */
+struct ScriptEventQueue : std::queue<ScriptObjectRef<ScriptEvent>> {
+};
 
 /**
  * The callback function for Mode-classes.
@@ -36,53 +45,35 @@ typedef bool (ScriptAsyncModeProc)();
 class ScriptStorage {
 friend class ScriptObject;
 private:
-	ScriptModeProc *mode;             ///< The current build mode we are int.
-	class ScriptObject *mode_instance; ///< The instance belonging to the current build mode.
-	ScriptAsyncModeProc *async_mode;         ///< The current command async mode we are in.
-	class ScriptObject *async_mode_instance; ///< The instance belonging to the current command async mode.
-	CompanyID root_company;          ///< The root company, the company that the script really belongs to.
-	CompanyID company;               ///< The current company.
+	ScriptModeProc *mode = nullptr; ///< The current build mode we are int.
+	class ScriptObject *mode_instance = nullptr; ///< The instance belonging to the current build mode.
+	ScriptAsyncModeProc *async_mode = nullptr; ///< The current command async mode we are in.
+	class ScriptObject *async_mode_instance = nullptr; ///< The instance belonging to the current command async mode.
+	CompanyID root_company = INVALID_OWNER; ///< The root company, the company that the script really belongs to.
+	CompanyID company = INVALID_OWNER; ///< The current company.
 
-	uint delay;                      ///< The ticks of delay each DoCommand has.
-	bool allow_do_command;           ///< Is the usage of DoCommands restricted?
+	uint delay = 1; ///< The ticks of delay each DoCommand has.
+	bool allow_do_command = true; ///< Is the usage of DoCommands restricted?
 
-	CommandCost costs;               ///< The costs the script is tracking.
-	Money last_cost;                 ///< The last cost of the command.
+	CommandCost costs; ///< The costs the script is tracking.
+	Money last_cost = 0; ///< The last cost of the command.
 	ScriptErrorType last_error{}; ///< The last error of the command.
-	bool last_command_res;           ///< The last result of the command.
+	bool last_command_res = true; ///< The last result of the command.
 
-	CommandDataBuffer last_data;     ///< The last data passed to a command.
-	Commands last_cmd;               ///< The last cmd passed to a command.
-	CommandDataBuffer last_cmd_ret;  ///< The extra data returned by the last command.
+	CommandDataBuffer last_data; ///< The last data passed to a command.
+	Commands last_cmd = CMD_END; ///< The last cmd passed to a command.
+	CommandDataBuffer last_cmd_ret; ///< The extra data returned by the last command.
 
 	std::vector<int> callback_value; ///< The values which need to survive a callback.
 
-	RoadType road_type;              ///< The current roadtype we build.
-	RailType rail_type;              ///< The current railtype we build.
+	RoadType road_type = INVALID_ROADTYPE; ///< The current roadtype we build.
+	RailType rail_type = INVALID_RAILTYPE; ///< The current railtype we build.
 
-	void *event_data;                ///< Pointer to the event data storage.
-	ScriptLogTypes::LogData log_data;///< Log data storage.
+	ScriptEventQueue event_queue; ///< Event queue for this script.
+	ScriptLogTypes::LogData log_data; ///< Log data storage.
 
 public:
-	ScriptStorage() :
-		mode              (nullptr),
-		mode_instance     (nullptr),
-		async_mode        (nullptr),
-		async_mode_instance (nullptr),
-		root_company      (INVALID_OWNER),
-		company           (INVALID_OWNER),
-		delay             (1),
-		allow_do_command  (true),
-		/* costs (can't be set) */
-		last_cost         (0),
-		last_command_res  (true),
-		last_cmd          (CMD_END),
-		/* calback_value (can't be set) */
-		road_type         (INVALID_ROADTYPE),
-		rail_type         (INVALID_RAILTYPE),
-		event_data        (nullptr)
-	{ }
-
+	ScriptStorage();
 	~ScriptStorage();
 };
 
diff --git a/src/script/script_suspend.hpp b/src/script/script_suspend.hpp
index c8a4501f30..1692c5b408 100644
--- a/src/script/script_suspend.hpp
+++ b/src/script/script_suspend.hpp
@@ -13,7 +13,7 @@
 /**
  * The callback function when a script suspends.
  */
-typedef void (Script_SuspendCallbackProc)(class ScriptInstance *instance);
+typedef void (Script_SuspendCallbackProc)(class ScriptInstance &instance);
 
 /**
  * A throw-class that is given when the script wants to suspend.
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index b933a3537a..2086e74f75 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -18,6 +18,8 @@
 #include <sqstdaux.h>
 #include <../squirrel/sqpcheader.h>
 #include <../squirrel/sqvm.h>
+#include "../core/math_func.hpp"
+#include "../core/string_consumer.hpp"
 
 #include "../safeguards.h"
 
@@ -132,7 +134,7 @@ public:
 		this->CheckAllocationAllowed(size - oldsize);
 
 		void *new_p = this->DoAlloc(size);
-		memcpy(new_p, p, std::min(oldsize, size));
+		std::copy_n(static_cast<std::byte *>(p), std::min(oldsize, size), static_cast<std::byte *>(new_p));
 		this->Free(p, oldsize);
 
 		return new_p;
@@ -177,7 +179,7 @@ size_t Squirrel::GetAllocatedMemory() const noexcept
 }
 
 
-void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *source, SQInteger line, SQInteger column)
+void Squirrel::CompileError(HSQUIRRELVM vm, std::string_view desc, std::string_view source, SQInteger line, SQInteger column)
 {
 	std::string msg = fmt::format("Error {}:{}/{}: {}", source, line, column, desc);
 
@@ -192,7 +194,7 @@ void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *so
 	}
 }
 
-void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, const std::string &s)
+void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, std::string_view s)
 {
 	/* Check if we have a custom print function */
 	SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func;
@@ -203,7 +205,7 @@ void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, const std::string &s)
 	}
 }
 
-void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error)
+void Squirrel::RunError(HSQUIRRELVM vm, std::string_view error)
 {
 	/* Set the print function to something that prints to stderr */
 	SQPRINTFUNCTION pf = sq_getprintfunc(vm);
@@ -227,11 +229,11 @@ void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error)
 
 SQInteger Squirrel::_RunError(HSQUIRRELVM vm)
 {
-	const SQChar *sErr = nullptr;
+	std::string_view view;
 
 	if (sq_gettop(vm) >= 1) {
-		if (SQ_SUCCEEDED(sq_getstring(vm, -1, &sErr))) {
-			Squirrel::RunError(vm, sErr);
+		if (SQ_SUCCEEDED(sq_getstring(vm, -1, view))) {
+			Squirrel::RunError(vm, view);
 			return 0;
 		}
 	}
@@ -240,7 +242,7 @@ SQInteger Squirrel::_RunError(HSQUIRRELVM vm)
 	return 0;
 }
 
-void Squirrel::PrintFunc(HSQUIRRELVM vm, const std::string &s)
+void Squirrel::PrintFunc(HSQUIRRELVM vm, std::string_view s)
 {
 	/* Check if we have a custom print function */
 	SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func;
@@ -251,57 +253,57 @@ void Squirrel::PrintFunc(HSQUIRRELVM vm, const std::string &s)
 	}
 }
 
-void Squirrel::AddMethod(const char *method_name, SQFUNCTION proc, uint nparam, const char *params, void *userdata, int size)
+void Squirrel::AddMethod(std::string_view method_name, SQFUNCTION proc, std::string_view params, void *userdata, int size)
 {
 	ScriptAllocatorScope alloc_scope(this);
 
-	sq_pushstring(this->vm, method_name, -1);
+	sq_pushstring(this->vm, method_name);
 
 	if (size != 0) {
 		void *ptr = sq_newuserdata(vm, size);
-		memcpy(ptr, userdata, size);
+		std::copy_n(static_cast<std::byte *>(userdata), size, static_cast<std::byte *>(ptr));
 	}
 
 	sq_newclosure(this->vm, proc, size != 0 ? 1 : 0);
-	if (nparam != 0) sq_setparamscheck(this->vm, nparam, params);
+	if (!params.empty()) sq_setparamscheck(this->vm, params.size(), params);
 	sq_setnativeclosurename(this->vm, -1, method_name);
 	sq_newslot(this->vm, -3, SQFalse);
 }
 
-void Squirrel::AddConst(const char *var_name, int value)
+void Squirrel::AddConst(std::string_view var_name, int value)
 {
 	ScriptAllocatorScope alloc_scope(this);
 
-	sq_pushstring(this->vm, var_name, -1);
+	sq_pushstring(this->vm, var_name);
 	sq_pushinteger(this->vm, value);
 	sq_newslot(this->vm, -3, SQTrue);
 }
 
-void Squirrel::AddConst(const char *var_name, bool value)
+void Squirrel::AddConst(std::string_view var_name, bool value)
 {
 	ScriptAllocatorScope alloc_scope(this);
 
-	sq_pushstring(this->vm, var_name, -1);
+	sq_pushstring(this->vm, var_name);
 	sq_pushbool(this->vm, value);
 	sq_newslot(this->vm, -3, SQTrue);
 }
 
-void Squirrel::AddClassBegin(const char *class_name)
+void Squirrel::AddClassBegin(std::string_view class_name)
 {
 	ScriptAllocatorScope alloc_scope(this);
 
 	sq_pushroottable(this->vm);
-	sq_pushstring(this->vm, class_name, -1);
+	sq_pushstring(this->vm, class_name);
 	sq_newclass(this->vm, SQFalse);
 }
 
-void Squirrel::AddClassBegin(const char *class_name, const char *parent_class)
+void Squirrel::AddClassBegin(std::string_view class_name, std::string_view parent_class)
 {
 	ScriptAllocatorScope alloc_scope(this);
 
 	sq_pushroottable(this->vm);
-	sq_pushstring(this->vm, class_name, -1);
-	sq_pushstring(this->vm, parent_class, -1);
+	sq_pushstring(this->vm, class_name);
+	sq_pushstring(this->vm, parent_class);
 	if (SQ_FAILED(sq_get(this->vm, -3))) {
 		Debug(misc, 0, "[squirrel] Failed to initialize class '{}' based on parent class '{}'", class_name, parent_class);
 		Debug(misc, 0, "[squirrel] Make sure that '{}' exists before trying to define '{}'", parent_class, class_name);
@@ -318,7 +320,7 @@ void Squirrel::AddClassEnd()
 	sq_pop(vm, 1);
 }
 
-bool Squirrel::MethodExists(HSQOBJECT instance, const char *method_name)
+bool Squirrel::MethodExists(HSQOBJECT instance, std::string_view method_name)
 {
 	assert(!this->crashed);
 	ScriptAllocatorScope alloc_scope(this);
@@ -327,7 +329,7 @@ bool Squirrel::MethodExists(HSQOBJECT instance, const char *method_name)
 	/* Go to the instance-root */
 	sq_pushobject(this->vm, instance);
 	/* Find the function-name inside the script */
-	sq_pushstring(this->vm, method_name, -1);
+	sq_pushstring(this->vm, method_name);
 	if (SQ_FAILED(sq_get(this->vm, -2))) {
 		sq_settop(this->vm, top);
 		return false;
@@ -371,7 +373,7 @@ void Squirrel::CollectGarbage()
 	sq_collectgarbage(this->vm);
 }
 
-bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT *ret, int suspend)
+bool Squirrel::CallMethod(HSQOBJECT instance, std::string_view method_name, HSQOBJECT *ret, int suspend)
 {
 	assert(!this->crashed);
 	ScriptAllocatorScope alloc_scope(this);
@@ -386,7 +388,7 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT
 	/* Go to the instance-root */
 	sq_pushobject(this->vm, instance);
 	/* Find the function-name inside the script */
-	sq_pushstring(this->vm, method_name, -1);
+	sq_pushstring(this->vm, method_name);
 	if (SQ_FAILED(sq_get(this->vm, -2))) {
 		Debug(misc, 0, "[squirrel] Could not find '{}' in the class", method_name);
 		sq_settop(this->vm, top);
@@ -405,16 +407,19 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT
 	return true;
 }
 
-bool Squirrel::CallStringMethod(HSQOBJECT instance, const char *method_name, std::string *res, int suspend)
+bool Squirrel::CallStringMethod(HSQOBJECT instance, std::string_view method_name, std::string *res, int suspend)
 {
 	HSQOBJECT ret;
 	if (!this->CallMethod(instance, method_name, &ret, suspend)) return false;
-	if (ret._type != OT_STRING) return false;
-	*res = StrMakeValid(ObjectToString(&ret));
+
+	auto str = ObjectToString(&ret);
+	if (!str.has_value()) return false;
+
+	*res = StrMakeValid(*str);
 	return true;
 }
 
-bool Squirrel::CallIntegerMethod(HSQOBJECT instance, const char *method_name, int *res, int suspend)
+bool Squirrel::CallIntegerMethod(HSQOBJECT instance, std::string_view method_name, int *res, int suspend)
 {
 	HSQOBJECT ret;
 	if (!this->CallMethod(instance, method_name, &ret, suspend)) return false;
@@ -423,7 +428,7 @@ bool Squirrel::CallIntegerMethod(HSQOBJECT instance, const char *method_name, in
 	return true;
 }
 
-bool Squirrel::CallBoolMethod(HSQOBJECT instance, const char *method_name, bool *res, int suspend)
+bool Squirrel::CallBoolMethod(HSQOBJECT instance, std::string_view method_name, bool *res, int suspend)
 {
 	HSQOBJECT ret;
 	if (!this->CallMethod(instance, method_name, &ret, suspend)) return false;
@@ -442,11 +447,10 @@ bool Squirrel::CallBoolMethod(HSQOBJECT instance, const char *method_name, bool
 	sq_pushroottable(vm);
 
 	if (prepend_API_name) {
-		std::string prepended_class_name = engine->GetAPIName();
-		prepended_class_name += class_name;
-		sq_pushstring(vm, prepended_class_name, -1);
+		std::string prepended_class_name = fmt::format("{}{}", engine->GetAPIName(), class_name);
+		sq_pushstring(vm, prepended_class_name);
 	} else {
-		sq_pushstring(vm, class_name, -1);
+		sq_pushstring(vm, class_name);
 	}
 
 	if (SQ_FAILED(sq_get(vm, -2))) {
@@ -486,7 +490,7 @@ bool Squirrel::CreateClassInstance(const std::string &class_name, void *real_ins
 	return Squirrel::CreateClassInstanceVM(this->vm, class_name, real_instance, instance, nullptr);
 }
 
-/* static */ SQUserPointer Squirrel::GetRealInstance(HSQUIRRELVM vm, int index, const char *tag)
+/* static */ SQUserPointer Squirrel::GetRealInstance(HSQUIRRELVM vm, int index, std::string_view tag)
 {
 	if (index < 0) index += sq_gettop(vm) + 1;
 	Squirrel *engine = static_cast<Squirrel *>(sq_getforeignptr(vm));
@@ -503,8 +507,8 @@ bool Squirrel::CreateClassInstance(const std::string &class_name, void *real_ins
 	throw sq_throwerror(vm, fmt::format("parameter {} has an invalid type ; expected: '{}'", index - 1, class_name));
 }
 
-Squirrel::Squirrel(const char *APIName) :
-	APIName(APIName), allocator(new ScriptAllocator())
+Squirrel::Squirrel(std::string_view api_name) :
+	api_name(api_name), allocator(std::make_unique<ScriptAllocator>())
 {
 	this->Initialize();
 }
@@ -544,69 +548,73 @@ private:
 	FileHandle file;
 	size_t size;
 	size_t pos;
+	std::string buffer;
+	StringConsumer consumer;
+
+	size_t ReadInternal(std::span<char> buf)
+	{
+		size_t count = buf.size();
+		if (this->pos + count > this->size) {
+			count = this->size - this->pos;
+		}
+		if (count > 0) count = fread(buf.data(), 1, count, this->file);
+		this->pos += count;
+		return count;
+	}
 
 public:
-	SQFile(FileHandle file, size_t size) : file(std::move(file)), size(size), pos(0) {}
+	SQFile(FileHandle file, size_t size) : file(std::move(file)), size(size), pos(0), consumer(buffer) {}
 
-	size_t Read(void *buf, size_t elemsize, size_t count)
+	StringConsumer &GetConsumer(size_t min_size = 64)
 	{
-		assert(elemsize != 0);
-		if (this->pos + (elemsize * count) > this->size) {
-			count = (this->size - this->pos) / elemsize;
+		if (this->consumer.GetBytesLeft() < min_size && this->pos < this->size) {
+			this->buffer.erase(0, this->consumer.GetBytesRead());
+
+			size_t buffer_size = this->buffer.size();
+			size_t read_size = Align(min_size - buffer_size, 4096); // read pages of 4096 bytes
+			/* TODO C++23: use std::string::resize_and_overwrite() */
+			this->buffer.resize(buffer_size + read_size);
+			auto dest = std::span(this->buffer.data(), this->buffer.size()).subspan(buffer_size);
+			buffer_size += this->ReadInternal(dest);
+			this->buffer.resize(buffer_size);
+
+			this->consumer = StringConsumer(this->buffer);
 		}
-		if (count == 0) return 0;
-		size_t ret = fread(buf, elemsize, count, this->file);
-		this->pos += ret * elemsize;
-		return ret;
+		return this->consumer;
+	}
+
+	size_t Read(void *buf, size_t max_size)
+	{
+		std::span<char> dest(reinterpret_cast<char *>(buf), max_size);
+
+		auto view = this->consumer.Read(max_size);
+		std::copy(view.data(), view.data() + view.size(), dest.data());
+		size_t result_size = view.size();
+
+		if (result_size < max_size) {
+			assert(!this->consumer.AnyBytesLeft());
+			result_size += this->ReadInternal(dest.subspan(result_size));
+		}
+
+		return result_size;
 	}
 };
 
 static char32_t _io_file_lexfeed_ASCII(SQUserPointer file)
 {
-	unsigned char c;
-	if (((SQFile *)file)->Read(&c, sizeof(c), 1) > 0) return c;
-	return 0;
+	StringConsumer &consumer = reinterpret_cast<SQFile *>(file)->GetConsumer();
+	return consumer.TryReadUint8().value_or(0); // read as unsigned, otherwise integer promotion breaks it
 }
 
 static char32_t _io_file_lexfeed_UTF8(SQUserPointer file)
 {
-	char buffer[5];
-
-	/* Read the first character, and get the length based on UTF-8 specs. If invalid, bail out. */
-	if (((SQFile *)file)->Read(buffer, sizeof(buffer[0]), 1) != 1) return 0;
-	uint len = Utf8EncodedCharLen(buffer[0]);
-	if (len == 0) return -1;
-
-	/* Read the remaining bits. */
-	if (len > 1 && ((SQFile *)file)->Read(buffer + 1, sizeof(buffer[0]), len - 1) != len - 1) return 0;
-
-	/* Convert the character, and when definitely invalid, bail out as well. */
-	char32_t c;
-	if (Utf8Decode(&c, buffer) != len) return -1;
-
-	return c;
-}
-
-static char32_t _io_file_lexfeed_UCS2_no_swap(SQUserPointer file)
-{
-	unsigned short c;
-	if (((SQFile *)file)->Read(&c, sizeof(c), 1) > 0) return (char32_t)c;
-	return 0;
-}
-
-static char32_t _io_file_lexfeed_UCS2_swap(SQUserPointer file)
-{
-	unsigned short c;
-	if (((SQFile *)file)->Read(&c, sizeof(c), 1) > 0) {
-		c = ((c >> 8) & 0x00FF)| ((c << 8) & 0xFF00);
-		return (char32_t)c;
-	}
-	return 0;
+	StringConsumer &consumer = reinterpret_cast<SQFile *>(file)->GetConsumer();
+	return consumer.AnyBytesLeft() ? consumer.ReadUtf8(-1) : 0;
 }
 
 static SQInteger _io_file_read(SQUserPointer file, SQUserPointer buf, SQInteger size)
 {
-	SQInteger ret = ((SQFile *)file)->Read(buf, 1, size);
+	SQInteger ret = reinterpret_cast<SQFile *>(file)->Read(buf, size);
 	if (ret == 0) return -1;
 	return ret;
 }
@@ -617,10 +625,10 @@ SQRESULT Squirrel::LoadFile(HSQUIRRELVM vm, const std::string &filename, SQBool
 
 	std::optional<FileHandle> file = std::nullopt;
 	size_t size;
-	if (strncmp(this->GetAPIName(), "AI", 2) == 0) {
+	if (this->GetAPIName().starts_with("AI")) {
 		file = FioFOpenFile(filename, "rb", AI_DIR, &size);
 		if (!file.has_value()) file = FioFOpenFile(filename, "rb", AI_LIBRARY_DIR, &size);
-	} else if (strncmp(this->GetAPIName(), "GS", 2) == 0) {
+	} else if (this->GetAPIName().starts_with("GS")) {
 		file = FioFOpenFile(filename, "rb", GAME_DIR, &size);
 		if (!file.has_value()) file = FioFOpenFile(filename, "rb", GAME_LIBRARY_DIR, &size);
 	} else {
@@ -648,17 +656,6 @@ SQRESULT Squirrel::LoadFile(HSQUIRRELVM vm, const std::string &filename, SQBool
 			}
 			return sq_throwerror(vm, "Couldn't read bytecode");
 		}
-		case 0xFFFE:
-			/* Either this file is encoded as big-endian and we're on a little-endian
-			 * machine, or this file is encoded as little-endian and we're on a big-endian
-			 * machine. Either way, swap the bytes of every word we read. */
-			func = _io_file_lexfeed_UCS2_swap;
-			size -= 2; // Skip BOM
-			break;
-		case 0xFEFF:
-			func = _io_file_lexfeed_UCS2_no_swap;
-			size -= 2; // Skip BOM
-			break;
 		case 0xBBEF:   // UTF-8
 		case 0xEFBB: { // UTF-8 on big-endian machine
 			/* Similarly, check the file is actually big enough to finish checking BOM */
diff --git a/src/script/squirrel.hpp b/src/script/squirrel.hpp
index a36261835a..415f75ca10 100644
--- a/src/script/squirrel.hpp
+++ b/src/script/squirrel.hpp
@@ -26,14 +26,14 @@ class Squirrel {
 	friend class ScriptInstance;
 
 private:
-	typedef void (SQPrintFunc)(bool error_msg, const std::string &message);
+	using SQPrintFunc = void (bool error_msg, std::string_view message);
 
 	HSQUIRRELVM vm;          ///< The VirtualMachine instance for squirrel
 	void *global_pointer;    ///< Can be set by who ever initializes Squirrel
 	SQPrintFunc *print_func; ///< Points to either nullptr, or a custom print handler
 	bool crashed;            ///< True if the squirrel script made an error.
 	int overdrawn_ops;       ///< The amount of operations we have overdrawn.
-	const char *APIName;     ///< Name of the API used for this squirrel.
+	std::string_view api_name; ///< Name of the API used for this squirrel.
 	std::unique_ptr<ScriptAllocator> allocator; ///< Allocator object used by this script.
 
 	/**
@@ -44,7 +44,7 @@ private:
 	/**
 	 * Get the API name.
 	 */
-	const char *GetAPIName() { return this->APIName; }
+	std::string_view GetAPIName() { return this->api_name; }
 
 	/** Perform all initialization steps to create the engine. */
 	void Initialize();
@@ -55,25 +55,25 @@ protected:
 	/**
 	 * The CompileError handler.
 	 */
-	static void CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *source, SQInteger line, SQInteger column);
+	static void CompileError(HSQUIRRELVM vm, std::string_view desc, std::string_view source, SQInteger line, SQInteger column);
 
 	/**
 	 * The RunError handler.
 	 */
-	static void RunError(HSQUIRRELVM vm, const SQChar *error);
+	static void RunError(HSQUIRRELVM vm, std::string_view error);
 
 	/**
 	 * If a user runs 'print' inside a script, this function gets the params.
 	 */
-	static void PrintFunc(HSQUIRRELVM vm, const std::string &s);
+	static void PrintFunc(HSQUIRRELVM vm, std::string_view s);
 
 	/**
 	 * If an error has to be print, this function is called.
 	 */
-	static void ErrorPrintFunc(HSQUIRRELVM vm, const std::string &s);
+	static void ErrorPrintFunc(HSQUIRRELVM vm, std::string_view s);
 
 public:
-	Squirrel(const char *APIName);
+	Squirrel(std::string_view api_name);
 	~Squirrel();
 
 	/**
@@ -98,39 +98,39 @@ public:
 	 * Adds a function to the stack. Depending on the current state this means
 	 *  either a method or a global function.
 	 */
-	void AddMethod(const char *method_name, SQFUNCTION proc, uint nparam = 0, const char *params = nullptr, void *userdata = nullptr, int size = 0);
+	void AddMethod(std::string_view method_name, SQFUNCTION proc, std::string_view params = {}, void *userdata = nullptr, int size = 0);
 
 	/**
 	 * Adds a const to the stack. Depending on the current state this means
 	 *  either a const to a class or to the global space.
 	 */
-	void AddConst(const char *var_name, int value);
+	void AddConst(std::string_view var_name, int value);
 
 	/**
 	 * Adds a const to the stack. Depending on the current state this means
 	 *  either a const to a class or to the global space.
 	 */
-	void AddConst(const char *var_name, uint value) { this->AddConst(var_name, (int)value); }
+	void AddConst(std::string_view var_name, uint value) { this->AddConst(var_name, (int)value); }
 
-	void AddConst(const char *var_name, const ConvertibleThroughBase auto &value) { this->AddConst(var_name, static_cast<int>(value.base())); }
+	void AddConst(std::string_view var_name, const ConvertibleThroughBase auto &value) { this->AddConst(var_name, static_cast<int>(value.base())); }
 
 	/**
 	 * Adds a const to the stack. Depending on the current state this means
 	 *  either a const to a class or to the global space.
 	 */
-	void AddConst(const char *var_name, bool value);
+	void AddConst(std::string_view var_name, bool value);
 
 	/**
 	 * Adds a class to the global scope. Make sure to call AddClassEnd when you
 	 *  are done adding methods.
 	 */
-	void AddClassBegin(const char *class_name);
+	void AddClassBegin(std::string_view class_name);
 
 	/**
 	 * Adds a class to the global scope, extending 'parent_class'.
 	 * Make sure to call AddClassEnd when you are done adding methods.
 	 */
-	void AddClassBegin(const char *class_name, const char *parent_class);
+	void AddClassBegin(std::string_view class_name, std::string_view parent_class);
 
 	/**
 	 * Finishes adding a class to the global scope. If this isn't called, no
@@ -162,16 +162,16 @@ public:
 	 * Call a method of an instance, in various flavors.
 	 * @return False if the script crashed or returned a wrong type.
 	 */
-	bool CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT *ret, int suspend);
-	bool CallMethod(HSQOBJECT instance, const char *method_name, int suspend) { return this->CallMethod(instance, method_name, nullptr, suspend); }
-	bool CallStringMethod(HSQOBJECT instance, const char *method_name, std::string *res, int suspend);
-	bool CallIntegerMethod(HSQOBJECT instance, const char *method_name, int *res, int suspend);
-	bool CallBoolMethod(HSQOBJECT instance, const char *method_name, bool *res, int suspend);
+	bool CallMethod(HSQOBJECT instance, std::string_view method_name, HSQOBJECT *ret, int suspend);
+	bool CallMethod(HSQOBJECT instance, std::string_view method_name, int suspend) { return this->CallMethod(instance, method_name, nullptr, suspend); }
+	bool CallStringMethod(HSQOBJECT instance, std::string_view method_name, std::string *res, int suspend);
+	bool CallIntegerMethod(HSQOBJECT instance, std::string_view method_name, int *res, int suspend);
+	bool CallBoolMethod(HSQOBJECT instance, std::string_view method_name, bool *res, int suspend);
 
 	/**
 	 * Check if a method exists in an instance.
 	 */
-	bool MethodExists(HSQOBJECT instance, const char *method_name);
+	bool MethodExists(HSQOBJECT instance, std::string_view method_name);
 
 	/**
 	 * Creates a class instance.
@@ -195,7 +195,7 @@ public:
 	 * @note This will only work just after a function-call from within Squirrel
 	 *  to your C++ function.
 	 */
-	static SQUserPointer GetRealInstance(HSQUIRRELVM vm, int index, const char *tag);
+	static SQUserPointer GetRealInstance(HSQUIRRELVM vm, int index, std::string_view tag);
 
 	/**
 	 * Get the Squirrel-instance pointer.
@@ -207,7 +207,7 @@ public:
 	/**
 	 * Convert a Squirrel-object to a string.
 	 */
-	static const char *ObjectToString(HSQOBJECT *ptr) { return sq_objtostring(ptr); }
+	static std::optional<std::string_view> ObjectToString(HSQOBJECT *ptr) { return sq_objtostring(ptr); }
 
 	/**
 	 * Convert a Squirrel-object to an integer.
@@ -238,7 +238,7 @@ public:
 	/**
 	 * Throw a Squirrel error that will be nicely displayed to the user.
 	 */
-	void ThrowError(const std::string_view error) { sq_throwerror(this->vm, error); }
+	void ThrowError(std::string_view error) { sq_throwerror(this->vm, error); }
 
 	/**
 	 * Release a SQ object.
diff --git a/src/script/squirrel_class.hpp b/src/script/squirrel_class.hpp
index 8794e2441a..dd84ff652b 100644
--- a/src/script/squirrel_class.hpp
+++ b/src/script/squirrel_class.hpp
@@ -19,111 +19,91 @@
 template <class CL, ScriptType ST>
 class DefSQClass {
 private:
-	const char *classname;
+	std::string_view classname;
 
 public:
-	DefSQClass(const char *_classname) :
+	DefSQClass(std::string_view _classname) :
 		classname(_classname)
 	{}
 
 	/**
-	 * This defines a method inside a class for Squirrel.
+	 * This defines a method inside a class for Squirrel with defined params.
+	 * @note If you define params, make sure that the first param is always 'x',
+	 *  which is the 'this' inside the function. This is hidden from the rest
+	 *  of the code, but without it calling your function will fail!
 	 */
 	template <typename Func>
-	void DefSQMethod(Squirrel *engine, Func function_proc, const char *function_name)
+	void DefSQMethod(Squirrel &engine, Func function_proc, std::string_view function_name, std::string_view params = {})
 	{
 		using namespace SQConvert;
-		engine->AddMethod(function_name, DefSQNonStaticCallback<CL, Func, ST>, 0, nullptr, &function_proc, sizeof(function_proc));
+		engine.AddMethod(function_name, DefSQNonStaticCallback<CL, Func, ST>, params, &function_proc, sizeof(function_proc));
 	}
 
 	/**
 	 * This defines a method inside a class for Squirrel, which has access to the 'engine' (experts only!).
 	 */
 	template <typename Func>
-	void DefSQAdvancedMethod(Squirrel *engine, Func function_proc, const char *function_name)
+	void DefSQAdvancedMethod(Squirrel &engine, Func function_proc, std::string_view function_name)
 	{
 		using namespace SQConvert;
-		engine->AddMethod(function_name, DefSQAdvancedNonStaticCallback<CL, Func, ST>, 0, nullptr, &function_proc, sizeof(function_proc));
+		engine.AddMethod(function_name, DefSQAdvancedNonStaticCallback<CL, Func, ST>, {}, &function_proc, sizeof(function_proc));
 	}
 
 	/**
-	 * This defines a method inside a class for Squirrel with defined params.
-	 * @note If you define nparam, make sure that the first param is always 'x',
+	 * This defines a static method inside a class for Squirrel with defined params.
+	 * @note If you define params, make sure that the first param is always 'x',
 	 *  which is the 'this' inside the function. This is hidden from the rest
 	 *  of the code, but without it calling your function will fail!
 	 */
 	template <typename Func>
-	void DefSQMethod(Squirrel *engine, Func function_proc, const char *function_name, int nparam, const char *params)
+	void DefSQStaticMethod(Squirrel &engine, Func function_proc, std::string_view function_name, std::string_view params = {})
 	{
 		using namespace SQConvert;
-		engine->AddMethod(function_name, DefSQNonStaticCallback<CL, Func, ST>, nparam, params, &function_proc, sizeof(function_proc));
-	}
-
-	/**
-	 * This defines a static method inside a class for Squirrel.
-	 */
-	template <typename Func>
-	void DefSQStaticMethod(Squirrel *engine, Func function_proc, const char *function_name)
-	{
-		using namespace SQConvert;
-		engine->AddMethod(function_name, DefSQStaticCallback<CL, Func>, 0, nullptr, &function_proc, sizeof(function_proc));
+		engine.AddMethod(function_name, DefSQStaticCallback<CL, Func>, params, &function_proc, sizeof(function_proc));
 	}
 
 	/**
 	 * This defines a static method inside a class for Squirrel, which has access to the 'engine' (experts only!).
 	 */
 	template <typename Func>
-	void DefSQAdvancedStaticMethod(Squirrel *engine, Func function_proc, const char *function_name)
+	void DefSQAdvancedStaticMethod(Squirrel &engine, Func function_proc, std::string_view function_name)
 	{
 		using namespace SQConvert;
-		engine->AddMethod(function_name, DefSQAdvancedStaticCallback<CL, Func>, 0, nullptr, &function_proc, sizeof(function_proc));
-	}
-
-	/**
-	 * This defines a static method inside a class for Squirrel with defined params.
-	 * @note If you define nparam, make sure that the first param is always 'x',
-	 *  which is the 'this' inside the function. This is hidden from the rest
-	 *  of the code, but without it calling your function will fail!
-	 */
-	template <typename Func>
-	void DefSQStaticMethod(Squirrel *engine, Func function_proc, const char *function_name, int nparam, const char *params)
-	{
-		using namespace SQConvert;
-		engine->AddMethod(function_name, DefSQStaticCallback<CL, Func>, nparam, params, &function_proc, sizeof(function_proc));
+		engine.AddMethod(function_name, DefSQAdvancedStaticCallback<CL, Func>, {}, &function_proc, sizeof(function_proc));
 	}
 
 	template <typename Var>
-	void DefSQConst(Squirrel *engine, Var value, const char *var_name)
+	void DefSQConst(Squirrel &engine, Var value, std::string_view var_name)
 	{
-		engine->AddConst(var_name, value);
+		engine.AddConst(var_name, value);
 	}
 
-	void PreRegister(Squirrel *engine)
+	void PreRegister(Squirrel &engine)
 	{
-		engine->AddClassBegin(this->classname);
+		engine.AddClassBegin(this->classname);
 	}
 
-	void PreRegister(Squirrel *engine, const char *parent_class)
+	void PreRegister(Squirrel &engine, std::string_view parent_class)
 	{
-		engine->AddClassBegin(this->classname, parent_class);
+		engine.AddClassBegin(this->classname, parent_class);
 	}
 
-	template <typename Func, int Tnparam>
-	void AddConstructor(Squirrel *engine, const char *params)
+	template <typename Func>
+	void AddConstructor(Squirrel &engine, std::string_view params)
 	{
 		using namespace SQConvert;
-		engine->AddMethod("constructor", DefSQConstructorCallback<CL, Func, Tnparam>, Tnparam, params);
+		engine.AddMethod("constructor", DefSQConstructorCallback<CL, Func>, params);
 	}
 
-	void AddSQAdvancedConstructor(Squirrel *engine)
+	void AddSQAdvancedConstructor(Squirrel &engine)
 	{
 		using namespace SQConvert;
-		engine->AddMethod("constructor", DefSQAdvancedConstructorCallback<CL>, 0, nullptr);
+		engine.AddMethod("constructor", DefSQAdvancedConstructorCallback<CL>);
 	}
 
-	void PostRegister(Squirrel *engine)
+	void PostRegister(Squirrel &engine)
 	{
-		engine->AddClassEnd();
+		engine.AddClassEnd();
 	}
 };
 
diff --git a/src/script/squirrel_helper.hpp b/src/script/squirrel_helper.hpp
index b0566e1233..f63351ddbf 100644
--- a/src/script/squirrel_helper.hpp
+++ b/src/script/squirrel_helper.hpp
@@ -61,7 +61,7 @@ namespace SQConvert {
 		static inline int Set(HSQUIRRELVM vm, std::optional<std::string> res)
 		{
 			if (res.has_value()) {
-				sq_pushstring(vm, res.value(), -1);
+				sq_pushstring(vm, res.value());
 			} else {
 				sq_pushnull(vm);
 			}
@@ -110,9 +110,9 @@ namespace SQConvert {
 			/* Convert what-ever there is as parameter to a string */
 			sq_tostring(vm, index);
 
-			const SQChar *tmp;
-			sq_getstring(vm, -1, &tmp);
-			std::string result = StrMakeValid(tmp);
+			std::string_view view;
+			sq_getstring(vm, -1, view);
+			std::string result = StrMakeValid(view);
 			sq_poptop(vm);
 			return result;
 		}
@@ -187,9 +187,9 @@ namespace SQConvert {
 			return SQCall(instance, func, vm, std::index_sequence_for<Targs...>{});
 		}
 
-		static Tcls *SQConstruct(Tcls *instance, Tretval(Tcls:: *func)(Targs...), HSQUIRRELVM vm)
+		static Tcls *SQConstruct(HSQUIRRELVM vm)
 		{
-			return SQConstruct(instance, func, vm, std::index_sequence_for<Targs...>{});
+			return SQConstruct(vm, std::index_sequence_for<Targs...>{});
 		}
 
 	private:
@@ -210,7 +210,7 @@ namespace SQConvert {
 		}
 
 		template <size_t... i>
-		static Tcls *SQConstruct(Tcls *, Tretval(Tcls:: *)(Targs...), [[maybe_unused]] HSQUIRRELVM vm, std::index_sequence<i...>)
+		static Tcls *SQConstruct([[maybe_unused]] HSQUIRRELVM vm, std::index_sequence<i...>)
 		{
 			Tcls *inst = new Tcls(
 				Param<Targs>::Get(vm, 2 + i)...
@@ -376,14 +376,17 @@ namespace SQConvert {
 	 *  params. It creates the instance in C++, and it sets all the needed
 	 *  settings in SQ to register the instance.
 	 */
-	template <typename Tcls, typename Tmethod, int Tnparam>
+	template <typename Tcls, typename Tmethod>
 	inline SQInteger DefSQConstructorCallback(HSQUIRRELVM vm)
 	{
 		try {
+			/* Find the amount of params we got */
+			int nparam = sq_gettop(vm);
+
 			/* Create the real instance */
-			Tcls *instance = HelperT<Tmethod>::SQConstruct((Tcls *)nullptr, (Tmethod)nullptr, vm);
-			sq_setinstanceup(vm, -Tnparam, instance);
-			sq_setreleasehook(vm, -Tnparam, DefSQDestructorCallback<Tcls>);
+			Tcls *instance = HelperT<Tmethod>::SQConstruct(vm);
+			sq_setinstanceup(vm, -nparam, instance);
+			sq_setreleasehook(vm, -nparam, DefSQDestructorCallback<Tcls>);
 			instance->AddRef();
 			return 0;
 		} catch (SQInteger &e) {
diff --git a/src/script/squirrel_std.cpp b/src/script/squirrel_std.cpp
index abcac023ec..d00c2ca023 100644
--- a/src/script/squirrel_std.cpp
+++ b/src/script/squirrel_std.cpp
@@ -41,20 +41,16 @@ SQInteger SquirrelStd::max(HSQUIRRELVM vm)
 SQInteger SquirrelStd::require(HSQUIRRELVM vm)
 {
 	SQInteger top = sq_gettop(vm);
-	const SQChar *filename;
+	std::string_view filename;
 
-	sq_getstring(vm, 2, &filename);
+	sq_getstring(vm, 2, filename);
 
 	/* Get the script-name of the current file, so we can work relative from it */
 	SQStackInfos si;
 	sq_stackinfos(vm, 1, &si);
-	if (si.source == nullptr) {
-		Debug(misc, 0, "[squirrel] Couldn't detect the script-name of the 'require'-caller; this should never happen!");
-		return SQ_ERROR;
-	}
 
 	/* Keep the dir, remove the rest */
-	std::string path = si.source;
+	std::string path{si.source};
 	auto p = path.find_last_of(PATHSEPCHAR);
 	/* Keep the PATHSEPCHAR there, remove the rest */
 	if (p != std::string::npos) path.erase(p + 1);
@@ -90,16 +86,16 @@ void squirrel_register_global_std(Squirrel *engine)
 {
 	/* We don't use squirrel_helper here, as we want to register to the global
 	 *  scope and not to a class. */
-	engine->AddMethod("require",             &SquirrelStd::require,             2, ".s");
-	engine->AddMethod("notifyallexceptions", &SquirrelStd::notifyallexceptions, 2, ".b");
+	engine->AddMethod("require",             &SquirrelStd::require,             ".s");
+	engine->AddMethod("notifyallexceptions", &SquirrelStd::notifyallexceptions, ".b");
 }
 
 void squirrel_register_std(Squirrel *engine)
 {
 	/* We don't use squirrel_helper here, as we want to register to the global
 	 *  scope and not to a class. */
-	engine->AddMethod("min", &SquirrelStd::min, 3, ".ii");
-	engine->AddMethod("max", &SquirrelStd::max, 3, ".ii");
+	engine->AddMethod("min", &SquirrelStd::min, ".ii");
+	engine->AddMethod("max", &SquirrelStd::max, ".ii");
 
 	sqstd_register_mathlib(engine->GetVM());
 }
diff --git a/src/settingentry_gui.cpp b/src/settingentry_gui.cpp
index 6ceeca0895..fcc408adb3 100644
--- a/src/settingentry_gui.cpp
+++ b/src/settingentry_gui.cpp
@@ -94,7 +94,7 @@ uint BaseSettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int
 	if (cur_row >= max_row) return cur_row;
 
 	bool rtl = _current_text_dir == TD_RTL;
-	int offset = (rtl ? -(int)_circle_size.width : (int)_circle_size.width) / 2;
+	int offset = (rtl ? -(int)_setting_circle_size.width : (int)_setting_circle_size.width) / 2;
 	int level_width = rtl ? -WidgetDimensions::scaled.hsep_indent : WidgetDimensions::scaled.hsep_indent;
 
 	int x = rtl ? right : left;
@@ -124,16 +124,6 @@ uint BaseSettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int
 
 /* == SettingEntry methods == */
 
-/**
- * Constructor for a single setting in the 'advanced settings' window
- * @param name Name of the setting in the setting table
- */
-SettingEntry::SettingEntry(const char *name)
-{
-	this->name = name;
-	this->setting = nullptr;
-}
-
 /**
  * Initialization of a setting entry
  * @param level      Page nesting level of this entry
@@ -293,7 +283,7 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, int left, int right,
 	int32_t value = sd->Read(ResolveObject(settings_ptr, sd));
 	if (sd->IsBoolSetting()) {
 		/* Draw checkbox for boolean-value either on/off */
-		DrawBoolButton(buttons_left, button_y, value != 0, editable);
+		DrawBoolButton(buttons_left, button_y, COLOUR_YELLOW, COLOUR_MAUVE, value != 0, editable);
 	} else if (sd->flags.Test(SettingFlag::GuiDropdown)) {
 		/* Draw [v] button for settings of an enum-type */
 		DrawDropDownButton(buttons_left, button_y, COLOUR_YELLOW, state != 0, editable);
@@ -621,8 +611,8 @@ uint SettingsPage::Draw(GameSettings *settings_ptr, int left, int right, int y,
 void SettingsPage::DrawSetting(GameSettings *, int left, int right, int y, bool) const
 {
 	bool rtl = _current_text_dir == TD_RTL;
-	DrawSprite((this->folded ? SPR_CIRCLE_FOLDED : SPR_CIRCLE_UNFOLDED), PAL_NONE, rtl ? right - _circle_size.width : left, y + (SETTING_HEIGHT - _circle_size.height) / 2);
-	DrawString(rtl ? left : left + _circle_size.width + WidgetDimensions::scaled.hsep_normal, rtl ? right - _circle_size.width - WidgetDimensions::scaled.hsep_normal : right, y + (SETTING_HEIGHT - GetCharacterHeight(FS_NORMAL)) / 2, this->title, TC_ORANGE);
+	DrawSprite((this->folded ? SPR_CIRCLE_FOLDED : SPR_CIRCLE_UNFOLDED), PAL_NONE, rtl ? right - _setting_circle_size.width : left, y + (SETTING_HEIGHT - _setting_circle_size.height) / 2);
+	DrawString(rtl ? left : left + _setting_circle_size.width + WidgetDimensions::scaled.hsep_normal, rtl ? right - _setting_circle_size.width - WidgetDimensions::scaled.hsep_normal : right, y + (SETTING_HEIGHT - GetCharacterHeight(FS_NORMAL)) / 2, this->title, TC_ORANGE);
 }
 
 /** Construct settings tree */
diff --git a/src/settingentry_gui.h b/src/settingentry_gui.h
index 600f2e98e9..66c017b99f 100644
--- a/src/settingentry_gui.h
+++ b/src/settingentry_gui.h
@@ -14,7 +14,7 @@
 #include "settings_internal.h"
 #include "stringfilter_type.h"
 
-extern Dimension _circle_size;
+extern Dimension _setting_circle_size;
 extern int SETTING_HEIGHT;
 
 /**
@@ -92,10 +92,10 @@ protected:
 
 /** Standard setting */
 struct SettingEntry : BaseSettingEntry {
-	const char *name;              ///< Name of the setting
-	const IntSettingDesc *setting; ///< Setting description of the setting
+	const std::string_view name; ///< Name of the setting
+	const IntSettingDesc *setting = nullptr; ///< Setting description of the setting
 
-	SettingEntry(const char *name);
+	SettingEntry(std::string_view name) : name(name) {}
 
 	void Init(uint8_t level = 0) override;
 	void ResetAll() override;
diff --git a/src/settings.cpp b/src/settings.cpp
index 9cd14a2da7..9efb21a057 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -23,6 +23,7 @@
 
 #include "stdafx.h"
 #include <charconv>
+#include "core/string_consumer.hpp"
 #include "settings_table.h"
 #include "debug.h"
 #include "currency.h"
@@ -45,6 +46,7 @@
 #include "game/game_config.hpp"
 #include "newgrf_config.h"
 #include "picker_func.h"
+#include "newgrf_badge_config.h"
 #include "base_media_base.h"
 #include "base_media_graphics.h"
 #include "fios.h"
@@ -117,8 +119,8 @@ static auto &SecretSettingTables()
 	return _secrets_setting_tables;
 }
 
-typedef void SettingDescProc(IniFile &ini, const SettingTable &desc, const char *grpname, void *object, bool only_startup);
-typedef void SettingDescProcList(IniFile &ini, const char *grpname, StringList &list);
+using SettingDescProc = void(IniFile &ini, const SettingTable &desc, std::string_view grpname, void *object, bool only_startup);
+using SettingDescProcList = void(IniFile &ini, std::string_view grpname, StringList &list);
 
 static bool IsSignedVarMemType(VarType vt)
 {
@@ -137,7 +139,7 @@ static bool IsSignedVarMemType(VarType vt)
  */
 class ConfigIniFile : public IniFile {
 private:
-	inline static const IniGroupNameList list_group_names = {
+	static inline const IniGroupNameList list_group_names = {
 		"bans",
 		"newgrf",
 		"servers",
@@ -178,24 +180,21 @@ enum IniFileVersion : uint32_t {
 const uint16_t INIFILE_VERSION = (IniFileVersion)(IFV_MAX_VERSION - 1); ///< Current ini-file version of OpenTTD.
 
 /**
- * Find the index value of a ONEofMANY type in a string separated by |
+ * Find the index value of a ONEofMANY type in a string
  * @param str the current value of the setting for which a value needs found
- * @param len length of the string
  * @param many full domain of values the ONEofMANY setting can have
- * @return the integer index of the full-list, or SIZE_MAX if not found
+ * @return the integer index of the full-list, or std::nullopt if not found
  */
-size_t OneOfManySettingDesc::ParseSingleValue(const char *str, size_t len, const std::vector<std::string> &many)
+std::optional<uint32_t> OneOfManySettingDesc::ParseSingleValue(std::string_view str, std::span<const std::string_view> many)
 {
+	StringConsumer consumer{str};
+	auto digit = consumer.TryReadIntegerBase<uint32_t>(10);
 	/* check if it's an integer */
-	if (isdigit(*str)) return std::strtoul(str, nullptr, 0);
+	if (digit.has_value()) return digit;
 
-	size_t idx = 0;
-	for (const auto &one : many) {
-		if (one.size() == len && strncmp(one.c_str(), str, len) == 0) return idx;
-		idx++;
-	}
-
-	return SIZE_MAX;
+	auto it = std::ranges::find(many, str);
+	if (it == many.end()) return std::nullopt;
+	return static_cast<uint32_t>(it - many.begin());
 }
 
 /**
@@ -204,10 +203,10 @@ size_t OneOfManySettingDesc::ParseSingleValue(const char *str, size_t len, const
  * @param str the current value of the setting for which a value needs found.
  * @return Either true/false, or nullopt if no boolean value found.
  */
-std::optional<bool> BoolSettingDesc::ParseSingleValue(const char *str)
+std::optional<bool> BoolSettingDesc::ParseSingleValue(std::string_view str)
 {
-	if (strcmp(str, "true") == 0 || strcmp(str, "on") == 0 || strcmp(str, "1") == 0) return true;
-	if (strcmp(str, "false") == 0 || strcmp(str, "off") == 0 || strcmp(str, "0") == 0) return false;
+	if (str == "true" || str == "on" || str == "1") return true;
+	if (str == "false" || str == "off" || str == "0") return false;
 
 	return std::nullopt;
 }
@@ -216,66 +215,53 @@ std::optional<bool> BoolSettingDesc::ParseSingleValue(const char *str)
  * Find the set-integer value MANYofMANY type in a string
  * @param many full domain of values the MANYofMANY setting can have
  * @param str the current string value of the setting, each individual
- * of separated by a whitespace,tab or | character
- * @return the 'fully' set integer, or SIZE_MAX if a set is not found
+ * of separated by a whitespace, tab or | character
+ * @return the 'fully' set integer, or std::nullopt if a set is not found
  */
-static size_t LookupManyOfMany(const std::vector<std::string> &many, const char *str)
+static std::optional<uint32_t> LookupManyOfMany(std::span<const std::string_view> many, std::string_view str)
 {
-	const char *s;
-	size_t r;
-	size_t res = 0;
+	static const std::string_view separators{" \t|"};
 
-	for (;;) {
+	uint32_t res = 0;
+	StringConsumer consumer{str};
+	while (consumer.AnyBytesLeft()) {
 		/* skip "whitespace" */
-		while (*str == ' ' || *str == '\t' || *str == '|') str++;
-		if (*str == 0) break;
+		consumer.SkipUntilCharNotIn(separators);
 
-		s = str;
-		while (*s != 0 && *s != ' ' && *s != '\t' && *s != '|') s++;
+		std::string_view value = consumer.ReadUntilCharIn(separators);
+		if (value.empty()) break;
 
-		r = OneOfManySettingDesc::ParseSingleValue(str, s - str, many);
-		if (r == SIZE_MAX) return r;
+		auto r = OneOfManySettingDesc::ParseSingleValue(value, many);
+		if (!r.has_value()) return r;
 
-		SetBit(res, (uint8_t)r); // value found, set it
-		if (*s == 0) break;
-		str = s + 1;
+		SetBit(res, *r); // value found, set it
 	}
 	return res;
 }
 
 /**
  * Parse a string into a vector of uint32s.
- * @param p the string to be parsed. Each element in the list is separated by a comma or a space character
+ * @param str the string to be parsed. Each element in the list is separated by a comma or a space character
  * @return std::optional with a vector of parsed integers. The optional is empty upon an error.
  */
-static std::optional<std::vector<uint32_t>> ParseIntList(const char *p)
+static std::optional<std::vector<uint32_t>> ParseIntList(std::string_view str)
 {
 	bool comma = false; // do we accept comma?
 	std::vector<uint32_t> result;
 
-	while (*p != '\0') {
-		switch (*p) {
-			case ',':
-				/* Do not accept multiple commas between numbers */
-				if (!comma) return std::nullopt;
-				comma = false;
-				[[fallthrough]];
-
-			case ' ':
-				p++;
-				break;
-
-			default: {
-				char *end;
-				unsigned long v = std::strtoul(p, &end, 0);
-				if (p == end) return std::nullopt; // invalid character (not a number)
-
-				result.push_back(ClampTo<uint32_t>(v));
-				p = end; // first non-number
-				comma = true; // we accept comma now
-				break;
-			}
+	StringConsumer consumer{str};
+	for (;;) {
+		consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+		if (!consumer.AnyBytesLeft()) break;
+		if (comma && consumer.ReadIf(",")) {
+			/* commas are optional, but we only accept one between values */
+			comma = false;
+			continue;
 		}
+		auto v = consumer.TryReadIntegerBase<uint32_t>(10);
+		if (!v.has_value()) return std::nullopt;
+		result.push_back(*v);
+		comma = true;
 	}
 
 	/* If we have read comma but no number after it, fail.
@@ -293,18 +279,18 @@ static std::optional<std::vector<uint32_t>> ParseIntList(const char *p)
  * @param type the type of elements the array holds (eg INT8, UINT16, etc.)
  * @return return true on success and false on error
  */
-static bool LoadIntList(const char *str, void *array, int nelems, VarType type)
+static bool LoadIntList(std::optional<std::string_view> str, void *array, int nelems, VarType type)
 {
 	size_t elem_size = SlVarSize(type);
-	if (str == nullptr) {
-		memset(array, 0, nelems * elem_size);
+	std::byte *p = static_cast<std::byte *>(array);
+	if (!str.has_value()) {
+		std::fill_n(p, nelems * elem_size, static_cast<std::byte>(0));
 		return true;
 	}
 
-	auto opt_items = ParseIntList(str);
+	auto opt_items = ParseIntList(*str);
 	if (!opt_items.has_value() || opt_items->size() != (size_t)nelems) return false;
 
-	char *p = static_cast<char *>(array);
 	for (auto item : *opt_items) {
 		WriteValue(p, type, item);
 		p += elem_size;
@@ -339,7 +325,7 @@ std::string ListSettingDesc::FormatValue(const void *object) const
 			default: NOT_REACHED();
 		}
 		if (i != 0) result += ',';
-		result += std::to_string(v);
+		format_append(result, "{}", v);
 	}
 	return result;
 }
@@ -347,9 +333,9 @@ std::string ListSettingDesc::FormatValue(const void *object) const
 std::string OneOfManySettingDesc::FormatSingleValue(uint id) const
 {
 	if (id >= this->many.size()) {
-		return std::to_string(id);
+		return fmt::format("{}", id);
 	}
-	return this->many[id];
+	return std::string{this->many[id]};
 }
 
 std::string OneOfManySettingDesc::FormatValue(const void *object) const
@@ -378,31 +364,32 @@ std::string ManyOfManySettingDesc::FormatValue(const void *object) const
  * @param str Input string that will be parsed based on the type of desc.
  * @return The value from the parse string, or the default value of the setting.
  */
-size_t IntSettingDesc::ParseValue(const char *str) const
+int32_t IntSettingDesc::ParseValue(std::string_view str) const
 {
-	char *end;
-	size_t val = std::strtoul(str, &end, 0);
-	if (end == str) {
+	StringConsumer consumer{str};
+	/* The actual settings value might be int32 or uint32. Read as int64 and just cast away the high bits. */
+	auto value = consumer.TryReadIntegerBase<int64_t>(10);
+	if (!value.has_value()) {
 		_settings_error_list.emplace_back(
 			GetEncodedString(STR_CONFIG_ERROR),
 			GetEncodedString(STR_CONFIG_ERROR_INVALID_VALUE, str, this->GetName()));
 		return this->GetDefaultValue();
 	}
-	if (*end != '\0') {
+	if (consumer.AnyBytesLeft()) {
 		_settings_error_list.emplace_back(
 			GetEncodedString(STR_CONFIG_ERROR),
 			GetEncodedString(STR_CONFIG_ERROR_TRAILING_CHARACTERS, this->GetName()));
 	}
-	return val;
+	return static_cast<int32_t>(*value);
 }
 
-size_t OneOfManySettingDesc::ParseValue(const char *str) const
+int32_t OneOfManySettingDesc::ParseValue(std::string_view str) const
 {
-	size_t r = OneOfManySettingDesc::ParseSingleValue(str, strlen(str), this->many);
+	auto r = OneOfManySettingDesc::ParseSingleValue(str, this->many);
 	/* if the first attempt of conversion from string to the appropriate value fails,
 	 * look if we have defined a converter from old value to new value. */
-	if (r == SIZE_MAX && this->many_cnvt != nullptr) r = this->many_cnvt(str);
-	if (r != SIZE_MAX) return r; // and here goes converted value
+	if (!r.has_value() && this->many_cnvt != nullptr) r = this->many_cnvt(str);
+	if (r.has_value()) return *r; // and here goes converted value
 
 	_settings_error_list.emplace_back(
 		GetEncodedString(STR_CONFIG_ERROR),
@@ -410,10 +397,10 @@ size_t OneOfManySettingDesc::ParseValue(const char *str) const
 	return this->GetDefaultValue();
 }
 
-size_t ManyOfManySettingDesc::ParseValue(const char *str) const
+int32_t ManyOfManySettingDesc::ParseValue(std::string_view str) const
 {
-	size_t r = LookupManyOfMany(this->many, str);
-	if (r != SIZE_MAX) return r;
+	auto r = LookupManyOfMany(this->many, str);
+	if (r.has_value()) return *r;
 
 	_settings_error_list.emplace_back(
 		GetEncodedString(STR_CONFIG_ERROR),
@@ -421,7 +408,7 @@ size_t ManyOfManySettingDesc::ParseValue(const char *str) const
 	return this->GetDefaultValue();
 }
 
-size_t BoolSettingDesc::ParseValue(const char *str) const
+int32_t BoolSettingDesc::ParseValue(std::string_view str) const
 {
 	auto r = BoolSettingDesc::ParseSingleValue(str);
 	if (r.has_value()) return *r;
@@ -606,7 +593,7 @@ void StringSettingDesc::MakeValueValid(std::string &str) const
  * @param object The object the setting is to be saved in.
  * @param str The string to save.
  */
-void StringSettingDesc::Write(const void *object, const std::string &str) const
+void StringSettingDesc::Write(const void *object, std::string_view str) const
 {
 	reinterpret_cast<std::string *>(GetVariableAddress(object, this->save))->assign(str);
 }
@@ -630,7 +617,7 @@ const std::string &StringSettingDesc::Read(const void *object) const
  * @param object pointer to the object been loaded
  * @param only_startup load only the startup settings set
  */
-static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, const char *grpname, void *object, bool only_startup)
+static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, std::string_view grpname, void *object, bool only_startup)
 {
 	const IniGroup *group;
 	const IniGroup *group_def = ini.GetGroup(grpname);
@@ -673,20 +660,25 @@ static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, co
 
 void IntSettingDesc::ParseValue(const IniItem *item, void *object) const
 {
-	size_t val = (item == nullptr) ? this->GetDefaultValue() : this->ParseValue(item->value.has_value() ? item->value->c_str() : "");
-	this->MakeValueValidAndWrite(object, (int32_t)val);
+	int32_t val = (item != nullptr && item->value.has_value()) ? this->ParseValue(*item->value) : this->GetDefaultValue();
+	this->MakeValueValidAndWrite(object, val);
 }
 
 void StringSettingDesc::ParseValue(const IniItem *item, void *object) const
 {
-	std::string str = (item == nullptr) ? this->def : item->value.value_or("");
+	std::string str{(item == nullptr) ? this->def : item->value.value_or("")};
 	this->MakeValueValid(str);
 	this->Write(object, str);
 }
 
 void ListSettingDesc::ParseValue(const IniItem *item, void *object) const
 {
-	const char *str = (item == nullptr) ? this->def : item->value.has_value() ? item->value->c_str() : nullptr;
+	std::optional<std::string_view> str;
+	if (item != nullptr) {
+		str = item->value;
+	} else if (!this->def.empty()) {
+		str = this->def;
+	}
 	void *ptr = GetVariableAddress(object, this->save);
 	if (!LoadIntList(str, ptr, this->save.length, GetVarMemType(this->save.conv))) {
 		_settings_error_list.emplace_back(
@@ -710,7 +702,7 @@ void ListSettingDesc::ParseValue(const IniItem *item, void *object) const
  * values are reloaded when saving). If settings indeed have changed, we get
  * these and save them.
  */
-static void IniSaveSettings(IniFile &ini, const SettingTable &settings_table, const char *grpname, void *object, bool)
+static void IniSaveSettings(IniFile &ini, const SettingTable &settings_table, std::string_view grpname, void *object, bool)
 {
 	IniGroup *group_def = nullptr, *group;
 
@@ -749,7 +741,7 @@ std::string IntSettingDesc::FormatValue(const void *object) const
 	} else {
 		i = (uint32_t)this->Read(object);
 	}
-	return std::to_string(i);
+	return fmt::format("{}", i);
 }
 
 std::string BoolSettingDesc::FormatValue(const void *object) const
@@ -760,7 +752,7 @@ std::string BoolSettingDesc::FormatValue(const void *object) const
 
 bool IntSettingDesc::IsSameValue(const IniItem *item, void *object) const
 {
-	int32_t item_value = (int32_t)this->ParseValue(item->value->c_str());
+	int32_t item_value = static_cast<int32_t>(this->ParseValue(*item->value));
 	int32_t object_value = this->Read(object);
 	return item_value == object_value;
 }
@@ -840,7 +832,7 @@ void ListSettingDesc::ResetToDefault(void *) const
  * @param grpname character string identifying the section-header of the ini file that will be parsed
  * @param list new list with entries of the given section
  */
-static void IniLoadSettingList(IniFile &ini, const char *grpname, StringList &list)
+static void IniLoadSettingList(IniFile &ini, std::string_view grpname, StringList &list)
 {
 	const IniGroup *group = ini.GetGroup(grpname);
 
@@ -862,7 +854,7 @@ static void IniLoadSettingList(IniFile &ini, const char *grpname, StringList &li
  * @param list pointer to an string(pointer) array that will be used as the
  *             source to be saved into the relevant ini section
  */
-static void IniSaveSettingList(IniFile &ini, const char *grpname, StringList &list)
+static void IniSaveSettingList(IniFile &ini, std::string_view grpname, StringList &list)
 {
 	IniGroup &group = ini.GetOrCreateGroup(grpname);
 	group.Clear();
@@ -878,7 +870,7 @@ static void IniSaveSettingList(IniFile &ini, const char *grpname, StringList &li
  * @param grpname character string identifying the section-header of the ini file that will be parsed
  * @param desc Destination WindowDesc
  */
-void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc)
+void IniLoadWindowSettings(IniFile &ini, std::string_view grpname, WindowDesc *desc)
 {
 	IniLoadSettings(ini, _window_settings, grpname, desc, false);
 }
@@ -889,7 +881,7 @@ void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc)
  * @param grpname character string identifying the section-header of the ini file
  * @param desc Source WindowDesc
  */
-void IniSaveWindowSettings(IniFile &ini, const char *grpname, void *desc)
+void IniSaveWindowSettings(IniFile &ini, std::string_view grpname, WindowDesc *desc)
 {
 	IniSaveSettings(ini, _window_settings, grpname, desc, false);
 }
@@ -956,7 +948,7 @@ static void ValidateSettings()
 	}
 }
 
-static void AILoadConfig(const IniFile &ini, const char *grpname)
+static void AILoadConfig(const IniFile &ini, std::string_view grpname)
 {
 	const IniGroup *group = ini.GetGroup(grpname);
 
@@ -985,7 +977,7 @@ static void AILoadConfig(const IniFile &ini, const char *grpname)
 	}
 }
 
-static void GameLoadConfig(const IniFile &ini, const char *grpname)
+static void GameLoadConfig(const IniFile &ini, std::string_view grpname)
 {
 	const IniGroup *group = ini.GetGroup(grpname);
 
@@ -1024,13 +1016,29 @@ static void GraphicsSetLoadConfig(IniFile &ini)
 		if (const IniItem *item = group->GetItem("name"); item != nullptr && item->value) BaseGraphics::ini_data.name = *item->value;
 
 		if (const IniItem *item = group->GetItem("shortname"); item != nullptr && item->value && item->value->size() == 8) {
-			BaseGraphics::ini_data.shortname = std::byteswap<uint32_t>(std::strtoul(item->value->c_str(), nullptr, 16));
+			auto val = ParseInteger<uint32_t>(*item->value, 16);
+			if (val.has_value()) {
+				BaseGraphics::ini_data.shortname = std::byteswap<uint32_t>(*val);
+			} else {
+				ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
+					GetEncodedString(STR_CONFIG_ERROR_INVALID_VALUE, *item->value, BaseGraphics::ini_data.name),
+					WL_CRITICAL);
+			}
 		}
 
-		if (const IniItem *item = group->GetItem("extra_version"); item != nullptr && item->value) BaseGraphics::ini_data.extra_version = std::strtoul(item->value->c_str(), nullptr, 10);
+		if (const IniItem *item = group->GetItem("extra_version"); item != nullptr && item->value) {
+			auto val = ParseInteger<uint32_t>(*item->value);
+			if (val.has_value()) {
+				BaseGraphics::ini_data.extra_version = *val;
+			} else {
+				ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
+					GetEncodedString(STR_CONFIG_ERROR_INVALID_VALUE, *item->value, BaseGraphics::ini_data.name),
+					WL_CRITICAL);
+			}
+		}
 
 		if (const IniItem *item = group->GetItem("extra_params"); item != nullptr && item->value) {
-			auto params = ParseIntList(item->value->c_str());
+			auto params = ParseIntList(*item->value);
 			if (params.has_value()) {
 				BaseGraphics::ini_data.extra_params = params.value();
 			} else {
@@ -1048,7 +1056,7 @@ static void GraphicsSetLoadConfig(IniFile &ini)
  * @param grpname   Group name containing the configuration of the GRF.
  * @param is_static GRF is static.
  */
-static GRFConfigList GRFLoadConfig(const IniFile &ini, const char *grpname, bool is_static)
+static GRFConfigList GRFLoadConfig(const IniFile &ini, std::string_view grpname, bool is_static)
 {
 	const IniGroup *group = ini.GetGroup(grpname);
 	GRFConfigList list;
@@ -1097,7 +1105,7 @@ static GRFConfigList GRFLoadConfig(const IniFile &ini, const char *grpname, bool
 
 		/* Parse parameters */
 		if (item.value.has_value() && !item.value->empty()) {
-			auto params = ParseIntList(item.value->c_str());
+			auto params = ParseIntList(*item.value);
 			if (params.has_value()) {
 				c->SetParams(params.value());
 			} else {
@@ -1123,7 +1131,7 @@ static GRFConfigList GRFLoadConfig(const IniFile &ini, const char *grpname, bool
 			}
 
 			ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
-				GetEncodedString(STR_CONFIG_ERROR_INVALID_GRF, filename.empty() ? item.name.c_str() : filename, reason),
+				GetEncodedString(STR_CONFIG_ERROR_INVALID_GRF, filename.empty() ? item.name : filename, reason),
 				WL_CRITICAL);
 			continue;
 		}
@@ -1169,7 +1177,7 @@ static IniFileVersion LoadVersionFromConfig(const IniFile &ini)
 	return static_cast<IniFileVersion>(version);
 }
 
-static void AISaveConfig(IniFile &ini, const char *grpname)
+static void AISaveConfig(IniFile &ini, std::string_view grpname)
 {
 	IniGroup &group = ini.GetOrCreateGroup(grpname);
 	group.Clear();
@@ -1189,7 +1197,7 @@ static void AISaveConfig(IniFile &ini, const char *grpname)
 	}
 }
 
-static void GameSaveConfig(IniFile &ini, const char *grpname)
+static void GameSaveConfig(IniFile &ini, std::string_view grpname)
 {
 	IniGroup &group = ini.GetOrCreateGroup(grpname);
 	group.Clear();
@@ -1216,7 +1224,7 @@ static void SaveVersionInConfig(IniFile &ini)
 	IniGroup &group = ini.GetOrCreateGroup("version");
 	group.GetOrCreateItem("version_string").SetValue(_openttd_revision);
 	group.GetOrCreateItem("version_number").SetValue(fmt::format("{:08X}", _openttd_newgrf_version));
-	group.GetOrCreateItem("ini_version").SetValue(std::to_string(INIFILE_VERSION));
+	group.GetOrCreateItem("ini_version").SetValue(fmt::format("{}", INIFILE_VERSION));
 }
 
 /**
@@ -1241,7 +1249,7 @@ static void GraphicsSetSaveConfig(IniFile &ini)
 }
 
 /* Save a GRF configuration to the given group name */
-static void GRFSaveConfig(IniFile &ini, const char *grpname, const GRFConfigList &list)
+static void GRFSaveConfig(IniFile &ini, std::string_view grpname, const GRFConfigList &list)
 {
 	IniGroup &group = ini.GetOrCreateGroup(grpname);
 	group.Clear();
@@ -1413,13 +1421,13 @@ void LoadFromConfig(bool startup)
 		const IniItem *old_item;
 
 		if (generic_version < IFV_GAME_TYPE && IsConversionNeeded(generic_ini, "network", "server_advertise", "server_game_type", &old_item)) {
-			auto old_value = BoolSettingDesc::ParseSingleValue(old_item->value->c_str());
+			auto old_value = BoolSettingDesc::ParseSingleValue(*old_item->value);
 			_settings_client.network.server_game_type = old_value.value_or(false) ? SERVER_GAME_TYPE_PUBLIC : SERVER_GAME_TYPE_LOCAL;
 		}
 
 		if (generic_version < IFV_AUTOSAVE_RENAME && IsConversionNeeded(generic_ini, "gui", "autosave", "autosave_interval", &old_item)) {
-			static std::vector<std::string> _old_autosave_interval{"off", "monthly", "quarterly", "half year", "yearly"};
-			auto old_value = OneOfManySettingDesc::ParseSingleValue(old_item->value->c_str(), old_item->value->size(), _old_autosave_interval);
+			static constexpr std::initializer_list<std::string_view> _old_autosave_interval{"off"sv, "monthly"sv, "quarterly"sv, "half year"sv, "yearly"sv};
+			auto old_value = OneOfManySettingDesc::ParseSingleValue(*old_item->value, _old_autosave_interval).value_or(-1);
 
 			switch (old_value) {
 				case 0: _settings_client.gui.autosave_interval = 0; break;
@@ -1433,7 +1441,7 @@ void LoadFromConfig(bool startup)
 
 		/* Persist the right click close option from older versions. */
 		if (generic_version < IFV_RIGHT_CLICK_CLOSE && IsConversionNeeded(generic_ini, "gui", "right_mouse_wnd_close", "right_click_wnd_close", &old_item)) {
-			auto old_value = BoolSettingDesc::ParseSingleValue(old_item->value->c_str());
+			auto old_value = BoolSettingDesc::ParseSingleValue(*old_item->value);
 			_settings_client.gui.right_click_wnd_close = old_value.value_or(false) ? RCC_YES : RCC_NO;
 		}
 
@@ -1442,6 +1450,7 @@ void LoadFromConfig(bool startup)
 		AILoadConfig(generic_ini, "ai_players");
 		GameLoadConfig(generic_ini, "game_scripts");
 		PickerLoadConfig(favs_ini);
+		BadgeClassLoadConfig(favs_ini);
 
 		PrepareOldDiffCustom();
 		IniLoadSettings(generic_ini, _old_gameopt_settings, "gameopt", &_settings_newgame, false);
@@ -1515,6 +1524,7 @@ void SaveToConfig()
 	AISaveConfig(generic_ini, "ai_players");
 	GameSaveConfig(generic_ini, "game_scripts");
 	PickerSaveConfig(favs_ini);
+	BadgeClassSaveConfig(favs_ini);
 
 	SaveVersionInConfig(generic_ini);
 	SaveVersionInConfig(private_ini);
@@ -1551,13 +1561,13 @@ StringList GetGRFPresetList()
  * @return NewGRF configuration.
  * @see GetGRFPresetList
  */
-GRFConfigList LoadGRFPresetFromConfig(const char *config_name)
+GRFConfigList LoadGRFPresetFromConfig(std::string_view config_name)
 {
 	std::string section("preset-");
 	section += config_name;
 
 	ConfigIniFile ini(_config_file);
-	GRFConfigList config = GRFLoadConfig(ini, section.c_str(), false);
+	GRFConfigList config = GRFLoadConfig(ini, section, false);
 
 	return config;
 }
@@ -1568,13 +1578,13 @@ GRFConfigList LoadGRFPresetFromConfig(const char *config_name)
  * @param config      NewGRF configuration to save.
  * @see GetGRFPresetList
  */
-void SaveGRFPresetToConfig(const char *config_name, GRFConfigList &config)
+void SaveGRFPresetToConfig(std::string_view config_name, GRFConfigList &config)
 {
 	std::string section("preset-");
 	section += config_name;
 
 	ConfigIniFile ini(_config_file);
-	GRFSaveConfig(ini, section.c_str(), config);
+	GRFSaveConfig(ini, section, config);
 	ini.SaveToDisk(_config_file);
 }
 
@@ -1582,7 +1592,7 @@ void SaveGRFPresetToConfig(const char *config_name, GRFConfigList &config)
  * Delete a NewGRF configuration by preset name.
  * @param config_name Name of the preset.
  */
-void DeleteGRFPresetFromConfig(const char *config_name)
+void DeleteGRFPresetFromConfig(std::string_view config_name)
 {
 	std::string section("preset-");
 	section += config_name;
@@ -1627,7 +1637,7 @@ void IntSettingDesc::ChangeValue(const void *object, int32_t newval) const
  * @return Pointer to the setting description of setting \a name if it can be found,
  *         \c nullptr indicates failure to obtain the description.
  */
-static const SettingDesc *GetSettingFromName(const std::string_view name, const SettingTable &settings)
+static const SettingDesc *GetSettingFromName(std::string_view name, const SettingTable &settings)
 {
 	/* First check all full names */
 	for (auto &desc : settings) {
@@ -1709,7 +1719,7 @@ static const SettingDesc *GetCompanySettingFromName(std::string_view name)
  * @return Pointer to the setting description of setting \a name if it can be found,
  *         \c nullptr indicates failure to obtain the description.
  */
-const SettingDesc *GetSettingFromName(const std::string_view name)
+const SettingDesc *GetSettingFromName(std::string_view name)
 {
 	for (auto &table : GenericSettingTables()) {
 		auto sd = GetSettingFromName(name, table);
@@ -1881,16 +1891,16 @@ void SyncCompanySettings()
  * @param force_newgame force the newgame settings
  * @note Strings WILL NOT be synced over the network
  */
-bool SetSettingValue(const StringSettingDesc *sd, std::string value, bool force_newgame)
+bool SetSettingValue(const StringSettingDesc *sd, std::string_view value, bool force_newgame)
 {
 	assert(sd->flags.Test(SettingFlag::NoNetworkSync));
 
-	if (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ && value.compare("(null)") == 0) {
-		value.clear();
+	if (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ && value == "(null)") {
+		value = {};
 	}
 
 	const void *object = (_game_mode == GM_MENU || force_newgame) ? &_settings_newgame : &_settings_game;
-	sd->AsStringSetting()->ChangeValue(object, value);
+	sd->AsStringSetting()->ChangeValue(object, std::string{value});
 	return true;
 }
 
@@ -1900,7 +1910,7 @@ bool SetSettingValue(const StringSettingDesc *sd, std::string value, bool force_
  * @param object The object the setting is in.
  * @param newval The new value for the setting.
  */
-void StringSettingDesc::ChangeValue(const void *object, std::string &newval) const
+void StringSettingDesc::ChangeValue(const void *object, std::string &&newval) const
 {
 	this->MakeValueValid(newval);
 	if (this->pre_check != nullptr && !this->pre_check(newval)) return;
@@ -1913,7 +1923,7 @@ void StringSettingDesc::ChangeValue(const void *object, std::string &newval) con
 
 /* Those 2 functions need to be here, else we have to make some stuff non-static
  * and besides, it is also better to keep stuff like this at the same place */
-void IConsoleSetSetting(const char *name, const char *value, bool force_newgame)
+void IConsoleSetSetting(std::string_view name, std::string_view value, bool force_newgame)
 {
 	const SettingDesc *sd = GetSettingFromName(name);
 	/* Company settings are not in "list_settings", so don't try to modify them. */
@@ -1945,7 +1955,7 @@ void IConsoleSetSetting(const char *name, const char *value, bool force_newgame)
 	}
 }
 
-void IConsoleSetSetting(const char *name, int value)
+void IConsoleSetSetting(std::string_view name, int value)
 {
 	const SettingDesc *sd = GetSettingFromName(name);
 	assert(sd != nullptr);
@@ -1957,7 +1967,7 @@ void IConsoleSetSetting(const char *name, int value)
  * @param name  Name of the setting to output its value
  * @param force_newgame force the newgame settings
  */
-void IConsoleGetSetting(const char *name, bool force_newgame)
+void IConsoleGetSetting(std::string_view name, bool force_newgame)
 {
 	const SettingDesc *sd = GetSettingFromName(name);
 	/* Company settings are not in "list_settings", so don't try to read them. */
@@ -1974,17 +1984,18 @@ void IConsoleGetSetting(const char *name, bool force_newgame)
 		std::string value = sd->FormatValue(object);
 		const IntSettingDesc *int_setting = sd->AsIntSetting();
 		auto [min_val, max_val] = int_setting->GetRange();
-		IConsolePrint(CC_INFO, "Current value for '{}' is '{}' (min: {}{}, max: {}).",
-			sd->GetName(), value, sd->flags.Test(SettingFlag::GuiZeroIsSpecial) ? "(0) " : "", min_val, max_val);
+		auto def_val = int_setting->GetDefaultValue();
+		IConsolePrint(CC_INFO, "Current value for '{}' is '{}' (min: {}{}, max: {}, def: {}).",
+			sd->GetName(), value, sd->flags.Test(SettingFlag::GuiZeroIsSpecial) ? "(0) " : "", min_val, max_val, def_val);
 	}
 }
 
-static void IConsoleListSettingsTable(const SettingTable &table, const char *prefilter)
+static void IConsoleListSettingsTable(const SettingTable &table, std::string_view prefilter)
 {
 	for (auto &desc : table) {
 		const SettingDesc *sd = GetSettingDesc(desc);
 		if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to)) continue;
-		if (prefilter != nullptr && sd->GetName().find(prefilter) == std::string::npos) continue;
+		if (!prefilter.empty() && sd->GetName().find(prefilter) == std::string::npos) continue;
 		IConsolePrint(CC_DEFAULT, "{} = {}", sd->GetName(), sd->FormatValue(&GetGameSettings()));
 	}
 }
@@ -1994,7 +2005,7 @@ static void IConsoleListSettingsTable(const SettingTable &table, const char *pre
  *
  * @param prefilter  If not \c nullptr, only list settings with names that begin with \a prefilter prefix
  */
-void IConsoleListSettings(const char *prefilter)
+void IConsoleListSettings(std::string_view prefilter)
 {
 	IConsolePrint(CC_HELP, "All settings with their current value:");
 
diff --git a/src/settings_func.h b/src/settings_func.h
index 935cf2d82b..8764e9cba7 100644
--- a/src/settings_func.h
+++ b/src/settings_func.h
@@ -15,22 +15,23 @@
 #include "newgrf_config.h"
 
 struct IniFile;
+struct WindowDesc;
 
-void IConsoleSetSetting(const char *name, const char *value, bool force_newgame = false);
-void IConsoleSetSetting(const char *name, int32_t value);
-void IConsoleGetSetting(const char *name, bool force_newgame = false);
-void IConsoleListSettings(const char *prefilter);
+void IConsoleSetSetting(std::string_view name, std::string_view value, bool force_newgame = false);
+void IConsoleSetSetting(std::string_view name, int32_t value);
+void IConsoleGetSetting(std::string_view name, bool force_newgame = false);
+void IConsoleListSettings(std::string_view prefilter);
 
 void LoadFromConfig(bool minimal = false);
 void SaveToConfig();
 
-void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc);
-void IniSaveWindowSettings(IniFile &ini, const char *grpname, void *desc);
+void IniLoadWindowSettings(IniFile &ini, std::string_view grpname, WindowDesc *desc);
+void IniSaveWindowSettings(IniFile &ini, std::string_view grpname, WindowDesc *desc);
 
 StringList GetGRFPresetList();
-GRFConfigList LoadGRFPresetFromConfig(const char *config_name);
-void SaveGRFPresetToConfig(const char *config_name, GRFConfigList &config);
-void DeleteGRFPresetFromConfig(const char *config_name);
+GRFConfigList LoadGRFPresetFromConfig(std::string_view config_name);
+void SaveGRFPresetToConfig(std::string_view config_name, GRFConfigList &config);
+void DeleteGRFPresetFromConfig(std::string_view config_name);
 
 void SetDefaultCompanySettings(CompanyID cid);
 
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 7534f9616f..d5f8d50e19 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -53,6 +53,7 @@
 #include "social_integration.h"
 #include "sound_func.h"
 #include "settingentry_gui.h"
+#include "core/string_consumer.hpp"
 
 #include "table/strings.h"
 
@@ -83,7 +84,7 @@ static const uint32_t _autosave_dropdown_to_minutes[] = {
 	120,
 };
 
-Dimension _circle_size; ///< Dimension of the circle +/- icon. This is here as not all users are within the class of the settings window.
+Dimension _setting_circle_size; ///< Dimension of the circle +/- icon. This is here as not all users are within the class of the settings window.
 
 /**
  * Get index of the current screen resolution.
@@ -102,7 +103,7 @@ struct BaseSetTextfileWindow : public TextfileWindow {
 	const std::string name; ///< Name of the content.
 	const StringID content_type; ///< STR_CONTENT_TYPE_xxx for title.
 
-	BaseSetTextfileWindow(TextfileType file_type, const std::string &name, const std::string &textfile, StringID content_type) : TextfileWindow(file_type), name(name), content_type(content_type)
+	BaseSetTextfileWindow(Window *parent, TextfileType file_type, const std::string &name, const std::string &textfile, StringID content_type) : TextfileWindow(parent, file_type), name(name), content_type(content_type)
 	{
 		this->ConstructWindow();
 		this->LoadTextfile(textfile, BASESET_DIR);
@@ -125,10 +126,10 @@ struct BaseSetTextfileWindow : public TextfileWindow {
  * @param content_type STR_CONTENT_TYPE_xxx for title.
  */
 template <class TBaseSet>
-void ShowBaseSetTextfileWindow(TextfileType file_type, const TBaseSet *baseset, StringID content_type)
+void ShowBaseSetTextfileWindow(Window *parent, TextfileType file_type, const TBaseSet *baseset, StringID content_type)
 {
-	CloseWindowById(WC_TEXTFILE, file_type);
-	new BaseSetTextfileWindow(file_type, baseset->name, *baseset->GetTextfile(file_type), content_type);
+	parent->CloseChildWindowById(WC_TEXTFILE, file_type);
+	new BaseSetTextfileWindow(parent, file_type, baseset->name, *baseset->GetTextfile(file_type), content_type);
 }
 
 /**
@@ -188,20 +189,31 @@ static std::optional<std::string> VolumeMarkFunc(int, int mark, int value)
 	/* Label only every other mark. */
 	if (mark % 2 != 0) return std::string{};
 
-	// 0-127 does not map nicely to 0-100. Dividing first gives us nice round numbers.
+	/* 0-127 does not map nicely to 0-100. Dividing first gives us nice round numbers. */
 	return GetString(STR_GAME_OPTIONS_VOLUME_MARK, value / 31 * 25);
 }
 
+/** Colour for background of game options. */
+static constexpr Colours GAME_OPTIONS_BACKGROUND = COLOUR_MAUVE;
+/** Colour for buttons of game options. */
+static constexpr Colours GAME_OPTIONS_BUTTON = COLOUR_YELLOW;
+/** Colour for frame text of game options. */
+static constexpr TextColour GAME_OPTIONS_FRAME = TC_ORANGE;
+/** Colour for label text of game options. */
+static constexpr TextColour GAME_OPTIONS_LABEL = TC_LIGHT_BLUE;
+/** Colour for selected text of game options. */
+static constexpr TextColour GAME_OPTIONS_SELECTED = TC_WHITE;
+
 static constexpr NWidgetPart _nested_social_plugins_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_FRAME, COLOUR_GREY, WID_GO_SOCIAL_PLUGIN_TITLE),
+		NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND, WID_GO_SOCIAL_PLUGIN_TITLE), SetTextStyle(GAME_OPTIONS_FRAME),
 			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_SOCIAL_PLUGIN_PLATFORM), SetMinimalSize(100, 12), SetAlignment(SA_RIGHT),
+				NWidget(WWT_TEXT, INVALID_COLOUR), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM), SetTextStyle(GAME_OPTIONS_LABEL),
+				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_SOCIAL_PLUGIN_PLATFORM), SetAlignment(SA_RIGHT),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_SOCIAL_PLUGIN_STATE), SetMinimalSize(100, 12), SetAlignment(SA_RIGHT),
+				NWidget(WWT_TEXT, INVALID_COLOUR), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE), SetTextStyle(GAME_OPTIONS_LABEL),
+				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_SOCIAL_PLUGIN_STATE), SetAlignment(SA_RIGHT),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
@@ -209,13 +221,13 @@ static constexpr NWidgetPart _nested_social_plugins_widgets[] = {
 
 static constexpr NWidgetPart _nested_social_plugins_none_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE),
+		NWidget(WWT_TEXT, INVALID_COLOUR), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE), SetTextStyle(GAME_OPTIONS_LABEL),
 	EndContainer(),
 };
 
 class NWidgetSocialPlugins : public NWidgetVertical {
 public:
-	NWidgetSocialPlugins()
+	NWidgetSocialPlugins() : NWidgetVertical({}, WID_GO_SOCIAL_PLUGINS)
 	{
 		this->plugins = SocialIntegration::GetPlugins();
 
@@ -232,12 +244,6 @@ public:
 		this->SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0);
 	}
 
-	void FillWidgetLookup(WidgetLookup &widget_lookup) override
-	{
-		widget_lookup[WID_GO_SOCIAL_PLUGINS] = this;
-		NWidgetVertical::FillWidgetLookup(widget_lookup);
-	}
-
 	void SetupSmallestSize(Window *w) override
 	{
 		this->current_index = -1;
@@ -357,19 +363,86 @@ std::unique_ptr<NWidgetBase> MakeNWidgetSocialPlugins()
 	return std::make_unique<NWidgetSocialPlugins>();
 }
 
+int SETTING_HEIGHT = 11;    ///< Height of a single setting in the tree view in pixels
+
+static const StringID _game_settings_restrict_dropdown[] = {
+	STR_CONFIG_SETTING_RESTRICT_BASIC,                            // RM_BASIC
+	STR_CONFIG_SETTING_RESTRICT_ADVANCED,                         // RM_ADVANCED
+	STR_CONFIG_SETTING_RESTRICT_ALL,                              // RM_ALL
+	STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT,          // RM_CHANGED_AGAINST_DEFAULT
+	STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW,              // RM_CHANGED_AGAINST_NEW
+};
+static_assert(lengthof(_game_settings_restrict_dropdown) == RM_END);
+
+/** Warnings about hidden search results. */
+enum WarnHiddenResult {
+	WHR_NONE,          ///< Nothing was filtering matches away.
+	WHR_CATEGORY,      ///< Category setting filtered matches away.
+	WHR_TYPE,          ///< Type setting filtered matches away.
+	WHR_CATEGORY_TYPE, ///< Both category and type settings filtered matches away.
+};
+
+/**
+ * Callback function for the reset all settings button
+ * @param w Window which is calling this callback
+ * @param confirmed boolean value, true when yes was clicked, false otherwise
+ */
+static void ResetAllSettingsConfirmationCallback(Window *w, bool confirmed)
+{
+	if (confirmed) {
+		GetSettingsTree().ResetAll();
+		GetSettingsTree().FoldAll();
+		w->InvalidateData();
+	}
+}
+
 struct GameOptionsWindow : Window {
+	static inline GameSettings *settings_ptr; ///< Pointer to the game settings being displayed and modified.
+
+	SettingEntry *valuewindow_entry = nullptr; ///< If non-nullptr, pointer to setting for which a value-entering window has been opened.
+	SettingEntry *clicked_entry = nullptr; ///< If non-nullptr, pointer to a clicked numeric setting (with a depressed left or right button).
+	SettingEntry *last_clicked = nullptr; ///< If non-nullptr, pointer to the last clicked setting.
+	SettingEntry *valuedropdown_entry = nullptr; ///< If non-nullptr, pointer to the value for which a dropdown window is currently opened.
+	bool closing_dropdown = false; ///< True, if the dropdown list is currently closing.
+
+	SettingFilter filter{}; ///< Filter for the list.
+	QueryString filter_editbox; ///< Filter editbox;
+	bool manually_changed_folding = false; ///< Whether the user expanded/collapsed something manually.
+	WarnHiddenResult warn_missing = WHR_NONE; ///< Whether and how to warn about missing search results.
+	int warn_lines = 0; ///< Number of lines used for warning about missing search results.
+
+	Scrollbar *vscroll;
+	Scrollbar *vscroll_description;
+	static constexpr uint NUM_DESCRIPTION_LINES = 5;
+
 	GameSettings *opt = nullptr;
 	bool reload = false;
 	int gui_scale = 0;
 	static inline WidgetID active_tab = WID_GO_TAB_GENERAL;
 
-	GameOptionsWindow(WindowDesc &desc) : Window(desc), gui_scale(_gui_scale)
+	GameOptionsWindow(WindowDesc &desc) : Window(desc), filter_editbox(50), gui_scale(_gui_scale)
 	{
 		this->opt = &GetGameSettings();
 
 		AddCustomRefreshRates();
 
-		this->InitNested(WN_GAME_OPTIONS_GAME_OPTIONS);
+		this->filter.mode = (RestrictionMode)_settings_client.gui.settings_restriction_mode;
+		this->filter.min_cat = RM_ALL;
+		this->filter.type = ST_ALL;
+		this->filter.type_hides = false;
+		this->settings_ptr = &GetGameSettings();
+
+		GetSettingsTree().FoldAll(); // Close all sub-pages
+
+		this->CreateNestedTree();
+		this->vscroll = this->GetScrollbar(WID_GO_SCROLLBAR);
+		this->vscroll_description = this->GetScrollbar(WID_GO_HELP_TEXT_SCROLL);
+		this->vscroll_description->SetCapacity(NUM_DESCRIPTION_LINES);
+		this->FinishInitNested(WN_GAME_OPTIONS_GAME_OPTIONS);
+
+		this->querystrings[WID_GO_FILTER] = &this->filter_editbox;
+		this->filter_editbox.cancel_button = QueryString::ACTION_CLEAR;
+
 		this->OnInvalidateData(0);
 
 		this->SetTab(GameOptionsWindow::active_tab);
@@ -377,10 +450,14 @@ struct GameOptionsWindow : Window {
 		if constexpr (!NetworkSurveyHandler::IsSurveyPossible()) this->GetWidget<NWidgetStacked>(WID_GO_SURVEY_SEL)->SetDisplayedPlane(SZSP_NONE);
 	}
 
+	void OnInit() override
+	{
+		_setting_circle_size = maxdim(GetSpriteSize(SPR_CIRCLE_FOLDED), GetSpriteSize(SPR_CIRCLE_UNFOLDED));
+	}
+
 	void Close([[maybe_unused]] int data = 0) override
 	{
 		CloseWindowById(WC_CUSTOM_CURRENCY, 0);
-		CloseWindowByClass(WC_TEXTFILE);
 		if (this->reload) _switch_mode = SM_MENU;
 		this->Window::Close();
 	}
@@ -437,7 +514,7 @@ struct GameOptionsWindow : Window {
 					bool hide_language = IsReleasedVersion() && !_languages[i].IsReasonablyFinished();
 					if (hide_language) continue;
 					bool hide_percentage = IsReleasedVersion() || _languages[i].missing < _settings_client.gui.missing_strings_threshold;
-					char *name;
+					std::string name;
 					if (&_languages[i] == _current_language) {
 						*selected_index = i;
 						name = _languages[i].own_name;
@@ -450,10 +527,10 @@ struct GameOptionsWindow : Window {
 						name = _languages[i].name;
 					}
 					if (hide_percentage) {
-						list.push_back(MakeDropDownListStringItem(name, i));
+						list.push_back(MakeDropDownListStringItem(std::move(name), i));
 					} else {
 						int percentage = (LANGUAGE_TOTAL_STRINGS - _languages[i].missing) * 100 / LANGUAGE_TOTAL_STRINGS;
-						list.push_back(MakeDropDownListStringItem(GetString(STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE, name, percentage), i));
+						list.push_back(MakeDropDownListStringItem(GetString(STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE, std::move(name), percentage), i));
 					}
 				}
 				std::sort(list.begin(), list.end(), DropDownListStringItem::NatSortFunc);
@@ -488,11 +565,33 @@ struct GameOptionsWindow : Window {
 			case WID_GO_BASE_MUSIC_DROPDOWN:
 				list = BuildSetDropDownList<BaseMusic>(selected_index);
 				break;
+
+			case WID_GO_RESTRICT_DROPDOWN:
+				for (int mode = 0; mode != RM_END; mode++) {
+					/* If we are in adv. settings screen for the new game's settings,
+					 * we don't want to allow comparing with new game's settings. */
+					bool disabled = mode == RM_CHANGED_AGAINST_NEW && settings_ptr == &_settings_newgame;
+
+					list.push_back(MakeDropDownListStringItem(_game_settings_restrict_dropdown[mode], mode, disabled));
+				}
+				break;
+
+			case WID_GO_TYPE_DROPDOWN:
+				list.push_back(MakeDropDownListStringItem(STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL, ST_ALL));
+				list.push_back(MakeDropDownListStringItem(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME, ST_GAME));
+				list.push_back(MakeDropDownListStringItem(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME, ST_COMPANY));
+				list.push_back(MakeDropDownListStringItem(STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT, ST_CLIENT));
+				break;
 		}
 
 		return list;
 	}
 
+	std::string GetToggleString(StringID stringid, WidgetID state_widget) const
+	{
+		return GetString(STR_GAME_OPTIONS_SETTING, stringid, this->IsWidgetLowered(state_widget) ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
+	}
+
 	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
 	{
 		switch (widget) {
@@ -534,6 +633,42 @@ struct GameOptionsWindow : Window {
 				return plugin->GetWidgetString(widget, stringid);
 			}
 
+			case WID_GO_RESTRICT_DROPDOWN:
+				return GetString(_game_settings_restrict_dropdown[this->filter.mode]);
+
+			case WID_GO_TYPE_DROPDOWN:
+				switch (this->filter.type) {
+					case ST_GAME:    return GetString(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME);
+					case ST_COMPANY: return GetString(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME);
+					case ST_CLIENT:  return GetString(STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT);
+					default:         return GetString(STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL);
+				}
+				break;
+
+			case WID_GO_SURVEY_PARTICIPATE_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_PARTICIPATE_SURVEY, WID_GO_SURVEY_PARTICIPATE_BUTTON);
+
+			case WID_GO_GUI_SCALE_AUTO_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_GUI_SCALE_AUTO, WID_GO_GUI_SCALE_AUTO);
+
+			case WID_GO_GUI_SCALE_BEVEL_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_GUI_SCALE_BEVELS, WID_GO_GUI_SCALE_BEVEL_BUTTON);
+
+			case WID_GO_GUI_FONT_SPRITE_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_GUI_FONT_SPRITE, WID_GO_GUI_FONT_SPRITE);
+
+			case WID_GO_GUI_FONT_AA_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_GUI_FONT_AA, WID_GO_GUI_FONT_AA);
+
+			case WID_GO_FULLSCREEN_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_FULLSCREEN, WID_GO_FULLSCREEN_BUTTON);
+
+			case WID_GO_VIDEO_ACCEL_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_VIDEO_ACCELERATION, WID_GO_VIDEO_ACCEL_BUTTON);
+
+			case WID_GO_VIDEO_VSYNC_TEXT:
+				return GetToggleString(STR_GAME_OPTIONS_VIDEO_VSYNC, WID_GO_VIDEO_VSYNC_BUTTON);
+
 			default:
 				return this->Window::GetWidgetString(widget, stringid);
 		}
@@ -543,56 +678,124 @@ struct GameOptionsWindow : Window {
 	{
 		switch (widget) {
 			case WID_GO_BASE_GRF_DESCRIPTION:
-				DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, BaseGraphics::GetUsedSet()->GetDescription(GetCurrentLanguageIsoCode())), TC_BLACK);
+				DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, BaseGraphics::GetUsedSet()->GetDescription(GetCurrentLanguageIsoCode())), GAME_OPTIONS_SELECTED);
 				break;
 
 			case WID_GO_BASE_SFX_DESCRIPTION:
-				DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, BaseSounds::GetUsedSet()->GetDescription(GetCurrentLanguageIsoCode())), TC_BLACK);
+				DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, BaseSounds::GetUsedSet()->GetDescription(GetCurrentLanguageIsoCode())), GAME_OPTIONS_SELECTED);
 				break;
 
 			case WID_GO_BASE_MUSIC_DESCRIPTION:
-				DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, BaseMusic::GetUsedSet()->GetDescription(GetCurrentLanguageIsoCode())), TC_BLACK);
+				DrawStringMultiLine(r, GetString(STR_JUST_RAW_STRING, BaseMusic::GetUsedSet()->GetDescription(GetCurrentLanguageIsoCode())), GAME_OPTIONS_SELECTED);
 				break;
 
 			case WID_GO_GUI_SCALE:
-				DrawSliderWidget(r, MIN_INTERFACE_SCALE, MAX_INTERFACE_SCALE, SCALE_NMARKS, this->gui_scale, ScaleMarkFunc);
+				DrawSliderWidget(r, GAME_OPTIONS_BACKGROUND, GAME_OPTIONS_BUTTON, TC_BLACK, MIN_INTERFACE_SCALE, MAX_INTERFACE_SCALE, SCALE_NMARKS, this->gui_scale, ScaleMarkFunc);
 				break;
 
 			case WID_GO_VIDEO_DRIVER_INFO:
-				DrawStringMultiLine(r, GetString(STR_GAME_OPTIONS_VIDEO_DRIVER_INFO, std::string{VideoDriver::GetInstance()->GetInfoString()}));
+				DrawStringMultiLine(r, GetString(STR_GAME_OPTIONS_VIDEO_DRIVER_INFO, std::string{VideoDriver::GetInstance()->GetInfoString()}), GAME_OPTIONS_SELECTED);
 				break;
 
 			case WID_GO_BASE_SFX_VOLUME:
-				DrawSliderWidget(r, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.effect_vol, VolumeMarkFunc);
+				DrawSliderWidget(r, GAME_OPTIONS_BACKGROUND, GAME_OPTIONS_BUTTON, TC_BLACK, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.effect_vol, VolumeMarkFunc);
 				break;
 
 			case WID_GO_BASE_MUSIC_VOLUME:
-				DrawSliderWidget(r, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.music_vol, VolumeMarkFunc);
+				DrawSliderWidget(r, GAME_OPTIONS_BACKGROUND, GAME_OPTIONS_BUTTON, TC_BLACK, 0, INT8_MAX, VOLUME_NMARKS, _settings_client.music.music_vol, VolumeMarkFunc);
+				break;
+
+			case WID_GO_OPTIONSPANEL: {
+				Rect tr = r.Shrink(WidgetDimensions::scaled.frametext, WidgetDimensions::scaled.framerect);
+				tr.top += this->warn_lines * SETTING_HEIGHT;
+				uint last_row = this->vscroll->GetPosition() + this->vscroll->GetCapacity() - this->warn_lines;
+				int next_row = GetSettingsTree().Draw(settings_ptr, tr.left, tr.right, tr.top,
+						this->vscroll->GetPosition(), last_row, this->last_clicked);
+				if (next_row == 0) DrawString(tr, STR_CONFIG_SETTINGS_NONE);
+				break;
+			}
+
+			case WID_GO_SETTING_PROPERTIES:
+				if (this->last_clicked != nullptr) {
+					const IntSettingDesc *sd = this->last_clicked->setting;
+
+					Rect tr = r;
+					std::string str;
+					switch (sd->GetType()) {
+						case ST_COMPANY: str = GetString(STR_CONFIG_SETTING_TYPE, _game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_COMPANY_INGAME); break;
+						case ST_CLIENT:  str = GetString(STR_CONFIG_SETTING_TYPE, STR_CONFIG_SETTING_TYPE_CLIENT); break;
+						case ST_GAME:    str = GetString(STR_CONFIG_SETTING_TYPE, _game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_GAME_MENU : STR_CONFIG_SETTING_TYPE_GAME_INGAME); break;
+						default: NOT_REACHED();
+					}
+					DrawString(tr, str);
+					tr.top += GetCharacterHeight(FS_NORMAL);
+
+					auto [param1, param2] = sd->GetValueParams(sd->GetDefaultValue());
+					DrawString(tr, GetString(STR_CONFIG_SETTING_DEFAULT_VALUE, param1, param2));
+				}
+				break;
+
+			case WID_GO_HELP_TEXT:
+				if (this->last_clicked != nullptr) {
+					const IntSettingDesc *sd = this->last_clicked->setting;
+
+					DrawPixelInfo tmp_dpi;
+					if (FillDrawPixelInfo(&tmp_dpi, r)) {
+						AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi);
+						int scrolls_pos = this->vscroll_description->GetPosition() * GetCharacterHeight(FS_NORMAL);
+						DrawStringMultiLine(0, r.Width() - 1, -scrolls_pos, r.Height() - 1, sd->GetHelp(), TC_WHITE);
+					}
+				}
+				break;
+
+			default:
 				break;
 		}
 	}
 
+	/**
+	 * Set the entry that should have its help text displayed, and mark the window dirty so it gets repainted.
+	 * @param pe Setting to display help text of, use \c nullptr to stop displaying help of the currently displayed setting.
+	 */
+	void SetDisplayedHelpText(SettingEntry *pe)
+	{
+		if (this->last_clicked != pe) this->SetDirty();
+		this->last_clicked = pe;
+		UpdateHelpTextSize();
+	}
+
+	void UpdateHelpTextSize()
+	{
+		NWidgetResizeBase *wid = this->GetWidget<NWidgetResizeBase>(WID_GO_HELP_TEXT);
+		this->vscroll_description->SetCount(this->last_clicked ? CeilDiv(this->last_clicked->GetMaxHelpHeight(wid->current_x), GetCharacterHeight(FS_NORMAL)) : 0);
+	}
+
 	void SetTab(WidgetID widget)
 	{
-		this->SetWidgetsLoweredState(false, WID_GO_TAB_GENERAL, WID_GO_TAB_GRAPHICS, WID_GO_TAB_SOUND, WID_GO_TAB_SOCIAL);
+		this->SetWidgetsLoweredState(false, WID_GO_TAB_GENERAL, WID_GO_TAB_GRAPHICS, WID_GO_TAB_SOUND, WID_GO_TAB_ADVANCED, WID_GO_TAB_SOCIAL);
 		this->LowerWidget(widget);
 		GameOptionsWindow::active_tab = widget;
 
-		int pane;
+		int plane;
 		switch (widget) {
-			case WID_GO_TAB_GENERAL: pane = 0; break;
-			case WID_GO_TAB_GRAPHICS: pane = 1; break;
-			case WID_GO_TAB_SOUND: pane = 2; break;
-			case WID_GO_TAB_SOCIAL: pane = 3; break;
+			case WID_GO_TAB_GENERAL: plane = 0; break;
+			case WID_GO_TAB_GRAPHICS: plane = 1; break;
+			case WID_GO_TAB_SOUND: plane = 2; break;
+			case WID_GO_TAB_SOCIAL: plane = 3; break;
+			case WID_GO_TAB_ADVANCED: plane = 4; break;
 			default: NOT_REACHED();
 		}
 
-		this->GetWidget<NWidgetStacked>(WID_GO_TAB_SELECTION)->SetDisplayedPlane(pane);
+		this->GetWidget<NWidgetStacked>(WID_GO_TAB_SELECTION)->SetDisplayedPlane(plane);
+		if (widget == WID_GO_TAB_ADVANCED) this->SetFocusedWidget(WID_GO_FILTER);
 		this->SetDirty();
 	}
 
 	void OnResize() override
 	{
+		this->vscroll->SetCapacityFromWidget(this, WID_GO_OPTIONSPANEL, WidgetDimensions::scaled.framerect.Vertical());
+		UpdateHelpTextSize();
+
 		bool changed = false;
 
 		NWidgetResizeBase *wid = this->GetWidget<NWidgetResizeBase>(WID_GO_BASE_GRF_DESCRIPTION);
@@ -651,6 +854,76 @@ struct GameOptionsWindow : Window {
 				size.width = std::max(size.width, GetDropDownListDimension(this->BuildDropDownList(widget, &selected)).width + padding.width);
 				break;
 			}
+
+			case WID_GO_OPTIONSPANEL:
+				fill.height = resize.height = SETTING_HEIGHT = std::max({(int)_setting_circle_size.height, SETTING_BUTTON_HEIGHT, GetCharacterHeight(FS_NORMAL)}) + WidgetDimensions::scaled.vsep_normal;
+				resize.width = 1;
+
+				size.height = 8 * resize.height + WidgetDimensions::scaled.framerect.Vertical();
+				break;
+
+			case WID_GO_SETTING_PROPERTIES: {
+				static const StringID setting_types[] = {
+					STR_CONFIG_SETTING_TYPE_CLIENT,
+					STR_CONFIG_SETTING_TYPE_COMPANY_MENU, STR_CONFIG_SETTING_TYPE_COMPANY_INGAME,
+					STR_CONFIG_SETTING_TYPE_GAME_MENU, STR_CONFIG_SETTING_TYPE_GAME_INGAME,
+				};
+				for (const auto &setting_type : setting_types) {
+					size.width = std::max(size.width, GetStringBoundingBox(GetString(STR_CONFIG_SETTING_TYPE, setting_type)).width + padding.width);
+				}
+				size.height = 2 * GetCharacterHeight(FS_NORMAL);
+				break;
+			}
+
+			case WID_GO_HELP_TEXT:
+				size.height = NUM_DESCRIPTION_LINES * GetCharacterHeight(FS_NORMAL);
+				break;
+
+			case WID_GO_RESTRICT_CATEGORY:
+			case WID_GO_RESTRICT_TYPE:
+				size.width = std::max(GetStringBoundingBox(STR_CONFIG_SETTING_RESTRICT_CATEGORY).width, GetStringBoundingBox(STR_CONFIG_SETTING_RESTRICT_TYPE).width);
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	void OnPaint() override
+	{
+		if (this->GetWidget<NWidgetStacked>(WID_GO_TAB_SELECTION)->shown_plane != 4) {
+			this->DrawWidgets();
+			return;
+		}
+
+		if (this->closing_dropdown) {
+			this->closing_dropdown = false;
+			assert(this->valuedropdown_entry != nullptr);
+			this->valuedropdown_entry->SetButtons({});
+			this->valuedropdown_entry = nullptr;
+		}
+
+		/* Reserve the correct number of lines for the 'some search results are hidden' notice in the central settings display panel. */
+		const Rect panel = this->GetWidget<NWidgetBase>(WID_GO_OPTIONSPANEL)->GetCurrentRect().Shrink(WidgetDimensions::scaled.frametext);
+		StringID warn_str = STR_CONFIG_SETTING_CATEGORY_HIDES - 1 + this->warn_missing;
+		int new_warn_lines;
+		if (this->warn_missing == WHR_NONE) {
+			new_warn_lines = 0;
+		} else {
+			new_warn_lines = GetStringLineCount(GetString(warn_str, _game_settings_restrict_dropdown[this->filter.min_cat]), panel.Width());
+		}
+		if (this->warn_lines != new_warn_lines) {
+			this->vscroll->SetCount(this->vscroll->GetCount() - this->warn_lines + new_warn_lines);
+			this->warn_lines = new_warn_lines;
+		}
+
+		this->DrawWidgets();
+
+		/* Draw the 'some search results are hidden' notice. */
+		if (this->warn_missing != WHR_NONE) {
+			DrawStringMultiLineWithClipping(panel.WithHeight(this->warn_lines * GetCharacterHeight(FS_NORMAL)),
+				GetString(warn_str, _game_settings_restrict_dropdown[this->filter.min_cat]),
+				TC_BLACK, SA_CENTER);
 		}
 	}
 
@@ -659,25 +932,26 @@ struct GameOptionsWindow : Window {
 		if (widget >= WID_GO_BASE_GRF_TEXTFILE && widget < WID_GO_BASE_GRF_TEXTFILE + TFT_CONTENT_END) {
 			if (BaseGraphics::GetUsedSet() == nullptr) return;
 
-			ShowBaseSetTextfileWindow((TextfileType)(widget - WID_GO_BASE_GRF_TEXTFILE), BaseGraphics::GetUsedSet(), STR_CONTENT_TYPE_BASE_GRAPHICS);
+			ShowBaseSetTextfileWindow(this, (TextfileType)(widget - WID_GO_BASE_GRF_TEXTFILE), BaseGraphics::GetUsedSet(), STR_CONTENT_TYPE_BASE_GRAPHICS);
 			return;
 		}
 		if (widget >= WID_GO_BASE_SFX_TEXTFILE && widget < WID_GO_BASE_SFX_TEXTFILE + TFT_CONTENT_END) {
 			if (BaseSounds::GetUsedSet() == nullptr) return;
 
-			ShowBaseSetTextfileWindow((TextfileType)(widget - WID_GO_BASE_SFX_TEXTFILE), BaseSounds::GetUsedSet(), STR_CONTENT_TYPE_BASE_SOUNDS);
+			ShowBaseSetTextfileWindow(this, (TextfileType)(widget - WID_GO_BASE_SFX_TEXTFILE), BaseSounds::GetUsedSet(), STR_CONTENT_TYPE_BASE_SOUNDS);
 			return;
 		}
 		if (widget >= WID_GO_BASE_MUSIC_TEXTFILE && widget < WID_GO_BASE_MUSIC_TEXTFILE + TFT_CONTENT_END) {
 			if (BaseMusic::GetUsedSet() == nullptr) return;
 
-			ShowBaseSetTextfileWindow((TextfileType)(widget - WID_GO_BASE_MUSIC_TEXTFILE), BaseMusic::GetUsedSet(), STR_CONTENT_TYPE_BASE_MUSIC);
+			ShowBaseSetTextfileWindow(this, (TextfileType)(widget - WID_GO_BASE_MUSIC_TEXTFILE), BaseMusic::GetUsedSet(), STR_CONTENT_TYPE_BASE_MUSIC);
 			return;
 		}
 		switch (widget) {
 			case WID_GO_TAB_GENERAL:
 			case WID_GO_TAB_GRAPHICS:
 			case WID_GO_TAB_SOUND:
+			case WID_GO_TAB_ADVANCED:
 			case WID_GO_TAB_SOCIAL:
 				this->SetTab(widget);
 				break;
@@ -703,7 +977,7 @@ struct GameOptionsWindow : Window {
 				break;
 
 			case WID_GO_SURVEY_PREVIEW_BUTTON:
-				ShowSurveyResultTextfileWindow();
+				ShowSurveyResultTextfileWindow(this);
 				break;
 
 			case WID_GO_FULLSCREEN_BUTTON: // Click fullscreen on/off
@@ -713,6 +987,7 @@ struct GameOptionsWindow : Window {
 				}
 				this->SetWidgetLoweredState(WID_GO_FULLSCREEN_BUTTON, _fullscreen);
 				this->SetWidgetDirty(WID_GO_FULLSCREEN_BUTTON);
+				this->SetWidgetDirty(WID_GO_FULLSCREEN_TEXT);
 				break;
 
 			case WID_GO_VIDEO_ACCEL_BUTTON:
@@ -720,10 +995,12 @@ struct GameOptionsWindow : Window {
 				ShowErrorMessage(GetEncodedString(STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART), {}, WL_INFO);
 				this->SetWidgetLoweredState(WID_GO_VIDEO_ACCEL_BUTTON, _video_hw_accel);
 				this->SetWidgetDirty(WID_GO_VIDEO_ACCEL_BUTTON);
+				this->SetWidgetDirty(WID_GO_VIDEO_ACCEL_TEXT);
 #ifndef __APPLE__
 				this->SetWidgetLoweredState(WID_GO_VIDEO_VSYNC_BUTTON, _video_hw_accel && _video_vsync);
 				this->SetWidgetDisabledState(WID_GO_VIDEO_VSYNC_BUTTON, !_video_hw_accel);
 				this->SetWidgetDirty(WID_GO_VIDEO_VSYNC_BUTTON);
+				this->SetWidgetDirty(WID_GO_VIDEO_VSYNC_TEXT);
 #endif
 				break;
 
@@ -735,6 +1012,7 @@ struct GameOptionsWindow : Window {
 
 				this->SetWidgetLoweredState(WID_GO_VIDEO_VSYNC_BUTTON, _video_vsync);
 				this->SetWidgetDirty(WID_GO_VIDEO_VSYNC_BUTTON);
+				this->SetWidgetDirty(WID_GO_VIDEO_VSYNC_TEXT);
 				this->SetWidgetDisabledState(WID_GO_REFRESH_RATE_DROPDOWN, _video_vsync);
 				this->SetWidgetDirty(WID_GO_REFRESH_RATE_DROPDOWN);
 				break;
@@ -797,6 +1075,7 @@ struct GameOptionsWindow : Window {
 					this->gui_scale = _gui_scale;
 				}
 				this->SetWidgetDirty(widget);
+				this->SetWidgetDirty(WID_GO_GUI_SCALE_AUTO_TEXT);
 				break;
 			}
 
@@ -876,577 +1155,20 @@ struct GameOptionsWindow : Window {
 				}
 				break;
 			}
-		}
-	}
 
-	void OnMouseLoop() override
-	{
-		if (_left_button_down || this->gui_scale == _gui_scale) return;
-
-		_gui_scale_cfg = this->gui_scale;
-
-		if (AdjustGUIZoom(false)) {
-			ReInitAllWindows(true);
-			this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, false);
-			this->SetDirty();
-		}
-	}
-
-	void OnDropdownSelect(WidgetID widget, int index) override
-	{
-		switch (widget) {
-			case WID_GO_CURRENCY_DROPDOWN: // Currency
-				if (index == CURRENCY_CUSTOM) ShowCustCurrency();
-				this->opt->locale.currency = index;
-				ReInitAllWindows(false);
-				break;
-
-			case WID_GO_AUTOSAVE_DROPDOWN: // Autosave options
-				_settings_client.gui.autosave_interval = _autosave_dropdown_to_minutes[index];
-				ChangeAutosaveFrequency(false);
-				this->SetDirty();
-				break;
-
-			case WID_GO_LANG_DROPDOWN: // Change interface language
-				ReadLanguagePack(&_languages[index]);
-				CloseWindowByClass(WC_QUERY_STRING);
-				CheckForMissingGlyphs();
-				ClearAllCachedNames();
-				UpdateAllVirtCoords();
-				CheckBlitter();
-				ReInitAllWindows(false);
-				break;
-
-			case WID_GO_RESOLUTION_DROPDOWN: // Change resolution
-				if ((uint)index < _resolutions.size() && ChangeResInGame(_resolutions[index].width, _resolutions[index].height)) {
-					this->SetDirty();
-				}
-				break;
-
-			case WID_GO_REFRESH_RATE_DROPDOWN: {
-				_settings_client.gui.refresh_rate = *std::next(_refresh_rates.begin(), index);
-				if (_settings_client.gui.refresh_rate > 60) {
-					/* Show warning to the user that this refresh rate might not be suitable on
-					 * larger maps with many NewGRFs and vehicles. */
-					ShowErrorMessage(GetEncodedString(STR_GAME_OPTIONS_REFRESH_RATE_WARNING), {}, WL_INFO);
-				}
-				break;
-			}
-
-			case WID_GO_BASE_GRF_DROPDOWN:
-				if (_game_mode == GM_MENU) {
-					CloseWindowByClass(WC_GRF_PARAMETERS);
-					auto set = BaseGraphics::GetSet(index);
-					BaseGraphics::SetSet(set);
-					this->reload = true;
-					this->InvalidateData();
-				}
-				break;
-
-			case WID_GO_BASE_SFX_DROPDOWN:
-				ChangeSoundSet(index);
-				break;
-
-			case WID_GO_BASE_MUSIC_DROPDOWN:
-				ChangeMusicSet(index);
-				break;
-		}
-	}
-
-	/**
-	 * Some data on this window has become invalid.
-	 * @param data Information about the changed data. @see GameOptionsInvalidationData
-	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
-	 */
-	void OnInvalidateData([[maybe_unused]] int data = 0, [[maybe_unused]] bool gui_scope = true) override
-	{
-		if (!gui_scope) return;
-		this->SetWidgetLoweredState(WID_GO_SURVEY_PARTICIPATE_BUTTON, _settings_client.network.participate_survey == PS_YES);
-		this->SetWidgetLoweredState(WID_GO_FULLSCREEN_BUTTON, _fullscreen);
-		this->SetWidgetLoweredState(WID_GO_VIDEO_ACCEL_BUTTON, _video_hw_accel);
-		this->SetWidgetDisabledState(WID_GO_REFRESH_RATE_DROPDOWN, _video_vsync);
-
-#ifndef __APPLE__
-		this->SetWidgetLoweredState(WID_GO_VIDEO_VSYNC_BUTTON, _video_hw_accel && _video_vsync);
-		this->SetWidgetDisabledState(WID_GO_VIDEO_VSYNC_BUTTON, !_video_hw_accel);
-#endif
-
-		this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, _gui_scale_cfg == -1);
-		this->SetWidgetLoweredState(WID_GO_GUI_SCALE_BEVEL_BUTTON, _settings_client.gui.scale_bevels);
-#ifdef HAS_TRUETYPE_FONT
-		this->SetWidgetLoweredState(WID_GO_GUI_FONT_SPRITE, _fcsettings.prefer_sprite);
-		this->SetWidgetLoweredState(WID_GO_GUI_FONT_AA, _fcsettings.global_aa);
-		this->SetWidgetDisabledState(WID_GO_GUI_FONT_AA, _fcsettings.prefer_sprite);
-#endif /* HAS_TRUETYPE_FONT */
-
-		this->SetWidgetDisabledState(WID_GO_BASE_GRF_DROPDOWN, _game_mode != GM_MENU);
-
-		this->SetWidgetDisabledState(WID_GO_BASE_GRF_PARAMETERS, BaseGraphics::GetUsedSet() == nullptr || !BaseGraphics::GetUsedSet()->IsConfigurable());
-
-		this->SetWidgetDisabledState(WID_GO_BASE_GRF_OPEN_URL, BaseGraphics::GetUsedSet() == nullptr || BaseGraphics::GetUsedSet()->url.empty());
-		this->SetWidgetDisabledState(WID_GO_BASE_SFX_OPEN_URL, BaseSounds::GetUsedSet() == nullptr || BaseSounds::GetUsedSet()->url.empty());
-		this->SetWidgetDisabledState(WID_GO_BASE_MUSIC_OPEN_URL, BaseMusic::GetUsedSet() == nullptr || BaseMusic::GetUsedSet()->url.empty());
-
-		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
-			this->SetWidgetDisabledState(WID_GO_BASE_GRF_TEXTFILE + tft, BaseGraphics::GetUsedSet() == nullptr || !BaseGraphics::GetUsedSet()->GetTextfile(tft).has_value());
-			this->SetWidgetDisabledState(WID_GO_BASE_SFX_TEXTFILE + tft, BaseSounds::GetUsedSet() == nullptr || !BaseSounds::GetUsedSet()->GetTextfile(tft).has_value());
-			this->SetWidgetDisabledState(WID_GO_BASE_MUSIC_TEXTFILE + tft, BaseMusic::GetUsedSet() == nullptr || !BaseMusic::GetUsedSet()->GetTextfile(tft).has_value());
-		}
-
-		this->SetWidgetsDisabledState(!_network_available, WID_GO_BASE_GRF_CONTENT_DOWNLOAD, WID_GO_BASE_SFX_CONTENT_DOWNLOAD, WID_GO_BASE_MUSIC_CONTENT_DOWNLOAD);
-	}
-};
-
-static constexpr NWidgetPart _nested_game_options_widgets[] = {
-	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
-		NWidget(WWT_CAPTION, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPadding(WidgetDimensions::unscaled.sparse),
-			NWidget(WWT_TEXTBTN, COLOUR_YELLOW, WID_GO_TAB_GENERAL),  SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_GENERAL, STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP), SetFill(1, 0),
-			NWidget(WWT_TEXTBTN, COLOUR_YELLOW, WID_GO_TAB_GRAPHICS), SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_GRAPHICS, STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP), SetFill(1, 0),
-			NWidget(WWT_TEXTBTN, COLOUR_YELLOW, WID_GO_TAB_SOUND),    SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_SOUND, STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP), SetFill(1, 0),
-			NWidget(WWT_TEXTBTN, COLOUR_YELLOW, WID_GO_TAB_SOCIAL),   SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_SOCIAL, STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP), SetFill(1, 0),
-		EndContainer(),
-	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GO_TAB_SELECTION),
-			/* General tab */
-			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_LANGUAGE),
-					NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_LANG_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_LANGUAGE_TOOLTIP), SetFill(1, 0),
-				EndContainer(),
-
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_AUTOSAVE_FRAME),
-					NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_AUTOSAVE_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP), SetFill(1, 0),
-				EndContainer(),
-
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME),
-					NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_CURRENCY_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP), SetFill(1, 0),
-				EndContainer(),
-
-				NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GO_SURVEY_SEL),
-					NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_SURVEY_PARTICIPATE_BUTTON), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_SURVEY_PREVIEW_BUTTON), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW, STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_SURVEY_LINK_BUTTON), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK, STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP),
-						EndContainer(),
-					EndContainer(),
-				EndContainer(),
-			EndContainer(),
-
-			/* Graphics tab */
-			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_GUI_SCALE_FRAME),
-					NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
-						NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_GUI_SCALE), SetMinimalSize(67, 0), SetMinimalTextLines(1, 12 + WidgetDimensions::unscaled.vsep_normal, FS_SMALL), SetFill(0, 0), SetToolTip(STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_GUI_SCALE_AUTO),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_GUI_SCALE_AUTO), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_GUI_SCALE_BEVELS),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_GUI_SCALE_BEVEL_BUTTON), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP),
-						EndContainer(),
-#ifdef HAS_TRUETYPE_FONT
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_GUI_FONT_SPRITE),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_GUI_FONT_SPRITE), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_GUI_FONT_AA),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_GUI_FONT_AA), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP),
-						EndContainer(),
-#endif /* HAS_TRUETYPE_FONT */
-					EndContainer(),
-				EndContainer(),
-
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_GRAPHICS),
-					NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_RESOLUTION),
-							NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_RESOLUTION_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_RESOLUTION_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_REFRESH_RATE),
-							NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_REFRESH_RATE_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_FULLSCREEN),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_FULLSCREEN_BUTTON), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_VIDEO_ACCELERATION),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_VIDEO_ACCEL_BUTTON), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP),
-						EndContainer(),
-#ifndef __APPLE__
-						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
-							NWidget(WWT_TEXT, INVALID_COLOUR), SetMinimalSize(0, 12), SetFill(1, 0), SetStringTip(STR_GAME_OPTIONS_VIDEO_VSYNC),
-							NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GO_VIDEO_VSYNC_BUTTON), SetAspect(WidgetDimensions::ASPECT_SETTINGS_BUTTON), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP),
-						EndContainer(),
-#endif
-						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_VIDEO_DRIVER_INFO), SetMinimalTextLines(1, 0), SetFill(1, 0),
-						EndContainer(),
-					EndContainer(),
-				EndContainer(),
-
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_BASE_GRF), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0), SetFill(1, 0),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_BASE_GRF_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_BASE_GRF_TOOLTIP), SetFill(1, 0),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_GRF_PARAMETERS), SetStringTip(STR_NEWGRF_SETTINGS_SET_PARAMETERS),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_GRF_CONTENT_DOWNLOAD), SetStringTip(STR_GAME_OPTIONS_ONLINE_CONTENT, STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP),
-					EndContainer(),
-					NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_BASE_GRF_DESCRIPTION), SetMinimalSize(200, 0), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP), SetFill(1, 0),
-					NWidget(NWID_VERTICAL),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_GRF_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_GRF_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_README, STR_TEXTFILE_VIEW_README_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_GRF_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_GRF_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_LICENCE, STR_TEXTFILE_VIEW_LICENCE_TOOLTIP),
-						EndContainer(),
-					EndContainer(),
-				EndContainer(),
-			EndContainer(),
-
-			/* Sound/Music tab */
-			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_VOLUME), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-						NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_TEXT_SFX_VOLUME), SetMinimalSize(0, 12), SetStringTip(STR_GAME_OPTIONS_SFX_VOLUME),
-						NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_SFX_VOLUME), SetMinimalSize(67, 0), SetMinimalTextLines(1, 12 + WidgetDimensions::unscaled.vsep_normal, FS_SMALL), SetFill(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
-					EndContainer(),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-						NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_TEXT_MUSIC_VOLUME), SetMinimalSize(0, 12), SetStringTip(STR_GAME_OPTIONS_MUSIC_VOLUME),
-						NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_MUSIC_VOLUME), SetMinimalSize(67, 0), SetMinimalTextLines(1, 12 + WidgetDimensions::unscaled.vsep_normal, FS_SMALL), SetFill(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
-					EndContainer(),
-				EndContainer(),
-
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_BASE_SFX), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_BASE_SFX_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_BASE_SFX_TOOLTIP), SetFill(1, 0),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_SFX_CONTENT_DOWNLOAD), SetStringTip(STR_GAME_OPTIONS_ONLINE_CONTENT, STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP),
-					EndContainer(),
-					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_SFX_DESCRIPTION), SetMinimalSize(200, 0), SetMinimalTextLines(1, 0), SetToolTip(STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP), SetFill(1, 0),
-					NWidget(NWID_VERTICAL),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_SFX_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_SFX_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_README, STR_TEXTFILE_VIEW_README_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_SFX_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_SFX_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_LICENCE, STR_TEXTFILE_VIEW_LICENCE_TOOLTIP),
-						EndContainer(),
-					EndContainer(),
-				EndContainer(),
-
-				NWidget(WWT_FRAME, COLOUR_GREY), SetStringTip(STR_GAME_OPTIONS_BASE_MUSIC), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_BASE_MUSIC_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP), SetFill(1, 0),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_CONTENT_DOWNLOAD), SetStringTip(STR_GAME_OPTIONS_ONLINE_CONTENT, STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP),
-					EndContainer(),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
-						NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_MUSIC_DESCRIPTION), SetMinimalSize(200, 0), SetMinimalTextLines(1, 0), SetToolTip(STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP), SetFill(1, 0),
-						NWidget(NWID_VERTICAL), SetPIPRatio(0, 0, 1),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_JUKEBOX), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_MUSIC, STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW),
-						EndContainer(),
-					EndContainer(),
-					NWidget(NWID_VERTICAL),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_README, STR_TEXTFILE_VIEW_README_TOOLTIP),
-						EndContainer(),
-						NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GO_BASE_MUSIC_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_LICENCE, STR_TEXTFILE_VIEW_LICENCE_TOOLTIP),
-						EndContainer(),
-					EndContainer(),
-				EndContainer(),
-			EndContainer(),
-
-			/* Social tab */
-			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
-				NWidgetFunction(MakeNWidgetSocialPlugins),
-			EndContainer(),
-		EndContainer(),
-	EndContainer(),
-};
-
-static WindowDesc _game_options_desc(
-	WDP_CENTER, nullptr, 0, 0,
-	WC_GAME_OPTIONS, WC_NONE,
-	{},
-	_nested_game_options_widgets
-);
-
-/** Open the game options window. */
-void ShowGameOptions()
-{
-	CloseWindowByClass(WC_GAME_OPTIONS);
-	new GameOptionsWindow(_game_options_desc);
-}
-
-int SETTING_HEIGHT = 11;    ///< Height of a single setting in the tree view in pixels
-
-static const StringID _game_settings_restrict_dropdown[] = {
-	STR_CONFIG_SETTING_RESTRICT_BASIC,                            // RM_BASIC
-	STR_CONFIG_SETTING_RESTRICT_ADVANCED,                         // RM_ADVANCED
-	STR_CONFIG_SETTING_RESTRICT_ALL,                              // RM_ALL
-	STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT,          // RM_CHANGED_AGAINST_DEFAULT
-	STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW,              // RM_CHANGED_AGAINST_NEW
-};
-static_assert(lengthof(_game_settings_restrict_dropdown) == RM_END);
-
-/** Warnings about hidden search results. */
-enum WarnHiddenResult : uint8_t {
-	WHR_NONE,          ///< Nothing was filtering matches away.
-	WHR_CATEGORY,      ///< Category setting filtered matches away.
-	WHR_TYPE,          ///< Type setting filtered matches away.
-	WHR_CATEGORY_TYPE, ///< Both category and type settings filtered matches away.
-};
-
-/**
- * Callback function for the reset all settings button
- * @param w Window which is calling this callback
- * @param confirmed boolean value, true when yes was clicked, false otherwise
- */
-static void ResetAllSettingsConfirmationCallback(Window *w, bool confirmed)
-{
-	if (confirmed) {
-		GetSettingsTree().ResetAll();
-		GetSettingsTree().FoldAll();
-		w->InvalidateData();
-	}
-}
-
-/** Window to edit settings of the game. */
-struct GameSettingsWindow : Window {
-	static GameSettings *settings_ptr; ///< Pointer to the game settings being displayed and modified.
-
-	SettingEntry *valuewindow_entry = nullptr; ///< If non-nullptr, pointer to setting for which a value-entering window has been opened.
-	SettingEntry *clicked_entry = nullptr; ///< If non-nullptr, pointer to a clicked numeric setting (with a depressed left or right button).
-	SettingEntry *last_clicked = nullptr; ///< If non-nullptr, pointer to the last clicked setting.
-	SettingEntry *valuedropdown_entry = nullptr; ///< If non-nullptr, pointer to the value for which a dropdown window is currently opened.
-	bool closing_dropdown = false; ///< True, if the dropdown list is currently closing.
-
-	SettingFilter filter{}; ///< Filter for the list.
-	QueryString filter_editbox; ///< Filter editbox;
-	bool manually_changed_folding = false; ///< Whether the user expanded/collapsed something manually.
-	WarnHiddenResult warn_missing = WHR_NONE; ///< Whether and how to warn about missing search results.
-	int warn_lines = 0; ///< Number of lines used for warning about missing search results.
-
-	Scrollbar *vscroll;
-
-	GameSettingsWindow(WindowDesc &desc) : Window(desc), filter_editbox(50)
-	{
-		this->filter.mode = (RestrictionMode)_settings_client.gui.settings_restriction_mode;
-		this->filter.min_cat = RM_ALL;
-		this->filter.type = ST_ALL;
-		this->filter.type_hides = false;
-		this->settings_ptr = &GetGameSettings();
-
-		GetSettingsTree().FoldAll(); // Close all sub-pages
-
-		this->CreateNestedTree();
-		this->vscroll = this->GetScrollbar(WID_GS_SCROLLBAR);
-		this->FinishInitNested(WN_GAME_OPTIONS_GAME_SETTINGS);
-
-		this->querystrings[WID_GS_FILTER] = &this->filter_editbox;
-		this->filter_editbox.cancel_button = QueryString::ACTION_CLEAR;
-		this->SetFocusedWidget(WID_GS_FILTER);
-
-		this->InvalidateData();
-	}
-
-	void OnInit() override
-	{
-		_circle_size = maxdim(GetSpriteSize(SPR_CIRCLE_FOLDED), GetSpriteSize(SPR_CIRCLE_UNFOLDED));
-	}
-
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
-	{
-		switch (widget) {
-			case WID_GS_OPTIONSPANEL:
-				resize.height = SETTING_HEIGHT = std::max({(int)_circle_size.height, SETTING_BUTTON_HEIGHT, GetCharacterHeight(FS_NORMAL)}) + WidgetDimensions::scaled.vsep_normal;
-				resize.width = 1;
-
-				size.height = 5 * resize.height + WidgetDimensions::scaled.framerect.Vertical();
-				break;
-
-			case WID_GS_HELP_TEXT: {
-				static const StringID setting_types[] = {
-					STR_CONFIG_SETTING_TYPE_CLIENT,
-					STR_CONFIG_SETTING_TYPE_COMPANY_MENU, STR_CONFIG_SETTING_TYPE_COMPANY_INGAME,
-					STR_CONFIG_SETTING_TYPE_GAME_MENU, STR_CONFIG_SETTING_TYPE_GAME_INGAME,
-				};
-				for (const auto &setting_type : setting_types) {
-					size.width = std::max(size.width, GetStringBoundingBox(GetString(STR_CONFIG_SETTING_TYPE, setting_type)).width + padding.width);
-				}
-				size.height = 2 * GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal +
-						std::max(size.height, GetSettingsTree().GetMaxHelpHeight(size.width));
-				break;
-			}
-
-			case WID_GS_RESTRICT_CATEGORY:
-			case WID_GS_RESTRICT_TYPE:
-				size.width = std::max(GetStringBoundingBox(STR_CONFIG_SETTING_RESTRICT_CATEGORY).width, GetStringBoundingBox(STR_CONFIG_SETTING_RESTRICT_TYPE).width);
-				break;
-
-			default:
-				break;
-		}
-	}
-
-	void OnPaint() override
-	{
-		if (this->closing_dropdown) {
-			this->closing_dropdown = false;
-			assert(this->valuedropdown_entry != nullptr);
-			this->valuedropdown_entry->SetButtons({});
-			this->valuedropdown_entry = nullptr;
-		}
-
-		/* Reserve the correct number of lines for the 'some search results are hidden' notice in the central settings display panel. */
-		const Rect panel = this->GetWidget<NWidgetBase>(WID_GS_OPTIONSPANEL)->GetCurrentRect().Shrink(WidgetDimensions::scaled.frametext);
-		StringID warn_str = STR_CONFIG_SETTING_CATEGORY_HIDES - 1 + this->warn_missing;
-		int new_warn_lines;
-		if (this->warn_missing == WHR_NONE) {
-			new_warn_lines = 0;
-		} else {
-			new_warn_lines = GetStringLineCount(GetString(warn_str, _game_settings_restrict_dropdown[this->filter.min_cat]), panel.Width());
-		}
-		if (this->warn_lines != new_warn_lines) {
-			this->vscroll->SetCount(this->vscroll->GetCount() - this->warn_lines + new_warn_lines);
-			this->warn_lines = new_warn_lines;
-		}
-
-		this->DrawWidgets();
-
-		/* Draw the 'some search results are hidden' notice. */
-		if (this->warn_missing != WHR_NONE) {
-			DrawStringMultiLine(panel.WithHeight(this->warn_lines * GetCharacterHeight(FS_NORMAL)),
-				GetString(warn_str, _game_settings_restrict_dropdown[this->filter.min_cat]),
-				TC_FROMSTRING, SA_CENTER);
-		}
-	}
-
-	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
-	{
-		switch (widget) {
-			case WID_GS_RESTRICT_DROPDOWN:
-				return GetString(_game_settings_restrict_dropdown[this->filter.mode]);
-
-			case WID_GS_TYPE_DROPDOWN:
-				switch (this->filter.type) {
-					case ST_GAME:    return GetString(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME);
-					case ST_COMPANY: return GetString(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME);
-					case ST_CLIENT:  return GetString(STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT);
-					default:         return GetString(STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL);
-				}
-
-			default:
-				return this->Window::GetWidgetString(widget, stringid);
-		}
-	}
-
-	DropDownList BuildDropDownList(WidgetID widget) const
-	{
-		DropDownList list;
-		switch (widget) {
-			case WID_GS_RESTRICT_DROPDOWN:
-				for (int mode = 0; mode != RM_END; mode++) {
-					/* If we are in adv. settings screen for the new game's settings,
-					 * we don't want to allow comparing with new game's settings. */
-					bool disabled = mode == RM_CHANGED_AGAINST_NEW && settings_ptr == &_settings_newgame;
-
-					list.push_back(MakeDropDownListStringItem(_game_settings_restrict_dropdown[mode], mode, disabled));
-				}
-				break;
-
-			case WID_GS_TYPE_DROPDOWN:
-				list.push_back(MakeDropDownListStringItem(STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL, ST_ALL));
-				list.push_back(MakeDropDownListStringItem(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME, ST_GAME));
-				list.push_back(MakeDropDownListStringItem(_game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME, ST_COMPANY));
-				list.push_back(MakeDropDownListStringItem(STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT, ST_CLIENT));
-				break;
-		}
-		return list;
-	}
-
-	void DrawWidget(const Rect &r, WidgetID widget) const override
-	{
-		switch (widget) {
-			case WID_GS_OPTIONSPANEL: {
-				Rect tr = r.Shrink(WidgetDimensions::scaled.frametext, WidgetDimensions::scaled.framerect);
-				tr.top += this->warn_lines * SETTING_HEIGHT;
-				uint last_row = this->vscroll->GetPosition() + this->vscroll->GetCapacity() - this->warn_lines;
-				int next_row = GetSettingsTree().Draw(settings_ptr, tr.left, tr.right, tr.top,
-						this->vscroll->GetPosition(), last_row, this->last_clicked);
-				if (next_row == 0) DrawString(tr, STR_CONFIG_SETTINGS_NONE);
-				break;
-			}
-
-			case WID_GS_HELP_TEXT:
-				if (this->last_clicked != nullptr) {
-					const IntSettingDesc *sd = this->last_clicked->setting;
-
-					Rect tr = r;
-					std::string str;
-					switch (sd->GetType()) {
-						case ST_COMPANY: str = GetString(STR_CONFIG_SETTING_TYPE, _game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_COMPANY_MENU : STR_CONFIG_SETTING_TYPE_COMPANY_INGAME); break;
-						case ST_CLIENT:  str = GetString(STR_CONFIG_SETTING_TYPE, STR_CONFIG_SETTING_TYPE_CLIENT); break;
-						case ST_GAME:    str = GetString(STR_CONFIG_SETTING_TYPE, _game_mode == GM_MENU ? STR_CONFIG_SETTING_TYPE_GAME_MENU : STR_CONFIG_SETTING_TYPE_GAME_INGAME); break;
-						default: NOT_REACHED();
-					}
-					DrawString(tr, str);
-					tr.top += GetCharacterHeight(FS_NORMAL);
-
-					auto [param1, param2] = sd->GetValueParams(sd->GetDefaultValue());
-					DrawString(tr, GetString(STR_CONFIG_SETTING_DEFAULT_VALUE, param1, param2));
-					tr.top += GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal;
-
-					DrawStringMultiLine(tr, sd->GetHelp(), TC_WHITE);
-				}
-				break;
-
-			default:
-				break;
-		}
-	}
-
-	/**
-	 * Set the entry that should have its help text displayed, and mark the window dirty so it gets repainted.
-	 * @param pe Setting to display help text of, use \c nullptr to stop displaying help of the currently displayed setting.
-	 */
-	void SetDisplayedHelpText(SettingEntry *pe)
-	{
-		if (this->last_clicked != pe) this->SetDirty();
-		this->last_clicked = pe;
-	}
-
-	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
-	{
-		switch (widget) {
-			case WID_GS_EXPAND_ALL:
+			case WID_GO_EXPAND_ALL:
 				this->manually_changed_folding = true;
 				GetSettingsTree().UnFoldAll();
 				this->InvalidateData();
 				break;
 
-			case WID_GS_COLLAPSE_ALL:
+			case WID_GO_COLLAPSE_ALL:
 				this->manually_changed_folding = true;
 				GetSettingsTree().FoldAll();
 				this->InvalidateData();
 				break;
 
-			case WID_GS_RESET_ALL:
+			case WID_GO_RESET_ALL:
 				ShowQuery(
 					GetEncodedString(STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION),
 					GetEncodedString(STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT),
@@ -1455,26 +1177,33 @@ struct GameSettingsWindow : Window {
 				);
 				break;
 
-			case WID_GS_RESTRICT_DROPDOWN: {
-				DropDownList list = this->BuildDropDownList(widget);
+			case WID_GO_RESTRICT_DROPDOWN: {
+				int selected;
+				DropDownList list = this->BuildDropDownList(widget, &selected);
 				if (!list.empty()) {
 					ShowDropDownList(this, std::move(list), this->filter.mode, widget);
 				}
 				break;
 			}
 
-			case WID_GS_TYPE_DROPDOWN: {
-				DropDownList list = this->BuildDropDownList(widget);
+			case WID_GO_TYPE_DROPDOWN: {
+				int selected;
+				DropDownList list = this->BuildDropDownList(widget, &selected);
 				if (!list.empty()) {
 					ShowDropDownList(this, std::move(list), this->filter.type, widget);
 				}
 				break;
 			}
+
+			case WID_GO_OPTIONSPANEL:
+				OptionsPanelClick(pt);
+				break;
 		}
+	}
 
-		if (widget != WID_GS_OPTIONSPANEL) return;
-
-		int32_t btn = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GS_OPTIONSPANEL, WidgetDimensions::scaled.framerect.top);
+	void OptionsPanelClick(Point pt)
+	{
+		int32_t btn = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GO_OPTIONSPANEL, WidgetDimensions::scaled.framerect.top);
 		if (btn == INT32_MAX || btn < this->warn_lines) return;
 		btn -= this->warn_lines;
 
@@ -1483,7 +1212,8 @@ struct GameSettingsWindow : Window {
 
 		if (clicked_entry == nullptr) return;  // Clicked below the last setting of the page
 
-		int x = (_current_text_dir == TD_RTL ? this->width - 1 - pt.x : pt.x) - WidgetDimensions::scaled.frametext.left - (clicked_entry->level + 1) * WidgetDimensions::scaled.hsep_indent;  // Shift x coordinate
+		const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_GO_OPTIONSPANEL);
+		int x = (_current_text_dir == TD_RTL ? this->width - 1 - pt.x : pt.x) - WidgetDimensions::scaled.frametext.left - (clicked_entry->level + 1) * WidgetDimensions::scaled.hsep_indent - wid->pos_x; // Shift x coordinate
 		if (x < 0) return;  // Clicked left of the entry
 
 		SettingsPage *clicked_page = dynamic_cast<SettingsPage*>(clicked_entry);
@@ -1524,7 +1254,6 @@ struct GameSettingsWindow : Window {
 				if (this->valuedropdown_entry != nullptr) this->valuedropdown_entry->SetButtons({});
 				this->closing_dropdown = false;
 
-				const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_GS_OPTIONSPANEL);
 				int rel_y = (pt.y - wid->pos_y - WidgetDimensions::scaled.framerect.top) % wid->resize_y;
 
 				Rect wi_rect;
@@ -1544,7 +1273,7 @@ struct GameSettingsWindow : Window {
 						list.push_back(MakeDropDownListStringItem(GetString(STR_JUST_STRING1, param1, param2), i));
 					}
 
-					ShowDropDownListAt(this, std::move(list), value, WID_GS_SETTING_DROPDOWN, wi_rect, COLOUR_ORANGE);
+					ShowDropDownListAt(this, std::move(list), value, WID_GO_SETTING_DROPDOWN, wi_rect, COLOUR_ORANGE);
 				}
 			}
 			this->SetDirty();
@@ -1636,12 +1365,13 @@ struct GameSettingsWindow : Window {
 
 		int32_t value;
 		if (!str->empty()) {
-			long long llvalue = atoll(str->c_str());
+			auto llvalue = ParseInteger<int64_t>(*str, 10, true);
+			if (!llvalue.has_value()) return;
 
 			/* Save the correct currency-translated value */
-			if (sd->flags.Test(SettingFlag::GuiCurrency)) llvalue /= GetCurrency().rate;
+			if (sd->flags.Test(SettingFlag::GuiCurrency)) llvalue = *llvalue / GetCurrency().rate;
 
-			value = ClampTo<int32_t>(llvalue);
+			value = ClampTo<int32_t>(*llvalue);
 		} else {
 			value = sd->GetDefaultValue();
 		}
@@ -1650,10 +1380,79 @@ struct GameSettingsWindow : Window {
 		this->SetDirty();
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnMouseLoop() override
+	{
+		if (_left_button_down || this->gui_scale == _gui_scale) return;
+
+		_gui_scale_cfg = this->gui_scale;
+
+		if (AdjustGUIZoom(false)) {
+			ReInitAllWindows(true);
+			this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, false);
+			this->SetDirty();
+		}
+	}
+
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
-			case WID_GS_RESTRICT_DROPDOWN:
+			case WID_GO_CURRENCY_DROPDOWN: // Currency
+				if (index == CURRENCY_CUSTOM) ShowCustCurrency();
+				this->opt->locale.currency = index;
+				ReInitAllWindows(false);
+				break;
+
+			case WID_GO_AUTOSAVE_DROPDOWN: // Autosave options
+				_settings_client.gui.autosave_interval = _autosave_dropdown_to_minutes[index];
+				ChangeAutosaveFrequency(false);
+				this->SetDirty();
+				break;
+
+			case WID_GO_LANG_DROPDOWN: // Change interface language
+				ReadLanguagePack(&_languages[index]);
+				CloseWindowByClass(WC_QUERY_STRING);
+				CheckForMissingGlyphs();
+				ClearAllCachedNames();
+				UpdateAllVirtCoords();
+				CheckBlitter();
+				ReInitAllWindows(false);
+				break;
+
+			case WID_GO_RESOLUTION_DROPDOWN: // Change resolution
+				if ((uint)index < _resolutions.size() && ChangeResInGame(_resolutions[index].width, _resolutions[index].height)) {
+					this->SetDirty();
+				}
+				break;
+
+			case WID_GO_REFRESH_RATE_DROPDOWN: {
+				_settings_client.gui.refresh_rate = *std::next(_refresh_rates.begin(), index);
+				if (_settings_client.gui.refresh_rate > 60) {
+					/* Show warning to the user that this refresh rate might not be suitable on
+					 * larger maps with many NewGRFs and vehicles. */
+					ShowErrorMessage(GetEncodedString(STR_GAME_OPTIONS_REFRESH_RATE_WARNING), {}, WL_INFO);
+				}
+				break;
+			}
+
+			case WID_GO_BASE_GRF_DROPDOWN:
+				if (_game_mode == GM_MENU) {
+					CloseWindowByClass(WC_GRF_PARAMETERS);
+					auto set = BaseGraphics::GetSet(index);
+					BaseGraphics::SetSet(set);
+					this->reload = true;
+					this->InvalidateData();
+				}
+				break;
+
+			case WID_GO_BASE_SFX_DROPDOWN:
+				ChangeSoundSet(index);
+				break;
+
+			case WID_GO_BASE_MUSIC_DROPDOWN:
+				ChangeMusicSet(index);
+				break;
+
+			case WID_GO_RESTRICT_DROPDOWN:
 				this->filter.mode = (RestrictionMode)index;
 				if (this->filter.mode == RM_CHANGED_AGAINST_DEFAULT ||
 						this->filter.mode == RM_CHANGED_AGAINST_NEW) {
@@ -1670,12 +1469,12 @@ struct GameSettingsWindow : Window {
 				this->InvalidateData();
 				break;
 
-			case WID_GS_TYPE_DROPDOWN:
+			case WID_GO_TYPE_DROPDOWN:
 				this->filter.type = (SettingType)index;
 				this->InvalidateData();
 				break;
 
-			case WID_GS_SETTING_DROPDOWN:
+			case WID_GO_SETTING_DROPDOWN:
 				/* Deal with drop down boxes on the panel. */
 				assert(this->valuedropdown_entry != nullptr);
 				const IntSettingDesc *sd = this->valuedropdown_entry->setting;
@@ -1687,14 +1486,14 @@ struct GameSettingsWindow : Window {
 		}
 	}
 
-	void OnDropdownClose(Point pt, WidgetID widget, int index, bool instant_close) override
+	void OnDropdownClose(Point pt, WidgetID widget, int index, int click_result, bool instant_close) override
 	{
-		if (widget != WID_GS_SETTING_DROPDOWN) {
+		if (widget != WID_GO_SETTING_DROPDOWN) {
 			/* Normally the default implementation of OnDropdownClose() takes care of
 			 * a few things. We want that behaviour here too, but only for
 			 * "normal" dropdown boxes. The special dropdown boxes added for every
 			 * setting that needs one can't have this call. */
-			Window::OnDropdownClose(pt, widget, index, instant_close);
+			Window::OnDropdownClose(pt, widget, index, click_result, instant_close);
 		} else {
 			/* We cannot raise the dropdown button just yet. OnClick needs some hint, whether
 			 * the same dropdown button was clicked again, and then not open the dropdown again.
@@ -1706,9 +1505,47 @@ struct GameSettingsWindow : Window {
 		}
 	}
 
+	/**
+	 * Some data on this window has become invalid.
+	 * @param data Information about the changed data. @see GameOptionsInvalidationData
+	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
+	 */
 	void OnInvalidateData([[maybe_unused]] int data = 0, [[maybe_unused]] bool gui_scope = true) override
 	{
 		if (!gui_scope) return;
+		this->SetWidgetLoweredState(WID_GO_SURVEY_PARTICIPATE_BUTTON, _settings_client.network.participate_survey == PS_YES);
+		this->SetWidgetLoweredState(WID_GO_FULLSCREEN_BUTTON, _fullscreen);
+		this->SetWidgetLoweredState(WID_GO_VIDEO_ACCEL_BUTTON, _video_hw_accel);
+		this->SetWidgetDisabledState(WID_GO_REFRESH_RATE_DROPDOWN, _video_vsync);
+
+#ifndef __APPLE__
+		this->SetWidgetLoweredState(WID_GO_VIDEO_VSYNC_BUTTON, _video_hw_accel && _video_vsync);
+		this->SetWidgetDisabledState(WID_GO_VIDEO_VSYNC_BUTTON, !_video_hw_accel);
+#endif
+
+		this->SetWidgetLoweredState(WID_GO_GUI_SCALE_AUTO, _gui_scale_cfg == -1);
+		this->SetWidgetLoweredState(WID_GO_GUI_SCALE_BEVEL_BUTTON, _settings_client.gui.scale_bevels);
+#ifdef HAS_TRUETYPE_FONT
+		this->SetWidgetLoweredState(WID_GO_GUI_FONT_SPRITE, _fcsettings.prefer_sprite);
+		this->SetWidgetLoweredState(WID_GO_GUI_FONT_AA, _fcsettings.global_aa);
+		this->SetWidgetDisabledState(WID_GO_GUI_FONT_AA, _fcsettings.prefer_sprite);
+#endif /* HAS_TRUETYPE_FONT */
+
+		this->SetWidgetDisabledState(WID_GO_BASE_GRF_DROPDOWN, _game_mode != GM_MENU);
+
+		this->SetWidgetDisabledState(WID_GO_BASE_GRF_PARAMETERS, BaseGraphics::GetUsedSet() == nullptr || !BaseGraphics::GetUsedSet()->IsConfigurable());
+
+		this->SetWidgetDisabledState(WID_GO_BASE_GRF_OPEN_URL, BaseGraphics::GetUsedSet() == nullptr || BaseGraphics::GetUsedSet()->url.empty());
+		this->SetWidgetDisabledState(WID_GO_BASE_SFX_OPEN_URL, BaseSounds::GetUsedSet() == nullptr || BaseSounds::GetUsedSet()->url.empty());
+		this->SetWidgetDisabledState(WID_GO_BASE_MUSIC_OPEN_URL, BaseMusic::GetUsedSet() == nullptr || BaseMusic::GetUsedSet()->url.empty());
+
+		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
+			this->SetWidgetDisabledState(WID_GO_BASE_GRF_TEXTFILE + tft, BaseGraphics::GetUsedSet() == nullptr || !BaseGraphics::GetUsedSet()->GetTextfile(tft).has_value());
+			this->SetWidgetDisabledState(WID_GO_BASE_SFX_TEXTFILE + tft, BaseSounds::GetUsedSet() == nullptr || !BaseSounds::GetUsedSet()->GetTextfile(tft).has_value());
+			this->SetWidgetDisabledState(WID_GO_BASE_MUSIC_TEXTFILE + tft, BaseMusic::GetUsedSet() == nullptr || !BaseMusic::GetUsedSet()->GetTextfile(tft).has_value());
+		}
+
+		this->SetWidgetsDisabledState(!_network_available, WID_GO_BASE_GRF_CONTENT_DOWNLOAD, WID_GO_BASE_SFX_CONTENT_DOWNLOAD, WID_GO_BASE_MUSIC_CONTENT_DOWNLOAD);
 
 		/* Update which settings are to be visible. */
 		RestrictionMode min_level = (this->filter.mode <= RM_ALL) ? this->filter.mode : RM_BASIC;
@@ -1732,13 +1569,13 @@ struct GameSettingsWindow : Window {
 		bool all_folded = true;
 		bool all_unfolded = true;
 		GetSettingsTree().GetFoldingState(all_folded, all_unfolded);
-		this->SetWidgetDisabledState(WID_GS_EXPAND_ALL, all_unfolded);
-		this->SetWidgetDisabledState(WID_GS_COLLAPSE_ALL, all_folded);
+		this->SetWidgetDisabledState(WID_GO_EXPAND_ALL, all_unfolded);
+		this->SetWidgetDisabledState(WID_GO_COLLAPSE_ALL, all_folded);
 	}
 
 	void OnEditboxChanged(WidgetID wid) override
 	{
-		if (wid == WID_GS_FILTER) {
+		if (wid == WID_GO_FILTER) {
 			this->filter.string.SetFilterTerm(this->filter_editbox.text.GetText());
 			if (!this->filter.string.IsEmpty() && !this->manually_changed_folding) {
 				/* User never expanded/collapsed single pages and entered a filter term.
@@ -1748,70 +1585,260 @@ struct GameSettingsWindow : Window {
 			this->InvalidateData();
 		}
 	}
-
-	void OnResize() override
-	{
-		this->vscroll->SetCapacityFromWidget(this, WID_GS_OPTIONSPANEL, WidgetDimensions::scaled.framerect.Vertical());
-	}
 };
 
-GameSettings *GameSettingsWindow::settings_ptr = nullptr;
+static constexpr NWidgetPart _nested_game_options_widgets[] = {
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_CLOSEBOX, GAME_OPTIONS_BACKGROUND),
+		NWidget(WWT_CAPTION, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_DEFSIZEBOX, GAME_OPTIONS_BACKGROUND),
+	EndContainer(),
+	NWidget(WWT_PANEL, GAME_OPTIONS_BACKGROUND),
+		NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPadding(WidgetDimensions::unscaled.sparse),
+			NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_TAB_GENERAL),  SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_GENERAL, STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_TAB_GRAPHICS), SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_GRAPHICS, STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_TAB_SOUND),    SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_SOUND, STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_TAB_SOCIAL),   SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_SOCIAL, STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_TAB_ADVANCED), SetMinimalTextLines(2, 0), SetStringTip(STR_GAME_OPTIONS_TAB_ADVANCED, STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+		EndContainer(),
+	EndContainer(),
+	NWidget(WWT_PANEL, GAME_OPTIONS_BACKGROUND),
+		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GO_TAB_SELECTION),
+			/* General tab */
+			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse_resize),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_LANGUAGE), SetTextStyle(GAME_OPTIONS_FRAME),
+						NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_LANG_DROPDOWN), SetToolTip(STR_GAME_OPTIONS_LANGUAGE_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+					EndContainer(),
 
-static constexpr NWidgetPart _nested_settings_selection_widgets[] = {
-	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_CLOSEBOX, COLOUR_MAUVE),
-		NWidget(WWT_CAPTION, COLOUR_MAUVE), SetStringTip(STR_CONFIG_SETTING_TREE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_DEFSIZEBOX, COLOUR_MAUVE),
-	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_MAUVE),
-		NWidget(NWID_VERTICAL), SetPIP(WidgetDimensions::unscaled.frametext.top, WidgetDimensions::unscaled.vsep_normal, WidgetDimensions::unscaled.frametext.bottom),
-			NWidget(NWID_HORIZONTAL), SetPIP(WidgetDimensions::unscaled.frametext.left, WidgetDimensions::unscaled.hsep_wide, WidgetDimensions::unscaled.frametext.right),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GS_RESTRICT_CATEGORY), SetStringTip(STR_CONFIG_SETTING_RESTRICT_CATEGORY),
-				NWidget(WWT_DROPDOWN, COLOUR_MAUVE, WID_GS_RESTRICT_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT), SetFill(1, 0), SetResize(1, 0),
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_AUTOSAVE_FRAME), SetTextStyle(GAME_OPTIONS_FRAME),
+						NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_AUTOSAVE_DROPDOWN), SetToolTip(STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+					EndContainer(),
+
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME), SetTextStyle(GAME_OPTIONS_FRAME),
+						NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_CURRENCY_DROPDOWN), SetToolTip(STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+					EndContainer(),
+
+					NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GO_SURVEY_SEL),
+						NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME), SetTextStyle(GAME_OPTIONS_FRAME), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_SURVEY_PARTICIPATE_BUTTON), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_SURVEY_PARTICIPATE_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_SURVEY_PREVIEW_BUTTON), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW, STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP),
+								NWidget(WWT_TEXTBTN, GAME_OPTIONS_BUTTON, WID_GO_SURVEY_LINK_BUTTON), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK, STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP),
+							EndContainer(),
+						EndContainer(),
+					EndContainer(),
+				EndContainer(),
+				NWidget(NWID_SPACER), SetFill(1, 1), SetResize(1, 1), // Allows this pane to resize
 			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(WidgetDimensions::unscaled.frametext.left, WidgetDimensions::unscaled.hsep_wide, WidgetDimensions::unscaled.frametext.right),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GS_RESTRICT_TYPE), SetStringTip(STR_CONFIG_SETTING_RESTRICT_TYPE),
-				NWidget(WWT_DROPDOWN, COLOUR_MAUVE, WID_GS_TYPE_DROPDOWN), SetMinimalSize(100, 12), SetToolTip(STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT), SetFill(1, 0), SetResize(1, 0),
+
+			/* Graphics tab */
+			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse_resize),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_INTERFACE), SetTextStyle(GAME_OPTIONS_FRAME),
+						NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_TEXT, INVALID_COLOUR), SetStringTip(STR_GAME_OPTIONS_GUI_SCALE_FRAME), SetTextStyle(GAME_OPTIONS_LABEL),
+								NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_GUI_SCALE), SetMinimalTextLines(1, 12 + WidgetDimensions::unscaled.vsep_normal, FS_SMALL), SetFill(1, 0), SetResize(1, 0), SetToolTip(STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_GUI_SCALE_AUTO), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_GUI_SCALE_AUTO_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_GUI_SCALE_BEVEL_BUTTON), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_GUI_SCALE_BEVEL_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+#ifdef HAS_TRUETYPE_FONT
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_GUI_FONT_SPRITE), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_GUI_FONT_SPRITE_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_GUI_FONT_AA), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_GUI_FONT_AA_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+#endif /* HAS_TRUETYPE_FONT */
+						EndContainer(),
+					EndContainer(),
+
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_DISPLAY), SetTextStyle(GAME_OPTIONS_FRAME),
+						NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
+								NWidget(WWT_TEXT, INVALID_COLOUR), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_GAME_OPTIONS_RESOLUTION), SetTextStyle(GAME_OPTIONS_LABEL),
+								NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_RESOLUTION_DROPDOWN), SetFill(1, 0), SetToolTip(STR_GAME_OPTIONS_RESOLUTION_TOOLTIP),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(0, WidgetDimensions::unscaled.hsep_normal, 0),
+								NWidget(WWT_TEXT, INVALID_COLOUR), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_GAME_OPTIONS_REFRESH_RATE), SetTextStyle(GAME_OPTIONS_LABEL),
+								NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_REFRESH_RATE_DROPDOWN), SetFill(1, 0), SetToolTip(STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_FULLSCREEN_BUTTON), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_FULLSCREEN_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_VIDEO_ACCEL_BUTTON), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR,WID_GO_VIDEO_ACCEL_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+#ifndef __APPLE__
+							NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+								NWidget(WWT_BOOLBTN, GAME_OPTIONS_BACKGROUND, WID_GO_VIDEO_VSYNC_BUTTON), SetAlternateColourTip(GAME_OPTIONS_BUTTON, STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP),
+								NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_VIDEO_VSYNC_TEXT), SetFill(1, 0), SetResize(1, 0), SetTextStyle(GAME_OPTIONS_LABEL),
+							EndContainer(),
+#endif
+							NWidget(NWID_HORIZONTAL),
+								NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_VIDEO_DRIVER_INFO), SetMinimalTextLines(1, 0), SetFill(1, 0), SetResize(1, 0),
+							EndContainer(),
+						EndContainer(),
+					EndContainer(),
+
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_BASE_GRF), SetTextStyle(GAME_OPTIONS_FRAME), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0), SetFill(1, 0),
+						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+							NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_DROPDOWN), SetToolTip(STR_GAME_OPTIONS_BASE_GRF_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+							NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_PARAMETERS), SetStringTip(STR_NEWGRF_SETTINGS_SET_PARAMETERS),
+							NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_CONTENT_DOWNLOAD), SetStringTip(STR_GAME_OPTIONS_ONLINE_CONTENT, STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP),
+						EndContainer(),
+						NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_BASE_GRF_DESCRIPTION), SetStringTip(STR_EMPTY, STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+						NWidget(NWID_VERTICAL),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_README, STR_TEXTFILE_VIEW_README_TOOLTIP),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_GRF_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_LICENCE, STR_TEXTFILE_VIEW_LICENCE_TOOLTIP),
+							EndContainer(),
+						EndContainer(),
+					EndContainer(),
+				EndContainer(),
+				NWidget(NWID_SPACER), SetFill(1, 1), SetResize(1, 1), // Allows this pane to resize
 			EndContainer(),
-			NWidget(NWID_HORIZONTAL), SetPIP(WidgetDimensions::unscaled.frametext.left, WidgetDimensions::unscaled.hsep_wide, WidgetDimensions::unscaled.frametext.right),
-				NWidget(WWT_TEXT, INVALID_COLOUR), SetFill(0, 1), SetStringTip(STR_CONFIG_SETTING_FILTER_TITLE),
-				NWidget(WWT_EDITBOX, COLOUR_MAUVE, WID_GS_FILTER), SetStringTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+
+			/* Sound/Music tab */
+			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse_resize),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_VOLUME), SetTextStyle(GAME_OPTIONS_FRAME), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0),
+						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+							NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_TEXT_SFX_VOLUME), SetStringTip(STR_GAME_OPTIONS_SFX_VOLUME), SetTextStyle(GAME_OPTIONS_LABEL),
+							NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_SFX_VOLUME), SetMinimalTextLines(1, 12 + WidgetDimensions::unscaled.vsep_normal, FS_SMALL), SetFill(1, 0), SetResize(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
+						EndContainer(),
+						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+							NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_TEXT_MUSIC_VOLUME), SetStringTip(STR_GAME_OPTIONS_MUSIC_VOLUME), SetTextStyle(GAME_OPTIONS_LABEL),
+							NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_MUSIC_VOLUME), SetMinimalTextLines(1, 12 + WidgetDimensions::unscaled.vsep_normal, FS_SMALL), SetFill(1, 0), SetResize(1, 0), SetToolTip(STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
+						EndContainer(),
+					EndContainer(),
+
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_BASE_SFX), SetTextStyle(GAME_OPTIONS_FRAME), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
+						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+							NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_BASE_SFX_DROPDOWN), SetToolTip(STR_GAME_OPTIONS_BASE_SFX_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+							NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_SFX_CONTENT_DOWNLOAD), SetStringTip(STR_GAME_OPTIONS_ONLINE_CONTENT, STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP),
+						EndContainer(),
+						NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_SFX_DESCRIPTION), SetMinimalTextLines(1, 0), SetToolTip(STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+						NWidget(NWID_VERTICAL),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_SFX_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_SFX_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_README, STR_TEXTFILE_VIEW_README_TOOLTIP),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_SFX_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_SFX_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_LICENCE, STR_TEXTFILE_VIEW_LICENCE_TOOLTIP),
+							EndContainer(),
+						EndContainer(),
+					EndContainer(),
+
+					NWidget(WWT_FRAME, GAME_OPTIONS_BACKGROUND), SetStringTip(STR_GAME_OPTIONS_BASE_MUSIC), SetTextStyle(GAME_OPTIONS_FRAME), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
+						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+							NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_DROPDOWN), SetToolTip(STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+							NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_CONTENT_DOWNLOAD), SetStringTip(STR_GAME_OPTIONS_ONLINE_CONTENT, STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP),
+						EndContainer(),
+						NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+							NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_BASE_MUSIC_DESCRIPTION), SetMinimalTextLines(1, 0), SetToolTip(STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+							NWidget(NWID_VERTICAL), SetPIPRatio(0, 0, 1),
+								NWidget(WWT_PUSHIMGBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_JUKEBOX), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_MUSIC, STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW),
+							EndContainer(),
+						EndContainer(),
+						NWidget(NWID_VERTICAL),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetStringTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_README, STR_TEXTFILE_VIEW_README_TOOLTIP),
+							EndContainer(),
+							NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP),
+								NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_BASE_MUSIC_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_TEXTFILE_VIEW_LICENCE, STR_TEXTFILE_VIEW_LICENCE_TOOLTIP),
+							EndContainer(),
+						EndContainer(),
+					EndContainer(),
+				EndContainer(),
+				NWidget(NWID_SPACER), SetFill(1, 1), SetResize(1, 1), // Allows this pane to resize
+			EndContainer(),
+
+			/* Social tab */
+			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse_resize),
+				NWidgetFunction(MakeNWidgetSocialPlugins),
+				NWidget(NWID_SPACER), SetFill(1, 1), SetResize(1, 1), // Allows this pane to resize
+			EndContainer(),
+
+			/* Advanced settings tab */
+			NWidget(NWID_VERTICAL), SetPadding(WidgetDimensions::unscaled.sparse_resize), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+						NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_RESTRICT_CATEGORY), SetStringTip(STR_CONFIG_SETTING_RESTRICT_CATEGORY), SetTextStyle(GAME_OPTIONS_LABEL),
+						NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_RESTRICT_DROPDOWN), SetToolTip(STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT), SetFill(1, 0), SetResize(1, 0),
+					EndContainer(),
+					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+						NWidget(WWT_TEXT, INVALID_COLOUR, WID_GO_RESTRICT_TYPE), SetStringTip(STR_CONFIG_SETTING_RESTRICT_TYPE), SetTextStyle(GAME_OPTIONS_LABEL),
+						NWidget(WWT_DROPDOWN, GAME_OPTIONS_BUTTON, WID_GO_TYPE_DROPDOWN), SetToolTip(STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT), SetFill(1, 0), SetResize(1, 0),
+					EndContainer(),
+					NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0),
+						NWidget(WWT_TEXT, INVALID_COLOUR), SetFill(0, 1), SetStringTip(STR_CONFIG_SETTING_FILTER_TITLE), SetTextStyle(GAME_OPTIONS_LABEL),
+						NWidget(WWT_EDITBOX, GAME_OPTIONS_BACKGROUND, WID_GO_FILTER), SetStringTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+					EndContainer(),
+				EndContainer(),
+
+				NWidget(NWID_HORIZONTAL),
+					NWidget(WWT_PANEL, GAME_OPTIONS_BACKGROUND, WID_GO_OPTIONSPANEL), SetFill(1, 1), SetResize(1, 1), SetScrollbar(WID_GO_SCROLLBAR),
+					EndContainer(),
+					NWidget(NWID_VSCROLLBAR, GAME_OPTIONS_BACKGROUND, WID_GO_SCROLLBAR),
+				EndContainer(),
+
+				NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+					NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_EXPAND_ALL), SetStringTip(STR_CONFIG_SETTING_EXPAND_ALL), SetFill(1, 0), SetResize(1, 0),
+					NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_COLLAPSE_ALL), SetStringTip(STR_CONFIG_SETTING_COLLAPSE_ALL), SetFill(1, 0), SetResize(1, 0),
+					NWidget(WWT_PUSHTXTBTN, GAME_OPTIONS_BUTTON, WID_GO_RESET_ALL), SetStringTip(STR_CONFIG_SETTING_RESET_ALL), SetFill(1, 0), SetResize(1, 0),
+				EndContainer(),
+
+				NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_SETTING_PROPERTIES), SetFill(1, 0), SetResize(1, 0),
+				NWidget(NWID_HORIZONTAL),
+					NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GO_HELP_TEXT), SetFill(1, 0), SetResize(1, 0), SetScrollbar(WID_GO_HELP_TEXT_SCROLL),
+					NWidget(NWID_VSCROLLBAR, GAME_OPTIONS_BACKGROUND, WID_GO_HELP_TEXT_SCROLL),
+				EndContainer(),
 			EndContainer(),
 		EndContainer(),
-	EndContainer(),
-	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PANEL, COLOUR_MAUVE, WID_GS_OPTIONSPANEL), SetMinimalSize(400, 174), SetScrollbar(WID_GS_SCROLLBAR), EndContainer(),
-		NWidget(NWID_VSCROLLBAR, COLOUR_MAUVE, WID_GS_SCROLLBAR),
-	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_MAUVE),
-		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GS_HELP_TEXT), SetMinimalSize(300, 25), SetFill(1, 1), SetResize(1, 0),
-				SetPadding(WidgetDimensions::unscaled.frametext),
-	EndContainer(),
-	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_GS_EXPAND_ALL), SetStringTip(STR_CONFIG_SETTING_EXPAND_ALL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_GS_COLLAPSE_ALL), SetStringTip(STR_CONFIG_SETTING_COLLAPSE_ALL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_GS_RESET_ALL), SetStringTip(STR_CONFIG_SETTING_RESET_ALL),
-		NWidget(WWT_PANEL, COLOUR_MAUVE), SetFill(1, 0), SetResize(1, 0),
+
+		NWidget(NWID_HORIZONTAL),
+			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_RESIZEBOX, GAME_OPTIONS_BACKGROUND), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
-		NWidget(WWT_RESIZEBOX, COLOUR_MAUVE),
 	EndContainer(),
 };
 
-static WindowDesc _settings_selection_desc(
-	WDP_CENTER, "settings", 510, 450,
+static WindowDesc _game_options_desc(
+	WDP_CENTER, "game_options", 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	{},
-	_nested_settings_selection_widgets
+	_nested_game_options_widgets
 );
 
-/** Open advanced settings window. */
-void ShowGameSettings()
+/** Open the game options window. */
+void ShowGameOptions()
 {
 	CloseWindowByClass(WC_GAME_OPTIONS);
-	new GameSettingsWindow(_settings_selection_desc);
+	new GameOptionsWindow(_game_options_desc);
 }
 
-
 /**
  * Draw [<][>] boxes.
  * @param x the x position to draw
@@ -1844,6 +1871,33 @@ void DrawArrowButtons(int x, int y, Colours button_colour, uint8_t state, bool c
 	}
 }
 
+/**
+ * Draw [^][v] buttons
+ * @param x the x position to draw
+ * @param y the y position to draw
+ * @param button_colour the colour of the button
+ * @param state 0 = none clicked, 1 = first clicked, 2 = second clicked
+ * @param clickable_up is the up button clickable?
+ * @param clickable_down is the down button clickable?
+ */
+void DrawUpDownButtons(int x, int y, Colours button_colour, uint8_t state, bool clickable_up, bool clickable_down)
+{
+	int colour = GetColourGradient(button_colour, SHADE_DARKER);
+
+	Rect r = {x, y, x + SETTING_BUTTON_WIDTH - 1, y + SETTING_BUTTON_HEIGHT - 1};
+	Rect ur = r.WithWidth(SETTING_BUTTON_WIDTH / 2, (_current_text_dir == TD_RTL));
+	Rect dr = r.WithWidth(SETTING_BUTTON_WIDTH / 2, (_current_text_dir != TD_RTL));
+
+	DrawFrameRect(ur, button_colour, (state == 1) ? FrameFlag::Lowered : FrameFlags{});
+	DrawFrameRect(dr, button_colour, (state == 2) ? FrameFlag::Lowered : FrameFlags{});
+	DrawSpriteIgnorePadding(SPR_ARROW_UP, PAL_NONE, ur, SA_CENTER);
+	DrawSpriteIgnorePadding(SPR_ARROW_DOWN, PAL_NONE, dr, SA_CENTER);
+
+	/* Grey out the buttons that aren't clickable */
+	if (!clickable_up) GfxFillRect(ur.Shrink(WidgetDimensions::scaled.bevel), colour, FILLRECT_CHECKER);
+	if (!clickable_down) GfxFillRect(dr.Shrink(WidgetDimensions::scaled.bevel), colour, FILLRECT_CHECKER);
+}
+
 /**
  * Draw a dropdown button.
  * @param x the x position to draw
@@ -1870,15 +1924,24 @@ void DrawDropDownButton(int x, int y, Colours button_colour, bool state, bool cl
  * Draw a toggle button.
  * @param x the x position to draw
  * @param y the y position to draw
+ * @param button_colour the colour of the button.
+ * @param background background colour.
  * @param state true = lowered
  * @param clickable is the button clickable?
  */
-void DrawBoolButton(int x, int y, bool state, bool clickable)
+void DrawBoolButton(int x, int y, Colours button_colour, Colours background, bool state, bool clickable)
 {
-	static const Colours _bool_ctabs[2][2] = {{COLOUR_CREAM, COLOUR_RED}, {COLOUR_DARK_GREEN, COLOUR_GREEN}};
-
 	Rect r = {x, y, x + SETTING_BUTTON_WIDTH - 1, y + SETTING_BUTTON_HEIGHT - 1};
-	DrawFrameRect(r, _bool_ctabs[state][clickable], state ? FrameFlag::Lowered : FrameFlags{});
+	DrawFrameRect(r, state ? COLOUR_GREEN : background, state ? FrameFlags{FrameFlag::Lowered} : FrameFlags{FrameFlag::Lowered, FrameFlag::BorderOnly});
+	if (!clickable) {
+		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(state ? COLOUR_GREEN : background, SHADE_DARKER), FILLRECT_CHECKER);
+	}
+
+	Rect button_rect = r.WithWidth(SETTING_BUTTON_WIDTH / 3, state ^ (_current_text_dir == TD_RTL));
+	DrawFrameRect(button_rect, button_colour, {});
+	if (!clickable) {
+		GfxFillRect(button_rect.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(button_colour, SHADE_DARKER), FILLRECT_CHECKER);
+	}
 }
 
 struct CustomCurrencyWindow : Window {
@@ -2024,9 +2087,12 @@ struct CustomCurrencyWindow : Window {
 		if (!str.has_value()) return;
 
 		switch (this->query_widget) {
-			case WID_CC_RATE:
-				GetCustomCurrency().rate = Clamp(atoi(str->c_str()), 1, UINT16_MAX);
+			case WID_CC_RATE: {
+				auto val = ParseInteger(*str, 10, true);
+				if (!val.has_value()) return;
+				GetCustomCurrency().rate = Clamp(*val, 1, UINT16_MAX);
 				break;
+			}
 
 			case WID_CC_SEPARATOR: // Thousands separator
 				GetCustomCurrency().separator = std::move(*str);
@@ -2041,9 +2107,13 @@ struct CustomCurrencyWindow : Window {
 				break;
 
 			case WID_CC_YEAR: { // Year to switch to euro
-				TimerGameCalendar::Year val{atoi(str->c_str())};
-
-				GetCustomCurrency().to_euro = (val < MIN_EURO_YEAR ? CF_NOEURO : std::min(val, CalendarTime::MAX_YEAR));
+				TimerGameCalendar::Year year = CF_NOEURO;
+				if (!str->empty()) {
+					auto val = ParseInteger(*str, 10, true);
+					if (!val.has_value()) return;
+					year = Clamp(static_cast<TimerGameCalendar::Year>(*val), MIN_EURO_YEAR, CalendarTime::MAX_YEAR);
+				}
+				GetCustomCurrency().to_euro = year;
 				break;
 			}
 		}
@@ -2099,7 +2169,7 @@ static constexpr NWidgetPart _nested_cust_currency_widgets[] = {
 };
 
 static WindowDesc _cust_currency_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_CUSTOM_CURRENCY, WC_NONE,
 	{},
 	_nested_cust_currency_widgets
diff --git a/src/settings_gui.h b/src/settings_gui.h
index bca6888ac7..77b11759fb 100644
--- a/src/settings_gui.h
+++ b/src/settings_gui.h
@@ -19,8 +19,9 @@
 #define SETTING_BUTTON_HEIGHT ((int)NWidgetScrollbar::GetHorizontalDimension().height)
 
 void DrawArrowButtons(int x, int y, Colours button_colour, uint8_t state, bool clickable_left, bool clickable_right);
+void DrawUpDownButtons(int x, int y, Colours button_colour, uint8_t state, bool clickable_up, bool clickable_down);
 void DrawDropDownButton(int x, int y, Colours button_colour, bool state, bool clickable);
-void DrawBoolButton(int x, int y, bool state, bool clickable);
+void DrawBoolButton(int x, int y, Colours button_colour, Colours background, bool state, bool clickable);
 
 template <class T>
 DropDownList BuildSetDropDownList(int *selected_index);
diff --git a/src/settings_internal.h b/src/settings_internal.h
index 8fcf2cd71b..4efb03baee 100644
--- a/src/settings_internal.h
+++ b/src/settings_internal.h
@@ -235,7 +235,7 @@ struct IntSettingDesc : SettingDesc {
 	void ChangeValue(const void *object, int32_t newvalue) const;
 	void MakeValueValidAndWrite(const void *object, int32_t value) const;
 
-	virtual size_t ParseValue(const char *str) const;
+	virtual int32_t ParseValue(std::string_view str) const;
 	std::string FormatValue(const void *object) const override;
 	void ParseValue(const IniItem *item, void *object) const override;
 	bool IsSameValue(const IniItem *item, void *object) const override;
@@ -258,36 +258,36 @@ struct BoolSettingDesc : IntSettingDesc {
 		IntSettingDesc(save, flags, startup, def ? 1 : 0, 0, 1, 0, str, str_help, str_val, cat,
 			pre_check, post_callback, get_title_cb, get_help_cb, get_value_params_cb, get_def_cb, nullptr) {}
 
-	static std::optional<bool> ParseSingleValue(const char *str);
+	static std::optional<bool> ParseSingleValue(std::string_view str);
 
 	bool IsBoolSetting() const override { return true; }
-	size_t ParseValue(const char *str) const override;
+	int32_t ParseValue(std::string_view str) const override;
 	std::string FormatValue(const void *object) const override;
 };
 
 /** One of many setting. */
 struct OneOfManySettingDesc : IntSettingDesc {
-	typedef size_t OnConvert(const char *value); ///< callback prototype for conversion error
+	typedef std::optional<uint32_t> OnConvert(std::string_view value); ///< callback prototype for conversion error
 
 	template <ConvertibleThroughBaseOrTo<int32_t> Tdef, ConvertibleThroughBaseOrTo<uint32_t> Tmax>
 	OneOfManySettingDesc(const SaveLoad &save, SettingFlags flags, bool startup, Tdef def,
 			Tmax max, StringID str, StringID str_help, StringID str_val, SettingCategory cat,
 			PreChangeCheck pre_check, PostChangeCallback post_callback,
 			GetTitleCallback get_title_cb, GetHelpCallback get_help_cb, GetValueParamsCallback get_value_params_cb,
-			GetDefaultValueCallback get_def_cb, std::initializer_list<const char *> many, OnConvert *many_cnvt) :
+			GetDefaultValueCallback get_def_cb, std::initializer_list<std::string_view> many, OnConvert *many_cnvt) :
 		IntSettingDesc(save, flags, startup, def, 0, max, 0, str, str_help, str_val, cat,
 			pre_check, post_callback, get_title_cb, get_help_cb, get_value_params_cb, get_def_cb, nullptr), many_cnvt(many_cnvt)
 	{
 		for (auto one : many) this->many.push_back(one);
 	}
 
-	std::vector<std::string> many; ///< possible values for this type
+	std::vector<std::string_view> many; ///< possible values for this type
 	OnConvert *many_cnvt;          ///< callback procedure when loading value mechanism fails
 
-	static size_t ParseSingleValue(const char *str, size_t len, const std::vector<std::string> &many);
+	static std::optional<uint32_t> ParseSingleValue(std::string_view str, std::span<const std::string_view> many);
 	std::string FormatSingleValue(uint id) const;
 
-	size_t ParseValue(const char *str) const override;
+	int32_t ParseValue(std::string_view str) const override;
 	std::string FormatValue(const void *object) const override;
 };
 
@@ -298,11 +298,11 @@ struct ManyOfManySettingDesc : OneOfManySettingDesc {
 		Tdef def, StringID str, StringID str_help, StringID str_val, SettingCategory cat,
 		PreChangeCheck pre_check, PostChangeCallback post_callback,
 		GetTitleCallback get_title_cb, GetHelpCallback get_help_cb, GetValueParamsCallback get_value_params_cb,
-		GetDefaultValueCallback get_def_cb, std::initializer_list<const char *> many, OnConvert *many_cnvt) :
+		GetDefaultValueCallback get_def_cb, std::initializer_list<std::string_view> many, OnConvert *many_cnvt) :
 		OneOfManySettingDesc(save, flags, startup, def, (1 << many.size()) - 1, str, str_help,
 			str_val, cat, pre_check, post_callback, get_title_cb, get_help_cb, get_value_params_cb, get_def_cb, many, many_cnvt) {}
 
-	size_t ParseValue(const char *str) const override;
+	int32_t ParseValue(std::string_view str) const override;
 	std::string FormatValue(const void *object) const override;
 };
 
@@ -323,18 +323,18 @@ struct StringSettingDesc : SettingDesc {
 	 */
 	typedef void PostChangeCallback(const std::string &value);
 
-	StringSettingDesc(const SaveLoad &save, SettingFlags flags, bool startup, const char *def,
+	StringSettingDesc(const SaveLoad &save, SettingFlags flags, bool startup, std::string_view def,
 			uint32_t max_length, PreChangeCheck pre_check, PostChangeCallback post_callback) :
-		SettingDesc(save, flags, startup), def(def == nullptr ? "" : def), max_length(max_length),
+		SettingDesc(save, flags, startup), def(def), max_length(max_length),
 			pre_check(pre_check), post_callback(post_callback) {}
 
-	std::string def;                   ///< Default value given when none is present
+	std::string_view def; ///< Default value given when none is present
 	uint32_t max_length;                 ///< Maximum length of the string, 0 means no maximum length
 	PreChangeCheck *pre_check;         ///< Callback to check for the validity of the setting.
 	PostChangeCallback *post_callback; ///< Callback when the setting has been changed.
 
 	bool IsStringSetting() const override { return true; }
-	void ChangeValue(const void *object, std::string &newval) const;
+	void ChangeValue(const void *object, std::string &&newval) const;
 
 	std::string FormatValue(const void *object) const override;
 	void ParseValue(const IniItem *item, void *object) const override;
@@ -345,15 +345,15 @@ struct StringSettingDesc : SettingDesc {
 
 private:
 	void MakeValueValid(std::string &str) const;
-	void Write(const void *object, const std::string &str) const;
+	void Write(const void *object, std::string_view str) const;
 };
 
 /** List/array settings. */
 struct ListSettingDesc : SettingDesc {
-	ListSettingDesc(const SaveLoad &save, SettingFlags flags, bool startup, const char *def) :
+	ListSettingDesc(const SaveLoad &save, SettingFlags flags, bool startup, std::string_view def) :
 		SettingDesc(save, flags, startup), def(def) {}
 
-	const char *def;        ///< default value given when none is present
+	std::string_view def; ///< default value given when none is present
 
 	std::string FormatValue(const void *object) const override;
 	void ParseValue(const IniItem *item, void *object) const override;
@@ -388,11 +388,11 @@ static constexpr const SettingDesc *GetSettingDesc(const SettingVariant &desc)
 
 typedef std::span<const SettingVariant> SettingTable;
 
-const SettingDesc *GetSettingFromName(const std::string_view name);
+const SettingDesc *GetSettingFromName(std::string_view name);
 void GetSaveLoadFromSettingTable(SettingTable settings, std::vector<SaveLoad> &saveloads);
 SettingTable GetSaveLoadSettingTable();
 bool SetSettingValue(const IntSettingDesc *sd, int32_t value, bool force_newgame = false);
-bool SetSettingValue(const StringSettingDesc *sd, const std::string value, bool force_newgame = false);
+bool SetSettingValue(const StringSettingDesc *sd, std::string_view value, bool force_newgame = false);
 
 std::vector<const SettingDesc *> GetFilteredSettingCollection(std::function<bool(const SettingDesc &desc)> func);
 
diff --git a/src/settings_table.cpp b/src/settings_table.cpp
index 6412253fad..434ec43f74 100644
--- a/src/settings_table.cpp
+++ b/src/settings_table.cpp
@@ -445,11 +445,11 @@ static bool CheckRoadSide(int32_t &)
  * @param value that was read from config file
  * @return the "hopefully" converted value
  */
-static size_t ConvertLandscape(const char *value)
+static std::optional<uint32_t> ConvertLandscape(std::string_view value)
 {
 	/* try with the old values */
-	static std::vector<std::string> _old_landscape_values{"normal", "hilly", "desert", "candy"};
-	return OneOfManySettingDesc::ParseSingleValue(value, strlen(value), _old_landscape_values);
+	static constexpr std::initializer_list<std::string_view> _old_landscape_values{"normal"sv, "hilly"sv, "desert"sv, "candy"sv};
+	return OneOfManySettingDesc::ParseSingleValue(value, _old_landscape_values);
 }
 
 static bool CheckFreeformEdges(int32_t &new_value)
diff --git a/src/settings_table.h b/src/settings_table.h
index 372e4739bb..3b1e8e1056 100644
--- a/src/settings_table.h
+++ b/src/settings_table.h
@@ -39,6 +39,6 @@ extern SettingTable _win32_settings;
 
 static const uint GAME_DIFFICULTY_NUM = 18;
 extern const std::array<std::string, GAME_DIFFICULTY_NUM> _old_diff_settings;
-extern uint16_t _old_diff_custom[GAME_DIFFICULTY_NUM];
+extern std::array<uint16_t, GAME_DIFFICULTY_NUM> _old_diff_custom;
 
 #endif /* SETTINGS_TABLE_H */
diff --git a/src/settings_type.h b/src/settings_type.h
index f6dd5bc98c..255038e537 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -598,7 +598,7 @@ struct CompanySettings {
 /** Container for AI and Game script configuration. */
 struct ScriptConfigSettings
 {
-	ReferenceThroughBaseContainer<std::array<std::unique_ptr<class AIConfig>, MAX_COMPANIES>> ai; ///< settings per company
+	TypedIndexContainer<std::array<std::unique_ptr<class AIConfig>, MAX_COMPANIES>, CompanyID> ai; ///< settings per company
 	std::unique_ptr<class GameConfig> game; ///< settings for gamescript
 
 	ScriptConfigSettings();
diff --git a/src/settingsgen/CMakeLists.txt b/src/settingsgen/CMakeLists.txt
index c69f755035..7f7c1854b1 100644
--- a/src/settingsgen/CMakeLists.txt
+++ b/src/settingsgen/CMakeLists.txt
@@ -11,6 +11,8 @@ if (NOT HOST_BINARY_DIR)
             ../ini_load.cpp
             ../string.cpp
             ../core/string_builder.cpp
+            ../core/string_consumer.cpp
+            ../core/string_inplace.cpp
             ../core/utf8.cpp
     )
     add_definitions(-DSETTINGSGEN)
diff --git a/src/settingsgen/settingsgen.cpp b/src/settingsgen/settingsgen.cpp
index 5e20d2080b..9a082d62d9 100644
--- a/src/settingsgen/settingsgen.cpp
+++ b/src/settingsgen/settingsgen.cpp
@@ -8,14 +8,15 @@
 /** @file settingsgen.cpp Tool to create computer-readable settings. */
 
 #include "../stdafx.h"
+#include "../core/string_consumer.hpp"
 #include "../string_func.h"
 #include "../strings_type.h"
 #include "../misc/getoptdata.h"
 #include "../ini_type.h"
-#include "../core/mem_func.hpp"
 #include "../error_func.h"
 
 #include <filesystem>
+#include <fstream>
 
 #include "../safeguards.h"
 
@@ -47,11 +48,9 @@ public:
 	 * @param length Length of the text in bytes.
 	 * @return Number of bytes actually stored.
 	 */
-	size_t Add(const char *text, size_t length)
+	size_t Add(std::string_view text)
 	{
-		size_t store_size = std::min(length, OUTPUT_BLOCK_SIZE - this->size);
-		assert(store_size <= OUTPUT_BLOCK_SIZE);
-		MemCpyT(this->data + this->size, text, store_size);
+		size_t store_size = text.copy(this->data + this->size, OUTPUT_BLOCK_SIZE - this->size);
 		this->size += store_size;
 		return store_size;
 	}
@@ -96,24 +95,19 @@ public:
 
 	/**
 	 * Add text to the output storage.
-	 * @param text   Text to store.
-	 * @param length Length of the text in bytes, \c 0 means 'length of the string'.
+	 * @param text Text to store.
 	 */
-	void Add(const char *text, size_t length = 0)
+	void Add(std::string_view text)
 	{
-		if (length == 0) length = strlen(text);
-
-		if (length > 0 && this->BufferHasRoom()) {
-			size_t stored_size = this->output_buffer[this->output_buffer.size() - 1].Add(text, length);
-			length -= stored_size;
-			text += stored_size;
+		if (!text.empty() && this->BufferHasRoom()) {
+			size_t stored_size = this->output_buffer[this->output_buffer.size() - 1].Add(text);
+			text.remove_prefix(stored_size);
 		}
-		while (length > 0) {
+		while (!text.empty()) {
 			OutputBuffer &block = this->output_buffer.emplace_back();
 			block.Clear(); // Initialize the new block.
-			size_t stored_size = block.Add(text, length);
-			length -= stored_size;
-			text += stored_size;
+			size_t stored_size = block.Add(text);
+			text.remove_prefix(stored_size);
 		}
 	}
 
@@ -156,7 +150,7 @@ struct SettingsIniFile : IniLoadFile {
 	{
 	}
 
-	std::optional<FileHandle> OpenFile(const std::string &filename, Subdirectory, size_t *size) override
+	std::optional<FileHandle> OpenFile(std::string_view filename, Subdirectory, size_t *size) override
 	{
 		/* Open the text file in binary mode to prevent end-of-line translations
 		 * done by ftell() and friends, as defined by K&R. */
@@ -170,34 +164,34 @@ struct SettingsIniFile : IniLoadFile {
 		return in;
 	}
 
-	void ReportFileError(const char * const pre, const char * const buffer, const char * const post) override
+	void ReportFileError(std::string_view message) override
 	{
-		FatalError("{}{}{}", pre, buffer, post);
+		FatalError("{}", message);
 	}
 };
 
 OutputStore _stored_output; ///< Temporary storage of the output, until all processing is done.
 OutputStore _post_amble_output; ///< Similar to _stored_output, but for the post amble.
 
-static const char *PREAMBLE_GROUP_NAME  = "pre-amble"; ///< Name of the group containing the pre amble.
-static const char *POSTAMBLE_GROUP_NAME = "post-amble"; ///< Name of the group containing the post amble.
-static const char *TEMPLATES_GROUP_NAME = "templates"; ///< Name of the group containing the templates.
-static const char *VALIDATION_GROUP_NAME = "validation"; ///< Name of the group containing the validation statements.
-static const char *DEFAULTS_GROUP_NAME  = "defaults"; ///< Name of the group containing default values for the template variables.
+static const std::string_view PREAMBLE_GROUP_NAME  = "pre-amble"; ///< Name of the group containing the pre amble.
+static const std::string_view POSTAMBLE_GROUP_NAME = "post-amble"; ///< Name of the group containing the post amble.
+static const std::string_view TEMPLATES_GROUP_NAME = "templates"; ///< Name of the group containing the templates.
+static const std::string_view VALIDATION_GROUP_NAME = "validation"; ///< Name of the group containing the validation statements.
+static const std::string_view DEFAULTS_GROUP_NAME  = "defaults"; ///< Name of the group containing default values for the template variables.
 
 /**
  * Dump a #IGT_SEQUENCE group into #_stored_output.
  * @param ifile      Loaded INI data.
  * @param group_name Name of the group to copy.
  */
-static void DumpGroup(const IniLoadFile &ifile, const char * const group_name)
+static void DumpGroup(const IniLoadFile &ifile, std::string_view group_name)
 {
 	const IniGroup *grp = ifile.GetGroup(group_name);
 	if (grp != nullptr && grp->type == IGT_SEQUENCE) {
 		for (const IniItem &item : grp->items) {
 			if (!item.name.empty()) {
-				_stored_output.Add(item.name.c_str());
-				_stored_output.Add("\n", 1);
+				_stored_output.Add(item.name);
+				_stored_output.Add("\n");
 			}
 		}
 	}
@@ -208,14 +202,14 @@ static void DumpGroup(const IniLoadFile &ifile, const char * const group_name)
  * @param name Name of the item to find.
  * @param grp  Group currently being expanded (searched first).
  * @param defaults Fallback group to search, \c nullptr skips the search.
- * @return Text of the item if found, else \c nullptr.
+ * @return Text of the item if found, else \c std::nullopt.
  */
-static const char *FindItemValue(const char *name, const IniGroup *grp, const IniGroup *defaults)
+static std::optional<std::string_view> FindItemValue(std::string_view name, const IniGroup *grp, const IniGroup *defaults)
 {
 	const IniItem *item = grp->GetItem(name);
 	if (item == nullptr && defaults != nullptr) item = defaults->GetItem(name);
-	if (item == nullptr || !item->value.has_value()) return nullptr;
-	return item->value->c_str();
+	if (item == nullptr) return std::nullopt;
+	return item->value;
 }
 
 /**
@@ -227,58 +221,42 @@ static const char *FindItemValue(const char *name, const IniGroup *grp, const In
  */
 static void DumpLine(const IniItem *item, const IniGroup *grp, const IniGroup *default_grp, OutputStore &output)
 {
-	static const int MAX_VAR_LENGTH = 64;
-
 	/* Prefix with #if/#ifdef/#ifndef */
 	static const auto pp_lines = {"if", "ifdef", "ifndef"};
 	int count = 0;
 	for (const auto &name : pp_lines) {
-		const char *condition = FindItemValue(name, grp, default_grp);
-		if (condition != nullptr) {
-			output.Add("#", 1);
+		auto condition = FindItemValue(name, grp, default_grp);
+		if (condition.has_value()) {
+			output.Add("#");
 			output.Add(name);
-			output.Add(" ", 1);
-			output.Add(condition);
-			output.Add("\n", 1);
+			output.Add(" ");
+			output.Add(*condition);
+			output.Add("\n");
 			count++;
 		}
 	}
 
 	/* Output text of the template, except template variables of the form '$[_a-z0-9]+' which get replaced by their value. */
-	const char *txt = item->value->c_str();
-	while (*txt != '\0') {
-		if (*txt != '$') {
-			output.Add(txt, 1);
-			txt++;
-			continue;
-		}
-		txt++;
-		if (*txt == '$') { // Literal $
-			output.Add(txt, 1);
-			txt++;
+	static const std::string_view variable_name_characters = "_abcdefghijklmnopqrstuvwxyz0123456789";
+	StringConsumer consumer{*item->value};
+	while (consumer.AnyBytesLeft()) {
+		char c = consumer.ReadChar();
+		if (c != '$' || consumer.ReadIf("$")) {
+			/* No $ or $$ (literal $). */
+			output.Add(std::string_view{&c, 1});
 			continue;
 		}
 
-		/* Read variable. */
-		char variable[MAX_VAR_LENGTH];
-		int i = 0;
-		while (i < MAX_VAR_LENGTH - 1) {
-			if (!(txt[i] == '_' || (txt[i] >= 'a' && txt[i] <= 'z') || (txt[i] >= '0' && txt[i] <= '9'))) break;
-			variable[i] = txt[i];
-			i++;
-		}
-		variable[i] = '\0';
-		txt += i;
-
-		if (i > 0) {
+		std::string_view variable = consumer.ReadUntilCharNotIn(variable_name_characters);
+		if (!variable.empty()) {
 			/* Find the text to output. */
-			const char *valitem = FindItemValue(variable, grp, default_grp);
-			if (valitem != nullptr) output.Add(valitem);
+			auto valitem = FindItemValue(variable, grp, default_grp);
+			if (valitem.has_value()) output.Add(*valitem);
 		} else {
-			output.Add("$", 1);
+			output.Add("$");
 		}
 	}
-	output.Add("\n", 1); // \n after the expanded template.
+	output.Add("\n"); // \n after the expanded template.
 	while (count > 0) {
 		output.Add("#endif\n");
 		count--;
@@ -323,13 +301,13 @@ static void DumpSections(const IniLoadFile &ifile)
  * @param fname Filename of file to append.
  * @param out_fp Output stream to write to.
  */
-static void AppendFile(const char *fname, FILE *out_fp)
+static void AppendFile(std::optional<std::string_view> fname, FILE *out_fp)
 {
-	if (fname == nullptr) return;
+	if (!fname.has_value()) return;
 
-	auto in_fp = FileHandle::Open(fname, "r");
+	auto in_fp = FileHandle::Open(*fname, "r");
 	if (!in_fp.has_value()) {
-		FatalError("Cannot open file {} for copying", fname);
+		FatalError("Cannot open file {} for copying", *fname);
 	}
 
 	char buffer[4096];
@@ -348,29 +326,18 @@ static void AppendFile(const char *fname, FILE *out_fp)
  * @param n2 Second file.
  * @return True if both files are identical.
  */
-static bool CompareFiles(const char *n1, const char *n2)
+static bool CompareFiles(std::filesystem::path path1, std::filesystem::path path2)
 {
-	auto f2 = FileHandle::Open(n2, "rb");
-	if (!f2.has_value()) return false;
+	/* Check for equal size, but ignore the error code for cases when a file does not exist. */
+	std::error_code error_code;
+	if (std::filesystem::file_size(path1, error_code) != std::filesystem::file_size(path2, error_code)) return false;
 
-	auto f1 = FileHandle::Open(n1, "rb");
-	if (!f1.has_value()) {
-		FatalError("can't open {}", n1);
-	}
+	std::ifstream stream1(path1, std::ifstream::binary);
+	std::ifstream stream2(path2, std::ifstream::binary);
 
-	size_t l1, l2;
-	do {
-		char b1[4096];
-		char b2[4096];
-		l1 = fread(b1, 1, sizeof(b1), *f1);
-		l2 = fread(b2, 1, sizeof(b2), *f2);
-
-		if (l1 != l2 || memcmp(b1, b2, l1) != 0) {
-			return false;
-		}
-	} while (l1 != 0);
-
-	return true;
+	return std::equal(std::istreambuf_iterator<char>(stream1.rdbuf()),
+			std::istreambuf_iterator<char>(),
+			std::istreambuf_iterator<char>(stream2.rdbuf()));
 }
 
 /** Options of settingsgen. */
@@ -402,7 +369,7 @@ static const OptionData _opts[] = {
  *
  * @param fname  Ini file to process. @return Exit status of the processing.
  */
-static void ProcessIniFile(const char *fname)
+static void ProcessIniFile(std::string_view fname)
 {
 	static const IniLoadFile::IniGroupNameList seq_groups = {PREAMBLE_GROUP_NAME, POSTAMBLE_GROUP_NAME};
 
@@ -421,11 +388,13 @@ static void ProcessIniFile(const char *fname)
  */
 int CDECL main(int argc, char *argv[])
 {
-	const char *output_file = nullptr;
-	const char *before_file = nullptr;
-	const char *after_file = nullptr;
+	std::optional<std::string_view> output_file;
+	std::optional<std::string_view> before_file;
+	std::optional<std::string_view> after_file;
 
-	GetOptData mgo(std::span(argv + 1, argc - 1), _opts);
+	std::vector<std::string_view> params;
+	for (int i = 1; i < argc; ++i) params.emplace_back(argv[i]);
+	GetOptData mgo(params, _opts);
 	for (;;) {
 		int i = mgo.GetOpt();
 		if (i == -1) break;
@@ -465,13 +434,13 @@ int CDECL main(int argc, char *argv[])
 	for (auto &argument : mgo.arguments) ProcessIniFile(argument);
 
 	/* Write output. */
-	if (output_file == nullptr) {
+	if (!output_file.has_value()) {
 		AppendFile(before_file, stdout);
 		_stored_output.Write(stdout);
 		_post_amble_output.Write(stdout);
 		AppendFile(after_file, stdout);
 	} else {
-		static const char * const tmp_output = "tmp2.xxx";
+		static const std::string_view tmp_output = "tmp2.xxx";
 
 		auto fp = FileHandle::Open(tmp_output, "w");
 		if (!fp.has_value()) {
@@ -484,13 +453,13 @@ int CDECL main(int argc, char *argv[])
 		fp.reset();
 
 		std::error_code error_code;
-		if (CompareFiles(tmp_output, output_file)) {
+		if (CompareFiles(tmp_output, *output_file)) {
 			/* Files are equal. tmp2.xxx is not needed. */
 			std::filesystem::remove(tmp_output, error_code);
 		} else {
 			/* Rename tmp2.xxx to output file. */
-			std::filesystem::rename(tmp_output, output_file, error_code);
-			if (error_code) FatalError("rename({}, {}) failed: {}", tmp_output, output_file, error_code.message());
+			std::filesystem::rename(tmp_output, *output_file, error_code);
+			if (error_code) FatalError("rename({}, {}) failed: {}", tmp_output, *output_file, error_code.message());
 		}
 	}
 	return 0;
@@ -502,9 +471,9 @@ int CDECL main(int argc, char *argv[])
  * @param mode Mode to open file.
  * @return FileHandle, or std::nullopt on failure.
  */
-std::optional<FileHandle> FileHandle::Open(const std::string &filename, const std::string &mode)
+std::optional<FileHandle> FileHandle::Open(const std::string &filename, std::string_view mode)
 {
-	auto f = fopen(filename.c_str(), mode.c_str());
+	auto f = fopen(filename.c_str(), std::string{mode}.c_str());
 	if (f == nullptr) return std::nullopt;
 	return FileHandle(f);
 }
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index badc781ab0..956d730252 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -83,7 +83,7 @@ static void GetShipIcon(EngineID engine, EngineImageType image_type, VehicleSpri
 	const Engine *e = Engine::Get(engine);
 	uint8_t spritenum = e->u.ship.image_index;
 
-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleIcon(engine, DIR_W, image_type, result);
 		if (result->IsValid()) return;
 
@@ -137,7 +137,7 @@ void Ship::GetImage(Direction direction, EngineImageType image_type, VehicleSpri
 
 	if (image_type == EIT_ON_MAP) direction = this->rotation;
 
-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleSprite(this, direction, image_type, result);
 		if (result->IsValid()) return;
 
@@ -168,7 +168,7 @@ static const Depot *FindClosestShipDepot(const Vehicle *v, uint max_distance)
 		patches_to_search.pop_front();
 
 		/* Add neighbours of the current patch to the search queue. */
-		TVisitWaterRegionPatchCallBack visit_func = [&](const WaterRegionPatchDesc &water_region_patch) {
+		VisitWaterRegionPatchCallback visit_func = [&](const WaterRegionPatchDesc &water_region_patch) {
 			/* Note that we check the max distance per axis, not the total distance. */
 			if (std::abs(water_region_patch.x - start_patch.x) > max_region_distance ||
 					std::abs(water_region_patch.y - start_patch.y) > max_region_distance) return;
@@ -359,14 +359,6 @@ void Ship::UpdateDeltaXY()
 	}
 }
 
-/**
- * Test-procedure for HasVehicleOnPos to check for any ships which are moving.
- */
-static Vehicle *EnsureNoMovingShipProc(Vehicle *v, void *)
-{
-	return v->type == VEH_SHIP && v->cur_speed != 0 ? v : nullptr;
-}
-
 static bool CheckReverseShip(const Ship *v, Trackdir *trackdir = nullptr)
 {
 	/* Ask pathfinder for best direction */
@@ -392,7 +384,9 @@ static bool CheckShipLeaveDepot(Ship *v)
 
 	/* Don't leave depot if another vehicle is already entering/leaving */
 	/* This helps avoid CPU load if many ships are set to start at the same time */
-	if (HasVehicleOnPos(v->tile, nullptr, &EnsureNoMovingShipProc)) return true;
+	if (HasVehicleOnTile(v->tile, [](const Vehicle *u) {
+			return u->type == VEH_SHIP && u->cur_speed != 0;
+		})) return true;
 
 	TileIndex tile = v->tile;
 	Axis axis = GetShipDepotAxis(tile);
@@ -549,7 +543,7 @@ struct ShipSubcoordData {
  * so each Diagdir sub-array will have three valid and three invalid structures per Track.
  */
 static const ShipSubcoordData _ship_subcoord[DIAGDIR_END][TRACK_END] = {
-	// DIAGDIR_NE
+	/* DIAGDIR_NE */
 	{
 		{15,  8, DIR_NE},      // TRACK_X
 		{ 0,  0, INVALID_DIR}, // TRACK_Y
@@ -558,7 +552,7 @@ static const ShipSubcoordData _ship_subcoord[DIAGDIR_END][TRACK_END] = {
 		{15,  7, DIR_N},       // TRACK_LEFT
 		{ 0,  0, INVALID_DIR}, // TRACK_RIGHT
 	},
-	// DIAGDIR_SE
+	/* DIAGDIR_SE */
 	{
 		{ 0,  0, INVALID_DIR}, // TRACK_X
 		{ 8,  0, DIR_SE},      // TRACK_Y
@@ -567,7 +561,7 @@ static const ShipSubcoordData _ship_subcoord[DIAGDIR_END][TRACK_END] = {
 		{ 8,  0, DIR_S},       // TRACK_LEFT
 		{ 0,  0, INVALID_DIR}, // TRACK_RIGHT
 	},
-	// DIAGDIR_SW
+	/* DIAGDIR_SW */
 	{
 		{ 0,  8, DIR_SW},      // TRACK_X
 		{ 0,  0, INVALID_DIR}, // TRACK_Y
@@ -576,7 +570,7 @@ static const ShipSubcoordData _ship_subcoord[DIAGDIR_END][TRACK_END] = {
 		{ 0,  0, INVALID_DIR}, // TRACK_LEFT
 		{ 0,  8, DIR_S},       // TRACK_RIGHT
 	},
-	// DIAGDIR_NW
+	/* DIAGDIR_NW */
 	{
 		{ 0,  0, INVALID_DIR}, // TRACK_X
 		{ 8, 15, DIR_NW},      // TRACK_Y
@@ -742,8 +736,8 @@ static void ShipController(Ship *v)
 					gp.y = v->y_pos;
 				} else {
 					/* Not inside depot */
-					const VehicleEnterTileStatus r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
-					if (HasBit(r, VETS_CANNOT_ENTER)) return ReverseShip(v);
+					auto vets = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
+					if (vets.Test(VehicleEnterTileState::CannotEnter)) return ReverseShip(v);
 
 					/* A leave station order only needs one tick to get processed, so we can
 					 * always skip ahead. */
@@ -810,10 +804,10 @@ static void ShipController(Ship *v)
 				gp.y = (gp.y & ~0xF) | b.y_subcoord;
 
 				/* Call the landscape function and tell it that the vehicle entered the tile */
-				const VehicleEnterTileStatus r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
-				if (HasBit(r, VETS_CANNOT_ENTER)) return ReverseShip(v);
+				auto vets = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
+				if (vets.Test(VehicleEnterTileState::CannotEnter)) return ReverseShip(v);
 
-				if (!HasBit(r, VETS_ENTERED_WORMHOLE)) {
+				if (!vets.Test(VehicleEnterTileState::EnteredWormhole)) {
 					v->tile = gp.new_tile;
 					v->state = TrackToTrackBits(track);
 
@@ -843,7 +837,7 @@ static void ShipController(Ship *v)
 			}
 		} else {
 			/* On a bridge */
-			if (!IsTileType(gp.new_tile, MP_TUNNELBRIDGE) || !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
+			if (!IsTileType(gp.new_tile, MP_TUNNELBRIDGE) || !VehicleEnterTile(v, gp.new_tile, gp.x, gp.y).Test(VehicleEnterTileState::EnteredWormhole)) {
 				v->x_pos = gp.x;
 				v->y_pos = gp.y;
 				v->UpdatePosition();
diff --git a/src/ship_gui.cpp b/src/ship_gui.cpp
index 7edccb0be6..7bdedb82dc 100644
--- a/src/ship_gui.cpp
+++ b/src/ship_gui.cpp
@@ -41,7 +41,7 @@ void DrawShipImage(const Vehicle *v, const Rect &r, VehicleID selection, EngineI
 	int x_offs = UnScaleGUI(rect.left);
 	int x = rtl ? r.right - width - x_offs : r.left - x_offs;
 	/* This magic -1 offset is related to the sprite_y_offsets in build_vehicle_gui.cpp */
-	int y = ScaleSpriteTrad(-1) + CenterBounds(r.top, r.bottom, 0);
+	int y = ScaleSpriteTrad(-1) + CentreBounds(r.top, r.bottom, 0);
 
 	seq.Draw(x, y, GetVehiclePalette(v), false);
 	if (v->cargo_cap > 0) DrawCargoIconOverlay(x, y, v->cargo_type);
diff --git a/src/signal.cpp b/src/signal.cpp
index b88ca97161..c9a1d7d017 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -52,9 +52,9 @@ static const TrackdirBits _enterdir_to_trackdirbits[DIAGDIR_END] = {
 template <typename Tdir, uint items>
 struct SmallSet {
 private:
-	uint n;           // actual number of units
-	bool overflowed;  // did we try to overflow the set?
-	const char *name; // name, used for debugging purposes...
+	uint n = 0; // actual number of units
+	bool overflowed = false; // did we try to overflow the set?
+	const std::string_view name; // name, used for debugging purposes...
 
 	/** Element of set */
 	struct SSdata {
@@ -64,7 +64,7 @@ private:
 
 public:
 	/** Constructor - just set default values and 'name' */
-	SmallSet(const char *name) : n(0), overflowed(false), name(name) { }
+	SmallSet(std::string_view name) : name(name) { }
 
 	/** Reset variables to default values */
 	void Reset()
@@ -189,11 +189,9 @@ static SmallSet<DiagDirection, SIG_GLOB_SIZE> _globset("_globset"); ///< set of
 
 
 /** Check whether there is a train on rail, not in a depot */
-static Vehicle *TrainOnTileEnum(Vehicle *v, void *)
+static bool IsTrainAndNotInDepot(const Vehicle *v)
 {
-	if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return nullptr;
-
-	return v;
+	return v->type == VEH_TRAIN && Train::From(v)->track != TRACK_BIT_DEPOT;
 }
 
 
@@ -280,13 +278,13 @@ static SigFlags ExploreSegment(Owner owner)
 
 				if (IsRailDepot(tile)) {
 					if (enterdir == INVALID_DIAGDIR) { // from 'inside' - train just entered or left the depot
-						if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+						if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 						exitdir = GetRailDepotDirection(tile);
 						tile += TileOffsByDiagDir(exitdir);
 						enterdir = ReverseDiagDir(exitdir);
 						break;
 					} else if (enterdir == GetRailDepotDirection(tile)) { // entered a depot
-						if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+						if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 						continue;
 					} else {
 						continue;
@@ -303,7 +301,7 @@ static SigFlags ExploreSegment(Owner owner)
 					if (!flags.Test(SigFlag::Train) && EnsureNoTrainOnTrackBits(tile, tracks).Failed()) flags. Set(SigFlag::Train);
 				} else {
 					if (tracks_masked == TRACK_BIT_NONE) continue; // no incidating track
-					if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+					if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 				}
 
 				/* Is this a track merge or split? */
@@ -358,7 +356,7 @@ static SigFlags ExploreSegment(Owner owner)
 				if (DiagDirToAxis(enterdir) != GetRailStationAxis(tile)) continue; // different axis
 				if (IsStationTileBlocked(tile)) continue; // 'eye-candy' station tile
 
-				if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+				if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 				tile += TileOffsByDiagDir(exitdir);
 				break;
 
@@ -367,7 +365,7 @@ static SigFlags ExploreSegment(Owner owner)
 				if (GetTileOwner(tile) != owner) continue;
 				if (DiagDirToAxis(enterdir) == GetCrossingRoadAxis(tile)) continue; // different axis
 
-				if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+				if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 				tile += TileOffsByDiagDir(exitdir);
 				break;
 
@@ -377,13 +375,13 @@ static SigFlags ExploreSegment(Owner owner)
 				DiagDirection dir = GetTunnelBridgeDirection(tile);
 
 				if (enterdir == INVALID_DIAGDIR) { // incoming from the wormhole
-					if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+					if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 					enterdir = dir;
 					exitdir = ReverseDiagDir(dir);
 					tile += TileOffsByDiagDir(exitdir); // just skip to next tile
 				} else { // NOT incoming from the wormhole!
 					if (ReverseDiagDir(enterdir) != dir) continue;
-					if (!flags.Test(SigFlag::Train) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags.Set(SigFlag::Train);
+					if (!flags.Test(SigFlag::Train) && HasVehicleOnTile(tile, IsTrainAndNotInDepot)) flags.Set(SigFlag::Train);
 					tile = GetOtherTunnelBridgeEnd(tile); // just skip to exit tile
 					enterdir = INVALID_DIAGDIR;
 					exitdir = INVALID_DIAGDIR;
diff --git a/src/signature.cpp b/src/signature.cpp
index 6009024059..91c8e3bff3 100644
--- a/src/signature.cpp
+++ b/src/signature.cpp
@@ -241,7 +241,7 @@ static bool _ValidateSignatureFile(const std::string &filename)
 		return false;
 	}
 
-	std::string dirname = FS2OTTD(std::filesystem::path(OTTD2FS(filename)).parent_path());
+	std::string dirname = FS2OTTD(std::filesystem::path(OTTD2FS(filename)).parent_path().native());
 
 	for (auto &signature : signatures["files"]) {
 		const std::string sig_filename = dirname + PATHSEPCHAR + signature["filename"].get<std::string>();
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index bcccad2cd4..37b0ccebab 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -132,11 +132,6 @@ struct SignList {
 bool SignList::match_case = false;
 std::string SignList::default_name;
 
-/** Enum referring to the Hotkeys in the sign list window */
-enum SignListHotkeys : int32_t {
-	SLHK_FOCUS_FILTER_BOX, ///< Focus the edit box for editing the filter string
-};
-
 struct SignListWindow : Window, SignList {
 	QueryString filter_editbox; ///< Filter editbox;
 	int text_offset = 0; ///< Offset of the sign text relative to the left edge of the WID_SIL_LIST widget.
@@ -177,7 +172,7 @@ struct SignListWindow : Window, SignList {
 	 * new string is zero-length or not the clear button is made
 	 * disabled/enabled. The sign list is updated according to the new filter.
 	 */
-	void SetFilterString(const char *new_filter_string)
+	void SetFilterString(std::string_view new_filter_string)
 	{
 		/* check if there is a new filter string */
 		this->string_filter.SetFilterTerm(new_filter_string);
@@ -263,7 +258,7 @@ struct SignListWindow : Window, SignList {
 			case WID_SIL_LIST: {
 				Dimension spr_dim = GetSpriteSize(SPR_COMPANY_ICON);
 				this->text_offset = WidgetDimensions::scaled.frametext.left + spr_dim.width + 2; // 2 pixels space between icon and the sign text.
-				resize.height = std::max<uint>(GetCharacterHeight(FS_NORMAL), spr_dim.height + 2);
+				fill.height = resize.height = std::max<uint>(GetCharacterHeight(FS_NORMAL), spr_dim.height + 2);
 				Dimension d = {(uint)(this->text_offset + WidgetDimensions::scaled.frametext.right), padding.height + 5 * resize.height};
 				size = maxdim(size, d);
 				break;
@@ -277,21 +272,6 @@ struct SignListWindow : Window, SignList {
 		}
 	}
 
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case SLHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_SIL_FILTER_TEXT);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				break;
-
-			default:
-				return ES_NOT_HANDLED;
-		}
-
-		return ES_HANDLED;
-	}
-
 	void OnEditboxChanged(WidgetID widget) override
 	{
 		if (widget == WID_SIL_FILTER_TEXT) this->SetFilterString(this->filter_editbox.text.GetText());
@@ -308,7 +288,7 @@ struct SignListWindow : Window, SignList {
 	}
 
 	/** Resort the sign listing on a regular interval. */
-	IntervalTimer<TimerWindow> rebuild_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> rebuild_interval = {std::chrono::seconds(3), [this](auto) {
 		this->BuildSortSignList();
 		this->SetDirty();
 	}};
@@ -345,7 +325,7 @@ struct SignListWindow : Window, SignList {
 	}
 
 	static inline HotkeyList hotkeys{"signlist", {
-		Hotkey('F', "focus_filter_box", SLHK_FOCUS_FILTER_BOX),
+		Hotkey('F', "focus_filter_box", WID_SIL_FILTER_TEXT),
 	}, SignListGlobalHotkeys};
 };
 
@@ -400,10 +380,10 @@ Window *ShowSignList()
  * @param text  the new name.
  * @return true if the window will already be removed after returning.
  */
-static bool RenameSign(SignID index, const char *text)
+static bool RenameSign(SignID index, std::string_view text)
 {
-	bool remove = StrEmpty(text);
-	Command<CMD_RENAME_SIGN>::Post(StrEmpty(text) ? STR_ERROR_CAN_T_DELETE_SIGN : STR_ERROR_CAN_T_CHANGE_SIGN_NAME, index, text);
+	bool remove = text.empty();
+	Command<CMD_RENAME_SIGN>::Post(remove ? STR_ERROR_CAN_T_DELETE_SIGN : STR_ERROR_CAN_T_CHANGE_SIGN_NAME, index, std::string{text});
 	return remove;
 }
 
@@ -544,7 +524,7 @@ static constexpr NWidgetPart _nested_query_sign_edit_widgets[] = {
 };
 
 static WindowDesc _query_sign_edit_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
 	WindowDefaultFlag::Construction,
 	_nested_query_sign_edit_widgets
diff --git a/src/signs_type.h b/src/signs_type.h
index ff298611f6..ff95f5868e 100644
--- a/src/signs_type.h
+++ b/src/signs_type.h
@@ -10,6 +10,8 @@
 #ifndef SIGNS_TYPE_H
 #define SIGNS_TYPE_H
 
+#include "core/pool_type.hpp"
+
 /** The type of the IDs of signs. */
 using SignID = PoolID<uint16_t, struct SignIDTag, 64000, 0xFFFF>;
 
diff --git a/src/slider.cpp b/src/slider.cpp
index c5dd1c15ea..32b8223cdc 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -22,13 +22,16 @@ static const int SLIDER_WIDTH = 3;
 /**
  * Draw a slider widget with knob at given value
  * @param r Rectangle to draw the widget in
+ * @param wedge_colour Colour to draw wedge.
+ * @param handle_colour Colour to draw handle.
+ * @param text_colour Colour of text.
  * @param min_value Minimum value of slider
  * @param max_value Maximum value of slider
  * @param nmarks Number of marks to display (when mark_func is provided.)
  * @param value Value to put the slider at
  * @param mark_func Callback function to get the StringID to draw on a mark.
  */
-void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func)
+void DrawSliderWidget(Rect r, Colours wedge_colour, Colours handle_colour, TextColour text_colour, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func)
 {
 	/* Allow space for labels. We assume they are in the small font. */
 	if (mark_func != nullptr) r.bottom -= GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.hsep_normal;
@@ -42,9 +45,9 @@ void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int valu
 	int wx1 = r.left  + sw / 2;
 	int wx2 = r.right - sw / 2;
 	if (_current_text_dir == TD_RTL) std::swap(wx1, wx2);
-	const uint shadow = GetColourGradient(COLOUR_GREY, SHADE_DARK);
-	const uint fill = GetColourGradient(COLOUR_GREY, SHADE_LIGHTER);
-	const uint light = GetColourGradient(COLOUR_GREY, SHADE_LIGHTEST);
+	const uint shadow = GetColourGradient(wedge_colour, SHADE_DARK);
+	const uint fill = GetColourGradient(wedge_colour, SHADE_LIGHTER);
+	const uint light = GetColourGradient(wedge_colour, SHADE_LIGHTEST);
 	const std::array<Point, 3> wedge{ Point{wx1, r.bottom - ha}, Point{wx2, r.top + ha}, Point{wx2, r.bottom - ha} };
 	GfxFillPolygon(wedge, fill);
 	GfxDrawLine(wedge[0].x, wedge[0].y, wedge[2].x, wedge[2].y, light, t);
@@ -67,7 +70,7 @@ void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int valu
 
 			Dimension d = GetStringBoundingBox(*str, FS_SMALL);
 			x = Clamp(x - d.width / 2, r.left, r.right - d.width);
-			DrawString(x, x + d.width, r.bottom + 1 + WidgetDimensions::scaled.hsep_normal, *str, TC_BLACK, SA_CENTER, false, FS_SMALL);
+			DrawString(x, x + d.width, r.bottom + 1 + WidgetDimensions::scaled.hsep_normal, *str, text_colour, SA_CENTER, false, FS_SMALL);
 		}
 	}
 
@@ -75,7 +78,7 @@ void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int valu
 	value -= min_value;
 	if (_current_text_dir == TD_RTL) value = max_value - value;
 	x = r.left + (value * (r.right - r.left - sw) / max_value);
-	DrawFrameRect(x, r.top, x + sw, r.bottom, COLOUR_GREY, {});
+	DrawFrameRect(x, r.top, x + sw, r.bottom, handle_colour, {});
 }
 
 /**
diff --git a/src/slider_func.h b/src/slider_func.h
index c4938644db..575c36945e 100644
--- a/src/slider_func.h
+++ b/src/slider_func.h
@@ -11,10 +11,10 @@
 #define SLIDER_TYPE_H
 
 #include "core/geometry_type.hpp"
-#include "strings_type.h"
+#include "gfx_type.h"
 
 using SliderMarkFunc = std::optional<std::string>(int nmarks, int mark, int value);
-void DrawSliderWidget(Rect r, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func);
+void DrawSliderWidget(Rect r, Colours wedge_colour, Colours handle_colour, TextColour text_colour, int min_value, int max_value, int nmarks, int value, SliderMarkFunc *mark_func);
 bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int nmarks, int &value);
 
 inline bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int nmarks, uint8_t &value)
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index e73183481e..827b654fe9 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -55,7 +55,7 @@ struct LegendAndColour {
 };
 
 /** Link stat colours shown in legenda. */
-static uint8_t _linkstat_colours_in_legenda[] = {0, 1, 3, 5, 7, 9, 11};
+static const uint8_t _linkstat_colours_in_legenda[] = {0, 1, 3, 5, 7, 9, 11};
 
 static const int NUM_NO_COMPANY_ENTRIES = 4; ///< Number of entries in the owner legend that are not companies.
 
@@ -181,7 +181,7 @@ static IndustryType _smallmap_industry_highlight = IT_INVALID;
 /** State of highlight blinking */
 static bool _smallmap_industry_highlight_state;
 /** For connecting company ID to position in owner list (small map legend) */
-static ReferenceThroughBaseContainer<std::array<uint32_t, MAX_COMPANIES>> _company_to_list_pos;
+static TypedIndexContainer<std::array<uint32_t, MAX_COMPANIES>, CompanyID> _company_to_list_pos;
 
 /**
  * Fills an array for the industries legends.
@@ -552,7 +552,7 @@ static inline uint32_t GetSmallMapVegetationPixels(TileIndex tile, TileType t)
 				if (GetClearDensity(tile) < 3) return MKCOLOUR_XXXX(PC_BARE_LAND);
 				if (GetTropicZone(tile) == TROPICZONE_RAINFOREST) return MKCOLOUR_XXXX(PC_RAINFOREST);
 			}
-			return _vegetation_clear_bits[GetClearGround(tile)];
+			return _vegetation_clear_bits[IsSnowTile(tile) ? CLEAR_SNOW : GetClearGround(tile)];
 
 		case MP_INDUSTRY:
 			return IsTileForestIndustry(tile) ? MKCOLOUR_XXXX(PC_GREEN) : MKCOLOUR_XXXX(PC_DARK_RED);
@@ -730,12 +730,12 @@ protected:
 	}
 
 	/** Blink the industries (if selected) on a regular interval. */
-	IntervalTimer<TimerWindow> blink_interval = {std::chrono::milliseconds(450), [this](auto) {
+	const IntervalTimer<TimerWindow> blink_interval = {TIMER_BLINK_INTERVAL, [this](auto) {
 		Blink();
 	}};
 
 	/** Update the whole map on a regular interval. */
-	IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(930), [this](auto) {
+	const IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(930), [this](auto) {
 		ForceRefresh();
 	}};
 
@@ -1495,8 +1495,8 @@ public:
 	 */
 	Point GetStationMiddle(const Station *st) const
 	{
-		int x = CenterBounds(st->rect.left, st->rect.right, 0);
-		int y = CenterBounds(st->rect.top, st->rect.bottom, 0);
+		int x = CentreBounds(st->rect.left, st->rect.right, 0);
+		int y = CentreBounds(st->rect.top, st->rect.bottom, 0);
 		Point ret = this->RemapTile(x, y);
 
 		/* Same magic 3 as in DrawVehicles; that's where I got it from.
@@ -1857,16 +1857,15 @@ public:
 		return true;
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_SM_MAP) return;
 		if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
 			const NWidgetBase *wid = this->GetWidget<NWidgetBase>(WID_SM_MAP);
 			int cursor_x = _cursor.pos.x - this->left - wid->pos_x;
 			int cursor_y = _cursor.pos.y - this->top  - wid->pos_y;
-			if (IsInsideMM(cursor_x, 0, wid->current_x) && IsInsideMM(cursor_y, 0, wid->current_y)) {
-				Point pt = {cursor_x, cursor_y};
-				this->SetZoomLevel((wheel < 0) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &pt);
-			}
+			Point pt = {cursor_x, cursor_y};
+			this->SetZoomLevel((wheel < 0) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &pt);
 		}
 	}
 
diff --git a/src/social_integration.cpp b/src/social_integration.cpp
index 4222a8d669..887335c22b 100644
--- a/src/social_integration.cpp
+++ b/src/social_integration.cpp
@@ -28,7 +28,7 @@ class InternalSocialIntegrationPlugin {
 public:
 	InternalSocialIntegrationPlugin(const std::string &filename, const std::string &basepath) : library(nullptr), external(basepath)
 	{
-		openttd_info.openttd_version = _openttd_revision;
+		openttd_info.openttd_version = _openttd_revision.c_str();
 
 		if (!ValidateSignatureFile(fmt::format("{}.sig", filename))) {
 			external.state = SocialIntegrationPlugin::INVALID_SIGNATURE;
diff --git a/src/sortlist_type.h b/src/sortlist_type.h
index 68fad3fffc..9ac1eebb47 100644
--- a/src/sortlist_type.h
+++ b/src/sortlist_type.h
@@ -39,7 +39,7 @@ struct Filtering {
  * @tparam P Tyoe of data passed as additional parameter to the sort function.
  * @tparam F Type of data fed as additional value to the filter function. @see FilterFunction
  */
-template <typename T, typename P = std::nullptr_t, typename F = const char*>
+template <typename T, typename P = std::nullptr_t, typename F = std::string_view>
 class GUIList : public std::vector<T> {
 public:
 	using SortFunction = std::conditional_t<std::is_same_v<P, std::nullptr_t>, bool (const T&, const T&), bool (const T&, const T&, const P)>; ///< Signature of sort function.
diff --git a/src/sound.cpp b/src/sound.cpp
index 7f72c64959..c56ff5cd91 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -122,7 +122,7 @@ static void StartSound(SoundID sound_id, float pan, uint volume)
 
 
 static const uint8_t _vol_factor_by_zoom[] = {255, 255, 255, 190, 134, 87};
-static_assert(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END);
+static_assert(lengthof(_vol_factor_by_zoom) == to_underlying(ZoomLevel::End));
 
 static const uint8_t _sound_base_vol[] = {
 	128,  90, 128, 128, 128, 128, 128, 128,
@@ -215,7 +215,7 @@ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, in
 			StartSound(
 				sound,
 				panning,
-				_vol_factor_by_zoom[vp.zoom]
+				_vol_factor_by_zoom[to_underlying(vp.zoom)]
 			);
 			return;
 		}
@@ -257,7 +257,7 @@ template <>
 }
 
 template <>
-/* static */ const char *BaseMedia<SoundsSet>::GetExtension()
+/* static */ std::string_view BaseMedia<SoundsSet>::GetExtension()
 {
 	return ".obs"; // OpenTTD Base Sounds
 }
@@ -268,7 +268,7 @@ template <>
 	if (BaseMedia<SoundsSet>::used_set != nullptr) return true;
 
 	const SoundsSet *best = nullptr;
-	for (const SoundsSet *c = BaseMedia<SoundsSet>::available_sets; c != nullptr; c = c->next) {
+	for (const auto &c : BaseMedia<SoundsSet>::available_sets) {
 		/* Skip unusable sets */
 		if (c->GetNumMissing() != 0) continue;
 
@@ -277,7 +277,7 @@ template <>
 				best->valid_files < c->valid_files ||
 				(best->valid_files == c->valid_files &&
 					(best->shortname == c->shortname && best->version < c->version))) {
-			best = c;
+			best = c.get();
 		}
 	}
 
diff --git a/src/sound/win32_s.cpp b/src/sound/win32_s.cpp
index 1bfc4e06ec..e94358d594 100644
--- a/src/sound/win32_s.cpp
+++ b/src/sound/win32_s.cpp
@@ -39,7 +39,7 @@ static void PrepareHeader(HeaderDataPair &hdr)
 	hdr.first.dwBufferLength = _bufsize * 4;
 	hdr.first.dwFlags = 0;
 	hdr.first.lpData = hdr.second.get();
-	if (waveOutPrepareHeader(_waveout, &hdr.first, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) throw "waveOutPrepareHeader failed";
+	if (waveOutPrepareHeader(_waveout, &hdr.first, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) throw "waveOutPrepareHeader failed"sv;
 }
 
 static DWORD WINAPI SoundThread(LPVOID)
@@ -76,16 +76,16 @@ std::optional<std::string_view> SoundDriver_Win32::Start(const StringList &parm)
 	_bufsize = std::min<int>(_bufsize, UINT16_MAX);
 
 	try {
-		if (nullptr == (_event = CreateEvent(nullptr, FALSE, FALSE, nullptr))) throw "Failed to create event";
+		if (nullptr == (_event = CreateEvent(nullptr, FALSE, FALSE, nullptr))) throw "Failed to create event"sv;
 
-		if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD_PTR)_event, 0, CALLBACK_EVENT) != MMSYSERR_NOERROR) throw "waveOutOpen failed";
+		if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD_PTR)_event, 0, CALLBACK_EVENT) != MMSYSERR_NOERROR) throw "waveOutOpen failed"sv;
 
 		MxInitialize(wfex.nSamplesPerSec);
 
 		for (auto &hdr : _wave_hdr) PrepareHeader(hdr);
 
-		if (nullptr == (_thread = CreateThread(nullptr, 8192, SoundThread, 0, 0, &_threadId))) throw "Failed to create thread";
-	} catch (const char *error) {
+		if (nullptr == (_thread = CreateThread(nullptr, 8192, SoundThread, 0, 0, &_threadId))) throw "Failed to create thread"sv;
+	} catch (std::string_view error) {
 		this->Stop();
 		return error;
 	}
diff --git a/src/sound/xaudio2_s.cpp b/src/sound/xaudio2_s.cpp
index 9f38939da5..0d565fcfc2 100644
--- a/src/sound/xaudio2_s.cpp
+++ b/src/sound/xaudio2_s.cpp
@@ -15,7 +15,7 @@
 #include "../core/bitmath_func.hpp"
 #include "../core/math_func.hpp"
 
-// Windows 8 SDK required for XAudio2
+/* Windows 8 SDK required for XAudio2 */
 #undef NTDDI_VERSION
 #undef _WIN32_WINNT
 
@@ -34,7 +34,7 @@ using Microsoft::WRL::ComPtr;
 #include "../os/windows/win32.h"
 #include "../safeguards.h"
 
-// Definition of the "XAudio2Create" call used to initialise XAudio2
+/* Definition of the "XAudio2Create" call used to initialise XAudio2 */
 typedef HRESULT(__stdcall *API_XAudio2Create)(_Outptr_ IXAudio2 **ppXAudio2, UINT32 Flags, XAUDIO2_PROCESSOR XAudio2Processor);
 
 static FSoundDriver_XAudio2 iFSoundDriver_XAudio2;
@@ -60,7 +60,7 @@ public:
 
 	HRESULT SubmitBuffer()
 	{
-		// Ensure we do have a valid voice
+		/* Ensure we do have a valid voice */
 		if (this->source_voice == nullptr) {
 			return E_FAIL;
 		}
@@ -159,7 +159,7 @@ std::optional<std::string_view> SoundDriver_XAudio2::Start(const StringList &par
 		return "Failed to load XAudio2 DLL";
 	}
 
-	// Create the XAudio engine
+	/* Create the XAudio engine */
 	hr = CreateXAudio(xAudio2Create);
 
 	if (FAILED(hr)) {
@@ -170,7 +170,7 @@ std::optional<std::string_view> SoundDriver_XAudio2::Start(const StringList &par
 		return "Failed to inititialise the XAudio2 engine";
 	}
 
-	// Create a mastering voice
+	/* Create a mastering voice */
 	hr = _xaudio2->CreateMasteringVoice(&_mastering_voice);
 
 	if (FAILED(hr)) {
@@ -182,7 +182,7 @@ std::optional<std::string_view> SoundDriver_XAudio2::Start(const StringList &par
 		return "Failed to create a mastering voice";
 	}
 
-	// Create a source voice to stream our audio
+	/* Create a source voice to stream our audio */
 	WAVEFORMATEX wfex;
 
 	wfex.wFormatTag = WAVE_FORMAT_PCM;
@@ -192,7 +192,7 @@ std::optional<std::string_view> SoundDriver_XAudio2::Start(const StringList &par
 	wfex.nBlockAlign = (wfex.nChannels * wfex.wBitsPerSample) / 8;
 	wfex.nAvgBytesPerSec = wfex.nSamplesPerSec * wfex.nBlockAlign;
 
-	// Limit buffer size to prevent overflows
+	/* Limit buffer size to prevent overflows */
 	int bufsize = GetDriverParamInt(parm, "samples", 1024);
 	bufsize = std::min<int>(bufsize, UINT16_MAX);
 
@@ -231,7 +231,7 @@ std::optional<std::string_view> SoundDriver_XAudio2::Start(const StringList &par
 
 	MxInitialize(wfex.nSamplesPerSec);
 
-	// Submit the first buffer
+	/* Submit the first buffer */
 	hr = _voice_context->SubmitBuffer();
 
 	if (FAILED(hr)) {
@@ -249,7 +249,7 @@ std::optional<std::string_view> SoundDriver_XAudio2::Start(const StringList &par
  */
 void SoundDriver_XAudio2::Stop()
 {
-	// Clean up XAudio2
+	/* Clean up XAudio2 */
 	_source_voice->DestroyVoice();
 
 	_voice_context = nullptr;
diff --git a/src/sound_type.h b/src/sound_type.h
index 8a2fa0140b..6c52ddc1cb 100644
--- a/src/sound_type.h
+++ b/src/sound_type.h
@@ -17,7 +17,7 @@ enum class SoundSource : uint8_t {
 };
 
 struct SoundEntry {
-	std::shared_ptr<std::vector<uint8_t>> data;
+	std::shared_ptr<std::vector<std::byte>> data;
 	class RandomAccessFile *file;
 	size_t file_offset;
 	size_t file_size;
diff --git a/src/soundloader.cpp b/src/soundloader.cpp
index 4503392cbf..96405435fb 100644
--- a/src/soundloader.cpp
+++ b/src/soundloader.cpp
@@ -26,7 +26,7 @@ bool LoadSoundData(SoundEntry &sound, bool new_format, SoundID sound_id, const s
 	if (sound.file_size == 0 || sound.file_size > SIZE_MAX - 2) return false;
 
 	size_t pos = sound.file->GetPos();
-	sound.data = std::make_shared<std::vector<uint8_t>>();
+	sound.data = std::make_shared<std::vector<std::byte>>();
 	for (auto &loader : ProviderManager<SoundLoader>::GetProviders()) {
 		sound.file->SeekTo(pos, SEEK_SET);
 		if (loader->Load(sound, new_format, *sound.data)) break;
diff --git a/src/soundloader_opus.cpp b/src/soundloader_opus.cpp
index 72efd806e9..5cf92c571c 100644
--- a/src/soundloader_opus.cpp
+++ b/src/soundloader_opus.cpp
@@ -8,6 +8,8 @@
 /** @file sound_opus.cpp Loading of opus sounds. */
 
 #include "stdafx.h"
+
+#include "misc/autorelease.hpp"
 #include "random_access_file_type.h"
 #include "sound_type.h"
 #include "soundloader_type.h"
@@ -32,7 +34,7 @@ public:
 	static constexpr size_t DECODE_BUFFER_SAMPLES = 5760 * 2;
 	static constexpr size_t DECODE_BUFFER_BYTES = DECODE_BUFFER_SAMPLES * sizeof(opus_int16);
 
-	bool Load(SoundEntry &sound, bool new_format, std::vector<uint8_t> &data) override
+	bool Load(SoundEntry &sound, bool new_format, std::vector<std::byte> &data) override
 	{
 		if (!new_format) return false;
 
@@ -51,7 +53,7 @@ public:
 		sound.file->ReadBlock(tmp.data(), tmp.size());
 
 		int error = 0;
-		auto of = std::unique_ptr<OggOpusFile, OggOpusFileDeleter>(op_open_memory(tmp.data(), tmp.size(), &error));
+		auto of = AutoRelease<OggOpusFile, op_free>(op_open_memory(tmp.data(), tmp.size(), &error));
 		if (error != 0) return false;
 
 		size_t datapos = 0;
@@ -81,15 +83,6 @@ public:
 
 		return true;
 	}
-
-private:
-	/** Helper class to RAII release an OggOpusFile. */
-	struct OggOpusFileDeleter {
-		void operator()(OggOpusFile *of)
-		{
-			if (of != nullptr) op_free(of);
-		}
-	};
 };
 
 static SoundLoader_Opus s_sound_loader_opus;
diff --git a/src/soundloader_raw.cpp b/src/soundloader_raw.cpp
index 7a5cea2edc..a1d71ed035 100644
--- a/src/soundloader_raw.cpp
+++ b/src/soundloader_raw.cpp
@@ -22,7 +22,7 @@ public:
 	static constexpr uint16_t RAW_SAMPLE_RATE = 11025; ///< Sample rate of raw pcm samples.
 	static constexpr uint8_t RAW_SAMPLE_BITS = 8; ///< Bit depths of raw pcm samples.
 
-	bool Load(SoundEntry &sound, bool new_format, std::vector<uint8_t> &data) override
+	bool Load(SoundEntry &sound, bool new_format, std::vector<std::byte> &data) override
 	{
 		/* Raw sounds are apecial case for the jackhammer sound (name in Windows sample.cat is "Corrupt sound")
 		 * It's not a RIFF file, but raw PCM data.
@@ -42,7 +42,7 @@ public:
 
 		/* Convert 8-bit samples from unsigned to signed. */
 		for (auto &sample : data) {
-			sample = sample - 128;
+			sample ^= std::byte{0x80};
 		}
 
 		return true;
diff --git a/src/soundloader_type.h b/src/soundloader_type.h
index 978a1b94b6..2f00cc8284 100644
--- a/src/soundloader_type.h
+++ b/src/soundloader_type.h
@@ -26,7 +26,7 @@ public:
 		ProviderManager<SoundLoader>::Unregister(*this);
 	}
 
-	virtual bool Load(SoundEntry &sound, bool new_format, std::vector<uint8_t> &data) = 0;
+	virtual bool Load(SoundEntry &sound, bool new_format, std::vector<std::byte> &data) = 0;
 };
 
 #endif /* SOUNDLOADER_TYPE_H */
diff --git a/src/soundloader_wav.cpp b/src/soundloader_wav.cpp
index 1f968ab884..d8d915cc6b 100644
--- a/src/soundloader_wav.cpp
+++ b/src/soundloader_wav.cpp
@@ -23,7 +23,7 @@ public:
 
 	static constexpr uint16_t DEFAULT_SAMPLE_RATE = 11025;
 
-	bool Load(SoundEntry &sound, bool new_format, std::vector<uint8_t> &data) override
+	bool Load(SoundEntry &sound, bool new_format, std::vector<std::byte> &data) override
 	{
 		RandomAccessFile &file = *sound.file;
 
@@ -71,7 +71,7 @@ public:
 					case 8:
 						/* Convert 8-bit samples from unsigned to signed. */
 						for (auto &sample : data) {
-							sample = sample - 128;
+							sample ^= std::byte{0x80};
 						}
 						break;
 
diff --git a/src/sprite.h b/src/sprite.h
index c9a89ce163..d02ffcad77 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -14,9 +14,6 @@
 
 #include "table/sprites.h"
 
-#define GENERAL_SPRITE_COLOUR(colour) ((colour) + PALETTE_RECOLOUR_START)
-#define COMPANY_SPRITE_COLOUR(owner) (GENERAL_SPRITE_COLOUR(_company_colours[owner]))
-
 /* The following describes bunch of sprites to be drawn together in a single 3D
  * bounding box. Used especially for various multi-sprite buildings (like
  * depots or stations): */
@@ -61,8 +58,7 @@ struct DrawTileSprites {
 struct DrawTileSpriteSpan : DrawTileSprites {
 	std::span<const DrawTileSeqStruct> seq; ///< Child sprites,
 
-	template <size_t N>
-	DrawTileSpriteSpan(PalSpriteID ground, const DrawTileSeqStruct (&seq)[N]) : DrawTileSprites(ground), seq(std::begin(seq), std::end(seq)) {}
+	DrawTileSpriteSpan(PalSpriteID ground, std::span<const DrawTileSeqStruct> seq) : DrawTileSprites(ground), seq(seq) {}
 	DrawTileSpriteSpan(PalSpriteID ground) : DrawTileSprites(ground) {};
 	DrawTileSpriteSpan() = default;
 
@@ -180,4 +176,11 @@ inline PaletteID GroundSpritePaletteTransform(SpriteID image, PaletteID pal, Pal
 	}
 }
 
+/**
+ * Get recolour palette for a colour.
+ * @param colour Colour.
+ * @return Recolour palette.
+ */
+static inline PaletteID GetColourPalette(Colours colour) { return PALETTE_RECOLOUR_START + colour; }
+
 #endif /* SPRITE_H */
diff --git a/src/spritecache.cpp b/src/spritecache.cpp
index a4eeb809ac..8997ef6749 100644
--- a/src/spritecache.cpp
+++ b/src/spritecache.cpp
@@ -19,7 +19,6 @@
 #include "settings_type.h"
 #include "blitter/factory.hpp"
 #include "core/math_func.hpp"
-#include "core/mem_func.hpp"
 #include "video/video_driver.hpp"
 #include "spritecache.h"
 #include "spritecache_internal.h"
@@ -221,23 +220,25 @@ SpriteID GetMaxSpriteID()
 
 static bool ResizeSpriteIn(SpriteLoader::SpriteCollection &sprite, ZoomLevel src, ZoomLevel tgt)
 {
-	uint8_t scaled_1 = ScaleByZoom(1, (ZoomLevel)(src - tgt));
+	uint8_t scaled_1 = AdjustByZoom(1, src - tgt);
+	const auto &src_sprite = sprite[src];
+	auto &dest_sprite = sprite[tgt];
 
 	/* Check for possible memory overflow. */
-	if (sprite[src].width * scaled_1 > UINT16_MAX || sprite[src].height * scaled_1 > UINT16_MAX) return false;
+	if (src_sprite.width * scaled_1 > UINT16_MAX || src_sprite.height * scaled_1 > UINT16_MAX) return false;
 
-	sprite[tgt].width  = sprite[src].width  * scaled_1;
-	sprite[tgt].height = sprite[src].height * scaled_1;
-	sprite[tgt].x_offs = sprite[src].x_offs * scaled_1;
-	sprite[tgt].y_offs = sprite[src].y_offs * scaled_1;
-	sprite[tgt].colours = sprite[src].colours;
+	dest_sprite.width = src_sprite.width * scaled_1;
+	dest_sprite.height = src_sprite.height * scaled_1;
+	dest_sprite.x_offs = src_sprite.x_offs * scaled_1;
+	dest_sprite.y_offs = src_sprite.y_offs * scaled_1;
+	dest_sprite.colours = src_sprite.colours;
 
-	sprite[tgt].AllocateData(tgt, static_cast<size_t>(sprite[tgt].width) * sprite[tgt].height);
+	dest_sprite.AllocateData(tgt, static_cast<size_t>(dest_sprite.width) * dest_sprite.height);
 
-	SpriteLoader::CommonPixel *dst = sprite[tgt].data;
-	for (int y = 0; y < sprite[tgt].height; y++) {
-		const SpriteLoader::CommonPixel *src_ln = &sprite[src].data[y / scaled_1 * sprite[src].width];
-		for (int x = 0; x < sprite[tgt].width; x++) {
+	SpriteLoader::CommonPixel *dst = dest_sprite.data;
+	for (int y = 0; y < dest_sprite.height; y++) {
+		const SpriteLoader::CommonPixel *src_ln = &src_sprite.data[y / scaled_1 * src_sprite.width];
+		for (int x = 0; x < dest_sprite.width; x++) {
 			*dst = src_ln[x / scaled_1];
 			dst++;
 		}
@@ -248,23 +249,27 @@ static bool ResizeSpriteIn(SpriteLoader::SpriteCollection &sprite, ZoomLevel src
 
 static void ResizeSpriteOut(SpriteLoader::SpriteCollection &sprite, ZoomLevel zoom)
 {
+	const auto &root_sprite = sprite.Root();
+	const auto &src_sprite = sprite[zoom - 1];
+	auto &dest_sprite = sprite[zoom];
+
 	/* Algorithm based on 32bpp_Optimized::ResizeSprite() */
-	sprite[zoom].width  = UnScaleByZoom(sprite[ZOOM_LVL_MIN].width,  zoom);
-	sprite[zoom].height = UnScaleByZoom(sprite[ZOOM_LVL_MIN].height, zoom);
-	sprite[zoom].x_offs = UnScaleByZoom(sprite[ZOOM_LVL_MIN].x_offs, zoom);
-	sprite[zoom].y_offs = UnScaleByZoom(sprite[ZOOM_LVL_MIN].y_offs, zoom);
-	sprite[zoom].colours = sprite[ZOOM_LVL_MIN].colours;
+	dest_sprite.width = UnScaleByZoom(root_sprite.width, zoom);
+	dest_sprite.height = UnScaleByZoom(root_sprite.height, zoom);
+	dest_sprite.x_offs = UnScaleByZoom(root_sprite.x_offs, zoom);
+	dest_sprite.y_offs = UnScaleByZoom(root_sprite.y_offs, zoom);
+	dest_sprite.colours = root_sprite.colours;
 
-	sprite[zoom].AllocateData(zoom, static_cast<size_t>(sprite[zoom].height) * sprite[zoom].width);
+	dest_sprite.AllocateData(zoom, static_cast<size_t>(dest_sprite.height) * dest_sprite.width);
 
-	SpriteLoader::CommonPixel *dst = sprite[zoom].data;
-	const SpriteLoader::CommonPixel *src = sprite[zoom - 1].data;
-	[[maybe_unused]] const SpriteLoader::CommonPixel *src_end = src + sprite[zoom - 1].height * sprite[zoom - 1].width;
+	SpriteLoader::CommonPixel *dst = dest_sprite.data;
+	const SpriteLoader::CommonPixel *src = src_sprite.data;
+	[[maybe_unused]] const SpriteLoader::CommonPixel *src_end = src + src_sprite.height * src_sprite.width;
 
-	for (uint y = 0; y < sprite[zoom].height; y++) {
-		const SpriteLoader::CommonPixel *src_ln = src + sprite[zoom - 1].width;
+	for (uint y = 0; y < dest_sprite.height; y++) {
+		const SpriteLoader::CommonPixel *src_ln = src + src_sprite.width;
 		assert(src_ln <= src_end);
-		for (uint x = 0; x < sprite[zoom].width; x++) {
+		for (uint x = 0; x < dest_sprite.width; x++) {
 			assert(src < src_ln);
 			if (src + 1 != src_ln && (src + 1)->a != 0) {
 				*dst = *(src + 1);
@@ -274,7 +279,7 @@ static void ResizeSpriteOut(SpriteLoader::SpriteCollection &sprite, ZoomLevel zo
 			dst++;
 			src += 2;
 		}
-		src = src_ln + sprite[zoom - 1].width;
+		src = src_ln + src_sprite.width;
 	}
 }
 
@@ -327,13 +332,13 @@ static bool PadSingleSprite(SpriteLoader::Sprite *sprite, ZoomLevel zoom, uint p
 	return true;
 }
 
-static bool PadSprites(SpriteLoader::SpriteCollection &sprite, uint8_t sprite_avail, SpriteEncoder *encoder)
+static bool PadSprites(SpriteLoader::SpriteCollection &sprite, ZoomLevels sprite_avail, SpriteEncoder *encoder)
 {
 	/* Get minimum top left corner coordinates. */
 	int min_xoffs = INT32_MAX;
 	int min_yoffs = INT32_MAX;
-	for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
-		if (HasBit(sprite_avail, zoom)) {
+	for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
+		if (sprite_avail.Test(zoom)) {
 			min_xoffs = std::min(min_xoffs, ScaleByZoom(sprite[zoom].x_offs, zoom));
 			min_yoffs = std::min(min_yoffs, ScaleByZoom(sprite[zoom].y_offs, zoom));
 		}
@@ -342,8 +347,8 @@ static bool PadSprites(SpriteLoader::SpriteCollection &sprite, uint8_t sprite_av
 	/* Get maximum dimensions taking necessary padding at the top left into account. */
 	int max_width  = INT32_MIN;
 	int max_height = INT32_MIN;
-	for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
-		if (HasBit(sprite_avail, zoom)) {
+	for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
+		if (sprite_avail.Test(zoom)) {
 			max_width  = std::max(max_width, ScaleByZoom(sprite[zoom].width + sprite[zoom].x_offs - UnScaleByZoom(min_xoffs, zoom), zoom));
 			max_height = std::max(max_height, ScaleByZoom(sprite[zoom].height + sprite[zoom].y_offs - UnScaleByZoom(min_yoffs, zoom), zoom));
 		}
@@ -357,17 +362,18 @@ static bool PadSprites(SpriteLoader::SpriteCollection &sprite, uint8_t sprite_av
 	}
 
 	/* Pad sprites where needed. */
-	for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
-		if (HasBit(sprite_avail, zoom)) {
+	for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
+		if (sprite_avail.Test(zoom)) {
+			auto &cur_sprite = sprite[zoom];
 			/* Scaling the sprite dimensions in the blitter is done with rounding up,
 			 * so a negative padding here is not an error. */
-			int pad_left   = std::max(0, sprite[zoom].x_offs - UnScaleByZoom(min_xoffs, zoom));
-			int pad_top    = std::max(0, sprite[zoom].y_offs - UnScaleByZoom(min_yoffs, zoom));
-			int pad_right  = std::max(0, UnScaleByZoom(max_width, zoom) - sprite[zoom].width - pad_left);
-			int pad_bottom = std::max(0, UnScaleByZoom(max_height, zoom) - sprite[zoom].height - pad_top);
+			int pad_left = std::max(0, cur_sprite.x_offs - UnScaleByZoom(min_xoffs, zoom));
+			int pad_top = std::max(0, cur_sprite.y_offs - UnScaleByZoom(min_yoffs, zoom));
+			int pad_right = std::max(0, UnScaleByZoom(max_width, zoom) - cur_sprite.width - pad_left);
+			int pad_bottom = std::max(0, UnScaleByZoom(max_height, zoom) - cur_sprite.height - pad_top);
 
 			if (pad_left > 0 || pad_right > 0 || pad_top > 0 || pad_bottom > 0) {
-				if (!PadSingleSprite(&sprite[zoom], zoom, pad_left, pad_top, pad_right, pad_bottom)) return false;
+				if (!PadSingleSprite(&cur_sprite, zoom, pad_left, pad_top, pad_right, pad_bottom)) return false;
 			}
 		}
 	}
@@ -375,38 +381,46 @@ static bool PadSprites(SpriteLoader::SpriteCollection &sprite, uint8_t sprite_av
 	return true;
 }
 
-static bool ResizeSprites(SpriteLoader::SpriteCollection &sprite, uint8_t sprite_avail, SpriteEncoder *encoder)
+static bool ResizeSprites(SpriteLoader::SpriteCollection &sprite, ZoomLevels sprite_avail, SpriteEncoder *encoder)
 {
 	/* Create a fully zoomed image if it does not exist */
-	ZoomLevel first_avail = static_cast<ZoomLevel>(FindFirstBit(sprite_avail));
-	if (first_avail != ZOOM_LVL_MIN) {
-		if (!ResizeSpriteIn(sprite, first_avail, ZOOM_LVL_MIN)) return false;
-		SetBit(sprite_avail, ZOOM_LVL_MIN);
+	ZoomLevel first_avail;
+	for (ZoomLevel zoom = ZoomLevel::Min; zoom <= ZoomLevel::Max; ++zoom) {
+		if (!sprite_avail.Test(zoom)) continue;
+		first_avail = zoom;
+		if (zoom != ZoomLevel::Min) {
+			if (!ResizeSpriteIn(sprite, zoom, ZoomLevel::Min)) return false;
+			sprite_avail.Set(ZoomLevel::Min);
+		}
+		break;
 	}
 
 	/* Pad sprites to make sizes match. */
 	if (!PadSprites(sprite, sprite_avail, encoder)) return false;
 
 	/* Create other missing zoom levels */
-	for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
-		if (zoom == ZOOM_LVL_MIN) continue;
+	for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
+		if (zoom == ZoomLevel::Min) continue;
 
-		if (HasBit(sprite_avail, zoom)) {
+		if (sprite_avail.Test(zoom)) {
 			/* Check that size and offsets match the fully zoomed image. */
-			assert(sprite[zoom].width  == UnScaleByZoom(sprite[ZOOM_LVL_MIN].width,  zoom));
-			assert(sprite[zoom].height == UnScaleByZoom(sprite[ZOOM_LVL_MIN].height, zoom));
-			assert(sprite[zoom].x_offs == UnScaleByZoom(sprite[ZOOM_LVL_MIN].x_offs, zoom));
-			assert(sprite[zoom].y_offs == UnScaleByZoom(sprite[ZOOM_LVL_MIN].y_offs, zoom));
+			[[maybe_unused]] const auto &root_sprite = sprite[ZoomLevel::Min];
+			[[maybe_unused]] const auto &dest_sprite = sprite[zoom];
+			assert(dest_sprite.width == UnScaleByZoom(root_sprite.width, zoom));
+			assert(dest_sprite.height == UnScaleByZoom(root_sprite.height, zoom));
+			assert(dest_sprite.x_offs == UnScaleByZoom(root_sprite.x_offs, zoom));
+			assert(dest_sprite.y_offs == UnScaleByZoom(root_sprite.y_offs, zoom));
+		} else {
+			/* Zoom level is not available, or unusable, so create it */
+			ResizeSpriteOut(sprite, zoom);
 		}
-
-		/* Zoom level is not available, or unusable, so create it */
-		if (!HasBit(sprite_avail, zoom)) ResizeSpriteOut(sprite, zoom);
 	}
 
-	/* Upscale to desired sprite_min_zoom if provided sprite only had zoomed in versions. */
+	/* Replace sprites with higher resolution than the desired maximum source resolution with scaled up sprites, if not already done. */
 	if (first_avail < _settings_client.gui.sprite_zoom_min) {
-		if (_settings_client.gui.sprite_zoom_min >= ZOOM_LVL_NORMAL) ResizeSpriteIn(sprite, ZOOM_LVL_NORMAL, ZOOM_LVL_IN_2X);
-		if (_settings_client.gui.sprite_zoom_min >= ZOOM_LVL_IN_2X) ResizeSpriteIn(sprite, ZOOM_LVL_IN_2X, ZOOM_LVL_IN_4X);
+		for (ZoomLevel zoom = std::min(ZoomLevel::Normal, _settings_client.gui.sprite_zoom_min); zoom > ZoomLevel::Min; --zoom) {
+			ResizeSpriteIn(sprite, zoom, zoom - 1);
+		}
 	}
 
 	return  true;
@@ -434,7 +448,7 @@ static void *ReadRecolourSprite(SpriteFile &file, size_t file_pos, uint num, Spr
 		uint8_t *dest_tmp = new uint8_t[std::max(RECOLOUR_SPRITE_SIZE, num)];
 
 		/* Only a few recolour sprites are less than 257 bytes */
-		if (num < RECOLOUR_SPRITE_SIZE) memset(dest_tmp, 0, RECOLOUR_SPRITE_SIZE);
+		if (num < RECOLOUR_SPRITE_SIZE) std::fill_n(dest_tmp, RECOLOUR_SPRITE_SIZE, 0);
 		file.ReadBlock(dest_tmp, num);
 
 		/* The data of index 0 is never used; "literal 00" according to the (New)GRF specs. */
@@ -473,26 +487,25 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty
 	Debug(sprite, 9, "Load sprite {}", id);
 
 	SpriteLoader::SpriteCollection sprite;
-	uint8_t sprite_avail = 0;
-	uint8_t avail_8bpp = 0;
-	uint8_t avail_32bpp = 0;
-	sprite[ZOOM_LVL_MIN].type = sprite_type;
+	ZoomLevels sprite_avail;
+	ZoomLevels avail_8bpp;
+	ZoomLevels avail_32bpp;
 
 	SpriteLoaderGrf sprite_loader(file.GetContainerVersion());
 	if (sprite_type != SpriteType::MapGen && encoder->Is32BppSupported()) {
 		/* Try for 32bpp sprites first. */
 		sprite_avail = sprite_loader.LoadSprite(sprite, file, file_pos, sprite_type, true, sc->control_flags, avail_8bpp, avail_32bpp);
 	}
-	if (sprite_avail == 0) {
+	if (sprite_avail.None()) {
 		sprite_avail = sprite_loader.LoadSprite(sprite, file, file_pos, sprite_type, false, sc->control_flags, avail_8bpp, avail_32bpp);
-		if (sprite_type == SpriteType::Normal && avail_32bpp != 0 && !encoder->Is32BppSupported() && sprite_avail == 0) {
+		if (sprite_type == SpriteType::Normal && avail_32bpp.Any() && !encoder->Is32BppSupported() && sprite_avail.None()) {
 			/* No 8bpp available, try converting from 32bpp. */
 			SpriteLoaderMakeIndexed make_indexed(sprite_loader);
 			sprite_avail = make_indexed.LoadSprite(sprite, file, file_pos, sprite_type, true, sc->control_flags, sprite_avail, avail_32bpp);
 		}
 	}
 
-	if (sprite_avail == 0) {
+	if (sprite_avail.None()) {
 		if (sprite_type == SpriteType::MapGen) return nullptr;
 		if (id == SPR_IMG_QUERY) UserError("Okay... something went horribly wrong. I couldn't load the fallback sprite. What should I do?");
 		return (void*)GetRawSprite(SPR_IMG_QUERY, SpriteType::Normal, &allocator, encoder);
@@ -508,16 +521,17 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty
 		 * Ugly: yes. Other solution: no. Blame the original author or
 		 *  something ;) The image should really have been a data-stream
 		 *  (so type = 0xFF basically). */
-		uint num = sprite[ZOOM_LVL_MIN].width * sprite[ZOOM_LVL_MIN].height;
+		const auto &root_sprite = sprite.Root();
+		uint num = root_sprite.width * root_sprite.height;
 
 		Sprite *s = allocator.Allocate<Sprite>(sizeof(*s) + num);
-		s->width  = sprite[ZOOM_LVL_MIN].width;
-		s->height = sprite[ZOOM_LVL_MIN].height;
-		s->x_offs = sprite[ZOOM_LVL_MIN].x_offs;
-		s->y_offs = sprite[ZOOM_LVL_MIN].y_offs;
+		s->width = root_sprite.width;
+		s->height = root_sprite.height;
+		s->x_offs = root_sprite.x_offs;
+		s->y_offs = root_sprite.y_offs;
 
-		SpriteLoader::CommonPixel *src = sprite[ZOOM_LVL_MIN].data;
-		uint8_t *dest = s->data;
+		SpriteLoader::CommonPixel *src = root_sprite.data;
+		uint8_t *dest = reinterpret_cast<uint8_t *>(s->data);
 		while (num-- > 0) {
 			*dest++ = src->m;
 			src++;
@@ -531,17 +545,12 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty
 		return (void*)GetRawSprite(SPR_IMG_QUERY, SpriteType::Normal, &allocator, encoder);
 	}
 
-	if (sprite[ZOOM_LVL_MIN].type == SpriteType::Font && _font_zoom != ZOOM_LVL_MIN) {
-		/* Make ZOOM_LVL_MIN be ZOOM_LVL_GUI */
-		sprite[ZOOM_LVL_MIN].width  = sprite[_font_zoom].width;
-		sprite[ZOOM_LVL_MIN].height = sprite[_font_zoom].height;
-		sprite[ZOOM_LVL_MIN].x_offs = sprite[_font_zoom].x_offs;
-		sprite[ZOOM_LVL_MIN].y_offs = sprite[_font_zoom].y_offs;
-		sprite[ZOOM_LVL_MIN].data   = sprite[_font_zoom].data;
-		sprite[ZOOM_LVL_MIN].colours = sprite[_font_zoom].colours;
+	if (sprite_type == SpriteType::Font && _font_zoom != ZoomLevel::Min) {
+		/* Make ZoomLevel::Min be ZOOM_LVL_GUI */
+		sprite[ZoomLevel::Min] = sprite[_font_zoom];
 	}
 
-	return encoder->Encode(sprite, allocator);
+	return encoder->Encode(sprite_type, sprite, allocator);
 }
 
 struct GrfSpriteOffset {
@@ -595,11 +604,11 @@ void ReadGRFSpriteOffsets(SpriteFile &file)
 				if (length > 0) {
 					uint8_t zoom = file.ReadByte();
 					length--;
-					if (colour != SpriteComponents{} && zoom == 0) { // ZOOM_LVL_NORMAL (normal zoom)
+					if (colour.Any() && zoom == 0) { // ZoomLevel::Normal (normal zoom)
 						SetBit(offset.control_flags, (colour != SpriteComponent::Palette) ? SCCF_ALLOW_ZOOM_MIN_1X_32BPP : SCCF_ALLOW_ZOOM_MIN_1X_PAL);
 						SetBit(offset.control_flags, (colour != SpriteComponent::Palette) ? SCCF_ALLOW_ZOOM_MIN_2X_32BPP : SCCF_ALLOW_ZOOM_MIN_2X_PAL);
 					}
-					if (colour != SpriteComponents{} && zoom == 2) { // ZOOM_LVL_IN_2X (2x zoomed in)
+					if (colour.Any() && zoom == 2) { // ZoomLevel::In2x (2x zoomed in)
 						SetBit(offset.control_flags, (colour != SpriteComponent::Palette) ? SCCF_ALLOW_ZOOM_MIN_2X_32BPP : SCCF_ALLOW_ZOOM_MIN_2X_PAL);
 					}
 				}
@@ -794,7 +803,8 @@ static void CompactSpriteCache()
 			GetSpriteCache(i)->ptr = s->data; // Adjust sprite array entry
 			/* Swap this and the next block */
 			temp = *s;
-			memmove(s, next, next->size);
+			std::byte *p = reinterpret_cast<std::byte *>(next);
+			std::move(p, &p[next->size], reinterpret_cast<std::byte *>(s));
 			s = NextBlock(s);
 			*s = temp;
 
@@ -889,7 +899,7 @@ void *CacheSpriteAllocator::AllocatePtr(size_t mem_req)
 
 void *UniquePtrSpriteAllocator::AllocatePtr(size_t size)
 {
-	this->data = std::make_unique<uint8_t[]>(size);
+	this->data = std::make_unique<std::byte[]>(size);
 	return this->data.get();
 }
 
@@ -904,7 +914,7 @@ void *UniquePtrSpriteAllocator::AllocatePtr(size_t size)
  */
 static void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType requested, SpriteCache *sc, SpriteAllocator *allocator)
 {
-	static const char * const sprite_types[] = {
+	static const std::string_view sprite_types[] = {
 		"normal",        // SpriteType::Normal
 		"map generator", // SpriteType::MapGen
 		"character",     // SpriteType::Font
@@ -1070,4 +1080,4 @@ void GfxClearFontSpriteCache()
 	}
 }
 
-/* static */ ReusableBuffer<SpriteLoader::CommonPixel> SpriteLoader::Sprite::buffer[ZOOM_LVL_END];
+/* static */ SpriteCollMap<ReusableBuffer<SpriteLoader::CommonPixel>> SpriteLoader::Sprite::buffer;
diff --git a/src/spritecache.h b/src/spritecache.h
index 3f0e99dd7a..54ab1f3dc9 100644
--- a/src/spritecache.h
+++ b/src/spritecache.h
@@ -19,7 +19,7 @@ struct Sprite {
 	uint16_t width;  ///< Width of the sprite.
 	int16_t x_offs;  ///< Number of pixels to shift the sprite to the right.
 	int16_t y_offs;  ///< Number of pixels to shift the sprite downwards.
-	uint8_t data[];   ///< Sprite data.
+	std::byte data[]; ///< Sprite data.
 };
 
 enum SpriteCacheCtrlFlags : uint8_t {
@@ -34,7 +34,7 @@ extern uint _sprite_cache_size;
 /** SpriteAllocator that allocates memory via a unique_ptr array. */
 class UniquePtrSpriteAllocator : public SpriteAllocator {
 public:
-	std::unique_ptr<uint8_t[]> data;
+	std::unique_ptr<std::byte[]> data;
 protected:
 	void *AllocatePtr(size_t size) override;
 };
diff --git a/src/spritecache_internal.h b/src/spritecache_internal.h
index 76f8aac7b2..946f8bfbc5 100644
--- a/src/spritecache_internal.h
+++ b/src/spritecache_internal.h
@@ -10,8 +10,6 @@
 #ifndef SPRITECACHE_INTERNAL_H
 #define SPRITECACHE_INTERNAL_H
 
-#include "stdafx.h"
-
 #include "core/math_func.hpp"
 #include "gfx_type.h"
 #include "spriteloader/spriteloader.hpp"
diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp
index 053a2120e5..57cb86a1a3 100644
--- a/src/spriteloader/grf.cpp
+++ b/src/spriteloader/grf.cpp
@@ -215,10 +215,10 @@ bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t f
 	return true;
 }
 
-uint8_t LoadSpriteV1(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t &avail_8bpp)
+static ZoomLevels LoadSpriteV1(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, ZoomLevels &avail_8bpp)
 {
 	/* Check the requested colour depth. */
-	if (load_32bpp) return 0;
+	if (load_32bpp) return {};
 
 	/* Open the right file and go to the correct position */
 	file.SeekTo(file_pos, SEEK_SET);
@@ -228,53 +228,54 @@ uint8_t LoadSpriteV1(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, s
 	uint8_t type = file.ReadByte();
 
 	/* Type 0xFF indicates either a colourmap or some other non-sprite info; we do not handle them here */
-	if (type == 0xFF) return 0;
+	if (type == 0xFF) return {};
 
-	ZoomLevel zoom_lvl = (sprite_type != SpriteType::MapGen) ? ZOOM_LVL_NORMAL : ZOOM_LVL_MIN;
+	ZoomLevel zoom_lvl = (sprite_type != SpriteType::MapGen) ? ZoomLevel::Normal : ZoomLevel::Min;
+	auto &dest_sprite = sprite[zoom_lvl];
 
-	sprite[zoom_lvl].height = file.ReadByte();
-	sprite[zoom_lvl].width  = file.ReadWord();
-	sprite[zoom_lvl].x_offs = file.ReadWord();
-	sprite[zoom_lvl].y_offs = file.ReadWord();
-	sprite[zoom_lvl].colours = SpriteComponent::Palette;
+	dest_sprite.height = file.ReadByte();
+	dest_sprite.width = file.ReadWord();
+	dest_sprite.x_offs = file.ReadWord();
+	dest_sprite.y_offs = file.ReadWord();
+	dest_sprite.colours = SpriteComponent::Palette;
 
-	if (sprite[zoom_lvl].width > INT16_MAX) {
+	if (dest_sprite.width > INT16_MAX) {
 		WarnCorruptSprite(file, file_pos, __LINE__);
-		return 0;
+		return {};
 	}
 
 	/* 0x02 indicates it is a compressed sprite, so we can't rely on 'num' to be valid.
 	 * In case it is uncompressed, the size is 'num' - 8 (header-size). */
-	num = (type & 0x02) ? sprite[zoom_lvl].width * sprite[zoom_lvl].height : num - 8;
+	num = (type & 0x02) ? dest_sprite.width * dest_sprite.height : num - 8;
 
-	if (DecodeSingleSprite(&sprite[zoom_lvl], file, file_pos, sprite_type, num, type, zoom_lvl, SpriteComponent::Palette, 1)) {
-		SetBit(avail_8bpp, zoom_lvl);
+	if (DecodeSingleSprite(&dest_sprite, file, file_pos, sprite_type, num, type, zoom_lvl, SpriteComponent::Palette, 1)) {
+		avail_8bpp.Set(zoom_lvl);
 		return avail_8bpp;
 	}
 
-	return 0;
+	return {};
 }
 
-uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, uint8_t &avail_8bpp, uint8_t &avail_32bpp)
+static ZoomLevels LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, ZoomLevels &avail_8bpp, ZoomLevels &avail_32bpp)
 {
-	static const ZoomLevel zoom_lvl_map[6] = {ZOOM_LVL_NORMAL, ZOOM_LVL_IN_4X, ZOOM_LVL_IN_2X, ZOOM_LVL_OUT_2X, ZOOM_LVL_OUT_4X, ZOOM_LVL_OUT_8X};
+	static const ZoomLevel zoom_lvl_map[6] = {ZoomLevel::Normal, ZoomLevel::In4x, ZoomLevel::In2x, ZoomLevel::Out2x, ZoomLevel::Out4x, ZoomLevel::Out8x};
 
 	/* Is the sprite not present/stripped in the GRF? */
-	if (file_pos == SIZE_MAX) return 0;
+	if (file_pos == SIZE_MAX) return {};
 
 	/* Open the right file and go to the correct position */
 	file.SeekTo(file_pos, SEEK_SET);
 
 	uint32_t id = file.ReadDword();
 
-	uint8_t loaded_sprites = 0;
+	ZoomLevels loaded_sprites;
 	do {
 		int64_t num = file.ReadDword();
 		size_t start_pos = file.GetPos();
 		uint8_t type = file.ReadByte();
 
 		/* Type 0xFF indicates either a colourmap or some other non-sprite info; we do not handle them here. */
-		if (type == 0xFF) return 0;
+		if (type == 0xFF) return {};
 
 		SpriteComponents colour{type};
 		/* Mask out colour component information from type. */
@@ -282,22 +283,23 @@ uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, s
 
 		uint8_t zoom = file.ReadByte();
 
-		bool is_wanted_colour_depth = (colour != SpriteComponents{} && (load_32bpp ? colour != SpriteComponent::Palette : colour == SpriteComponent::Palette));
+		bool is_wanted_colour_depth = (colour.Any() && (load_32bpp ? colour != SpriteComponent::Palette : colour == SpriteComponent::Palette));
 		bool is_wanted_zoom_lvl;
 
 		if (sprite_type != SpriteType::MapGen) {
 			if (zoom < lengthof(zoom_lvl_map)) {
-				if (colour == SpriteComponent::Palette) SetBit(avail_8bpp, zoom_lvl_map[zoom]);
-				if (colour != SpriteComponent::Palette) SetBit(avail_32bpp, zoom_lvl_map[zoom]);
+				ZoomLevel zoom_lvl = zoom_lvl_map[zoom];
+				if (colour == SpriteComponent::Palette) avail_8bpp.Set(zoom_lvl);
+				if (colour != SpriteComponent::Palette) avail_32bpp.Set(zoom_lvl);
 
 				is_wanted_zoom_lvl = true;
-				ZoomLevel zoom_min = sprite_type == SpriteType::Font ? ZOOM_LVL_MIN : _settings_client.gui.sprite_zoom_min;
-				if (zoom_min >= ZOOM_LVL_IN_2X &&
-						HasBit(control_flags, load_32bpp ? SCCF_ALLOW_ZOOM_MIN_2X_32BPP : SCCF_ALLOW_ZOOM_MIN_2X_PAL) && zoom_lvl_map[zoom] < ZOOM_LVL_IN_2X) {
+				ZoomLevel zoom_min = sprite_type == SpriteType::Font ? ZoomLevel::Min : _settings_client.gui.sprite_zoom_min;
+				if (zoom_min >= ZoomLevel::In2x &&
+						HasBit(control_flags, load_32bpp ? SCCF_ALLOW_ZOOM_MIN_2X_32BPP : SCCF_ALLOW_ZOOM_MIN_2X_PAL) && zoom_lvl < ZoomLevel::In2x) {
 					is_wanted_zoom_lvl = false;
 				}
-				if (zoom_min >= ZOOM_LVL_NORMAL &&
-						HasBit(control_flags, load_32bpp ? SCCF_ALLOW_ZOOM_MIN_1X_32BPP : SCCF_ALLOW_ZOOM_MIN_1X_PAL) && zoom_lvl_map[zoom] < ZOOM_LVL_NORMAL) {
+				if (zoom_min >= ZoomLevel::Normal &&
+						HasBit(control_flags, load_32bpp ? SCCF_ALLOW_ZOOM_MIN_1X_32BPP : SCCF_ALLOW_ZOOM_MIN_1X_PAL) && zoom_lvl < ZoomLevel::Normal) {
 					is_wanted_zoom_lvl = false;
 				}
 			} else {
@@ -308,23 +310,24 @@ uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, s
 		}
 
 		if (is_wanted_colour_depth && is_wanted_zoom_lvl) {
-			ZoomLevel zoom_lvl = (sprite_type != SpriteType::MapGen) ? zoom_lvl_map[zoom] : ZOOM_LVL_MIN;
+			ZoomLevel zoom_lvl = (sprite_type != SpriteType::MapGen) ? zoom_lvl_map[zoom] : ZoomLevel::Min;
 
-			if (HasBit(loaded_sprites, zoom_lvl)) {
+			if (loaded_sprites.Test(zoom_lvl)) {
 				/* We already have this zoom level, skip sprite. */
 				Debug(sprite, 1, "Ignoring duplicate zoom level sprite {} from {}", id, file.GetSimplifiedFilename());
 				file.SkipBytes(num - 2);
 				continue;
 			}
 
-			sprite[zoom_lvl].height = file.ReadWord();
-			sprite[zoom_lvl].width  = file.ReadWord();
-			sprite[zoom_lvl].x_offs = file.ReadWord();
-			sprite[zoom_lvl].y_offs = file.ReadWord();
+			auto &dest_sprite = sprite[zoom_lvl];
+			dest_sprite.height = file.ReadWord();
+			dest_sprite.width = file.ReadWord();
+			dest_sprite.x_offs = file.ReadWord();
+			dest_sprite.y_offs = file.ReadWord();
 
-			if (sprite[zoom_lvl].width > INT16_MAX || sprite[zoom_lvl].height > INT16_MAX) {
+			if (dest_sprite.width > INT16_MAX || dest_sprite.height > INT16_MAX) {
 				WarnCorruptSprite(file, file_pos, __LINE__);
-				return 0;
+				return {};
 			}
 
 			/* Convert colour components to pixel size. */
@@ -333,19 +336,19 @@ uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, s
 			if (colour.Test(SpriteComponent::Alpha)) bpp++;
 			if (colour.Test(SpriteComponent::Palette)) bpp++;
 
-			sprite[zoom_lvl].colours = colour;
+			dest_sprite.colours = colour;
 
 			/* For chunked encoding we store the decompressed size in the file,
 			 * otherwise we can calculate it from the image dimensions. */
-			uint decomp_size = (type & 0x08) ? file.ReadDword() : sprite[zoom_lvl].width * sprite[zoom_lvl].height * bpp;
+			uint decomp_size = (type & 0x08) ? file.ReadDword() : dest_sprite.width * dest_sprite.height * bpp;
 
-			bool valid = DecodeSingleSprite(&sprite[zoom_lvl], file, file_pos, sprite_type, decomp_size, type, zoom_lvl, colour, 2);
+			bool valid = DecodeSingleSprite(&dest_sprite, file, file_pos, sprite_type, decomp_size, type, zoom_lvl, colour, 2);
 			if (file.GetPos() != start_pos + num) {
 				WarnCorruptSprite(file, file_pos, __LINE__);
-				return 0;
+				return {};
 			}
 
-			if (valid) SetBit(loaded_sprites, zoom_lvl);
+			if (valid) loaded_sprites.Set(zoom_lvl);
 		} else {
 			/* Not the wanted zoom level or colour depth, continue searching. */
 			file.SkipBytes(num - 2);
@@ -356,7 +359,7 @@ uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, s
 	return loaded_sprites;
 }
 
-uint8_t SpriteLoaderGrf::LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, uint8_t &avail_8bpp, uint8_t &avail_32bpp)
+ZoomLevels SpriteLoaderGrf::LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, ZoomLevels &avail_8bpp, ZoomLevels &avail_32bpp)
 {
 	if (this->container_ver >= 2) {
 		return LoadSpriteV2(sprite, file, file_pos, sprite_type, load_32bpp, control_flags, avail_8bpp, avail_32bpp);
diff --git a/src/spriteloader/grf.hpp b/src/spriteloader/grf.hpp
index 14e89abd03..2050a909eb 100644
--- a/src/spriteloader/grf.hpp
+++ b/src/spriteloader/grf.hpp
@@ -17,7 +17,7 @@ class SpriteLoaderGrf : public SpriteLoader {
 	uint8_t container_ver;
 public:
 	SpriteLoaderGrf(uint8_t container_ver) : container_ver(container_ver) {}
-	uint8_t LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, uint8_t &avail_8bpp, uint8_t &avail_32bpp) override;
+	ZoomLevels LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, ZoomLevels &avail_8bpp, ZoomLevels &avail_32bpp) override;
 };
 
 #endif /* SPRITELOADER_GRF_HPP */
diff --git a/src/spriteloader/makeindexed.cpp b/src/spriteloader/makeindexed.cpp
index 8218e12d59..fd5cb2c631 100644
--- a/src/spriteloader/makeindexed.cpp
+++ b/src/spriteloader/makeindexed.cpp
@@ -48,12 +48,12 @@ static void Convert32bppTo8bpp(SpriteLoader::Sprite &sprite)
 	}
 }
 
-uint8_t SpriteLoaderMakeIndexed::LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool, uint8_t control_flags, uint8_t &avail_8bpp, uint8_t &avail_32bpp)
+ZoomLevels SpriteLoaderMakeIndexed::LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool, uint8_t control_flags, ZoomLevels &avail_8bpp, ZoomLevels &avail_32bpp)
 {
-	uint8_t avail = this->baseloader.LoadSprite(sprite, file, file_pos, sprite_type, true, control_flags, avail_8bpp, avail_32bpp);
+	ZoomLevels avail = this->baseloader.LoadSprite(sprite, file, file_pos, sprite_type, true, control_flags, avail_8bpp, avail_32bpp);
 
-	for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
-		if (HasBit(avail, zoom)) Convert32bppTo8bpp(sprite[zoom]);
+	for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
+		if (avail.Test(zoom)) Convert32bppTo8bpp(sprite[zoom]);
 	}
 
 	return avail;
diff --git a/src/spriteloader/makeindexed.h b/src/spriteloader/makeindexed.h
index 7b0f690663..23bdd39d7a 100644
--- a/src/spriteloader/makeindexed.h
+++ b/src/spriteloader/makeindexed.h
@@ -17,7 +17,7 @@ class SpriteLoaderMakeIndexed : public SpriteLoader {
 	SpriteLoader &baseloader;
 public:
 	SpriteLoaderMakeIndexed(SpriteLoader &baseloader) : baseloader(baseloader) {}
-	uint8_t LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, uint8_t &avail_8bpp, uint8_t &avail_32bpp) override;
+	ZoomLevels LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, ZoomLevels &avail_8bpp, ZoomLevels &avail_32bpp) override;
 };
 
 #endif /* SPRITELOADER_MAKEINDEXED_H */
diff --git a/src/spriteloader/sprite_file.cpp b/src/spriteloader/sprite_file.cpp
index e4bc055ec4..a374d7969f 100644
--- a/src/spriteloader/sprite_file.cpp
+++ b/src/spriteloader/sprite_file.cpp
@@ -9,6 +9,7 @@
 
 #include "../stdafx.h"
 #include "sprite_file_type.hpp"
+#include "../safeguards.h"
 
 /** Signature of a container version 2 GRF. */
 extern const std::array<uint8_t, 8> _grf_cont_v2_sig = {'G', 'R', 'F', 0x82, 0x0D, 0x0A, 0x1A, 0x0A};
diff --git a/src/spriteloader/spriteloader.hpp b/src/spriteloader/spriteloader.hpp
index 21435535b8..cf4673b760 100644
--- a/src/spriteloader/spriteloader.hpp
+++ b/src/spriteloader/spriteloader.hpp
@@ -26,6 +26,20 @@ enum class SpriteComponent : uint8_t {
 };
 using SpriteComponents = EnumBitSet<SpriteComponent, uint8_t, SpriteComponent::End>;
 
+/**
+ * Map zoom level to data.
+ */
+template <class T>
+class SpriteCollMap {
+	std::array<T, to_underlying(ZoomLevel::End)> data{};
+public:
+	inline constexpr T &operator[](const ZoomLevel &zoom) { return this->data[to_underlying(zoom)]; }
+	inline constexpr const T &operator[](const ZoomLevel &zoom) const { return this->data[to_underlying(zoom)]; }
+
+	T &Root() { return this->data[to_underlying(ZoomLevel::Min)]; }
+	const T &Root() const { return this->data[to_underlying(ZoomLevel::Min)]; }
+};
+
 /** Interface for the loader of our sprites. */
 class SpriteLoader {
 public:
@@ -49,7 +63,6 @@ public:
 		uint16_t width;                    ///< Width of the sprite
 		int16_t x_offs;                    ///< The x-offset of where the sprite will be drawn
 		int16_t y_offs;                    ///< The y-offset of where the sprite will be drawn
-		SpriteType type;                 ///< The sprite type
 		SpriteComponents colours;   ///< The colour components of the sprite with useful information.
 		SpriteLoader::CommonPixel *data; ///< The sprite itself
 
@@ -61,25 +74,27 @@ public:
 		void AllocateData(ZoomLevel zoom, size_t size) { this->data = Sprite::buffer[zoom].ZeroAllocate(size); }
 	private:
 		/** Allocated memory to pass sprite data around */
-		static ReusableBuffer<SpriteLoader::CommonPixel> buffer[ZOOM_LVL_END];
+		static SpriteCollMap<ReusableBuffer<SpriteLoader::CommonPixel>> buffer;
 	};
 
 	/**
 	 * Type defining a collection of sprites, one for each zoom level.
 	 */
-	using SpriteCollection = std::array<Sprite, ZOOM_LVL_END>;
+	using SpriteCollection = SpriteCollMap<Sprite>;
 
 	/**
 	 * Load a sprite from the disk and return a sprite struct which is the same for all loaders.
 	 * @param[out] sprite The sprites to fill with data.
-	 * @param file_slot   The file "descriptor" of the file we read from.
+	 * @param file The file "descriptor" of the file we read from.
 	 * @param file_pos    The position within the file the image begins.
 	 * @param sprite_type The type of sprite we're trying to load.
 	 * @param load_32bpp  True if 32bpp sprites should be loaded, false for a 8bpp sprite.
 	 * @param control_flags Control flags, see SpriteCacheCtrlFlags.
-	 * @return Bit mask of the zoom levels successfully loaded or 0 if no sprite could be loaded.
+	 * @param[out] avail_8bpp Available 8bpp sprites.
+	 * @param[out] avail_32bpp Available 32bpp sprites.
+	 * @return Available sprites matching \a load_32bpp.
 	 */
-	virtual uint8_t LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, uint8_t &avail_8bpp, uint8_t &avail_32bpp) = 0;
+	virtual ZoomLevels LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint8_t control_flags, ZoomLevels &avail_8bpp, ZoomLevels &avail_32bpp) = 0;
 
 	virtual ~SpriteLoader() = default;
 };
@@ -124,7 +139,7 @@ public:
 	/**
 	 * Convert a sprite from the loader to our own format.
 	 */
-	virtual Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) = 0;
+	virtual Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) = 0;
 
 	/**
 	 * Get the value which the height and width on a sprite have to be aligned by.
diff --git a/src/station.cpp b/src/station.cpp
index 2dbb04c312..fa7b545fc3 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -8,6 +8,7 @@
 /** @file station.cpp Implementation of the station base class. */
 
 #include "stdafx.h"
+#include "core/flatset_type.hpp"
 #include "company_func.h"
 #include "company_base.h"
 #include "roadveh.h"
@@ -228,7 +229,7 @@ RoadStop *Station::GetPrimaryRoadStop(const RoadVehicle *v) const
  */
 void Station::AddFacility(StationFacility new_facility_bit, TileIndex facil_xy)
 {
-	if (this->facilities == StationFacilities{}) {
+	if (this->facilities.None()) {
 		this->MoveSign(facil_xy);
 		this->random_bits = Random();
 	}
@@ -387,7 +388,7 @@ Rect Station::GetCatchmentRect() const
  */
 void Station::AddIndustryToDeliver(Industry *ind, TileIndex tile)
 {
-	/* Using DistanceMax to get about the same order as with previously used CircularTileSearch. */
+	/* Using DistanceMax to get about the same order as with previously used SpiralTileSequence. */
 	uint distance = DistanceMax(this->xy, tile);
 
 	/* Don't check further if this industry is already in the list but update the distance if it's closer */
@@ -425,8 +426,8 @@ void Station::RemoveIndustryToDeliver(Industry *ind)
  */
 void Station::RemoveFromAllNearbyLists()
 {
-	std::set<TownID> towns;
-	std::set<IndustryID> industries;
+	FlatSet<TownID> towns;
+	FlatSet<IndustryID> industries;
 
 	for (const auto &tile : this->catchment_tiles) {
 		TileType type = GetTileType(tile);
diff --git a/src/station_base.h b/src/station_base.h
index 91189baa49..c503118f9e 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -10,6 +10,7 @@
 #ifndef STATION_BASE_H
 #define STATION_BASE_H
 
+#include "core/flatset_type.hpp"
 #include "core/random_func.hpp"
 #include "base_station_base.h"
 #include "newgrf_airport.h"
@@ -627,14 +628,15 @@ void ForAllStationsAroundTiles(const TileArea &ta, Func func)
 	if (Station::GetNumItems() == 0) return;
 
 	/* Not using, or don't have a nearby stations list, so we need to scan. */
-	std::set<StationID> seen_stations;
+	FlatSet<StationID> seen_stations;
 
 	/* Scan an area around the building covering the maximum possible station
 	 * to find the possible nearby stations. */
 	uint max_c = _settings_game.station.modified_catchment ? MAX_CATCHMENT : CA_UNMODIFIED;
 	TileArea ta_ext = TileArea(ta).Expand(max_c);
 	for (TileIndex tile : ta_ext) {
-		if (IsTileType(tile, MP_STATION)) seen_stations.insert(GetStationIndex(tile));
+		if (!IsTileType(tile, MP_STATION)) continue;
+		seen_stations.insert(GetStationIndex(tile));
 	}
 
 	for (StationID stationid : seen_stations) {
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index ad5e88dd96..677c81ba8e 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -8,6 +8,7 @@
 /** @file station_cmd.cpp Handling of station tiles. */
 
 #include "stdafx.h"
+#include "core/flatset_type.hpp"
 #include "aircraft.h"
 #include "bridge_map.h"
 #include "vehiclelist_func.h"
@@ -210,8 +211,6 @@ static bool CMSATree(TileIndex tile)
 	return IsTileType(tile, MP_TREES);
 }
 
-#define M(x) ((x) - STR_SV_STNAME)
-
 enum StationNaming : uint8_t {
 	STATIONNAMING_RAIL,
 	STATIONNAMING_ROAD,
@@ -223,49 +222,27 @@ enum StationNaming : uint8_t {
 
 /** Information to handle station action 0 property 24 correctly */
 struct StationNameInformation {
-	uint32_t free_names; ///< Current bitset of free names (we can remove names).
+	std::bitset<STR_SV_STNAME_FALLBACK - STR_SV_STNAME> used_names; ///< Used default station suffixes.
 	std::bitset<NUM_INDUSTRYTYPES> indtypes; ///< Bit set indicating when an industry type has been found.
+
+	bool IsAvailable(StringID str) const
+	{
+		assert(IsInsideMM(str, STR_SV_STNAME, STR_SV_STNAME_FALLBACK));
+		return !this->used_names.test(str - STR_SV_STNAME);
+	}
+
+	void SetUsed(StringID str)
+	{
+		assert(IsInsideMM(str, STR_SV_STNAME, STR_SV_STNAME_FALLBACK));
+		this->used_names.set(str - STR_SV_STNAME);
+	}
 };
 
-/**
- * Find a station action 0 property 24 station name, or reduce the
- * free_names if needed.
- * @param tile the tile to search
- * @param user_data the StationNameInformation to base the search on
- * @return true if the tile contains an industry that has not given
- *              its name to one of the other stations in town.
- */
-static bool FindNearIndustryName(TileIndex tile, void *user_data)
-{
-	/* All already found industry types */
-	StationNameInformation *sni = (StationNameInformation*)user_data;
-	if (!IsTileType(tile, MP_INDUSTRY)) return false;
-
-	/* If the station name is undefined it means that it doesn't name a station */
-	IndustryType indtype = GetIndustryType(tile);
-	if (GetIndustrySpec(indtype)->station_name == STR_UNDEFINED) return false;
-
-	/* In all cases if an industry that provides a name is found two of
-	 * the standard names will be disabled. */
-	sni->free_names &= ~(1 << M(STR_SV_STNAME_OILFIELD) | 1 << M(STR_SV_STNAME_MINES));
-	return !sni->indtypes[indtype];
-}
-
 static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming name_class)
 {
-	static const uint32_t _gen_station_name_bits[] = {
-		0,                                       // STATIONNAMING_RAIL
-		0,                                       // STATIONNAMING_ROAD
-		1U << M(STR_SV_STNAME_AIRPORT),          // STATIONNAMING_AIRPORT
-		1U << M(STR_SV_STNAME_OILFIELD),         // STATIONNAMING_OILRIG
-		1U << M(STR_SV_STNAME_DOCKS),            // STATIONNAMING_DOCK
-		1U << M(STR_SV_STNAME_HELIPORT),         // STATIONNAMING_HELIPORT
-	};
-
 	const Town *t = st->town;
 
 	StationNameInformation sni{};
-	sni.free_names = UINT32_MAX;
 
 	for (const Station *s : Station::Iterate()) {
 		if (s != st && s->town == t) {
@@ -281,36 +258,57 @@ static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming n
 				}
 				continue;
 			}
-			uint str = M(s->string_id);
-			if (str <= 0x20) {
-				if (str == M(STR_SV_STNAME_FOREST)) {
-					str = M(STR_SV_STNAME_WOODS);
-				}
-				ClrBit(sni.free_names, str);
+			if (IsInsideMM(s->string_id, STR_SV_STNAME, STR_SV_STNAME_FALLBACK)) {
+				auto str = s->string_id;
+				if (str == STR_SV_STNAME_FOREST) str = STR_SV_STNAME_WOODS;
+				sni.SetUsed(str);
 			}
 		}
 	}
 
-	TileIndex indtile = tile;
-	if (CircularTileSearch(&indtile, 7, FindNearIndustryName, &sni)) {
-		/* An industry has been found nearby */
+	for (auto indtile : SpiralTileSequence(tile, 7)) {
+		if (!IsTileType(indtile, MP_INDUSTRY)) continue;
+
+		/* If the station name is undefined it means that it doesn't name a station */
 		IndustryType indtype = GetIndustryType(indtile);
 		const IndustrySpec *indsp = GetIndustrySpec(indtype);
+		if (indsp->station_name == STR_UNDEFINED) continue;
+
+		/* In all cases if an industry that provides a name is found two of
+		 * the standard names will be disabled. */
+		sni.SetUsed(STR_SV_STNAME_OILFIELD);
+		sni.SetUsed(STR_SV_STNAME_MINES);
+		if (sni.indtypes[indtype]) continue;
+
 		/* STR_NULL means it only disables oil rig/mines */
 		if (indsp->station_name != STR_NULL) {
 			st->indtype = indtype;
 			return STR_SV_STNAME_FALLBACK;
 		}
+		break;
 	}
 
-	/* Oil rigs/mines name could be marked not free by looking for a near by industry. */
-
-	/* check default names */
-	uint32_t tmp = sni.free_names & _gen_station_name_bits[name_class];
-	if (tmp != 0) return STR_SV_STNAME + FindFirstBit(tmp);
+	/* check default names
+	 * Oil rigs/mines name could be marked not free by looking for a near by industry. */
+	switch (name_class) {
+		case STATIONNAMING_AIRPORT:
+			if (sni.IsAvailable(STR_SV_STNAME_AIRPORT)) return STR_SV_STNAME_AIRPORT;
+			break;
+		case STATIONNAMING_OILRIG:
+			if (sni.IsAvailable(STR_SV_STNAME_OILFIELD)) return STR_SV_STNAME_OILFIELD;
+			break;
+		case STATIONNAMING_DOCK:
+			if (sni.IsAvailable(STR_SV_STNAME_DOCKS)) return STR_SV_STNAME_DOCKS;
+			break;
+		case STATIONNAMING_HELIPORT:
+			if (sni.IsAvailable(STR_SV_STNAME_HELIPORT)) return STR_SV_STNAME_HELIPORT;
+			break;
+		default:
+			break;
+	};
 
 	/* check mine? */
-	if (HasBit(sni.free_names, M(STR_SV_STNAME_MINES))) {
+	if (sni.IsAvailable(STR_SV_STNAME_MINES)) {
 		if (CountMapSquareAround(tile, CMSAMine) >= 2) {
 			return STR_SV_STNAME_MINES;
 		}
@@ -318,20 +316,19 @@ static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming n
 
 	/* check close enough to town to get central as name? */
 	if (DistanceMax(tile, t->xy) < 8) {
-		if (HasBit(sni.free_names, M(STR_SV_STNAME))) return STR_SV_STNAME;
-
-		if (HasBit(sni.free_names, M(STR_SV_STNAME_CENTRAL))) return STR_SV_STNAME_CENTRAL;
+		if (sni.IsAvailable(STR_SV_STNAME)) return STR_SV_STNAME;
+		if (sni.IsAvailable(STR_SV_STNAME_CENTRAL)) return STR_SV_STNAME_CENTRAL;
 	}
 
 	/* Check lakeside */
-	if (HasBit(sni.free_names, M(STR_SV_STNAME_LAKESIDE)) &&
+	if (sni.IsAvailable(STR_SV_STNAME_LAKESIDE) &&
 			DistanceFromEdge(tile) < 20 &&
 			CountMapSquareAround(tile, CMSAWater) >= 5) {
 		return STR_SV_STNAME_LAKESIDE;
 	}
 
 	/* Check woods */
-	if (HasBit(sni.free_names, M(STR_SV_STNAME_WOODS)) && (
+	if (sni.IsAvailable(STR_SV_STNAME_WOODS) && (
 				CountMapSquareAround(tile, CMSATree) >= 8 ||
 				CountMapSquareAround(tile, IsTileForestIndustry) >= 2)
 			) {
@@ -342,43 +339,47 @@ static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming n
 	int z = GetTileZ(tile);
 	int z2 = GetTileZ(t->xy);
 	if (z < z2) {
-		if (HasBit(sni.free_names, M(STR_SV_STNAME_VALLEY))) return STR_SV_STNAME_VALLEY;
+		if (sni.IsAvailable(STR_SV_STNAME_VALLEY)) return STR_SV_STNAME_VALLEY;
 	} else if (z > z2) {
-		if (HasBit(sni.free_names, M(STR_SV_STNAME_HEIGHTS))) return STR_SV_STNAME_HEIGHTS;
+		if (sni.IsAvailable(STR_SV_STNAME_HEIGHTS)) return STR_SV_STNAME_HEIGHTS;
 	}
 
 	/* check direction compared to town */
-	static const int8_t _direction_and_table[] = {
-		~( (1 << M(STR_SV_STNAME_WEST))  | (1 << M(STR_SV_STNAME_EAST)) | (1 << M(STR_SV_STNAME_NORTH)) ),
-		~( (1 << M(STR_SV_STNAME_SOUTH)) | (1 << M(STR_SV_STNAME_WEST)) | (1 << M(STR_SV_STNAME_NORTH)) ),
-		~( (1 << M(STR_SV_STNAME_SOUTH)) | (1 << M(STR_SV_STNAME_EAST)) | (1 << M(STR_SV_STNAME_NORTH)) ),
-		~( (1 << M(STR_SV_STNAME_SOUTH)) | (1 << M(STR_SV_STNAME_WEST)) | (1 << M(STR_SV_STNAME_EAST)) ),
+	if (TileX(tile) < TileX(t->xy)) {
+		sni.SetUsed(STR_SV_STNAME_SOUTH);
+		sni.SetUsed(STR_SV_STNAME_WEST);
+	} else {
+		sni.SetUsed(STR_SV_STNAME_NORTH);
+		sni.SetUsed(STR_SV_STNAME_EAST);
+	}
+	if (TileY(tile) < TileY(t->xy)) {
+		sni.SetUsed(STR_SV_STNAME_SOUTH);
+		sni.SetUsed(STR_SV_STNAME_EAST);
+	} else {
+		sni.SetUsed(STR_SV_STNAME_NORTH);
+		sni.SetUsed(STR_SV_STNAME_WEST);
+	}
+
+	/** Remaining station names that can be used when a more specific name has not been used. */
+	static const StringID fallback_names[] = {
+		STR_SV_STNAME_NORTH,
+		STR_SV_STNAME_SOUTH,
+		STR_SV_STNAME_EAST,
+		STR_SV_STNAME_WEST,
+		STR_SV_STNAME_TRANSFER,
+		STR_SV_STNAME_HALT,
+		STR_SV_STNAME_EXCHANGE,
+		STR_SV_STNAME_ANNEXE,
+		STR_SV_STNAME_SIDINGS,
+		STR_SV_STNAME_BRANCH,
+		STR_SV_STNAME_UPPER,
+		STR_SV_STNAME_LOWER,
 	};
-
-	sni.free_names &= _direction_and_table[
-		(TileX(tile) < TileX(t->xy)) +
-		(TileY(tile) < TileY(t->xy)) * 2];
-
-	/** Bitmask of remaining station names that can be used when a more specific name has not been used. */
-	static const uint32_t fallback_names = (
-		(1U << M(STR_SV_STNAME_NORTH)) |
-		(1U << M(STR_SV_STNAME_SOUTH)) |
-		(1U << M(STR_SV_STNAME_EAST)) |
-		(1U << M(STR_SV_STNAME_WEST)) |
-		(1U << M(STR_SV_STNAME_TRANSFER)) |
-		(1U << M(STR_SV_STNAME_HALT)) |
-		(1U << M(STR_SV_STNAME_EXCHANGE)) |
-		(1U << M(STR_SV_STNAME_ANNEXE)) |
-		(1U << M(STR_SV_STNAME_SIDINGS)) |
-		(1U << M(STR_SV_STNAME_BRANCH)) |
-		(1U << M(STR_SV_STNAME_UPPER)) |
-		(1U << M(STR_SV_STNAME_LOWER))
-	);
-
-	sni.free_names &= fallback_names;
-	return (sni.free_names == 0) ? STR_SV_STNAME_FALLBACK : (STR_SV_STNAME + FindFirstBit(sni.free_names));
+	for (auto str : fallback_names) {
+		if (sni.IsAvailable(str)) return str;
+	}
+	return STR_SV_STNAME_FALLBACK;
 }
-#undef M
 
 /**
  * Find the closest deleted station of the current company
@@ -543,7 +544,7 @@ static void ShowRejectOrAcceptNews(const Station *st, CargoTypes cargoes, bool r
 CargoArray GetProductionAroundTiles(TileIndex north_tile, int w, int h, int rad)
 {
 	CargoArray produced{};
-	std::set<IndustryID> industries;
+	FlatSet<IndustryID> industries;
 	TileArea ta = TileArea(north_tile, w, h).Expand(rad);
 
 	/* Loop over all tiles to get the produced cargo of
@@ -796,7 +797,7 @@ CommandCost ClearTile_Station(TileIndex tile, DoCommandFlags flags);
  * @param check_bridge Check for the existence of a bridge.
  * @return The cost in case of success, or an error code if it failed.
  */
-CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z, bool allow_steep, bool check_bridge = true)
+CommandCost CheckBuildableTile(TileIndex tile, DiagDirections invalid_dirs, int &allowed_z, bool allow_steep, bool check_bridge = true)
 {
 	if (check_bridge && IsBridgeAbove(tile)) {
 		return CommandCost(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
@@ -821,7 +822,7 @@ CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z
 	if (tileh != SLOPE_FLAT) {
 		/* Forbid building if the tile faces a slope in a invalid direction. */
 		for (DiagDirection dir = DIAGDIR_BEGIN; dir != DIAGDIR_END; dir++) {
-			if (HasBit(invalid_dirs, dir) && !CanBuildDepotByTileh(dir, tileh)) {
+			if (invalid_dirs.Test(dir) && !CanBuildDepotByTileh(dir, tileh)) {
 				return CommandCost(STR_ERROR_FLAT_LAND_REQUIRED);
 			}
 		}
@@ -851,7 +852,7 @@ static CommandCost CheckFlatLandAirport(AirportTileTableIterator tile_iter, DoCo
 	int allowed_z = -1;
 
 	for (; tile_iter != INVALID_TILE; ++tile_iter) {
-		CommandCost ret = CheckBuildableTile(tile_iter, 0, allowed_z, true);
+		CommandCost ret = CheckBuildableTile(tile_iter, {}, allowed_z, true);
 		if (ret.Failed()) return ret;
 		cost.AddCost(ret.GetCost());
 
@@ -882,7 +883,7 @@ static CommandCost CheckFlatLandAirport(AirportTileTableIterator tile_iter, DoCo
 static CommandCost CheckFlatLandRailStation(TileIndex tile_cur, TileIndex north_tile, int &allowed_z, DoCommandFlags flags, Axis axis, StationID *station, RailType rt, std::vector<Train *> &affected_vehicles, StationClassID spec_class, uint16_t spec_index, uint8_t plat_len, uint8_t numtracks)
 {
 	CommandCost cost(EXPENSES_CONSTRUCTION);
-	uint invalid_dirs = 5 << axis;
+	DiagDirections invalid_dirs = AxisToDiagDirs(axis);
 
 	const StationSpec *statspec = StationClass::Get(spec_class)->GetSpec(spec_index);
 	bool slope_cb = statspec != nullptr && statspec->callback_mask.Test(StationCallbackMask::SlopeCheck);
@@ -921,7 +922,7 @@ static CommandCost CheckFlatLandRailStation(TileIndex tile_cur, TileIndex north_
 			if (HasPowerOnRail(GetRailType(tile_cur), rt)) {
 				TrackBits tracks = GetTrackBits(tile_cur);
 				Track track = RemoveFirstTrack(&tracks);
-				Track expected_track = HasBit(invalid_dirs, DIAGDIR_NE) ? TRACK_X : TRACK_Y;
+				Track expected_track = invalid_dirs.Test(DIAGDIR_NE) ? TRACK_X : TRACK_Y;
 
 				/* The existing track must align with the desired station axis. */
 				if (tracks == TRACK_BIT_NONE && track == expected_track) {
@@ -961,7 +962,7 @@ static CommandCost CheckFlatLandRailStation(TileIndex tile_cur, TileIndex north_
  * @param rt Road type to build, may be INVALID_ROADTYPE if an existing road is required.
  * @return The cost in case of success, or an error code if it failed.
  */
-CommandCost CheckFlatLandRoadStop(TileIndex cur_tile, int &allowed_z, DoCommandFlags flags, uint invalid_dirs, bool is_drive_through, StationType station_type, Axis axis, StationID *station, RoadType rt)
+static CommandCost CheckFlatLandRoadStop(TileIndex cur_tile, int &allowed_z, DoCommandFlags flags, DiagDirections invalid_dirs, bool is_drive_through, StationType station_type, Axis axis, StationID *station, RoadType rt)
 {
 	CommandCost cost(EXPENSES_CONSTRUCTION);
 
@@ -1419,7 +1420,7 @@ CommandCost CmdBuildRailStation(DoCommandFlags flags, TileIndex tile_org, RailTy
 		if (statspec != nullptr) {
 			/* Include this station spec's animation trigger bitmask
 			 * in the station's cached copy. */
-			st->cached_anim_triggers |= statspec->animation.triggers;
+			st->cached_anim_triggers.Set(statspec->animation.triggers);
 		}
 
 		TileIndexDiff tile_delta = TileOffsByAxis(axis); // offset to go to the next platform tile
@@ -1480,7 +1481,7 @@ CommandCost CmdBuildRailStation(DoCommandFlags flags, TileIndex tile_org, RailTy
 					}
 
 					/* Trigger station animation -- after building? */
-					TriggerStationAnimation(st, tile, SAT_BUILT);
+					TriggerStationAnimation(st, tile, StationAnimationTrigger::Built);
 				}
 
 				SetRailStationTileFlags(tile, statspec);
@@ -1914,12 +1915,12 @@ static CommandCost FindJoiningRoadStop(StationID existing_stop, StationID statio
  */
 CommandCost CalculateRoadStopCost(TileArea tile_area, DoCommandFlags flags, bool is_drive_through, StationType station_type, Axis axis, DiagDirection ddir, StationID *est, RoadType rt, Money unit_cost)
 {
-	uint invalid_dirs = 0;
+	DiagDirections invalid_dirs{};
 	if (is_drive_through) {
-		SetBit(invalid_dirs, AxisToDiagDir(axis));
-		SetBit(invalid_dirs, ReverseDiagDir(AxisToDiagDir(axis)));
+		invalid_dirs.Set(AxisToDiagDir(axis));
+		invalid_dirs.Set(ReverseDiagDir(AxisToDiagDir(axis)));
 	} else {
-		SetBit(invalid_dirs, ddir);
+		invalid_dirs.Set(ddir);
 	}
 
 	/* Check every tile in the area. */
@@ -2050,7 +2051,7 @@ CommandCost CmdBuildRoadStop(DoCommandFlags flags, TileIndex tile, uint8_t width
 			if (roadstopspec != nullptr) {
 				/* Include this road stop spec's animation trigger bitmask
 				 * in the station's cached copy. */
-				st->cached_roadstop_anim_triggers |= roadstopspec->animation.triggers;
+				st->cached_roadstop_anim_triggers.Set(roadstopspec->animation.triggers);
 			}
 
 			RoadStop *road_stop = new RoadStop(cur_tile);
@@ -2095,7 +2096,7 @@ CommandCost CmdBuildRoadStop(DoCommandFlags flags, TileIndex tile, uint8_t width
 			SetCustomRoadStopSpecIndex(cur_tile, specindex);
 			if (roadstopspec != nullptr) {
 				st->SetRoadStopRandomBits(cur_tile, GB(Random(), 0, 8));
-				TriggerRoadStopAnimation(st, cur_tile, SAT_BUILT);
+				TriggerRoadStopAnimation(st, cur_tile, StationAnimationTrigger::Built);
 			}
 
 			MarkTileDirtyByTile(cur_tile);
@@ -2108,24 +2109,6 @@ CommandCost CmdBuildRoadStop(DoCommandFlags flags, TileIndex tile, uint8_t width
 	return cost;
 }
 
-
-static Vehicle *ClearRoadStopStatusEnum(Vehicle *v, void *)
-{
-	if (v->type == VEH_ROAD) {
-		/* Okay... we are a road vehicle on a drive through road stop.
-		 * But that road stop has just been removed, so we need to make
-		 * sure we are in a valid state... however, vehicles can also
-		 * turn on road stop tiles, so only clear the 'road stop' state
-		 * bits and only when the state was 'in road stop', otherwise
-		 * we'll end up clearing the turn around bits. */
-		RoadVehicle *rv = RoadVehicle::From(v);
-		if (HasBit(rv->state, RVS_IN_DT_ROAD_STOP)) rv->state &= RVSB_ROAD_STOP_TRACKDIR_MASK;
-	}
-
-	return nullptr;
-}
-
-
 /**
  * Remove a bus station/truck stop
  * @param tile TileIndex been queried
@@ -2159,7 +2142,19 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlags flags, int repl
 	/* don't do the check for drive-through road stops when company bankrupts */
 	if (IsDriveThroughStopTile(tile) && flags.Test(DoCommandFlag::Bankrupt)) {
 		/* remove the 'going through road stop' status from all vehicles on that tile */
-		if (flags.Test(DoCommandFlag::Execute)) FindVehicleOnPos(tile, nullptr, &ClearRoadStopStatusEnum);
+		if (flags.Test(DoCommandFlag::Execute)) {
+			for (Vehicle *v : VehiclesOnTile(tile)) {
+				if (v->type != VEH_ROAD) continue;
+				/* Okay... we are a road vehicle on a drive through road stop.
+				 * But that road stop has just been removed, so we need to make
+				 * sure we are in a valid state... however, vehicles can also
+				 * turn on road stop tiles, so only clear the 'road stop' state
+				 * bits and only when the state was 'in road stop', otherwise
+				 * we'll end up clearing the turn around bits. */
+				RoadVehicle *rv = RoadVehicle::From(v);
+				if (HasBit(rv->state, RVS_IN_DT_ROAD_STOP)) rv->state &= RVSB_ROAD_STOP_TRACKDIR_MASK;
+			}
+		}
 	} else {
 		CommandCost ret = EnsureNoVehicleOnGround(tile);
 		if (ret.Failed()) return ret;
@@ -2292,7 +2287,7 @@ CommandCost RemoveRoadWaypointStop(TileIndex tile, DoCommandFlags flags, int rep
 
 			/* if we deleted the whole waypoint, delete the road facility. */
 			if (wp->road_waypoint_area.tile == INVALID_TILE) {
-				wp->facilities.Reset(StationFacility::BusStop).Reset(StationFacility::TruckStop);
+				wp->facilities.Reset({StationFacility::BusStop, StationFacility::TruckStop});
 				SetWindowWidgetDirty(WC_STATION_VIEW, wp->index, WID_SV_ROADVEHS);
 				wp->UpdateVirtCoord();
 				DeleteStationIfEmpty(wp);
@@ -2546,7 +2541,7 @@ CommandCost CmdBuildAirport(DoCommandFlags flags, TileIndex tile, uint8_t airpor
 		return CommandCost(STR_ERROR_STATION_TOO_SPREAD_OUT);
 	}
 
-	AirportTileTableIterator tile_iter(as->layouts[layout].tiles.data(), tile);
+	AirportTileTableIterator tile_iter(as->layouts[layout].tiles, tile);
 	CommandCost cost = CheckFlatLandAirport(tile_iter, flags);
 	if (cost.Failed()) return cost;
 
@@ -2595,7 +2590,7 @@ CommandCost CmdBuildAirport(DoCommandFlags flags, TileIndex tile, uint8_t airpor
 		return CommandCost(STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT);
 	}
 
-	for (AirportTileTableIterator iter(as->layouts[layout].tiles.data(), tile); iter != INVALID_TILE; ++iter) {
+	for (AirportTileTableIterator iter(as->layouts[layout].tiles, tile); iter != INVALID_TILE; ++iter) {
 		cost.AddCost(_price[PR_BUILD_STATION_AIRPORT]);
 	}
 
@@ -2611,18 +2606,18 @@ CommandCost CmdBuildAirport(DoCommandFlags flags, TileIndex tile, uint8_t airpor
 
 		st->rect.BeforeAddRect(tile, w, h, StationRect::ADD_TRY);
 
-		for (AirportTileTableIterator iter(as->layouts[layout].tiles.data(), tile); iter != INVALID_TILE; ++iter) {
+		for (AirportTileTableIterator iter(as->layouts[layout].tiles, tile); iter != INVALID_TILE; ++iter) {
 			Tile t(iter);
 			MakeAirport(t, st->owner, st->index, iter.GetStationGfx(), WATER_CLASS_INVALID);
 			SetStationTileRandomBits(t, GB(Random(), 0, 4));
 			st->airport.Add(iter);
 
-			if (AirportTileSpec::Get(GetTranslatedAirportTileID(iter.GetStationGfx()))->animation.status != ANIM_STATUS_NO_ANIMATION) AddAnimatedTile(t);
+			if (AirportTileSpec::Get(GetTranslatedAirportTileID(iter.GetStationGfx()))->animation.status != AnimationStatus::NoAnimation) AddAnimatedTile(t);
 		}
 
 		/* Only call the animation trigger after all tiles have been built */
-		for (AirportTileTableIterator iter(as->layouts[layout].tiles.data(), tile); iter != INVALID_TILE; ++iter) {
-			AirportTileAnimationTrigger(st, iter, AAT_BUILT);
+		for (AirportTileTableIterator iter(as->layouts[layout].tiles, tile); iter != INVALID_TILE; ++iter) {
+			TriggerAirportTileAnimation(st, iter, AirportAnimationTrigger::Built);
 		}
 
 		UpdateAirplanesOnNewStation(st);
@@ -2757,8 +2752,8 @@ bool HasStationInUse(StationID station, bool include_company, CompanyID company)
 		assert(v != nullptr);
 		if ((v->owner == company) != include_company) continue;
 
-		for (const Order *order = orderlist->GetFirstOrder(); order != nullptr; order = order->next) {
-			if (order->GetDestination() == station && (order->IsType(OT_GOTO_STATION) || order->IsType(OT_GOTO_WAYPOINT))) {
+		for (const Order &order : orderlist->GetOrders()) {
+			if (order.GetDestination() == station && (order.IsType(OT_GOTO_STATION) || order.IsType(OT_GOTO_WAYPOINT))) {
 				return true;
 			}
 		}
@@ -3081,7 +3076,8 @@ bool SplitGroundSpriteForOverlay(const TileInfo *ti, SpriteID *ground, RailTrack
 static void DrawTile_Station(TileInfo *ti)
 {
 	const NewGRFSpriteLayout *layout = nullptr;
-	DrawTileSpriteSpan tmp_rail_layout;
+	SpriteLayoutProcessor processor; // owns heap, borrowed by tmp_layout and t
+	DrawTileSpriteSpan tmp_layout;
 	const DrawTileSprites *t = nullptr;
 	int32_t total_offset;
 	const RailTypeInfo *rti = nullptr;
@@ -3127,7 +3123,7 @@ static void DrawTile_Station(TileInfo *ti)
 		gfx = GetAirportGfx(ti->tile);
 		if (gfx >= NEW_AIRPORTTILE_OFFSET) {
 			const AirportTileSpec *ats = AirportTileSpec::Get(gfx);
-			if (ats->grf_prop.GetSpriteGroup() != nullptr && DrawNewAirportTile(ti, Station::GetByTile(ti->tile), ats)) {
+			if (ats->grf_prop.HasSpriteGroups() && DrawNewAirportTile(ti, Station::GetByTile(ti->tile), ats)) {
 				return;
 			}
 			/* No sprite group (or no valid one) found, meaning no graphics associated.
@@ -3158,7 +3154,7 @@ static void DrawTile_Station(TileInfo *ti)
 
 	PaletteID palette;
 	if (Company::IsValidID(owner)) {
-		palette = COMPANY_SPRITE_COLOUR(owner);
+		palette = GetCompanyPalette(owner);
 	} else {
 		/* Some stations are not owner by a company, namely oil rigs */
 		palette = PALETTE_TO_GREY;
@@ -3273,13 +3269,10 @@ draw_default_foundation:
 		if (layout != nullptr) {
 			/* Sprite layout which needs preprocessing */
 			bool separate_ground = statspec->flags.Test(StationSpecFlag::SeparateGround);
-			uint32_t var10_values = layout->PrepareLayout(total_offset, rti->fallback_railtype, 0, 0, separate_ground);
-			for (uint8_t var10 : SetBitIterator(var10_values)) {
-				uint32_t var10_relocation = GetCustomStationRelocation(statspec, st, ti->tile, var10);
-				layout->ProcessRegisters(var10, var10_relocation, separate_ground);
-			}
-			tmp_rail_layout.seq = layout->GetLayout(&tmp_rail_layout.ground);
-			t = &tmp_rail_layout;
+			processor = SpriteLayoutProcessor(*layout, total_offset, rti->fallback_railtype, 0, 0, separate_ground);
+			GetCustomStationRelocation(processor, statspec, st, ti->tile);
+			tmp_layout = processor.GetLayout();
+			t = &tmp_layout;
 			total_offset = 0;
 		} else if (statspec != nullptr) {
 			/* Simple sprite layout */
@@ -3334,16 +3327,18 @@ draw_default_foundation:
 		if (stopspec != nullptr) {
 			stop_draw_mode = stopspec->draw_mode;
 			st = BaseStation::GetByTile(ti->tile);
-			RoadStopResolverObject object(stopspec, st, ti->tile, INVALID_ROADTYPE, type, view);
-			const SpriteGroup *group = object.Resolve();
-			if (group != nullptr && group->type == SGT_TILELAYOUT) {
+			std::array<int32_t, 1> regs100;
+			auto result = GetRoadStopLayout(ti, stopspec, st, type, view, regs100);
+			if (result.has_value()) {
 				if (stopspec->flags.Test(RoadStopSpecFlag::DrawModeRegister)) {
-					stop_draw_mode = static_cast<RoadStopDrawMode>(GetRegister(0x100));
+					stop_draw_mode = static_cast<RoadStopDrawMode>(regs100[0]);
 				}
 				if (type == StationType::RoadWaypoint && stop_draw_mode.Test(RoadStopDrawMode::WaypGround)) {
 					draw_ground = true;
 				}
-				t = ((const TileLayoutSpriteGroup *)group)->ProcessRegisters(nullptr);
+				processor = std::move(*result);
+				tmp_layout = processor.GetLayout();
+				t = &tmp_layout;
 			}
 		}
 
@@ -3390,7 +3385,7 @@ draw_default_foundation:
 void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, RoadType roadtype, int image)
 {
 	int32_t total_offset = 0;
-	PaletteID pal = COMPANY_SPRITE_COLOUR(_local_company);
+	PaletteID pal = GetCompanyPalette(_local_company);
 	const DrawTileSprites *t = GetStationTileLayout(st, image);
 	const RailTypeInfo *railtype_info = nullptr;
 
@@ -3607,9 +3602,15 @@ static TrackStatus GetTileTrackStatus_Station(TileIndex tile, TransportType mode
 
 static void TileLoop_Station(TileIndex tile)
 {
+	auto *st = BaseStation::GetByTile(tile);
 	switch (GetStationType(tile)) {
 		case StationType::Airport:
-			AirportTileAnimationTrigger(Station::GetByTile(tile), tile, AAT_TILELOOP);
+			TriggerAirportTileAnimation(Station::From(st), tile, AirportAnimationTrigger::TileLoop);
+			break;
+
+		case StationType::Rail:
+		case StationType::RailWaypoint:
+			TriggerStationAnimation(st, tile, StationAnimationTrigger::TileLoop);
 			break;
 
 		case StationType::Dock:
@@ -3621,6 +3622,11 @@ static void TileLoop_Station(TileIndex tile)
 			TileLoop_Water(tile);
 			break;
 
+		case StationType::Truck:
+		case StationType::Bus:
+			TriggerRoadStopAnimation(st, tile, StationAnimationTrigger::TileLoop);
+			break;
+
 		case StationType::RoadWaypoint: {
 			switch (_settings_game.game_creation.landscape) {
 				case LandscapeType::Arctic:
@@ -3640,20 +3646,22 @@ static void TileLoop_Station(TileIndex tile)
 				default: break;
 			}
 
-			HouseZonesBits new_zone = HZB_TOWN_EDGE;
+			HouseZone new_zone = HouseZone::TownEdge;
 			const Town *t = ClosestTownFromTile(tile, UINT_MAX);
 			if (t != nullptr) {
 				new_zone = GetTownRadiusGroup(t, tile);
 			}
 
 			/* Adjust road ground type depending on 'new_zone' */
-			Roadside new_rs = new_zone > HZB_TOWN_EDGE ? ROADSIDE_PAVED : ROADSIDE_GRASS;
+			Roadside new_rs = new_zone != HouseZone::TownEdge ? ROADSIDE_PAVED : ROADSIDE_GRASS;
 			Roadside cur_rs = GetRoadWaypointRoadside(tile);
 
 			if (new_rs != cur_rs) {
 				SetRoadWaypointRoadside(tile, cur_rs == ROADSIDE_BARREN ? new_rs : ROADSIDE_BARREN);
 				MarkTileDirtyByTile(tile);
 			}
+
+			TriggerRoadStopAnimation(st, tile, StationAnimationTrigger::TileLoop);
 			break;
 		}
 
@@ -3696,12 +3704,12 @@ static bool ClickTile_Station(TileIndex tile)
 	return true;
 }
 
-static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y)
+static VehicleEnterTileStates VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y)
 {
 	if (v->type == VEH_TRAIN) {
 		StationID station_id = GetStationIndex(tile);
-		if (!v->current_order.ShouldStopAtStation(v, station_id)) return VETSB_CONTINUE;
-		if (!IsRailStation(tile) || !v->IsFrontEngine()) return VETSB_CONTINUE;
+		if (!v->current_order.ShouldStopAtStation(v, station_id)) return {};
+		if (!IsRailStation(tile) || !v->IsFrontEngine()) return {};
 
 		int station_ahead;
 		int station_length;
@@ -3711,7 +3719,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i
 		 * begin of the platform to the stop location is longer than the length
 		 * of the platform. Station ahead 'includes' the current tile where the
 		 * vehicle is on, so we need to subtract that. */
-		if (stop + station_ahead - (int)TILE_SIZE >= station_length) return VETSB_CONTINUE;
+		if (stop + station_ahead - (int)TILE_SIZE >= station_length) return {};
 
 		DiagDirection dir = DirToDiagDir(v->direction);
 
@@ -3724,7 +3732,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i
 			stop &= TILE_SIZE - 1;
 
 			if (x == stop) {
-				return VETSB_ENTERED_STATION | static_cast<VehicleEnterTileStatus>(station_id.base() << VETS_STATION_ID_OFFSET); // enter station
+				return VehicleEnterTileState::EnteredStation; // enter station
 			} else if (x < stop) {
 				v->vehstatus.Set(VehState::TrainSlowing);
 				uint16_t spd = std::max(0, (stop - x) * 20 - 15);
@@ -3736,12 +3744,13 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i
 		if (rv->state < RVSB_IN_ROAD_STOP && !IsReversingRoadTrackdir((Trackdir)rv->state) && rv->frame == 0) {
 			if (IsStationRoadStop(tile) && rv->IsFrontEngine()) {
 				/* Attempt to allocate a parking bay in a road stop */
-				return RoadStop::GetByTile(tile, GetRoadStopType(tile))->Enter(rv) ? VETSB_CONTINUE : VETSB_CANNOT_ENTER;
+				if (RoadStop::GetByTile(tile, GetRoadStopType(tile))->Enter(rv)) return {};
+				return VehicleEnterTileState::CannotEnter;
 			}
 		}
 	}
 
-	return VETSB_CONTINUE;
+	return {};
 }
 
 /**
@@ -3763,7 +3772,7 @@ void TriggerWatchedCargoCallbacks(Station *st)
 	BitmapTileIterator it(st->catchment_tiles);
 	for (TileIndex tile = it; tile != INVALID_TILE; tile = ++it) {
 		if (IsTileType(tile, MP_HOUSE)) {
-			WatchedCargoCallback(tile, cargoes);
+			TriggerHouseAnimation_WatchedCargoAccepted(tile, cargoes);
 		}
 	}
 }
@@ -4036,15 +4045,15 @@ void DeleteStaleLinks(Station *from)
 					/* Have all vehicles refresh their next hops before deciding to
 					 * remove the node. */
 					std::vector<Vehicle *> vehicles;
-					for (OrderList *l : OrderList::Iterate()) {
+					for (const OrderList *l : OrderList::Iterate()) {
 						bool found_from = false;
 						bool found_to = false;
-						for (Order *order = l->GetFirstOrder(); order != nullptr; order = order->next) {
-							if (!order->IsType(OT_GOTO_STATION) && !order->IsType(OT_IMPLICIT)) continue;
-							if (order->GetDestination() == from->index) {
+						for (const Order &order : l->GetOrders()) {
+							if (!order.IsType(OT_GOTO_STATION) && !order.IsType(OT_IMPLICIT)) continue;
+							if (order.GetDestination() == from->index) {
 								found_from = true;
 								if (found_to) break;
-							} else if (order->GetDestination() == to->index) {
+							} else if (order.GetDestination() == to->index) {
 								found_to = true;
 								if (found_from) break;
 							}
@@ -4210,15 +4219,15 @@ void OnTick_Station()
 
 		/* Spread out station animation over STATION_ACCEPTANCE_TICKS ticks. */
 		if ((TimerGameTick::counter + st->index) % Ticks::STATION_ACCEPTANCE_TICKS == 0) {
-			TriggerStationAnimation(st, st->xy, SAT_250_TICKS);
-			TriggerRoadStopAnimation(st, st->xy, SAT_250_TICKS);
-			if (Station::IsExpected(st)) AirportAnimationTrigger(Station::From(st), AAT_STATION_250_TICKS);
+			TriggerStationAnimation(st, st->xy, StationAnimationTrigger::AcceptanceTick);
+			TriggerRoadStopAnimation(st, st->xy, StationAnimationTrigger::AcceptanceTick);
+			if (Station::IsExpected(st)) TriggerAirportAnimation(Station::From(st), AirportAnimationTrigger::AcceptanceTick);
 		}
 	}
 }
 
 /** Economy monthly loop for stations. */
-static IntervalTimer<TimerGameEconomy> _economy_stations_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::STATION}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_stations_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::STATION}, [](auto)
 {
 	for (Station *st : Station::Iterate()) {
 		for (GoodsEntry &ge : st->goods) {
@@ -4277,11 +4286,11 @@ static uint UpdateStationWaiting(Station *st, CargoType cargo, uint amount, Sour
 		ge.status.Set(GoodsEntry::State::Rating);
 	}
 
-	TriggerStationRandomisation(st, st->xy, SRT_NEW_CARGO, cargo);
-	TriggerStationAnimation(st, st->xy, SAT_NEW_CARGO, cargo);
-	AirportAnimationTrigger(st, AAT_STATION_NEW_CARGO, cargo);
-	TriggerRoadStopRandomisation(st, st->xy, RSRT_NEW_CARGO, cargo);
-	TriggerRoadStopAnimation(st, st->xy, SAT_NEW_CARGO, cargo);
+	TriggerStationRandomisation(st, st->xy, StationRandomTrigger::NewCargo, cargo);
+	TriggerStationAnimation(st, st->xy, StationAnimationTrigger::NewCargo, cargo);
+	TriggerAirportAnimation(st, AirportAnimationTrigger::NewCargo, cargo);
+	TriggerRoadStopRandomisation(st, st->xy, StationRandomTrigger::NewCargo, cargo);
+	TriggerRoadStopAnimation(st, st->xy, StationAnimationTrigger::NewCargo, cargo);
 
 
 	SetWindowDirty(WC_STATION_VIEW, st->index);
@@ -4422,8 +4431,8 @@ uint MoveGoodsToStation(CargoType cargo, uint amount, Source source, const Stati
 		return UpdateStationWaiting(first_station, cargo, amount, source);
 	}
 
-	ReferenceThroughBaseContainer<std::array<uint32_t, OWNER_END.base()>> company_best = {};  // best rating for each company, including OWNER_NONE
-	ReferenceThroughBaseContainer<std::array<uint32_t, OWNER_END.base()>> company_sum = {};   // sum of ratings for each company
+	TypedIndexContainer<std::array<uint32_t, OWNER_END.base()>, Owner> company_best = {};  // best rating for each company, including OWNER_NONE
+	TypedIndexContainer<std::array<uint32_t, OWNER_END.base()>, Owner> company_sum = {};   // sum of ratings for each company
 	uint best_rating = 0;
 	uint best_sum = 0;  // sum of best ratings for each company
 
diff --git a/src/station_cmd.h b/src/station_cmd.h
index e1310da686..cd5c69b7fa 100644
--- a/src/station_cmd.h
+++ b/src/station_cmd.h
@@ -11,8 +11,12 @@
 #define STATION_CMD_H
 
 #include "command_type.h"
+#include "rail_type.h"
+#include "road_type.h"
 #include "station_type.h"
 
+struct Town;
+
 enum StationClassID : uint16_t;
 enum RoadStopClassID : uint16_t;
 
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 160f1d1eb1..4f0979ec86 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -469,7 +469,7 @@ public:
 			}
 
 			case WID_STL_LIST:
-				resize.height = std::max(GetCharacterHeight(FS_NORMAL), GetCharacterHeight(FS_SMALL) + ScaleGUITrad(3));
+				fill.height = resize.height = std::max(GetCharacterHeight(FS_NORMAL), GetCharacterHeight(FS_SMALL) + ScaleGUITrad(3));
 				size.height = padding.height + 5 * resize.height;
 
 				/* Determine appropriate width for mini station rating graph */
@@ -631,8 +631,8 @@ public:
 					this->filter.facilities.Flip(static_cast<StationFacility>(widget - WID_STL_TRAIN));
 					this->ToggleWidgetLoweredState(widget);
 				} else {
-					for (uint i : SetBitIterator(this->filter.facilities.base())) {
-						this->RaiseWidget(i + WID_STL_TRAIN);
+					for (StationFacility i : this->filter.facilities) {
+						this->RaiseWidget(to_underlying(i) + WID_STL_TRAIN);
 					}
 					this->filter.facilities = {};
 					this->filter.facilities.Set(static_cast<StationFacility>(widget - WID_STL_TRAIN));
@@ -668,7 +668,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(int widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget == WID_STL_SORTDROPBTN) {
 			if (this->stations.SortType() != index) {
@@ -889,9 +889,13 @@ enum class CargoSortType : uint8_t {
 
 class CargoSorter {
 public:
+	using is_transparent = void;
 	CargoSorter(CargoSortType t = CargoSortType::StationID, SortOrder o = SO_ASCENDING) : type(t), order(o) {}
 	CargoSortType GetSortType() {return this->type;}
-	bool operator()(const CargoDataEntry *cd1, const CargoDataEntry *cd2) const;
+	bool operator()(const CargoDataEntry &cd1, const CargoDataEntry &cd2) const;
+	bool operator()(const CargoDataEntry &cd1, const std::unique_ptr<CargoDataEntry> &cd2) const { return this->operator()(cd1, *cd2); }
+	bool operator()(const std::unique_ptr<CargoDataEntry> &cd1, const CargoDataEntry &cd2) const { return this->operator()(*cd1, cd2); }
+	bool operator()(const std::unique_ptr<CargoDataEntry> &cd1, const std::unique_ptr<CargoDataEntry> &cd2) const { return this->operator()(*cd1, *cd2); }
 
 private:
 	CargoSortType type;
@@ -899,11 +903,11 @@ private:
 
 	template <class Tid>
 	bool SortId(Tid st1, Tid st2) const;
-	bool SortCount(const CargoDataEntry *cd1, const CargoDataEntry *cd2) const;
-	bool SortStation (StationID st1, StationID st2) const;
+	bool SortCount(const CargoDataEntry &cd1, const CargoDataEntry &cd2) const;
+	bool SortStation(StationID st1, StationID st2) const;
 };
 
-typedef std::set<CargoDataEntry *, CargoSorter> CargoDataSet;
+typedef std::set<std::unique_ptr<CargoDataEntry>, CargoSorter> CargoDataSet;
 
 /**
  * A cargo data entry representing one possible row in the station view window's
@@ -920,7 +924,7 @@ public:
 	 * @param station ID of the station for which an entry shall be created or retrieved
 	 * @return a child entry associated with the given station.
 	 */
-	CargoDataEntry *InsertOrRetrieve(StationID station)
+	CargoDataEntry &InsertOrRetrieve(StationID station)
 	{
 		return this->InsertOrRetrieve<StationID>(station);
 	}
@@ -930,7 +934,7 @@ public:
 	 * @param cargo type of the cargo for which an entry shall be created or retrieved
 	 * @return a child entry associated with the given cargo.
 	 */
-	CargoDataEntry *InsertOrRetrieve(CargoType cargo)
+	CargoDataEntry &InsertOrRetrieve(CargoType cargo)
 	{
 		return this->InsertOrRetrieve<CargoType>(cargo);
 	}
@@ -944,7 +948,7 @@ public:
 	void Remove(StationID station)
 	{
 		CargoDataEntry t(station);
-		this->Remove(&t);
+		this->Remove(t);
 	}
 
 	/**
@@ -954,7 +958,7 @@ public:
 	void Remove(CargoType cargo)
 	{
 		CargoDataEntry t(cargo);
-		this->Remove(&t);
+		this->Remove(t);
 	}
 
 	/**
@@ -965,7 +969,7 @@ public:
 	CargoDataEntry *Retrieve(StationID station) const
 	{
 		CargoDataEntry t(station);
-		return this->Retrieve(this->children->find(&t));
+		return this->Retrieve(this->children->find(t));
 	}
 
 	/**
@@ -976,7 +980,7 @@ public:
 	CargoDataEntry *Retrieve(CargoType cargo) const
 	{
 		CargoDataEntry t(cargo);
-		return this->Retrieve(this->children->find(&t));
+		return this->Retrieve(this->children->find(t));
 	}
 
 	void Resort(CargoSortType type, SortOrder order);
@@ -1027,19 +1031,19 @@ public:
 	void SetTransfers(bool value) { this->transfers = value; }
 
 	void Clear();
-private:
 
 	CargoDataEntry(StationID station, uint count, CargoDataEntry *parent);
 	CargoDataEntry(CargoType cargo, uint count, CargoDataEntry *parent);
 	CargoDataEntry(StationID station);
 	CargoDataEntry(CargoType cargo);
 
+private:
 	CargoDataEntry *Retrieve(CargoDataSet::iterator i) const;
 
 	template <class Tid>
-	CargoDataEntry *InsertOrRetrieve(Tid s);
+	CargoDataEntry &InsertOrRetrieve(Tid s);
 
-	void Remove(CargoDataEntry *entry);
+	void Remove(CargoDataEntry &entry);
 	void IncrementSize();
 
 	CargoDataEntry *parent;   ///< the parent of this entry.
@@ -1052,7 +1056,7 @@ private:
 	};
 	uint num_children;        ///< the number of subentries belonging to this entry.
 	uint count;               ///< sum of counts of all children or amount of cargo for this entry.
-	CargoDataSet *children;   ///< the children of this entry.
+	std::unique_ptr<CargoDataSet> children;   ///< the children of this entry.
 };
 
 CargoDataEntry::CargoDataEntry() :
@@ -1060,7 +1064,7 @@ CargoDataEntry::CargoDataEntry() :
 	station(StationID::Invalid()),
 	num_children(0),
 	count(0),
-	children(new CargoDataSet(CargoSorter(CargoSortType::CargoType)))
+	children(std::make_unique<CargoDataSet>(CargoSorter(CargoSortType::CargoType)))
 {}
 
 CargoDataEntry::CargoDataEntry(CargoType cargo, uint count, CargoDataEntry *parent) :
@@ -1068,7 +1072,7 @@ CargoDataEntry::CargoDataEntry(CargoType cargo, uint count, CargoDataEntry *pare
 	cargo(cargo),
 	num_children(0),
 	count(count),
-	children(new CargoDataSet)
+	children(std::make_unique<CargoDataSet>())
 {}
 
 CargoDataEntry::CargoDataEntry(StationID station, uint count, CargoDataEntry *parent) :
@@ -1076,7 +1080,7 @@ CargoDataEntry::CargoDataEntry(StationID station, uint count, CargoDataEntry *pa
 	station(station),
 	num_children(0),
 	count(count),
-	children(new CargoDataSet)
+	children(std::make_unique<CargoDataSet>())
 {}
 
 CargoDataEntry::CargoDataEntry(StationID station) :
@@ -1098,7 +1102,6 @@ CargoDataEntry::CargoDataEntry(CargoType cargo) :
 CargoDataEntry::~CargoDataEntry()
 {
 	this->Clear();
-	delete this->children;
 }
 
 /**
@@ -1106,13 +1109,7 @@ CargoDataEntry::~CargoDataEntry()
  */
 void CargoDataEntry::Clear()
 {
-	if (this->children != nullptr) {
-		for (auto &it : *this->children) {
-			assert(it != this);
-			delete it;
-		}
-		this->children->clear();
-	}
+	if (this->children != nullptr) this->children->clear();
 	if (this->parent != nullptr) this->parent->count -= this->count;
 	this->count = 0;
 	this->num_children = 0;
@@ -1124,13 +1121,10 @@ void CargoDataEntry::Clear()
  * which only contains the ID of the entry to be removed. In this case child is
  * not deleted.
  */
-void CargoDataEntry::Remove(CargoDataEntry *entry)
+void CargoDataEntry::Remove(CargoDataEntry &entry)
 {
 	CargoDataSet::iterator i = this->children->find(entry);
-	if (i != this->children->end()) {
-		delete *i;
-		this->children->erase(i);
-	}
+	if (i != this->children->end()) this->children->erase(i);
 }
 
 /**
@@ -1140,17 +1134,16 @@ void CargoDataEntry::Remove(CargoDataEntry *entry)
  * @return the new or retrieved subentry
  */
 template <class Tid>
-CargoDataEntry *CargoDataEntry::InsertOrRetrieve(Tid child_id)
+CargoDataEntry &CargoDataEntry::InsertOrRetrieve(Tid child_id)
 {
 	CargoDataEntry tmp(child_id);
-	CargoDataSet::iterator i = this->children->find(&tmp);
+	CargoDataSet::iterator i = this->children->find(tmp);
 	if (i == this->children->end()) {
 		IncrementSize();
-		return *(this->children->insert(new CargoDataEntry(child_id, 0, this)).first);
+		return **(this->children->insert(std::make_unique<CargoDataEntry>(child_id, 0, this)).first);
 	} else {
-		CargoDataEntry *ret = *i;
 		assert(this->children->value_comp().GetSortType() != CargoSortType::Count);
-		return ret;
+		return **i;
 	}
 }
 
@@ -1176,9 +1169,9 @@ void CargoDataEntry::IncrementSize()
 
 void CargoDataEntry::Resort(CargoSortType type, SortOrder order)
 {
-	CargoDataSet *new_subs = new CargoDataSet(this->children->begin(), this->children->end(), CargoSorter(type, order));
-	delete this->children;
-	this->children = new_subs;
+	auto new_children = std::make_unique<CargoDataSet>(CargoSorter(type, order));
+	new_children->merge(*this->children);
+	this->children = std::move(new_children);
 }
 
 CargoDataEntry *CargoDataEntry::Retrieve(CargoDataSet::iterator i) const
@@ -1187,21 +1180,21 @@ CargoDataEntry *CargoDataEntry::Retrieve(CargoDataSet::iterator i) const
 		return nullptr;
 	} else {
 		assert(this->children->value_comp().GetSortType() != CargoSortType::Count);
-		return *i;
+		return i->get();
 	}
 }
 
-bool CargoSorter::operator()(const CargoDataEntry *cd1, const CargoDataEntry *cd2) const
+bool CargoSorter::operator()(const CargoDataEntry &cd1, const CargoDataEntry &cd2) const
 {
 	switch (this->type) {
 		case CargoSortType::StationID:
-			return this->SortId<StationID>(cd1->GetStation(), cd2->GetStation());
+			return this->SortId<StationID>(cd1.GetStation(), cd2.GetStation());
 		case CargoSortType::CargoType:
-			return this->SortId<CargoType>(cd1->GetCargo(), cd2->GetCargo());
+			return this->SortId<CargoType>(cd1.GetCargo(), cd2.GetCargo());
 		case CargoSortType::Count:
 			return this->SortCount(cd1, cd2);
 		case CargoSortType::StationString:
-			return this->SortStation(cd1->GetStation(), cd2->GetStation());
+			return this->SortStation(cd1.GetStation(), cd2.GetStation());
 		default:
 			NOT_REACHED();
 	}
@@ -1213,12 +1206,12 @@ bool CargoSorter::SortId(Tid st1, Tid st2) const
 	return (this->order == SO_ASCENDING) ? st1 < st2 : st2 < st1;
 }
 
-bool CargoSorter::SortCount(const CargoDataEntry *cd1, const CargoDataEntry *cd2) const
+bool CargoSorter::SortCount(const CargoDataEntry &cd1, const CargoDataEntry &cd2) const
 {
-	uint c1 = cd1->GetCount();
-	uint c2 = cd2->GetCount();
+	uint c1 = cd1.GetCount();
+	uint c2 = cd2.GetCount();
 	if (c1 == c2) {
-		return this->SortStation(cd1->GetStation(), cd2->GetStation());
+		return this->SortStation(cd1.GetStation(), cd2.GetStation());
 	} else if (this->order == SO_ASCENDING) {
 		return c1 < c2;
 	} else {
@@ -1392,25 +1385,25 @@ struct StationViewWindow : public Window {
 			switch (groupings[i]) {
 				case GR_CARGO:
 					assert(i == 0);
-					data = data->InsertOrRetrieve(cargo);
+					data = &data->InsertOrRetrieve(cargo);
 					data->SetTransfers(source != this->window_number);
 					expand = expand->Retrieve(cargo);
 					break;
 				case GR_SOURCE:
 					if (auto_distributed || source != this->window_number) {
-						data = data->InsertOrRetrieve(source);
+						data = &data->InsertOrRetrieve(source);
 						expand = expand->Retrieve(source);
 					}
 					break;
 				case GR_NEXT:
 					if (auto_distributed) {
-						data = data->InsertOrRetrieve(next);
+						data = &data->InsertOrRetrieve(next);
 						expand = expand->Retrieve(next);
 					}
 					break;
 				case GR_DESTINATION:
 					if (auto_distributed) {
-						data = data->InsertOrRetrieve(dest);
+						data = &data->InsertOrRetrieve(dest);
 						expand = expand->Retrieve(dest);
 					}
 					break;
@@ -1423,7 +1416,7 @@ struct StationViewWindow : public Window {
 	{
 		switch (widget) {
 			case WID_SV_WAITING:
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				size.height = 4 * resize.height + padding.height;
 				this->expand_shrink_width = std::max(GetStringBoundingBox("-").width, GetStringBoundingBox("+").width);
 				break;
@@ -1461,7 +1454,7 @@ struct StationViewWindow : public Window {
 		this->SetWidgetLoweredState(WID_SV_CLOSE_AIRPORT, st->facilities.Test(StationFacility::Airport) && st->airport.blocks.Test(AirportBlock::AirportClosed));
 
 		extern const Station *_viewport_highlight_station;
-		this->SetWidgetDisabledState(WID_SV_CATCHMENT, st->facilities == StationFacilities{});
+		this->SetWidgetDisabledState(WID_SV_CATCHMENT, st->facilities.None());
 		this->SetWidgetLoweredState(WID_SV_CATCHMENT, _viewport_highlight_station == st);
 
 		this->DrawWidgets();
@@ -1498,7 +1491,7 @@ struct StationViewWindow : public Window {
 			/* Draw waiting cargo. */
 			NWidgetBase *nwi = this->GetWidget<NWidgetBase>(WID_SV_WAITING);
 			Rect waiting_rect = nwi->GetCurrentRect().Shrink(WidgetDimensions::scaled.framerect);
-			this->DrawEntries(&cargo, waiting_rect, pos, maxrows, 0);
+			this->DrawEntries(cargo, waiting_rect, pos, maxrows, 0);
 			scroll_to_row = INT_MAX;
 		}
 	}
@@ -1521,20 +1514,20 @@ struct StationViewWindow : public Window {
 	void RecalcDestinations(CargoType cargo)
 	{
 		const Station *st = Station::Get(this->window_number);
-		CargoDataEntry *entry = cached_destinations.InsertOrRetrieve(cargo);
-		entry->Clear();
+		CargoDataEntry &entry = cached_destinations.InsertOrRetrieve(cargo);
+		entry.Clear();
 
 		if (!st->goods[cargo].HasData()) return;
 
 		for (const auto &it : st->goods[cargo].GetData().flows) {
 			StationID from = it.first;
-			CargoDataEntry *source_entry = entry->InsertOrRetrieve(from);
+			CargoDataEntry &source_entry = entry.InsertOrRetrieve(from);
 			uint32_t prev_count = 0;
 			for (const auto &flow_it : *it.second.GetShares()) {
 				StationID via = flow_it.second;
-				CargoDataEntry *via_entry = source_entry->InsertOrRetrieve(via);
+				CargoDataEntry &via_entry = source_entry.InsertOrRetrieve(via);
 				if (via == this->window_number) {
-					via_entry->InsertOrRetrieve(via)->Update(flow_it.first - prev_count);
+					via_entry.InsertOrRetrieve(via).Update(flow_it.first - prev_count);
 				} else {
 					EstimateDestinations(cargo, from, via, flow_it.first - prev_count, via_entry);
 				}
@@ -1552,7 +1545,7 @@ struct StationViewWindow : public Window {
 	 * @param count Size of the batch of cargo.
 	 * @param dest CargoDataEntry to save the results in.
 	 */
-	void EstimateDestinations(CargoType cargo, StationID source, StationID next, uint count, CargoDataEntry *dest)
+	void EstimateDestinations(CargoType cargo, StationID source, StationID next, uint count, CargoDataEntry &dest)
 	{
 		if (Station::IsValidID(next) && Station::IsValidID(source)) {
 			GoodsEntry &ge = Station::Get(next)->goods[cargo];
@@ -1565,19 +1558,19 @@ struct StationViewWindow : public Window {
 				const FlowStat::SharesMap *shares = map_it->second.GetShares();
 				uint32_t prev_count = 0;
 				for (FlowStat::SharesMap::const_iterator i = shares->begin(); i != shares->end(); ++i) {
-					tmp.InsertOrRetrieve(i->second)->Update(i->first - prev_count);
+					tmp.InsertOrRetrieve(i->second).Update(i->first - prev_count);
 					prev_count = i->first;
 				}
 			}
 
 			if (tmp.GetCount() == 0) {
-				dest->InsertOrRetrieve(StationID::Invalid())->Update(count);
+				dest.InsertOrRetrieve(StationID::Invalid()).Update(count);
 			} else {
 				uint sum_estimated = 0;
 				while (sum_estimated < count) {
 					for (CargoDataSet::iterator i = tmp.Begin(); i != tmp.End() && sum_estimated < count; ++i) {
-						CargoDataEntry *child = *i;
-						uint estimate = DivideApprox(child->GetCount() * count, tmp.GetCount());
+						CargoDataEntry &child = **i;
+						uint estimate = DivideApprox(child.GetCount() * count, tmp.GetCount());
 						if (estimate == 0) estimate = 1;
 
 						sum_estimated += estimate;
@@ -1587,10 +1580,10 @@ struct StationViewWindow : public Window {
 						}
 
 						if (estimate > 0) {
-							if (child->GetStation() == next) {
-								dest->InsertOrRetrieve(next)->Update(estimate);
+							if (child.GetStation() == next) {
+								dest.InsertOrRetrieve(next).Update(estimate);
 							} else {
-								EstimateDestinations(cargo, source, child->GetStation(), estimate, dest);
+								EstimateDestinations(cargo, source, child.GetStation(), estimate, dest);
 							}
 						}
 					}
@@ -1598,7 +1591,7 @@ struct StationViewWindow : public Window {
 				}
 			}
 		} else {
-			dest->InsertOrRetrieve(StationID::Invalid())->Update(count);
+			dest.InsertOrRetrieve(StationID::Invalid()).Update(count);
 		}
 	}
 
@@ -1618,8 +1611,8 @@ struct StationViewWindow : public Window {
 			for (FlowStat::SharesMap::const_iterator flow_it = shares->begin(); flow_it != shares->end(); ++flow_it) {
 				const CargoDataEntry *via_entry = source_entry->Retrieve(flow_it->second);
 				for (CargoDataSet::iterator dest_it = via_entry->Begin(); dest_it != via_entry->End(); ++dest_it) {
-					CargoDataEntry *dest_entry = *dest_it;
-					ShowCargo(entry, cargo, from, flow_it->second, dest_entry->GetStation(), dest_entry->GetCount());
+					CargoDataEntry &dest_entry = **dest_it;
+					ShowCargo(entry, cargo, from, flow_it->second, dest_entry.GetStation(), dest_entry.GetCount());
 				}
 			}
 		}
@@ -1652,7 +1645,7 @@ struct StationViewWindow : public Window {
 
 			uint remaining = cp->Count();
 			for (CargoDataSet::iterator dest_it = via_entry->Begin(); dest_it != via_entry->End();) {
-				CargoDataEntry *dest_entry = *dest_it;
+				CargoDataEntry &dest_entry = **dest_it;
 
 				/* Advance iterator here instead of in the for statement to test whether this is the last entry */
 				++dest_it;
@@ -1664,10 +1657,10 @@ struct StationViewWindow : public Window {
 					 * not matching GoodsEntry::TotalCount() */
 					val = remaining;
 				} else {
-					val = std::min<uint>(remaining, DivideApprox(cp->Count() * dest_entry->GetCount(), via_entry->GetCount()));
+					val = std::min<uint>(remaining, DivideApprox(cp->Count() * dest_entry.GetCount(), via_entry->GetCount()));
 					remaining -= val;
 				}
-				this->ShowCargo(entry, cargo, cp->GetFirstStation(), next, dest_entry->GetStation(), val);
+				this->ShowCargo(entry, cargo, cp->GetFirstStation(), next, dest_entry.GetStation(), val);
 			}
 		}
 		this->ShowCargo(entry, cargo, NEW_STATION, NEW_STATION, NEW_STATION, packets.ReservedCount());
@@ -1701,16 +1694,16 @@ struct StationViewWindow : public Window {
 	 * Mark a specific row, characterized by its CargoDataEntry, as expanded.
 	 * @param entry The row to be marked as expanded.
 	 */
-	void SetDisplayedRow(const CargoDataEntry *entry)
+	void SetDisplayedRow(const CargoDataEntry &entry)
 	{
 		std::list<StationID> stations;
-		const CargoDataEntry *parent = entry->GetParent();
+		const CargoDataEntry *parent = entry.GetParent();
 		if (parent->GetParent() == nullptr) {
-			this->displayed_rows.push_back(RowDisplay(&this->expanded_rows, entry->GetCargo()));
+			this->displayed_rows.push_back(RowDisplay(&this->expanded_rows, entry.GetCargo()));
 			return;
 		}
 
-		StationID next = entry->GetStation();
+		StationID next = entry.GetStation();
 		while (parent->GetParent()->GetParent() != nullptr) {
 			stations.push_back(parent->GetStation());
 			parent = parent->GetParent();
@@ -1764,9 +1757,10 @@ struct StationViewWindow : public Window {
 	 * @param column The "column" the entry will be shown in.
 	 * @return either STR_STATION_VIEW_VIA or STR_STATION_VIEW_NONSTOP.
 	 */
-	StringID SearchNonStop(CargoDataEntry *cd, StationID station, int column)
+	StringID SearchNonStop(CargoDataEntry &cd, StationID station, int column)
 	{
-		CargoDataEntry *parent = cd->GetParent();
+		assert(column < NUM_COLUMNS);
+		CargoDataEntry *parent = cd.GetParent();
 		for (int i = column - 1; i > 0; --i) {
 			if (this->groupings[i] == GR_DESTINATION) {
 				if (parent->GetStation() == station) {
@@ -1778,10 +1772,10 @@ struct StationViewWindow : public Window {
 			parent = parent->GetParent();
 		}
 
-		if (this->groupings[column + 1] == GR_DESTINATION) {
-			CargoDataSet::iterator begin = cd->Begin();
-			CargoDataSet::iterator end = cd->End();
-			if (begin != end && ++(cd->Begin()) == end && (*(begin))->GetStation() == station) {
+		if (column < NUM_COLUMNS - 1 && this->groupings[column + 1] == GR_DESTINATION) {
+			CargoDataSet::iterator begin = cd.Begin();
+			CargoDataSet::iterator end = cd.End();
+			if (begin != end && ++(cd.Begin()) == end && (*(begin))->GetStation() == station) {
 				return STR_STATION_VIEW_NONSTOP;
 			} else {
 				return STR_STATION_VIEW_VIA;
@@ -1801,20 +1795,21 @@ struct StationViewWindow : public Window {
 	 * @param cargo Current cargo being drawn (if cargo column has been passed).
 	 * @return row (in "pos" counting) after the one we have last drawn to.
 	 */
-	int DrawEntries(CargoDataEntry *entry, const Rect &r, int pos, int maxrows, int column, CargoType cargo = INVALID_CARGO)
+	int DrawEntries(CargoDataEntry &entry, const Rect &r, int pos, int maxrows, int column, CargoType cargo = INVALID_CARGO)
 	{
+		assert(column < NUM_COLUMNS);
 		if (this->sortings[column] == CargoSortType::AsGrouping) {
 			if (this->groupings[column] != GR_CARGO) {
-				entry->Resort(CargoSortType::StationString, this->sort_orders[column]);
+				entry.Resort(CargoSortType::StationString, this->sort_orders[column]);
 			}
 		} else {
-			entry->Resort(CargoSortType::Count, this->sort_orders[column]);
+			entry.Resort(CargoSortType::Count, this->sort_orders[column]);
 		}
-		for (CargoDataSet::iterator i = entry->Begin(); i != entry->End(); ++i) {
-			CargoDataEntry *cd = *i;
+		for (CargoDataSet::iterator i = entry.Begin(); i != entry.End(); ++i) {
+			CargoDataEntry &cd = **i;
 
 			Grouping grouping = this->groupings[column];
-			if (grouping == GR_CARGO) cargo = cd->GetCargo();
+			if (grouping == GR_CARGO) cargo = cd.GetCargo();
 			bool auto_distributed = _settings_game.linkgraph.GetDistributionType(cargo) != DT_MANUAL;
 
 			if (pos > -maxrows && pos <= 0) {
@@ -1823,10 +1818,10 @@ struct StationViewWindow : public Window {
 				int y = r.top - pos * GetCharacterHeight(FS_NORMAL);
 				if (this->groupings[column] == GR_CARGO) {
 					str = STR_STATION_VIEW_WAITING_CARGO;
-					DrawCargoIcons(cd->GetCargo(), cd->GetCount(), r.left + this->expand_shrink_width, r.right - this->expand_shrink_width, y);
+					DrawCargoIcons(cd.GetCargo(), cd.GetCount(), r.left + this->expand_shrink_width, r.right - this->expand_shrink_width, y);
 				} else {
 					if (!auto_distributed) grouping = GR_SOURCE;
-					station = cd->GetStation();
+					station = cd.GetStation();
 					str = this->GetGroupingString(grouping, station);
 					if (grouping == GR_NEXT && str == STR_STATION_VIEW_VIA) str = this->SearchNonStop(cd, station, column);
 
@@ -1839,11 +1834,11 @@ struct StationViewWindow : public Window {
 				Rect text = r.Indent(column * WidgetDimensions::scaled.hsep_indent, rtl).Indent(this->expand_shrink_width, !rtl);
 				Rect shrink = r.WithWidth(this->expand_shrink_width, !rtl);
 
-				DrawString(text.left, text.right, y, GetString(str, cargo, cd->GetCount(), station));
+				DrawString(text.left, text.right, y, GetString(str, cargo, cd.GetCount(), station));
 
 				if (column < NUM_COLUMNS - 1) {
-					const char *sym = nullptr;
-					if (cd->GetNumChildren() > 0) {
+					std::string_view sym;
+					if (cd.GetNumChildren() > 0) {
 						sym = "-";
 					} else if (auto_distributed && str != STR_STATION_VIEW_RESERVED) {
 						sym = "+";
@@ -1852,17 +1847,17 @@ struct StationViewWindow : public Window {
 						const GoodsEntry &ge = Station::Get(this->window_number)->goods[cargo];
 						if (ge.HasData()) {
 							const StationCargoList &cargo_list = ge.GetData().cargo;
-							if (grouping == GR_CARGO && (cargo_list.ReservedCount() > 0 || cd->HasTransfers())) {
+							if (grouping == GR_CARGO && (cargo_list.ReservedCount() > 0 || cd.HasTransfers())) {
 								sym = "+";
 							}
 						}
 					}
-					if (sym != nullptr) DrawString(shrink.left, shrink.right, y, sym, TC_YELLOW);
+					if (!sym.empty()) DrawString(shrink.left, shrink.right, y, sym, TC_YELLOW);
 				}
 				this->SetDisplayedRow(cd);
 			}
 			--pos;
-			if (auto_distributed || column == 0) {
+			if ((auto_distributed || column == 0) && column < NUM_COLUMNS - 1) {
 				pos = this->DrawEntries(cd, r, pos, maxrows, column + 1, cargo);
 			}
 		}
@@ -2117,7 +2112,7 @@ struct StationViewWindow : public Window {
 		this->SetDirty();
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget == WID_SV_SORT_BY) {
 			this->SelectSortBy(index);
@@ -2185,14 +2180,12 @@ static std::vector<StationID> _stations_nearby_list;
  * Add station on this tile to _stations_nearby_list if it's fully within the
  * station spread.
  * @param tile Tile just being checked
- * @param user_data Pointer to TileArea context
+ * @param ctx Pointer to TileArea context
  * @tparam T the station filter type
  */
 template <class T>
-static bool AddNearbyStation(TileIndex tile, void *user_data)
+static void AddNearbyStation(TileIndex tile, TileArea *ctx)
 {
-	TileArea *ctx = (TileArea *)user_data;
-
 	/* First check if there were deleted stations here */
 	for (auto it = _deleted_stations_nearby.begin(); it != _deleted_stations_nearby.end(); /* nothing */) {
 		if (it->tile == tile) {
@@ -2204,21 +2197,19 @@ static bool AddNearbyStation(TileIndex tile, void *user_data)
 	}
 
 	/* Check if own station and if we stay within station spread */
-	if (!IsTileType(tile, MP_STATION)) return false;
+	if (!IsTileType(tile, MP_STATION)) return;
 
 	StationID sid = GetStationIndex(tile);
 
 	/* This station is (likely) a waypoint */
-	if (!T::IsValidID(sid)) return false;
+	if (!T::IsValidID(sid)) return;
 
 	BaseStation *st = BaseStation::Get(sid);
-	if (st->owner != _local_company || std::ranges::find(_stations_nearby_list, sid) != _stations_nearby_list.end()) return false;
+	if (st->owner != _local_company || std::ranges::find(_stations_nearby_list, sid) != _stations_nearby_list.end()) return;
 
 	if (st->rect.BeforeAddRect(ctx->tile, ctx->w, ctx->h, StationRect::ADD_TEST).Succeeded()) {
 		_stations_nearby_list.push_back(sid);
 	}
-
-	return false; // We want to include *all* nearby stations
 }
 
 /**
@@ -2266,8 +2257,9 @@ static const BaseStation *FindStationsNearby(TileArea ta, bool distant_join)
 	if (distant_join && std::min(ta.w, ta.h) >= _settings_game.station.station_spread) return nullptr;
 	uint max_dist = distant_join ? _settings_game.station.station_spread - std::min(ta.w, ta.h) : 1;
 
-	TileIndex tile = TileAddByDir(ctx.tile, DIR_N);
-	CircularTileSearch(&tile, max_dist, ta.w, ta.h, AddNearbyStation<T>, &ctx);
+	for (auto tile : SpiralTileSequence(TileAddByDir(ctx.tile, DIR_N), max_dist, ta.w, ta.h)) {
+		AddNearbyStation<T>(tile, &ctx);
+	}
 
 	return nullptr;
 }
@@ -2333,7 +2325,7 @@ struct SelectStationWindow : Window {
 				: GetString(STR_STATION_LIST_STATION, st->index, st->facilities)));
 		}
 
-		resize.height = d.height;
+		fill.height = resize.height = d.height;
 		d.height *= 5;
 		d.width += padding.width;
 		d.height += padding.height;
diff --git a/src/station_type.h b/src/station_type.h
index 45943b77e4..9641556213 100644
--- a/src/station_type.h
+++ b/src/station_type.h
@@ -76,6 +76,43 @@ enum StationHadVehicleOfType : uint8_t {
 };
 DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType)
 
+/** Randomisation triggers for stations and roadstops */
+enum class StationRandomTrigger : uint8_t {
+	NewCargo, ///< Trigger station on new cargo arrival.
+	CargoTaken, ///< Trigger station when cargo is completely taken.
+	VehicleArrives, ///< Trigger platform when train arrives.
+	VehicleDeparts, ///< Trigger platform when train leaves.
+	VehicleLoads, ///< Trigger platform when train loads/unloads.
+	PathReservation, ///< Trigger platform when train reserves path.
+};
+using StationRandomTriggers = EnumBitSet<StationRandomTrigger, uint8_t>;
+
+/** Animation triggers for stations and roadstops. */
+enum class StationAnimationTrigger : uint8_t {
+	Built, ///< Trigger tile when built.
+	NewCargo, ///< Trigger station on new cargo arrival.
+	CargoTaken, ///< Trigger station when cargo is completely taken.
+	VehicleArrives, ///< Trigger platform when train arrives.
+	VehicleDeparts, ///< Trigger platform when train leaves.
+	VehicleLoads, ///< Trigger platform when train loads/unloads.
+	AcceptanceTick, ///< Trigger station every 250 ticks.
+	TileLoop, ///< Trigger in the periodic tile loop.
+	PathReservation, ///< Trigger platform when train reserves path.
+	End
+};
+using StationAnimationTriggers = EnumBitSet<StationAnimationTrigger, uint16_t>;
+
+/** Animation triggers for airport tiles */
+enum class AirportAnimationTrigger : uint8_t {
+	Built, ///< Triggered when the airport is built (for all tiles at the same time).
+	TileLoop, ///< Triggered in the periodic tile loop.
+	NewCargo, ///< Triggered when new cargo arrives at the station (for all tiles at the same time).
+	CargoTaken, ///< Triggered when a cargo type is completely removed from the station (for all tiles at the same time).
+	AcceptanceTick, ///< Triggered every 250 ticks (for all tiles at the same time).
+	AirplaneTouchdown, ///< Triggered when an airplane (not a helicopter) touches down at the airport (for single tile).
+};
+using AirportAnimationTriggers = EnumBitSet<AirportAnimationTrigger, uint8_t>;
+
 /* The different catchment area sizes. */
 static constexpr uint CA_NONE = 0; ///< Catchment when the station has no facilities
 static constexpr uint CA_BUS = 3; ///< Catchment for bus stops with "modified catchment" enabled
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index 7944176499..ffd5e90494 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -74,9 +74,9 @@ struct StatusBarWindow : Window {
 		return pt;
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int def_height, bool allow_resize) override
 	{
-		Window::FindWindowPlacementAndResize(_toolbar_width, def_height);
+		Window::FindWindowPlacementAndResize(_toolbar_width, def_height, allow_resize);
 	}
 
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
@@ -106,7 +106,7 @@ struct StatusBarWindow : Window {
 	void DrawWidget(const Rect &r, WidgetID widget) const override
 	{
 		Rect tr = r.Shrink(WidgetDimensions::scaled.framerect, RectPadding::zero);
-		tr.top = CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL));
+		tr.top = CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL));
 		switch (widget) {
 			case WID_S_LEFT:
 				/* Draw the date */
@@ -155,7 +155,7 @@ struct StatusBarWindow : Window {
 
 				if (!this->reminder_timeout.HasFired()) {
 					Dimension icon_size = GetSpriteSize(SPR_UNREAD_NEWS);
-					DrawSprite(SPR_UNREAD_NEWS, PAL_NONE, tr.right - icon_size.width, CenterBounds(r.top, r.bottom, icon_size.height));
+					DrawSprite(SPR_UNREAD_NEWS, PAL_NONE, tr.right - icon_size.width, CentreBounds(r.top, r.bottom, icon_size.height));
 				}
 				break;
 		}
@@ -192,7 +192,7 @@ struct StatusBarWindow : Window {
 	}
 
 	/** Move information on the ticker slowly from one side to the other. */
-	IntervalTimer<TimerWindow> ticker_scroll_interval = {std::chrono::milliseconds(15), [this](uint count) {
+	const IntervalTimer<TimerWindow> ticker_scroll_interval = {std::chrono::milliseconds(15), [this](uint count) {
 		if (_pause_mode.Any()) return;
 
 		if (this->ticker_scroll < TICKER_STOP) {
@@ -205,7 +205,7 @@ struct StatusBarWindow : Window {
 		this->SetWidgetDirty(WID_S_MIDDLE);
 	}};
 
-	IntervalTimer<TimerGameCalendar> daily_interval = {{TimerGameCalendar::DAY, TimerGameCalendar::Priority::NONE}, [this](auto) {
+	const IntervalTimer<TimerGameCalendar> daily_interval = {{TimerGameCalendar::DAY, TimerGameCalendar::Priority::NONE}, [this](auto) {
 		this->SetWidgetDirty(WID_S_LEFT);
 	}};
 };
@@ -219,7 +219,7 @@ static constexpr NWidgetPart _nested_main_status_widgets[] = {
 };
 
 static WindowDesc _main_status_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_STATUS_BAR, WC_NONE,
 	{WindowDefaultFlag::NoFocus, WindowDefaultFlag::NoClose},
 	_nested_main_status_widgets
diff --git a/src/stdafx.h b/src/stdafx.h
index cc5dce3972..e9ae4c02d3 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -73,6 +73,8 @@
 #include <variant>
 #include <vector>
 
+using namespace std::literals::string_view_literals;
+
 #if defined(UNIX) || defined(__MINGW32__)
 #	include <sys/types.h>
 #endif
@@ -87,7 +89,7 @@
 #endif
 
 #if defined(_MSC_VER)
-	// See https://learn.microsoft.com/en-us/cpp/cpp/empty-bases?view=msvc-170
+	/* See https://learn.microsoft.com/en-us/cpp/cpp/empty-bases?view=msvc-170 */
 #	define EMPTY_BASES __declspec(empty_bases)
 #else
 #	define EMPTY_BASES
@@ -155,16 +157,14 @@
 
 #if !defined(STRGEN) && !defined(SETTINGSGEN)
 #	if defined(_WIN32)
-		char *getcwd(char *buf, size_t size);
-
-		std::string FS2OTTD(const std::wstring &name);
-		std::wstring OTTD2FS(const std::string &name);
+		std::string FS2OTTD(std::wstring_view name);
+		std::wstring OTTD2FS(std::string_view name);
 #	elif defined(WITH_ICONV)
-		std::string FS2OTTD(const std::string &name);
-		std::string OTTD2FS(const std::string &name);
+		std::string FS2OTTD(std::string_view name);
+		std::string OTTD2FS(std::string_view name);
 #	else
-		template <typename T> std::string FS2OTTD(T name) { return name; }
-		template <typename T> std::string OTTD2FS(T name) { return name; }
+		static inline std::string FS2OTTD(std::string_view name) { return std::string{name}; }
+		static inline std::string OTTD2FS(std::string_view name) { return std::string{name}; }
 #	endif /* _WIN32 or WITH_ICONV */
 #endif /* STRGEN || SETTINGSGEN */
 
@@ -270,14 +270,6 @@ char (&ArraySizeHelper(T (&array)[N]))[N];
  */
 #define lengthof(array) (sizeof(ArraySizeHelper(array)))
 
-/**
- * Gets the size of a variable within a class.
- * @param base     The class the variable is in.
- * @param variable The variable to get the size of.
- * @return the size of the variable
- */
-#define cpp_sizeof(base, variable) (sizeof(std::declval<base>().variable))
-
 
 /* take care of some name clashes on MacOS */
 #if defined(__APPLE__)
@@ -293,7 +285,7 @@ char (&ArraySizeHelper(T (&array)[N]))[N];
 #endif /* __GNUC__ || __clang__ */
 
 [[noreturn]] void NOT_REACHED(const std::source_location location = std::source_location::current());
-[[noreturn]] void AssertFailedError(const char *expression, const std::source_location location = std::source_location::current());
+[[noreturn]] void AssertFailedError(std::string_view expression, const std::source_location location = std::source_location::current());
 
 /* For non-debug builds with assertions enabled use the special assertion handler. */
 #if defined(NDEBUG) && defined(WITH_ASSERT)
diff --git a/src/story_gui.cpp b/src/story_gui.cpp
index c74e840185..f3c1d4feb0 100644
--- a/src/story_gui.cpp
+++ b/src/story_gui.cpp
@@ -712,7 +712,7 @@ public:
 
 			switch (ce.pe->type) {
 				case SPET_TEXT:
-					y_offset = DrawStringMultiLine(ce.bounds.left, ce.bounds.right, ce.bounds.top - scrollpos, ce.bounds.bottom - scrollpos,
+					DrawStringMultiLineWithClipping(ce.bounds.left, ce.bounds.right, ce.bounds.top - scrollpos, ce.bounds.bottom - scrollpos,
 						ce.pe->text.GetDecodedString(), TC_BLACK, SA_TOP | SA_LEFT);
 					break;
 
@@ -832,7 +832,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_SB_SEL_PAGE) return;
 
diff --git a/src/strgen/CMakeLists.txt b/src/strgen/CMakeLists.txt
index 425cc1dd1a..64d1905089 100644
--- a/src/strgen/CMakeLists.txt
+++ b/src/strgen/CMakeLists.txt
@@ -13,6 +13,8 @@ if (NOT HOST_BINARY_DIR)
             ../error.cpp
             ../string.cpp
             ../core/string_builder.cpp
+            ../core/string_consumer.cpp
+            ../core/string_inplace.cpp
             ../core/utf8.cpp
     )
     add_definitions(-DSTRGEN)
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 7b4287eec5..06ead4ec0b 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -9,7 +9,6 @@
 
 #include "../stdafx.h"
 #include "../core/endian_func.hpp"
-#include "../core/mem_func.hpp"
 #include "../error_func.h"
 #include "../string_func.h"
 #include "../strings_type.h"
@@ -35,34 +34,34 @@
 
 void StrgenWarningI(const std::string &msg)
 {
-	if (_translation) {
-		fmt::print(stderr, LINE_NUM_FMT("info"), _file, _cur_line, msg);
+	if (_strgen.translation) {
+		fmt::print(stderr, LINE_NUM_FMT("info"), _strgen.file, _strgen.cur_line, msg);
 	} else {
-		fmt::print(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, msg);
+		fmt::print(stderr, LINE_NUM_FMT("warning"), _strgen.file, _strgen.cur_line, msg);
 	}
-	_warnings++;
+	_strgen.warnings++;
 }
 
 void StrgenErrorI(const std::string &msg)
 {
-	fmt::print(stderr, LINE_NUM_FMT("error"), _file, _cur_line, msg);
-	_errors++;
+	fmt::print(stderr, LINE_NUM_FMT("error"), _strgen.file, _strgen.cur_line, msg);
+	_strgen.errors++;
 }
 
 [[noreturn]] void StrgenFatalI(const std::string &msg)
 {
-	fmt::print(stderr, LINE_NUM_FMT("FATAL"), _file, _cur_line, msg);
+	fmt::print(stderr, LINE_NUM_FMT("FATAL"), _strgen.file, _strgen.cur_line, msg);
 #ifdef _MSC_VER
-	fmt::print(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, "language is not compiled");
+	fmt::print(stderr, LINE_NUM_FMT("warning"), _strgen.file, _strgen.cur_line, "language is not compiled");
 #endif
 	throw std::exception();
 }
 
 [[noreturn]] void FatalErrorI(const std::string &msg)
 {
-	fmt::print(stderr, LINE_NUM_FMT("FATAL"), _file, _cur_line, msg);
+	fmt::print(stderr, LINE_NUM_FMT("FATAL"), _strgen.file, _strgen.cur_line, msg);
 #ifdef _MSC_VER
-	fmt::print(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, "language is not compiled");
+	fmt::print(stderr, LINE_NUM_FMT("warning"), _strgen.file, _strgen.cur_line, "language is not compiled");
 #endif
 	exit(2);
 }
@@ -91,85 +90,82 @@ struct FileStringReader : StringReader {
 		return result;
 	}
 
-	void HandlePragma(char *str) override;
+	void HandlePragma(std::string_view str, LanguagePackHeader &lang) override;
 
 	void ParseFile() override
 	{
 		this->StringReader::ParseFile();
 
-		if (StrEmpty(_lang.name) || StrEmpty(_lang.own_name) || StrEmpty(_lang.isocode)) {
+		if (*_strgen.lang.name == '\0' || *_strgen.lang.own_name == '\0' || *_strgen.lang.isocode == '\0') {
 			FatalError("Language must include ##name, ##ownname and ##isocode");
 		}
 	}
 };
 
-void FileStringReader::HandlePragma(char *str)
+void FileStringReader::HandlePragma(std::string_view str, LanguagePackHeader &lang)
 {
-	if (!memcmp(str, "id ", 3)) {
-		this->data.next_string_id = std::strtoul(str + 3, nullptr, 0);
-	} else if (!memcmp(str, "name ", 5)) {
-		strecpy(_lang.name, str + 5);
-	} else if (!memcmp(str, "ownname ", 8)) {
-		strecpy(_lang.own_name, str + 8);
-	} else if (!memcmp(str, "isocode ", 8)) {
-		strecpy(_lang.isocode, str + 8);
-	} else if (!memcmp(str, "textdir ", 8)) {
-		if (!memcmp(str + 8, "ltr", 3)) {
-			_lang.text_dir = TD_LTR;
-		} else if (!memcmp(str + 8, "rtl", 3)) {
-			_lang.text_dir = TD_RTL;
+	StringConsumer consumer(str);
+	auto name = consumer.ReadUntilChar(' ', StringConsumer::SKIP_ALL_SEPARATORS);
+	if (name == "id") {
+		this->data.next_string_id = consumer.ReadIntegerBase<uint32_t>(0);
+	} else if (name == "name") {
+		strecpy(lang.name, consumer.Read(StringConsumer::npos));
+	} else if (name == "ownname") {
+		strecpy(lang.own_name, consumer.Read(StringConsumer::npos));
+	} else if (name == "isocode") {
+		strecpy(lang.isocode, consumer.Read(StringConsumer::npos));
+	} else if (name == "textdir") {
+		auto dir = consumer.Read(StringConsumer::npos);
+		if (dir == "ltr") {
+			lang.text_dir = TD_LTR;
+		} else if (dir == "rtl") {
+			lang.text_dir = TD_RTL;
 		} else {
-			FatalError("Invalid textdir {}", str + 8);
+			FatalError("Invalid textdir {}", dir);
 		}
-	} else if (!memcmp(str, "digitsep ", 9)) {
-		str += 9;
-		strecpy(_lang.digit_group_separator, strcmp(str, "{NBSP}") == 0 ? NBSP : str);
-	} else if (!memcmp(str, "digitsepcur ", 12)) {
-		str += 12;
-		strecpy(_lang.digit_group_separator_currency, strcmp(str, "{NBSP}") == 0 ? NBSP : str);
-	} else if (!memcmp(str, "decimalsep ", 11)) {
-		str += 11;
-		strecpy(_lang.digit_decimal_separator, strcmp(str, "{NBSP}") == 0 ? NBSP : str);
-	} else if (!memcmp(str, "winlangid ", 10)) {
-		const char *buf = str + 10;
-		long langid = std::strtol(buf, nullptr, 16);
+	} else if (name == "digitsep") {
+		auto sep = consumer.Read(StringConsumer::npos);
+		strecpy(lang.digit_group_separator, sep == "{NBSP}" ? NBSP : sep);
+	} else if (name == "digitsepcur") {
+		auto sep = consumer.Read(StringConsumer::npos);
+		strecpy(lang.digit_group_separator_currency, sep == "{NBSP}" ? NBSP : sep);
+	} else if (name == "decimalsep") {
+		auto sep = consumer.Read(StringConsumer::npos);
+		strecpy(lang.digit_decimal_separator, sep == "{NBSP}" ? NBSP : sep);
+	} else if (name == "winlangid") {
+		auto langid = consumer.ReadIntegerBase<int32_t>(0);
 		if (langid > UINT16_MAX || langid < 0) {
-			FatalError("Invalid winlangid {}", buf);
+			FatalError("Invalid winlangid {}", langid);
 		}
-		_lang.winlangid = static_cast<uint16_t>(langid);
-	} else if (!memcmp(str, "grflangid ", 10)) {
-		const char *buf = str + 10;
-		long langid = std::strtol(buf, nullptr, 16);
+		lang.winlangid = static_cast<uint16_t>(langid);
+	} else if (name == "grflangid") {
+		auto langid = consumer.ReadIntegerBase<int32_t>(0);
 		if (langid >= 0x7F || langid < 0) {
-			FatalError("Invalid grflangid {}", buf);
+			FatalError("Invalid grflangid {}", langid);
 		}
-		_lang.newgrflangid = static_cast<uint8_t>(langid);
-	} else if (!memcmp(str, "gender ", 7)) {
+		lang.newgrflangid = static_cast<uint8_t>(langid);
+	} else if (name == "gender") {
 		if (this->master) FatalError("Genders are not allowed in the base translation.");
-		const char *buf = str + 7;
-
 		for (;;) {
-			auto s = ParseWord(&buf);
+			auto s = ParseWord(consumer);
 
 			if (!s.has_value()) break;
-			if (_lang.num_genders >= MAX_NUM_GENDERS) FatalError("Too many genders, max {}", MAX_NUM_GENDERS);
-			s->copy(_lang.genders[_lang.num_genders], CASE_GENDER_LEN - 1);
-			_lang.num_genders++;
+			if (lang.num_genders >= MAX_NUM_GENDERS) FatalError("Too many genders, max {}", MAX_NUM_GENDERS);
+			s->copy(lang.genders[lang.num_genders], CASE_GENDER_LEN - 1);
+			lang.num_genders++;
 		}
-	} else if (!memcmp(str, "case ", 5)) {
+	} else if (name == "case") {
 		if (this->master) FatalError("Cases are not allowed in the base translation.");
-		const char *buf = str + 5;
-
 		for (;;) {
-			auto s = ParseWord(&buf);
+			auto s = ParseWord(consumer);
 
 			if (!s.has_value()) break;
-			if (_lang.num_cases >= MAX_NUM_CASES) FatalError("Too many cases, max {}", MAX_NUM_CASES);
-			s->copy(_lang.cases[_lang.num_cases], CASE_GENDER_LEN - 1);
-			_lang.num_cases++;
+			if (lang.num_cases >= MAX_NUM_CASES) FatalError("Too many cases, max {}", MAX_NUM_CASES);
+			s->copy(lang.cases[lang.num_cases], CASE_GENDER_LEN - 1);
+			lang.num_cases++;
 		}
 	} else {
-		StringReader::HandlePragma(str);
+		StringReader::HandlePragma(str, lang);
 	}
 }
 
@@ -292,7 +288,7 @@ struct LanguageFileWriter : LanguageWriter, FileWriter {
 
 	void WriteHeader(const LanguagePackHeader *header) override
 	{
-		this->Write(reinterpret_cast<const char *>(header), sizeof(*header));
+		this->Write({reinterpret_cast<const char *>(header), sizeof(*header)});
 	}
 
 	void Finalise() override
@@ -301,9 +297,9 @@ struct LanguageFileWriter : LanguageWriter, FileWriter {
 		this->FileWriter::Finalise();
 	}
 
-	void Write(const char *buffer, size_t length) override
+	void Write(std::string_view buffer) override
 	{
-		this->output_stream.write(buffer, length);
+		this->output_stream.write(buffer.data(), buffer.size());
 	}
 };
 
@@ -325,7 +321,9 @@ int CDECL main(int argc, char *argv[])
 	std::filesystem::path src_dir(".");
 	std::filesystem::path dest_dir;
 
-	GetOptData mgo(std::span(argv + 1, argc - 1), _opts);
+	std::vector<std::string_view> params;
+	for (int i = 1; i < argc; ++i) params.emplace_back(argv[i]);
+	GetOptData mgo(params, _opts);
 	for (;;) {
 		int i = mgo.GetOpt();
 		if (i == -1) break;
@@ -364,11 +362,11 @@ int CDECL main(int argc, char *argv[])
 				return 0;
 
 			case 't':
-				_annotate_todos = true;
+				_strgen.annotate_todos = true;
 				break;
 
 			case 'w':
-				_show_warnings = true;
+				_strgen.show_warnings = true;
 				break;
 
 			case 'h':
@@ -417,7 +415,7 @@ int CDECL main(int argc, char *argv[])
 			StringData data(TEXT_TAB_END);
 			FileStringReader master_reader(data, input_path, true, false);
 			master_reader.ParseFile();
-			if (_errors != 0) return 1;
+			if (_strgen.errors != 0) return 1;
 
 			/* write strings.h */
 			std::filesystem::path output_path = dest_dir;
@@ -427,7 +425,7 @@ int CDECL main(int argc, char *argv[])
 			HeaderFileWriter writer(output_path);
 			writer.WriteHeader(data);
 			writer.Finalise(data);
-			if (_errors != 0) return 1;
+			if (_strgen.errors != 0) return 1;
 		} else {
 			std::filesystem::path input_path = std::move(src_dir);
 			input_path /= "english.txt";
@@ -443,7 +441,7 @@ int CDECL main(int argc, char *argv[])
 				std::filesystem::path lang_file = argument;
 				FileStringReader translation_reader(data, lang_file, false, lang_file.filename() != "english.txt");
 				translation_reader.ParseFile(); // target file
-				if (_errors != 0) return 1;
+				if (_strgen.errors != 0) return 1;
 
 				/* get the targetfile, strip any directories and append to destination path */
 				std::filesystem::path output_file = dest_dir;
@@ -455,8 +453,8 @@ int CDECL main(int argc, char *argv[])
 				writer.Finalise();
 
 				/* if showing warnings, print a summary of the language */
-				if (_show_warnings) {
-					fmt::print("{} warnings and {} errors for {}\n", _warnings, _errors, output_file);
+				if (_strgen.show_warnings) {
+					fmt::print("{} warnings and {} errors for {}\n", _strgen.warnings, _strgen.errors, output_file);
 				}
 			}
 		}
diff --git a/src/strgen/strgen.h b/src/strgen/strgen.h
index 7253138063..8052107aa9 100644
--- a/src/strgen/strgen.h
+++ b/src/strgen/strgen.h
@@ -10,7 +10,9 @@
 #ifndef STRGEN_H
 #define STRGEN_H
 
+#include "../core/string_consumer.hpp"
 #include "../language.h"
+#include "../string_type.h"
 #include "../3rdparty/fmt/format.h"
 
 #include <unordered_map>
@@ -21,7 +23,7 @@ struct Case {
 	uint8_t caseidx;       ///< The index of the case.
 	std::string string; ///< The translation of the case.
 
-	Case(uint8_t caseidx, const std::string &string);
+	Case(uint8_t caseidx, std::string_view string);
 };
 
 /** Information about a single string. */
@@ -33,14 +35,14 @@ struct LangString {
 	size_t line;            ///< Line of string in source-file.
 	std::vector<Case> translated_cases; ///< Cases of the translation.
 
-	LangString(const std::string &name, const std::string &english, size_t index, size_t line);
+	LangString(std::string_view name, std::string_view english, size_t index, size_t line);
 	void FreeTranslation();
 };
 
 /** Information about the currently known strings. */
 struct StringData {
 	std::vector<std::shared_ptr<LangString>> strings; ///< List of all known strings.
-	std::unordered_map<std::string, std::shared_ptr<LangString>> name_to_string; ///< Lookup table for the strings.
+	std::unordered_map<std::string, std::shared_ptr<LangString>, StringHash, std::equal_to<>> name_to_string; ///< Lookup table for the strings.
 	size_t tabs;          ///< The number of 'tabs' of strings.
 	size_t max_strings;   ///< The maximum number of strings.
 	size_t next_string_id;///< The next string ID to allocate.
@@ -48,7 +50,7 @@ struct StringData {
 	StringData(size_t tabs);
 	void FreeTranslation();
 	void Add(std::shared_ptr<LangString> ls);
-	LangString *Find(const std::string &s);
+	LangString *Find(std::string_view s);
 	uint32_t Version() const;
 	size_t CountInUse(size_t tab) const;
 };
@@ -62,7 +64,7 @@ struct StringReader {
 
 	StringReader(StringData &data, const std::string &file, bool master, bool translation);
 	virtual ~StringReader() = default;
-	void HandleString(char *str);
+	void HandleString(std::string_view str);
 
 	/**
 	 * Read a single line from the source of strings.
@@ -74,7 +76,7 @@ struct StringReader {
 	 * Handle the pragma of the file.
 	 * @param str    The pragma string to parse.
 	 */
-	virtual void HandlePragma(char *str);
+	virtual void HandlePragma(std::string_view str, LanguagePackHeader &lang);
 
 	/**
 	 * Start parsing the file.
@@ -115,9 +117,8 @@ struct LanguageWriter {
 	/**
 	 * Write a number of bytes.
 	 * @param buffer The buffer to write.
-	 * @param length The amount of byte to write.
 	 */
-	virtual void Write(const char *buffer, size_t length) = 0;
+	virtual void Write(std::string_view buffer) = 0;
 
 	/**
 	 * Finalise writing the file.
@@ -144,7 +145,7 @@ struct ParsedCommandStruct {
 };
 
 const CmdStruct *TranslateCmdForCompare(const CmdStruct *a);
-ParsedCommandStruct ExtractCommandString(const char *s, bool warnings);
+ParsedCommandStruct ExtractCommandString(std::string_view s, bool warnings);
 
 void StrgenWarningI(const std::string &msg);
 void StrgenErrorI(const std::string &msg);
@@ -152,12 +153,19 @@ void StrgenErrorI(const std::string &msg);
 #define StrgenWarning(format_string, ...) StrgenWarningI(fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__))
 #define StrgenError(format_string, ...) StrgenErrorI(fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__))
 #define StrgenFatal(format_string, ...) StrgenFatalI(fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__))
-std::optional<std::string_view> ParseWord(const char **buf);
+std::optional<std::string_view> ParseWord(StringConsumer &consumer);
 
-extern const char *_file;
-extern size_t _cur_line;
-extern size_t _errors, _warnings;
-extern bool _show_warnings, _annotate_todos, _translation;
-extern LanguagePackHeader _lang;
+/** Global state shared between strgen.cpp, game_text.cpp and strgen_base.cpp */
+struct StrgenState {
+	std::string file = "(unknown file)"; ///< The filename of the input, so we can refer to it in errors/warnings
+	size_t cur_line = 0; ///< The current line we're parsing in the input file
+	size_t errors = 0;
+	size_t warnings = 0;
+	bool show_warnings = false;
+	bool annotate_todos = false;
+	bool translation = false; ///< Is the current file actually a translation or not
+	LanguagePackHeader lang; ///< Header information about a language.
+};
+extern StrgenState _strgen;
 
 #endif /* STRGEN_H */
diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp
index c30ad4ae9b..513f610839 100644
--- a/src/strgen/strgen_base.cpp
+++ b/src/strgen/strgen_base.cpp
@@ -9,7 +9,7 @@
 
 #include "../stdafx.h"
 #include "../core/endian_func.hpp"
-#include "../core/mem_func.hpp"
+#include "../core/math_func.hpp"
 #include "../error_func.h"
 #include "../string_func.h"
 #include "../core/string_builder.hpp"
@@ -21,14 +21,9 @@
 
 #include "../safeguards.h"
 
+StrgenState _strgen;
 static bool _translated;              ///< Whether the current language is not the master language
-bool _translation;                    ///< Is the current file actually a translation or not
-const char *_file = "(unknown file)"; ///< The filename of the input, so we can refer to it in errors/warnings
-size_t _cur_line;                     ///< The current line we're parsing in the input file
-size_t _errors, _warnings;
-bool _show_warnings = false, _annotate_todos = false;
-LanguagePackHeader _lang;             ///< Header information about a language.
-static const char *_cur_ident;
+static std::string_view _cur_ident;
 static ParsedCommandStruct _cur_pcs;
 static size_t _cur_argidx;
 
@@ -38,7 +33,7 @@ struct ParsedCommandString {
 	std::optional<size_t> argno;
 	std::optional<uint8_t> casei;
 };
-static ParsedCommandString ParseCommandString(const char **str);
+static ParsedCommandString ParseCommandString(StringConsumer &consumer);
 static size_t TranslateArgumentIdx(size_t arg, size_t offset = 0);
 
 /**
@@ -46,7 +41,7 @@ static size_t TranslateArgumentIdx(size_t arg, size_t offset = 0);
  * @param caseidx The index of the case.
  * @param string  The translation of the case.
  */
-Case::Case(uint8_t caseidx, const std::string &string) :
+Case::Case(uint8_t caseidx, std::string_view string) :
 		caseidx(caseidx), string(string)
 {
 }
@@ -58,7 +53,7 @@ Case::Case(uint8_t caseidx, const std::string &string) :
  * @param index   The index in the string table.
  * @param line    The line this string was found on.
  */
-LangString::LangString(const std::string &name, const std::string &english, size_t index, size_t line) :
+LangString::LangString(std::string_view name, std::string_view english, size_t index, size_t line) :
 		name(name), english(english), index(index), line(line)
 {
 }
@@ -105,7 +100,7 @@ void StringData::Add(std::shared_ptr<LangString> ls)
  * @param s The string name to search on.
  * @return The LangString or nullptr if it is not known.
  */
-LangString *StringData::Find(const std::string &s)
+LangString *StringData::Find(std::string_view s)
 {
 	auto it = this->name_to_string.find(s);
 	if (it == this->name_to_string.end()) return nullptr;
@@ -144,9 +139,9 @@ uint32_t StringData::Version() const
 			hash = (hash & 1 ? hash >> 1 ^ 0xDEADBEEF : hash >> 1);
 			hash = VersionHashStr(hash, ls->name);
 
-			const char *s = ls->english.c_str();
+			StringConsumer consumer(ls->english);
 			ParsedCommandString cs;
-			while ((cs = ParseCommandString(&s)).cmd != nullptr) {
+			while ((cs = ParseCommandString(consumer)).cmd != nullptr) {
 				if (cs.cmd->flags.Test(CmdFlag::DontCount)) continue;
 
 				hash ^= (cs.cmd - _cmd_structs) * 0x1234567;
@@ -169,86 +164,41 @@ size_t StringData::CountInUse(size_t tab) const
 	return count;
 }
 
-static size_t Utf8Validate(const char *s)
+void EmitSingleChar(StringBuilder &builder, std::string_view param, char32_t value)
 {
-	char32_t c;
-
-	if (!HasBit(s[0], 7)) {
-		/* 1 byte */
-		return 1;
-	} else if (GB(s[0], 5, 3) == 6 && IsUtf8Part(s[1])) {
-		/* 2 bytes */
-		c = GB(s[0], 0, 5) << 6 | GB(s[1], 0, 6);
-		if (c >= 0x80) return 2;
-	} else if (GB(s[0], 4, 4) == 14 && IsUtf8Part(s[1]) && IsUtf8Part(s[2])) {
-		/* 3 bytes */
-		c = GB(s[0], 0, 4) << 12 | GB(s[1], 0, 6) << 6 | GB(s[2], 0, 6);
-		if (c >= 0x800) return 3;
-	} else if (GB(s[0], 3, 5) == 30 && IsUtf8Part(s[1]) && IsUtf8Part(s[2]) && IsUtf8Part(s[3])) {
-		/* 4 bytes */
-		c = GB(s[0], 0, 3) << 18 | GB(s[1], 0, 6) << 12 | GB(s[2], 0, 6) << 6 | GB(s[3], 0, 6);
-		if (c >= 0x10000 && c <= 0x10FFFF) return 4;
-	}
-
-	return 0;
-}
-
-void EmitSingleChar(StringBuilder &builder, const char *buf, char32_t value)
-{
-	if (*buf != '\0') StrgenWarning("Ignoring trailing letters in command");
+	if (!param.empty()) StrgenWarning("Ignoring trailing letters in command");
 	builder.PutUtf8(value);
 }
 
 /* The plural specifier looks like
  * {NUM} {PLURAL <ARG#> passenger passengers} then it picks either passenger/passengers depending on the count in NUM */
-static std::pair<std::optional<size_t>, std::optional<size_t>> ParseRelNum(const char **buf)
+static std::pair<std::optional<size_t>, std::optional<size_t>> ParseRelNum(StringConsumer &consumer)
 {
-	const char *s = *buf;
-	char *end;
-
-	while (*s == ' ' || *s == '\t') s++;
-	size_t v = std::strtoul(s, &end, 0);
-	if (end == s) return {};
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+	std::optional<size_t> v = consumer.TryReadIntegerBase<size_t>(10);
 	std::optional<size_t> offset;
-	if (*end == ':') {
+	if (v.has_value() && consumer.ReadCharIf(':')) {
 		/* Take the Nth within */
-		s = end + 1;
-		offset = std::strtoul(s, &end, 0);
-		if (end == s) return {};
+		offset = consumer.TryReadIntegerBase<size_t>(10);
+		if (!offset.has_value()) StrgenFatal("Expected number for substring parameter");
 	}
-	*buf = end;
 	return {v, offset};
 }
 
 /* Parse out the next word, or nullptr */
-std::optional<std::string_view> ParseWord(const char **buf)
+std::optional<std::string_view> ParseWord(StringConsumer &consumer)
 {
-	const char *s = *buf;
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+	if (!consumer.AnyBytesLeft()) return {};
 
-	while (*s == ' ' || *s == '\t') s++;
-	if (*s == '\0') return {};
-
-	if (*s == '"') {
-		const char *begin = ++s;
+	if (consumer.ReadCharIf('"')) {
 		/* parse until next " or NUL */
-		for (;;) {
-			if (*s == '\0') StrgenFatal("Unterminated quotes");
-			if (*s == '"') {
-				*buf = s + 1;
-				return std::string_view(begin, s - begin);
-			}
-			s++;
-		}
+		auto result = consumer.ReadUntilChar('"', StringConsumer::KEEP_SEPARATOR);
+		if (!consumer.ReadCharIf('"')) StrgenFatal("Unterminated quotes");
+		return result;
 	} else {
 		/* proceed until whitespace or NUL */
-		const char *begin = s;
-		for (;;) {
-			if (*s == '\0' || *s == ' ' || *s == '\t') {
-				*buf = s;
-				return std::string_view(begin, s - begin);
-			}
-			s++;
-		}
+		return consumer.ReadUntilCharIn(StringConsumer::WHITESPACE_NO_NEWLINE);
 	}
 }
 
@@ -267,10 +217,12 @@ static void EmitWordList(StringBuilder &builder, const std::vector<std::string>
 	}
 }
 
-void EmitPlural(StringBuilder &builder, const char *buf, char32_t)
+void EmitPlural(StringBuilder &builder, std::string_view param, char32_t)
 {
+	StringConsumer consumer(param);
+
 	/* Parse out the number, if one exists. Otherwise default to prev arg. */
-	auto [argidx, offset] = ParseRelNum(&buf);
+	auto [argidx, offset] = ParseRelNum(consumer);
 	if (!argidx.has_value()) {
 		if (_cur_argidx == 0) StrgenFatal("Plural choice needs positional reference");
 		argidx = _cur_argidx - 1;
@@ -288,7 +240,7 @@ void EmitPlural(StringBuilder &builder, const char *buf, char32_t)
 	/* Parse each string */
 	std::vector<std::string> words;
 	for (;;) {
-		auto word = ParseWord(&buf);
+		auto word = ParseWord(consumer);
 		if (!word.has_value()) break;
 		words.emplace_back(*word);
 	}
@@ -297,13 +249,13 @@ void EmitPlural(StringBuilder &builder, const char *buf, char32_t)
 		StrgenFatal("{}: No plural words", _cur_ident);
 	}
 
-	size_t expected = _plural_forms[_lang.plural_form].plural_count;
+	size_t expected = _plural_forms[_strgen.lang.plural_form].plural_count;
 	if (expected != words.size()) {
 		if (_translated) {
 			StrgenFatal("{}: Invalid number of plural forms. Expecting {}, found {}.", _cur_ident,
 				expected, words.size());
 		} else {
-			if (_show_warnings) StrgenWarning("'{}' is untranslated. Tweaking english string to allow compilation for plural forms", _cur_ident);
+			if (_strgen.show_warnings) StrgenWarning("'{}' is untranslated. Tweaking english string to allow compilation for plural forms", _cur_ident);
 			if (words.size() > expected) {
 				words.resize(expected);
 			} else {
@@ -315,19 +267,19 @@ void EmitPlural(StringBuilder &builder, const char *buf, char32_t)
 	}
 
 	builder.PutUtf8(SCC_PLURAL_LIST);
-	builder.PutUint8(_lang.plural_form);
+	builder.PutUint8(_strgen.lang.plural_form);
 	builder.PutUint8(static_cast<uint8_t>(TranslateArgumentIdx(*argidx, *offset)));
 	EmitWordList(builder, words);
 }
 
-void EmitGender(StringBuilder &builder, const char *buf, char32_t)
+void EmitGender(StringBuilder &builder, std::string_view param, char32_t)
 {
-	if (buf[0] == '=') {
-		buf++;
-
+	StringConsumer consumer(param);
+	if (consumer.ReadCharIf('=')) {
 		/* This is a {G=DER} command */
-		auto nw = _lang.GetGenderIndex(buf);
-		if (nw >= MAX_NUM_GENDERS) StrgenFatal("G argument '{}' invalid", buf);
+		auto gender = consumer.Read(StringConsumer::npos);
+		auto nw = _strgen.lang.GetGenderIndex(gender);
+		if (nw >= MAX_NUM_GENDERS) StrgenFatal("G argument '{}' invalid", gender);
 
 		/* now nw contains the gender index */
 		builder.PutUtf8(SCC_GENDER_INDEX);
@@ -335,7 +287,7 @@ void EmitGender(StringBuilder &builder, const char *buf, char32_t)
 	} else {
 		/* This is a {G 0 foo bar two} command.
 		 * If no relative number exists, default to +0 */
-		auto [argidx, offset] = ParseRelNum(&buf);
+		auto [argidx, offset] = ParseRelNum(consumer);
 		if (!argidx.has_value()) argidx = _cur_argidx;
 		if (!offset.has_value()) offset = 0;
 
@@ -346,11 +298,11 @@ void EmitGender(StringBuilder &builder, const char *buf, char32_t)
 
 		std::vector<std::string> words;
 		for (;;) {
-			auto word = ParseWord(&buf);
+			auto word = ParseWord(consumer);
 			if (!word.has_value()) break;
 			words.emplace_back(*word);
 		}
-		if (words.size() != _lang.num_genders) StrgenFatal("Bad # of arguments for gender command");
+		if (words.size() != _strgen.lang.num_genders) StrgenFatal("Bad # of arguments for gender command");
 
 		assert(IsInsideBS(cmd->value, SCC_CONTROL_START, UINT8_MAX));
 		builder.PutUtf8(SCC_GENDER_LIST);
@@ -369,80 +321,51 @@ static const CmdStruct *FindCmd(std::string_view s)
 
 static uint8_t ResolveCaseName(std::string_view str)
 {
-	uint8_t case_idx = _lang.GetCaseIndex(str);
+	uint8_t case_idx = _strgen.lang.GetCaseIndex(str);
 	if (case_idx >= MAX_NUM_CASES) StrgenFatal("Invalid case-name '{}'", str);
 	return case_idx + 1;
 }
 
 /* returns cmd == nullptr on eof */
-static ParsedCommandString ParseCommandString(const char **str)
+static ParsedCommandString ParseCommandString(StringConsumer &consumer)
 {
 	ParsedCommandString result;
-	const char *s = *str;
 
 	/* Scan to the next command, exit if there's no next command. */
-	for (; *s != '{'; s++) {
-		if (*s == '\0') return {};
-	}
-	s++; // Skip past the {
+	consumer.SkipUntilChar('{', StringConsumer::KEEP_SEPARATOR);
+	if (!consumer.ReadCharIf('{')) return {};
 
-	if (*s >= '0' && *s <= '9') {
-		char *end;
-
-		result.argno = std::strtoul(s, &end, 0);
-		if (*end != ':') StrgenFatal("missing arg #");
-		s = end + 1;
+	if (auto argno = consumer.TryReadIntegerBase<uint32_t>(10); argno.has_value()) {
+		result.argno = argno;
+		if (!consumer.ReadCharIf(':')) StrgenFatal("missing arg #");
 	}
 
 	/* parse command name */
-	const char *start = s;
-	char c;
-	do {
-		c = *s++;
-	} while (c != '}' && c != ' ' && c != '=' && c != '.' && c != 0);
-
-	std::string_view command(start, s - start - 1);
+	auto command = consumer.ReadUntilCharIn("} =.");
 	result.cmd = FindCmd(command);
 	if (result.cmd == nullptr) {
 		StrgenError("Undefined command '{}'", command);
 		return {};
 	}
 
-	if (c == '.') {
-		const char *casep = s;
-
+	/* parse case */
+	if (consumer.ReadCharIf('.')) {
 		if (!result.cmd->flags.Test(CmdFlag::Case)) {
 			StrgenFatal("Command '{}' can't have a case", result.cmd->cmd);
 		}
 
-		do {
-			c = *s++;
-		} while (c != '}' && c != ' ' && c != '\0');
-		result.casei = ResolveCaseName(std::string_view(casep, s - casep - 1));
+		auto casep = consumer.ReadUntilCharIn("} ");
+		result.casei = ResolveCaseName(casep);
 	}
 
-	if (c == '\0') {
-		StrgenError("Missing }} from command '{}'", start);
+	/* parse params */
+	result.param = consumer.ReadUntilChar('}', StringConsumer::KEEP_SEPARATOR);
+
+	if (!consumer.ReadCharIf('}')) {
+		StrgenError("Missing }} from command '{}'", result.cmd->cmd);
 		return {};
 	}
 
-	if (c != '}') {
-		if (c == '=') s--;
-		/* copy params */
-		start = s;
-		for (;;) {
-			c = *s++;
-			if (c == '}') break;
-			if (c == '\0') {
-				StrgenError("Missing }} from command '{}'", start);
-				return {};
-			}
-			result.param += c;
-		}
-	}
-
-	*str = s;
-
 	return result;
 }
 
@@ -458,14 +381,15 @@ StringReader::StringReader(StringData &data, const std::string &file, bool maste
 {
 }
 
-ParsedCommandStruct ExtractCommandString(const char *s, bool)
+ParsedCommandStruct ExtractCommandString(std::string_view s, bool)
 {
 	ParsedCommandStruct p;
+	StringConsumer consumer(s);
 
 	size_t argidx = 0;
 	for (;;) {
 		/* read until next command from a. */
-		auto cs = ParseCommandString(&s);
+		auto cs = ParseCommandString(consumer);
 
 		if (cs.cmd == nullptr) break;
 
@@ -504,13 +428,13 @@ const CmdStruct *TranslateCmdForCompare(const CmdStruct *a)
 	return a;
 }
 
-static bool CheckCommandsMatch(const char *a, const char *b, const char *name)
+static bool CheckCommandsMatch(std::string_view a, std::string_view b, std::string_view name)
 {
 	/* If we're not translating, i.e. we're compiling the base language,
 	 * it is pointless to do all these checks as it'll always be correct.
 	 * After all, all checks are based on the base language.
 	 */
-	if (!_translation) return true;
+	if (!_strgen.translation) return true;
 
 	bool result = true;
 
@@ -555,137 +479,124 @@ static bool CheckCommandsMatch(const char *a, const char *b, const char *name)
 	return result;
 }
 
-void StringReader::HandleString(char *str)
+void StringReader::HandleString(std::string_view src)
 {
-	if (*str == '#') {
-		if (str[1] == '#' && str[2] != '#') this->HandlePragma(str + 2);
-		return;
+	/* Ignore blank lines */
+	if (src.empty()) return;
+
+	StringConsumer consumer(src);
+	if (consumer.ReadCharIf('#')) {
+		if (consumer.ReadCharIf('#') && !consumer.ReadCharIf('#')) this->HandlePragma(consumer.Read(StringConsumer::npos), _strgen.lang);
+		return; // ignore comments
 	}
 
-	/* Ignore comments & blank lines */
-	if (*str == ';' || *str == ' ' || *str == '\0') return;
-
-	char *s = strchr(str, ':');
-	if (s == nullptr) {
+	/* Read string name */
+	std::string_view str_name = StrTrimView(consumer.ReadUntilChar(':', StringConsumer::KEEP_SEPARATOR), StringConsumer::WHITESPACE_NO_NEWLINE);
+	if (!consumer.ReadCharIf(':')) {
 		StrgenError("Line has no ':' delimiter");
 		return;
 	}
 
-	char *t;
-	/* Trim spaces.
-	 * After this str points to the command name, and s points to the command contents */
-	for (t = s; t > str && (t[-1] == ' ' || t[-1] == '\t'); t--) {}
-	*t = 0;
-	s++;
-
-	/* Check string is valid UTF-8 */
-	const char *tmp;
-	for (tmp = s; *tmp != '\0';) {
-		size_t len = Utf8Validate(tmp);
-		if (len == 0) StrgenFatal("Invalid UTF-8 sequence in '{}'", s);
-
-		char32_t c;
-		Utf8Decode(&c, tmp);
-		if (c <= 0x001F || // ASCII control character range
-				c == 0x200B || // Zero width space
-				(c >= 0xE000 && c <= 0xF8FF) || // Private range
-				(c >= 0xFFF0 && c <= 0xFFFF)) { // Specials range
-			StrgenFatal("Unwanted UTF-8 character U+{:04X} in sequence '{}'", static_cast<uint32_t>(c), s);
-		}
-
-		tmp += len;
+	/* Read string case */
+	std::optional<std::string_view> casep;
+	if (auto index = str_name.find("."); index != std::string_view::npos) {
+		casep = str_name.substr(index + 1);
+		str_name = str_name.substr(0, index);
 	}
 
-	/* Check if the string has a case..
-	 * The syntax for cases is IDENTNAME.case */
-	char *casep = strchr(str, '.');
-	if (casep != nullptr) *casep++ = '\0';
+	/* Read string data */
+	std::string_view value = consumer.Read(StringConsumer::npos);
+
+	/* Check string is valid UTF-8 */
+	for (StringConsumer validation_consumer(value); validation_consumer.AnyBytesLeft(); ) {
+		auto c = validation_consumer.TryReadUtf8();
+		if (!c.has_value()) StrgenFatal("Invalid UTF-8 sequence in '{}'", value);
+		if (*c <= 0x001F || // ASCII control character range
+				*c == 0x200B || // Zero width space
+				(*c >= 0xE000 && *c <= 0xF8FF) || // Private range
+				(*c >= 0xFFF0 && *c <= 0xFFFF)) { // Specials range
+			StrgenFatal("Unwanted UTF-8 character U+{:04X} in sequence '{}'", static_cast<uint32_t>(*c), value);
+		}
+	}
 
 	/* Check if this string already exists.. */
-	LangString *ent = this->data.Find(str);
+	LangString *ent = this->data.Find(str_name);
 
 	if (this->master) {
-		if (casep != nullptr) {
+		if (casep.has_value()) {
 			StrgenError("Cases in the base translation are not supported.");
 			return;
 		}
 
 		if (ent != nullptr) {
-			StrgenError("String name '{}' is used multiple times", str);
+			StrgenError("String name '{}' is used multiple times", str_name);
 			return;
 		}
 
 		if (this->data.strings[this->data.next_string_id] != nullptr) {
-			StrgenError("String ID 0x{:X} for '{}' already in use by '{}'", this->data.next_string_id, str, this->data.strings[this->data.next_string_id]->name);
+			StrgenError("String ID 0x{:X} for '{}' already in use by '{}'", this->data.next_string_id, str_name, this->data.strings[this->data.next_string_id]->name);
 			return;
 		}
 
 		/* Allocate a new LangString */
-		this->data.Add(std::make_unique<LangString>(str, s, this->data.next_string_id++, _cur_line));
+		this->data.Add(std::make_unique<LangString>(str_name, value, this->data.next_string_id++, _strgen.cur_line));
 	} else {
 		if (ent == nullptr) {
-			StrgenWarning("String name '{}' does not exist in master file", str);
+			StrgenWarning("String name '{}' does not exist in master file", str_name);
 			return;
 		}
 
-		if (!ent->translated.empty() && casep == nullptr) {
-			StrgenError("String name '{}' is used multiple times", str);
+		if (!ent->translated.empty() && !casep.has_value()) {
+			StrgenError("String name '{}' is used multiple times", str_name);
 			return;
 		}
 
 		/* make sure that the commands match */
-		if (!CheckCommandsMatch(s, ent->english.c_str(), str)) return;
+		if (!CheckCommandsMatch(value, ent->english, str_name)) return;
 
-		if (casep != nullptr) {
-			ent->translated_cases.emplace_back(ResolveCaseName(casep), s);
+		if (casep.has_value()) {
+			ent->translated_cases.emplace_back(ResolveCaseName(*casep), value);
 		} else {
-			ent->translated = s;
+			ent->translated = value;
 			/* If the string was translated, use the line from the
 			 * translated language so errors in the translated file
 			 * are properly referenced to. */
-			ent->line = _cur_line;
+			ent->line = _strgen.cur_line;
 		}
 	}
 }
 
-void StringReader::HandlePragma(char *str)
+void StringReader::HandlePragma(std::string_view str, LanguagePackHeader &lang)
 {
-	if (!memcmp(str, "plural ", 7)) {
-		_lang.plural_form = atoi(str + 7);
-		if (_lang.plural_form >= lengthof(_plural_forms)) {
-			StrgenFatal("Invalid pluralform {}", _lang.plural_form);
+	StringConsumer consumer(str);
+	auto name = consumer.ReadUntilChar(' ', StringConsumer::SKIP_ALL_SEPARATORS);
+	if (name == "plural") {
+		lang.plural_form = consumer.ReadIntegerBase<uint32_t>(10);
+		if (lang.plural_form >= lengthof(_plural_forms)) {
+			StrgenFatal("Invalid pluralform {}", lang.plural_form);
 		}
 	} else {
-		StrgenFatal("unknown pragma '{}'", str);
+		StrgenFatal("unknown pragma '{}'", name);
 	}
 }
 
-static void StripTrailingWhitespace(std::string &str)
-{
-	str.erase(str.find_last_not_of("\r\n ") + 1);
-}
-
 void StringReader::ParseFile()
 {
-	_warnings = _errors = 0;
+	_strgen.warnings = _strgen.errors = 0;
 
-	_translation = this->translation;
-	_file = this->file.c_str();
+	_strgen.translation = this->translation;
+	_strgen.file = this->file;
 
 	/* For each new file we parse, reset the genders, and language codes. */
-	MemSetT(&_lang, 0);
-	strecpy(_lang.digit_group_separator, ",");
-	strecpy(_lang.digit_group_separator_currency, ",");
-	strecpy(_lang.digit_decimal_separator, ".");
+	_strgen.lang = {};
 
-	_cur_line = 1;
+	_strgen.cur_line = 1;
 	while (this->data.next_string_id < this->data.max_strings) {
 		std::optional<std::string> line = this->ReadLine();
 		if (!line.has_value()) return;
 
-		StripTrailingWhitespace(line.value());
-		this->HandleString(line.value().data());
-		_cur_line++;
+		this->HandleString(StrTrimView(line.value(), StringConsumer::WHITESPACE_OR_NEWLINE));
+		_strgen.cur_line++;
 	}
 
 	if (this->data.next_string_id == this->data.max_strings) {
@@ -740,20 +651,19 @@ static void PutArgidxCommand(StringBuilder &builder)
 	builder.PutUint8(static_cast<uint8_t>(TranslateArgumentIdx(_cur_argidx)));
 }
 
-static std::string PutCommandString(const char *str)
+static std::string PutCommandString(std::string_view str)
 {
 	std::string result;
 	StringBuilder builder(result);
+	StringConsumer consumer(str);
 	_cur_argidx = 0;
 
-	while (*str != '\0') {
+	for (;;) {
 		/* Process characters as they are until we encounter a { */
-		if (*str != '{') {
-			builder.PutChar(*str++);
-			continue;
-		}
+		builder.Put(consumer.ReadUntilChar('{', StringConsumer::KEEP_SEPARATOR));
+		if (!consumer.AnyBytesLeft()) break;
 
-		auto cs = ParseCommandString(&str);
+		auto cs = ParseCommandString(consumer);
 		auto *cmd = cs.cmd;
 		if (cmd == nullptr) break;
 
@@ -777,7 +687,7 @@ static std::string PutCommandString(const char *str)
 			}
 		}
 
-		cmd->proc(builder, cs.param.c_str(), cmd->value);
+		cmd->proc(builder, cs.param, cmd->value);
 	}
 	return result;
 }
@@ -798,7 +708,7 @@ void LanguageWriter::WriteLength(size_t length)
 		buffer[offs++] = static_cast<char>(static_cast<uint8_t>((length >> 8) | 0xC0));
 	}
 	buffer[offs++] = static_cast<char>(static_cast<uint8_t>(length & 0xFF));
-	this->Write(buffer, offs);
+	this->Write({buffer, offs});
 }
 
 /**
@@ -812,20 +722,20 @@ void LanguageWriter::WriteLang(const StringData &data)
 		size_t n = data.CountInUse(tab);
 
 		in_use.push_back(n);
-		_lang.offsets[tab] = TO_LE16(static_cast<uint16_t>(n));
+		_strgen.lang.offsets[tab] = TO_LE16(static_cast<uint16_t>(n));
 
 		for (size_t j = 0; j != in_use[tab]; j++) {
 			const LangString *ls = data.strings[(tab * TAB_SIZE) + j].get();
-			if (ls != nullptr && ls->translated.empty()) _lang.missing++;
+			if (ls != nullptr && ls->translated.empty()) _strgen.lang.missing++;
 		}
 	}
 
-	_lang.ident = TO_LE32(LanguagePackHeader::IDENT);
-	_lang.version = TO_LE32(data.Version());
-	_lang.missing = TO_LE16(_lang.missing);
-	_lang.winlangid = TO_LE16(_lang.winlangid);
+	_strgen.lang.ident = TO_LE32(LanguagePackHeader::IDENT);
+	_strgen.lang.version = TO_LE32(data.Version());
+	_strgen.lang.missing = TO_LE16(_strgen.lang.missing);
+	_strgen.lang.winlangid = TO_LE16(_strgen.lang.winlangid);
 
-	this->WriteHeader(&_lang);
+	this->WriteHeader(&_strgen.lang);
 
 	for (size_t tab = 0; tab < data.tabs; tab++) {
 		for (size_t j = 0; j != in_use[tab]; j++) {
@@ -839,21 +749,21 @@ void LanguageWriter::WriteLang(const StringData &data)
 
 			std::string output;
 			StringBuilder builder(output);
-			_cur_ident = ls->name.c_str();
-			_cur_line = ls->line;
+			_cur_ident = ls->name;
+			_strgen.cur_line = ls->line;
 
 			/* Produce a message if a string doesn't have a translation. */
 			if (ls->translated.empty()) {
-				if (_show_warnings) {
+				if (_strgen.show_warnings) {
 					StrgenWarning("'{}' is untranslated", ls->name);
 				}
-				if (_annotate_todos) {
+				if (_strgen.annotate_todos) {
 					builder.Put("<TODO> ");
 				}
 			}
 
 			/* Extract the strings and stuff from the english command string */
-			_cur_pcs = ExtractCommandString(ls->english.c_str(), false);
+			_cur_pcs = ExtractCommandString(ls->english, false);
 
 			_translated = !ls->translated_cases.empty() || !ls->translated.empty();
 			const std::string &cmdp = _translated ? ls->translated : ls->english;
@@ -868,7 +778,7 @@ void LanguageWriter::WriteLang(const StringData &data)
 
 				/* Write each case */
 				for (const Case &c : ls->translated_cases) {
-					auto case_str = PutCommandString(c.string.c_str());
+					auto case_str = PutCommandString(c.string);
 					builder.PutUint8(c.caseidx);
 					builder.PutUint16LE(static_cast<uint16_t>(case_str.size()));
 					builder.Put(case_str);
@@ -876,14 +786,14 @@ void LanguageWriter::WriteLang(const StringData &data)
 			}
 
 			std::string def_str;
-			if (!cmdp.empty()) def_str = PutCommandString(cmdp.c_str());
+			if (!cmdp.empty()) def_str = PutCommandString(cmdp);
 			if (!ls->translated_cases.empty()) {
 				builder.PutUint16LE(static_cast<uint16_t>(def_str.size()));
 			}
 			builder.Put(def_str);
 
 			this->WriteLength(output.size());
-			this->Write(output.data(), output.size());
+			this->Write(output);
 		}
 	}
 }
diff --git a/src/string.cpp b/src/string.cpp
index 2fadbb2e30..16441e802f 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file string.cpp Handling of C-type strings (char*). */
+/** @file string.cpp Handling of strings (std::string/std::string_view). */
 
 #include "stdafx.h"
 #include "debug.h"
@@ -14,13 +14,10 @@
 #include "string_func.h"
 #include "string_base.h"
 #include "core/utf8.hpp"
+#include "core/string_inplace.hpp"
 
 #include "table/control_codes.h"
 
-#ifdef _MSC_VER
-#	define strncasecmp strnicmp
-#endif
-
 #ifdef _WIN32
 #	include "os/windows/win32.h"
 #endif
@@ -81,7 +78,7 @@ std::string FormatArrayAsHex(std::span<const uint8_t> data)
 	str.reserve(data.size() * 2 + 1);
 
 	for (auto b : data) {
-		fmt::format_to(std::back_inserter(str), "{:02X}", b);
+		format_append(str, "{:02X}", b);
 	}
 
 	return str;
@@ -108,76 +105,40 @@ static bool IsSccEncodedCode(char32_t c)
 }
 
 /**
- * Copies the valid (UTF-8) characters from \c str up to \c last to the \c dst.
+ * Copies the valid (UTF-8) characters from \c consumer to the \c builder.
  * Depending on the \c settings invalid characters can be replaced with a
  * question mark, as well as determining what characters are deemed invalid.
  *
- * It is allowed for \c dst to be the same as \c src, in which case the string
- * is make valid in place.
- * @param dst The destination to write to.
- * @param str The string to validate.
- * @param last The last valid character of str.
+ * @param builder The destination to write to.
+ * @param consumer The string to validate.
  * @param settings The settings for the string validation.
  */
-template <class T>
-static void StrMakeValid(T &dst, const char *str, const char *last, StringValidationSettings settings)
+template <class Builder>
+static void StrMakeValid(Builder &builder, StringConsumer &consumer, StringValidationSettings settings)
 {
 	/* Assume the ABSOLUTE WORST to be in str as it comes from the outside. */
-
-	while (str <= last && *str != '\0') {
-		size_t len = Utf8EncodedCharLen(*str);
-		char32_t c;
-		/* If the first byte does not look like the first byte of an encoded
-		 * character, i.e. encoded length is 0, then this byte is definitely bad
-		 * and it should be skipped.
-		 * When the first byte looks like the first byte of an encoded character,
-		 * then the remaining bytes in the string are checked whether the whole
-		 * encoded character can be there. If that is not the case, this byte is
-		 * skipped.
-		 * Finally we attempt to decode the encoded character, which does certain
-		 * extra validations to see whether the correct number of bytes were used
-		 * to encode the character. If that is not the case, the byte is probably
-		 * invalid and it is skipped. We could emit a question mark, but then the
-		 * logic below cannot just copy bytes, it would need to re-encode the
-		 * decoded characters as the length in bytes may have changed.
-		 *
-		 * The goals here is to get as much valid Utf8 encoded characters from the
-		 * source string to the destination string.
-		 *
-		 * Note: a multi-byte encoded termination ('\0') will trigger the encoded
-		 * char length and the decoded length to differ, so it will be ignored as
-		 * invalid character data. If it were to reach the termination, then we
-		 * would also reach the "last" byte of the string and a normal '\0'
-		 * termination will be placed after it.
-		 */
-		if (len == 0 || str + len > last + 1 || len != Utf8Decode(&c, str)) {
+	while (consumer.AnyBytesLeft()) {
+		auto c = consumer.TryReadUtf8();
+		if (!c.has_value()) {
 			/* Maybe the next byte is still a valid character? */
-			str++;
+			consumer.Skip(1);
 			continue;
 		}
+		if (*c == 0) break;
 
-		if ((IsPrintable(c) && (c < SCC_SPRITE_START || c > SCC_SPRITE_END)) || (settings.Test(StringValidationSetting::AllowControlCode) && IsSccEncodedCode(c))) {
-			/* Copy the character back. Even if dst is current the same as str
-			 * (i.e. no characters have been changed) this is quicker than
-			 * moving the pointers ahead by len */
-			do {
-				*dst++ = *str++;
-			} while (--len != 0);
-		} else if (settings.Test(StringValidationSetting::AllowNewline) && c == '\n') {
-			*dst++ = *str++;
-		} else {
-			if (settings.Test(StringValidationSetting::AllowNewline) && c == '\r' && str[1] == '\n') {
-				str += len;
-				continue;
-			}
-			str += len;
-			if (settings.Test(StringValidationSetting::ReplaceTabCrNlWithSpace) && (c == '\r' || c == '\n' || c == '\t')) {
-				/* Replace the tab, carriage return or newline with a space. */
-				*dst++ = ' ';
-			} else if (settings.Test(StringValidationSetting::ReplaceWithQuestionMark)) {
-				/* Replace the undesirable character with a question mark */
-				*dst++ = '?';
-			}
+		if ((IsPrintable(*c) && (*c < SCC_SPRITE_START || *c > SCC_SPRITE_END)) ||
+				(settings.Test(StringValidationSetting::AllowControlCode) && IsSccEncodedCode(*c)) ||
+				(settings.Test(StringValidationSetting::AllowNewline) && *c == '\n')) {
+			builder.PutUtf8(*c);
+		} else if (settings.Test(StringValidationSetting::AllowNewline) && *c == '\r' && consumer.PeekCharIf('\n')) {
+			/* Skip \r, if followed by \n */
+			/* continue */
+		} else if (settings.Test(StringValidationSetting::ReplaceTabCrNlWithSpace) && (*c == '\r' || *c == '\n' || *c == '\t')) {
+			/* Replace the tab, carriage return or newline with a space. */
+			builder.PutChar(' ');
+		} else if (settings.Test(StringValidationSetting::ReplaceWithQuestionMark)) {
+			/* Replace the undesirable character with a question mark */
+			builder.PutChar('?');
 		}
 	}
 
@@ -193,9 +154,10 @@ static void StrMakeValid(T &dst, const char *str, const char *last, StringValida
  */
 void StrMakeValidInPlace(char *str, StringValidationSettings settings)
 {
-	char *dst = str;
-	StrMakeValid(dst, str, str + strlen(str), settings);
-	*dst = '\0';
+	InPlaceReplacement inplace(std::span(str, strlen(str)));
+	StrMakeValid(inplace.builder, inplace.consumer, settings);
+	/* Add NUL terminator, if we ended up with less bytes than before */
+	if (inplace.builder.AnyBytesUnused()) inplace.builder.PutChar('\0');
 }
 
 /**
@@ -209,11 +171,9 @@ void StrMakeValidInPlace(std::string &str, StringValidationSettings settings)
 {
 	if (str.empty()) return;
 
-	char *buf = str.data();
-	char *last = buf + str.size() - 1;
-	char *dst = buf;
-	StrMakeValid(dst, buf, last, settings);
-	str.erase(dst - buf, std::string::npos);
+	InPlaceReplacement inplace(std::span(str.data(), str.size()));
+	StrMakeValid(inplace.builder, inplace.consumer, settings);
+	str.erase(inplace.builder.GetBytesWritten(), std::string::npos);
 }
 
 /**
@@ -225,16 +185,11 @@ void StrMakeValidInPlace(std::string &str, StringValidationSettings settings)
  */
 std::string StrMakeValid(std::string_view str, StringValidationSettings settings)
 {
-	if (str.empty()) return {};
-
-	auto buf = str.data();
-	auto last = buf + str.size() - 1;
-
-	std::ostringstream dst;
-	std::ostreambuf_iterator<char> dst_iter(dst);
-	StrMakeValid(dst_iter, buf, last, settings);
-
-	return dst.str();
+	std::string result;
+	StringBuilder builder(result);
+	StringConsumer consumer(str);
+	StrMakeValid(builder, consumer, settings);
+	return result;
 }
 
 /**
@@ -248,27 +203,17 @@ std::string StrMakeValid(std::string_view str, StringValidationSettings settings
 bool StrValid(std::span<const char> str)
 {
 	/* Assume the ABSOLUTE WORST to be in str as it comes from the outside. */
-	auto it = std::begin(str);
-	auto last = std::prev(std::end(str));
-
-	while (it <= last && *it != '\0') {
-		size_t len = Utf8EncodedCharLen(*it);
-		/* Encoded length is 0 if the character isn't known.
-		 * The length check is needed to prevent Utf8Decode to read
-		 * over the terminating '\0' if that happens to be placed
-		 * within the encoding of an UTF8 character. */
-		if (len == 0 || it + len > last) return false;
-
-		char32_t c;
-		len = Utf8Decode(&c, &*it);
-		if (!IsPrintable(c) || (c >= SCC_SPRITE_START && c <= SCC_SPRITE_END)) {
+	StringConsumer consumer(str);
+	while (consumer.AnyBytesLeft()) {
+		auto c = consumer.TryReadUtf8();
+		if (!c.has_value()) return false; // invalid codepoint
+		if (*c == 0) return true; // NUL termination
+		if (!IsPrintable(*c) || (*c >= SCC_SPRITE_START && *c <= SCC_SPRITE_END)) {
 			return false;
 		}
-
-		it += len;
 	}
 
-	return *it == '\0';
+	return false; // missing NUL termination
 }
 
 /**
@@ -280,16 +225,24 @@ bool StrValid(std::span<const char> str)
  */
 void StrTrimInPlace(std::string &str)
 {
-	str = StrTrimView(str);
+	size_t first_pos = str.find_first_not_of(StringConsumer::WHITESPACE_NO_NEWLINE);
+	if (first_pos == std::string::npos) {
+		str.clear();
+		return;
+	}
+	str.erase(0, first_pos);
+
+	size_t last_pos = str.find_last_not_of(StringConsumer::WHITESPACE_NO_NEWLINE);
+	str.erase(last_pos + 1);
 }
 
-std::string_view StrTrimView(std::string_view str)
+std::string_view StrTrimView(std::string_view str, std::string_view characters_to_trim)
 {
-	size_t first_pos = str.find_first_not_of(' ');
+	size_t first_pos = str.find_first_not_of(characters_to_trim);
 	if (first_pos == std::string::npos) {
 		return std::string_view{};
 	}
-	size_t last_pos = str.find_last_not_of(' ');
+	size_t last_pos = str.find_last_not_of(characters_to_trim);
 	return str.substr(first_pos, last_pos - first_pos + 1);
 }
 
@@ -299,7 +252,7 @@ std::string_view StrTrimView(std::string_view str)
  * @param prefix The prefix to look for.
  * @return True iff the begin of the string is the same as the prefix, ignoring case.
  */
-bool StrStartsWithIgnoreCase(std::string_view str, const std::string_view prefix)
+bool StrStartsWithIgnoreCase(std::string_view str, std::string_view prefix)
 {
 	if (str.size() < prefix.size()) return false;
 	return StrEqualsIgnoreCase(str.substr(0, prefix.size()), prefix);
@@ -339,7 +292,7 @@ typedef std::basic_string_view<char, CaseInsensitiveCharTraits> CaseInsensitiveS
  * @param suffix The suffix to look for.
  * @return True iff the end of the string is the same as the suffix, ignoring case.
  */
-bool StrEndsWithIgnoreCase(std::string_view str, const std::string_view suffix)
+bool StrEndsWithIgnoreCase(std::string_view str, std::string_view suffix)
 {
 	if (str.size() < suffix.size()) return false;
 	return StrEqualsIgnoreCase(str.substr(str.size() - suffix.size()), suffix);
@@ -352,7 +305,7 @@ bool StrEndsWithIgnoreCase(std::string_view str, const std::string_view suffix)
  * @return Less than zero if str1 < str2, zero if str1 == str2, greater than
  *         zero if str1 > str2. All ignoring the case of the characters.
  */
-int StrCompareIgnoreCase(const std::string_view str1, const std::string_view str2)
+int StrCompareIgnoreCase(std::string_view str1, std::string_view str2)
 {
 	CaseInsensitiveStringView ci_str1{ str1.data(), str1.size() };
 	CaseInsensitiveStringView ci_str2{ str2.data(), str2.size() };
@@ -365,7 +318,7 @@ int StrCompareIgnoreCase(const std::string_view str1, const std::string_view str
  * @param str2 The second string.
  * @return True iff both strings are equal, barring the case of the characters.
  */
-bool StrEqualsIgnoreCase(const std::string_view str1, const std::string_view str2)
+bool StrEqualsIgnoreCase(std::string_view str1, std::string_view str2)
 {
 	if (str1.size() != str2.size()) return false;
 	return StrCompareIgnoreCase(str1, str2) == 0;
@@ -378,7 +331,7 @@ bool StrEqualsIgnoreCase(const std::string_view str1, const std::string_view str
  * @param value The string to search for.
  * @return True if a match was found.
  */
-bool StrContainsIgnoreCase(const std::string_view str, const std::string_view value)
+bool StrContainsIgnoreCase(std::string_view str, std::string_view value)
 {
 	CaseInsensitiveStringView ci_str{ str.data(), str.size() };
 	CaseInsensitiveStringView ci_value{ value.data(), value.size() };
@@ -428,48 +381,6 @@ bool IsValidChar(char32_t key, CharSetFilter afilter)
 	}
 }
 
-
-/* UTF-8 handling routines */
-
-
-/**
- * Decode and consume the next UTF-8 encoded character.
- * @param c Buffer to place decoded character.
- * @param s Character stream to retrieve character from.
- * @return Number of characters in the sequence.
- */
-size_t Utf8Decode(char32_t *c, const char *s)
-{
-	assert(c != nullptr);
-
-	if (!HasBit(s[0], 7)) {
-		/* Single byte character: 0xxxxxxx */
-		*c = s[0];
-		return 1;
-	} else if (GB(s[0], 5, 3) == 6) {
-		if (IsUtf8Part(s[1])) {
-			/* Double byte character: 110xxxxx 10xxxxxx */
-			*c = GB(s[0], 0, 5) << 6 | GB(s[1], 0, 6);
-			if (*c >= 0x80) return 2;
-		}
-	} else if (GB(s[0], 4, 4) == 14) {
-		if (IsUtf8Part(s[1]) && IsUtf8Part(s[2])) {
-			/* Triple byte character: 1110xxxx 10xxxxxx 10xxxxxx */
-			*c = GB(s[0], 0, 4) << 12 | GB(s[1], 0, 6) << 6 | GB(s[2], 0, 6);
-			if (*c >= 0x800) return 3;
-		}
-	} else if (GB(s[0], 3, 5) == 30) {
-		if (IsUtf8Part(s[1]) && IsUtf8Part(s[2]) && IsUtf8Part(s[3])) {
-			/* 4 byte character: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
-			*c = GB(s[0], 0, 3) << 18 | GB(s[1], 0, 6) << 12 | GB(s[2], 0, 6) << 6 | GB(s[3], 0, 6);
-			if (*c >= 0x10000 && *c <= 0x10FFFF) return 4;
-		}
-	}
-
-	*c = '?';
-	return 1;
-}
-
 /**
  * Test if a unicode character is considered garbage to be skipped.
  * @param c Character to test.
@@ -552,7 +463,7 @@ int StrNaturalCompare(std::string_view s1, std::string_view s2, bool ignore_garb
  * @param case_insensitive Search case-insensitive.
  * @return 1 if value was found, 0 if it was not found, or -1 if not supported by the OS.
  */
-static int ICUStringContains(const std::string_view str, const std::string_view value, bool case_insensitive)
+static int ICUStringContains(std::string_view str, std::string_view value, bool case_insensitive)
 {
 	if (_current_collator) {
 		std::unique_ptr<icu::RuleBasedCollator> coll(dynamic_cast<icu::RuleBasedCollator *>(_current_collator->clone()));
@@ -582,7 +493,7 @@ static int ICUStringContains(const std::string_view str, const std::string_view
  * @param value The string to search for.
  * @return True if a match was found.
  */
-[[nodiscard]] bool StrNaturalContains(const std::string_view str, const std::string_view value)
+[[nodiscard]] bool StrNaturalContains(std::string_view str, std::string_view value)
 {
 #ifdef WITH_ICU_I18N
 	int res_u = ICUStringContains(str, value, false);
@@ -609,7 +520,7 @@ static int ICUStringContains(const std::string_view str, const std::string_view
  * @param value The string to search for.
  * @return True if a match was found.
  */
-[[nodiscard]] bool StrNaturalContainsIgnoreCase(const std::string_view str, const std::string_view value)
+[[nodiscard]] bool StrNaturalContainsIgnoreCase(std::string_view str, std::string_view value)
 {
 #ifdef WITH_ICU_I18N
 	int res_u = ICUStringContains(str, value, true);
@@ -940,3 +851,15 @@ public:
 #endif /* defined(WITH_COCOA) && !defined(STRGEN) && !defined(SETTINGSGEN) */
 
 #endif
+
+/**
+ * Get the environment variable using std::getenv and when it is an empty string (or nullptr), return \c std::nullopt instead.
+ * @param variable The environment variable to read from.
+ * @return The environment value, or \c std::nullopt.
+ */
+std::optional<std::string_view> GetEnv(const char *variable)
+{
+	auto val = std::getenv(variable);
+	if (val == nullptr || *val == '\0') return std::nullopt;
+	return val;
+}
diff --git a/src/string_func.h b/src/string_func.h
index 0952993855..828d123505 100644
--- a/src/string_func.h
+++ b/src/string_func.h
@@ -25,10 +25,6 @@ void StrMakeValidInPlace(char *str, StringValidationSettings settings = StringVa
 void StrMakeValidInPlace(std::string &str, StringValidationSettings settings = StringValidationSetting::ReplaceWithQuestionMark);
 
 [[nodiscard]] std::string StrMakeValid(std::string_view str, StringValidationSettings settings = StringValidationSetting::ReplaceWithQuestionMark);
-[[nodiscard]] inline std::string StrMakeValid(const char *str, StringValidationSettings settings = StringValidationSetting::ReplaceWithQuestionMark)
-{
-	return StrMakeValid(std::string_view(str), settings);
-}
 [[nodiscard]] inline std::string StrMakeValid(std::string &&str, StringValidationSettings settings = StringValidationSetting::ReplaceWithQuestionMark)
 {
 	StrMakeValidInPlace(str, settings);
@@ -39,98 +35,27 @@ bool strtolower(std::string &str, std::string::size_type offs = 0);
 
 [[nodiscard]] bool StrValid(std::span<const char> str);
 void StrTrimInPlace(std::string &str);
-[[nodiscard]] std::string_view StrTrimView(std::string_view str);
+[[nodiscard]] std::string_view StrTrimView(std::string_view str, std::string_view characters_to_trim);
 
-[[nodiscard]] bool StrStartsWithIgnoreCase(std::string_view str, const std::string_view prefix);
-[[nodiscard]] bool StrEndsWithIgnoreCase(std::string_view str, const std::string_view suffix);
+[[nodiscard]] bool StrStartsWithIgnoreCase(std::string_view str, std::string_view prefix);
+[[nodiscard]] bool StrEndsWithIgnoreCase(std::string_view str, std::string_view suffix);
 
-[[nodiscard]] int StrCompareIgnoreCase(const std::string_view str1, const std::string_view str2);
-[[nodiscard]] bool StrEqualsIgnoreCase(const std::string_view str1, const std::string_view str2);
-[[nodiscard]] bool StrContainsIgnoreCase(const std::string_view str, const std::string_view value);
+[[nodiscard]] int StrCompareIgnoreCase(std::string_view str1, std::string_view str2);
+[[nodiscard]] bool StrEqualsIgnoreCase(std::string_view str1, std::string_view str2);
+[[nodiscard]] bool StrContainsIgnoreCase(std::string_view str, std::string_view value);
 [[nodiscard]] int StrNaturalCompare(std::string_view s1, std::string_view s2, bool ignore_garbage_at_front = false);
-[[nodiscard]] bool StrNaturalContains(const std::string_view str, const std::string_view value);
-[[nodiscard]] bool StrNaturalContainsIgnoreCase(const std::string_view str, const std::string_view value);
+[[nodiscard]] bool StrNaturalContains(std::string_view str, std::string_view value);
+[[nodiscard]] bool StrNaturalContainsIgnoreCase(std::string_view str, std::string_view value);
 
 bool ConvertHexToBytes(std::string_view hex, std::span<uint8_t> bytes);
 
 /** Case insensitive comparator for strings, for example for use in std::map. */
 struct CaseInsensitiveComparator {
-	bool operator()(const std::string_view s1, const std::string_view s2) const { return StrCompareIgnoreCase(s1, s2) < 0; }
+	bool operator()(std::string_view s1, std::string_view s2) const { return StrCompareIgnoreCase(s1, s2) < 0; }
 };
 
-/**
- * Check if a string buffer is empty.
- *
- * @param s The pointer to the first element of the buffer
- * @return true if the buffer starts with the terminating null-character or
- *         if the given pointer points to nullptr else return false
- */
-inline bool StrEmpty(const char *s)
-{
-	return s == nullptr || s[0] == '\0';
-}
-
-/**
- * Get the length of a string, within a limited buffer.
- *
- * @param str The pointer to the first element of the buffer
- * @param maxlen The maximum size of the buffer
- * @return The length of the string
- */
-inline size_t ttd_strnlen(const char *str, size_t maxlen)
-{
-	const char *t;
-	for (t = str; static_cast<size_t>(t - str) < maxlen && *t != '\0'; t++) {}
-	return t - str;
-}
-
 bool IsValidChar(char32_t key, CharSetFilter afilter);
 
-size_t Utf8Decode(char32_t *c, const char *s);
-/* std::string_view::iterator might be char *, in which case we do not want this templated variant to be taken. */
-template <typename T> requires (!std::is_same_v<T, char *> && (std::is_same_v<std::string_view::iterator, T> || std::is_same_v<std::string::iterator, T>))
-inline size_t Utf8Decode(char32_t *c, T &s) { return Utf8Decode(c, &*s); }
-
-inline char32_t Utf8Consume(const char **s)
-{
-	char32_t c;
-	*s += Utf8Decode(&c, *s);
-	return c;
-}
-
-template <class Titr>
-inline char32_t Utf8Consume(Titr &s)
-{
-	char32_t c;
-	s += Utf8Decode(&c, &*s);
-	return c;
-}
-
-/**
- * Return the length of an UTF-8 encoded value based on a single char. This
- * char should be the first byte of the UTF-8 encoding. If not, or encoding
- * is invalid, return value is 0
- * @param c char to query length of
- * @return requested size
- */
-inline int8_t Utf8EncodedCharLen(char c)
-{
-	if (GB(c, 3, 5) == 0x1E) return 4;
-	if (GB(c, 4, 4) == 0x0E) return 3;
-	if (GB(c, 5, 3) == 0x06) return 2;
-	if (GB(c, 7, 1) == 0x00) return 1;
-
-	/* Invalid UTF8 start encoding */
-	return 0;
-}
-
-
-/* Check if the given character is part of a UTF8 sequence */
-inline bool IsUtf8Part(char c)
-{
-	return GB(c, 6, 2) == 2;
-}
-
 size_t Utf8StringLength(std::string_view str);
 
 /**
@@ -226,4 +151,6 @@ inline bool IsWhitespace(char32_t c)
 #include <sys/param.h>
 #endif
 
+std::optional<std::string_view> GetEnv(const char *variable);
+
 #endif /* STRING_FUNC_H */
diff --git a/src/string_type.h b/src/string_type.h
index 345a7dcb4e..e2e3de80f5 100644
--- a/src/string_type.h
+++ b/src/string_type.h
@@ -59,4 +59,13 @@ using StringValidationSettings = EnumBitSet<StringValidationSetting, uint8_t>;
 /** Type for a list of strings. */
 typedef std::vector<std::string> StringList;
 
+/** Helper to provide transparent hashing for string types in e.g. std::unordered_map. */
+struct StringHash {
+	using hash_type = std::hash<std::string_view>;
+	using is_transparent = void;
+
+	std::size_t operator()(std::string_view str) const { return hash_type{}(str); }
+	std::size_t operator()(const std::string &str) const { return hash_type{}(str); }
+};
+
 #endif /* STRING_TYPE_H */
diff --git a/src/strings.cpp b/src/strings.cpp
index 68a59c0c9b..cd77c85540 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -39,8 +39,8 @@
 #include "core/backup_type.hpp"
 #include "gfx_layout.h"
 #include "core/utf8.hpp"
+#include "core/string_consumer.hpp"
 #include <stack>
-#include <charconv>
 
 #include "table/strings.h"
 #include "table/control_codes.h"
@@ -153,48 +153,39 @@ EncodedString EncodedString::ReplaceParam(size_t param, StringParameter &&data)
 	if (this->empty()) return {};
 
 	std::vector<StringParameter> params;
+	StringConsumer consumer(this->string);
 
-	/* We need char * for std::from_chars. Iterate the underlying data, as string's own iterators may interfere. */
-	const char *p = this->string.data();
-	const char *e = this->string.data() + this->string.length();
-
-	char32_t c = Utf8Consume(p);
-	if (c != SCC_ENCODED_INTERNAL) return {};
+	if (!consumer.ReadUtf8If(SCC_ENCODED_INTERNAL)) return {};
 
 	StringID str;
-	auto result = std::from_chars(p, e, str, 16);
-	if (result.ec != std::errc()) return {};
-	if (result.ptr != e && *result.ptr != SCC_RECORD_SEPARATOR) return {};
-	p = result.ptr;
+	if (auto r = consumer.TryReadIntegerBase<uint32_t>(16); r.has_value()) {
+		str = *r;
+	} else {
+		return {};
+	}
+	if (consumer.AnyBytesLeft() && !consumer.ReadUtf8If(SCC_RECORD_SEPARATOR)) return {};
 
-	while (p != e) {
-		auto s = ++p;
+	while (consumer.AnyBytesLeft()) {
+		StringConsumer record(consumer.ReadUntilUtf8(SCC_RECORD_SEPARATOR, StringConsumer::SKIP_ONE_SEPARATOR));
 
-		/* Find end of the parameter. */
-		for (; p != e && *p != SCC_RECORD_SEPARATOR; ++p) {}
-
-		if (s == p) {
+		if (!record.AnyBytesLeft()) {
 			/* This is an empty parameter. */
 			params.emplace_back(std::monostate{});
 			continue;
 		}
 
 		/* Get the parameter type. */
-		char32_t parameter_type;
-		size_t len = Utf8Decode(&parameter_type, s);
-		s += len;
-
+		char32_t parameter_type = record.ReadUtf8();
 		switch (parameter_type) {
 			case SCC_ENCODED_NUMERIC: {
-				uint64_t value;
-				result = std::from_chars(s, p, value, 16);
-				if (result.ec != std::errc() || result.ptr != p) return {};
+				uint64_t value = record.ReadIntegerBase<uint64_t>(16);
+				assert(!record.AnyBytesLeft());
 				params.emplace_back(value);
 				break;
 			}
 
 			case SCC_ENCODED_STRING: {
-				params.emplace_back(std::string(s, p));
+				params.emplace_back(record.Read(StringConsumer::npos));
 				break;
 			}
 
@@ -282,7 +273,7 @@ struct LanguagePackDeleter {
 	void operator()(LanguagePack *langpack)
 	{
 		/* LanguagePack is in fact reinterpreted char[], we need to reinterpret it back to free it properly. */
-		delete[] reinterpret_cast<char*>(langpack);
+		delete[] reinterpret_cast<char *>(langpack);
 	}
 };
 
@@ -466,10 +457,10 @@ std::string GetStringWithArgs(StringID string, std::span<StringParameter> args)
 	return result;
 }
 
-static const char *GetDecimalSeparator()
+static std::string_view GetDecimalSeparator()
 {
-	const char *decimal_separator = _settings_game.locale.digit_decimal_separator.c_str();
-	if (StrEmpty(decimal_separator)) decimal_separator = _langpack.langpack->digit_decimal_separator;
+	std::string_view decimal_separator = _settings_game.locale.digit_decimal_separator;
+	if (decimal_separator.empty()) decimal_separator = _langpack.langpack->digit_decimal_separator;
 	return decimal_separator;
 }
 
@@ -479,7 +470,7 @@ static const char *GetDecimalSeparator()
  * @param number    the number to write down
  * @param separator the thousands-separator to use
  */
-static void FormatNumber(StringBuilder &builder, int64_t number, const char *separator)
+static void FormatNumber(StringBuilder &builder, int64_t number, std::string_view separator)
 {
 	static const int max_digits = 20;
 	uint64_t divisor = 10000000000000000000ULL;
@@ -509,8 +500,8 @@ static void FormatNumber(StringBuilder &builder, int64_t number, const char *sep
 
 static void FormatCommaNumber(StringBuilder &builder, int64_t number)
 {
-	const char *separator = _settings_game.locale.digit_group_separator.c_str();
-	if (StrEmpty(separator)) separator = _langpack.langpack->digit_group_separator;
+	std::string_view separator = _settings_game.locale.digit_group_separator;
+	if (separator.empty()) separator = _langpack.langpack->digit_group_separator;
 	FormatNumber(builder, number, separator);
 }
 
@@ -538,8 +529,8 @@ static void FormatBytes(StringBuilder &builder, int64_t number)
 {
 	assert(number >= 0);
 
-	/*                                   1   2^10  2^20  2^30  2^40  2^50  2^60 */
-	const char * const iec_prefixes[] = {"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei"};
+	/*                                              1   2^10  2^20  2^30  2^40  2^50  2^60 */
+	static const std::string_view iec_prefixes[] = {"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei"};
 	uint id = 1;
 	while (number >= 1024 * 1024) {
 		number /= 1024;
@@ -629,9 +620,9 @@ static void FormatGenericCurrency(StringBuilder &builder, const CurrencySpec *sp
 		}
 	}
 
-	const char *separator = _settings_game.locale.digit_group_separator_currency.c_str();
-	if (StrEmpty(separator)) separator = GetCurrency().separator.c_str();
-	if (StrEmpty(separator)) separator = _langpack.langpack->digit_group_separator_currency;
+	std::string_view separator = _settings_game.locale.digit_group_separator_currency;
+	if (separator.empty()) separator = GetCurrency().separator;
+	if (separator.empty()) separator = _langpack.langpack->digit_group_separator_currency;
 	FormatNumber(builder, number, separator);
 	if (number_str != STR_NULL) {
 		FormatString(builder, GetStringPtr(number_str), {});
@@ -653,7 +644,7 @@ static void FormatGenericCurrency(StringBuilder &builder, const CurrencySpec *sp
  * @param plural_form The plural form we want an index for.
  * @return The plural index for the given form.
  */
-static int DeterminePluralForm(int64_t count, int plural_form)
+static int DeterminePluralForm(int64_t count, uint plural_form)
 {
 	/* The absolute value determines plurality */
 	uint64_t n = abs(count);
@@ -774,22 +765,35 @@ static int DeterminePluralForm(int64_t count, int plural_form)
 	}
 }
 
-static const char *ParseStringChoice(const char *b, uint form, StringBuilder &builder)
+static void SkipStringChoice(StringConsumer &consumer)
+{
+	uint n = consumer.ReadUint8();
+	uint len = 0;
+	for (uint i = 0; i != n; i++) {
+		len += consumer.ReadUint8();
+	}
+	consumer.Skip(len);
+}
+
+static void ParseStringChoice(StringConsumer &consumer, uint form, StringBuilder &builder)
 {
 	/* <NUM> {Length of each string} {each string} */
-	uint n = (uint8_t)*b++;
-	size_t form_offset = 0, form_len = 0, total_len = 0;
+	uint n = consumer.ReadUint8();
+	size_t form_pre = 0, form_len = 0, form_post = 0;
 	for (uint i = 0; i != n; i++) {
-		uint len = (uint8_t)*b++;
-		if (i == form) {
-			form_offset = total_len;
+		uint len = consumer.ReadUint8();
+		if (i < form) {
+			form_pre += len;
+		} else if (i > form) {
+			form_post += len;
+		} else {
 			form_len = len;
 		}
-		total_len += len;
 	}
 
-	builder += std::string_view(b + form_offset, form_len);
-	return b + total_len;
+	consumer.Skip(form_pre);
+	builder += consumer.Read(form_len);
+	consumer.Skip(form_post);
 }
 
 /** Helper for unit conversion. */
@@ -991,67 +995,60 @@ uint ConvertDisplaySpeedToKmhishSpeed(uint speed, VehicleType type)
 
 /**
  * Decodes an encoded string during FormatString.
- * @param str The buffer of the encoded string.
+ * @param consumer The encoded string.
  * @param game_script Set if decoding a GameScript-encoded string. This affects how string IDs are handled.
  * @param builder The string builder to write the string to.
- * @returns Updated position position in input buffer.
  */
-static const char *DecodeEncodedString(const char *str, bool game_script, StringBuilder &builder)
+static void DecodeEncodedString(StringConsumer &consumer, bool game_script, StringBuilder &builder)
 {
 	std::vector<StringParameter> sub_args;
 
-	char *p;
-	StringIndexInTab id(std::strtoul(str, &p, 16));
-	if (*p != SCC_RECORD_SEPARATOR && *p != '\0') {
-		while (*p != '\0') p++;
+	StringIndexInTab id(consumer.ReadIntegerBase<uint32_t>(16));
+	if (consumer.AnyBytesLeft() && !consumer.PeekUtf8If(SCC_RECORD_SEPARATOR)) {
+		consumer.SkipAll();
 		builder += "(invalid SCC_ENCODED)";
-		return p;
+		return;
 	}
 	if (game_script && id >= TAB_SIZE_GAMESCRIPT) {
-		while (*p != '\0') p++;
+		consumer.SkipAll();
 		builder += "(invalid StringID)";
-		return p;
+		return;
 	}
 
-	while (*p != '\0') {
-		/* The start of parameter. */
-		const char *s = ++p;
+	while (consumer.AnyBytesLeft()) {
+		consumer.SkipUtf8If(SCC_RECORD_SEPARATOR);
+		StringConsumer record(consumer.ReadUntilUtf8(SCC_RECORD_SEPARATOR, StringConsumer::KEEP_SEPARATOR));
 
-		/* Find end of the parameter. */
-		for (; *p != '\0' && *p != SCC_RECORD_SEPARATOR; ++p) {}
-
-		if (s == p) {
+		if (!record.AnyBytesLeft()) {
 			/* This is an empty parameter. */
 			sub_args.emplace_back(std::monostate{});
 			continue;
 		}
 
 		/* Get the parameter type. */
-		char32_t parameter_type;
-		size_t len = Utf8Decode(&parameter_type, s);
-		s += len;
-
+		char32_t parameter_type = record.ReadUtf8();
 		switch (parameter_type) {
 			case SCC_ENCODED: {
-				uint64_t param = std::strtoull(s, &p, 16);
+				uint64_t param = record.ReadIntegerBase<uint64_t>(16);
 				if (param >= TAB_SIZE_GAMESCRIPT) {
-					while (*p != '\0') p++;
 					builder += "(invalid sub-StringID)";
-					return p;
+					return;
 				}
+				assert(!record.AnyBytesLeft());
 				param = MakeStringID(TEXT_TAB_GAMESCRIPT_START, StringIndexInTab(param));
 				sub_args.emplace_back(param);
 				break;
 			}
 
 			case SCC_ENCODED_NUMERIC: {
-				uint64_t param = std::strtoull(s, &p, 16);
+				uint64_t param = record.ReadIntegerBase<uint64_t>(16);
+				assert(!record.AnyBytesLeft());
 				sub_args.emplace_back(param);
 				break;
 			}
 
 			case SCC_ENCODED_STRING: {
-				sub_args.emplace_back(std::string(s, p - s));
+				sub_args.emplace_back(record.Read(StringConsumer::npos));
 				break;
 			}
 
@@ -1064,8 +1061,6 @@ static const char *DecodeEncodedString(const char *str, bool game_script, String
 
 	StringID stringid = game_script ? MakeStringID(TEXT_TAB_GAMESCRIPT_START, id) : StringID{id.base()};
 	GetStringWithArgs(builder, stringid, sub_args, true);
-
-	return p;
 }
 
 /**
@@ -1096,13 +1091,12 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 	}
 	uint next_substr_case_index = 0;
 	struct StrStackItem {
-		const char *str;
-		const char *end;
+		StringConsumer consumer;
 		size_t first_param_offset;
 		uint case_index;
 
 		StrStackItem(std::string_view view, size_t first_param_offset, uint case_index)
-			: str(view.data()), end(view.data() + view.size()), first_param_offset(first_param_offset), case_index(case_index)
+			: consumer(view), first_param_offset(first_param_offset), case_index(case_index)
 		{}
 	};
 	std::stack<StrStackItem, std::vector<StrStackItem>> str_stack;
@@ -1110,19 +1104,24 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 
 	for (;;) {
 		try {
-			while (!str_stack.empty() && str_stack.top().str >= str_stack.top().end) {
+			while (!str_stack.empty() && !str_stack.top().consumer.AnyBytesLeft()) {
 				str_stack.pop();
 			}
 			if (str_stack.empty()) break;
-			const char *&str = str_stack.top().str;
+			StringConsumer &consumer = str_stack.top().consumer;
 			const size_t ref_param_offset = str_stack.top().first_param_offset;
 			const uint case_index = str_stack.top().case_index;
-			char32_t b = Utf8Consume(&str);
+			char32_t b = consumer.ReadUtf8();
 			assert(b != 0);
+			if (b == 0) {
+				/* A NUL character should never be encountered, but for non-debug builds handle it gracefully. */
+				builder += "(unexpected NUL)";
+				continue;
+			}
 
 			if (SCC_NEWGRF_FIRST <= b && b <= SCC_NEWGRF_LAST) {
 				/* We need to pass some stuff as it might be modified. */
-				b = RemapNewGRFStringControlCode(b, &str);
+				b = RemapNewGRFStringControlCode(b, consumer);
 				if (b == 0) continue;
 			}
 
@@ -1135,13 +1134,13 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 			switch (b) {
 				case SCC_ENCODED:
 				case SCC_ENCODED_INTERNAL:
-					str = DecodeEncodedString(str, b == SCC_ENCODED, builder);
+					DecodeEncodedString(consumer, b == SCC_ENCODED, builder);
 					break;
 
 				case SCC_NEWGRF_STRINL: {
-					StringID substr = Utf8Consume(&str);
+					StringID substr = consumer.ReadUtf8(STR_NULL);
 					std::string_view ptr = GetStringPtr(substr);
-					str_stack.emplace(ptr, args.GetOffset(), next_substr_case_index); // this may invalidate "str"
+					str_stack.emplace(ptr, args.GetOffset(), next_substr_case_index); // this may invalidate "consumer"
 					next_substr_case_index = 0;
 					break;
 				}
@@ -1149,15 +1148,15 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 				case SCC_NEWGRF_PRINT_WORD_STRING_ID: {
 					StringID substr = args.GetNextParameter<StringID>();
 					std::string_view ptr = GetStringPtr(substr);
-					str_stack.emplace(ptr, args.GetOffset(), next_substr_case_index); // this may invalidate "str"
+					str_stack.emplace(ptr, args.GetOffset(), next_substr_case_index); // this may invalidate "consumer"
 					next_substr_case_index = 0;
 					break;
 				}
 
 				case SCC_GENDER_LIST: { // {G 0 Der Die Das}
 					/* First read the meta data from the language file. */
-					size_t offset = ref_param_offset + (uint8_t)*str++;
-					int gender = 0;
+					size_t offset = ref_param_offset + consumer.ReadUint8();
+					uint8_t gender = 0;
 					if (offset >= args.GetNumParameters()) {
 						/* The offset may come from an external NewGRF, and be invalid. */
 						builder += "(invalid GENDER parameter)";
@@ -1179,76 +1178,75 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 							FormatString(tmp_builder, input, tmp_params);
 						}
 
-						/* The gender is stored at the start of the formatted string. */
-						const char *s = buffer.c_str();
-						char32_t c = Utf8Consume(&s);
-						/* Does this string have a gender, if so, set it */
-						if (c == SCC_GENDER_INDEX) gender = (uint8_t)s[0];
+						/* The gender is stored at the start of the formatted string.
+						 * Does this string have a gender, if so, set it. */
+						StringConsumer gender_consumer(buffer);
+						if (gender_consumer.ReadUtf8If(SCC_GENDER_INDEX)) {
+							gender = gender_consumer.ReadUint8();
+						}
 					}
-					str = ParseStringChoice(str, gender, builder);
+					ParseStringChoice(consumer, gender, builder);
 					break;
 				}
 
 				/* This sets up the gender for the string.
 				 * We just ignore this one. It's used in {G 0 Der Die Das} to determine the case. */
-				case SCC_GENDER_INDEX: // {GENDER 0}
+				case SCC_GENDER_INDEX: { // {GENDER 0}
+					uint8_t gender = consumer.ReadUint8();
 					if (_scan_for_gender_data) {
 						builder.PutUtf8(SCC_GENDER_INDEX);
-						builder.PutUint8(*str++);
-					} else {
-						str++;
+						builder.PutUint8(gender);
 					}
 					break;
+				}
 
 				case SCC_PLURAL_LIST: { // {P}
-					int plural_form = *str++;          // contains the plural form for this string
-					size_t offset = ref_param_offset + (uint8_t)*str++;
+					uint8_t plural_form = consumer.ReadUint8();  // contains the plural form for this string
+					size_t offset = ref_param_offset + consumer.ReadUint8();
 					const uint64_t *v = nullptr;
 					/* The offset may come from an external NewGRF, and be invalid. */
 					if (offset < args.GetNumParameters()) {
 						v = std::get_if<uint64_t>(&args.GetParam(offset)); // contains the number that determines plural
 					}
 					if (v != nullptr) {
-						str = ParseStringChoice(str, DeterminePluralForm(static_cast<int64_t>(*v), plural_form), builder);
+						ParseStringChoice(consumer, DeterminePluralForm(static_cast<int64_t>(*v), plural_form), builder);
 					} else {
+						SkipStringChoice(consumer);
 						builder += "(invalid PLURAL parameter)";
 					}
 					break;
 				}
 
 				case SCC_ARG_INDEX: { // Move argument pointer
-					args.SetOffset(ref_param_offset + (uint8_t)*str++);
+					args.SetOffset(ref_param_offset + consumer.ReadUint8());
 					break;
 				}
 
 				case SCC_SET_CASE: { // {SET_CASE}
 					/* This is a pseudo command, it's outputted when someone does {STRING.ack}
 					 * The modifier is added to all subsequent GetStringWithArgs that accept the modifier. */
-					next_substr_case_index = (uint8_t)*str++;
+					next_substr_case_index = consumer.ReadUint8();
 					break;
 				}
 
 				case SCC_SWITCH_CASE: { // {Used to implement case switching}
 					/* <0x9E> <NUM CASES> <CASE1> <LEN1> <STRING1> <CASE2> <LEN2> <STRING2> <CASE3> <LEN3> <STRING3> <LENDEFAULT> <STRINGDEFAULT>
 					 * Each LEN is printed using 2 bytes in little endian order. */
-					uint num = (uint8_t)*str++;
+					uint num = consumer.ReadUint8();
 					std::optional<std::string_view> found;
 					for (; num > 0; --num) {
-						uint8_t index = static_cast<uint8_t>(str[0]);
-						uint16_t len = static_cast<uint8_t>(str[1]) + (static_cast<uint8_t>(str[2]) << 8);
-						str += 3;
+						uint8_t index = consumer.ReadUint8();
+						uint16_t len = consumer.ReadUint16LE();
+						auto case_str = consumer.Read(len);
 						if (index == case_index) {
 							/* Found the case */
-							found.emplace(str, len);
+							found = case_str;
 						}
-						str += len;
 					}
-					uint16_t default_len = static_cast<uint8_t>(str[0]) + (static_cast<uint8_t>(str[1]) << 8);
-					str += 2;
-					if (!found.has_value()) found.emplace(str, default_len);
-					str += default_len;
-					assert(str <= str_stack.top().end);
-					str_stack.emplace(*found, ref_param_offset, case_index); // this may invalidate "str"
+					uint16_t default_len = consumer.ReadUint16LE();
+					auto default_str = consumer.Read(default_len);
+					if (!found.has_value()) found = default_str;
+					str_stack.emplace(*found, ref_param_offset, case_index); // this may invalidate "consumer"
 					break;
 				}
 
@@ -1256,16 +1254,9 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 					builder += _openttd_revision;
 					break;
 
-				case SCC_RAW_STRING_POINTER: { // {RAW_STRING}
-					const char *raw_string = args.GetNextParameterString();
-					/* raw_string can be nullptr. */
-					if (raw_string == nullptr) {
-						builder += "(invalid RAW_STRING parameter)";
-						break;
-					}
-					FormatString(builder, raw_string, args);
+				case SCC_RAW_STRING_POINTER: // {RAW_STRING}
+					FormatString(builder, args.GetNextParameterString(), args);
 					break;
-				}
 
 				case SCC_STRING: {// {STRING}
 					StringID string_id = args.GetNextParameter<StringID>();
@@ -1496,7 +1487,7 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 
 				case SCC_VELOCITY: { // {VELOCITY}
 					int64_t arg = args.GetNextParameter<int64_t>();
-					// Unpack vehicle type from packed argument to get desired units.
+					/* Unpack vehicle type from packed argument to get desired units. */
 					VehicleType vt = static_cast<VehicleType>(GB(arg, 56, 8));
 					const auto &x = GetVelocityUnits(vt);
 					auto tmp_params = MakeParameters(ConvertKmhishSpeedToDisplaySpeed(GB(arg, 0, 56), vt), x.decimal_places);
@@ -1624,13 +1615,20 @@ static void FormatString(StringBuilder &builder, std::string_view str_arg, Strin
 					}
 
 					if (e->info.callback_mask.Test(VehicleCallbackMask::Name)) {
-						uint16_t callback = GetVehicleCallback(CBID_VEHICLE_NAME, static_cast<uint32_t>(arg >> 32), 0, e->index, nullptr);
+						std::array<int32_t, 16> regs100;
+						uint16_t callback = GetVehicleCallback(CBID_VEHICLE_NAME, static_cast<uint32_t>(arg >> 32), 0, e->index, nullptr, regs100);
 						/* Not calling ErrorUnknownCallbackResult due to being inside string processing. */
-						if (callback != CALLBACK_FAILED && callback < 0x400) {
+						if (callback == 0x40F) {
 							const GRFFile *grffile = e->GetGRF();
 							assert(grffile != nullptr);
 
-							builder += GetGRFStringWithTextStack(grffile, GRFSTR_MISC_GRF_TEXT + callback, 6);
+							builder += GetGRFStringWithTextStack(grffile, static_cast<GRFStringID>(regs100[0]), std::span{regs100}.subspan(1));
+							break;
+						} else if (callback < 0x400) {
+							const GRFFile *grffile = e->GetGRF();
+							assert(grffile != nullptr);
+
+							builder += GetGRFStringWithTextStack(grffile, GRFSTR_MISC_GRF_TEXT + callback, regs100);
 							break;
 						}
 					}
@@ -1833,7 +1831,7 @@ static void StationGetSpecialString(StringBuilder &builder, StationFacilities x)
 	if (x.Test(StationFacility::Airport)) builder.PutUtf8(SCC_PLANE);
 }
 
-static const char * const _silly_company_names[] = {
+static const std::string_view _silly_company_names[] = {
 	"Bloggs Brothers",
 	"Tiny Transport Ltd.",
 	"Express Travel",
@@ -1849,7 +1847,7 @@ static const char * const _silly_company_names[] = {
 	"Getout & Pushit Ltd."
 };
 
-static const char * const _surname_list[] = {
+static const std::string_view _surname_list[] = {
 	"Adams",
 	"Allan",
 	"Baker",
@@ -1881,7 +1879,7 @@ static const char * const _surname_list[] = {
 	"Watkins"
 };
 
-static const char * const _silly_surname_list[] = {
+static const std::string_view _silly_surname_list[] = {
 	"Grumpy",
 	"Dozy",
 	"Speedy",
@@ -1901,7 +1899,7 @@ static const char _initial_name_letters[] = {
 	'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W',
 };
 
-static std::span<const char * const> GetSurnameOptions()
+static std::span<const std::string_view> GetSurnameOptions()
 {
 	if (_settings_game.game_creation.landscape == LandscapeType::Toyland) return _silly_surname_list;
 	return _surname_list;
@@ -1912,7 +1910,7 @@ static std::span<const char * const> GetSurnameOptions()
  * @param seed The seed the surname was generated from.
  * @return The surname.
  */
-static const char *GetSurname(uint32_t seed)
+static std::string_view GetSurname(uint32_t seed)
 {
 	auto surname_options = GetSurnameOptions();
 	return surname_options[surname_options.size() * GB(seed, 16, 8) >> 8];
@@ -2004,7 +2002,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
 {
 	/* Current language pack */
 	size_t total_len = 0;
-	std::unique_ptr<LanguagePack, LanguagePackDeleter> lang_pack(reinterpret_cast<LanguagePack *>(ReadFileToMem(FS2OTTD(lang->file), total_len, 1U << 20).release()));
+	std::unique_ptr<LanguagePack, LanguagePackDeleter> lang_pack(reinterpret_cast<LanguagePack *>(ReadFileToMem(FS2OTTD(lang->file.native()), total_len, 1U << 20).release()));
 	if (!lang_pack) return false;
 
 	/* End of read data (+ terminating zero added in ReadFileToMem()) */
@@ -2052,7 +2050,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
 
 	_current_language = lang;
 	_current_text_dir = (TextDirection)_current_language->text_dir;
-	_config_language_file = FS2OTTD(_current_language->file.filename());
+	_config_language_file = FS2OTTD(_current_language->file.filename().native());
 	SetCurrentGrfLangID(_current_language->newgrflangid);
 	_langpack.list_separator = GetString(STR_LIST_SEPARATOR);
 
@@ -2062,7 +2060,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
 #endif
 
 #ifdef WITH_COCOA
-	extern void MacOSSetCurrentLocaleName(const char *iso_code);
+	extern void MacOSSetCurrentLocaleName(std::string_view iso_code);
 	MacOSSetCurrentLocaleName(_current_language->isocode);
 #endif
 
@@ -2108,25 +2106,26 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
  *        set. Pass nullptr if you don't want additional checks.
  * @return return string containing current charset, or nullptr if not-determinable
  */
-const char *GetCurrentLocale(const char *param)
+std::optional<std::string> GetCurrentLocale(const char *param)
 {
-	const char *env;
+	auto env = GetEnv("LANGUAGE");
+	if (env.has_value()) return std::string{*env};
 
-	env = std::getenv("LANGUAGE");
-	if (env != nullptr) return env;
-
-	env = std::getenv("LC_ALL");
-	if (env != nullptr) return env;
+	env = GetEnv("LC_ALL");
+	if (env.has_value()) return std::string{*env};
 
 	if (param != nullptr) {
-		env = std::getenv(param);
-		if (env != nullptr) return env;
+		env = GetEnv(param);
+		if (env.has_value()) return std::string{*env};
 	}
 
-	return std::getenv("LANG");
+	env = GetEnv("LANG");
+	if (env.has_value()) return std::string{*env};
+
+	return std::nullopt;
 }
 #else
-const char *GetCurrentLocale(const char *param);
+std::optional<std::string> GetCurrentLocale(const char *param);
 #endif /* !(defined(_WIN32) || defined(__APPLE__)) */
 
 /**
@@ -2181,10 +2180,11 @@ static void FillLanguageList(const std::string &path)
 		lmd.file = dir_entry.path();
 
 		/* Check whether the file is of the correct version */
-		if (!GetLanguageFileHeader(FS2OTTD(lmd.file), &lmd)) {
-			Debug(misc, 3, "{} is not a valid language file", FS2OTTD(lmd.file));
+		std::string file = FS2OTTD(lmd.file.native());
+		if (!GetLanguageFileHeader(file, &lmd)) {
+			Debug(misc, 3, "{} is not a valid language file", file);
 		} else if (GetLanguage(lmd.newgrflangid) != nullptr) {
-			Debug(misc, 3, "{}'s language ID is already known", FS2OTTD(lmd.file));
+			Debug(misc, 3, "{}'s language ID is already known", file);
 		} else {
 			_languages.push_back(std::move(lmd));
 		}
@@ -2206,8 +2206,8 @@ void InitializeLanguagePacks()
 	if (_languages.empty()) UserError("No available language packs (invalid versions?)");
 
 	/* Acquire the locale of the current system */
-	const char *lang = GetCurrentLocale("LC_MESSAGES");
-	if (lang == nullptr) lang = "en_GB";
+	auto str_lang = GetCurrentLocale("LC_MESSAGES");
+	std::string_view lang = str_lang.has_value() ? std::string_view{*str_lang} : "en_GB";
 
 	const LanguageMetadata *chosen_language   = nullptr; ///< Matching the language in the configuration file or the current locale
 	const LanguageMetadata *language_fallback = nullptr; ///< Using pt_PT for pt_BR locale when pt_BR is not available
@@ -2218,18 +2218,19 @@ void InitializeLanguagePacks()
 		/* We are trying to find a default language. The priority is by
 		 * configuration file, local environment and last, if nothing found,
 		 * English. */
-		if (_config_language_file == FS2OTTD(lng.file.filename())) {
+		if (_config_language_file == FS2OTTD(lng.file.filename().native())) {
 			chosen_language = &lng;
 			break;
 		}
 
-		if (strcmp (lng.isocode, "en_GB") == 0) en_GB_fallback    = &lng;
+		std::string_view iso_code = lng.isocode;
+		if (iso_code == "en_GB") en_GB_fallback = &lng;
 
 		/* Only auto-pick finished translations */
 		if (!lng.IsReasonablyFinished()) continue;
 
-		if (strncmp(lng.isocode, lang, 5) == 0) chosen_language   = &lng;
-		if (strncmp(lng.isocode, lang, 2) == 0) language_fallback = &lng;
+		if (iso_code.starts_with(lang.substr(0, 5))) chosen_language = &lng;
+		if (iso_code.starts_with(lang.substr(0, 2))) language_fallback = &lng;
 	}
 
 	/* We haven't found the language in the config nor the one in the locale.
@@ -2238,14 +2239,14 @@ void InitializeLanguagePacks()
 		chosen_language = (language_fallback != nullptr) ? language_fallback : en_GB_fallback;
 	}
 
-	if (!ReadLanguagePack(chosen_language)) UserError("Can't read language pack '{}'", FS2OTTD(chosen_language->file));
+	if (!ReadLanguagePack(chosen_language)) UserError("Can't read language pack '{}'", FS2OTTD(chosen_language->file.native()));
 }
 
 /**
  * Get the ISO language code of the currently loaded language.
  * @return the ISO code.
  */
-const char *GetCurrentLanguageIsoCode()
+std::string_view GetCurrentLanguageIsoCode()
 {
 	return _langpack.langpack->isocode;
 }
@@ -2322,7 +2323,7 @@ class LanguagePackGlyphSearcher : public MissingGlyphSearcher {
 		return false;
 	}
 
-	void SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] const char *font_name, [[maybe_unused]] const void *os_data) override
+	void SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] std::string_view font_name, [[maybe_unused]] const void *os_data) override
 	{
 #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
 		settings->small.font = font_name;
diff --git a/src/strings_func.h b/src/strings_func.h
index 7f53eeec1e..f813dc0fb5 100644
--- a/src/strings_func.h
+++ b/src/strings_func.h
@@ -96,7 +96,7 @@ uint64_t GetParamMaxDigits(uint count, FontSize size = FS_NORMAL);
 extern TextDirection _current_text_dir; ///< Text direction of the currently selected language
 
 void InitializeLanguagePacks();
-const char *GetCurrentLanguageIsoCode();
+std::string_view GetCurrentLanguageIsoCode();
 std::string_view GetListSeparator();
 
 /**
@@ -189,7 +189,7 @@ public:
 	 * @param font_name The new font name.
 	 * @param os_data Opaque pointer to OS-specific data.
 	 */
-	virtual void SetFontNames(struct FontCacheSettings *settings, const char *font_name, const void *os_data = nullptr) = 0;
+	virtual void SetFontNames(struct FontCacheSettings *settings, std::string_view font_name, const void *os_data = nullptr) = 0;
 
 	bool FindMissingGlyphs();
 };
diff --git a/src/strings_internal.h b/src/strings_internal.h
index 47e4329bad..e718793f9a 100644
--- a/src/strings_internal.h
+++ b/src/strings_internal.h
@@ -13,6 +13,7 @@
 #include "strings_func.h"
 #include "string_func.h"
 #include "core/string_builder.hpp"
+#include "core/string_consumer.hpp"
 
 class StringParameters {
 protected:
@@ -111,12 +112,12 @@ public:
 	 * will be read.
 	 * @return The next parameter's value.
 	 */
-	const char *GetNextParameterString()
+	std::string_view GetNextParameterString()
 	{
 		struct visitor {
-			const char *operator()(const std::monostate &) { throw std::out_of_range("Attempt to read uninitialised parameter as string"); }
-			const char *operator()(const uint64_t &) { throw std::out_of_range("Attempt to read integer parameter as string"); }
-			const char *operator()(const std::string &arg) { return arg.c_str(); }
+			std::string_view operator()(const std::monostate &) { throw std::out_of_range("Attempt to read uninitialised parameter as string"); }
+			std::string_view operator()(const uint64_t &) { throw std::out_of_range("Attempt to read integer parameter as string"); }
+			std::string_view operator()(const std::string &arg) { return arg; }
 		};
 
 		const auto &param = this->GetNextParameterReference();
@@ -184,14 +185,12 @@ public:
 		SetParam(n, v.base());
 	}
 
-	void SetParam(size_t n, const char *str)
+	void SetParam(size_t n, const std::string &str)
 	{
 		assert(n < this->parameters.size());
 		this->parameters[n].data = str;
 	}
 
-	void SetParam(size_t n, const std::string &str) { this->SetParam(n, str.c_str()); }
-
 	void SetParam(size_t n, std::string &&str)
 	{
 		assert(n < this->parameters.size());
@@ -214,6 +213,6 @@ void GenerateTownNameString(StringBuilder &builder, size_t lang, uint32_t seed);
 void GetTownName(StringBuilder &builder, const struct Town *t);
 void GRFTownNameGenerate(StringBuilder &builder, uint32_t grfid, uint16_t gen, uint32_t seed);
 
-char32_t RemapNewGRFStringControlCode(char32_t scc, const char **str);
+char32_t RemapNewGRFStringControlCode(char32_t scc, StringConsumer &consumer);
 
 #endif /* STRINGS_INTERNAL_H */
diff --git a/src/strings_type.h b/src/strings_type.h
index f6d15f00eb..bced06abe5 100644
--- a/src/strings_type.h
+++ b/src/strings_type.h
@@ -85,7 +85,7 @@ struct StringParameter {
 	inline StringParameter(const std::monostate &data) : data(data), type(0) {}
 	inline StringParameter(uint64_t data) : data(data), type(0) {}
 
-	inline StringParameter(const char *data) : data(std::string{data}), type(0) {}
+	inline StringParameter(std::string_view data) : data(std::string{data}), type(0) {}
 	inline StringParameter(std::string &&data) : data(std::move(data)), type(0) {}
 	inline StringParameter(const std::string &data) : data(data), type(0) {}
 
diff --git a/src/subsidy.cpp b/src/subsidy.cpp
index 537063dbb6..33c4094ae6 100644
--- a/src/subsidy.cpp
+++ b/src/subsidy.cpp
@@ -422,7 +422,7 @@ bool FindSubsidyCargoDestination(CargoType cargo_type, Source src)
 }
 
 /** Perform the economy monthly update of open subsidies, and try to create a new one. */
-static IntervalTimer<TimerGameEconomy> _economy_subsidies_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::SUBSIDY}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_subsidies_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::SUBSIDY}, [](auto)
 {
 	bool modified = false;
 
diff --git a/src/subsidy_func.h b/src/subsidy_func.h
index 89023b96cb..cdd0cb91f8 100644
--- a/src/subsidy_func.h
+++ b/src/subsidy_func.h
@@ -10,6 +10,7 @@
 #ifndef SUBSIDY_FUNC_H
 #define SUBSIDY_FUNC_H
 
+#include "source_type.h"
 #include "station_type.h"
 #include "company_type.h"
 #include "cargo_type.h"
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index 520063d198..b57bcbe35c 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -136,7 +136,7 @@ struct SubsidyListWindow : Window {
 		if (widget != WID_SUL_PANEL) return;
 		Dimension d = maxdim(GetStringBoundingBox(STR_SUBSIDIES_OFFERED_TITLE), GetStringBoundingBox(STR_SUBSIDIES_SUBSIDISED_TITLE));
 
-		resize.height = GetCharacterHeight(FS_NORMAL);
+		fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 
 		d.height *= 5;
 		d.width += WidgetDimensions::scaled.framerect.Horizontal();
@@ -150,7 +150,7 @@ struct SubsidyListWindow : Window {
 		SpriteID icon = CargoSpec::Get(cargo_type)->GetCargoIcon();
 		Dimension d = GetSpriteSize(icon);
 		Rect ir = r.WithWidth(this->cargo_icon_size.width, rtl).WithHeight(GetCharacterHeight(FS_NORMAL));
-		DrawSprite(icon, PAL_NONE, CenterBounds(ir.left, ir.right, d.width), CenterBounds(ir.top, ir.bottom, this->cargo_icon_size.height) + y_offset);
+		DrawSprite(icon, PAL_NONE, CentreBounds(ir.left, ir.right, d.width), CentreBounds(ir.top, ir.bottom, this->cargo_icon_size.height) + y_offset);
 	}
 
 	void DrawWidget(const Rect &r, WidgetID widget) const override
@@ -219,13 +219,13 @@ struct SubsidyListWindow : Window {
 					if (TimerGameEconomy::UsingWallclockUnits()) {
 						text = GetString(STR_SUBSIDIES_SUBSIDISED_FROM_TO,
 							cs->name, s->src.GetFormat(), s->src.id, s->dst.GetFormat(), s->dst.id,
-							GetString(STR_COMPANY_NAME, s->awarded),
+							s->awarded,
 							STR_SUBSIDIES_SUBSIDISED_EXPIRY_TIME,
 							s->remaining + 1); // We get the rest of the current economy month for free, since the expiration is checked on each new month.
 					} else {
 						text = GetString(STR_SUBSIDIES_SUBSIDISED_FROM_TO,
 							cs->name, s->src.GetFormat(), s->src.id, s->dst.GetFormat(), s->dst.id,
-							GetString(STR_COMPANY_NAME, s->awarded),
+							s->awarded,
 							STR_SUBSIDIES_SUBSIDISED_EXPIRY_DATE,
 							TimerGameEconomy::date.base() - ymd.day + s->remaining * 32);
 					}
diff --git a/src/subsidy_type.h b/src/subsidy_type.h
index de03cc9ba1..5e51bf05a5 100644
--- a/src/subsidy_type.h
+++ b/src/subsidy_type.h
@@ -11,6 +11,7 @@
 #define SUBSIDY_TYPE_H
 
 #include "core/enum_type.hpp"
+#include "core/pool_type.hpp"
 
 /** What part of a subsidy is something? */
 enum class PartOfSubsidy : uint8_t {
diff --git a/src/survey.cpp b/src/survey.cpp
index 838a702fb1..3d648b00e1 100644
--- a/src/survey.cpp
+++ b/src/survey.cpp
@@ -18,6 +18,7 @@
 #include "timer/timer_game_tick.h"
 #include "timer/timer_game_calendar.h"
 #include "timer/timer_game_economy.h"
+#include "3rdparty/fmt/ranges.h"
 
 #include "currency.h"
 #include "fontcache.h"
@@ -256,7 +257,7 @@ void SurveyConfiguration(nlohmann::json &survey)
 {
 	survey["network"] = _networking ? (_network_server ? "server" : "client") : "no";
 	if (_current_language != nullptr) {
-		survey["language"]["filename"] = FS2OTTD(_current_language->file.filename());
+		survey["language"]["filename"] = FS2OTTD(_current_language->file.filename().native());
 		survey["language"]["name"] = _current_language->name;
 		survey["language"]["isocode"] = _current_language->isocode;
 	}
@@ -274,7 +275,7 @@ void SurveyConfiguration(nlohmann::json &survey)
 		survey["video_info"] = VideoDriver::GetInstance()->GetInfoString();
 	}
 	if (BaseGraphics::GetUsedSet() != nullptr) {
-		survey["graphics_set"] = fmt::format("{}.{}", BaseGraphics::GetUsedSet()->name, BaseGraphics::GetUsedSet()->version);
+		survey["graphics_set"] = fmt::format("{}.{}", BaseGraphics::GetUsedSet()->name, fmt::join(BaseGraphics::GetUsedSet()->version, "."));
 		const GRFConfig *extra_cfg = BaseGraphics::GetUsedSet()->GetExtraConfig();
 		if (extra_cfg != nullptr && !extra_cfg->param.empty()) {
 			survey["graphics_set_parameters"] = std::span<const uint32_t>(extra_cfg->param);
@@ -283,10 +284,10 @@ void SurveyConfiguration(nlohmann::json &survey)
 		}
 	}
 	if (BaseMusic::GetUsedSet() != nullptr) {
-		survey["music_set"] = fmt::format("{}.{}", BaseMusic::GetUsedSet()->name, BaseMusic::GetUsedSet()->version);
+		survey["music_set"] = fmt::format("{}.{}", BaseMusic::GetUsedSet()->name, fmt::join(BaseMusic::GetUsedSet()->version, "."));
 	}
 	if (BaseSounds::GetUsedSet() != nullptr) {
-		survey["sound_set"] = fmt::format("{}.{}", BaseSounds::GetUsedSet()->name, BaseSounds::GetUsedSet()->version);
+		survey["sound_set"] = fmt::format("{}.{}", BaseSounds::GetUsedSet()->name, fmt::join(BaseSounds::GetUsedSet()->version, "."));
 	}
 }
 
@@ -311,7 +312,7 @@ void SurveyFont(nlohmann::json &survey)
 void SurveyCompanies(nlohmann::json &survey)
 {
 	for (const Company *c : Company::Iterate()) {
-		auto &company = survey[std::to_string(c->index.base())];
+		auto &company = survey[fmt::format("{}", c->index.base())];
 		if (c->ai_info == nullptr) {
 			company["type"] = "human";
 		} else {
diff --git a/src/table/airport_defaults.h b/src/table/airport_defaults.h
index 1212046f9e..f7b1fb7f7c 100644
--- a/src/table/airport_defaults.h
+++ b/src/table/airport_defaults.h
@@ -22,11 +22,6 @@
  */
 #define MK(x, y, m) {{x, y}, m}
 
-/**
- * Terminator of airport tiles layout definition
- */
-#define MKEND {{-0x80, 0}, 0}
-
 /** Tiles for Country Airfield (small) */
 static const std::initializer_list<AirportTileTable> _tile_table_country_0 = {
 	MK(0, 0, APT_SMALL_BUILDING_1),
@@ -41,7 +36,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_country_0 = {
 	MK(1, 2, APT_RUNWAY_SMALL_MIDDLE),
 	MK(2, 2, APT_RUNWAY_SMALL_MIDDLE),
 	MK(3, 2, APT_RUNWAY_SMALL_NEAR_END),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_country = {
@@ -70,7 +64,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_commuter_0 = {
 	MK(2, 3, APT_RUNWAY_2),
 	MK(3, 3, APT_RUNWAY_2),
 	MK(4, 3, APT_RUNWAY_END_FENCE_SE),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_commuter = {
@@ -115,7 +108,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_city_0 = {
 	MK(3, 5, APT_RUNWAY_3),
 	MK(4, 5, APT_RUNWAY_4),
 	MK(5, 5, APT_RUNWAY_END_FENCE_SE),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_city = {
@@ -160,7 +152,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_metropolitan_0
 	MK(3, 5, APT_RUNWAY_2),
 	MK(4, 5, APT_RUNWAY_2),
 	MK(5, 5, APT_RUNWAY_END_FENCE_SE),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_metropolitan = {
@@ -218,7 +209,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_international_0
 	MK(4, 6, APT_RUNWAY_2),
 	MK(5, 6, APT_RUNWAY_2),
 	MK(6, 6, APT_RUNWAY_END_FENCE_SE),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_international = {
@@ -326,7 +316,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_intercontinenta
 	MK(6, 10, APT_RUNWAY_2),
 	MK(7, 10, APT_RUNWAY_END_FENCE_SE_SW),
 	MK(8, 10, APT_EMPTY),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_intercontinental = {
@@ -336,7 +325,6 @@ static const std::initializer_list<AirportTileLayout> _tile_table_intercontinent
 /** Tiles for Heliport */
 static const std::initializer_list<AirportTileTable> _tile_table_heliport_0 = {
 	MK(0, 0, APT_HELIPORT),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_heliport = {
@@ -349,7 +337,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_helidepot_0 = {
 	MK(1, 0, APT_DEPOT_SE),
 	MK(0, 1, APT_HELIPAD_2_FENCE_NE_SE),
 	MK(1, 1, APT_APRON_FENCE_SE_SW),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_helidepot = {
@@ -366,7 +353,6 @@ static const std::initializer_list<AirportTileTable> _tile_table_helistation_0 =
 	MK(1, 1, APT_APRON_FENCE_SE),
 	MK(2, 1, APT_APRON_FENCE_SE),
 	MK(3, 1, APT_HELIPAD_3_FENCE_SE_SW),
-	MKEND
 };
 
 static const std::initializer_list<AirportTileLayout> _tile_table_helistation = {
@@ -374,11 +360,10 @@ static const std::initializer_list<AirportTileLayout> _tile_table_helistation =
 };
 
 #undef MK
-#undef MKEND
 
 /** General AirportSpec definition. */
 #define AS_GENERIC(fsm, layouts, depots, size_x, size_y, noise, catchment, min_year, max_year, maint_cost, ttdpatch_type, class_id, name, preview, enabled) \
-	{{class_id, 0}, fsm, layouts, depots, size_x, size_y, noise, catchment, TimerGameCalendar::Year{min_year}, TimerGameCalendar::Year{max_year}, name, ttdpatch_type, preview, maint_cost, enabled, GRFFileProps(AT_INVALID), {}}
+	{{class_id, 0}, fsm, layouts, depots, size_x, size_y, noise, catchment, TimerGameCalendar::Year{min_year}, TimerGameCalendar::Year{max_year}, name, ttdpatch_type, preview, maint_cost, enabled, SubstituteGRFFileProps(AT_INVALID), {}}
 
 /** AirportSpec definition for airports without any depot. */
 #define AS_ND(ap_name, size_x, size_y, min_year, max_year, catchment, noise, maint_cost, ttdpatch_type, class_id, name, preview) \
diff --git a/src/table/airporttiles.h b/src/table/airporttiles.h
index 1776ea0505..056777bf65 100644
--- a/src/table/airporttiles.h
+++ b/src/table/airporttiles.h
@@ -10,10 +10,12 @@
 #ifndef AIRPORTTILES_H
 #define AIRPORTTILES_H
 
+#include "table/strings.h"
+
 /** Writes all airport tile properties in the AirportTile struct */
-#define AT(num_frames, anim_speed) {{num_frames, ANIM_STATUS_LOOPING, anim_speed, 0}, STR_NULL, AirportTileCallbackMasks{}, 0, true, GRFFileProps(INVALID_AIRPORTTILE), {}}
+#define AT(num_frames, anim_speed) {{num_frames, AnimationStatus::Looping, anim_speed, {}}, STR_NULL, AirportTileCallbackMasks{}, 0, true, SubstituteGRFFileProps(INVALID_AIRPORTTILE), {}}
 /** Writes an airport tile without animation in the AirportTile struct */
-#define AT_NOANIM {{0, ANIM_STATUS_NO_ANIMATION, 2, 0}, STR_NULL, AirportTileCallbackMasks{}, 0, true, GRFFileProps(INVALID_AIRPORTTILE), {}}
+#define AT_NOANIM {AnimationInfo<AirportAnimationTriggers>{}, STR_NULL, AirportTileCallbackMasks{}, 0, true, SubstituteGRFFileProps(INVALID_AIRPORTTILE), {}}
 
 /**
  * All default airport tiles.
diff --git a/src/table/bridge_land.h b/src/table/bridge_land.h
index 8561149695..e6f4f7f185 100644
--- a/src/table/bridge_land.h
+++ b/src/table/bridge_land.h
@@ -5,6 +5,8 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "table/strings.h"
+
 /**
  * @file bridge_land.h This file contains all the sprites for bridges
  * It consists of a number of arrays.
diff --git a/src/table/build_industry.h b/src/table/build_industry.h
index 258c368170..b86484e28d 100644
--- a/src/table/build_industry.h
+++ b/src/table/build_industry.h
@@ -10,6 +10,8 @@
 #ifndef BUILD_INDUSTRY_H
 #define BUILD_INDUSTRY_H
 
+#include "table/strings.h"
+
 /**
  * Definition of an industry tiles layout.
  * @param x offset x of this tile
@@ -1133,7 +1135,7 @@ enum IndustryTypes : uint8_t {
 		{INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO}, \
 		{{im1, 0}, {im2, 0}, {im3, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}, \
 		pr, clim, bev, col, in, intx, s1, s2, s3, STR_UNDEFINED, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \
-		IndustryCallbackMasks{}, true, GRFFileProps(IT_INVALID), snd, {}, \
+		IndustryCallbackMasks{}, true, SubstituteGRFFileProps(IT_INVALID), snd, {}, \
 		{{p1, p2}}, {{a1, a2, a3}}}
 	/* Format:
 	   tile table                              count and sounds table
@@ -1529,11 +1531,11 @@ static const IndustrySpec _origin_industry_specs[NEW_INDUSTRYOFFSET] = {
  * @param sl  slope refused upon choosing a place to build
  * @param a1  animation frame on production
  * @param a2  next frame of animation
- * @param a3  chooses between animation or construction state
+ * @param a3  chooses between animation or construction stage
  */
 #define MT(ca1, c1, ca2, c2, ca3, c3, sl, a1, a2, a3) { \
 	{INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO}, \
-	{ca1, ca2, ca3}, sl, a1, a2, a3, IndustryTileCallbackMasks{}, {0, ANIM_STATUS_NO_ANIMATION, 2, 0}, IndustryTileSpecialFlags{}, true, GRFFileProps(INVALID_INDUSTRYTILE), {}, {c1, c2, c3} \
+	{ca1, ca2, ca3}, sl, a1, a2, a3, IndustryTileCallbackMasks{}, AnimationInfo<IndustryAnimationTriggers>{}, IndustryTileSpecialFlags{}, true, SubstituteGRFFileProps(INVALID_INDUSTRYTILE), {}, {c1, c2, c3} \
 }
 static const IndustryTileSpec _origin_industry_tile_specs[NEW_INDUSTRYTILEOFFSET] = {
 	/* Coal Mine */
diff --git a/src/table/cargo_const.h b/src/table/cargo_const.h
index 07b4a396a3..13880539a6 100644
--- a/src/table/cargo_const.h
+++ b/src/table/cargo_const.h
@@ -7,6 +7,11 @@
 
 /** @file cargo_const.h Table of all default cargo types */
 
+#include "../table/sprites.h"
+#ifndef CHECK_UNUSED_STRINGS
+#include "table/strings.h"
+#endif
+
 /** Construction macros for the #CargoSpec StringID entries. */
 #define MK_STR_CARGO_PLURAL(label_plural) STR_CARGO_PLURAL_ ## label_plural
 #define MK_STR_CARGO_SINGULAR(label_singular) STR_CARGO_SINGULAR_ ## label_singular
diff --git a/src/table/clear_land.h b/src/table/clear_land.h
index 3101e27040..00ea23fd0d 100644
--- a/src/table/clear_land.h
+++ b/src/table/clear_land.h
@@ -7,6 +7,8 @@
 
 /** @file clear_land.h Tables with sprites for clear land and fences. */
 
+#include "sprites.h"
+
 static const SpriteID _landscape_clear_sprites_rough[8] = {
 	SPR_FLAT_ROUGH_LAND,
 	SPR_FLAT_ROUGH_LAND_1,
diff --git a/src/table/control_codes.h b/src/table/control_codes.h
index d6db08ad31..fded339a25 100644
--- a/src/table/control_codes.h
+++ b/src/table/control_codes.h
@@ -171,6 +171,7 @@ enum StringControlCode : uint16_t {
 	 * These are mapped to the original glyphs */
 	SCC_LESS_THAN        = SCC_SPRITE_START + 0x3C,
 	SCC_GREATER_THAN     = SCC_SPRITE_START + 0x3E,
+	SCC_LEFT_ARROW       = SCC_SPRITE_START + 0x9D,
 	SCC_UP_ARROW         = SCC_SPRITE_START + 0xA0,
 	SCC_DOWN_ARROW       = SCC_SPRITE_START + 0xAA,
 	SCC_CHECKMARK        = SCC_SPRITE_START + 0xAC,
diff --git a/src/table/elrail_data.h b/src/table/elrail_data.h
index 4c5ec7f4e3..5be264f008 100644
--- a/src/table/elrail_data.h
+++ b/src/table/elrail_data.h
@@ -17,7 +17,7 @@
  * Tile Location group.
  * This defines whether the X and or Y coordinate of a tile is even
  */
-enum TLG : uint8_t {
+enum TileLocationGroup : uint8_t {
 	XEVEN_YEVEN = 0,
 	XEVEN_YODD  = 1,
 	XODD_YEVEN  = 2,
@@ -40,11 +40,11 @@ enum TileSource : uint8_t {
 static const uint NUM_TRACKS_AT_PCP = 6;
 
 /** Which PPPs are possible at all on a given PCP */
-static const uint8_t AllowedPPPonPCP[DIAGDIR_END] = {
-	1 << DIR_N | 1 << DIR_E  | 1 << DIR_SE | 1 << DIR_S | 1 << DIR_W  | 1 << DIR_NW,
-	1 << DIR_N | 1 << DIR_NE | 1 << DIR_E  | 1 << DIR_S | 1 << DIR_SW | 1 << DIR_W,
-	1 << DIR_N | 1 << DIR_E  | 1 << DIR_SE | 1 << DIR_S | 1 << DIR_W  | 1 << DIR_NW,
-	1 << DIR_N | 1 << DIR_NE | 1 << DIR_E  | 1 << DIR_S | 1 << DIR_SW | 1 << DIR_W,
+static const Directions _allowed_ppp_on_pcp[DIAGDIR_END] = {
+	{DIR_N, DIR_E, DIR_SE, DIR_S, DIR_W, DIR_NW},
+	{DIR_N, DIR_NE, DIR_E, DIR_S, DIR_SW, DIR_W},
+	{DIR_N, DIR_E, DIR_SE, DIR_S, DIR_W, DIR_NW},
+	{DIR_N, DIR_NE, DIR_E, DIR_S, DIR_SW, DIR_W},
 };
 
 /**
@@ -52,15 +52,15 @@ static const uint8_t AllowedPPPonPCP[DIAGDIR_END] = {
  * the following system is used: if you rotate the PCP so that it is in the
  * north, the eastern PPP belongs to the tile.
  */
-static const uint8_t OwnedPPPonPCP[DIAGDIR_END] = {
-	1 << DIR_SE | 1 << DIR_S  | 1 << DIR_SW | 1 << DIR_W,
-	1 << DIR_N  | 1 << DIR_SW | 1 << DIR_W  | 1 << DIR_NW,
-	1 << DIR_N  | 1 << DIR_NE | 1 << DIR_E  | 1 << DIR_NW,
-	1 << DIR_NE | 1 << DIR_E  | 1 << DIR_SE | 1 << DIR_S
+static const Directions _owned_ppp_on_pcp[DIAGDIR_END] = {
+	{DIR_SE, DIR_S, DIR_SW, DIR_W},
+	{DIR_N, DIR_SW, DIR_W, DIR_NW},
+	{DIR_N, DIR_NE, DIR_E, DIR_NW},
+	{DIR_NE, DIR_E, DIR_SE, DIR_S},
 };
 
 /** Maps a track bit onto two PCP positions */
-static const DiagDirection PCPpositions[TRACK_END][2] = {
+static const DiagDirection _pcp_positions[TRACK_END][2] = {
 	{DIAGDIR_NE, DIAGDIR_SW}, // X
 	{DIAGDIR_SE, DIAGDIR_NW}, // Y
 	{DIAGDIR_NW, DIAGDIR_NE}, // UPPER
@@ -69,142 +69,141 @@ static const DiagDirection PCPpositions[TRACK_END][2] = {
 	{DIAGDIR_NE, DIAGDIR_SE}, // RIGHT
 };
 
-#define PCP_NOT_ON_TRACK 0xFF
 /**
  * Preferred points of each trackbit. Those are the ones perpendicular to the
  * track, plus the point in extension of the track (to mark end-of-track). PCPs
  * which are not on either end of the track are fully preferred.
  * @see PCPpositions
  */
-static const uint8_t PreferredPPPofTrackAtPCP[TRACK_END][DIAGDIR_END] = {
-	{    // X
-		1 << DIR_NE | 1 << DIR_SE | 1 << DIR_NW, // NE
-		PCP_NOT_ON_TRACK,                        // SE
-		1 << DIR_SE | 1 << DIR_SW | 1 << DIR_NW, // SW
-		PCP_NOT_ON_TRACK                         // NE
-	}, { // Y
-		PCP_NOT_ON_TRACK,
-		1 << DIR_NE | 1 << DIR_SE | 1 << DIR_SW,
-		PCP_NOT_ON_TRACK,
-		1 << DIR_SW | 1 << DIR_NW | 1 << DIR_NE
-	}, { // UPPER
-		1 << DIR_E | 1 << DIR_N | 1 << DIR_S,
-		PCP_NOT_ON_TRACK,
-		PCP_NOT_ON_TRACK,
-		1 << DIR_W | 1 << DIR_N | 1 << DIR_S
-	}, { // LOWER
-		PCP_NOT_ON_TRACK,
-		1 << DIR_E | 1 << DIR_N | 1 << DIR_S,
-		1 << DIR_W | 1 << DIR_N | 1 << DIR_S,
-		PCP_NOT_ON_TRACK
-	}, { // LEFT
-		PCP_NOT_ON_TRACK,
-		PCP_NOT_ON_TRACK,
-		1 << DIR_S | 1 << DIR_E | 1 << DIR_W,
-		1 << DIR_N | 1 << DIR_E | 1 << DIR_W
-	}, { // RIGHT
-		1 << DIR_N | 1 << DIR_E | 1 << DIR_W,
-		1 << DIR_S | 1 << DIR_E | 1 << DIR_W,
-		PCP_NOT_ON_TRACK,
-		PCP_NOT_ON_TRACK
-	}
+static const Directions _preferred_ppp_of_track_at_pcp[TRACK_END][DIAGDIR_END] = {
+	{ // X
+		{DIR_NE, DIR_SE, DIR_NW}, // NE
+		DIRECTIONS_ALL,           // SE
+		{DIR_SE, DIR_SW, DIR_NW}, // SW
+		DIRECTIONS_ALL            // NE
+	},
+	{ // Y
+		DIRECTIONS_ALL,
+		{DIR_NE, DIR_SE, DIR_SW},
+		DIRECTIONS_ALL,
+		{DIR_SW, DIR_NW, DIR_NE},
+	},
+	{ // UPPER
+		{DIR_E, DIR_N, DIR_S},
+		DIRECTIONS_ALL,
+		DIRECTIONS_ALL,
+		{DIR_W, DIR_N, DIR_S},
+	},
+	{ // LOWER
+		DIRECTIONS_ALL,
+		{DIR_E, DIR_N, DIR_S},
+		{DIR_W, DIR_N, DIR_S},
+		DIRECTIONS_ALL,
+	},
+	{ // LEFT
+		DIRECTIONS_ALL,
+		DIRECTIONS_ALL,
+		{DIR_S, DIR_E, DIR_W},
+		{DIR_N, DIR_E, DIR_W},
+	},
+	{ // RIGHT
+		{DIR_N, DIR_E, DIR_W},
+		{DIR_S, DIR_E, DIR_W},
+		DIRECTIONS_ALL,
+		DIRECTIONS_ALL,
+	},
 };
-#undef PCP_NOT_ON_TRACK
-
 
 #define NUM_IGNORE_GROUPS 3
-#define IGNORE_NONE 0xFF
 /**
  * In case we have a straight line, we place pylon only every two tiles,
  * so there are certain tiles which we ignore. A straight line is found if
  * we have exactly two PPPs.
  */
-static const uint8_t IgnoredPCP[NUM_IGNORE_GROUPS][TLG_END][DIAGDIR_END] = {
+static const Directions _ignored_pcp[NUM_IGNORE_GROUPS][TLG_END][DIAGDIR_END] = {
 	{   // Ignore group 1, X and Y tracks
 		{     // X even, Y even
-			IGNORE_NONE,
-			1 << DIR_NE | 1 << DIR_SW,
-			1 << DIR_NW | 1 << DIR_SE,
-			IGNORE_NONE
+			DIRECTIONS_ALL,
+			{DIR_NE, DIR_SW},
+			{DIR_NW, DIR_SE},
+			DIRECTIONS_ALL,
 		}, { // X even, Y odd
-			IGNORE_NONE,
-			IGNORE_NONE,
-			1 << DIR_NW | 1 << DIR_SE,
-			1 << DIR_NE | 1 << DIR_SW
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
+			{DIR_NW, DIR_SE},
+			{DIR_NE, DIR_SW},
 		}, { // X odd,  Y even
-			1 << DIR_NW | 1 << DIR_SE,
-			1 << DIR_NE | 1 << DIR_SW,
-			IGNORE_NONE,
-			IGNORE_NONE
+			{DIR_NW, DIR_SE},
+			{DIR_NE, DIR_SW},
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
 		}, { // X odd,  Y odd
-			1 << DIR_NW | 1 << DIR_SE,
-			IGNORE_NONE,
-			IGNORE_NONE,
-			1 << DIR_NE | 1 << DIR_SW
+			{DIR_NW, DIR_SE},
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
+			{DIR_NE, DIR_SW},
 		}
 	},
 	{   // Ignore group 2, LEFT and RIGHT tracks
 		{
-			1 << DIR_E | 1 << DIR_W,
-			IGNORE_NONE,
-			IGNORE_NONE,
-			1 << DIR_E | 1 << DIR_W
+			{DIR_E, DIR_W},
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
+			{DIR_E, DIR_W},
 		}, {
-			IGNORE_NONE,
-			1 << DIR_E | 1 << DIR_W,
-			1 << DIR_E | 1 << DIR_W,
-			IGNORE_NONE
+			DIRECTIONS_ALL,
+			{DIR_E, DIR_W},
+			{DIR_E, DIR_W},
+			DIRECTIONS_ALL,
 		}, {
-			IGNORE_NONE,
-			1 << DIR_E | 1 << DIR_W,
-			1 << DIR_E | 1 << DIR_W,
-			IGNORE_NONE
+			DIRECTIONS_ALL,
+			{DIR_E, DIR_W},
+			{DIR_E, DIR_W},
+			DIRECTIONS_ALL,
 		}, {
-			1 << DIR_E | 1 << DIR_W,
-			IGNORE_NONE,
-			IGNORE_NONE,
-			1 << DIR_E | 1 << DIR_W
+			{DIR_E, DIR_W},
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
+			{DIR_E, DIR_W},
 		}
 	},
 	{   // Ignore group 3, UPPER and LOWER tracks
 		{
-			1 << DIR_N | 1 << DIR_S,
-			1 << DIR_N | 1 << DIR_S,
-			IGNORE_NONE,
-			IGNORE_NONE
+			{DIR_N, DIR_S},
+			{DIR_N, DIR_S},
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
 		}, {
-			IGNORE_NONE,
-			IGNORE_NONE,
-			1 << DIR_N | 1 << DIR_S,
-			1 << DIR_N | 1 << DIR_S
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
+			{DIR_N, DIR_S},
+			{DIR_N, DIR_S},
 		}, {
-			IGNORE_NONE,
-			IGNORE_NONE,
-			1 << DIR_N | 1 << DIR_S ,
-			1 << DIR_N | 1 << DIR_S
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
+			{DIR_N, DIR_S},
+			{DIR_N, DIR_S},
 		}, {
-			1 << DIR_N | 1 << DIR_S,
-			1 << DIR_N | 1 << DIR_S,
-			IGNORE_NONE,
-			IGNORE_NONE
+			{DIR_N, DIR_S},
+			{DIR_N, DIR_S},
+			DIRECTIONS_ALL,
+			DIRECTIONS_ALL,
 		}
 	}
 };
 
-#undef NO_IGNORE
-
 /** Which pylons can definitely NOT be built */
-static const uint8_t DisallowedPPPofTrackAtPCP[TRACK_END][DIAGDIR_END] = {
-	{1 << DIR_SW | 1 << DIR_NE, 0,           1 << DIR_SW | 1 << DIR_NE, 0          }, // X
-	{0,           1 << DIR_NW | 1 << DIR_SE, 0,           1 << DIR_NW | 1 << DIR_SE}, // Y
-	{1 << DIR_W | 1 << DIR_E,  0,           0,           1 << DIR_W | 1 << DIR_E }, // UPPER
-	{0,           1 << DIR_W | 1 << DIR_E,  1 << DIR_W | 1 << DIR_E,  0          }, // LOWER
-	{0,           0,           1 << DIR_S | 1 << DIR_N,  1 << DIR_N | 1 << DIR_S }, // LEFT
-	{1 << DIR_S | 1 << DIR_N,  1 << DIR_S | 1 << DIR_N,  0,           0,         }, // RIGHT
+static const Directions _disallowed_ppp_of_track_at_pcp[TRACK_END][DIAGDIR_END] = {
+	{{DIR_SW, DIR_NE}, {},               {DIR_SW, DIR_NE}, {}              }, // X
+	{{},               {DIR_NW, DIR_SE}, {},               {DIR_NW, DIR_SE}}, // Y
+	{{DIR_W, DIR_E},   {},               {},               {DIR_W, DIR_E}  }, // UPPER
+	{{},               {DIR_W, DIR_E},   {DIR_W, DIR_E},   {}              }, // LOWER
+	{{},               {},               {DIR_S, DIR_N},   {DIR_N, DIR_S}  }, // LEFT
+	{{DIR_S, DIR_N},   {DIR_S, DIR_N},   {},               {},             }, // RIGHT
 };
 
 /* This array stores which track bits can meet at a tile edge */
-static const Track TracksAtPCP[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
+static const Track _tracks_at_pcp[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
 	{TRACK_X, TRACK_X, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
 	{TRACK_Y, TRACK_Y, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
 	{TRACK_X, TRACK_X, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
@@ -213,7 +212,7 @@ static const Track TracksAtPCP[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
 
 /* takes each of the 6 track bits from the array above and
  * assigns it to the home tile or neighbour tile */
-static const TileSource TrackSourceTile[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
+static const TileSource _track_source_tile[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
 	{TS_HOME, TS_NEIGHBOUR, TS_HOME     , TS_NEIGHBOUR, TS_NEIGHBOUR, TS_HOME     },
 	{TS_HOME, TS_NEIGHBOUR, TS_NEIGHBOUR, TS_HOME     , TS_NEIGHBOUR, TS_HOME     },
 	{TS_HOME, TS_NEIGHBOUR, TS_NEIGHBOUR, TS_HOME     , TS_HOME     , TS_NEIGHBOUR},
@@ -221,7 +220,7 @@ static const TileSource TrackSourceTile[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
 };
 
 /* Several PPPs maybe exist, here they are sorted in order of preference. */
-static const Direction PPPorder[DIAGDIR_END][TLG_END][DIR_END] = {    //  X  -  Y
+static const Direction _ppp_order[DIAGDIR_END][TLG_END][DIR_END] = {    //  X  -  Y
 	{   // PCP 0
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_N, DIR_E, DIR_S, DIR_W}, // evn - evn
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_S, DIR_W, DIR_N, DIR_E}, // evn - odd
@@ -245,11 +244,11 @@ static const Direction PPPorder[DIAGDIR_END][TLG_END][DIR_END] = {    //  X  -
 	}
 };
 /* Geometric placement of the PCP relative to the tile origin */
-static const int8_t x_pcp_offsets[DIAGDIR_END] = {0,  8, 16, 8};
-static const int8_t y_pcp_offsets[DIAGDIR_END] = {8, 16,  8, 0};
+static const int8_t _x_pcp_offsets[DIAGDIR_END] = {0,  8, 16, 8};
+static const int8_t _y_pcp_offsets[DIAGDIR_END] = {8, 16,  8, 0};
 /* Geometric placement of the PPP relative to the PCP*/
-static const int8_t x_ppp_offsets[DIR_END] = {-2, -4, -2,  0,  2,  4,  2,  0};
-static const int8_t y_ppp_offsets[DIR_END] = {-2,  0,  2,  4,  2,  0, -2, -4};
+static const int8_t _x_ppp_offsets[DIR_END] = {-2, -4, -2,  0,  2,  4,  2,  0};
+static const int8_t _y_ppp_offsets[DIR_END] = {-2,  0,  2,  4,  2,  0, -2, -4};
 
 /**
  * Offset for pylon sprites from the base pylon sprite.
@@ -266,7 +265,7 @@ enum PylonSpriteOffset : uint8_t {
 };
 
 /* The type of pylon to draw at each PPP */
-static const uint8_t pylon_sprites[] = {
+static const uint8_t _pylon_sprites[] = {
 	PSO_EW_N,
 	PSO_Y_NE,
 	PSO_NS_E,
@@ -331,7 +330,7 @@ static const uint ELRAIL_ELEVRAISE = ELRAIL_ELEVATION + TILE_HEIGHT + 1;
 /** Wires that a draw one level lower than the north corner. */
 static const uint ELRAIL_ELEVLOWER = ELRAIL_ELEVATION - 1;
 
-static const SortableSpriteStruct RailCatenarySpriteData[] = {
+static const SortableSpriteStruct _rail_catenary_sprite_data[] = {
 /* X direction
 	 * Flat tiles:
 		 * Wires */
@@ -392,14 +391,14 @@ static const SortableSpriteStruct RailCatenarySpriteData[] = {
 	{ WSO_EW_E,         15,  8,  3,  3,  1, ELRAIL_ELEVATION }  //!33: LOWER trackbit wire, pylon on both ends
 };
 
-static const SortableSpriteStruct RailCatenarySpriteData_Depot[] = {
+static const SortableSpriteStruct _rail_catenary_sprite_data_depot[] = {
 	{ WSO_ENTRANCE_NE,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for NE depot exit
 	{ WSO_ENTRANCE_SE,   7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //! Wire for SE depot exit
 	{ WSO_ENTRANCE_SW,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for SW depot exit
 	{ WSO_ENTRANCE_NW,   7,  0,  1, 15,  1, ELRAIL_ELEVATION }  //! Wire for NW depot exit
 };
 
-static const SortableSpriteStruct RailCatenarySpriteData_Tunnel[] = {
+static const SortableSpriteStruct _rail_catenary_sprite_data_tunnel[] = {
 	{ WSO_ENTRANCE_SW,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for NE tunnel (SW facing exit)
 	{ WSO_ENTRANCE_NW,   7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //! Wire for SE tunnel (NW facing exit)
 	{ WSO_ENTRANCE_NE,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for SW tunnel (NE facing exit)
@@ -471,7 +470,7 @@ enum RailCatenarySprite : uint8_t {
  * c) the second
  * d) both
  * PCP exists.*/
-static const RailCatenarySprite Wires[5][TRACK_END][4] = {
+static const RailCatenarySprite _rail_wires[5][TRACK_END][4] = {
 	{ // Tileh == 0
 		{INVALID_CATENARY, WIRE_X_FLAT_NE,   WIRE_X_FLAT_SW,   WIRE_X_FLAT_BOTH},
 		{INVALID_CATENARY, WIRE_Y_FLAT_SE,   WIRE_Y_FLAT_NW,   WIRE_Y_FLAT_BOTH},
diff --git a/src/table/engines.h b/src/table/engines.h
index b34b2e7602..b5e745c1b2 100644
--- a/src/table/engines.h
+++ b/src/table/engines.h
@@ -13,6 +13,8 @@
 #ifndef ENGINES_H
 #define ENGINES_H
 
+#include "table/strings.h"
+
 /**
  * Writes the properties of a train into the EngineInfo struct.
  * @see EngineInfo
diff --git a/src/table/newgrf_debug_data.h b/src/table/newgrf_debug_data.h
index b083758506..44fd14b40a 100644
--- a/src/table/newgrf_debug_data.h
+++ b/src/table/newgrf_debug_data.h
@@ -13,10 +13,10 @@
 #include "../newgrf_roadstop.h"
 
 /* Helper for filling property tables */
-#define NIP(prop, base, variable, type, name) { name, [] (const void *b) -> const void * { return std::addressof(static_cast<const base *>(b)->variable); }, cpp_sizeof(base, variable), prop, type }
+#define NIP(prop, base_class, variable, type, name) { name, [] (const void *b) -> uint32_t { return static_cast<const base_class *>(b)->variable; }, prop, type }
 
 /* Helper for filling callback tables */
-#define NIC(cb_id, base, variable, bit) { #cb_id, [] (const void *b) -> const void * { return std::addressof(static_cast<const base *>(b)->variable); }, cpp_sizeof(base, variable), bit, cb_id }
+#define NIC(cb_id, base_class, variable, bit) { #cb_id, [] (const void *b) -> uint32_t { return static_cast<const base_class *>(b)->variable.base(); }, bit, cb_id }
 
 /* Helper for filling variable tables */
 #define NIV(var, name) { name, var }
@@ -60,7 +60,7 @@ static const NIVariable _niv_vehicles[] = {
 	NIV(0x4C, "current max speed"),
 	NIV(0x4D, "position in articulated vehicle"),
 	NIV(0x60, "count vehicle id occurrences"),
-	// 0x61 not useful, since it requires register 0x10F
+	/* 0x61 not useful, since it requires register 0x10F */
 	NIV(0x62, "curvature/position difference to other vehicle"),
 	NIV(0x63, "tile compatibility wrt. track-type"),
 };
@@ -97,8 +97,8 @@ static const NICallback _nic_stations[] = {
 	NICS(CBID_STATION_AVAILABILITY,     StationCallbackMask::Avail),
 	NICS(CBID_STATION_DRAW_TILE_LAYOUT, StationCallbackMask::DrawTileLayout),
 	NICS(CBID_STATION_BUILD_TILE_LAYOUT,std::monostate{}),
-	NICS(CBID_STATION_ANIM_START_STOP,  std::monostate{}),
-	NICS(CBID_STATION_ANIM_NEXT_FRAME,  StationCallbackMask::AnimationNextFrame),
+	NICS(CBID_STATION_ANIMATION_TRIGGER, std::monostate{}),
+	NICS(CBID_STATION_ANIMATION_NEXT_FRAME, StationCallbackMask::AnimationNextFrame),
 	NICS(CBID_STATION_ANIMATION_SPEED,  StationCallbackMask::AnimationSpeed),
 	NICS(CBID_STATION_LAND_SLOPE_CHECK, StationCallbackMask::SlopeCheck),
 };
@@ -160,8 +160,8 @@ static const NIFeature _nif_station = {
 static const NICallback _nic_house[] = {
 	NICH(CBID_HOUSE_ALLOW_CONSTRUCTION,        HouseCallbackMask::AllowConstruction),
 	NICH(CBID_HOUSE_ANIMATION_NEXT_FRAME,      HouseCallbackMask::AnimationNextFrame),
-	NICH(CBID_HOUSE_ANIMATION_START_STOP,      HouseCallbackMask::AnimationStartStop),
-	NICH(CBID_HOUSE_CONSTRUCTION_STATE_CHANGE, HouseCallbackMask::ConstructionStateChange),
+	NICH(CBID_HOUSE_ANIMATION_TRIGGER_TILE_LOOP, HouseCallbackMask::AnimationTriggerTileLoop),
+	NICH(CBID_HOUSE_ANIMATION_TRIGGER_CONSTRUCTION_STAGE_CHANGED, HouseCallbackMask::AnimationTriggerConstructionStageChanged),
 	NICH(CBID_HOUSE_COLOUR,                    HouseCallbackMask::Colour),
 	NICH(CBID_HOUSE_CARGO_ACCEPTANCE,          HouseCallbackMask::CargoAcceptance),
 	NICH(CBID_HOUSE_ANIMATION_SPEED,           HouseCallbackMask::AnimationSpeed),
@@ -169,14 +169,14 @@ static const NICallback _nic_house[] = {
 	NICH(CBID_HOUSE_ACCEPT_CARGO,              HouseCallbackMask::AcceptCargo),
 	NICH(CBID_HOUSE_PRODUCE_CARGO,             HouseCallbackMask::ProduceCargo),
 	NICH(CBID_HOUSE_DENY_DESTRUCTION,          HouseCallbackMask::DenyDestruction),
-	NICH(CBID_HOUSE_WATCHED_CARGO_ACCEPTED,    std::monostate{}),
+	NICH(CBID_HOUSE_ANIMATION_TRIGGER_WATCHED_CARGO_ACCEPTED, std::monostate{}),
 	NICH(CBID_HOUSE_CUSTOM_NAME,               std::monostate{}),
 	NICH(CBID_HOUSE_DRAW_FOUNDATIONS,          HouseCallbackMask::DrawFoundations),
 	NICH(CBID_HOUSE_AUTOSLOPE,                 HouseCallbackMask::Autoslope),
 };
 
 static const NIVariable _niv_house[] = {
-	NIV(0x40, "construction state of tile and pseudo-random value"),
+	NIV(0x40, "construction stage of tile and pseudo-random value"),
 	NIV(0x41, "age of building in years"),
 	NIV(0x42, "town zone"),
 	NIV(0x43, "terrain type"),
@@ -223,8 +223,8 @@ static const NIFeature _nif_house = {
 
 #define NICIT(cb_id, bit) NIC(cb_id, IndustryTileSpec, callback_mask, bit)
 static const NICallback _nic_industrytiles[] = {
-	NICIT(CBID_INDTILE_ANIM_START_STOP,  std::monostate{}),
-	NICIT(CBID_INDTILE_ANIM_NEXT_FRAME,  IndustryTileCallbackMask::AnimationNextFrame),
+	NICIT(CBID_INDTILE_ANIMATION_TRIGGER, std::monostate{}),
+	NICIT(CBID_INDTILE_ANIMATION_NEXT_FRAME, IndustryTileCallbackMask::AnimationNextFrame),
 	NICIT(CBID_INDTILE_ANIMATION_SPEED,  IndustryTileCallbackMask::AnimationSpeed),
 	NICIT(CBID_INDTILE_CARGO_ACCEPTANCE, IndustryTileCallbackMask::CargoAcceptance),
 	NICIT(CBID_INDTILE_ACCEPT_CARGO,     IndustryTileCallbackMask::AcceptCargo),
@@ -234,7 +234,7 @@ static const NICallback _nic_industrytiles[] = {
 };
 
 static const NIVariable _niv_industrytiles[] = {
-	NIV(0x40, "construction state of tile"),
+	NIV(0x40, "construction stage of tile"),
 	NIV(0x41, "ground type"),
 	NIV(0x42, "current town zone in nearest town"),
 	NIV(0x43, "relative position"),
@@ -270,8 +270,8 @@ static const NIFeature _nif_industrytile = {
 
 
 /*** NewGRF industries ***/
-#define NIP_PRODUCED_CARGO(prop, base, slot, type, name) { name, [] (const void *b) -> const void * { return std::addressof(static_cast<const base *>(b)->GetProduced(slot).cargo); }, sizeof(CargoType), prop, type }
-#define NIP_ACCEPTED_CARGO(prop, base, slot, type, name) { name, [] (const void *b) -> const void * { return std::addressof(static_cast<const base *>(b)->GetAccepted(slot).cargo); }, sizeof(CargoType), prop, type }
+#define NIP_PRODUCED_CARGO(prop, base_class, slot, type, name) { name, [] (const void *b) -> uint32_t { return static_cast<const base_class *>(b)->GetProduced(slot).cargo; }, prop, type }
+#define NIP_ACCEPTED_CARGO(prop, base_class, slot, type, name) { name, [] (const void *b) -> uint32_t { return static_cast<const base_class *>(b)->GetAccepted(slot).cargo; }, prop, type }
 
 static const NIProperty _nip_industries[] = {
 	NIP_PRODUCED_CARGO(0x25, Industry,  0, NIT_CARGO, "produced cargo 0"),
@@ -394,7 +394,7 @@ static const NIFeature _nif_industry = {
 static const NICallback _nic_objects[] = {
 	NICO(CBID_OBJECT_LAND_SLOPE_CHECK,     ObjectCallbackMask::SlopeCheck),
 	NICO(CBID_OBJECT_ANIMATION_NEXT_FRAME, ObjectCallbackMask::AnimationNextFrame),
-	NICO(CBID_OBJECT_ANIMATION_START_STOP, std::monostate{}),
+	NICO(CBID_OBJECT_ANIMATION_TRIGGER, std::monostate{}),
 	NICO(CBID_OBJECT_ANIMATION_SPEED,      ObjectCallbackMask::AnimationSpeed),
 	NICO(CBID_OBJECT_COLOUR,               ObjectCallbackMask::Colour),
 	NICO(CBID_OBJECT_FUND_MORE_TEXT,       ObjectCallbackMask::FundMoreText),
@@ -451,6 +451,7 @@ static const NIVariable _niv_railtypes[] = {
 	NIV(0x42, "level crossing status"),
 	NIV(0x43, "construction date"),
 	NIV(0x44, "town zone"),
+	NIV(0x45, "track types"),
 };
 
 class NIHRailType : public NIHelper {
@@ -484,8 +485,8 @@ static const NIFeature _nif_railtype = {
 #define NICAT(cb_id, bit) NIC(cb_id, AirportTileSpec, callback_mask, bit)
 static const NICallback _nic_airporttiles[] = {
 	NICAT(CBID_AIRPTILE_DRAW_FOUNDATIONS, AirportTileCallbackMask::DrawFoundations),
-	NICAT(CBID_AIRPTILE_ANIM_START_STOP,  std::monostate{}),
-	NICAT(CBID_AIRPTILE_ANIM_NEXT_FRAME,  AirportTileCallbackMask::AnimationNextFrame),
+	NICAT(CBID_AIRPTILE_ANIMATION_TRIGGER, std::monostate{}),
+	NICAT(CBID_AIRPTILE_ANIMATION_NEXT_FRAME, AirportTileCallbackMask::AnimationNextFrame),
 	NICAT(CBID_AIRPTILE_ANIMATION_SPEED,  AirportTileCallbackMask::AnimationSpeed),
 };
 
@@ -620,6 +621,7 @@ static const NIVariable _niv_roadtypes[] = {
 	NIV(0x42, "level crossing status"),
 	NIV(0x43, "construction date"),
 	NIV(0x44, "town zone"),
+	NIV(0x45, "track types"),
 };
 
 template <RoadTramType TRoadTramType>
@@ -663,8 +665,8 @@ static const NIFeature _nif_tramtype = {
 #define NICRS(cb_id, bit) NIC(cb_id, RoadStopSpec, callback_mask, bit)
 static const NICallback _nic_roadstops[] = {
 	NICRS(CBID_STATION_AVAILABILITY,     RoadStopCallbackMask::Avail),
-	NICRS(CBID_STATION_ANIM_START_STOP,  std::monostate{}),
-	NICRS(CBID_STATION_ANIM_NEXT_FRAME,  RoadStopCallbackMask::AnimationNextFrame),
+	NICRS(CBID_STATION_ANIMATION_TRIGGER, std::monostate{}),
+	NICRS(CBID_STATION_ANIMATION_NEXT_FRAME, RoadStopCallbackMask::AnimationNextFrame),
 	NICRS(CBID_STATION_ANIMATION_SPEED,  RoadStopCallbackMask::AnimationSpeed),
 };
 
diff --git a/src/table/object_land.h b/src/table/object_land.h
index 39574a82c6..47199bc0c9 100644
--- a/src/table/object_land.h
+++ b/src/table/object_land.h
@@ -7,6 +7,8 @@
 
 /** @file object_land.h Sprites to use and how to display them for object tiles. */
 
+#include "table/strings.h"
+
 #define TILE_SEQ_LINE(sz, img) { 0, 0, 0, 16, 16, sz, {img, PAL_NONE} },
 
 static const DrawTileSeqStruct _object_transmitter_seq[] = {
@@ -104,7 +106,7 @@ static const DrawTileSpriteSpan _object_hq[] = {
 #undef TILE_SPRITE_LINE
 #undef TILE_SPRITE_LINE_NOTHING
 
-#define M(name, size, build_cost_multiplier, clear_cost_multiplier, height, climate, gen_amount, flags) {{INVALID_OBJECT_CLASS, 0}, FixedGRFFileProps<2>{}, {0, 0, 0, 0}, name, climate, size, build_cost_multiplier, clear_cost_multiplier, TimerGameCalendar::Date{}, CalendarTime::MAX_DATE + 1, flags, ObjectCallbackMasks{}, height, 1, gen_amount, {}}
+#define M(name, size, build_cost_multiplier, clear_cost_multiplier, height, climate, gen_amount, flags) {{INVALID_OBJECT_CLASS, 0}, StandardGRFFileProps{}, AnimationInfo<ObjectAnimationTriggers>{}, name, climate, size, build_cost_multiplier, clear_cost_multiplier, TimerGameCalendar::Date{}, CalendarTime::MAX_DATE + 1, flags, ObjectCallbackMasks{}, height, 1, gen_amount, {}}
 
 /* Climates
  * T = Temperate
diff --git a/src/table/railtypes.h b/src/table/railtypes.h
index 99e9b76ef4..3f687545bb 100644
--- a/src/table/railtypes.h
+++ b/src/table/railtypes.h
@@ -13,6 +13,8 @@
 #ifndef RAILTYPES_H
 #define RAILTYPES_H
 
+#include "table/strings.h"
+
 /**
  * Global Railtype definition
  */
diff --git a/src/table/roadtypes.h b/src/table/roadtypes.h
index 87f1f64207..f77c34dc74 100644
--- a/src/table/roadtypes.h
+++ b/src/table/roadtypes.h
@@ -13,6 +13,8 @@
 #ifndef ROADTYPES_H
 #define ROADTYPES_H
 
+#include "table/strings.h"
+
 /**
  * Global Roadtype definition
  */
diff --git a/src/table/settings.h.preamble b/src/table/settings.h.preamble
index a9006f3078..599760f562 100644
--- a/src/table/settings.h.preamble
+++ b/src/table/settings.h.preamble
@@ -7,8 +7,10 @@
 
 /** @file table/settings.h Settings to save in the savegame and config file. */
 
+#include "table/strings.h"
+
 /* Callback function used in _settings[] as well as _company_settings[] */
-static size_t ConvertLandscape(const char *value);
+static std::optional<uint32_t> ConvertLandscape(std::string_view value);
 
 static StringID SettingTitleWallclock(const IntSettingDesc &sd);
 static StringID SettingHelpWallclock(const IntSettingDesc &sd);
diff --git a/src/table/settings/currency_settings.ini b/src/table/settings/currency_settings.ini
index ad43b94580..24bc22dde9 100644
--- a/src/table/settings/currency_settings.ini
+++ b/src/table/settings/currency_settings.ini
@@ -61,7 +61,7 @@ max      = CalendarTime::MAX_YEAR
 [SDT_SSTR]
 var      = prefix
 type     = SLE_STRQ
-def      = nullptr
+def      = """"
 
 [SDT_SSTR]
 var      = suffix
diff --git a/src/table/settings/difficulty_settings.ini b/src/table/settings/difficulty_settings.ini
index 001a8a0a58..47b003a821 100644
--- a/src/table/settings/difficulty_settings.ini
+++ b/src/table/settings/difficulty_settings.ini
@@ -10,7 +10,7 @@
 [pre-amble]
 const std::array<std::string, GAME_DIFFICULTY_NUM> _old_diff_settings{"max_no_competitors", "competitor_start_time", "number_towns", "industry_density", "max_loan", "initial_interest", "vehicle_costs", "competitor_speed", "competitor_intelligence", "vehicle_breakdowns", "subsidy_multiplier", "construction_cost", "terrain_type", "quantity_sea_lakes", "economy", "line_reverse_mode", "disasters", "town_council_tolerance"};
 
-uint16_t _old_diff_custom[GAME_DIFFICULTY_NUM];
+std::array<uint16_t, GAME_DIFFICULTY_NUM> _old_diff_custom;
 uint8_t _old_diff_level;                                 ///< Old difficulty level from old savegames
 
 static void DifficultyNoiseChange(int32_t new_value);
diff --git a/src/table/settings/economy_settings.ini b/src/table/settings/economy_settings.ini
index dd24dd19fc..e45bdbc006 100644
--- a/src/table/settings/economy_settings.ini
+++ b/src/table/settings/economy_settings.ini
@@ -12,7 +12,7 @@ static void TownFoundingChanged(int32_t new_value);
 static void ChangeTimekeepingUnits(int32_t new_value);
 static void ChangeMinutesPerYear(int32_t new_value);
 
-static constexpr std::initializer_list<const char*> _place_houses{"forbidden", "allowed", "fully constructed"};
+static constexpr std::initializer_list<std::string_view> _place_houses{"forbidden"sv, "allowed"sv, "fully constructed"sv};
 
 static const SettingVariant _economy_settings_table[] = {
 [post-amble]
diff --git a/src/table/settings/game_settings.ini b/src/table/settings/game_settings.ini
index 0a946940d4..c264ddc850 100644
--- a/src/table/settings/game_settings.ini
+++ b/src/table/settings/game_settings.ini
@@ -9,7 +9,7 @@
 ; Game settings are everything related to vehicles, stations, orders, etc.
 
 [pre-amble]
-static constexpr std::initializer_list<const char*> _roadsides{"left", "right"};
+static constexpr std::initializer_list<std::string_view> _roadsides{"left"sv, "right"sv};
 
 static void StationSpreadChanged(int32_t new_value);
 static void UpdateConsists(int32_t new_value);
diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini
index 39c44675aa..3d9ee1b75b 100644
--- a/src/table/settings/gui_settings.ini
+++ b/src/table/settings/gui_settings.ini
@@ -17,9 +17,9 @@ static void InvalidateNewGRFChangeWindows(int32_t new_value);
 static void ZoomMinMaxChanged(int32_t new_value);
 static void SpriteZoomMinChanged(int32_t new_value);
 
-static constexpr std::initializer_list<const char*> _osk_activation{"disabled", "double", "single", "immediately"};
-static constexpr std::initializer_list<const char*> _savegame_date{"long", "short", "iso"};
-static constexpr std::initializer_list<const char*> _right_click_close{"no", "yes", "except sticky"};
+static constexpr std::initializer_list<std::string_view> _osk_activation{"disabled"sv, "double"sv, "single"sv, "immediately"sv};
+static constexpr std::initializer_list<std::string_view> _savegame_date{"long"sv, "short"sv, "iso"sv};
+static constexpr std::initializer_list<std::string_view> _right_click_close{"no"sv, "yes"sv, "except sticky"sv};
 
 static const SettingVariant _gui_settings_table[] = {
 [post-amble]
@@ -260,9 +260,9 @@ cat      = SC_EXPERT
 var      = gui.zoom_min
 type     = SLE_UINT8
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown
-def      = ZOOM_LVL_MIN
-min      = ZOOM_LVL_MIN
-max      = ZOOM_LVL_NORMAL
+def      = to_underlying(ZoomLevel::Min)
+min      = to_underlying(ZoomLevel::Min)
+max      = to_underlying(ZoomLevel::Normal)
 str      = STR_CONFIG_SETTING_ZOOM_MIN
 strhelp  = STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT
 strval   = STR_CONFIG_SETTING_ZOOM_LVL_MIN
@@ -273,9 +273,9 @@ startup  = true
 var      = gui.zoom_max
 type     = SLE_UINT8
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown
-def      = ZOOM_LVL_MAX
-min      = ZOOM_LVL_OUT_2X
-max      = ZOOM_LVL_MAX
+def      = to_underlying(ZoomLevel::Max)
+min      = to_underlying(ZoomLevel::Out2x)
+max      = to_underlying(ZoomLevel::Max)
 str      = STR_CONFIG_SETTING_ZOOM_MAX
 strhelp  = STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT
 strval   = STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X
@@ -286,9 +286,9 @@ startup  = true
 var      = gui.sprite_zoom_min
 type     = SLE_UINT8
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown
-def      = ZOOM_LVL_MIN
-min      = ZOOM_LVL_MIN
-max      = ZOOM_LVL_NORMAL
+def      = to_underlying(ZoomLevel::Min)
+min      = to_underlying(ZoomLevel::Min)
+max      = to_underlying(ZoomLevel::Normal)
 str      = STR_CONFIG_SETTING_SPRITE_ZOOM_MIN
 strhelp  = STR_CONFIG_SETTING_SPRITE_ZOOM_MIN_HELPTEXT
 strval   = STR_CONFIG_SETTING_SPRITE_ZOOM_LVL_MIN
diff --git a/src/table/settings/locale_settings.ini b/src/table/settings/locale_settings.ini
index 303cac8e3e..4e38128ee0 100644
--- a/src/table/settings/locale_settings.ini
+++ b/src/table/settings/locale_settings.ini
@@ -12,8 +12,8 @@ static std::pair<StringParameter, StringParameter> SettingsValueVelocityUnit(con
 
 uint8_t _old_units;                                      ///< Old units from old savegames
 
-static constexpr std::initializer_list<const char*> _locale_currencies{"GBP", "USD", "EUR", "JPY", "ATS", "BEF", "CHF", "CZK", "DEM", "DKK", "ESP", "FIM", "FRF", "GRD", "HUF", "ISK", "ITL", "NLG", "NOK", "PLN", "RON", "RUR", "SIT", "SEK", "TRY", "SKK", "BRL", "EEK", "LTL", "KRW", "ZAR", "custom", "GEL", "IRR", "RUB", "MXN", "NTD", "CNY", "HKD", "INR", "IDR", "MYR", "LVL", "PTE", "UAH"};
-static constexpr std::initializer_list<const char*> _locale_units{"imperial", "metric", "si", "gameunits", "knots"};
+static constexpr std::initializer_list<std::string_view> _locale_currencies{"GBP"sv, "USD"sv, "EUR"sv, "JPY"sv, "ATS"sv, "BEF"sv, "CHF"sv, "CZK"sv, "DEM"sv, "DKK"sv, "ESP"sv, "FIM"sv, "FRF"sv, "GRD"sv, "HUF"sv, "ISK"sv, "ITL"sv, "NLG"sv, "NOK"sv, "PLN"sv, "RON"sv, "RUR"sv, "SIT"sv, "SEK"sv, "TRY"sv, "SKK"sv, "BRL"sv, "EEK"sv, "LTL"sv, "KRW"sv, "ZAR"sv, "custom"sv, "GEL"sv, "IRR"sv, "RUB"sv, "MXN"sv, "NTD"sv, "CNY"sv, "HKD"sv, "INR"sv, "IDR"sv, "MYR"sv, "LVL"sv, "PTE"sv, "UAH"sv};
+static constexpr std::initializer_list<std::string_view> _locale_units{"imperial"sv, "metric"sv, "si"sv, "gameunits"sv, "knots"sv};
 
 static_assert(_locale_currencies.size() == CURRENCY_END);
 
@@ -176,7 +176,7 @@ var      = locale.digit_group_separator
 type     = SLE_STRQ
 from     = SLV_118
 flags    = SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
 
@@ -185,7 +185,7 @@ var      = locale.digit_group_separator_currency
 type     = SLE_STRQ
 from     = SLV_118
 flags    = SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
 
@@ -194,6 +194,6 @@ var      = locale.digit_decimal_separator
 type     = SLE_STRQ
 from     = SLV_126
 flags    = SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
diff --git a/src/table/settings/misc_settings.ini b/src/table/settings/misc_settings.ini
index 630ff5fef2..ff46d87f54 100644
--- a/src/table/settings/misc_settings.ini
+++ b/src/table/settings/misc_settings.ini
@@ -10,9 +10,9 @@
 [pre-amble]
 extern std::string _config_language_file;
 
-static constexpr std::initializer_list<const char*> _support8bppmodes{"no", "system", "hardware"};
-static constexpr std::initializer_list<const char*> _display_opt_modes{"SHOW_TOWN_NAMES", "SHOW_STATION_NAMES", "SHOW_SIGNS", "FULL_ANIMATION", "", "FULL_DETAIL", "WAYPOINTS", "SHOW_COMPETITOR_SIGNS"};
-static constexpr std::initializer_list<const char*> _facility_display_opt_modes{"TRAIN", "TRUCK_STOP", "BUS_STOP", "AIRPORT", "DOCK", "", "GHOST"};
+static constexpr std::initializer_list<std::string_view> _support8bppmodes{"no"sv, "system"sv, "hardware"sv};
+static constexpr std::initializer_list<std::string_view> _display_opt_modes{"SHOW_TOWN_NAMES"sv, "SHOW_STATION_NAMES"sv, "SHOW_SIGNS"sv, "FULL_ANIMATION"sv, ""sv, "FULL_DETAIL"sv, "WAYPOINTS"sv, "SHOW_COMPETITOR_SIGNS"sv};
+static constexpr std::initializer_list<std::string_view> _facility_display_opt_modes{"TRAIN"sv, "TRUCK_STOP"sv, "BUS_STOP"sv, "AIRPORT"sv, "DOCK"sv, ""sv, "GHOST"sv};
 
 #ifdef WITH_COCOA
 extern bool _allow_hidpi_window;
@@ -111,48 +111,48 @@ cat      = SC_BASIC
 name     = ""soundsset""
 type     = SLE_STRQ
 var      = BaseSounds::ini_set
-def      = nullptr
+def      = """"
 cat      = SC_BASIC
 
 [SDTG_SSTR]
 name     = ""musicset""
 type     = SLE_STRQ
 var      = BaseMusic::ini_set
-def      = nullptr
+def      = """"
 cat      = SC_BASIC
 
 [SDTG_SSTR]
 name     = ""videodriver""
 type     = SLE_STRQ
 var      = _ini_videodriver
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_SSTR]
 name     = ""musicdriver""
 type     = SLE_STRQ
 var      = _ini_musicdriver
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_SSTR]
 name     = ""sounddriver""
 type     = SLE_STRQ
 var      = _ini_sounddriver
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_SSTR]
 name     = ""blitter""
 type     = SLE_STRQ
 var      = _ini_blitter
-def      = nullptr
+def      = """"
 
 [SDTG_SSTR]
 name     = ""language""
 type     = SLE_STR
 var      = _config_language_file
-def      = nullptr
+def      = """"
 cat      = SC_BASIC
 
 ; workaround for implicit lengthof() in SDTG_LIST
@@ -168,14 +168,14 @@ cat      = SC_BASIC
 name     = ""screenshot_format""
 type     = SLE_STR
 var      = _screenshot_format_name
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_SSTR]
 name     = ""savegame_format""
 type     = SLE_STR
 var      = _savegame_format
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_BOOL]
@@ -188,28 +188,28 @@ ifdef    = HAS_TRUETYPE_FONT
 name     = ""small_font""
 type     = SLE_STR
 var      = _fcsettings.small.font
-def      = nullptr
+def      = """"
 
 [SDTG_SSTR]
 ifdef    = HAS_TRUETYPE_FONT
 name     = ""medium_font""
 type     = SLE_STR
 var      = _fcsettings.medium.font
-def      = nullptr
+def      = """"
 
 [SDTG_SSTR]
 ifdef    = HAS_TRUETYPE_FONT
 name     = ""large_font""
 type     = SLE_STR
 var      = _fcsettings.large.font
-def      = nullptr
+def      = """"
 
 [SDTG_SSTR]
 ifdef    = HAS_TRUETYPE_FONT
 name     = ""mono_font""
 type     = SLE_STR
 var      = _fcsettings.mono.font
-def      = nullptr
+def      = """"
 
 [SDTG_VAR]
 ifdef    = HAS_TRUETYPE_FONT
@@ -308,14 +308,14 @@ cat      = SC_BASIC
 name     = ""keyboard""
 type     = SLE_STR
 var      = _keyboard_opt[0]
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_SSTR]
 name     = ""keyboard_caps""
 type     = SLE_STR
 var      = _keyboard_opt[1]
-def      = nullptr
+def      = """"
 cat      = SC_EXPERT
 
 [SDTG_VAR]
diff --git a/src/table/settings/multimedia_settings.ini b/src/table/settings/multimedia_settings.ini
index 55bed4b610..3f8265130e 100644
--- a/src/table/settings/multimedia_settings.ini
+++ b/src/table/settings/multimedia_settings.ini
@@ -132,14 +132,14 @@ cat      = SC_BASIC
 var      = music.custom_1
 type     = SLE_UINT8
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 cat      = SC_BASIC
 
 [SDTC_LIST]
 var      = music.custom_2
 type     = SLE_UINT8
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 cat      = SC_BASIC
 
 [SDTC_BOOL]
diff --git a/src/table/settings/network_private_settings.ini b/src/table/settings/network_private_settings.ini
index be903294b2..b8544fdd18 100644
--- a/src/table/settings/network_private_settings.ini
+++ b/src/table/settings/network_private_settings.ini
@@ -7,8 +7,8 @@
 ; Network settings as stored in the private configuration file ("private.cfg").
 
 [pre-amble]
-static constexpr std::initializer_list<const char*> _use_relay_service{"never", "ask", "allow"};
-static constexpr std::initializer_list<const char*> _participate_survey{"ask", "no", "yes"};
+static constexpr std::initializer_list<std::string_view> _use_relay_service{"never"sv, "ask"sv, "allow"sv};
+static constexpr std::initializer_list<std::string_view> _participate_survey{"ask"sv, "no"sv, "yes"sv};
 
 static const SettingVariant _network_private_settings_table[] = {
 [post-amble]
@@ -47,7 +47,7 @@ var      = network.client_name
 type     = SLE_STR
 length   = NETWORK_CLIENT_NAME_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 pre_cb   = NetworkValidateClientName
 post_cb  = NetworkUpdateClientName
 cat      = SC_BASIC
@@ -57,7 +57,7 @@ var      = network.server_name
 type     = SLE_STR
 length   = NETWORK_NAME_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::NetworkOnly
-def      = nullptr
+def      = """"
 pre_cb   = NetworkValidateServerName
 post_cb  = [](auto) { UpdateClientConfigValues(); }
 cat      = SC_BASIC
@@ -67,7 +67,7 @@ var      = network.connect_to_ip
 type     = SLE_STR
 length   = 0
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 
 [SDTC_SSTR]
 var      = network.last_joined
diff --git a/src/table/settings/network_secrets_settings.ini b/src/table/settings/network_secrets_settings.ini
index 6e9146846e..54ef0b21e0 100644
--- a/src/table/settings/network_secrets_settings.ini
+++ b/src/table/settings/network_secrets_settings.ini
@@ -39,7 +39,7 @@ var      = network.server_password
 type     = SLE_STR
 length   = NETWORK_PASSWORD_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::NetworkOnly
-def      = nullptr
+def      = """"
 pre_cb   = ReplaceAsteriskWithEmptyPassword
 post_cb  = [](auto) { NetworkServerUpdateGameInfo(); }
 cat      = SC_BASIC
@@ -49,7 +49,7 @@ var      = network.rcon_password
 type     = SLE_STR
 length   = NETWORK_PASSWORD_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::NetworkOnly
-def      = nullptr
+def      = """"
 pre_cb   = ReplaceAsteriskWithEmptyPassword
 cat      = SC_BASIC
 
@@ -58,7 +58,7 @@ var      = network.admin_password
 type     = SLE_STR
 length   = NETWORK_PASSWORD_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::NetworkOnly
-def      = nullptr
+def      = """"
 cat      = SC_BASIC
 
 [SDTC_SSTR]
@@ -66,7 +66,7 @@ var      = network.client_secret_key
 type     = SLE_STR
 length   = NETWORK_SECRET_KEY_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 ; Prevent the user from setting the secret key from the console using 'setting'
 pre_cb   = [](auto) { return false; }
 
@@ -75,7 +75,7 @@ var      = network.client_public_key
 type     = SLE_STR
 length   = NETWORK_SECRET_KEY_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync
-def      = nullptr
+def      = """"
 ; Prevent the user from setting the public key from the console using 'setting'
 pre_cb   = [](auto) { return false; }
 
@@ -84,11 +84,11 @@ var      = network.server_invite_code
 type     = SLE_STR
 length   = NETWORK_INVITE_CODE_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::NetworkOnly
-def      = nullptr
+def      = """"
 
 [SDTC_SSTR]
 var      = network.server_invite_code_secret
 type     = SLE_STR
 length   = NETWORK_INVITE_CODE_SECRET_LENGTH
 flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::NetworkOnly
-def      = nullptr
+def      = """"
diff --git a/src/table/settings/network_settings.ini b/src/table/settings/network_settings.ini
index c7d724d4a5..18743ae77a 100644
--- a/src/table/settings/network_settings.ini
+++ b/src/table/settings/network_settings.ini
@@ -10,7 +10,7 @@
 static void UpdateClientConfigValues();
 void ChangeNetworkRestartTime(bool reset);
 
-static constexpr std::initializer_list<const char*> _server_game_type{"local", "public", "invite-only"};
+static constexpr std::initializer_list<std::string_view> _server_game_type{"local"sv, "public"sv, "invite-only"sv};
 
 static const SettingVariant _network_settings_table[] = {
 [post-amble]
diff --git a/src/table/settings/news_display_settings.ini b/src/table/settings/news_display_settings.ini
index b43f58fed9..ca91b08990 100644
--- a/src/table/settings/news_display_settings.ini
+++ b/src/table/settings/news_display_settings.ini
@@ -7,7 +7,7 @@
 ; News display settings as stored in the main configuration file ("openttd.cfg").
 
 [pre-amble]
-static constexpr std::initializer_list<const char*> _news_display{ "off", "summarized", "full"};
+static constexpr std::initializer_list<std::string_view> _news_display{"off"sv, "summarized"sv, "full"sv};
 
 static const SettingVariant _news_display_settings_table[] = {
 [post-amble]
diff --git a/src/table/settings/old_gameopt_settings.ini b/src/table/settings/old_gameopt_settings.ini
index 8cf1299ab9..b72c6f3a30 100644
--- a/src/table/settings/old_gameopt_settings.ini
+++ b/src/table/settings/old_gameopt_settings.ini
@@ -14,8 +14,8 @@
 ; be saved in their new place.
 
 [pre-amble]
-static constexpr std::initializer_list<const char*> _town_names{"english", "french", "german", "american", "latin", "silly", "swedish", "dutch", "finnish", "polish", "slovak", "norwegian", "hungarian", "austrian", "romanian", "czech", "swiss", "danish", "turkish", "italian", "catalan"};
-static constexpr std::initializer_list<const char*> _climates{"temperate", "arctic", "tropic", "toyland"};
+static constexpr std::initializer_list<std::string_view> _town_names{"english"sv, "french"sv, "german"sv, "american"sv, "latin"sv, "silly"sv, "swedish"sv, "dutch"sv, "finnish"sv, "polish"sv, "slovak"sv, "norwegian"sv, "hungarian"sv, "austrian"sv, "romanian"sv, "czech"sv, "swiss"sv, "danish"sv, "turkish"sv, "italian"sv, "catalan"sv};
+static constexpr std::initializer_list<std::string_view> _climates{"temperate"sv, "arctic"sv, "tropic"sv, "toyland"sv};
 
 static const SettingVariant _old_gameopt_settings_table[] = {
 /* In version 4 a new difficulty setting has been added to the difficulty settings,
@@ -75,7 +75,7 @@ type     = SLE_FILE_I16 | SLE_VAR_U16
 flags    = SettingFlag::NotInConfig
 var      = _old_diff_custom
 length   = 17
-def      = nullptr
+def      = """"
 to       = SLV_4
 
 [SDTG_LIST]
@@ -86,7 +86,7 @@ type     = SLE_UINT16
 flags    = SettingFlag::NotInConfig
 var      = _old_diff_custom
 length   = 18
-def      = nullptr
+def      = """"
 full     = nullptr
 from     = SLV_4
 
diff --git a/src/table/sprites.h b/src/table/sprites.h
index e0003fa61b..21f9318be4 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -54,7 +54,7 @@ static const SpriteID SPR_LARGE_SMALL_WINDOW = 682;
 
 /** Extra graphic spritenumbers */
 static const SpriteID SPR_OPENTTD_BASE   = 4896;
-static const uint16_t OPENTTD_SPRITE_COUNT = 191;
+static const uint16_t OPENTTD_SPRITE_COUNT = 192;
 
 /* Halftile-selection sprites */
 static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE;
@@ -172,6 +172,8 @@ static const SpriteID SPR_JOIN                       = SPR_OPENTTD_BASE + 188;
 static const SpriteID SPR_PLAYER_SELF                = SPR_OPENTTD_BASE + 189;
 static const SpriteID SPR_PLAYER_HOST                = SPR_OPENTTD_BASE + 190;
 
+static const SpriteID SPR_EXTRA_MENU                 = SPR_OPENTTD_BASE + 191;
+
 static const SpriteID SPR_IMG_CARGOFLOW              = SPR_OPENTTD_BASE + 174;
 
 static const SpriteID SPR_SIGNALS_BASE  = SPR_OPENTTD_BASE + OPENTTD_SPRITE_COUNT;
diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h
index bd57fa795d..6373b85159 100644
--- a/src/table/strgen_tables.h
+++ b/src/table/strgen_tables.h
@@ -17,7 +17,7 @@ enum class CmdFlag : uint8_t {
 using CmdFlags = EnumBitSet<CmdFlag, uint8_t>;
 
 class StringBuilder;
-typedef void (*ParseCmdProc)(StringBuilder &builder, const char *buf, char32_t value);
+typedef void (*ParseCmdProc)(StringBuilder &builder, std::string_view param, char32_t value);
 
 struct CmdStruct {
 	std::string_view cmd;
@@ -28,9 +28,9 @@ struct CmdStruct {
 	CmdFlags flags;
 };
 
-extern void EmitSingleChar(StringBuilder &builder, const char *buf, char32_t value);
-extern void EmitPlural(StringBuilder &builder, const char *buf, char32_t value);
-extern void EmitGender(StringBuilder &builder, const char *buf, char32_t value);
+extern void EmitSingleChar(StringBuilder &builder, std::string_view param, char32_t value);
+extern void EmitPlural(StringBuilder &builder, std::string_view param, char32_t value);
+extern void EmitGender(StringBuilder &builder, std::string_view param, char32_t value);
 
 static const CmdStruct _cmd_structs[] = {
 	/* Font size */
@@ -142,6 +142,7 @@ static const CmdStruct _cmd_structs[] = {
 	{"DOWN_ARROW",        EmitSingleChar, SCC_DOWN_ARROW,         0, std::nullopt, {CmdFlag::DontCount}},
 	{"CHECKMARK",         EmitSingleChar, SCC_CHECKMARK,          0, std::nullopt, {CmdFlag::DontCount}},
 	{"CROSS",             EmitSingleChar, SCC_CROSS,              0, std::nullopt, {CmdFlag::DontCount}},
+	{"LEFT_ARROW",        EmitSingleChar, SCC_LEFT_ARROW,         0, std::nullopt, {CmdFlag::DontCount}},
 	{"RIGHT_ARROW",       EmitSingleChar, SCC_RIGHT_ARROW,        0, std::nullopt, {CmdFlag::DontCount}},
 	{"SMALL_LEFT_ARROW",  EmitSingleChar, SCC_LESS_THAN,          0, std::nullopt, {CmdFlag::DontCount}},
 	{"SMALL_RIGHT_ARROW", EmitSingleChar, SCC_GREATER_THAN,       0, std::nullopt, {CmdFlag::DontCount}},
@@ -160,8 +161,8 @@ static const CmdStruct _cmd_structs[] = {
 /** Description of a plural form */
 struct PluralForm {
 	size_t plural_count;     ///< The number of plural forms
-	const char *description; ///< Human readable description of the form
-	const char *names;       ///< Plural names
+	std::string_view description; ///< Human readable description of the form
+	std::string_view names; ///< Plural names
 };
 
 /** The maximum number of plurals. */
@@ -199,7 +200,7 @@ static const PluralForm _plural_forms[] = {
  * a = array, i.e. list of strings
  */
  /** All pragmas used */
-static const char * const _pragmas[][4] = {
+static const std::string_view _pragmas[][4] = {
 	/*  name         flags  default   description */
 	{ "name",        "0",   "",       "English name for the language" },
 	{ "ownname",     "t",   "",       "Localised name for the language" },
diff --git a/src/table/town_land.h b/src/table/town_land.h
index 7b2f8c4b8e..12c9c0c1b5 100644
--- a/src/table/town_land.h
+++ b/src/table/town_land.h
@@ -1813,8 +1813,8 @@ static_assert(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4);
 	{TimerGameCalendar::Year{mnd}, TimerGameCalendar::Year{mxd}, p, rc, bn, rr, mg, \
 	{ca1, ca2, ca3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
 	{INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO, INVALID_CARGO}, \
-	bf, ba, true, GRFFileProps(INVALID_HOUSE_ID), HouseCallbackMasks{}, {COLOUR_BEGIN, COLOUR_BEGIN, COLOUR_BEGIN, COLOUR_BEGIN}, \
-	16, HouseExtraFlags{}, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0, {}, {cg1, cg2, cg3}, }
+	bf, ba, true, SubstituteGRFFileProps(INVALID_HOUSE_ID), HouseCallbackMasks{}, {COLOUR_BEGIN, COLOUR_BEGIN, COLOUR_BEGIN, COLOUR_BEGIN}, \
+	16, HouseExtraFlags{}, HOUSE_NO_CLASS, AnimationInfo<void>{}, 0, 0, 0, {}, {cg1, cg2, cg3}, }
 /** House specifications from original data */
 extern const HouseSpec _original_house_specs[] = {
 	/**
@@ -1834,443 +1834,443 @@ extern const HouseSpec _original_house_specs[] = {
 	 */
 	MS(1963, CalendarTime::MAX_YEAR, 187, 150, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      140,  70,   8,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 00
 	MS(1957, CalendarTime::MAX_YEAR,  85, 140, STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1,           130,  55,   8,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 01
 	MS(1968, CalendarTime::MAX_YEAR,  40, 100, STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1,    90,  20,   8,   3,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 02
 	MS(   0, CalendarTime::MAX_YEAR,   5,  90, STR_TOWN_BUILDING_NAME_CHURCH_1,                 230,   2,   2,   0,   0,
 	   BuildingFlags({BuildingFlag::IsChurch, BuildingFlag::Size1x1}),
-	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 03
 	MS(1975, CalendarTime::MAX_YEAR, 220, 160, STR_TOWN_BUILDING_NAME_LARGE_OFFICE_BLOCK_1,     160,  85,  10,   4,   6,
 	   BuildingFlags({BuildingFlag::IsAnimated, BuildingFlag::Size1x1}),
-	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 04
 	MS(1975, CalendarTime::MAX_YEAR, 220, 160, STR_TOWN_BUILDING_NAME_LARGE_OFFICE_BLOCK_1,     160,  85,  10,   4,   6,
 	   BuildingFlags({BuildingFlag::IsAnimated, BuildingFlag::Size1x1}),
-	   HZ_SUBARTC_ABOVE  | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 05
 	MS(   0, CalendarTime::MAX_YEAR,  30,  80, STR_TOWN_BUILDING_NAME_TOWN_HOUSES_1,             80,  12,   4,   1,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 06
 	MS(1959, CalendarTime::MAX_YEAR, 140, 180, STR_TOWN_BUILDING_NAME_HOTEL_1,                  150,  22,   6,   1,   2,
 	   BuildingFlag::Size1x2,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 07
 	MS(1959, CalendarTime::MAX_YEAR,   0, 180, STR_TOWN_BUILDING_NAME_HOTEL_1,                  150,  22,   6,   1,   2,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 08
 	MS(1945, CalendarTime::MAX_YEAR,   0,  65, STR_TOWN_BUILDING_NAME_STATUE_1,                  40,   0,   2,   0,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 09
 	MS(1945, CalendarTime::MAX_YEAR,   0,  65, STR_TOWN_BUILDING_NAME_FOUNTAIN_1,                40,   0,   2,   0,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0A
 	MS(   0, CalendarTime::MAX_YEAR,   0,  60, STR_TOWN_BUILDING_NAME_PARK_1,                    75,   0,   2,   0,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0B
 	MS(1935, CalendarTime::MAX_YEAR,   0,  60, STR_TOWN_BUILDING_NAME_PARK_1,                    75,   0,   2,   0,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0C
 	MS(1951, CalendarTime::MAX_YEAR, 150, 130, STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_2,           110,  65,   8,   2,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0D
 	MS(1930, 1960,      95, 110, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      100,  48,   6,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0E
 	MS(1930, 1960,      95, 105, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      100,  48,   6,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0F
 	MS(1930, 1960,      95, 107, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      100,  48,   6,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 10
 	MS(1977, CalendarTime::MAX_YEAR, 130, 200, STR_TOWN_BUILDING_NAME_MODERN_OFFICE_BUILDING_1, 150,  50,  10,   3,   6,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 11
 	MS(1983, CalendarTime::MAX_YEAR,   6, 145, STR_TOWN_BUILDING_NAME_WAREHOUSE_1,              110,  10,   6,   3,   8,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 12
 	MS(1985, CalendarTime::MAX_YEAR, 110, 155, STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_3,           110,  55,   6,   2,   6,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 13
 	MS(   0, CalendarTime::MAX_YEAR,  65, 250, STR_TOWN_BUILDING_NAME_STADIUM_1,                300,   5,   4,   0,   0,
 	   BuildingFlags({BuildingFlag::IsStadium, BuildingFlag::Size2x2}),
-	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 14
 	MS(   0, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_STADIUM_1,                300,   5,   4,   0,   0,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 15
 	MS(   0, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_STADIUM_1,                300,   5,   4,   0,   0,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 16
 	MS(   0, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_STADIUM_1,                300,   5,   4,   0,   0,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 17
 	MS(   0, 1951,      15,  70, STR_TOWN_BUILDING_NAME_OLD_HOUSES_1,              75,   6,   3,   1,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 18
 	MS(   0, 1952,      12,  75, STR_TOWN_BUILDING_NAME_COTTAGES_1,                75,   7,   3,   1,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 19
 	MS(1931, CalendarTime::MAX_YEAR,  13,  71, STR_TOWN_BUILDING_NAME_HOUSES_1,                  75,   8,   3,   1,   0,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1A
 	MS(1935, CalendarTime::MAX_YEAR, 100, 135, STR_TOWN_BUILDING_NAME_FLATS_1,                  100,  35,   7,   2,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1B
 	MS(1963, CalendarTime::MAX_YEAR, 170, 145, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_2,      170,  50,   8,   3,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1C
 	MS(   0, 1955,     100, 132, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_2,      135,  40,   6,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1D
 	MS(1973, CalendarTime::MAX_YEAR, 180, 155, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_3,      180,  64,   8,   3,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1E
 	MS(   0, CalendarTime::MAX_YEAR,  35, 220, STR_TOWN_BUILDING_NAME_THEATER_1,                230,  23,   8,   2,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1F
 	MS(1958, CalendarTime::MAX_YEAR,  65, 250, STR_TOWN_BUILDING_NAME_STADIUM_2,                300,   5,   4,   0,   0,
 	   BuildingFlags({BuildingFlag::IsStadium, BuildingFlag::Size2x2}),
-	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 20
 	MS(1958, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_STADIUM_2,                300,   5,   4,   0,   0,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 21
 	MS(1958, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_STADIUM_2,                300,   5,   4,   0,   0,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 22
 	MS(1958, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_STADIUM_2,                300,   5,   4,   0,   0,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 23
 	MS(2000, CalendarTime::MAX_YEAR, 140, 170, STR_TOWN_BUILDING_NAME_OFFICES_1,                250,  65,   8,   3,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 24
 	MS(   0, 1960,      15,  70, STR_TOWN_BUILDING_NAME_HOUSES_2,                  75,   6,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 25
 	MS(   0, 1960,      15,  70, STR_TOWN_BUILDING_NAME_HOUSES_2,                  75,   6,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 26
 	MS(1945, CalendarTime::MAX_YEAR,  35, 210, STR_TOWN_BUILDING_NAME_CINEMA_1,                 230,  23,   8,   2,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 27
 	MS(1983, CalendarTime::MAX_YEAR, 180, 250, STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1,          300,   5,   8,   2,   3,
 	   BuildingFlag::Size2x2,
-	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 |HZ_ZON2,
+	   HouseZones({HouseZone::ClimateTemperate, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb,HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 28
 	MS(1983, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1,          300,   5,   8,   2,   3,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 29
 	MS(1983, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1,          300,   5,   8,   2,   3,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 2A
 	MS(1983, CalendarTime::MAX_YEAR,   0, 250, STR_TOWN_BUILDING_NAME_SHOPPING_MALL_1,          300,   5,   8,   2,   3,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 2B
 	MS(   0, CalendarTime::MAX_YEAR,  80, 100, STR_TOWN_BUILDING_NAME_FLATS_1,                   90,  20,   5,   2,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2C
 	MS(   0, CalendarTime::MAX_YEAR,  80, 100, STR_TOWN_BUILDING_NAME_FLATS_1,                   90,  20,   5,   2,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE  | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2D
 	MS(   0, CalendarTime::MAX_YEAR,  16,  70, STR_TOWN_BUILDING_NAME_HOUSES_2,                  70,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2E
 	MS(   0, CalendarTime::MAX_YEAR,  16,  70, STR_TOWN_BUILDING_NAME_HOUSES_2,                  70,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2F
 	MS(   0, 1963,      14,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  70,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 30
 	MS(   0, 1963,      14,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  70,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 31
 	MS(1966, CalendarTime::MAX_YEAR, 135, 150, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      120,  60,   8,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 32
 	MS(1966, CalendarTime::MAX_YEAR, 135, 150, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      120,  60,   8,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 33
 	MS(1970, CalendarTime::MAX_YEAR, 170, 170, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      130,  70,   9,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 34
 	MS(1970, CalendarTime::MAX_YEAR, 170, 170, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      130,  70,   9,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 35
 	MS(1974, CalendarTime::MAX_YEAR, 210, 200, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      140,  80,  10,   3,   5,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 36
 	MS(1974, CalendarTime::MAX_YEAR, 210, 200, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      140,  80,  10,   3,   5,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 37
 	MS(   0, CalendarTime::MAX_YEAR,  10,  60, STR_TOWN_BUILDING_NAME_HOUSES_2,                  60,   5,   2,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 38
 	MS(   0, CalendarTime::MAX_YEAR,  10,  60, STR_TOWN_BUILDING_NAME_HOUSES_2,                  60,   5,   2,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 39
 	MS(   0, CalendarTime::MAX_YEAR,  25, 100, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,       80,  20,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3A
 	MS(   0, CalendarTime::MAX_YEAR,  25, 100, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,       80,  20,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3B
 	MS(   0, CalendarTime::MAX_YEAR,   6,  85, STR_TOWN_BUILDING_NAME_CHURCH_1,                 230,   2,   2,   0,   0,
 	   BuildingFlags({BuildingFlag::IsChurch, BuildingFlag::Size1x1}),
-	   HZ_SUBARTC_BELOW | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 3C
 	MS(   0, CalendarTime::MAX_YEAR,   6,  85, STR_TOWN_BUILDING_NAME_CHURCH_1,                 230,   2,   2,   0,   0,
 	   BuildingFlags({BuildingFlag::IsChurch, BuildingFlag::Size1x1}),
-	   HZ_SUBARTC_ABOVE | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 3D
 	MS(   0, CalendarTime::MAX_YEAR,  17,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   7,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3E
 	MS(   0, CalendarTime::MAX_YEAR,  17,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   7,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3F
 	MS(   0, 1960,      90, 140, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      110,  45,   6,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 40
 	MS(   0, 1960,      90, 140, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      110,  45,   6,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 41
 	MS(1972, CalendarTime::MAX_YEAR, 140, 160, STR_TOWN_BUILDING_NAME_HOTEL_1,                  160,  25,   6,   1,   3,
 	   BuildingFlag::Size1x2,
-	   HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 42
 	MS(1972, CalendarTime::MAX_YEAR,   0, 160, STR_TOWN_BUILDING_NAME_HOTEL_1,                  160,  25,   6,   1,   2,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 43
 	MS(1972, CalendarTime::MAX_YEAR, 140, 160, STR_TOWN_BUILDING_NAME_HOTEL_1,                  160,  25,   6,   1,   3,
 	   BuildingFlag::Size1x2,
-	   HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 44
 	MS(1972, CalendarTime::MAX_YEAR,   0, 160, STR_TOWN_BUILDING_NAME_HOTEL_1,                  160,  25,   6,   1,   2,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 45
 	MS(1963, CalendarTime::MAX_YEAR, 105, 130, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      105,  50,   7,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 46
 	MS(1963, CalendarTime::MAX_YEAR, 105, 130, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      105,  50,   7,   2,   3,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 47
 	MS(1978, CalendarTime::MAX_YEAR, 190, 190, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      135,  75,   9,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 48
 	MS(1978, CalendarTime::MAX_YEAR, 190, 190, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      135,  75,   9,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 49
 	MS(1967, CalendarTime::MAX_YEAR, 250, 140, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      200,  60,   7,   2,   2,
 	   BuildingFlag::Size2x1,
-	   HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticBelowSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4A
 	MS(1967, CalendarTime::MAX_YEAR,   0, 140, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      200,  60,   7,   2,   2,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4B
 	MS(1967, CalendarTime::MAX_YEAR, 250, 140, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      200,  60,   7,   2,   2,
 	   BuildingFlag::Size2x1,
-	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubarcticAboveSnow, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4C
 	MS(1967, CalendarTime::MAX_YEAR,   0, 140, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      200,  60,   7,   2,   2,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4D
 	MS(   0, CalendarTime::MAX_YEAR,  16,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 4E
 	MS(   0, CalendarTime::MAX_YEAR,  16,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 4F
 	MS(   0, CalendarTime::MAX_YEAR,  16,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   5,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 50
 	MS(   0, CalendarTime::MAX_YEAR,   7,  30, STR_TOWN_BUILDING_NAME_HOUSES_2,                  30,   4,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 51
 	MS(   0, CalendarTime::MAX_YEAR,  45, 130, STR_TOWN_BUILDING_NAME_FLATS_1,                   95,  15,   6,   2,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 52
 	MS(   0, CalendarTime::MAX_YEAR,   8,  90, STR_TOWN_BUILDING_NAME_CHURCH_1,                 200,   3,   2,   0,   0,
 	   BuildingFlags({BuildingFlag::IsChurch, BuildingFlag::Size1x1}),
-	   HZ_SUBTROPIC | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 53
 	MS(   0, CalendarTime::MAX_YEAR,  18,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   7,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt}),
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 54
 	MS(1973, CalendarTime::MAX_YEAR,  90, 110, STR_TOWN_BUILDING_NAME_FLATS_1,                   95,  24,   6,   2,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 55
 	MS(1962, CalendarTime::MAX_YEAR, 120, 120, STR_TOWN_BUILDING_NAME_FLATS_1,                   95,  25,   6,   2,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 56
 	MS(1984, CalendarTime::MAX_YEAR, 250, 190, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      140,  80,   8,   3,   4,
 	   BuildingFlag::Size2x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 57
 	MS(1984, CalendarTime::MAX_YEAR,   0, 190, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      140,  80,   8,   3,   4,
 	   {},
-	   HZ_SUBTROPIC,
+	   HouseZones({HouseZone::ClimateSubtropic}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 58
 	MS(   0, CalendarTime::MAX_YEAR,  80, 110, STR_TOWN_BUILDING_NAME_FLATS_1,                   95,  23,   6,   2,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 59
 	MS(1993, CalendarTime::MAX_YEAR, 180, 180, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      150,  90,   8,   3,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateSubtropic, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 5A
 	MS(   0, CalendarTime::MAX_YEAR,   8,  90, STR_TOWN_BUILDING_NAME_CHURCH_1,                 200,   3,   2,   0,   0,
 	   BuildingFlags({BuildingFlag::IsChurch, BuildingFlag::Size1x1}),
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5B
 	MS(   0, CalendarTime::MAX_YEAR,  18,  90, STR_TOWN_BUILDING_NAME_HOUSES_2,                  90,   5,   6,   2,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5C
 	MS(   0, CalendarTime::MAX_YEAR,   7,  70, STR_TOWN_BUILDING_NAME_HOUSES_2,                  50,   3,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5D
 	MS(   0, CalendarTime::MAX_YEAR,  15,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  75,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5E
 	MS(   0, CalendarTime::MAX_YEAR,  17,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  75,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5F
 	MS(   0, CalendarTime::MAX_YEAR,  19,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  75,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 60
 	MS(   0, CalendarTime::MAX_YEAR,  21,  80, STR_TOWN_BUILDING_NAME_HOUSES_2,                  75,   6,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 61
 	MS(   0, CalendarTime::MAX_YEAR,  75, 160, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      130,  20,   8,   4,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 62
 	MS(   0, CalendarTime::MAX_YEAR,  35,  90, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   9,   4,   1,   2,
 	   BuildingFlag::Size1x2,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 63
 	MS(   0, CalendarTime::MAX_YEAR,   0,  90, STR_TOWN_BUILDING_NAME_HOUSES_2,                  80,   0,   4,   1,   2,
 	   {},
-	   HZ_NOZNS,
+	   {},
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 64
 	MS(   0, CalendarTime::MAX_YEAR,  85, 150, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      130,  18,   8,   4,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 65
 	MS(   0, CalendarTime::MAX_YEAR,  11,  60, STR_TOWN_BUILDING_NAME_IGLOO_1,                   45,   3,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 66
 	MS(   0, CalendarTime::MAX_YEAR,  10,  60, STR_TOWN_BUILDING_NAME_TEPEES_1,                  45,   3,   3,   1,   1,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 67
 	MS(   0, CalendarTime::MAX_YEAR,  67, 140, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      130,  22,   8,   4,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), // 68
 	MS(   0, CalendarTime::MAX_YEAR,  86, 145, STR_TOWN_BUILDING_NAME_SHOPS_AND_OFFICES_1,      130,  23,   8,   4,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), // 69
 	MS(   0, CalendarTime::MAX_YEAR,  95, 165, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1,      130,  28,   8,   4,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 6A
 	MS(   0, CalendarTime::MAX_YEAR,  30,  90, STR_TOWN_BUILDING_NAME_STATUE_1,                  70,  10,   4,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 6B
 	MS(   0, CalendarTime::MAX_YEAR,  25,  75, STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1,            65,   8,   3,   1,   2,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 6C
 	MS(   0, CalendarTime::MAX_YEAR,  18,  85, STR_TOWN_BUILDING_NAME_PIGGY_BANK_1,              95,   7,   3,   2,   4,
 	   BuildingFlag::Size1x1,
-	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
+	   HouseZones({HouseZone::ClimateToyland, HouseZone::TownCentre, HouseZone::TownInnerSuburb, HouseZone::TownOuterSuburb, HouseZone::TownOutskirt, HouseZone::TownEdge}),
 	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), // 6D
 };
 #undef MS
diff --git a/src/table/townname.h b/src/table/townname.h
index e2ff9279be..fa4dc9bea0 100644
--- a/src/table/townname.h
+++ b/src/table/townname.h
@@ -9,14 +9,14 @@
 
 #include "../core/enum_type.hpp"
 
-static const char * const _name_original_english_1[] = {
+static const std::string_view _name_original_english_1[] = {
 	"Great ",
 	"Little ",
 	"New ",
 	"Fort ",
 };
 
-static const char * const _name_original_english_2[] = {
+static const std::string_view _name_original_english_2[] = {
 	"Wr",
 	"B",
 	"C",
@@ -45,7 +45,7 @@ static const char * const _name_original_english_2[] = {
 	"W",
 };
 
-static const char * const _name_original_english_3[] = {
+static const std::string_view _name_original_english_3[] = {
 	"ar",
 	"a",
 	"e",
@@ -56,7 +56,7 @@ static const char * const _name_original_english_3[] = {
 	"en",
 };
 
-static const char * const _name_original_english_4[] = {
+static const std::string_view _name_original_english_4[] = {
 	"n",
 	"ning",
 	"ding",
@@ -66,7 +66,7 @@ static const char * const _name_original_english_4[] = {
 	"fing",
 };
 
-static const char * const _name_original_english_5[] = {
+static const std::string_view _name_original_english_5[] = {
 	"ville",
 	"ham",
 	"field",
@@ -92,7 +92,7 @@ static const char * const _name_original_english_5[] = {
 	"burg",
 };
 
-static const char * const _name_original_english_6[] = {
+static const std::string_view _name_original_english_6[] = {
 	"-on-sea",
 	" Bay",
 	" Market",
@@ -104,7 +104,7 @@ static const char * const _name_original_english_6[] = {
 	" Springs",
 };
 
-static const char * const _name_additional_english_prefix[] = {
+static const std::string_view _name_additional_english_prefix[] = {
 	"Great ",
 	"Little ",
 	"New ",
@@ -113,7 +113,7 @@ static const char * const _name_additional_english_prefix[] = {
 	"Old ",
 };
 
-static const char * const _name_additional_english_1a[] = {
+static const std::string_view _name_additional_english_1a[] = {
 	"Pen",
 	"Lough",
 	"Stam",
@@ -159,7 +159,7 @@ static const char * const _name_additional_english_1a[] = {
 	"Stan",
 };
 
-static const char * const _name_additional_english_1b1[] = {
+static const std::string_view _name_additional_english_1b1[] = {
 	"Wr",
 	"B",
 	"C",
@@ -188,7 +188,7 @@ static const char * const _name_additional_english_1b1[] = {
 	"W",
 };
 
-static const char * const _name_additional_english_1b2[] = {
+static const std::string_view _name_additional_english_1b2[] = {
 	"ar",
 	"a",
 	"e",
@@ -203,7 +203,7 @@ static const char * const _name_additional_english_1b2[] = {
 	"en",
 };
 
-static const char * const _name_additional_english_1b3a[] = {
+static const std::string_view _name_additional_english_1b3a[] = {
 	"n",
 	"d",
 	"",
@@ -212,13 +212,13 @@ static const char * const _name_additional_english_1b3a[] = {
 	"",
 };
 
-static const char * const _name_additional_english_1b3b[] = {
+static const std::string_view _name_additional_english_1b3b[] = {
 	"ning",
 	"ding",
 	"fing",
 };
 
-static const char * const _name_additional_english_2[] = {
+static const std::string_view _name_additional_english_2[] = {
 	"ville",
 	"ham",
 	"field",
@@ -276,7 +276,7 @@ static const char * const _name_additional_english_2[] = {
 	"thwaite",
 };
 
-static const char * const _name_additional_english_3[] = {
+static const std::string_view _name_additional_english_3[] = {
 	"-on-sea",
 	" Bay",
 	" Market",
@@ -297,7 +297,7 @@ static const char * const _name_additional_english_3[] = {
 	" Springs",
 };
 
-static const char * const _name_austrian_a1[] = {
+static const std::string_view _name_austrian_a1[] = {
 	"Bad ",
 	"Deutsch ",
 	"Gross ",
@@ -306,7 +306,7 @@ static const char * const _name_austrian_a1[] = {
 	"Maria ",
 };
 
-static const char * const _name_austrian_a2[] = {
+static const std::string_view _name_austrian_a2[] = {
 	"Aus",
 	"Alten",
 	"Braun",
@@ -351,7 +351,7 @@ static const char * const _name_austrian_a2[] = {
 	"Weissen",
 };
 
-static const char * const _name_austrian_a3[] = {
+static const std::string_view _name_austrian_a3[] = {
 	"see",
 	"bach",
 	"dorf",
@@ -370,7 +370,7 @@ static const char * const _name_austrian_a3[] = {
 	"haag",
 };
 
-static const char * const _name_austrian_a4[] = {
+static const std::string_view _name_austrian_a4[] = {
 	"Bruck",
 	"Brunn",
 	"Gams",
@@ -385,12 +385,12 @@ static const char * const _name_austrian_a4[] = {
 	"Wald",
 };
 
-static const char * const _name_austrian_a5[] = {
+static const std::string_view _name_austrian_a5[] = {
 	"St. ",
 	"Sankt ",
 };
 
-static const char * const _name_austrian_a6[] = {
+static const std::string_view _name_austrian_a6[] = {
 	"Aegyd",
 	"Andr\u00e4",
 	"Georgen",
@@ -413,12 +413,12 @@ static const char * const _name_austrian_a6[] = {
 	"Wolfgang",
 };
 
-static const char * const _name_austrian_f1[] = {
+static const std::string_view _name_austrian_f1[] = {
 	" an der ",
 	" ob der ",
 };
 
-static const char * const _name_austrian_f2[] = {
+static const std::string_view _name_austrian_f2[] = {
 	"Donau",
 	"Steyr",
 	"Lafnitz",
@@ -434,11 +434,11 @@ static const char * const _name_austrian_f2[] = {
 	"Ill",
 };
 
-static const char * const _name_austrian_b1[] = {
+static const std::string_view _name_austrian_b1[] = {
 	" am ",
 };
 
-static const char * const _name_austrian_b2[] = {
+static const std::string_view _name_austrian_b2[] = {
 	"Brenner",
 	"Dachstein",
 	"Gebirge",
@@ -451,7 +451,7 @@ static const char * const _name_austrian_b2[] = {
 	"Ziller",
 };
 
-static const char * const _name_german_real[] = {
+static const std::string_view _name_german_real[] = {
 	"Berlin",
 	"Bonn",
 	"Bremen",
@@ -475,13 +475,13 @@ static const char * const _name_german_real[] = {
 	"Wiesbaden",
 };
 
-static const char * const _name_german_pre[] = {
+static const std::string_view _name_german_pre[] = {
 	"Bad ",
 	"Klein ",
 	"Neu ",
 };
 
-static const char * const _name_german_1[] = {
+static const std::string_view _name_german_1[] = {
 	"Alb",
 	"Als",
 	"Ander",
@@ -577,7 +577,7 @@ static const char * const _name_german_1[] = {
 	"W\u00fcrz",
 };
 
-static const char * const _name_german_2[] = {
+static const std::string_view _name_german_2[] = {
 	"bach",
 	"berg",
 	"br\u00fcck",
@@ -596,15 +596,15 @@ static const char * const _name_german_2[] = {
 	"wald",
 };
 
-static const char * const _name_german_3_an_der[] = {
+static const std::string_view _name_german_3_an_der[] = {
 	" an der ",
 };
 
-static const char * const _name_german_3_am[] = {
+static const std::string_view _name_german_3_am[] = {
 	" am ",
 };
 
-static const char * const _name_german_4_an_der[] = {
+static const std::string_view _name_german_4_an_der[] = {
 	"Oder",
 	"Spree",
 	"Donau",
@@ -612,11 +612,11 @@ static const char * const _name_german_4_an_der[] = {
 	"Elbe",
 };
 
-static const char * const _name_german_4_am[] = {
+static const std::string_view _name_german_4_am[] = {
 	"Main",
 };
 
-static const char * const _name_spanish_real[] = {
+static const std::string_view _name_spanish_real[] = {
 	"Caracas",
 	"Maracay",
 	"Maracaibo",
@@ -705,7 +705,7 @@ static const char * const _name_spanish_real[] = {
 	"Santa Rosa",
 };
 
-static const char * const _name_french_real[] = {
+static const std::string_view _name_french_real[] = {
 	"Agincourt",
 	"Lille",
 	"Dinan",
@@ -778,7 +778,7 @@ static const char * const _name_french_real[] = {
 	"Alen\u00e7on",
 };
 
-static const char * const _name_silly_1[] = {
+static const std::string_view _name_silly_1[] = {
 	"Binky",
 	"Blubber",
 	"Bumble",
@@ -869,7 +869,7 @@ static const char * const _name_silly_1[] = {
 	"Griddle",
 };
 
-static const char * const _name_silly_2[] = {
+static const std::string_view _name_silly_2[] = {
 	"ton",
 	"bury",
 	"bottom",
@@ -887,14 +887,14 @@ static const char * const _name_silly_2[] = {
 	"bridge",
 };
 
-static const char * const _name_swedish_1[] = {
+static const std::string_view _name_swedish_1[] = {
 	"Gamla ",
 	"Lilla ",
 	"Nya ",
 	"Stora ",
 };
 
-static const char * const _name_swedish_2[] = {
+static const std::string_view _name_swedish_2[] = {
 	"Boll",
 	"Bor",
 	"Ed",
@@ -935,7 +935,7 @@ static const char * const _name_swedish_2[] = {
 	"\u00d6ster",
 };
 
-static const char * const _name_swedish_2a[] = {
+static const std::string_view _name_swedish_2a[] = {
 	"B",
 	"Br",
 	"D",
@@ -980,7 +980,7 @@ static const char * const _name_swedish_2a[] = {
 	"Vr",
 };
 
-static const char * const _name_swedish_2b[] = {
+static const std::string_view _name_swedish_2b[] = {
 	"a",
 	"e",
 	"i",
@@ -992,7 +992,7 @@ static const char * const _name_swedish_2b[] = {
 	"\u00f6",
 };
 
-static const char * const _name_swedish_2c[] = {
+static const std::string_view _name_swedish_2c[] = {
 	"ck",
 	"d",
 	"dd",
@@ -1021,7 +1021,7 @@ static const char * const _name_swedish_2c[] = {
 	"v",
 };
 
-static const char * const _name_swedish_3[] = {
+static const std::string_view _name_swedish_3[] = {
 	"arp",
 	"berg",
 	"boda",
@@ -1056,7 +1056,7 @@ static const char * const _name_swedish_3[] = {
 	"\u00e5s",
 };
 
-static const char * const _name_dutch_1[] = {
+static const std::string_view _name_dutch_1[] = {
 	"Nieuw ",
 	"Oud ",
 	"Groot ",
@@ -1067,7 +1067,7 @@ static const char * const _name_dutch_1[] = {
 	"Klein ",
 };
 
-static const char * const _name_dutch_2[] = {
+static const std::string_view _name_dutch_2[] = {
 	"Hoog",
 	"Laag",
 	"Zuider",
@@ -1123,7 +1123,7 @@ static const char * const _name_dutch_2[] = {
 	"Hil",
 };
 
-static const char * const _name_dutch_3[] = {
+static const std::string_view _name_dutch_3[] = {
 	"Drog",
 	"Nat",
 	"Valk",
@@ -1146,7 +1146,7 @@ static const char * const _name_dutch_3[] = {
 	"Koning",
 };
 
-static const char * const _name_dutch_4[] = {
+static const std::string_view _name_dutch_4[] = {
 	"e",
 	"er",
 	"el",
@@ -1155,7 +1155,7 @@ static const char * const _name_dutch_4[] = {
 	"s",
 };
 
-static const char * const _name_dutch_5[] = {
+static const std::string_view _name_dutch_5[] = {
 	"stad",
 	"vorst",
 	"dorp",
@@ -1214,7 +1214,7 @@ static const char * const _name_dutch_5[] = {
 	"end",
 };
 
-static const char * const _name_finnish_real[] = {
+static const std::string_view _name_finnish_real[] = {
 	"Aijala",
 	"Kisko",
 	"Espoo",
@@ -1248,7 +1248,7 @@ static const char * const _name_finnish_real[] = {
 	"Lieksa",
 };
 
-static const char * const _name_finnish_1[] = {
+static const std::string_view _name_finnish_1[] = {
 	"Hiekka",
 	"Haapa",
 	"Mylly",
@@ -1278,7 +1278,7 @@ static const char * const _name_finnish_1[] = {
 	"Niini",
 };
 
-static const char * const _name_finnish_2[] = {
+static const std::string_view _name_finnish_2[] = {
 	"Lappeen",
 	"Lohjan",
 	"Savon",
@@ -1292,7 +1292,7 @@ static const char * const _name_finnish_2[] = {
 	"Kangas",
 };
 
-static const char * const _name_finnish_3[] = {
+static const std::string_view _name_finnish_3[] = {
 	"harju",
 	"linna",
 	"j\u00e4rvi",
@@ -1314,7 +1314,7 @@ static const char * const _name_finnish_3[] = {
 	"salo",
 };
 
-static const char * const _name_polish_1_m[] = {
+static const std::string_view _name_polish_1_m[] = {
 	"Wielki ",
 	"Ma\u0142y ",
 	"Z\u0142y ",
@@ -1328,7 +1328,7 @@ static const char * const _name_polish_1_m[] = {
 	"D\u0119bowy ",
 };
 
-static const char * const _name_polish_1_f[] = {
+static const std::string_view _name_polish_1_f[] = {
 	"Wielka ",
 	"Ma\u0142a ",
 	"Z\u0142a ",
@@ -1342,7 +1342,7 @@ static const char * const _name_polish_1_f[] = {
 	"D\u0119bowa ",
 };
 
-static const char * const _name_polish_1_n[] = {
+static const std::string_view _name_polish_1_n[] = {
 	"Wielkie ",
 	"Ma\u0142e ",
 	"Z\u0142e ",
@@ -1356,7 +1356,7 @@ static const char * const _name_polish_1_n[] = {
 	"D\u0119bowe ",
 };
 
-static const char * const _name_polish_2_o[] = {
+static const std::string_view _name_polish_2_o[] = {
 	"Frombork",
 	"Gniezno",
 	"Olsztyn",
@@ -1393,7 +1393,7 @@ static const char * const _name_polish_2_o[] = {
 	"Wolsztyn",
 };
 
-static const char * const _name_polish_2_m[] = {
+static const std::string_view _name_polish_2_m[] = {
 	"Jarocin",
 	"Gogolin",
 	"Tomasz\u00f3w",
@@ -1444,7 +1444,7 @@ static const char * const _name_polish_2_m[] = {
 	"Garwolin",
 };
 
-static const char * const _name_polish_2_f[] = {
+static const std::string_view _name_polish_2_f[] = {
 	"Szprotawa",
 	"Pogorzelica",
 	"Mot\u0142awa",
@@ -1475,7 +1475,7 @@ static const char * const _name_polish_2_f[] = {
 	"Pilawa",
 };
 
-static const char * const _name_polish_2_n[] = {
+static const std::string_view _name_polish_2_n[] = {
 	"Lipsko",
 	"Pilzno",
 	"Przodkowo",
@@ -1508,7 +1508,7 @@ static const char * const _name_polish_2_n[] = {
 	"Opoczno",
 };
 
-static const char * const _name_polish_3_m[] = {
+static const std::string_view _name_polish_3_m[] = {
 	" Wybudowanie",
 	" \u015awi\u0119tokrzyski",
 	" G\u00f3rski",
@@ -1540,7 +1540,7 @@ static const char * const _name_polish_3_m[] = {
 	" Lesny",
 };
 
-static const char * const _name_polish_3_f[] = {
+static const std::string_view _name_polish_3_f[] = {
 	" Wybudowanie",
 	" \u015awi\u0119tokrzyska",
 	" G\u00f3rska",
@@ -1572,7 +1572,7 @@ static const char * const _name_polish_3_f[] = {
 	" Le\u015bna",
 };
 
-static const char * const _name_polish_3_n[] = {
+static const std::string_view _name_polish_3_n[] = {
 	" Wybudowanie",
 	" \u015awietokrzyskie",
 	" G\u00f3rskie",
@@ -1604,7 +1604,7 @@ static const char * const _name_polish_3_n[] = {
 	" Le\u015bne",
 };
 
-static const char * const _name_czech_real[] = {
+static const std::string_view _name_czech_real[] = {
 	"A\u0161",
 	"Bene\u0161ov",
 	"Beroun",
@@ -1716,7 +1716,7 @@ enum CzechPattern : uint8_t {
 };
 
 /* [CzechGender][CzechPattern] - suffixes for adjectives */
-static const char * const _name_czech_patmod[][3] = {
+static const std::string_view _name_czech_patmod[][3] = {
 	/* CZG_SMASC */ { "\u00ed", "\u00fd", "uv" },
 	/* CZG_SFEM */  { "\u00ed", "\u00e1", "ova" },
 	/* CZG_SNEUT */ { "\u00ed", "\u00e9", "ovo" },
@@ -1727,37 +1727,38 @@ static const char * const _name_czech_patmod[][3] = {
 
 /* This way the substantive can choose only some adjectives/endings:
  * At least one of these flags must be satisfied: */
-enum CzechAllow : uint8_t {
-	CZA_SHORT = 1,
-	CZA_MIDDLE = 2,
-	CZA_LONG = 4,
-	CZA_ALL = CZA_SHORT | CZA_MIDDLE | CZA_LONG,
+enum class CzechAllowFlag : uint8_t {
+	Short,
+	Middle,
+	Long,
 };
 
-DECLARE_ENUM_AS_BIT_SET(CzechAllow)
+using CzechAllowFlags = EnumBitSet<CzechAllowFlag, uint8_t>;
+
+static constexpr CzechAllowFlags CZA_ALL = {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long};
 
 /* All these flags must be satisfied (in the stem->others direction): */
-enum CzechChoose : uint8_t {
-	CZC_NONE = 0, // No requirements.
-	CZC_COLOR = 1,
-	CZC_POSTFIX = 2, // Matched if postfix was inserted.
-	CZC_NOPOSTFIX = 4, // Matched if no postfix was inserted.
-	CZC_ANY = CZC_COLOR | CZC_POSTFIX | CZC_NOPOSTFIX,
+enum class CzechChooseFlag : uint8_t {
+	Colour,
+	Postfix, // Matched if postfix was inserted.
+	NoPostfix, // Matched if no postfix was inserted.
 };
 
-DECLARE_ENUM_AS_BIT_SET(CzechChoose)
+using CzechChooseFlags = EnumBitSet<CzechChooseFlag, uint8_t>;
+
+static constexpr CzechChooseFlags CZC_ANY = {CzechChooseFlag::Colour, CzechChooseFlag::Postfix, CzechChooseFlag::NoPostfix};
 
 struct CzechNameSubst {
 	CzechGender gender;
-	CzechAllow allow;
-	CzechChoose choose;
-	const char *name;
+	CzechAllowFlags allow;
+	CzechChooseFlags choose;
+	std::string_view name;
 };
 
 struct CzechNameAdj {
 	CzechPattern pattern;
-	CzechChoose choose;
-	const char *name;
+	CzechChooseFlags choose;
+	std::string_view name;
 };
 
 /* Some of items which should be common are doubled. */
@@ -1791,18 +1792,18 @@ static const CzechNameAdj _name_czech_adj[] = {
 	{ CZP_MLADY, CZC_ANY, "Kamenn" },
 	{ CZP_MLADY, CZC_ANY, "Cihlov" },
 	{ CZP_MLADY, CZC_ANY, "Divn" },
-	{ CZP_MLADY, CZC_COLOR, "\u010cerven" },
-	{ CZP_MLADY, CZC_COLOR, "\u010cerven" },
-	{ CZP_MLADY, CZC_COLOR, "\u010cerven" },
-	{ CZP_MLADY, CZC_COLOR, "Zelen" },
-	{ CZP_MLADY, CZC_COLOR, "\u017dlut" },
-	{ CZP_MLADY, CZC_COLOR, "Siv" },
-	{ CZP_MLADY, CZC_COLOR, "\u0160ed" },
-	{ CZP_MLADY, CZC_COLOR, "B\u00edl" },
-	{ CZP_MLADY, CZC_COLOR, "B\u00edl" },
-	{ CZP_MLADY, CZC_COLOR, "Modr" },
-	{ CZP_MLADY, CZC_COLOR, "R\u016f\u017eov" },
-	{ CZP_MLADY, CZC_COLOR, "\u010cern" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "\u010cerven" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "\u010cerven" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "\u010cerven" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "Zelen" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "\u017dlut" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "Siv" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "\u0160ed" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "B\u00edl" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "B\u00edl" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "Modr" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "R\u016f\u017eov" },
+	{ CZP_MLADY, CzechChooseFlag::Colour, "\u010cern" },
 	{ CZP_PRIVL, CZC_ANY, "Kr\u00e1l" },
 	{ CZP_PRIVL, CZC_ANY, "Jan" },
 	{ CZP_PRIVL, CZC_ANY, "Karl" },
@@ -1814,72 +1815,72 @@ static const CzechNameAdj _name_czech_adj[] = {
 
 /* Considered a stem for choose/allow matching purposes. */
 static const CzechNameSubst _name_czech_subst_full[] = {
-	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Sedlec" },
-	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
-	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
-	{ CZG_SMASC, CZA_ALL, CZC_NONE, "\u00daval" },
-	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "\u017d\u010f\u00e1r" },
-	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Smrk" },
-	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Hora" },
-	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Lhota" },
-	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Lhota" },
-	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "Hlava" },
-	{ CZG_SFEM,  CZA_ALL, CZC_COLOR, "L\u00edpa" },
-	{ CZG_SNEUT, CZA_ALL, CZC_COLOR, "Pole" },
-	{ CZG_SNEUT, CZA_ALL, CZC_COLOR, "\u00dadol\u00ed" },
-	{ CZG_PMASC, CZA_ALL, CZC_NONE, "\u00davaly" },
-	{ CZG_PFEM,  CZA_ALL, CZC_COLOR, "Luka" },
-	{ CZG_PNEUT, CZA_ALL, CZC_COLOR, "Pole" },
+	{ CZG_SMASC, CZA_ALL, CzechChooseFlag::Colour, "Sedlec" },
+	{ CZG_SMASC, CZA_ALL, CzechChooseFlag::Colour, "Brod" },
+	{ CZG_SMASC, CZA_ALL, CzechChooseFlag::Colour, "Brod" },
+	{ CZG_SMASC, CZA_ALL, {}, "\u00daval" },
+	{ CZG_SMASC, CZA_ALL, CzechChooseFlag::Colour, "\u017d\u010f\u00e1r" },
+	{ CZG_SMASC, CZA_ALL, CzechChooseFlag::Colour, "Smrk" },
+	{ CZG_SFEM,  CZA_ALL, CzechChooseFlag::Colour, "Hora" },
+	{ CZG_SFEM,  CZA_ALL, CzechChooseFlag::Colour, "Lhota" },
+	{ CZG_SFEM,  CZA_ALL, CzechChooseFlag::Colour, "Lhota" },
+	{ CZG_SFEM,  CZA_ALL, CzechChooseFlag::Colour, "Hlava" },
+	{ CZG_SFEM,  CZA_ALL, CzechChooseFlag::Colour, "L\u00edpa" },
+	{ CZG_SNEUT, CZA_ALL, CzechChooseFlag::Colour, "Pole" },
+	{ CZG_SNEUT, CZA_ALL, CzechChooseFlag::Colour, "\u00dadol\u00ed" },
+	{ CZG_PMASC, CZA_ALL, {}, "\u00davaly" },
+	{ CZG_PFEM,  CZA_ALL, CzechChooseFlag::Colour, "Luka" },
+	{ CZG_PNEUT, CZA_ALL, CzechChooseFlag::Colour, "Pole" },
 };
 
 /* TODO: More stems needed. --pasky */
 static const CzechNameSubst _name_czech_subst_stem[] = {
-	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Kostel" },
-	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Kl\u00e1\u0161ter" },
-	{ CZG_SMASC, CZA_SHORT,                         CZC_COLOR, "Lhot" },
-	{ CZG_SFEM,  CZA_SHORT,                         CZC_COLOR, "Lhot" },
-	{ CZG_SFEM,  CZA_SHORT,                         CZC_COLOR, "Hur" },
-	{ CZG_FREE,              CZA_MIDDLE | CZA_LONG, CZC_NONE, "Sedl" },
-	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_COLOR, "Hrad" },
-	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Pras" },
-	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Ba\u017e" },
-	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "Tes" },
-	{ CZG_NFREE,             CZA_MIDDLE,            CZC_NONE, "U\u017e" },
-	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_POSTFIX, "B\u0159" },
-	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_NONE, "Vod" },
-	{ CZG_NFREE,             CZA_MIDDLE | CZA_LONG, CZC_NONE, "Jan" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Prach" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Kunr" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Strak" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "V\u00edt" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Vy\u0161" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "\u017dat" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "\u017der" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "St\u0159ed" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Harv" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Pruh" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Tach" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "P\u00edsn" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Jin" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Jes" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Jar" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Sok" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Hod" },
-	{ CZG_NFREE,                          CZA_LONG, CZC_NONE, "Net" },
-	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Pra\u017e" },
-	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Nerat" },
-	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Kral" },
-	{ CZG_FREE,                           CZA_LONG, CZC_NONE, "Hut" },
-	{ CZG_FREE,                           CZA_LONG, CZC_NOPOSTFIX, "Pan" },
-	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_NOPOSTFIX, "Odst\u0159ed" },
-	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_COLOR, "Mrat" },
-	{ CZG_FREE,                           CZA_LONG, CZC_COLOR, "Hlav" },
-	{ CZG_FREE,  CZA_SHORT | CZA_MIDDLE,            CZC_NONE, "M\u011b\u0159" },
-	{ CZG_FREE,              CZA_MIDDLE | CZA_LONG, CZC_NONE, "Lip" },
+	{ CZG_SMASC, {                       CzechAllowFlag::Middle                      }, CzechChooseFlag::Colour, "Kostel" },
+	{ CZG_SMASC, {                       CzechAllowFlag::Middle                      }, CzechChooseFlag::Colour, "Kl\u00e1\u0161ter" },
+	{ CZG_SMASC, {CzechAllowFlag::Short                                              }, CzechChooseFlag::Colour, "Lhot" },
+	{ CZG_SFEM,  {CzechAllowFlag::Short                                              }, CzechChooseFlag::Colour, "Lhot" },
+	{ CZG_SFEM,  {CzechAllowFlag::Short                                              }, CzechChooseFlag::Colour, "Hur" },
+	{ CZG_FREE,  {                       CzechAllowFlag::Middle, CzechAllowFlag::Long}, {}, "Sedl" },
+	{ CZG_FREE,  {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long}, CzechChooseFlag::Colour, "Hrad" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle                      }, {}, "Pras" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle                      }, {}, "Ba\u017e" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle                      }, {}, "Tes" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle                      }, {}, "U\u017e" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle, CzechAllowFlag::Long}, CzechChooseFlag::Postfix, "B\u0159" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle, CzechAllowFlag::Long}, {}, "Vod" },
+	{ CZG_NFREE, {                       CzechAllowFlag::Middle, CzechAllowFlag::Long}, {}, "Jan" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Prach" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Kunr" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Strak" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "V\u00edt" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Vy\u0161" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "\u017dat" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "\u017der" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "St\u0159ed" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Harv" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Pruh" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Tach" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "P\u00edsn" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Jin" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Jes" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Jar" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Sok" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Hod" },
+	{ CZG_NFREE, {                                               CzechAllowFlag::Long}, {}, "Net" },
+	{ CZG_FREE,  {                                               CzechAllowFlag::Long}, {}, "Pra\u017e" },
+	{ CZG_FREE,  {                                               CzechAllowFlag::Long}, {}, "Nerat" },
+	{ CZG_FREE,  {                                               CzechAllowFlag::Long}, {}, "Kral" },
+	{ CZG_FREE,  {                                               CzechAllowFlag::Long}, {}, "Hut" },
+	{ CZG_FREE,  {                                               CzechAllowFlag::Long}, CzechChooseFlag::NoPostfix, "Pan" },
+	{ CZG_FREE,  {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long}, CzechChooseFlag::NoPostfix, "Odst\u0159ed" },
+	{ CZG_FREE,  {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long}, CzechChooseFlag::Colour, "Mrat" },
+	{ CZG_FREE,  {                                               CzechAllowFlag::Long}, CzechChooseFlag::Colour, "Hlav" },
+	{ CZG_FREE,  {CzechAllowFlag::Short, CzechAllowFlag::Middle                      }, {}, "M\u011b\u0159" },
+	{ CZG_FREE,  {                       CzechAllowFlag::Middle, CzechAllowFlag::Long}, {}, "Lip" },
 };
 
 /* Optional postfix inserted between stem and ending. */
-static const char * const _name_czech_subst_postfix[] = {
+static const std::string_view _name_czech_subst_postfix[] = {
 	"av", "an", "at",
 	"ov", "on", "ot",
 	"ev", "en", "et",
@@ -1887,29 +1888,29 @@ static const char * const _name_czech_subst_postfix[] = {
 
 /* This array must have the both neutral genders at the end! */
 static const CzechNameSubst _name_czech_subst_ending[] = {
-	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "ec" },
-	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "\u00edn" },
-	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "ov" },
-	{ CZG_SMASC, CZA_SHORT       |        CZA_LONG, CZC_ANY, "kov" },
-	{ CZG_SMASC,                          CZA_LONG, CZC_POSTFIX, "\u00edn" },
-	{ CZG_SMASC,                          CZA_LONG, CZC_POSTFIX, "n\u00edk" },
-	{ CZG_SMASC,                          CZA_LONG, CZC_ANY, "burk" },
-	{ CZG_SFEM,  CZA_SHORT,                         CZC_ANY, "ka" },
-	{ CZG_SFEM,              CZA_MIDDLE,            CZC_ANY, "inka" },
-	{ CZG_SFEM,              CZA_MIDDLE,            CZC_ANY, "n\u00e1" },
-	{ CZG_SFEM,                           CZA_LONG, CZC_ANY, "ava" },
-	{ CZG_PMASC,                          CZA_LONG, CZC_POSTFIX, "\u00edky" },
-	{ CZG_PMASC,                          CZA_LONG, CZC_ANY, "upy" },
-	{ CZG_PMASC,                          CZA_LONG, CZC_ANY, "olupy" },
-	{ CZG_PFEM,                           CZA_LONG, CZC_ANY, "avy" },
-	{ CZG_PFEM,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "ice" },
-	{ CZG_PFEM,  CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "i\u010dky" },
-	{ CZG_PNEUT, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "na" },
-	{ CZG_SNEUT, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "no" },
-	{ CZG_SNEUT,                          CZA_LONG, CZC_ANY, "i\u0161t\u011b" },
+	{ CZG_SMASC, {CzechAllowFlag::Short, CzechAllowFlag::Middle                      }, CZC_ANY, "ec" },
+	{ CZG_SMASC, {CzechAllowFlag::Short, CzechAllowFlag::Middle                      }, CZC_ANY, "\u00edn" },
+	{ CZG_SMASC, {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long}, CZC_ANY, "ov" },
+	{ CZG_SMASC, {CzechAllowFlag::Short,                         CzechAllowFlag::Long}, CZC_ANY, "kov" },
+	{ CZG_SMASC, {                                               CzechAllowFlag::Long}, CzechChooseFlag::Postfix, "\u00edn" },
+	{ CZG_SMASC, {                                               CzechAllowFlag::Long}, CzechChooseFlag::Postfix, "n\u00edk" },
+	{ CZG_SMASC, {                                               CzechAllowFlag::Long}, CZC_ANY, "burk" },
+	{ CZG_SFEM,  {CzechAllowFlag::Short                                              }, CZC_ANY, "ka" },
+	{ CZG_SFEM,  {                       CzechAllowFlag::Middle                      }, CZC_ANY, "inka" },
+	{ CZG_SFEM,  {                       CzechAllowFlag::Middle                      }, CZC_ANY, "n\u00e1" },
+	{ CZG_SFEM,  {                                               CzechAllowFlag::Long}, CZC_ANY, "ava" },
+	{ CZG_PMASC, {                                               CzechAllowFlag::Long}, CzechChooseFlag::Postfix, "\u00edky" },
+	{ CZG_PMASC, {                                               CzechAllowFlag::Long}, CZC_ANY, "upy" },
+	{ CZG_PMASC, {                                               CzechAllowFlag::Long}, CZC_ANY, "olupy" },
+	{ CZG_PFEM,  {                                               CzechAllowFlag::Long}, CZC_ANY, "avy" },
+	{ CZG_PFEM,  {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long}, CZC_ANY, "ice" },
+	{ CZG_PFEM,  {CzechAllowFlag::Short, CzechAllowFlag::Middle, CzechAllowFlag::Long}, CZC_ANY, "i\u010dky" },
+	{ CZG_PNEUT, {CzechAllowFlag::Short, CzechAllowFlag::Middle                      }, CZC_ANY, "na" },
+	{ CZG_SNEUT, {CzechAllowFlag::Short, CzechAllowFlag::Middle                      }, CZC_ANY, "no" },
+	{ CZG_SNEUT, {                                               CzechAllowFlag::Long}, CZC_ANY, "i\u0161t\u011b" },
 };
 
-static const char * const _name_czech_suffix[] = {
+static const std::string_view _name_czech_suffix[] = {
 	"nad Cidlinou",
 	"nad Dyj\u00ed",
 	"nad Jihlavou",
@@ -1933,7 +1934,7 @@ static const char * const _name_czech_suffix[] = {
 
 
 
-static const char * const _name_romanian_real[] = {
+static const std::string_view _name_romanian_real[] = {
 	"Adjud",
 	"Alba Iulia",
 	"Alexandria",
@@ -2030,7 +2031,7 @@ static const char * const _name_romanian_real[] = {
 	"Zal\u0103u",
 };
 
-static const char * const _name_slovak_real[] = {
+static const std::string_view _name_slovak_real[] = {
 	"Bratislava",
 	"B\u00e1novce nad Bebravou",
 	"Bansk\u00e1 Bystrica",
@@ -2120,7 +2121,7 @@ static const char * const _name_slovak_real[] = {
 	"Zvolen",
 };
 
-static const char * const _name_norwegian_1[] = {
+static const std::string_view _name_norwegian_1[] = {
 	"Arna",
 	"Aust",
 	"Bj\u00f8rk",
@@ -2207,7 +2208,7 @@ static const char * const _name_norwegian_1[] = {
 	"V\u00e5g",
 };
 
-static const char * const _name_norwegian_2[] = {
+static const std::string_view _name_norwegian_2[] = {
 	"aker",
 	"anger",
 	"bakken",
@@ -2277,7 +2278,7 @@ static const char * const _name_norwegian_2[] = {
 	"\u00e5sen",
 };
 
-static const char * const _name_norwegian_real[] = {
+static const std::string_view _name_norwegian_real[] = {
 	"Alta",
 	"Arendal",
 	"Askim",
@@ -2374,7 +2375,7 @@ static const char * const _name_norwegian_real[] = {
 	"\u00c5ndalsnes",
 };
 
-static const char * const _name_hungarian_1[] = {
+static const std::string_view _name_hungarian_1[] = {
 	"Nagy-",
 	"Kis-",
 	"Fels\u0151-",
@@ -2382,7 +2383,7 @@ static const char * const _name_hungarian_1[] = {
 	"\u00daj-",
 };
 
-static const char * const _name_hungarian_2[] = {
+static const std::string_view _name_hungarian_2[] = {
 	"Bodrog",
 	"Dr\u00e1va",
 	"Duna",
@@ -2439,7 +2440,7 @@ static const char * const _name_hungarian_2[] = {
 	"V\u00e1s\u00e1ros",
 };
 
-static const char * const _name_hungarian_3[] = {
+static const std::string_view _name_hungarian_3[] = {
 	"ap\u00e1ti",
 	"b\u00e1ba",
 	"bikk",
@@ -2458,7 +2459,7 @@ static const char * const _name_hungarian_3[] = {
 	"v\u00f6lgy",
 };
 
-static const char * const _name_hungarian_4[] = {
+static const std::string_view _name_hungarian_4[] = {
 	"alja",
 	"egyh\u00e1za",
 	"h\u00e1za",
@@ -2466,7 +2467,7 @@ static const char * const _name_hungarian_4[] = {
 	"v\u00e1r",
 };
 
-static const char * const _name_hungarian_real[] = {
+static const std::string_view _name_hungarian_real[] = {
 	"Ajka",
 	"Asz\u00f3d",
 	"Badacsony",
@@ -2505,7 +2506,7 @@ static const char * const _name_hungarian_real[] = {
 	"Zirc",
 };
 
-static const char * const _name_swiss_real[] = {
+static const std::string_view _name_swiss_real[] = {
 	"Aarau",
 	"Aesch",
 	"Altdorf",
@@ -2631,7 +2632,7 @@ static const char * const _name_swiss_real[] = {
 	"Zug",
 };
 
-static const char * const _name_danish_1[] = {
+static const std::string_view _name_danish_1[] = {
 	"Gamle ",
 	"Lille ",
 	"Nye ",
@@ -2646,7 +2647,7 @@ static const char * const _name_danish_1[] = {
 	"Kongens ",
 };
 
-static const char * const _name_danish_2[] = {
+static const std::string_view _name_danish_2[] = {
 	"Ager",
 	"Alle",
 	"Aske",
@@ -2730,7 +2731,7 @@ static const char * const _name_danish_2[] = {
 	"\u00c5l",
 };
 
-static const char * const _name_danish_3[] = {
+static const std::string_view _name_danish_3[] = {
 	"basse",
 	"borg",
 	"berg",
@@ -2763,7 +2764,7 @@ static const char * const _name_danish_3[] = {
 	"skov",
 };
 
-static const char * const _name_turkish_prefix[] = {
+static const std::string_view _name_turkish_prefix[] = {
 	"Ak\u00e7a",
 	"Alt\u0131n",
 	"Bah\u00e7e",
@@ -2782,7 +2783,7 @@ static const char * const _name_turkish_prefix[] = {
 	"Yeni",
 };
 
-static const char * const _name_turkish_middle[] = {
+static const std::string_view _name_turkish_middle[] = {
 	"aga\u00e7",
 	"ayva",
 	"\u00e7am",
@@ -2792,7 +2793,7 @@ static const char * const _name_turkish_middle[] = {
 	"yal\u0131",
 };
 
-static const char * const _name_turkish_suffix[] = {
+static const std::string_view _name_turkish_suffix[] = {
 	"dere",
 	"hisar",
 	"kale",
@@ -2809,7 +2810,7 @@ static const char * const _name_turkish_suffix[] = {
 	"yurt",
 };
 
-static const char * const _name_turkish_real[] = {
+static const std::string_view _name_turkish_real[] = {
 	"Adana",
 	"Ad\u0131yaman",
 	"Afyon",
@@ -2877,7 +2878,7 @@ static const char * const _name_turkish_real[] = {
 	"D\u00fczce",
 };
 
-static const char * const _name_italian_real[] = {
+static const std::string_view _name_italian_real[] = {
 	"Roma",
 	"Milano",
 	"Napoli",
@@ -2958,7 +2959,7 @@ static const char * const _name_italian_real[] = {
 	"Grosseto",
 };
 
-static const char * const _name_italian_pref[] = {
+static const std::string_view _name_italian_pref[] = {
 	"Alpe ",
 	"Borgo ",
 	"Cascina ",
@@ -2973,7 +2974,7 @@ static const char * const _name_italian_pref[] = {
 	"Villar ",
 };
 
-static const char * const _name_italian_1m[] = {
+static const std::string_view _name_italian_1m[] = {
 	"Bel",
 	"Borgo",
 	"Bosco",
@@ -3001,7 +3002,7 @@ static const char * const _name_italian_1m[] = {
 	"Vico",
 };
 
-static const char * const _name_italian_1f[] = {
+static const std::string_view _name_italian_1f[] = {
 	"Acqua",
 	"Bra",
 	"Cala",
@@ -3027,7 +3028,7 @@ static const char * const _name_italian_1f[] = {
 	"Villa",
 };
 
-static const char * const _name_italian_2[] = {
+static const std::string_view _name_italian_2[] = {
 	"bell",
 	"bianc",
 	"cald",
@@ -3057,7 +3058,7 @@ static const char * const _name_italian_2[] = {
 	"viv",
 };
 
-static const char * const _name_italian_2i[] = {
+static const std::string_view _name_italian_2i[] = {
 	"",
 	"breve",
 	"brevi",
@@ -3084,7 +3085,7 @@ static const char * const _name_italian_2i[] = {
 };
 
 
-static const char * const _name_italian_3[] = {
+static const std::string_view _name_italian_3[] = {
 	" Marittimo",
 	" Marittima",
 	" del Capo",
@@ -3108,14 +3109,14 @@ static const char * const _name_italian_3[] = {
 	" Ticino",
 };
 
-static const char * const _name_italian_river1[] = {
+static const std::string_view _name_italian_river1[] = {
 	" del",
 	" sul",
 	" al",
 	" nel",
 };
 
-static const char * const _name_italian_river2[] = {
+static const std::string_view _name_italian_river2[] = {
 	"l'Adda",
 	"l'Adige",
 	"le Alpi",
@@ -3143,7 +3144,7 @@ static const char * const _name_italian_river2[] = {
 	" Tevere",
 };
 
-static const char * const _name_catalan_real[] = {
+static const std::string_view _name_catalan_real[] = {
 	"Barcelona",
 	"L'Hospitalet de Llobregat",
 	"Cerdanyola",
@@ -3213,7 +3214,7 @@ static const char * const _name_catalan_real[] = {
 	"Roses",
 };
 
-static const char * const _name_catalan_pref[] = {
+static const std::string_view _name_catalan_pref[] = {
 	"El Pont de ",
 	"Parets de ",
 	"Canet de ",
@@ -3248,7 +3249,7 @@ static const char * const _name_catalan_pref[] = {
 
 };
 
-static const char * const _name_catalan_1m[] = {
+static const std::string_view _name_catalan_1m[] = {
 	"Torrent",
 	"Cami",
 	"Mont",
@@ -3257,7 +3258,7 @@ static const char * const _name_catalan_1m[] = {
 	"Riu",
 };
 
-static const char * const _name_catalan_1f[] = {
+static const std::string_view _name_catalan_1f[] = {
 	"Pala",
 	"Selva",
 	"Vall",
@@ -3268,7 +3269,7 @@ static const char * const _name_catalan_1f[] = {
 	"Terra",
 };
 
-static const char * const _name_catalan_2m[] = {
+static const std::string_view _name_catalan_2m[] = {
 	"alt",
 	"baix",
 	"fosc",
@@ -3279,7 +3280,7 @@ static const char * const _name_catalan_2m[] = {
 	"gr\u00eds",
 };
 
-static const char * const _name_catalan_2f[] = {
+static const std::string_view _name_catalan_2f[] = {
 	"baixa",
 	"alta",
 	"fosca",
@@ -3290,7 +3291,7 @@ static const char * const _name_catalan_2f[] = {
 	"freda",
 };
 
-static const char * const _name_catalan_3[] = {
+static const std::string_view _name_catalan_3[] = {
 	" Desp\u00ed",
 	" Desvern",
 	" del Cam\u00ed",
@@ -3303,7 +3304,7 @@ static const char * const _name_catalan_3[] = {
 	" de la Plana",
 };
 
-static const char * const _name_catalan_river1[] = {
+static const std::string_view _name_catalan_river1[] = {
 	" d'Anoia",
 	" de Ter",
 	" de Llobregat",
diff --git a/src/tar_type.h b/src/tar_type.h
index 69f8f04c4a..992cb04448 100644
--- a/src/tar_type.h
+++ b/src/tar_type.h
@@ -19,8 +19,8 @@ struct TarFileListEntry {
 	size_t position;
 };
 
-typedef std::map<std::string, std::string> TarList; ///< Map of tar file to tar directory.
-typedef std::map<std::string, TarFileListEntry> TarFileList;
+using TarList = std::map<std::string, std::string, std::less<>>; ///< Map of tar file to tar directory.
+using TarFileList = std::map<std::string, TarFileListEntry, std::less<>> ;
 extern std::array<TarList, NUM_SUBDIRS> _tar_list;
 extern TarFileList _tar_filelist[NUM_SUBDIRS];
 
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 203a995b21..346b728cc6 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -323,25 +323,25 @@ static constexpr NWidgetPart _nested_terraform_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_LOWER_LAND), SetMinimalSize(22, 22),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_LOWER_LAND), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_TERRAFORM_DOWN, STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_RAISE_LAND), SetMinimalSize(22, 22),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_RAISE_LAND), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_TERRAFORM_UP, STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_LEVEL_LAND), SetMinimalSize(22, 22),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_LEVEL_LAND), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_LEVEL_LAND, STR_LANDSCAPING_LEVEL_LAND_TOOLTIP),
 
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(4, 22), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), EndContainer(),
 
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_DEMOLISH), SetMinimalSize(22, 22),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_DEMOLISH), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BUY_LAND), SetMinimalSize(22, 22),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BUY_LAND), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_BUY_LAND, STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND),
-		NWidget(WWT_PUSHIMGBTN, COLOUR_DARK_GREEN, WID_TT_PLANT_TREES), SetMinimalSize(22, 22),
+		NWidget(WWT_PUSHIMGBTN, COLOUR_DARK_GREEN, WID_TT_PLANT_TREES), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_PLANTTREES, STR_SCENEDIT_TOOLBAR_PLANT_TREES_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_PLACE_SIGN), SetMinimalSize(22, 22),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_PLACE_SIGN), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_SIGN, STR_SCENEDIT_TOOLBAR_PLACE_SIGN_TOOLTIP),
 		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_TT_SHOW_PLACE_OBJECT),
-			NWidget(WWT_PUSHIMGBTN, COLOUR_DARK_GREEN, WID_TT_PLACE_OBJECT), SetMinimalSize(22, 22),
+			NWidget(WWT_PUSHIMGBTN, COLOUR_DARK_GREEN, WID_TT_PLACE_OBJECT), SetToolbarMinimalSize(1),
 								SetFill(0, 1), SetSpriteTip(SPR_IMG_TRANSMITTER, STR_SCENEDIT_TOOLBAR_PLACE_OBJECT_TOOLTIP),
 		EndContainer(),
 	EndContainer(),
@@ -455,21 +455,21 @@ static constexpr NWidgetPart _nested_scen_edit_land_gen_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_DARK_GREEN),
 		NWidget(NWID_HORIZONTAL), SetPadding(2, 2, 7, 2),
 			NWidget(NWID_SPACER), SetFill(1, 0),
-			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_DEMOLISH), SetMinimalSize(22, 22),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_DEMOLISH), SetToolbarMinimalSize(1),
 										SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_LOWER_LAND), SetMinimalSize(22, 22),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_LOWER_LAND), SetToolbarMinimalSize(1),
 										SetFill(0, 1), SetSpriteTip(SPR_IMG_TERRAFORM_DOWN, STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND),
-			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_RAISE_LAND), SetMinimalSize(22, 22),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_RAISE_LAND), SetToolbarMinimalSize(1),
 										SetFill(0, 1), SetSpriteTip(SPR_IMG_TERRAFORM_UP, STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND),
-			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_LEVEL_LAND), SetMinimalSize(22, 22),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_LEVEL_LAND), SetToolbarMinimalSize(1),
 										SetFill(0, 1), SetSpriteTip(SPR_IMG_LEVEL_LAND, STR_LANDSCAPING_LEVEL_LAND_TOOLTIP),
-			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_PLACE_ROCKS), SetMinimalSize(22, 22),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_PLACE_ROCKS), SetToolbarMinimalSize(1),
 										SetFill(0, 1), SetSpriteTip(SPR_IMG_ROCKS, STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE),
 			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_ETT_SHOW_PLACE_DESERT),
-				NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_PLACE_DESERT), SetMinimalSize(22, 22),
+				NWidget(WWT_IMGBTN, COLOUR_GREY, WID_ETT_PLACE_DESERT), SetToolbarMinimalSize(1),
 											SetFill(0, 1), SetSpriteTip(SPR_IMG_DESERT, STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA),
 			EndContainer(),
-			NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_ETT_PLACE_OBJECT), SetMinimalSize(23, 22),
+			NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_ETT_PLACE_OBJECT), SetToolbarMinimalSize(1),
 										SetFill(0, 1), SetSpriteTip(SPR_IMG_TRANSMITTER, STR_SCENEDIT_TOOLBAR_PLACE_OBJECT_TOOLTIP),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 7bfc261e4c..c603eb99d3 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_test_files(
+    alternating_iterator.cpp
     bitmath_func.cpp
     enum_over_optimisation.cpp
+    flatset_type.cpp
     landscape_partial_pixel_z.cpp
     math_func.cpp
     mock_environment.h
@@ -8,10 +10,13 @@ add_test_files(
     mock_spritecache.cpp
     mock_spritecache.h
     string_builder.cpp
+    string_consumer.cpp
+    string_inplace.cpp
     string_func.cpp
     test_main.cpp
     test_network_crypto.cpp
     test_script_admin.cpp
     test_window_desc.cpp
+    tilearea.cpp
     utf8.cpp
 )
diff --git a/src/tests/alternating_iterator.cpp b/src/tests/alternating_iterator.cpp
new file mode 100644
index 0000000000..93775685f5
--- /dev/null
+++ b/src/tests/alternating_iterator.cpp
@@ -0,0 +1,48 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file bitmath_func.cpp Test functionality from core/bitmath_func. */
+
+#include "../stdafx.h"
+
+#include "../3rdparty/catch2/catch.hpp"
+
+#include "../misc/alternating_iterator.hpp"
+
+#include "../safeguards.h"
+
+TEST_CASE("AlternatingIterator tests")
+{
+	auto test_case = [&](auto input, std::initializer_list<int> expected) {
+		return std::ranges::equal(input, expected);
+	};
+
+	/* Sequence includes sentinel markers to detect out-of-bounds reads without relying on UB. */
+	std::initializer_list<const int> raw_sequence_even = {INT_MAX, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, INT_MAX};
+	const std::span<const int> sequence_even = std::span{raw_sequence_even.begin() + 1, raw_sequence_even.end() - 1};
+
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 0), { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 1), { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 2), { 2, 1, 3, 0, 4, 5, 6, 7, 8, 9 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 3), { 3, 2, 4, 1, 5, 0, 6, 7, 8, 9 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 4), { 4, 3, 5, 2, 6, 1, 7, 0, 8, 9 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 5), { 5, 4, 6, 3, 7, 2, 8, 1, 9, 0 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 6), { 6, 5, 7, 4, 8, 3, 9, 2, 1, 0 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 7), { 7, 6, 8, 5, 9, 4, 3, 2, 1, 0 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 8), { 8, 7, 9, 6, 5, 4, 3, 2, 1, 0 }));
+	CHECK(test_case(AlternatingView(sequence_even, sequence_even.begin() + 9), { 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }));
+
+	/* Sequence includes sentinel markers to detect out-of-bounds reads without relying on UB. */
+	std::initializer_list<const int> raw_sequence_odd = {INT_MAX, 0, 1, 2, 3, 4, INT_MAX};
+	const std::span<const int> sequence_odd = std::span{raw_sequence_odd.begin() + 1, raw_sequence_odd.end() - 1};
+
+	CHECK(test_case(AlternatingView(sequence_odd, sequence_odd.begin() + 0), { 0, 1, 2, 3, 4 }));
+	CHECK(test_case(AlternatingView(sequence_odd, sequence_odd.begin() + 1), { 1, 0, 2, 3, 4 }));
+	CHECK(test_case(AlternatingView(sequence_odd, sequence_odd.begin() + 2), { 2, 1, 3, 0, 4 }));
+	CHECK(test_case(AlternatingView(sequence_odd, sequence_odd.begin() + 3), { 3, 2, 4, 1, 0 }));
+	CHECK(test_case(AlternatingView(sequence_odd, sequence_odd.begin() + 4), { 4, 3, 2, 1, 0 }));
+}
diff --git a/src/tests/bitmath_func.cpp b/src/tests/bitmath_func.cpp
index fa89f14252..347fa55e85 100644
--- a/src/tests/bitmath_func.cpp
+++ b/src/tests/bitmath_func.cpp
@@ -13,6 +13,8 @@
 
 #include "../core/bitmath_func.hpp"
 
+#include "../safeguards.h"
+
 TEST_CASE("SetBitIterator tests")
 {
 	auto test_case = [&](auto input, std::initializer_list<uint> expected) {
diff --git a/src/tests/enum_over_optimisation.cpp b/src/tests/enum_over_optimisation.cpp
index bdb3c6a9a4..1ec718f228 100644
--- a/src/tests/enum_over_optimisation.cpp
+++ b/src/tests/enum_over_optimisation.cpp
@@ -17,6 +17,8 @@
 
 #include "../3rdparty/catch2/catch.hpp"
 
+#include "../safeguards.h"
+
 enum TestEnum : int8_t {
 	ZERO,
 	ONE,
diff --git a/src/tests/flatset_type.cpp b/src/tests/flatset_type.cpp
new file mode 100644
index 0000000000..c27b284300
--- /dev/null
+++ b/src/tests/flatset_type.cpp
@@ -0,0 +1,67 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file string_consumer.cpp Test functionality from core/string_consumer. */
+
+#include "../stdafx.h"
+
+#include <ranges>
+
+#include "../3rdparty/catch2/catch.hpp"
+
+#include "../core/flatset_type.hpp"
+
+#include "../safeguards.h"
+
+TEST_CASE("FlatSet - basic")
+{
+	/* Sorted array of expected values. */
+	const auto values = std::to_array<uint8_t>({5, 10, 15, 20, 25});
+
+	FlatSet<uint8_t> set;
+
+	/* Set should be empty. */
+	CHECK(set.empty());
+
+	/* Insert in a random order,. */
+	set.insert(values[1]);
+	set.insert(values[2]);
+	set.insert(values[4]);
+	set.insert(values[3]);
+	set.insert(values[0]);
+	CHECK(set.size() == 5);
+	CHECK(set.contains(values[0]));
+	CHECK(set.contains(values[1]));
+	CHECK(set.contains(values[2]));
+	CHECK(set.contains(values[3]));
+	CHECK(set.contains(values[4]));
+	CHECK(std::ranges::equal(set, values));
+
+	/* Test inserting an existing value does not affect order. */
+	set.insert(values[1]);
+	CHECK(set.size() == 5);
+	CHECK(set.contains(values[0]));
+	CHECK(set.contains(values[1]));
+	CHECK(set.contains(values[2]));
+	CHECK(set.contains(values[3]));
+	CHECK(set.contains(values[4]));
+	CHECK(std::ranges::equal(set, values));
+
+	/* Insert a value multiple times. */
+	set.insert(0);
+	set.insert(0);
+	set.insert(0);
+	CHECK(set.size() == 6);
+	CHECK(set.contains(0));
+
+	/* Remove a value multiple times. */
+	set.erase(0);
+	set.erase(0);
+	set.erase(0);
+	CHECK(set.size() == 5);
+	CHECK(!set.contains(0));
+}
diff --git a/src/tests/landscape_partial_pixel_z.cpp b/src/tests/landscape_partial_pixel_z.cpp
index ec8c8f79db..1e890cd45a 100644
--- a/src/tests/landscape_partial_pixel_z.cpp
+++ b/src/tests/landscape_partial_pixel_z.cpp
@@ -14,6 +14,8 @@
 #include "../landscape.h"
 #include "../slope_func.h"
 
+#include "../safeguards.h"
+
 /**
  * Check whether the addition of two slope's GetPartialPixelZ values results in
  * the GetPartialPixelZ values of the expected slope.
diff --git a/src/tests/math_func.cpp b/src/tests/math_func.cpp
index 1f53d005b7..a5542f1d87 100644
--- a/src/tests/math_func.cpp
+++ b/src/tests/math_func.cpp
@@ -13,6 +13,8 @@
 
 #include "../core/math_func.hpp"
 
+#include "../safeguards.h"
+
 TEST_CASE("DivideApproxTest - Negative")
 {
 	CHECK(-2 == DivideApprox(-5, 2));
diff --git a/src/tests/mock_fontcache.h b/src/tests/mock_fontcache.h
index 1a43cd1821..5ae4103f65 100644
--- a/src/tests/mock_fontcache.h
+++ b/src/tests/mock_fontcache.h
@@ -10,8 +10,6 @@
 #ifndef MOCK_FONTCACHE_H
 #define MOCK_FONTCACHE_H
 
-#include "../stdafx.h"
-
 #include "../fontcache.h"
 #include "../string_func.h"
 
diff --git a/src/tests/mock_spritecache.cpp b/src/tests/mock_spritecache.cpp
index 18ff34c872..e002f56b5a 100644
--- a/src/tests/mock_spritecache.cpp
+++ b/src/tests/mock_spritecache.cpp
@@ -15,6 +15,8 @@
 #include "../spritecache_internal.h"
 #include "../table/sprites.h"
 
+#include "../safeguards.h"
+
 static bool MockLoadNextSprite(SpriteID load_index)
 {
 	static UniquePtrSpriteAllocator allocator;
diff --git a/src/tests/string_builder.cpp b/src/tests/string_builder.cpp
index b4dcf6bf6c..c9e3f8f99a 100644
--- a/src/tests/string_builder.cpp
+++ b/src/tests/string_builder.cpp
@@ -12,8 +12,6 @@
 #include "../core/string_builder.hpp"
 #include "../safeguards.h"
 
-using namespace std::literals;
-
 TEST_CASE("StringBuilder - basic")
 {
 	std::string buffer;
diff --git a/src/tests/string_consumer.cpp b/src/tests/string_consumer.cpp
new file mode 100644
index 0000000000..85a523902f
--- /dev/null
+++ b/src/tests/string_consumer.cpp
@@ -0,0 +1,538 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file string_consumer.cpp Test functionality from core/string_consumer. */
+
+#include "../stdafx.h"
+
+#include <iostream>
+
+#include "../3rdparty/catch2/catch.hpp"
+
+#include "../core/string_consumer.hpp"
+
+#include "../safeguards.h"
+
+TEST_CASE("StringConsumer - basic")
+{
+	StringConsumer consumer("ab"sv);
+	CHECK(!consumer.AnyBytesRead());
+	CHECK(consumer.GetBytesRead() == 0);
+	CHECK(consumer.AnyBytesLeft());
+	CHECK(consumer.GetBytesLeft() == 2);
+	CHECK(consumer.GetOrigData() == "ab");
+	CHECK(consumer.GetReadData() == "");
+	CHECK(consumer.GetLeftData() == "ab");
+	consumer.Skip(1);
+	CHECK(consumer.AnyBytesRead());
+	CHECK(consumer.GetBytesRead() == 1);
+	CHECK(consumer.AnyBytesLeft());
+	CHECK(consumer.GetBytesLeft() == 1);
+	CHECK(consumer.GetOrigData() == "ab");
+	CHECK(consumer.GetReadData() == "a");
+	CHECK(consumer.GetLeftData() == "b");
+	consumer.SkipAll();
+	CHECK(consumer.AnyBytesRead());
+	CHECK(consumer.GetBytesRead() == 2);
+	CHECK(!consumer.AnyBytesLeft());
+	CHECK(consumer.GetBytesLeft() == 0);
+	CHECK(consumer.GetOrigData() == "ab");
+	CHECK(consumer.GetReadData() == "ab");
+	CHECK(consumer.GetLeftData() == "");
+	consumer.Skip(1);
+	CHECK(consumer.AnyBytesRead());
+	CHECK(consumer.GetBytesRead() == 2);
+	CHECK(!consumer.AnyBytesLeft());
+	CHECK(consumer.GetBytesLeft() == 0);
+	CHECK(consumer.GetOrigData() == "ab");
+	CHECK(consumer.GetReadData() == "ab");
+	CHECK(consumer.GetLeftData() == "");
+}
+
+TEST_CASE("StringConsumer - binary8")
+{
+	StringConsumer consumer("\xFF\xFE\xFD\0"sv);
+	CHECK(consumer.PeekUint8() == 0xFF);
+	CHECK(consumer.PeekSint8() == -1);
+	CHECK(consumer.PeekChar() == static_cast<char>(-1));
+	consumer.SkipUint8();
+	CHECK(consumer.PeekUint8() == 0xFE);
+	CHECK(consumer.PeekSint8() == -2);
+	CHECK(consumer.PeekChar() == static_cast<char>(-2));
+	CHECK(consumer.ReadUint8() == 0xFE);
+	CHECK(consumer.PeekUint8() == 0xFD);
+	CHECK(consumer.PeekSint8() == -3);
+	CHECK(consumer.PeekChar() == static_cast<char>(-3));
+	CHECK(consumer.ReadSint8() == -3);
+	CHECK(consumer.PeekUint8() == 0);
+	CHECK(consumer.PeekSint8() == 0);
+	CHECK(consumer.PeekChar() == 0);
+	CHECK(consumer.ReadChar() == 0);
+	CHECK(consumer.PeekUint8() == std::nullopt);
+	CHECK(consumer.PeekSint8() == std::nullopt);
+	CHECK(consumer.PeekChar() == std::nullopt);
+	CHECK(consumer.ReadUint8(42) == 42);
+	consumer.SkipSint8();
+	CHECK(consumer.ReadSint8(42) == 42);
+	CHECK(consumer.ReadChar(42) == 42);
+}
+
+TEST_CASE("StringConsumer - binary16")
+{
+	StringConsumer consumer("\xFF\xFF\xFE\xFF\xFD\xFF"sv);
+	CHECK(consumer.PeekUint16LE() == 0xFFFF);
+	CHECK(consumer.PeekSint16LE() == -1);
+	consumer.SkipUint16LE();
+	CHECK(consumer.PeekUint16LE() == 0xFFFE);
+	CHECK(consumer.PeekSint16LE() == -2);
+	CHECK(consumer.ReadUint16LE() == 0xFFFE);
+	CHECK(consumer.PeekUint16LE() == 0xFFFD);
+	CHECK(consumer.PeekSint16LE() == -3);
+	CHECK(consumer.ReadSint16LE() == -3);
+	CHECK(consumer.PeekUint16LE() == std::nullopt);
+	CHECK(consumer.PeekSint16LE() == std::nullopt);
+	CHECK(consumer.ReadUint16LE(42) == 42);
+	consumer.SkipSint16LE();
+	CHECK(consumer.ReadSint16LE(42) == 42);
+}
+
+TEST_CASE("StringConsumer - binary32")
+{
+	StringConsumer consumer("\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFD\xFF\xFF\xFF"sv);
+	CHECK(consumer.PeekUint32LE() == 0xFFFFFFFF);
+	CHECK(consumer.PeekSint32LE() == -1);
+	consumer.SkipUint32LE();
+	CHECK(consumer.PeekUint32LE() == 0xFFFFFFFE);
+	CHECK(consumer.PeekSint32LE() == -2);
+	CHECK(consumer.ReadUint32LE() == 0xFFFFFFFE);
+	CHECK(consumer.PeekUint32LE() == 0xFFFFFFFD);
+	CHECK(consumer.PeekSint32LE() == -3);
+	CHECK(consumer.ReadSint32LE() == -3);
+	CHECK(consumer.PeekUint32LE() == std::nullopt);
+	CHECK(consumer.PeekSint32LE() == std::nullopt);
+	CHECK(consumer.ReadUint32LE(42) == 42);
+	consumer.SkipSint32LE();
+	CHECK(consumer.ReadSint32LE(42) == 42);
+}
+
+TEST_CASE("StringConsumer - binary64")
+{
+	StringConsumer consumer("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFD\xFF\xFF\xFF\xFF\xFF\xFF\xFF"sv);
+	CHECK(consumer.PeekUint64LE() == 0xFFFFFFFF'FFFFFFFF);
+	CHECK(consumer.PeekSint64LE() == -1);
+	consumer.SkipUint64LE();
+	CHECK(consumer.PeekUint64LE() == 0xFFFFFFFF'FFFFFFFE);
+	CHECK(consumer.PeekSint64LE() == -2);
+	CHECK(consumer.ReadUint64LE() == 0xFFFFFFFF'FFFFFFFE);
+	CHECK(consumer.PeekUint64LE() == 0xFFFFFFFF'FFFFFFFD);
+	CHECK(consumer.PeekSint64LE() == -3);
+	CHECK(consumer.ReadSint64LE() == -3);
+	CHECK(consumer.PeekUint64LE() == std::nullopt);
+	CHECK(consumer.PeekSint64LE() == std::nullopt);
+	CHECK(consumer.ReadUint64LE(42) == 42);
+	consumer.SkipSint64LE();
+	CHECK(consumer.ReadSint64LE(42) == 42);
+}
+
+TEST_CASE("StringConsumer - utf8")
+{
+	StringConsumer consumer("a\u1234\xFF\xFE""b"sv);
+	CHECK(consumer.PeekUtf8() == std::pair<StringConsumer::size_type, char32_t>(1, 'a'));
+	consumer.SkipUtf8();
+	CHECK(consumer.PeekUtf8() == std::pair<StringConsumer::size_type, char32_t>(3, 0x1234));
+	CHECK(consumer.ReadUtf8() == 0x1234);
+	CHECK(consumer.PeekUint8() == 0xFF);
+	CHECK(consumer.PeekUtf8() == std::pair<StringConsumer::size_type, char32_t>(0, 0));
+	CHECK(consumer.ReadUtf8() == '?');
+	CHECK(consumer.PeekUint8() == 0xFE);
+	CHECK(consumer.PeekUtf8() == std::pair<StringConsumer::size_type, char32_t>(0, 0));
+	consumer.SkipUtf8();
+	CHECK(consumer.PeekUtf8() == std::pair<StringConsumer::size_type, char32_t>(1, 'b'));
+	CHECK(consumer.ReadUtf8() == 'b');
+	CHECK(!consumer.AnyBytesLeft());
+	CHECK(consumer.PeekUtf8() == std::pair<StringConsumer::size_type, char32_t>(0, 0));
+	CHECK(consumer.ReadUtf8() == '?');
+}
+
+TEST_CASE("StringConsumer - conditions")
+{
+	StringConsumer consumer("ABCDabcde\u0234@@@gh\0\0\0ij\0\0\0kl"sv);
+	CHECK(consumer.PeekIf("AB"));
+	CHECK(consumer.PeekCharIf('A'));
+	CHECK(consumer.PeekUtf8If('A'));
+	CHECK(!consumer.PeekIf("CD"));
+	CHECK(!consumer.ReadIf("CD"));
+	consumer.SkipIf("CD");
+	CHECK(consumer.ReadIf("AB"));
+	CHECK(consumer.PeekIf("CD"));
+	consumer.SkipIf("CD");
+	CHECK(consumer.Peek(2) == "ab");
+	CHECK(consumer.Read(2) == "ab");
+	CHECK(consumer.Peek(2) == "cd");
+	CHECK(consumer.Find("e\u0234") == 2);
+	CHECK(consumer.Find("ab") == StringConsumer::npos);
+	CHECK(consumer.FindChar('e') == 2);
+	CHECK(consumer.FindChar('a') == StringConsumer::npos);
+	CHECK(consumer.FindUtf8(0x234) == 3);
+	CHECK(consumer.FindUtf8(0x1234) == StringConsumer::npos);
+	consumer.Skip(2);
+	CHECK(consumer.Peek(3) == "e\u0234");
+	CHECK(consumer.PeekUntil("e", StringConsumer::READ_ALL_SEPARATORS) == "e");
+	CHECK(consumer.PeekUntil("e", StringConsumer::READ_ONE_SEPARATOR) == "e");
+	CHECK(consumer.PeekUntil("e", StringConsumer::KEEP_SEPARATOR) == "");
+	CHECK(consumer.PeekUntil("e", StringConsumer::SKIP_ONE_SEPARATOR) == "");
+	CHECK(consumer.PeekUntil("e", StringConsumer::SKIP_ALL_SEPARATORS) == "");
+	CHECK(consumer.PeekUntil("@", StringConsumer::READ_ALL_SEPARATORS) == "e\u0234@@@");
+	CHECK(consumer.PeekUntil("@", StringConsumer::READ_ONE_SEPARATOR) == "e\u0234@");
+	CHECK(consumer.PeekUntil("@", StringConsumer::KEEP_SEPARATOR) == "e\u0234");
+	CHECK(consumer.PeekUntil("@", StringConsumer::SKIP_ONE_SEPARATOR) == "e\u0234");
+	CHECK(consumer.PeekUntil("@", StringConsumer::SKIP_ALL_SEPARATORS) == "e\u0234");
+	CHECK(consumer.ReadUntil("@", StringConsumer::KEEP_SEPARATOR) == "e\u0234");
+	CHECK(consumer.ReadUntil("@", StringConsumer::READ_ONE_SEPARATOR) == "@");
+	CHECK(consumer.ReadUntil("@", StringConsumer::READ_ALL_SEPARATORS) == "@@");
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::READ_ALL_SEPARATORS) == "gh\0\0\0"sv);
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::READ_ONE_SEPARATOR) == "gh\0"sv);
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::KEEP_SEPARATOR) == "gh");
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::SKIP_ONE_SEPARATOR) == "gh");
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::SKIP_ALL_SEPARATORS) == "gh");
+	CHECK(consumer.ReadUntilChar('\0', StringConsumer::READ_ONE_SEPARATOR) == "gh\0"sv);
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::READ_ALL_SEPARATORS) == "\0\0"sv);
+	CHECK(consumer.ReadUntilChar('\0', StringConsumer::SKIP_ONE_SEPARATOR) == "");
+	CHECK(consumer.PeekUntilChar('\0', StringConsumer::READ_ALL_SEPARATORS) == "\0"sv);
+	consumer.SkipUntilUtf8(0, StringConsumer::READ_ALL_SEPARATORS);
+	CHECK(consumer.PeekUntilUtf8(0, StringConsumer::KEEP_SEPARATOR) == "ij");
+	consumer.SkipUntilUtf8(0, StringConsumer::SKIP_ALL_SEPARATORS);
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::READ_ALL_SEPARATORS) == "kl");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::READ_ONE_SEPARATOR) == "kl");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::KEEP_SEPARATOR) == "kl");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::SKIP_ONE_SEPARATOR) == "kl");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::SKIP_ALL_SEPARATORS) == "kl");
+	CHECK(consumer.ReadUntilUtf8(0x234, StringConsumer::READ_ALL_SEPARATORS) == "kl");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::READ_ALL_SEPARATORS) == "");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::READ_ONE_SEPARATOR) == "");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::KEEP_SEPARATOR) == "");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::SKIP_ONE_SEPARATOR) == "");
+	CHECK(consumer.PeekUntilUtf8(0x234, StringConsumer::SKIP_ALL_SEPARATORS) == "");
+	CHECK(consumer.ReadUntilUtf8(0x234, StringConsumer::READ_ALL_SEPARATORS) == "");
+	CHECK(consumer.ReadUntilUtf8(0x234, StringConsumer::READ_ONE_SEPARATOR) == "");
+	CHECK(consumer.ReadUntilUtf8(0x234, StringConsumer::KEEP_SEPARATOR) == "");
+	CHECK(consumer.ReadUntilUtf8(0x234, StringConsumer::SKIP_ONE_SEPARATOR) == "");
+	CHECK(consumer.ReadUntilUtf8(0x234, StringConsumer::SKIP_ALL_SEPARATORS) == "");
+	CHECK(consumer.Peek(2) == "");
+	CHECK(consumer.Read(2) == "");
+}
+
+TEST_CASE("StringConsumer - ascii")
+{
+	StringConsumer consumer("abcdefgh  \r\n\tAB  \r\n\t"sv);
+	CHECK(consumer.FindCharIn("dc") == 2);
+	CHECK(consumer.FindCharIn("xy") == StringConsumer::npos);
+	CHECK(consumer.FindCharNotIn("ba") == 2);
+	CHECK(consumer.PeekUntilCharNotIn("ba") == "ab");
+	CHECK(consumer.PeekUntilCharNotIn("dc") == "");
+	CHECK(consumer.PeekUntilCharIn("ba") == "");
+	CHECK(consumer.PeekUntilCharIn("dc") == "ab");
+	CHECK(consumer.ReadUntilCharNotIn("dc") == "");
+	CHECK(consumer.ReadUntilCharNotIn("ba") == "ab");
+	CHECK(consumer.ReadUntilCharIn("dc") == "");
+	CHECK(consumer.ReadUntilCharIn("fe") == "cd");
+	CHECK(consumer.PeekIf("ef"));
+	consumer.SkipUntilCharNotIn("ji");
+	CHECK(consumer.PeekIf("ef"));
+	consumer.SkipUntilCharNotIn("fe");
+	CHECK(consumer.PeekIf("gh"));
+	consumer.SkipUntilCharIn("hg");
+	CHECK(consumer.PeekIf("gh"));
+	consumer.SkipUntilCharIn(StringConsumer::WHITESPACE_OR_NEWLINE);
+	CHECK(consumer.PeekCharIfIn(StringConsumer::WHITESPACE_OR_NEWLINE) == ' ');
+	CHECK(consumer.ReadCharIfIn(StringConsumer::WHITESPACE_OR_NEWLINE) == ' ');
+	consumer.SkipCharIfIn(StringConsumer::WHITESPACE_OR_NEWLINE);
+	CHECK(consumer.PeekUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE) == "\r");
+	CHECK(consumer.ReadUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE) == "\r");
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+	CHECK(consumer.PeekCharIfIn(StringConsumer::WHITESPACE_OR_NEWLINE) == '\n');
+	CHECK(consumer.ReadCharIfIn(StringConsumer::WHITESPACE_OR_NEWLINE) == '\n');
+	CHECK(consumer.PeekUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE) == "\t");
+	CHECK(consumer.ReadUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE) == "\t");
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
+	CHECK(consumer.PeekUntilCharIn(StringConsumer::WHITESPACE_OR_NEWLINE) == "AB");
+	CHECK(consumer.ReadUntilCharIn(StringConsumer::WHITESPACE_OR_NEWLINE) == "AB");
+	CHECK(consumer.PeekUntilCharNotIn(StringConsumer::WHITESPACE_OR_NEWLINE) == "  \r\n\t");
+	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_OR_NEWLINE);
+	CHECK(!consumer.AnyBytesLeft());
+}
+
+TEST_CASE("StringConsumer - parse int")
+{
+	StringConsumer consumer("1 a -a -2 -8 ffffFFFF ffffFFFF -1aaaAAAA -1aaaAAAA +3 1234567890123 1234567890123 1234567890123 ffffFFFFffffFFFE ffffFFFFffffFFFE ffffFFFFffffFFFE ffffFFFFffffFFFE -0x1aaaAAAAaaaaAAAA -1234567890123 "sv);
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(8) == std::pair<StringConsumer::size_type, uint32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<int32_t>(8) == std::pair<StringConsumer::size_type, int32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(1, 1));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(1, 1));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(10) == 1);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(8) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(8) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(1, 0xa));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(1, 0xa));
+	CHECK(consumer.ReadIntegerBase<uint32_t>(16) == 0xa);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(8) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(8) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(2, -0xa));
+	CHECK(consumer.ReadIntegerBase<int32_t>(16) == -0xa);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(2, -2));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(8) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(8) == std::pair<StringConsumer::size_type, int32_t>(2, -2));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(2, -2));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(2, -2));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(10) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(10) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(8) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(8) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(8) == std::nullopt);
+	CHECK(consumer.TryReadIntegerBase<int32_t>(8) == std::nullopt);
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(2, -8));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(10) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<int32_t>(10) == -8);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(8, 0xffffffff));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16, true) == std::pair<StringConsumer::size_type, uint32_t>(8, 0xffffffff));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16, true) == std::pair<StringConsumer::size_type, int32_t>(8, 0x7fffffff));
+	CHECK(consumer.TryReadIntegerBase<int32_t>(16) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<int32_t>(16) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(16) == 0xffffffff);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(9, -0x1aaaaaaa));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16, true) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16, true) == std::pair<StringConsumer::size_type, int32_t>(9, -0x1aaaaaaa));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(16) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(16) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(9, -0x1aaaaaaa));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(16) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<int32_t>(16) == -0x1aaaaaaa);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(8) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(8) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	consumer.SkipIntegerBase(10);
+	CHECK(consumer.ReadUtf8() == '+');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(1, 3));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(1, 3));
+	consumer.SkipIntegerBase(10);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(13, 1234567890123));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(13, 1234567890123));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10, true) == std::pair<StringConsumer::size_type, uint32_t>(13, 0xffffffff));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10, true) == std::pair<StringConsumer::size_type, int32_t>(13, 0x7fffffff));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10, true) == std::pair<StringConsumer::size_type, uint64_t>(13, 1234567890123));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10, true) == std::pair<StringConsumer::size_type, int64_t>(13, 1234567890123));
+	CHECK(consumer.TryReadIntegerBase<uint32_t>(10) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(10) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(13, 1234567890123));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(13, 1234567890123));
+	CHECK(consumer.TryReadIntegerBase<int32_t>(10) == std::nullopt);
+	CHECK(consumer.ReadIntegerBase<int32_t>(10) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(13, 1234567890123));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(13, 1234567890123));
+	CHECK(consumer.ReadIntegerBase<uint64_t>(10) == 1234567890123);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(16) == std::pair<StringConsumer::size_type, uint64_t>(16, 0xffffffff'fffffffe));
+	CHECK(consumer.PeekIntegerBase<int64_t>(16) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16, true) == std::pair<StringConsumer::size_type, uint32_t>(16, 0xffffffff));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16, true) == std::pair<StringConsumer::size_type, int32_t>(16, 0x7fffffff));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(16, true) == std::pair<StringConsumer::size_type, uint64_t>(16, 0xffffffff'fffffffe));
+	CHECK(consumer.PeekIntegerBase<int64_t>(16, true) == std::pair<StringConsumer::size_type, int64_t>(16, 0x7fffffff'ffffffff));
+	CHECK(consumer.ReadIntegerBase<uint32_t>(16) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(16) == std::pair<StringConsumer::size_type, uint64_t>(16, 0xffffffff'fffffffe));
+	CHECK(consumer.PeekIntegerBase<int64_t>(16) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	CHECK(consumer.ReadIntegerBase<int32_t>(16) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(16) == std::pair<StringConsumer::size_type, uint64_t>(16, 0xffffffff'fffffffe));
+	CHECK(consumer.PeekIntegerBase<int64_t>(16) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	CHECK(consumer.ReadIntegerBase<int64_t>(16) == 0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(16) == std::pair<StringConsumer::size_type, uint64_t>(16, 0xffffffff'fffffffe));
+	CHECK(consumer.PeekIntegerBase<int64_t>(16) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	CHECK(consumer.ReadIntegerBase<uint64_t>(16) == 0xffffffff'fffffffe);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(2, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(16) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(16) == std::pair<StringConsumer::size_type, int64_t>(2, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(0) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(0) == std::pair<StringConsumer::size_type, int64_t>(19, -0x1aaaaaaa'aaaaaaaa));
+	CHECK(consumer.ReadIntegerBase<int64_t>(0) == -0x1aaaaaaa'aaaaaaaa);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(14, -1234567890123));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(0) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(0) == std::pair<StringConsumer::size_type, int64_t>(14, -1234567890123));
+	CHECK(consumer.ReadIntegerBase<int64_t>(0) == -1234567890123);
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(0) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(0) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	consumer.SkipIntegerBase(10);
+	consumer.SkipIntegerBase(10);
+	consumer.SkipIntegerBase(0);
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int32_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<uint64_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int64_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(0, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int32_t>(0, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<uint64_t>(0, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int64_t>(0, 42) == 42);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(0) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(0) == std::pair<StringConsumer::size_type, int64_t>(0, 0));
+	consumer.SkipIntegerBase(10);
+	consumer.SkipIntegerBase(10);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int32_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<uint64_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int64_t>(10, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<uint32_t>(0, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int32_t>(0, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<uint64_t>(0, 42) == 42);
+	CHECK(consumer.ReadIntegerBase<int64_t>(0, 42) == 42);
+}
+
+TEST_CASE("StringConsumer - invalid int")
+{
+	StringConsumer consumer("x 0x - -0x 0y"sv);
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	consumer.SkipIntegerBase(0);
+	consumer.SkipIntegerBase(10);
+	consumer.SkipIntegerBase(16);
+	CHECK(consumer.ReadUtf8() == 'x');
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(1, 0));
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(2, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(2, 0));
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(1, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(1, 0));
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadUtf8() == 'y');
+}
+
+TEST_CASE("StringConsumer - most negative")
+{
+	StringConsumer consumer("-80000000 -0x80000000 -2147483648 -9223372036854775808"sv);
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16) == std::pair<StringConsumer::size_type, int32_t>(9, 0x80000000));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(16, true) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(16, true) == std::pair<StringConsumer::size_type, int32_t>(9, 0x80000000));
+	consumer.SkipIntegerBase(16);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(0) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(0) == std::pair<StringConsumer::size_type, int32_t>(11, 0x80000000));
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(11, 0x80000000));
+	consumer.SkipIntegerBase(0);
+	CHECK(consumer.ReadUtf8() == ' ');
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10) == std::pair<StringConsumer::size_type, int32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10) == std::pair<StringConsumer::size_type, int64_t>(20, 0x80000000'00000000));
+	CHECK(consumer.PeekIntegerBase<uint32_t>(10, true) == std::pair<StringConsumer::size_type, uint32_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int32_t>(10, true) == std::pair<StringConsumer::size_type, int32_t>(20, 0x80000000));
+	CHECK(consumer.PeekIntegerBase<uint64_t>(10, true) == std::pair<StringConsumer::size_type, uint64_t>(0, 0));
+	CHECK(consumer.PeekIntegerBase<int64_t>(10, true) == std::pair<StringConsumer::size_type, int64_t>(20, 0x80000000'00000000));
+}
diff --git a/src/tests/string_func.cpp b/src/tests/string_func.cpp
index 1b05786a9e..17d35ed35b 100644
--- a/src/tests/string_func.cpp
+++ b/src/tests/string_func.cpp
@@ -14,10 +14,13 @@
 #include "../string_func.h"
 #include "../strings_func.h"
 #include "../core/string_builder.hpp"
+#include "../core/string_consumer.hpp"
 #include "../table/control_codes.h"
 
 #include "table/strings.h"
 
+#include "../safeguards.h"
+
 /**** String compare/equals *****/
 
 TEST_CASE("StrCompareIgnoreCase - std::string")
@@ -44,30 +47,6 @@ TEST_CASE("StrCompareIgnoreCase - std::string")
 	CHECK(StrCompareIgnoreCase(std::string{"aa"}, std::string{"a"}) > 0);
 }
 
-TEST_CASE("StrCompareIgnoreCase - char pointer")
-{
-	/* Same string, with different cases. */
-	CHECK(StrCompareIgnoreCase("", "") == 0);
-	CHECK(StrCompareIgnoreCase("a", "a") == 0);
-	CHECK(StrCompareIgnoreCase("a", "A") == 0);
-	CHECK(StrCompareIgnoreCase("A", "a") == 0);
-	CHECK(StrCompareIgnoreCase("A", "A") == 0);
-
-	/* Not the same string. */
-	CHECK(StrCompareIgnoreCase("", "b") < 0);
-	CHECK(StrCompareIgnoreCase("a", "") > 0);
-
-	CHECK(StrCompareIgnoreCase("a", "b") < 0);
-	CHECK(StrCompareIgnoreCase("b", "a") > 0);
-	CHECK(StrCompareIgnoreCase("a", "B") < 0);
-	CHECK(StrCompareIgnoreCase("b", "A") > 0);
-	CHECK(StrCompareIgnoreCase("A", "b") < 0);
-	CHECK(StrCompareIgnoreCase("B", "a") > 0);
-
-	CHECK(StrCompareIgnoreCase("a", "aa") < 0);
-	CHECK(StrCompareIgnoreCase("aa", "a") > 0);
-}
-
 TEST_CASE("StrCompareIgnoreCase - std::string_view")
 {
 	/*
@@ -75,7 +54,7 @@ TEST_CASE("StrCompareIgnoreCase - std::string_view")
 	 * which does not guarantee the termination that would be required by
 	 * things such as stricmp/strcasecmp. So, just passing .data() into stricmp
 	 * or strcasecmp would fail if it does not account for the length of the
-	 * view. Thus, contrary to the string/char* tests, this uses the same base
+	 * view. Thus, contrary to the string tests, this uses the same base
 	 * string but gets different sections to trigger these corner cases.
 	 */
 	std::string_view base{"aaAbB"};
@@ -120,24 +99,6 @@ TEST_CASE("StrEqualsIgnoreCase - std::string")
 	CHECK(!StrEqualsIgnoreCase(std::string{"aa"}, std::string{"a"}));
 }
 
-TEST_CASE("StrEqualsIgnoreCase - char pointer")
-{
-	/* Same string, with different cases. */
-	CHECK(StrEqualsIgnoreCase("", ""));
-	CHECK(StrEqualsIgnoreCase("a", "a"));
-	CHECK(StrEqualsIgnoreCase("a", "A"));
-	CHECK(StrEqualsIgnoreCase("A", "a"));
-	CHECK(StrEqualsIgnoreCase("A", "A"));
-
-	/* Not the same string. */
-	CHECK(!StrEqualsIgnoreCase("", "b"));
-	CHECK(!StrEqualsIgnoreCase("a", ""));
-	CHECK(!StrEqualsIgnoreCase("a", "b"));
-	CHECK(!StrEqualsIgnoreCase("b", "a"));
-	CHECK(!StrEqualsIgnoreCase("a", "aa"));
-	CHECK(!StrEqualsIgnoreCase("aa", "a"));
-}
-
 TEST_CASE("StrEqualsIgnoreCase - std::string_view")
 {
 	/*
@@ -145,7 +106,7 @@ TEST_CASE("StrEqualsIgnoreCase - std::string_view")
 	 * which does not guarantee the termination that would be required by
 	 * things such as stricmp/strcasecmp. So, just passing .data() into stricmp
 	 * or strcasecmp would fail if it does not account for the length of the
-	 * view. Thus, contrary to the string/char* tests, this uses the same base
+	 * view. Thus, contrary to the string tests, this uses the same base
 	 * string but gets different sections to trigger these corner cases.
 	 */
 	std::string_view base{"aaAb"};
@@ -193,31 +154,6 @@ TEST_CASE("StrStartsWithIgnoreCase - std::string")
 	CHECK(!StrStartsWithIgnoreCase(std::string{"a"}, std::string{"aa"}));
 }
 
-TEST_CASE("StrStartsWithIgnoreCase - char pointer")
-{
-	/* Everything starts with an empty prefix. */
-	CHECK(StrStartsWithIgnoreCase("", ""));
-	CHECK(StrStartsWithIgnoreCase("a", ""));
-
-	/* Equals string, ignoring case. */
-	CHECK(StrStartsWithIgnoreCase("a", "a"));
-	CHECK(StrStartsWithIgnoreCase("a", "A"));
-	CHECK(StrStartsWithIgnoreCase("A", "a"));
-	CHECK(StrStartsWithIgnoreCase("A", "A"));
-
-	/* Starts with same, ignoring case. */
-	CHECK(StrStartsWithIgnoreCase("ab", "a"));
-	CHECK(StrStartsWithIgnoreCase("ab", "A"));
-	CHECK(StrStartsWithIgnoreCase("Ab", "a"));
-	CHECK(StrStartsWithIgnoreCase("Ab", "A"));
-
-	/* Does not start the same. */
-	CHECK(!StrStartsWithIgnoreCase("", "b"));
-	CHECK(!StrStartsWithIgnoreCase("a", "b"));
-	CHECK(!StrStartsWithIgnoreCase("b", "a"));
-	CHECK(!StrStartsWithIgnoreCase("a", "aa"));
-}
-
 TEST_CASE("StrStartsWithIgnoreCase - std::string_view")
 {
 	/*
@@ -225,7 +161,7 @@ TEST_CASE("StrStartsWithIgnoreCase - std::string_view")
 	 * which does not guarantee the termination that would be required by
 	 * things such as stricmp/strcasecmp. So, just passing .data() into stricmp
 	 * or strcasecmp would fail if it does not account for the length of the
-	 * view. Thus, contrary to the string/char* tests, this uses the same base
+	 * view. Thus, contrary to the string tests, this uses the same base
 	 * string but gets different sections to trigger these corner cases.
 	 */
 	std::string_view base{"aabAb"};
@@ -280,31 +216,6 @@ TEST_CASE("StrEndsWithIgnoreCase - std::string")
 	CHECK(!StrEndsWithIgnoreCase(std::string{"a"}, std::string{"aa"}));
 }
 
-TEST_CASE("StrEndsWithIgnoreCase - char pointer")
-{
-	/* Everything ends with an empty prefix. */
-	CHECK(StrEndsWithIgnoreCase("", ""));
-	CHECK(StrEndsWithIgnoreCase("a", ""));
-
-	/* Equals string, ignoring case. */
-	CHECK(StrEndsWithIgnoreCase("a", "a"));
-	CHECK(StrEndsWithIgnoreCase("a", "A"));
-	CHECK(StrEndsWithIgnoreCase("A", "a"));
-	CHECK(StrEndsWithIgnoreCase("A", "A"));
-
-	/* Ends with same, ignoring case. */
-	CHECK(StrEndsWithIgnoreCase("ba", "a"));
-	CHECK(StrEndsWithIgnoreCase("ba", "A"));
-	CHECK(StrEndsWithIgnoreCase("bA", "a"));
-	CHECK(StrEndsWithIgnoreCase("bA", "A"));
-
-	/* Does not end the same. */
-	CHECK(!StrEndsWithIgnoreCase("", "b"));
-	CHECK(!StrEndsWithIgnoreCase("a", "b"));
-	CHECK(!StrEndsWithIgnoreCase("b", "a"));
-	CHECK(!StrEndsWithIgnoreCase("a", "aa"));
-}
-
 TEST_CASE("StrEndsWithIgnoreCase - std::string_view")
 {
 	/*
@@ -312,7 +223,7 @@ TEST_CASE("StrEndsWithIgnoreCase - std::string_view")
 	 * which does not guarantee the termination that would be required by
 	 * things such as stricmp/strcasecmp. So, just passing .data() into stricmp
 	 * or strcasecmp would fail if it does not account for the length of the
-	 * view. Thus, contrary to the string/char* tests, this uses the same base
+	 * view. Thus, contrary to the string tests, this uses the same base
 	 * string but gets different sections to trigger these corner cases.
 	 */
 	std::string_view base{"aabAba"};
@@ -396,7 +307,8 @@ static const std::vector<std::pair<std::string, std::string>> _str_trim_testcase
 	{"a  ", "a"},
 	{"  a   ", "a"},
 	{"  a  b  c  ", "a  b  c"},
-	{"   ", ""}
+	{"   ", ""},
+	{"  \r\f\t  ", ""},
 };
 
 TEST_CASE("StrTrimInPlace")
@@ -409,7 +321,7 @@ TEST_CASE("StrTrimInPlace")
 
 TEST_CASE("StrTrimView") {
 	for (const auto& [input, expected] : _str_trim_testcases) {
-		CHECK(StrTrimView(input) == expected);
+		CHECK(StrTrimView(input, StringConsumer::WHITESPACE_NO_NEWLINE) == expected);
 	}
 }
 
@@ -462,6 +374,9 @@ TEST_CASE("FixSCCEncoded")
 	/* Test conversion with one numeric parameter. */
 	CHECK(FixSCCEncodedWrapper("\uE00022:1", false) == Compose(SCC_ENCODED, "22", SCC_RECORD_SEPARATOR, SCC_ENCODED_NUMERIC, "1"));
 
+	/* Test conversion with signed numeric parameter. */
+	CHECK(FixSCCEncodedWrapper("\uE00022:-1", false) == Compose(SCC_ENCODED, "22", SCC_RECORD_SEPARATOR, SCC_ENCODED_NUMERIC, "-1"));
+
 	/* Test conversion with two numeric parameters. */
 	CHECK(FixSCCEncodedWrapper("\uE0003:12:2", false) == Compose(SCC_ENCODED, "3", SCC_RECORD_SEPARATOR, SCC_ENCODED_NUMERIC, "12", SCC_RECORD_SEPARATOR, SCC_ENCODED_NUMERIC, "2"));
 
@@ -478,14 +393,49 @@ TEST_CASE("FixSCCEncoded")
 	CHECK(FixSCCEncodedWrapper("\uE000777:\uE0008888:\"Foo\":\"BarBaz\"", false) == Compose(SCC_ENCODED, "777", SCC_RECORD_SEPARATOR, SCC_ENCODED, "8888", SCC_RECORD_SEPARATOR, SCC_ENCODED_STRING, "Foo", SCC_RECORD_SEPARATOR, SCC_ENCODED_STRING, "BarBaz"));
 }
 
-TEST_CASE("EncodedString::ReplaceParam")
+extern void FixSCCEncodedNegative(std::string &str);
+
+/* Helper to call FixSCCEncodedNegative and return the result in a new string. */
+static std::string FixSCCEncodedNegativeWrapper(const std::string &str)
+{
+	std::string result = str;
+	FixSCCEncodedNegative(result);
+	return result;
+}
+
+TEST_CASE("FixSCCEncodedNegative")
+{
+	auto positive = Compose(SCC_ENCODED, "777", SCC_RECORD_SEPARATOR, SCC_ENCODED_NUMERIC, "ffffffffffffffff");
+	auto negative = Compose(SCC_ENCODED, "777", SCC_RECORD_SEPARATOR, SCC_ENCODED_NUMERIC, "-1");
+
+	CHECK(FixSCCEncodedNegativeWrapper("") == "");
+	CHECK(FixSCCEncodedNegativeWrapper(positive) == positive);
+	CHECK(FixSCCEncodedNegativeWrapper(negative) == positive);
+}
+
+TEST_CASE("EncodedString::ReplaceParam - positive")
 {
 	/* Test that two encoded strings with different parameters are not the same. */
-	EncodedString string1 = GetEncodedString(STR_NULL, "Foo", 10, "Bar");
-	EncodedString string2 = GetEncodedString(STR_NULL, "Foo", 15, "Bar");
+	EncodedString string1 = GetEncodedString(STR_NULL, "Foo"sv, 10, "Bar"sv);
+	EncodedString string2 = GetEncodedString(STR_NULL, "Foo"sv, 15, "Bar"sv);
 	CHECK(string1 != string2);
 
 	/* Test that replacing parameter results in the same string. */
 	EncodedString string3 = string1.ReplaceParam(1, 15);
 	CHECK(string2 == string3);
 }
+
+TEST_CASE("EncodedString::ReplaceParam - negative")
+{
+	EncodedString string1 = GetEncodedString(STR_NULL, "Foo"sv, -1, "Bar"sv);
+	EncodedString string2 = GetEncodedString(STR_NULL, "Foo"sv, -2, "Bar"sv);
+	EncodedString string3 = GetEncodedString(STR_NULL, "Foo"sv, 0xFFFF'FFFF'FFFF'FFFF, "Bar"sv);
+	/* Test that two encoded strings with different parameters are not the same. */
+	CHECK(string1 != string2);
+	/* Test that signed values are stored as unsigned. */
+	CHECK(string1 == string3);
+
+	/* Test that replacing parameter results in the same string. */
+	EncodedString string4 = string1.ReplaceParam(1, -2);
+	CHECK(string2 == string4);
+}
diff --git a/src/tests/string_inplace.cpp b/src/tests/string_inplace.cpp
new file mode 100644
index 0000000000..f6557a2b3e
--- /dev/null
+++ b/src/tests/string_inplace.cpp
@@ -0,0 +1,55 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file string_inplace.cpp Test functionality from core/string_inplace. */
+
+#include "../stdafx.h"
+#include "../3rdparty/catch2/catch.hpp"
+#include "../core/string_inplace.hpp"
+#include "../safeguards.h"
+
+TEST_CASE("InPlaceReplacement")
+{
+	std::array<char, 4> buffer{1, 2, 3, 4};
+	InPlaceReplacement inplace(buffer);
+
+	CHECK(!inplace.builder.AnyBytesWritten());
+	CHECK(inplace.builder.GetBytesWritten() == 0);
+	CHECK(inplace.builder.GetWrittenData() == ""sv);
+	CHECK(!inplace.builder.AnyBytesUnused());
+	CHECK(inplace.builder.GetBytesUnused() == 0);
+	CHECK(!inplace.consumer.AnyBytesRead());
+	CHECK(inplace.consumer.GetBytesRead() == 0);
+	CHECK(inplace.consumer.AnyBytesLeft());
+	CHECK(inplace.consumer.GetBytesLeft() == 4);
+
+	CHECK(inplace.consumer.ReadUint16LE() == 0x201);
+
+	CHECK(inplace.builder.GetBytesWritten() == 0);
+	CHECK(inplace.builder.GetBytesUnused() == 2);
+	CHECK(inplace.consumer.GetBytesRead() == 2);
+	CHECK(inplace.consumer.GetBytesLeft() == 2);
+
+	inplace.builder.PutUint8(11);
+
+	CHECK(inplace.builder.GetBytesWritten() == 1);
+	CHECK(inplace.builder.GetBytesUnused() == 1);
+	CHECK(inplace.consumer.GetBytesRead() == 2);
+	CHECK(inplace.consumer.GetBytesLeft() == 2);
+
+	inplace.builder.PutUint8(12);
+
+	CHECK(inplace.builder.GetBytesWritten() == 2);
+	CHECK(inplace.builder.GetBytesUnused() == 0);
+	CHECK(inplace.consumer.GetBytesRead() == 2);
+	CHECK(inplace.consumer.GetBytesLeft() == 2);
+
+	CHECK(buffer[0] == 11);
+	CHECK(buffer[1] == 12);
+	CHECK(buffer[2] == 3);
+	CHECK(buffer[3] == 4);
+}
diff --git a/src/tests/test_network_crypto.cpp b/src/tests/test_network_crypto.cpp
index be28d486d5..c3d0184780 100644
--- a/src/tests/test_network_crypto.cpp
+++ b/src/tests/test_network_crypto.cpp
@@ -16,6 +16,8 @@
 #include "../network/core/packet.h"
 #include "../string_func.h"
 
+#include "../safeguards.h"
+
 /* The length of the hexadecimal representation of a X25519 key must fit in the key length. */
 static_assert(NETWORK_SECRET_KEY_LENGTH >= X25519_KEY_SIZE * 2 + 1);
 static_assert(NETWORK_PUBLIC_KEY_LENGTH >= X25519_KEY_SIZE * 2 + 1);
@@ -37,14 +39,14 @@ static std::tuple<Packet, bool> CreatePacketForReading(Packet &source, MockNetwo
 
 	Packet dest(socket_handler, COMPAT_MTU, source.Size());
 
-	auto transfer_in = [](Packet &source, char *dest_data, size_t length) {
-		auto transfer_out = [](char *dest_data, const char *source_data, size_t length) {
-			std::copy(source_data, source_data + length, dest_data);
-			return length;
+	auto transfer_in = [&source](std::span<uint8_t> dest_data) {
+		auto transfer_out = [&dest_data](std::span<const uint8_t> source_data) {
+			std::ranges::copy(source_data, dest_data.begin());
+			return source_data.size();
 		};
-		return source.TransferOutWithLimit(transfer_out, length, dest_data);
+		return source.TransferOutWithLimit(transfer_out, dest_data.size());
 	};
-	dest.TransferIn(transfer_in, source);
+	dest.TransferIn(transfer_in);
 
 	bool valid = dest.PrepareToRead();
 	dest.Recv_uint8(); // Ignore the type
diff --git a/src/tests/test_script_admin.cpp b/src/tests/test_script_admin.cpp
index c286e6293a..b3121032ec 100644
--- a/src/tests/test_script_admin.cpp
+++ b/src/tests/test_script_admin.cpp
@@ -22,6 +22,8 @@
 
 #include <squirrel.h>
 
+#include "../safeguards.h"
+
 /**
  * A controller to start enough so we can use Squirrel for testing.
  *
@@ -35,7 +37,7 @@
 class TestScriptController {
 public:
 	GameInstance game{};
-	ScriptObject::ActiveInstance active{&game};
+	ScriptObject::ActiveInstance active{game};
 
 	Squirrel engine{"test"};
 	ScriptAllocatorScope scope{&engine};
@@ -56,13 +58,13 @@ static std::optional<std::string> TestScriptAdminMakeJSON(std::string_view squir
 
 	/* Insert an (empty) class for testing. */
 	sq_pushroottable(vm);
-	sq_pushstring(vm, "DummyClass", -1);
+	sq_pushstring(vm, "DummyClass");
 	sq_newclass(vm, SQFalse);
 	sq_newslot(vm, -3, SQFalse);
 	sq_pop(vm, 1);
 
 	/* Compile the snippet. */
-	REQUIRE(sq_compilebuffer(vm, buffer.c_str(), buffer.size(), "test", SQTrue) == SQ_OK);
+	REQUIRE(sq_compilebuffer(vm, buffer, "test", SQTrue) == SQ_OK);
 	/* Execute the snippet, capturing the return value. */
 	sq_pushroottable(vm);
 	REQUIRE(sq_call(vm, 1, SQTrue, SQTrue) == SQ_OK);
diff --git a/src/tests/test_window_desc.cpp b/src/tests/test_window_desc.cpp
index 0f4305c69a..af12075f3d 100644
--- a/src/tests/test_window_desc.cpp
+++ b/src/tests/test_window_desc.cpp
@@ -15,6 +15,8 @@
 
 #include "../window_gui.h"
 
+#include "../safeguards.h"
+
 /**
  * List of WindowDescs. Defined in window.cpp but not exposed as this unit-test is the only other place that needs it.
  * WindowDesc is a self-registering class so all WindowDescs will be included in the list.
@@ -30,11 +32,11 @@ private:
 
 TEST_CASE("WindowDesc - ini_key uniqueness")
 {
-	std::set<std::string> seen;
+	std::set<std::string_view> seen;
 
 	for (const WindowDesc *window_desc : *_window_descs) {
 
-		if (window_desc->ini_key == nullptr) continue;
+		if (window_desc->ini_key.empty()) continue;
 
 		CAPTURE(window_desc->ini_key);
 		CHECK((seen.find(window_desc->ini_key) == std::end(seen)));
@@ -47,7 +49,7 @@ TEST_CASE("WindowDesc - ini_key validity")
 {
 	const WindowDesc *window_desc = GENERATE(from_range(std::begin(*_window_descs), std::end(*_window_descs)));
 
-	bool has_inikey = window_desc->ini_key != nullptr;
+	bool has_inikey = !window_desc->ini_key.empty();
 	bool has_widget = std::any_of(std::begin(window_desc->nwid_parts), std::end(window_desc->nwid_parts), [](const NWidgetPart &part) { return part.type == WWT_DEFSIZEBOX || part.type == WWT_STICKYBOX; });
 
 	INFO(fmt::format("{}:{}", window_desc->source_location.file_name(), window_desc->source_location.line()));
diff --git a/src/tests/tilearea.cpp b/src/tests/tilearea.cpp
new file mode 100644
index 0000000000..2821c5bfde
--- /dev/null
+++ b/src/tests/tilearea.cpp
@@ -0,0 +1,108 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file tilearea.cpp Test functionality from tilearea_type. */
+
+#include "../stdafx.h"
+
+#include "../3rdparty/catch2/catch.hpp"
+
+#include "../tilearea_type.h"
+#include "../map_func.h"
+
+#include "../safeguards.h"
+
+struct TileCoord {
+	uint x, y;
+};
+
+static void TestSpiralTileSequence(TileCoord center, uint diameter, std::span<TileCoord> expected)
+{
+	auto tile = TileXY(center.x, center.y);
+
+	std::vector<TileIndex> result;
+	for (auto ti : SpiralTileSequence(tile, diameter)) {
+		result.push_back(ti);
+	}
+	REQUIRE(result.size() == expected.size());
+	for (size_t i = 0; i < result.size(); ++i) {
+		CHECK(TileX(result[i]) == expected[i].x);
+		CHECK(TileY(result[i]) == expected[i].y);
+	}
+}
+
+static void TestSpiralTileSequence(TileCoord start_north, uint radius, uint w, uint h, std::span<TileCoord> expected)
+{
+	auto tile = TileXY(start_north.x, start_north.y);
+
+	std::vector<TileIndex> result;
+	for (auto ti : SpiralTileSequence(tile, radius, w, h)) {
+		result.push_back(ti);
+	}
+	REQUIRE(result.size() == expected.size());
+	for (size_t i = 0; i < result.size(); ++i) {
+		CHECK(TileX(result[i]) == expected[i].x);
+		CHECK(TileY(result[i]) == expected[i].y);
+	}
+}
+
+TEST_CASE("SpiralTileSequence - minimum")
+{
+	Map::Allocate(64, 64);
+
+	TileCoord expected[] = {{63, 63}};
+	TestSpiralTileSequence({63, 63}, 1, expected);
+	TestSpiralTileSequence({63, 63}, 2, expected);
+	TestSpiralTileSequence({63, 63}, 1, 0, 0, expected);
+	TestSpiralTileSequence({63, 63}, 1, 2, 2, expected);
+}
+
+TEST_CASE("SpiralTileSequence - odd")
+{
+	Map::Allocate(64, 64);
+
+	TileCoord expected[] = {
+		{1, 1},
+		{2, 0}, {1, 0}, {0, 0}, {0, 1}, {0, 2}, {1, 2}, {2, 2}, {2, 1},
+		{0, 3}, {1, 3}, {2, 3}, {3, 3}, {3, 2}, {3, 1}, {3, 0},
+	};
+	TestSpiralTileSequence({1, 1}, 5, expected);
+}
+
+TEST_CASE("SpiralTileSequence - even")
+{
+	Map::Allocate(64, 64);
+
+	TileCoord expected[] = {
+		{2, 1}, {1, 1}, {1, 2}, {2, 2},
+		{3, 0}, {2, 0}, {1, 0}, {0, 0}, {0, 1}, {0, 2}, {0, 3}, {1, 3}, {2, 3}, {3, 3}, {3, 2}, {3, 1},
+		{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0},
+	};
+	TestSpiralTileSequence({1, 1}, 6, expected);
+	TestSpiralTileSequence({1, 1}, 3, 0, 0, expected);
+}
+
+TEST_CASE("SpiralTileSequence - zero hole")
+{
+	Map::Allocate(64, 64);
+
+	TileCoord expected[] = {
+		{5, 2}, {4, 2}, {3, 2}, {2, 2}, {2, 3}, {3, 3}, {4, 3}, {5, 3},
+		{6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {1, 2}, {1, 3}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}, {6, 3}, {6, 2},
+	};
+	TestSpiralTileSequence({2, 2}, 2, 2, 0, expected);
+}
+
+TEST_CASE("SpiralTileSequence - normal hole")
+{
+	Map::Allocate(64, 64);
+
+	TileCoord expected[] = {
+		{4, 2}, {3, 2}, {2, 2}, {2, 3}, {2, 4}, {2, 5}, {3, 5}, {4, 5}, {4, 4}, {4, 3},
+	};
+	TestSpiralTileSequence({2, 2}, 1, 1, 2, expected);
+}
diff --git a/src/tests/utf8.cpp b/src/tests/utf8.cpp
index 1429fd6283..7c240f6030 100644
--- a/src/tests/utf8.cpp
+++ b/src/tests/utf8.cpp
@@ -15,8 +15,6 @@
 
 #include "../safeguards.h"
 
-using namespace std::literals;
-
 TEST_CASE("Utf8View - empty")
 {
 	Utf8View view;
diff --git a/src/textbuf.cpp b/src/textbuf.cpp
index 25d2481b60..a35834079a 100644
--- a/src/textbuf.cpp
+++ b/src/textbuf.cpp
@@ -154,21 +154,21 @@ bool Textbuf::InsertChar(char32_t key)
  * @param replacement_end Replace all characters from #insert_location up to this location with the new string.
  * @return True on successful change of Textbuf, or false otherwise.
  */
-bool Textbuf::InsertString(const char *str, bool marked, const char *caret, const char *insert_location, const char *replacement_end)
+bool Textbuf::InsertString(std::string_view str, bool marked, std::optional<size_t> caret, std::optional<size_t> insert_location, std::optional<size_t> replacement_end)
 {
 	uint16_t insertpos = (marked && this->marklength != 0) ? this->markpos : this->caretpos;
-	if (insert_location != nullptr) {
-		insertpos = insert_location - this->buf.data();
+	if (insert_location.has_value()) {
+		insertpos = static_cast<uint16_t>(*insert_location);
 		if (insertpos >= this->buf.size()) return false;
 
-		if (replacement_end != nullptr) {
-			this->DeleteText(insertpos, replacement_end - this->buf.data(), str == nullptr);
+		if (replacement_end.has_value()) {
+			this->DeleteText(insertpos, static_cast<uint16_t>(*replacement_end), str.empty());
 		}
 	} else {
-		if (marked) this->DiscardMarkedText(str == nullptr);
+		if (marked) this->DiscardMarkedText(str.empty());
 	}
 
-	if (str == nullptr) return false;
+	if (str.empty()) return false;
 
 	uint16_t chars = 0;
 	uint16_t bytes;
@@ -192,17 +192,17 @@ bool Textbuf::InsertString(const char *str, bool marked, const char *caret, cons
 	if (bytes == 0) return false;
 
 	/* Move caret if needed. */
-	if (str <= caret && caret <= str + bytes) this->caretpos = insertpos + (caret - str);
+	if (caret.has_value()) this->caretpos = insertpos + static_cast<uint16_t>(*caret);
 
 	if (marked) {
 		this->markpos = insertpos;
 		this->markend = insertpos + bytes;
 	}
 
-	this->buf.insert(insertpos, str, bytes);
+	this->buf.insert(insertpos, str.substr(0, bytes));
 
 	this->chars += chars;
-	if (!marked && caret == nullptr) this->caretpos += bytes;
+	if (!marked && !caret.has_value()) this->caretpos += bytes;
 	assert(this->buf.size() < this->max_bytes);
 	assert(this->chars <= this->max_chars);
 
@@ -225,7 +225,7 @@ bool Textbuf::InsertClipboard()
 	auto contents = GetClipboardContents();
 	if (!contents.has_value()) return false;
 
-	return this->InsertString(contents.value().c_str(), false);
+	return this->InsertString(contents.value(), false);
 }
 
 /**
@@ -281,9 +281,9 @@ void Textbuf::DiscardMarkedText(bool update)
  * Get the current text.
  * @return Current text.
  */
-const char *Textbuf::GetText() const
+std::string_view Textbuf::GetText() const
 {
-	return this->buf.c_str();
+	return this->buf;
 }
 
 /** Update the character iter after the text has changed. */
@@ -303,7 +303,7 @@ void Textbuf::UpdateWidth()
 /** Update pixel position of the caret. */
 void Textbuf::UpdateCaretPosition()
 {
-	const auto pos = GetCharPosInString(this->buf, &this->buf[this->caretpos], FS_NORMAL);
+	const auto pos = GetCharPosInString(this->buf, this->caretpos, FS_NORMAL);
 	this->caretxoffs = _current_text_dir == TD_LTR ? pos.left : pos.right;
 }
 
@@ -311,8 +311,8 @@ void Textbuf::UpdateCaretPosition()
 void Textbuf::UpdateMarkedText()
 {
 	if (this->markend != 0) {
-		const auto pos = GetCharPosInString(this->buf, &this->buf[this->markpos], FS_NORMAL);
-		const auto end = GetCharPosInString(this->buf, &this->buf[this->markend], FS_NORMAL);
+		const auto pos = GetCharPosInString(this->buf, this->markpos, FS_NORMAL);
+		const auto end = GetCharPosInString(this->buf, this->markend, FS_NORMAL);
 		this->markxoffs = std::min(pos.left, end.left);
 		this->marklength = std::max(pos.right, end.right) - this->markxoffs;
 	} else {
@@ -417,7 +417,7 @@ Textbuf::Textbuf(uint16_t max_bytes, uint16_t max_chars)
  * Copy a string into the textbuffer.
  * @param text Source.
  */
-void Textbuf::Assign(const std::string_view text)
+void Textbuf::Assign(std::string_view text)
 {
 	size_t bytes = std::min<size_t>(this->max_bytes - 1, text.size());
 	this->buf = StrMakeValid(text.substr(0, bytes));
diff --git a/src/textbuf_type.h b/src/textbuf_type.h
index 3e0a2661b3..99b8353d5b 100644
--- a/src/textbuf_type.h
+++ b/src/textbuf_type.h
@@ -43,13 +43,15 @@ struct Textbuf {
 
 	explicit Textbuf(uint16_t max_bytes, uint16_t max_chars = UINT16_MAX);
 
-	void Assign(const std::string_view text);
+	void Assign(std::string_view text);
 
 	void DeleteAll();
 	bool InsertClipboard();
 
 	bool InsertChar(char32_t key);
-	bool InsertString(const char *str, bool marked, const char *caret = nullptr, const char *insert_location = nullptr, const char *replacement_end = nullptr);
+	bool InsertString(std::string_view str, bool marked,
+			std::optional<size_t> caret = std::nullopt,
+			std::optional<size_t> insert_location = std::nullopt, std::optional<size_t> replacement_end = std::nullopt);
 
 	bool DeleteChar(uint16_t keycode);
 	bool MovePos(uint16_t keycode);
@@ -61,7 +63,7 @@ struct Textbuf {
 
 	void DiscardMarkedText(bool update = true);
 
-	const char *GetText() const;
+	std::string_view GetText() const;
 
 private:
 	std::string buf; ///< buffer in which text is saved
diff --git a/src/texteff.cpp b/src/texteff.cpp
index 152ab89181..82f832e2de 100644
--- a/src/texteff.cpp
+++ b/src/texteff.cpp
@@ -89,7 +89,7 @@ void RemoveTextEffect(TextEffectID te_id)
 }
 
 /** Slowly move text effects upwards. */
-IntervalTimer<TimerWindow> move_all_text_effects_interval = {std::chrono::milliseconds(30), [](uint count) {
+const IntervalTimer<TimerWindow> move_all_text_effects_interval = {std::chrono::milliseconds(30), [](uint count) {
 	if (_pause_mode.Any() && _game_mode != GM_EDITOR && _settings_game.construction.command_pause_level <= CMDPL_NO_CONSTRUCTION) return;
 
 	for (TextEffect &te : _text_effects) {
@@ -101,10 +101,10 @@ IntervalTimer<TimerWindow> move_all_text_effects_interval = {std::chrono::millis
 			continue;
 		}
 
-		te.MarkDirty(ZOOM_LVL_TEXT_EFFECT);
+		te.MarkDirty(ZoomLevel::TextEffect);
 		te.duration -= count;
 		te.top -= count * ZOOM_BASE;
-		te.MarkDirty(ZOOM_LVL_TEXT_EFFECT);
+		te.MarkDirty(ZoomLevel::TextEffect);
 	}
 }};
 
@@ -117,11 +117,11 @@ void InitTextEffects()
 void DrawTextEffects(DrawPixelInfo *dpi)
 {
 	/* Don't draw the text effects when zoomed out a lot */
-	if (dpi->zoom > ZOOM_LVL_TEXT_EFFECT) return;
+	if (dpi->zoom > ZoomLevel::TextEffect) return;
 	if (IsTransparencySet(TO_TEXT)) return;
 
 	ViewportStringFlags flags{};
-	if (dpi->zoom >= ZOOM_LVL_TEXT_EFFECT) flags.Set(ViewportStringFlag::Small);
+	if (dpi->zoom >= ZoomLevel::TextEffect) flags.Set(ViewportStringFlag::Small);
 
 	for (const TextEffect &te : _text_effects) {
 		if (!te.IsValid()) continue;
diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp
index 0ac1f3a3da..f474ead9c9 100644
--- a/src/textfile_gui.cpp
+++ b/src/textfile_gui.cpp
@@ -83,10 +83,11 @@ static WindowDesc _textfile_desc(
 	_nested_textfile_widgets
 );
 
-TextfileWindow::TextfileWindow(TextfileType file_type) : Window(_textfile_desc), file_type(file_type)
+TextfileWindow::TextfileWindow(Window *parent, TextfileType file_type) : Window(_textfile_desc), file_type(file_type)
 {
 	/* Init of nested tree is deferred.
 	 * TextfileWindow::ConstructWindow must be called by the inheriting window. */
+	this->parent = parent;
 }
 
 void TextfileWindow::ConstructWindow()
@@ -104,41 +105,26 @@ void TextfileWindow::ConstructWindow()
 }
 
 /**
- * Get the total height of the content displayed in this window, if wrapping is disabled.
- * @return the height in pixels
+ * Reset the reflow process to start on the next UI tick.
  */
-uint TextfileWindow::ReflowContent()
+void TextfileWindow::ReflowContent()
 {
-	uint height = 0;
-	if (!IsWidgetLowered(WID_TF_WRAPTEXT)) {
-		for (auto &line : this->lines) {
-			line.top = height;
-			height++;
-			line.bottom = height;
-		}
-	} else {
-		int max_width = this->GetWidget<NWidgetCore>(WID_TF_BACKGROUND)->current_x - WidgetDimensions::scaled.frametext.Horizontal();
-		for (auto &line : this->lines) {
-			line.top = height;
-			height += GetStringHeight(line.text, max_width, FS_MONO) / GetCharacterHeight(FS_MONO);
-			line.bottom = height;
-		}
-	}
+	/* Minimum number of lines that will be flowed. */
+	if (this->num_lines == 0) this->num_lines = std::size(this->lines);
 
-	return height;
-}
+	auto it = this->GetIteratorFromPosition(this->vscroll->GetPosition());
 
-uint TextfileWindow::GetContentHeight()
-{
-	if (this->lines.empty()) return 0;
-	return this->lines.back().bottom;
+	auto adapter = AlternatingView{this->lines, it};
+	this->reflow_iter = adapter.begin();
+	this->reflow_end = adapter.end();
 }
 
 /* virtual */ void TextfileWindow::UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize)
 {
 	switch (widget) {
 		case WID_TF_BACKGROUND:
-			resize.height = GetCharacterHeight(FS_MONO);
+			resize.width = GetCharacterHeight(FS_MONO); // Width is not available here as the font may not be loaded yet.
+			fill.height = resize.height = GetCharacterHeight(FS_MONO);
 
 			size.height = 4 * resize.height + WidgetDimensions::scaled.frametext.Vertical(); // At least 4 lines are visible.
 			size.width = std::max(200u, size.width); // At least 200 pixels wide.
@@ -147,20 +133,14 @@ uint TextfileWindow::GetContentHeight()
 }
 
 /** Set scrollbars to the right lengths. */
-void TextfileWindow::SetupScrollbars(bool force_reflow)
+void TextfileWindow::SetupScrollbars()
 {
-	if (IsWidgetLowered(WID_TF_WRAPTEXT)) {
-		/* Reflow is mandatory if text wrapping is on */
-		uint height = this->ReflowContent();
-		this->vscroll->SetCount(ClampTo<uint16_t>(height));
-		this->hscroll->SetCount(0);
-	} else {
-		uint height = force_reflow ? this->ReflowContent() : this->GetContentHeight();
-		this->vscroll->SetCount(ClampTo<uint16_t>(height));
-		this->hscroll->SetCount(this->max_length);
-	}
+	this->vscroll->SetCount(this->num_lines);
+	this->hscroll->SetCount(this->IsTextWrapped() ? 0 : CeilDiv(this->max_width, this->resize.step_width));
 
-	this->SetWidgetDisabledState(WID_TF_HSCROLLBAR, IsWidgetLowered(WID_TF_WRAPTEXT));
+	this->SetWidgetDirty(WID_TF_VSCROLLBAR);
+	this->SetWidgetDirty(WID_TF_HSCROLLBAR);
+	this->SetWidgetDisabledState(WID_TF_HSCROLLBAR, this->IsTextWrapped());
 }
 
 
@@ -307,18 +287,17 @@ const TextfileWindow::Hyperlink *TextfileWindow::GetHyperlink(Point pt) const
 
 	/* Which line was clicked. */
 	const int clicked_row = this->GetRowFromWidget(pt.y, WID_TF_BACKGROUND, WidgetDimensions::scaled.frametext.top, GetCharacterHeight(FS_MONO)) + this->GetScrollbar(WID_TF_VSCROLLBAR)->GetPosition();
-	size_t line_index;
-	size_t subline;
-	if (IsWidgetLowered(WID_TF_WRAPTEXT)) {
-		auto it = std::ranges::find_if(this->lines, [clicked_row](const Line &l) { return l.top <= clicked_row && l.bottom > clicked_row; });
-		if (it == this->lines.cend()) return nullptr;
-		line_index = it - this->lines.cbegin();
-		subline = clicked_row - it->top;
-		Debug(misc, 4, "TextfileWindow check hyperlink: clicked_row={}, line_index={}, line.top={}, subline={}", clicked_row, line_index, it->top, subline);
-	} else {
-		line_index = clicked_row / GetCharacterHeight(FS_MONO);
-		subline = 0;
-	}
+
+	int visible_line = 0;
+	auto it = std::ranges::find_if(this->lines, [&visible_line, clicked_row](const Line &l) {
+		visible_line += l.num_lines;
+		return (visible_line - l.num_lines) <= clicked_row && visible_line > clicked_row;
+	});
+	if (it == this->lines.cend()) return nullptr;
+
+	size_t line_index = it - this->lines.cbegin();
+	size_t subline = clicked_row - (visible_line - it->num_lines);
+	Debug(misc, 4, "TextfileWindow check hyperlink: clicked_row={}, line_index={}, line.top={}, subline={}", clicked_row, line_index, visible_line - it->num_lines, subline);
 
 	/* Find hyperlinks in this line. */
 	std::vector<const Hyperlink *> found_links;
@@ -328,12 +307,12 @@ const TextfileWindow::Hyperlink *TextfileWindow::GetHyperlink(Point pt) const
 	if (found_links.empty()) return nullptr;
 
 	/* Build line layout to figure out character position that was clicked. */
-	uint window_width = IsWidgetLowered(WID_TF_WRAPTEXT) ? this->GetWidget<NWidgetCore>(WID_TF_BACKGROUND)->current_x - WidgetDimensions::scaled.frametext.Horizontal() : INT_MAX;
-	Layouter layout(this->lines[line_index].text, window_width, FS_MONO);
+	const Line &line = this->lines[line_index];
+	Layouter layout(line.text, line.wrapped_width, FS_MONO);
 	assert(subline < layout.size());
 	ptrdiff_t char_index = layout.GetCharAtPosition(pt.x - WidgetDimensions::scaled.frametext.left, subline);
 	if (char_index < 0) return nullptr;
-	Debug(misc, 4, "TextfileWindow check hyperlink click: line={}, subline={}, char_index={}", line_index, subline, (int)char_index);
+	Debug(misc, 4, "TextfileWindow check hyperlink click: line={}, subline={}, char_index={}", line_index, subline, char_index);
 
 	/* Found character index in line, check if any links are at that position. */
 	for (const Hyperlink *link : found_links) {
@@ -569,6 +548,14 @@ void TextfileWindow::AfterLoadMarkdown()
 
 /* virtual */ void TextfileWindow::DrawWidget(const Rect &r, WidgetID widget) const
 {
+	if (widget == WID_TF_CAPTION && std::size(this->lines) > 0 && this->reflow_iter != this->reflow_end) {
+		/* Draw a progress bar in the caption. */
+		Rect fr = r.Shrink(WidgetDimensions::scaled.captiontext).WithHeight(WidgetDimensions::scaled.vsep_normal, true);
+		size_t remaining = std::distance(this->reflow_iter, this->reflow_end);
+		fr = fr.WithWidth(static_cast<int>(remaining * fr.Width() / std::size(this->lines)), _current_text_dir != TD_RTL);
+		GfxFillRect(fr, PC_WHITE, FILLRECT_CHECKER);
+	}
+
 	if (widget != WID_TF_BACKGROUND) return;
 
 	Rect fr = r.Shrink(WidgetDimensions::scaled.frametext);
@@ -581,18 +568,21 @@ void TextfileWindow::AfterLoadMarkdown()
 	fr = fr.Translate(-fr.left, -fr.top);
 	int line_height = GetCharacterHeight(FS_MONO);
 
-	if (!IsWidgetLowered(WID_TF_WRAPTEXT)) fr = ScrollRect(fr, *this->hscroll, 1);
+	if (!this->IsTextWrapped()) fr = ScrollRect(fr, *this->hscroll, this->resize.step_width);
 
 	int pos = this->vscroll->GetPosition();
 	int cap = this->vscroll->GetCapacity();
-
+	int cur_line = 0;
 	for (auto &line : this->lines) {
-		if (line.bottom < pos) continue;
-		if (line.top > pos + cap) break;
+		int top = cur_line;
+		cur_line += line.num_lines;
+		if (cur_line <= pos) continue;
+		if (top > pos + cap) break;
 
-		int y_offset = (line.top - pos) * line_height;
-		if (IsWidgetLowered(WID_TF_WRAPTEXT)) {
-			DrawStringMultiLine(fr.left, fr.right, y_offset, fr.bottom, line.text, line.colour, SA_TOP | SA_LEFT, false, FS_MONO);
+		int y_offset = (top - pos) * line_height;
+		if (line.wrapped_width != 0) {
+			Rect tr = fr.WithWidth(line.wrapped_width, _current_text_dir == TD_RTL);
+			DrawStringMultiLineWithClipping(tr.left, tr.right, y_offset, y_offset + line.num_lines * line_height, line.text, line.colour, SA_TOP | SA_LEFT, false, FS_MONO);
 		} else {
 			DrawString(fr.left, fr.right, y_offset, line.text, line.colour, SA_TOP | SA_LEFT, false, FS_MONO);
 		}
@@ -604,36 +594,149 @@ void TextfileWindow::AfterLoadMarkdown()
 	this->vscroll->SetCapacityFromWidget(this, WID_TF_BACKGROUND, WidgetDimensions::scaled.frametext.Vertical());
 	this->hscroll->SetCapacityFromWidget(this, WID_TF_BACKGROUND, WidgetDimensions::scaled.framerect.Horizontal());
 
-	this->SetupScrollbars(false);
+	this->UpdateVisibleIterators();
+	this->ReflowContent();
+	this->SetupScrollbars();
+}
+
+/* virtual */ void TextfileWindow::OnInit()
+{
+	/* If font has changed we need to recalculate the maximum width. */
+	this->num_lines = 0;
+	this->max_width = 0;
+	for (auto &line : this->lines) {
+		line.max_width = -1;
+		line.num_lines = 1;
+		line.wrapped_width = 0;
+	}
+
+	this->ReflowContent();
 }
 
 /* virtual */ void TextfileWindow::OnInvalidateData([[maybe_unused]] int data, [[maybe_unused]] bool gui_scope)
 {
 	if (!gui_scope) return;
 
-	this->SetupScrollbars(true);
+	this->ReflowContent();
+	this->SetupScrollbars();
 }
 
-void TextfileWindow::OnDropdownSelect(WidgetID widget, int index)
+void TextfileWindow::OnDropdownSelect(WidgetID widget, int index, int)
 {
 	if (widget != WID_TF_JUMPLIST) return;
 
 	this->ScrollToLine(index);
 }
 
+extern bool CanContinueRealtimeTick();
+
+TextfileWindow::ReflowState TextfileWindow::ContinueReflow()
+{
+	if (this->reflow_iter == this->reflow_end) return ReflowState::None;
+
+	int window_width = this->GetWidget<NWidgetCore>(WID_TF_BACKGROUND)->current_x - WidgetDimensions::scaled.frametext.Horizontal();
+
+	bool wrapped = this->IsTextWrapped();
+	bool dirty = false;
+	int pos = this->vscroll->GetPosition();
+
+	for (/* nothing */; this->reflow_iter != this->reflow_end; ++this->reflow_iter) {
+		auto it = this->reflow_iter.Base();
+		Line &line = *it;
+
+		int old_lines = line.num_lines;
+		if (wrapped) {
+			if (line.wrapped_width != window_width) {
+				line.num_lines = GetStringHeight(line.text, window_width, FS_MONO) / GetCharacterHeight(FS_MONO);
+				line.wrapped_width = window_width;
+			}
+		} else {
+			if (line.max_width == -1) {
+				line.max_width = GetStringBoundingBox(line.text, FS_MONO).width;
+				this->max_width = std::max(this->max_width, line.max_width);
+			}
+			line.num_lines = 1;
+			line.wrapped_width = 0;
+		}
+
+		/* Adjust the total number of lines. */
+		this->num_lines += (line.num_lines - old_lines);
+
+		/* Maintain scroll position. */
+		if (this->visible_first > it) pos += (line.num_lines - old_lines);
+
+		/* Mark dirty if visible range is touched. */
+		if (it >= this->visible_first && it <= this->visible_last) dirty = true;
+
+		if (!CanContinueRealtimeTick()) break;
+	}
+
+	if (this->vscroll->SetPosition(pos)) dirty = true;
+
+	return dirty ? ReflowState::VisibleReflowed : ReflowState::Reflowed;
+}
+
+void TextfileWindow::OnRealtimeTick(uint)
+{
+	auto r = this->ContinueReflow();
+	if (r == ReflowState::None) return;
+
+	this->SetupScrollbars();
+
+	if (r == ReflowState::VisibleReflowed) {
+		this->SetWidgetDirty(WID_TF_BACKGROUND);
+		this->UpdateVisibleIterators();
+	}
+
+	/* Caption is always dirty. */
+	this->SetWidgetDirty(WID_TF_CAPTION);
+}
+
+void TextfileWindow::UpdateVisibleIterators()
+{
+	int pos = this->vscroll->GetPosition();
+	int cap = this->vscroll->GetCapacity();
+	this->visible_first = this->GetIteratorFromPosition(pos);
+
+	/* The last visible iterator ignores line wrapping so that it does not need to change when line heights change. */
+	this->visible_last = std::ranges::next(this->visible_first, cap + 1, std::end(this->lines));
+}
+
+void TextfileWindow::OnScrollbarScroll(WidgetID widget)
+{
+	if (widget != WID_TF_VSCROLLBAR) return;
+
+	this->UpdateVisibleIterators();
+	this->ReflowContent();
+}
+
+std::vector<TextfileWindow::Line>::iterator TextfileWindow::GetIteratorFromPosition(int pos)
+{
+	for (auto it = std::begin(this->lines); it != std::end(this->lines); ++it) {
+		pos -= it->num_lines;
+		if (pos <= 0) return it;
+	}
+	return std::end(this->lines);
+}
+
 void TextfileWindow::ScrollToLine(size_t line)
 {
 	Scrollbar *sb = this->GetScrollbar(WID_TF_VSCROLLBAR);
-	int newpos;
-	if (this->IsWidgetLowered(WID_TF_WRAPTEXT)) {
-		newpos = this->lines[line].top;
-	} else {
-		newpos = static_cast<int>(line);
+	int newpos = 0;
+	for (auto it = std::begin(this->lines); it != std::end(this->lines) && line > 0; --line, ++it) {
+		newpos += it->num_lines;
 	}
 	sb->SetPosition(std::min(newpos, sb->GetCount() - sb->GetCapacity()));
+	this->UpdateVisibleIterators();
+	this->ReflowContent();
 	this->SetDirty();
 }
 
+bool TextfileWindow::IsTextWrapped() const
+{
+	return this->IsWidgetLowered(WID_TF_WRAPTEXT);
+}
+
 /* virtual */ void TextfileWindow::Reset()
 {
 	this->search_iterator = 0;
@@ -656,7 +759,7 @@ void TextfileWindow::ScrollToLine(size_t line)
 	return true;
 }
 
-/* virtual */ void TextfileWindow::SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] const char *font_name, [[maybe_unused]] const void *os_data)
+/* virtual */ void TextfileWindow::SetFontNames([[maybe_unused]] FontCacheSettings *settings, [[maybe_unused]] std::string_view font_name, [[maybe_unused]] const void *os_data)
 {
 #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
 	settings->mono.font = font_name;
@@ -679,8 +782,7 @@ static std::vector<char> Gunzip(std::span<char> input)
 	static const int BLOCKSIZE = 8192;
 	std::vector<char> output;
 
-	z_stream z;
-	memset(&z, 0, sizeof(z));
+	z_stream z{};
 	z.next_in = reinterpret_cast<Bytef *>(input.data());
 	z.avail_in = static_cast<uInt>(input.size());
 
@@ -809,25 +911,17 @@ void TextfileWindow::LoadText(std::string_view buf)
 
 	/* Split the string on newlines. */
 	std::string_view p(text);
-	int row = 0;
 	auto next = p.find_first_of('\n');
 	while (next != std::string_view::npos) {
-		this->lines.emplace_back(row, p.substr(0, next));
+		this->lines.emplace_back(p.substr(0, next));
 		p.remove_prefix(next + 1);
 
-		row++;
 		next = p.find_first_of('\n');
 	}
-	this->lines.emplace_back(row, p);
-
-	/* Calculate maximum text line length. */
-	uint max_length = 0;
-	for (auto &line : this->lines) {
-		max_length = std::max(max_length, GetStringBoundingBox(line.text, FS_MONO).width);
-	}
-	this->max_length = max_length;
+	this->lines.emplace_back(p);
 
 	this->AfterLoadText();
+	this->ReflowContent();
 
 	CheckForMissingGlyphs(true, this);
 
@@ -842,9 +936,9 @@ void TextfileWindow::LoadText(std::string_view buf)
  * @param filename The filename of the content to look for.
  * @return The path to the textfile, \c nullptr otherwise.
  */
-std::optional<std::string> GetTextfile(TextfileType type, Subdirectory dir, const std::string &filename)
+std::optional<std::string> GetTextfile(TextfileType type, Subdirectory dir, std::string_view filename)
 {
-	static const char * const prefixes[] = {
+	static const std::string_view prefixes[] = {
 		"readme",
 		"changelog",
 		"license",
@@ -861,9 +955,9 @@ std::optional<std::string> GetTextfile(TextfileType type, Subdirectory dir, cons
 	auto slash = filename.find_last_of(PATHSEPCHAR);
 	if (slash == std::string::npos) return std::nullopt;
 
-	std::string_view base_path(filename.data(), slash + 1);
+	std::string_view base_path = filename.substr(0, slash + 1);
 
-	static const std::initializer_list<std::string_view> extensions{
+	static const std::initializer_list<const std::string_view> extensions{
 		"txt",
 		"md",
 #if defined(WITH_ZLIB)
diff --git a/src/textfile_gui.h b/src/textfile_gui.h
index d0b35dacba..74034852bf 100644
--- a/src/textfile_gui.h
+++ b/src/textfile_gui.h
@@ -10,12 +10,13 @@
 #ifndef TEXTFILE_GUI_H
 #define TEXTFILE_GUI_H
 
+#include "misc/alternating_iterator.hpp"
 #include "fileio_type.h"
 #include "strings_func.h"
 #include "textfile_type.h"
 #include "window_gui.h"
 
-std::optional<std::string> GetTextfile(TextfileType type, Subdirectory dir, const std::string &filename);
+std::optional<std::string> GetTextfile(TextfileType type, Subdirectory dir, std::string_view filename);
 
 /** Window for displaying a textfile */
 struct TextfileWindow : public Window, MissingGlyphSearcher {
@@ -28,29 +29,34 @@ struct TextfileWindow : public Window, MissingGlyphSearcher {
 	bool OnTooltip([[maybe_unused]] Point pt, WidgetID widget, TooltipCloseCondition close_cond) override;
 	void DrawWidget(const Rect &r, WidgetID widget) const override;
 	void OnResize() override;
+	void OnInit() override;
 	void OnInvalidateData(int data = 0, bool gui_scope = true) override;
-	void OnDropdownSelect(WidgetID widget, int index) override;
+	void OnDropdownSelect(WidgetID widget, int index, int) override;
+	void OnRealtimeTick(uint delta_ms) override;
+	void OnScrollbarScroll(WidgetID widget) override;
 
 	void Reset() override;
 	FontSize DefaultSize() override;
 	std::optional<std::string_view> NextString() override;
 	bool Monospace() override;
-	void SetFontNames(FontCacheSettings *settings, const char *font_name, const void *os_data) override;
+	void SetFontNames(FontCacheSettings *settings, std::string_view font_name, const void *os_data) override;
 	void ScrollToLine(size_t line);
+	bool IsTextWrapped() const;
 
 	virtual void LoadTextfile(const std::string &textfile, Subdirectory dir);
 
 protected:
-	TextfileWindow(TextfileType file_type);
+	TextfileWindow(Window *parent, TextfileType file_type);
 	void ConstructWindow();
 
 	struct Line {
-		int top = 0;                  ///< Top scroll position in visual lines.
-		int bottom = 0;               ///< Bottom scroll position in visual lines.
-		std::string text{};           ///< Contents of the line.
+		int num_lines = 1; ///< Number of visual lines for this line.
+		int wrapped_width = 0;
+		int max_width = -1;
 		TextColour colour = TC_WHITE; ///< Colour to render text line in.
+		std::string text{};           ///< Contents of the line.
 
-		Line(int top, std::string_view text) : top(top), bottom(top + 1), text(text) {}
+		Line(std::string_view text) : text(text) {}
 		Line() {}
 	};
 
@@ -99,11 +105,29 @@ protected:
 
 private:
 	uint search_iterator = 0; ///< Iterator for the font check search.
-	uint max_length = 0; ///< Maximum length of unwrapped text line.
+	int max_width = 0; ///< Maximum length of unwrapped text line.
+	size_t num_lines = 0; ///< Number of lines of text, taking account of wrapping.
 
-	uint ReflowContent();
-	uint GetContentHeight();
-	void SetupScrollbars(bool force_reflow);
+	using LineIterator = std::vector<Line>::iterator;
+	using ReflowIterator = AlternatingIterator<LineIterator>;
+
+	ReflowIterator reflow_iter; ///< Current iterator for reflow.
+	ReflowIterator reflow_end; ///< End iterator for reflow.
+
+	LineIterator visible_first; ///< Iterator to first visible element.
+	LineIterator visible_last; ///< Iterator to last visible element.
+
+	enum class ReflowState : uint8_t {
+		None, ///< Nothing has been reflowed.
+		Reflowed, ///< Content has been reflowed.
+		VisibleReflowed, ///< Visible content has been reflowed.
+	};
+
+	std::vector<TextfileWindow::Line>::iterator GetIteratorFromPosition(int pos);
+	void UpdateVisibleIterators();
+	void ReflowContent();
+	ReflowState ContinueReflow();
+	void SetupScrollbars();
 	const Hyperlink *GetHyperlink(Point pt) const;
 
 	void AfterLoadMarkdown();
diff --git a/src/thread.h b/src/thread.h
index 55b883a043..dd9177fff3 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -30,7 +30,7 @@ inline void CSleep(int milliseconds)
  * Name the thread this function is called on for the debugger.
  * @param name Name to set for the thread..
  */
-void SetCurrentThreadName(const char *name);
+void SetCurrentThreadName(const std::string &name);
 
 
 /**
@@ -44,13 +44,13 @@ void SetCurrentThreadName(const char *name);
  * @return True if the thread was successfully started, false otherwise.
  */
 template <class TFn, class... TArgs>
-inline bool StartNewThread(std::thread *thr, const char *name, TFn&& _Fx, TArgs&&... _Ax)
+inline bool StartNewThread(std::thread *thr, std::string_view name, TFn&& _Fx, TArgs&&... _Ax)
 {
 	try {
 		static std::mutex thread_startup_mutex;
 		std::lock_guard<std::mutex> lock(thread_startup_mutex);
 
-		std::thread t([] (const char *name, TFn&& F, TArgs&&... A) {
+		std::thread t([] (std::string name, TFn&& F, TArgs&&... A) {
 				/* Delay starting the thread till the main thread is finished
 				 * with the administration. This prevent race-conditions on
 				 * startup. */
@@ -68,7 +68,7 @@ inline bool StartNewThread(std::thread *thr, const char *name, TFn&& _Fx, TArgs&
 				} catch (...) {
 					NOT_REACHED();
 				}
-			}, name, std::forward<TFn>(_Fx), std::forward<TArgs>(_Ax)...);
+			}, std::string{name}, std::forward<TFn>(_Fx), std::forward<TArgs>(_Ax)...);
 
 		if (thr != nullptr) {
 			*thr = std::move(t);
diff --git a/src/tile_cmd.h b/src/tile_cmd.h
index 59c942a94b..ec3563887c 100644
--- a/src/tile_cmd.h
+++ b/src/tile_cmd.h
@@ -17,27 +17,13 @@
 #include "tile_map.h"
 #include "timer/timer_game_calendar.h"
 
-/** The returned bits of VehicleEnterTile. */
-enum VehicleEnterTileStatus : uint32_t {
-	VETS_ENTERED_STATION  = 1, ///< The vehicle entered a station
-	VETS_ENTERED_WORMHOLE = 2, ///< The vehicle either entered a bridge, tunnel or depot tile (this includes the last tile of the bridge/tunnel)
-	VETS_CANNOT_ENTER     = 3, ///< The vehicle cannot enter the tile
-
-	/**
-	 * Shift the VehicleEnterTileStatus this many bits
-	 * to the right to get the station ID when
-	 * VETS_ENTERED_STATION is set
-	 */
-	VETS_STATION_ID_OFFSET = 8,
-	VETS_STATION_MASK      = 0xFFFF << VETS_STATION_ID_OFFSET,
-
-	/** Bit sets of the above specified bits */
-	VETSB_CONTINUE         = 0,                          ///< The vehicle can continue normally
-	VETSB_ENTERED_STATION  = 1 << VETS_ENTERED_STATION,  ///< The vehicle entered a station
-	VETSB_ENTERED_WORMHOLE = 1 << VETS_ENTERED_WORMHOLE, ///< The vehicle either entered a bridge, tunnel or depot tile (this includes the last tile of the bridge/tunnel)
-	VETSB_CANNOT_ENTER     = 1 << VETS_CANNOT_ENTER,     ///< The vehicle cannot enter the tile
+enum class VehicleEnterTileState : uint8_t {
+	EnteredStation, ///< The vehicle entered a station
+	EnteredWormhole, ///< The vehicle either entered a bridge, tunnel or depot tile (this includes the last tile of the bridge/tunnel)
+	CannotEnter, ///< The vehicle cannot enter the tile
 };
-DECLARE_ENUM_AS_BIT_SET(VehicleEnterTileStatus)
+
+using VehicleEnterTileStates = EnumBitSet<VehicleEnterTileState, uint8_t>;
 
 /** Tile information, used while rendering the tile */
 struct TileInfo {
@@ -131,8 +117,7 @@ typedef void AnimateTileProc(TileIndex tile);
 typedef void TileLoopProc(TileIndex tile);
 typedef void ChangeTileOwnerProc(TileIndex tile, Owner old_owner, Owner new_owner);
 
-/** @see VehicleEnterTileStatus to see what the return values mean */
-typedef VehicleEnterTileStatus VehicleEnterTileProc(Vehicle *v, TileIndex tile, int x, int y);
+typedef VehicleEnterTileStates VehicleEnterTileProc(Vehicle *v, TileIndex tile, int x, int y);
 typedef Foundation GetFoundationProc(TileIndex tile, Slope tileh);
 
 /**
@@ -176,7 +161,7 @@ struct TileTypeProcs {
 extern const TileTypeProcs * const _tile_type_procs[16];
 
 TrackStatus GetTileTrackStatus(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side = INVALID_DIAGDIR);
-VehicleEnterTileStatus VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y);
+VehicleEnterTileStates VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y);
 void ChangeTileOwner(TileIndex tile, Owner old_owner, Owner new_owner);
 void GetTileDesc(TileIndex tile, TileDesc &td);
 
diff --git a/src/tilearea.cpp b/src/tilearea.cpp
index 83705a82c1..09560c9f5c 100644
--- a/src/tilearea.cpp
+++ b/src/tilearea.cpp
@@ -295,3 +295,105 @@ TileIterator &DiagonalTileIterator::operator++()
 	}
 	return std::make_unique<OrthogonalTileIterator>(corner1, corner2);
 }
+
+/**
+ * See SpiralTileSequence constructor for description.
+ */
+SpiralTileIterator::SpiralTileIterator(TileIndex center, uint diameter) :
+	max_radius(diameter / 2),
+	cur_radius(0),
+	dir(DIAGDIR_BEGIN)
+{
+	assert(diameter > 0);
+
+	if (diameter % 2 == 1) {
+		this->extent.fill(1);
+		this->dir = INVALID_DIAGDIR; // special case for odd diameters, see Increment()
+		this->position = 0;
+
+		this->x = TileX(center);
+		this->y = TileY(center);
+	} else {
+		this->extent.fill(0);
+		this->dir = DIAGDIR_BEGIN;
+		this->InitPosition();
+
+		/* Start with the west corner of the center 2x2 rect */
+		this->x = TileX(center) + 1;
+		this->y = TileY(center);
+	}
+	this->SkipOutsideMap();
+}
+
+/**
+ * See SpiralTileSequence constructor for description.
+ */
+SpiralTileIterator::SpiralTileIterator(TileIndex start_north, uint radius, uint w, uint h) :
+	max_radius(radius),
+	extent{w, h, w, h},
+	cur_radius(0),
+	dir(DIAGDIR_BEGIN),
+	/* first tile is the west corner */
+	x(TileX(start_north) + w + 1),
+	y(TileY(start_north))
+{
+	assert(max_radius > 0);
+	this->InitPosition();
+	this->SkipOutsideMap();
+}
+
+/**
+ * Advance the internal state until it reaches a valid tile or the end.
+ */
+void SpiralTileIterator::SkipOutsideMap()
+{
+	while (!this->IsEnd() && (this->x >= Map::SizeX() || this->y >= Map::SizeY())) this->Increment();
+}
+
+/**
+ * Initialise "position" after "dir" was changed.
+ */
+void SpiralTileIterator::InitPosition()
+{
+	this->position = this->extent[this->dir] + this->cur_radius * 2 + 1;
+}
+
+/**
+ * Advance the internal state to the next potential tile.
+ * The tile may be outside the map though.
+ */
+void SpiralTileIterator::Increment()
+{
+	assert(!this->IsEnd());
+
+	/* Special value for first tile in areas with odd diameter */
+	if (this->dir == INVALID_DIAGDIR) {
+		const auto west = TileIndexDiffCByDir(DIR_W);
+		this->x += west.x;
+		this->y += west.y;
+		this->dir = DIAGDIR_BEGIN;
+		this->InitPosition();
+		return;
+	}
+
+	/* Step to the next 'neighbour' in the circular line */
+	const auto diff = TileIndexDiffCByDiagDir(this->dir);
+	this->x += diff.x;
+	this->y += diff.y;
+	--this->position;
+	if (this->position > 0) return;
+
+	/* Corner reached, switch direction */
+	++this->dir;
+
+	if (this->dir == DIAGDIR_END) {
+		/* Jump to next circle */
+		const auto west = TileIndexDiffCByDir(DIR_W);
+		this->x += west.x;
+		this->y += west.y;
+		++this->cur_radius;
+		this->dir = DIAGDIR_BEGIN;
+	}
+
+	this->InitPosition();
+}
diff --git a/src/tilearea_type.h b/src/tilearea_type.h
index 9add7cfe8b..85a910a97b 100644
--- a/src/tilearea_type.h
+++ b/src/tilearea_type.h
@@ -253,4 +253,122 @@ public:
 	}
 };
 
+/**
+ * Helper class for SpiralTileSequence.
+ */
+class SpiralTileIterator {
+public:
+	using value_type = TileIndex;
+	using difference_type = std::ptrdiff_t;
+	using iterator_category = std::forward_iterator_tag;
+	using pointer = void;
+	using reference = void;
+
+	SpiralTileIterator(TileIndex center, uint diameter);
+	SpiralTileIterator(TileIndex start_north, uint radius, uint w, uint h);
+
+	bool operator==(const SpiralTileIterator &rhs) const { return this->x == rhs.x && this->y == rhs.y; }
+	bool operator==(const std::default_sentinel_t &) const { return this->IsEnd(); }
+
+	TileIndex operator*() const { return TileXY(this->x, this->y); }
+
+	SpiralTileIterator &operator++()
+	{
+		this->Increment();
+		this->SkipOutsideMap();
+		return *this;
+	}
+
+	SpiralTileIterator operator++(int)
+	{
+		SpiralTileIterator result = *this;
+		++*this;
+		return result;
+	}
+
+private:
+	/* set by constructor, const afterwards */
+	uint max_radius;
+	std::array<uint, DIAGDIR_END> extent;
+
+	/* mutable iterator state */
+	uint cur_radius;
+	DiagDirection dir;
+	uint position;
+	uint x, y;
+
+	void SkipOutsideMap();
+	void InitPosition();
+	void Increment();
+
+	/**
+	 * Test whether the iterator reached the end.
+	 */
+	bool IsEnd() const
+	{
+		return this->cur_radius == this->max_radius && this->dir != INVALID_DIAGDIR;
+	}
+};
+
+/**
+ * Generate TileIndices around a center tile or tile area, with increasing distance.
+ */
+class SpiralTileSequence {
+public:
+	/**
+	 * Generate TileIndices for a square area around a center tile.
+	 *
+	 * The size of the square is given by the length of the edge.
+	 * If the size is even, the south extent will be larger than the north extent.
+	 *
+	 * Example for diameter=4, [ ] is the "center":
+	 *        1
+	 *      1   1
+	 *    1  [0]  1
+	 *  1   0   0   1
+	 *    1   0   1
+	 *      1   1
+	 *        1
+	 * The sequence starts with the "0" tiles, and continues with the shells around it.
+	 *
+	 * @param center Center of the square area.
+	 * @param diameter Edge length of the square.
+	 * @pre diameter > 0
+	 * @note This constructor uses a "diameter", unlike the other constructor using a "radius".
+	 */
+	SpiralTileSequence(TileIndex center, uint diameter) : start(center, diameter) {}
+
+	/**
+	 * Generate TileIndices for a rectangular area with an optional rectangular hole in the center.
+	 * The TileIndices will be sorted by increasing distance from the center (hole).
+	 *
+	 * Example for radius=2, w=2, h=1, [ ] is "start_north":
+	 *            1
+	 *          1   1
+	 *        1  [0]  1
+	 *      1   0   0   1
+	 *    1   0   H   0   1
+	 *  1   0   H   0   1
+	 *    1   0   0   1
+	 *      1   0   1
+	 *        1   1
+	 *          1
+	 * The sequence starts with the "0" tiles, and continues with the shells around it.
+	 *
+	 * @param start_north Tile directly north from the center hole.
+	 * @param radius Radial distance between outer rectangle and center hole.
+	 * @param w Width of the inner rectangular hole.
+	 * @param h Height of the inner rectangular hole.
+	 * @pre radius > 0
+	 * @note This constructor uses a "radius", unlike the other constructor using a "diameter".
+	 */
+	SpiralTileSequence(TileIndex start_north, uint radius, uint w, uint h) : start(start_north, radius, w, h) {}
+
+	SpiralTileIterator begin() const { return start; }
+	std::default_sentinel_t end() const { return std::default_sentinel_t(); }
+
+private:
+	SpiralTileIterator start;
+};
+
 #endif /* TILEAREA_TYPE_H */
diff --git a/src/timer/timer_game_calendar.h b/src/timer/timer_game_calendar.h
index 602d96e429..19eb1b1d93 100644
--- a/src/timer/timer_game_calendar.h
+++ b/src/timer/timer_game_calendar.h
@@ -10,7 +10,6 @@
 #ifndef TIMER_GAME_CALENDAR_H
 #define TIMER_GAME_CALENDAR_H
 
-#include "../stdafx.h"
 #include "../core/strong_typedef_type.hpp"
 #include "timer_game_common.h"
 
diff --git a/src/timer/timer_manager.h b/src/timer/timer_manager.h
index 92e45ccc17..e6e5b6eed1 100644
--- a/src/timer/timer_manager.h
+++ b/src/timer/timer_manager.h
@@ -11,8 +11,6 @@
 #ifndef TIMER_MANAGER_H
 #define TIMER_MANAGER_H
 
-#include "../stdafx.h"
-
 template <typename TTimerType>
 class BaseTimer;
 
diff --git a/src/timer/timer_window.cpp b/src/timer/timer_window.cpp
index 2016d19f5d..9ec0f0163d 100644
--- a/src/timer/timer_window.cpp
+++ b/src/timer/timer_window.cpp
@@ -43,8 +43,8 @@ void TimeoutTimer<TimerWindow>::Elapsed(TimerWindow::TElapsed delta)
 	this->storage.elapsed += delta;
 
 	if (this->storage.elapsed >= this->period) {
-		this->callback();
 		this->fired = true;
+		this->callback();
 	}
 }
 
diff --git a/src/timer/timer_window.h b/src/timer/timer_window.h
index b32048b4c4..789d82618b 100644
--- a/src/timer/timer_window.h
+++ b/src/timer/timer_window.h
@@ -32,4 +32,7 @@ public:
 	};
 };
 
+/** Interval used by blinking interface elements. */
+static constexpr std::chrono::milliseconds TIMER_BLINK_INTERVAL{450};
+
 #endif /* TIMER_WINDOW_H */
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp
index a5988a00b7..cefeed144c 100644
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -482,7 +482,8 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
 	assert(real_current_order != nullptr);
 
 	VehicleOrderID first_manual_order = 0;
-	for (Order *o = v->GetFirstOrder(); o != nullptr && o->IsType(OT_IMPLICIT); o = o->next) {
+	for (const Order &o : v->Orders()) {
+		if (!o.IsType(OT_IMPLICIT)) break;
 		++first_manual_order;
 	}
 
@@ -522,8 +523,7 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
 	/* Before modifying waiting times, check whether we want to preserve bigger ones. */
 	if (!real_current_order->IsType(OT_CONDITIONAL) &&
 			(travelling || time_taken > real_current_order->GetWaitTime() || remeasure_wait_time)) {
-		/* Round up to the unit currently shown in the GUI for days and seconds.
-		 * Round up to seconds if currently used display style is ticks.
+		/* Round up to the smallest unit of time commonly shown in the GUI (seconds) to avoid confusion.
 		 * Players timetabling in Ticks can adjust later.
 		 * For trains/aircraft multiple movement cycles are done in one
 		 * tick. This makes it possible to leave the station and process
@@ -531,8 +531,7 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
 		 * the timetable entry like is done for road vehicles/ships.
 		 * Thus always make sure at least one tick is used between the
 		 * processing of different orders when filling the timetable. */
-		uint factor = _settings_client.gui.timetable_mode == TimetableMode::Days ? Ticks::DAY_TICKS : Ticks::TICKS_PER_SECOND;
-		uint time_to_set = CeilDiv(std::max(time_taken, 1), factor) * factor;
+		uint time_to_set = CeilDiv(std::max(time_taken, 1), Ticks::TICKS_PER_SECOND) * Ticks::TICKS_PER_SECOND;
 
 		if (travelling && (autofilling || !real_current_order->IsTravelTimetabled())) {
 			ChangeTimetable(v, v->cur_real_order_index, time_to_set, MTF_TRAVEL_TIME, autofilling);
diff --git a/src/timetable_cmd.h b/src/timetable_cmd.h
index eeda1ff4c1..221b394174 100644
--- a/src/timetable_cmd.h
+++ b/src/timetable_cmd.h
@@ -11,7 +11,9 @@
 #define TIMETABLE_CMD_H
 
 #include "command_type.h"
+#include "order_type.h"
 #include "timer/timer_game_tick.h"
+#include "vehicle_type.h"
 
 CommandCost CmdChangeTimetable(DoCommandFlags flags, VehicleID veh, VehicleOrderID order_number, ModifyTimetableFlags mtf, uint16_t data);
 CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTimetableFlags mtf, uint16_t data);
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index ac46927b2d..033555b6a1 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -27,6 +27,7 @@
 #include "settings_type.h"
 #include "timetable_cmd.h"
 #include "timetable.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/timetable_widget.h"
 
@@ -101,15 +102,15 @@ bool VehicleIsAboveLatenessThreshold(TimerGameTick::Ticks ticks, bool round_to_d
  * @param travelling whether we are interested in the travel or the wait part.
  * @return true if the travel/wait time can be used.
  */
-static bool CanDetermineTimeTaken(const Order *order, bool travelling)
+static bool CanDetermineTimeTaken(const Order &order, bool travelling)
 {
 	/* Current order is conditional */
-	if (order->IsType(OT_CONDITIONAL) || order->IsType(OT_IMPLICIT)) return false;
+	if (order.IsType(OT_CONDITIONAL) || order.IsType(OT_IMPLICIT)) return false;
 	/* No travel time and we have not already finished travelling */
-	if (travelling && !order->IsTravelTimetabled()) return false;
+	if (travelling && !order.IsTravelTimetabled()) return false;
 	/* No wait time but we are loading at this timetabled station */
-	if (!travelling && !order->IsWaitTimetabled() && order->IsType(OT_GOTO_STATION) &&
-			!(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
+	if (!travelling && !order.IsWaitTimetabled() && order.IsType(OT_GOTO_STATION) &&
+			!(order.GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
 		return false;
 	}
 
@@ -138,7 +139,7 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
 
 	TimerGameTick::Ticks sum = offset;
 	VehicleOrderID i = start;
-	const Order *order = v->GetOrder(i);
+	auto orders = v->Orders();
 
 	/* Cyclically loop over all orders until we reach the current one again.
 	 * As we may start at the current order, do a post-checking loop */
@@ -146,48 +147,30 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
 		/* Automatic orders don't influence the overall timetable;
 		 * they just add some untimetabled entries, but the time till
 		 * the next non-implicit order can still be known. */
-		if (!order->IsType(OT_IMPLICIT)) {
+		if (!orders[i].IsType(OT_IMPLICIT)) {
 			if (travelling || i != start) {
-				if (!CanDetermineTimeTaken(order, true)) return;
-				sum += order->GetTimetabledTravel();
+				if (!CanDetermineTimeTaken(orders[i], true)) return;
+				sum += orders[i].GetTimetabledTravel();
 				table[i].arrival = sum;
 			}
 
-			if (!CanDetermineTimeTaken(order, false)) return;
-			sum += order->GetTimetabledWait();
+			if (!CanDetermineTimeTaken(orders[i], false)) return;
+			sum += orders[i].GetTimetabledWait();
 			table[i].departure = sum;
 		}
 
-		++i;
-		order = order->next;
-		if (i >= v->GetNumOrders()) {
-			i = 0;
-			assert(order == nullptr);
-			order = v->orders->GetFirstOrder();
-		}
+		i = v->orders->GetNext(i);
 	} while (i != start);
 
 	/* When loading at a scheduled station we still have to treat the
 	 * travelling part of the first order. */
 	if (!travelling) {
-		if (!CanDetermineTimeTaken(order, true)) return;
-		sum += order->GetTimetabledTravel();
+		if (!CanDetermineTimeTaken(orders[i], true)) return;
+		sum += orders[i].GetTimetabledTravel();
 		table[i].arrival = sum;
 	}
 }
 
-
-/**
- * Callback for when a time has been chosen to start the time table
- * @param w the window related to the setting of the date
- * @param date the actually chosen date
- */
-static void ChangeTimetableStartCallback(const Window *w, TimerGameEconomy::Date date, void *data)
-{
-	Command<CMD_SET_TIMETABLE_START>::Post(STR_ERROR_CAN_T_TIMETABLE_VEHICLE, w->window_number, reinterpret_cast<std::uintptr_t>(data) != 0, GetStartTickFromDate(date));
-}
-
-
 struct TimetableWindow : Window {
 	int sel_index = -1;
 	VehicleTimetableWidgets query_widget{}; ///< Which button was clicked to open the query text input?
@@ -259,7 +242,7 @@ struct TimetableWindow : Window {
 
 			case WID_VT_ARRIVAL_DEPARTURE_SELECTION:
 			case WID_VT_TIMETABLE_PANEL:
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				size.height = 8 * resize.height + padding.height;
 				break;
 
@@ -454,25 +437,18 @@ struct TimetableWindow : Window {
 		int index_column_width = GetStringBoundingBox(GetString(STR_ORDER_INDEX, GetParamMaxValue(v->GetNumOrders(), 2))).width + 2 * GetSpriteSize(rtl ? SPR_ARROW_RIGHT : SPR_ARROW_LEFT).width + WidgetDimensions::scaled.hsep_normal;
 		int middle = rtl ? tr.right - index_column_width : tr.left + index_column_width;
 
-		const Order *order = v->GetOrder(order_id);
-		while (order != nullptr) {
+		auto orders = v->Orders();
+		while (true) {
 			/* Don't draw anything if it extends past the end of the window. */
 			if (!this->vscroll->IsVisible(i)) break;
 
 			if (i % 2 == 0) {
-				DrawOrderString(v, order, order_id, tr.top, i == selected, true, tr.left, middle, tr.right);
-
-				order_id++;
-
-				if (order_id >= v->GetNumOrders()) {
-					order = v->GetOrder(0);
-					final_order = true;
-				} else {
-					order = order->next;
-				}
+				DrawOrderString(v, &orders[order_id], order_id, tr.top, i == selected, true, tr.left, middle, tr.right);
+				if (order_id > v->orders->GetNext(order_id)) final_order = true;
+				order_id = v->orders->GetNext(order_id);
 			} else {
 				TextColour colour;
-				std::string string = GetTimetableTravelString(*order, i, colour);
+				std::string string = GetTimetableTravelString(orders[order_id], i, colour);
 
 				DrawString(rtl ? tr.left : middle, rtl ? middle : tr.right, tr.top, string, colour);
 
@@ -661,7 +637,11 @@ struct TimetableWindow : Window {
 					this->change_timetable_all = _ctrl_pressed;
 					ShowQueryString({}, STR_TIMETABLE_START_SECONDS_QUERY, 6, this, CS_NUMERAL, QueryStringFlag::AcceptUnchanged);
 				} else {
-					ShowSetDateWindow(this, v->index.base(), TimerGameEconomy::date, TimerGameEconomy::year, TimerGameEconomy::year + MAX_TIMETABLE_START_YEARS, ChangeTimetableStartCallback, reinterpret_cast<void*>(static_cast<uintptr_t>(_ctrl_pressed)));
+					ShowSetDateWindow(this, v->index.base(), TimerGameEconomy::date, TimerGameEconomy::year, TimerGameEconomy::year + MAX_TIMETABLE_START_YEARS,
+						[ctrl=_ctrl_pressed](const Window *w, TimerGameEconomy::Date date) {
+							Command<CMD_SET_TIMETABLE_START>::Post(STR_ERROR_CAN_T_TIMETABLE_VEHICLE, w->window_number, ctrl, GetStartTickFromDate(date));
+						}
+					);
 				}
 				break;
 
@@ -755,7 +735,7 @@ struct TimetableWindow : Window {
 		if (!str.has_value()) return;
 
 		const Vehicle *v = this->vehicle;
-		uint64_t val = str->empty() ? 0 : std::strtoul(str->c_str(), nullptr, 10);
+		uint64_t val = ParseInteger<uint64_t>(*str, 10, true).value_or(0);
 		auto [order_id, mtf] = PackTimetableArgs(v, this->sel_index, query_widget == WID_VT_CHANGE_SPEED);
 
 		switch (query_widget) {
@@ -809,7 +789,7 @@ struct TimetableWindow : Window {
 	/**
 	 * In real-time mode, the timetable GUI shows relative times and needs to be redrawn every second.
 	 */
-	IntervalTimer<TimerGameTick> redraw_interval = { { TimerGameTick::Priority::NONE, Ticks::TICKS_PER_SECOND }, [this](auto) {
+	const IntervalTimer<TimerGameTick> redraw_interval = { { TimerGameTick::Priority::NONE, Ticks::TICKS_PER_SECOND }, [this](auto) {
 		if (_settings_client.gui.timetable_mode == TimetableMode::Seconds) {
 			this->SetDirty();
 		}
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index e94e14c818..a82d581990 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -59,6 +59,7 @@
 #include "timer/timer_window.h"
 #include "timer/timer_game_calendar.h"
 #include "help_gui.h"
+#include "core/string_consumer.hpp"
 
 #include "widgets/toolbar_widget.h"
 
@@ -101,7 +102,7 @@ static CallBackFunction _last_started_action = CBF_NONE; ///< Last started user
  */
 class DropDownListCompanyItem : public DropDownIcon<DropDownIcon<DropDownString<DropDownListItem>, true>> {
 public:
-	DropDownListCompanyItem(CompanyID company, bool shaded) : DropDownIcon<DropDownIcon<DropDownString<DropDownListItem>, true>>(SPR_COMPANY_ICON, COMPANY_SPRITE_COLOUR(company), NetworkCanJoinCompany(company) ? SPR_EMPTY : SPR_LOCK, PAL_NONE, GetString(STR_COMPANY_NAME_COMPANY_NUM, company, company), company.base(), false, shaded)
+	DropDownListCompanyItem(CompanyID company, bool shaded) : DropDownIcon<DropDownIcon<DropDownString<DropDownListItem>, true>>(SPR_COMPANY_ICON, GetCompanyPalette(company), NetworkCanJoinCompany(company) ? SPR_EMPTY : SPR_LOCK, PAL_NONE, GetString(STR_COMPANY_NAME_COMPANY_NUM, company, company), company.base(), false, shaded)
 	{
 	}
 };
@@ -228,7 +229,6 @@ static CallBackFunction ToolbarFastForwardClick(Window *)
  */
 enum OptionMenuEntries : uint8_t {
 	OME_GAMEOPTIONS,
-	OME_SETTINGS,
 	OME_AI_SETTINGS,
 	OME_GAMESCRIPT_SETTINGS,
 	OME_NEWGRFSETTINGS,
@@ -261,7 +261,6 @@ static CallBackFunction ToolbarOptionsClick(Window *w)
 {
 	DropDownList list;
 	list.push_back(MakeDropDownListStringItem(STR_SETTINGS_MENU_GAME_OPTIONS,             OME_GAMEOPTIONS));
-	list.push_back(MakeDropDownListStringItem(STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE,     OME_SETTINGS));
 	/* Changes to the per-AI settings don't get send from the server to the clients. Clients get
 	 * the settings once they join but never update it. As such don't show the window at all
 	 * to network clients. */
@@ -306,7 +305,6 @@ static CallBackFunction MenuClickSettings(int index)
 {
 	switch (index) {
 		case OME_GAMEOPTIONS:          ShowGameOptions();                               return CBF_NONE;
-		case OME_SETTINGS:             ShowGameSettings();                              return CBF_NONE;
 		case OME_AI_SETTINGS:          ShowAIConfigWindow();                            return CBF_NONE;
 		case OME_GAMESCRIPT_SETTINGS:  ShowGSConfigWindow();                            return CBF_NONE;
 		case OME_NEWGRFSETTINGS:       ShowNewGRFSettings(!_networking && _settings_client.gui.UserIsAllowedToChangeNewGRFs(), true, true, _grfconfig); return CBF_NONE;
@@ -1540,7 +1538,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_AIR,
 			WID_TN_LANDSCAPE,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_SETTINGS,
 			WID_TN_SAVE,
 			WID_TN_SMALL_MAP,
@@ -1572,7 +1570,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_ZOOM_IN,
 			WID_TN_ZOOM_OUT,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_PAUSE,
 			WID_TN_SETTINGS,
 			WID_TN_SMALL_MAP,
@@ -1606,7 +1604,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_ZOOM_IN,
 			WID_TN_ZOOM_OUT,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_PAUSE,
 			WID_TN_FAST_FORWARD,
 			WID_TN_SAVE,
@@ -1642,7 +1640,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_ZOOM_IN,
 			WID_TN_ZOOM_OUT,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_PAUSE,
 			WID_TN_FAST_FORWARD,
 			WID_TN_SAVE,
@@ -1680,7 +1678,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_ZOOM_IN,
 			WID_TN_ZOOM_OUT,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_PAUSE,
 			WID_TN_FAST_FORWARD,
 			WID_TN_SAVE,
@@ -1720,7 +1718,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_ZOOM_IN,
 			WID_TN_ZOOM_OUT,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_PAUSE,
 			WID_TN_FAST_FORWARD,
 			WID_TN_SAVE,
@@ -1762,7 +1760,7 @@ class NWidgetMainToolbarContainer : public NWidgetToolbarContainer {
 			WID_TN_ZOOM_IN,
 			WID_TN_ZOOM_OUT,
 			WID_TN_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TN_PAUSE,
 			WID_TN_FAST_FORWARD,
 			WID_TN_SAVE,
@@ -1909,7 +1907,7 @@ class NWidgetScenarioToolbarContainer : public NWidgetToolbarContainer {
 			WID_TE_TREES,
 			WID_TE_SIGNS,
 			WID_TE_SWITCH_BAR,
-			// lower toolbar
+			/* lower toolbar */
 			WID_TE_PAUSE,
 			WID_TE_FAST_FORWARD,
 			WID_TE_SETTINGS,
@@ -2004,9 +2002,9 @@ struct MainToolbarWindow : Window {
 		DoZoomInOutWindow(ZOOM_NONE, this);
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int def_height, bool allow_resize) override
 	{
-		Window::FindWindowPlacementAndResize(_toolbar_width, def_height);
+		Window::FindWindowPlacementAndResize(_toolbar_width, def_height, allow_resize);
 	}
 
 	void OnPaint() override
@@ -2029,7 +2027,7 @@ struct MainToolbarWindow : Window {
 		if (_game_mode != GM_MENU && !this->IsWidgetDisabled(widget)) _toolbar_button_procs[widget](this);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		CallBackFunction cbf = _menu_clicked_procs[widget](index);
 		if (cbf != CBF_NONE) _last_started_action = cbf;
@@ -2106,7 +2104,7 @@ struct MainToolbarWindow : Window {
 	}
 
 	/** Refresh the state of pause / game-speed on a regular interval.*/
-	IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(30), [this](auto) {
+	const IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(30), [this](auto) {
 		if (this->IsWidgetLowered(WID_TN_PAUSE) != _pause_mode.Any()) {
 			this->ToggleWidgetLoweredState(WID_TN_PAUSE);
 			this->SetWidgetDirty(WID_TN_PAUSE);
@@ -2244,7 +2242,7 @@ static constexpr NWidgetPart _nested_toolbar_normal_widgets[] = {
 };
 
 static WindowDesc _toolb_normal_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_MAIN_TOOLBAR, WC_NONE,
 	{WindowDefaultFlag::NoFocus, WindowDefaultFlag::NoClose},
 	_nested_toolbar_normal_widgets,
@@ -2343,9 +2341,9 @@ struct ScenarioEditorToolbarWindow : Window {
 		DoZoomInOutWindow(ZOOM_NONE, this);
 	}
 
-	void FindWindowPlacementAndResize([[maybe_unused]] int def_width, [[maybe_unused]] int def_height) override
+	void FindWindowPlacementAndResize(int, int def_height, bool allow_resize) override
 	{
-		Window::FindWindowPlacementAndResize(_toolbar_width, def_height);
+		Window::FindWindowPlacementAndResize(_toolbar_width, def_height, allow_resize);
 	}
 
 	void OnPaint() override
@@ -2405,7 +2403,7 @@ struct ScenarioEditorToolbarWindow : Window {
 		if (cbf != CBF_NONE) _last_started_action = cbf;
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		CallBackFunction cbf = _scen_toolbar_dropdown_procs[widget](index);
 		if (cbf != CBF_NONE) _last_started_action = cbf;
@@ -2473,7 +2471,7 @@ struct ScenarioEditorToolbarWindow : Window {
 	}
 
 	/** Refresh the state of pause / game-speed on a regular interval.*/
-	IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(30), [this](auto) {
+	const IntervalTimer<TimerWindow> refresh_interval = {std::chrono::milliseconds(30), [this](auto) {
 		if (this->IsWidgetLowered(WID_TE_PAUSE) != _pause_mode.Any()) {
 			this->ToggleWidgetLoweredState(WID_TE_PAUSE);
 			this->SetDirty();
@@ -2503,7 +2501,9 @@ struct ScenarioEditorToolbarWindow : Window {
 
 		TimerGameCalendar::Year value;
 		if (!str->empty()) {
-			value = TimerGameCalendar::Year{atoi(str->c_str())};
+			auto val = ParseInteger(*str, 10, true);
+			if (!val.has_value()) return;
+			value = static_cast<TimerGameCalendar::Year>(*val);
 		} else {
 			/* An empty string means revert to the default */
 			value = TimerGameCalendar::Year{CalendarTime::DEF_START_YEAR.base()};
@@ -2585,7 +2585,7 @@ static constexpr NWidgetPart _nested_toolb_scen_widgets[] = {
 };
 
 static WindowDesc _toolb_scen_desc(
-	WDP_MANUAL, nullptr, 0, 0,
+	WDP_MANUAL, {}, 0, 0,
 	WC_MAIN_TOOLBAR, WC_NONE,
 	{WindowDefaultFlag::NoFocus, WindowDefaultFlag::NoClose},
 	_nested_toolb_scen_widgets,
diff --git a/src/town.h b/src/town.h
index 1c6e134db6..7894d19f86 100644
--- a/src/town.h
+++ b/src/town.h
@@ -42,7 +42,7 @@ struct TownCache {
 	uint32_t population = 0; ///< Current population of people
 	TrackedViewportSign sign{}; ///< Location of name sign, UpdateVirtCoord updates this
 	PartsOfSubsidy part_of_subsidy{}; ///< Is this town a source/destination of a subsidy?
-	std::array<uint32_t, HZB_END> squared_town_zone_radius{}; ///< UpdateTownRadius updates this given the house count
+	std::array<uint32_t, NUM_HOUSE_ZONES> squared_town_zone_radius{}; ///< UpdateTownRadius updates this given the house count
 	BuildingCounts<uint16_t> building_counts{}; ///< The number of each type of building in the town
 
 	auto operator<=>(const TownCache &) const = default;
@@ -69,10 +69,10 @@ struct Town : TownPool::PoolItem<&_town_pool> {
 
 	/* Company ratings. */
 	CompanyMask have_ratings{}; ///< which companies have a rating
-	ReferenceThroughBaseContainer<std::array<uint8_t, MAX_COMPANIES>> unwanted{}; ///< how many months companies aren't wanted by towns (bribe)
+	TypedIndexContainer<std::array<uint8_t, MAX_COMPANIES>, CompanyID> unwanted{}; ///< how many months companies aren't wanted by towns (bribe)
 	CompanyID exclusivity = CompanyID::Invalid(); ///< which company has exclusivity
 	uint8_t exclusive_counter = 0; ///< months till the exclusivity expires
-	ReferenceThroughBaseContainer<std::array<int16_t, MAX_COMPANIES>> ratings{};  ///< ratings of each company for this town
+	TypedIndexContainer<std::array<int16_t, MAX_COMPANIES>, CompanyID> ratings{};  ///< ratings of each company for this town
 
 	std::array<TransportedCargoStat<uint32_t>, NUM_CARGO> supplied{}; ///< Cargo statistics about supplied cargo.
 	std::array<TransportedCargoStat<uint16_t>, NUM_TAE> received{}; ///< Cargo statistics about received cargotypes.
@@ -228,10 +228,11 @@ void UpdateTownRadius(Town *t);
 CommandCost CheckIfAuthorityAllowsNewStation(TileIndex tile, DoCommandFlags flags);
 Town *ClosestTownFromTile(TileIndex tile, uint threshold);
 void ChangeTownRating(Town *t, int add, int max, DoCommandFlags flags);
-HouseZonesBits GetTownRadiusGroup(const Town *t, TileIndex tile);
+HouseZone GetTownRadiusGroup(const Town *t, TileIndex tile);
 void SetTownRatingTestMode(bool mode);
 TownActions GetMaskOfTownActions(CompanyID cid, const Town *t);
-bool GenerateTowns(TownLayout layout);
+uint GetDefaultTownsForMapSize();
+bool GenerateTowns(TownLayout layout, std::optional<uint> number = std::nullopt);
 const CargoSpec *FindFirstCargoWithTownAcceptanceEffect(TownAcceptanceEffect effect);
 CargoArray GetAcceptedCargoOfHouse(const HouseSpec *hs);
 
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 50f868ba87..e9e72f1aec 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -228,17 +228,7 @@ Money HouseSpec::GetRemovalCost() const
 	return (_price[PR_CLEAR_HOUSE] * this->removal_cost) >> 8;
 }
 
-/* Local */
-static int _grow_town_result;
-
-/* The possible states of town growth. */
-enum TownGrowthResult {
-	GROWTH_SUCCEED         = -1,
-	GROWTH_SEARCH_STOPPED  =  0
-//	GROWTH_SEARCH_RUNNING >=  1
-};
-
-static bool TryBuildTownHouse(Town *t, TileIndex tile);
+static bool TryBuildTownHouse(Town *t, TileIndex tile, TownExpandModes modes);
 static Town *CreateRandomTown(uint attempts, uint32_t townnameparts, TownSize size, bool city, TownLayout layout);
 
 static void TownDrawHouseLift(const TileInfo *ti)
@@ -273,7 +263,7 @@ static void DrawTile_Town(TileInfo *ti)
 		/* Houses don't necessarily need new graphics. If they don't have a
 		 * spritegroup associated with them, then the sprite for the substitute
 		 * house id is drawn instead. */
-		if (HouseSpec::Get(house_id)->grf_prop.GetSpriteGroup() != nullptr) {
+		if (HouseSpec::Get(house_id)->grf_prop.HasSpriteGroups()) {
 			DrawNewHouseTile(ti, house_id);
 			return;
 		} else {
@@ -334,7 +324,7 @@ static Foundation GetFoundation_Town(TileIndex tile, Slope tileh)
 	 */
 	if (hid >= NEW_HOUSE_OFFSET) {
 		const HouseSpec *hs = HouseSpec::Get(hid);
-		if (hs->grf_prop.GetSpriteGroup() != nullptr && hs->callback_mask.Test(HouseCallbackMask::DrawFoundations)) {
+		if (hs->callback_mask.Test(HouseCallbackMask::DrawFoundations)) {
 			uint32_t callback_res = GetHouseCallback(CBID_HOUSE_DRAW_FOUNDATIONS, 0, 0, hid, Town::GetByTile(tile), tile);
 			if (callback_res != CALLBACK_FAILED && !ConvertBooleanCallback(hs->grf_prop.grffile, CBID_HOUSE_DRAW_FOUNDATIONS, callback_res)) return FOUNDATION_NONE;
 		}
@@ -503,7 +493,7 @@ static void AdvanceSingleHouseConstruction(TileIndex tile)
 	IncHouseConstructionTick(tile);
 	if (GetHouseConstructionTick(tile) != 0) return;
 
-	AnimateNewHouseConstruction(tile);
+	TriggerHouseAnimation_ConstructionStageChanged(tile, false);
 
 	if (IsHouseCompleted(tile)) {
 		/* Now that construction is complete, we can add the population of the
@@ -701,7 +691,10 @@ static void TileLoop_Town(TileIndex tile)
 				}
 			}
 
-			TryBuildTownHouse(t, tile);
+			TownExpandModes modes{TownExpandMode::Buildings};
+			if (_settings_game.economy.allow_town_roads) modes.Set(TownExpandMode::Roads);
+
+			TryBuildTownHouse(t, tile, modes);
 		}
 	}
 
@@ -813,7 +806,7 @@ void AddAcceptedCargoOfHouse(TileIndex tile, HouseID house, const HouseSpec *hs,
 
 	/* Check for custom accepted cargo types */
 	if (hs->callback_mask.Test(HouseCallbackMask::AcceptCargo)) {
-		uint16_t callback = GetHouseCallback(CBID_HOUSE_ACCEPT_CARGO, 0, 0, house, t, tile, tile == INVALID_TILE);
+		uint16_t callback = GetHouseCallback(CBID_HOUSE_ACCEPT_CARGO, 0, 0, house, t, tile, {}, tile == INVALID_TILE);
 		if (callback != CALLBACK_FAILED) {
 			/* Replace accepted cargo types with translated values from callback */
 			accepts[0] = GetCargoTranslation(GB(callback,  0, 5), hs->grf_prop.grffile);
@@ -824,7 +817,7 @@ void AddAcceptedCargoOfHouse(TileIndex tile, HouseID house, const HouseSpec *hs,
 
 	/* Check for custom cargo acceptance */
 	if (hs->callback_mask.Test(HouseCallbackMask::CargoAcceptance)) {
-		uint16_t callback = GetHouseCallback(CBID_HOUSE_CARGO_ACCEPTANCE, 0, 0, house, t, tile, tile == INVALID_TILE);
+		uint16_t callback = GetHouseCallback(CBID_HOUSE_CARGO_ACCEPTANCE, 0, 0, house, t, tile, {}, tile == INVALID_TILE);
 		if (callback != CALLBACK_FAILED) {
 			AddAcceptedCargoSetMask(accepts[0], GB(callback, 0, 4), acceptance, always_accepted);
 			AddAcceptedCargoSetMask(accepts[1], GB(callback, 4, 4), acceptance, always_accepted);
@@ -872,15 +865,19 @@ static void GetTileDesc_Town(TileIndex tile, TileDesc &td)
 	td.str = hs->building_name;
 	td.town_can_upgrade = !IsHouseProtected(tile);
 
-	uint16_t callback_res = GetHouseCallback(CBID_HOUSE_CUSTOM_NAME, house_completed ? 1 : 0, 0, house, Town::GetByTile(tile), tile);
+	std::array<int32_t, 1> regs100;
+	uint16_t callback_res = GetHouseCallback(CBID_HOUSE_CUSTOM_NAME, house_completed ? 1 : 0, 0, house, Town::GetByTile(tile), tile, regs100);
 	if (callback_res != CALLBACK_FAILED && callback_res != 0x400) {
-		if (callback_res > 0x400) {
+		StringID new_name = STR_NULL;
+		if (callback_res == 0x40F) {
+			new_name = GetGRFStringID(hs->grf_prop.grfid, static_cast<GRFStringID>(regs100[0]));
+		} else if (callback_res > 0x400) {
 			ErrorUnknownCallbackResult(hs->grf_prop.grfid, CBID_HOUSE_CUSTOM_NAME, callback_res);
 		} else {
-			StringID new_name = GetGRFStringID(hs->grf_prop.grfid, GRFSTR_MISC_GRF_TEXT + callback_res);
-			if (new_name != STR_NULL && new_name != STR_UNDEFINED) {
-				td.str = new_name;
-			}
+			new_name = GetGRFStringID(hs->grf_prop.grfid, GRFSTR_MISC_GRF_TEXT + callback_res);
+		}
+		if (new_name != STR_NULL && new_name != STR_UNDEFINED) {
+			td.str = new_name;
 		}
 	}
 
@@ -908,7 +905,7 @@ static void ChangeTileOwner_Town(TileIndex, Owner, Owner)
 	/* not used */
 }
 
-static bool GrowTown(Town *t);
+static bool GrowTown(Town *t, TownExpandModes modes);
 
 /**
  * Handle the town tick for a single town, by growing the town if desired.
@@ -917,9 +914,11 @@ static bool GrowTown(Town *t);
 static void TownTickHandler(Town *t)
 {
 	if (HasBit(t->flags, TOWN_IS_GROWING)) {
+		TownExpandModes modes{TownExpandMode::Buildings};
+		if (_settings_game.economy.allow_town_roads) modes.Set(TownExpandMode::Roads);
 		int i = (int)t->grow_counter - 1;
 		if (i < 0) {
-			if (GrowTown(t)) {
+			if (GrowTown(t, modes)) {
 				i = t->growth_rate;
 			} else {
 				/* If growth failed wait a bit before retrying */
@@ -1210,7 +1209,7 @@ static RoadBits GetTownRoadGridElement(Town *t, TileIndex tile, DiagDirection di
  * @param tile The target tile for the extra house.
  * @return true if an extra house has been added.
  */
-static bool GrowTownWithExtraHouse(Town *t, TileIndex tile)
+static bool GrowTownWithExtraHouse(Town *t, TileIndex tile, TownExpandModes modes)
 {
 	/* We can't look further than that. */
 	if (DistanceFromEdge(tile) == 0) return false;
@@ -1234,11 +1233,7 @@ static bool GrowTownWithExtraHouse(Town *t, TileIndex tile)
 
 		/* If there are enough neighbours stop here */
 		if (counter >= 3) {
-			if (TryBuildTownHouse(t, tile)) {
-				_grow_town_result = GROWTH_SUCCEED;
-				return true;
-			}
-			return false;
+			return TryBuildTownHouse(t, tile, modes);
 		}
 	}
 	return false;
@@ -1255,11 +1250,7 @@ static bool GrowTownWithExtraHouse(Town *t, TileIndex tile)
 static bool GrowTownWithRoad(const Town *t, TileIndex tile, RoadBits rcmd)
 {
 	RoadType rt = GetTownRoadType();
-	if (Command<CMD_BUILD_ROAD>::Do({DoCommandFlag::Execute, DoCommandFlag::Auto, DoCommandFlag::NoWater}, tile, rcmd, rt, DRD_NONE, t->index).Succeeded()) {
-		_grow_town_result = GROWTH_SUCCEED;
-		return true;
-	}
-	return false;
+	return Command<CMD_BUILD_ROAD>::Do({DoCommandFlag::Execute, DoCommandFlag::Auto, DoCommandFlag::NoWater}, tile, rcmd, rt, DRD_NONE, t->index).Succeeded();
 }
 
 /**
@@ -1307,27 +1298,6 @@ static bool CanRoadContinueIntoNextTile(const Town *t, const TileIndex tile, con
 	return Command<CMD_BUILD_ROAD>::Do({DoCommandFlag::Auto, DoCommandFlag::NoWater}, next_tile, rcmd, rt, DRD_NONE, t->index).Succeeded();
 }
 
-/**
- * CircularTileSearch proc which checks for a nearby parallel bridge to avoid building redundant bridges.
- * @param tile The tile to search.
- * @param user_data Reference to the valid direction of the proposed bridge.
- * @return true if another bridge exists, else false.
- */
-static bool RedundantBridgeExistsNearby(TileIndex tile, void *user_data)
-{
-	/* Don't look into the void. */
-	if (!IsValidTile(tile)) return false;
-
-	/* Only consider bridge head tiles. */
-	if (!IsBridgeTile(tile)) return false;
-
-	/* Only consider road bridges. */
-	if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return false;
-
-	/* If the bridge is facing the same direction as the proposed bridge, we've found a redundant bridge. */
-	return (GetTileSlope(tile) & InclinedSlope(ReverseDiagDir(*(DiagDirection *)user_data)));
-}
-
 /**
  * Grows the town with a bridge.
  *  At first we check if a bridge is reasonable.
@@ -1390,9 +1360,18 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
 	if (!CanRoadContinueIntoNextTile(t, bridge_tile, bridge_dir)) return false;
 
 	/* If another parallel bridge exists nearby, this one would be redundant and shouldn't be built. We don't care about flat bridges. */
-	TileIndex search = tile;
-	DiagDirection direction_to_match = bridge_dir;
-	if (slope != SLOPE_FLAT && CircularTileSearch(&search, bridge_length, 0, 0, RedundantBridgeExistsNearby, &direction_to_match)) return false;
+	if (slope != SLOPE_FLAT) {
+		for (auto search : SpiralTileSequence(tile, bridge_length, 0, 0)) {
+			/* Only consider bridge head tiles. */
+			if (!IsBridgeTile(search)) continue;
+
+			/* Only consider road bridges. */
+			if (GetTunnelBridgeTransportType(search) != TRANSPORT_ROAD) continue;
+
+			/* If the bridge is facing the same direction as the proposed bridge, we've found a redundant bridge. */
+			if (GetTileSlope(search) & InclinedSlope(ReverseDiagDir(bridge_dir))) return false;
+		}
+	}
 
 	for (uint8_t times = 0; times <= 22; times++) {
 		uint8_t bridge_type = RandomRange(MAX_BRIDGES - 1);
@@ -1401,7 +1380,6 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
 		RoadType rt = GetTownRoadType();
 		if (Command<CMD_BUILD_BRIDGE>::Do(CommandFlagsToDCFlags(GetCommandFlags<CMD_BUILD_BRIDGE>()), tile, bridge_tile, TRANSPORT_ROAD, bridge_type, rt).Succeeded()) {
 			Command<CMD_BUILD_BRIDGE>::Do(CommandFlagsToDCFlags(GetCommandFlags<CMD_BUILD_BRIDGE>()).Set(DoCommandFlag::Execute), tile, bridge_tile, TRANSPORT_ROAD, bridge_type, rt);
-			_grow_town_result = GROWTH_SUCCEED;
 			return true;
 		}
 	}
@@ -1472,7 +1450,6 @@ static bool GrowTownWithTunnel(const Town *t, const TileIndex tile, const DiagDi
 	RoadType rt = GetTownRoadType();
 	if (Command<CMD_BUILD_TUNNEL>::Do(CommandFlagsToDCFlags(GetCommandFlags<CMD_BUILD_TUNNEL>()), tile, TRANSPORT_ROAD, rt).Succeeded()) {
 		Command<CMD_BUILD_TUNNEL>::Do(CommandFlagsToDCFlags(GetCommandFlags<CMD_BUILD_TUNNEL>()).Set(DoCommandFlag::Execute), tile, TRANSPORT_ROAD, rt);
-		_grow_town_result = GROWTH_SUCCEED;
 		return true;
 	}
 
@@ -1526,11 +1503,18 @@ static bool TownCanGrowRoad(TileIndex tile)
  * Check if the town is allowed to build roads.
  * @return true If the town is allowed to build roads.
  */
-static inline bool TownAllowedToBuildRoads()
+static inline bool TownAllowedToBuildRoads(TownExpandModes modes)
 {
-	return _settings_game.economy.allow_town_roads || _generating_world || _game_mode == GM_EDITOR;
+	return modes.Test(TownExpandMode::Roads);
 }
 
+/* The possible states of town growth. */
+enum class TownGrowthResult {
+	Succeed,
+	SearchStopped,
+	Continue,
+};
+
 /**
  * Grows the given town.
  * There are at the moment 3 possible way's for
@@ -1547,8 +1531,9 @@ static inline bool TownAllowedToBuildRoads()
  * @param cur_rb The current tiles RoadBits
  * @param target_dir The target road dir
  * @param t1 The current town
+ * @return Result so far.
  */
-static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection target_dir, Town *t1)
+static TownGrowthResult GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection target_dir, Town *t1, TownExpandModes modes)
 {
 	RoadBits rcmd = ROAD_NONE;  // RoadBits for the road construction command
 	TileIndex tile = *tile_ptr; // The main tile on which we base our growth
@@ -1556,12 +1541,11 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 	assert(tile < Map::Size());
 
 	if (cur_rb == ROAD_NONE) {
-		/* Tile has no road. First reset the status counter
-		 * to say that this is the last iteration. */
-		_grow_town_result = GROWTH_SEARCH_STOPPED;
+		/* Tile has no road.
+		 * We will return TownGrowthResult::SearchStopped to say that this is the last iteration. */
 
-		if (!TownAllowedToBuildRoads()) return;
-		if (!_settings_game.economy.allow_town_level_crossings && IsTileType(tile, MP_RAILWAY)) return;
+		if (!TownAllowedToBuildRoads(modes)) return TownGrowthResult::SearchStopped;
+		if (!_settings_game.economy.allow_town_level_crossings && IsTileType(tile, MP_RAILWAY)) return TownGrowthResult::SearchStopped;
 
 		/* Remove hills etc */
 		if (!_settings_game.construction.build_on_slopes || Chance16(1, 6)) LevelTownLand(tile);
@@ -1573,12 +1557,12 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 			case TL_3X3_GRID:
 			case TL_2X2_GRID:
 				rcmd = GetTownRoadGridElement(t1, tile, target_dir);
-				if (rcmd == ROAD_NONE) return;
+				if (rcmd == ROAD_NONE) return TownGrowthResult::SearchStopped;
 				break;
 
 			case TL_BETTER_ROADS:
 			case TL_ORIGINAL:
-				if (!IsRoadAllowedHere(t1, tile, target_dir)) return;
+				if (!IsRoadAllowedHere(t1, tile, target_dir)) return TownGrowthResult::SearchStopped;
 
 				DiagDirection source_dir = ReverseDiagDir(target_dir);
 
@@ -1590,12 +1574,12 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 				if (!IsRoadAllowedHere(t1, TileAddByDiagDir(tile, target_dir), target_dir)) {
 					/* A road is not allowed to continue the randomized road,
 					 *  return if the road we're trying to build is curved. */
-					if (target_dir != ReverseDiagDir(source_dir)) return;
+					if (target_dir != ReverseDiagDir(source_dir)) return TownGrowthResult::SearchStopped;
 
 					/* Return if neither side of the new road is a house */
 					if (!IsTileType(TileAddByDiagDir(tile, ChangeDiagDir(target_dir, DIAGDIRDIFF_90RIGHT)), MP_HOUSE) &&
 							!IsTileType(TileAddByDiagDir(tile, ChangeDiagDir(target_dir, DIAGDIRDIFF_90LEFT)), MP_HOUSE)) {
-						return;
+						return TownGrowthResult::SearchStopped;
 					}
 
 					/* That means that the road is only allowed if there is a house
@@ -1607,15 +1591,13 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 		}
 
 	} else if (target_dir < DIAGDIR_END && !(cur_rb & DiagDirToRoadBits(ReverseDiagDir(target_dir)))) {
-		if (!TownCanGrowRoad(tile)) return;
+		if (!TownCanGrowRoad(tile)) return TownGrowthResult::Continue;
+
+		if (!TownAllowedToBuildRoads(modes)) return TownGrowthResult::SearchStopped;
 
 		/* Continue building on a partial road.
 		 * Should be always OK, so we only generate
 		 * the fitting RoadBits */
-		_grow_town_result = GROWTH_SEARCH_STOPPED;
-
-		if (!TownAllowedToBuildRoads()) return;
-
 		switch (t1->layout) {
 			default: NOT_REACHED();
 
@@ -1638,7 +1620,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 			if (GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD && (target_dir != DIAGDIR_END || Chance16(1, 2))) {
 				*tile_ptr = GetOtherTunnelBridgeEnd(tile);
 			}
-			return;
+			return TownGrowthResult::Continue;
 		}
 
 		/* Possibly extend the road in a direction.
@@ -1655,7 +1637,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 			 * one common bit with a straight road so it has the same
 			 * chance to be chosen as the house on the side of a road.
 			 */
-			if ((cur_rb & ROAD_X) != target_rb) return;
+			if ((cur_rb & ROAD_X) != target_rb) return TownGrowthResult::Continue;
 
 			/* Check whether it is a turn and if so determine
 			 * position of the corner tile */
@@ -1673,7 +1655,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 					house_tile = TileAddByDir(tile, DIR_E);
 					break;
 				default:
-					return;  // not a turn
+					return TownGrowthResult::Continue; // not a turn
 			}
 			target_dir = DIAGDIR_END;
 		} else {
@@ -1681,16 +1663,20 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 		}
 
 		/* Don't walk into water. */
-		if (HasTileWaterGround(house_tile)) return;
+		if (HasTileWaterGround(house_tile)) return TownGrowthResult::Continue;
 
-		if (!IsValidTile(house_tile)) return;
+		if (!IsValidTile(house_tile)) return TownGrowthResult::Continue;
 
-		if (target_dir != DIAGDIR_END && TownAllowedToBuildRoads()) {
+		TownGrowthResult result = TownGrowthResult::Continue;
+
+		if (target_dir != DIAGDIR_END && TownAllowedToBuildRoads(modes)) {
 			switch (t1->layout) {
 				default: NOT_REACHED();
 
 				case TL_3X3_GRID: // Use 2x2 grid afterwards!
-					GrowTownWithExtraHouse(t1, TileAddByDiagDir(house_tile, target_dir));
+					if (GrowTownWithExtraHouse(t1, TileAddByDiagDir(house_tile, target_dir), modes)) {
+						result = TownGrowthResult::Succeed;
+					}
 					[[fallthrough]];
 
 				case TL_2X2_GRID:
@@ -1699,7 +1685,9 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 					break;
 
 				case TL_BETTER_ROADS: // Use original afterwards!
-					GrowTownWithExtraHouse(t1, TileAddByDiagDir(house_tile, target_dir));
+					if (GrowTownWithExtraHouse(t1, TileAddByDiagDir(house_tile, target_dir), modes)) {
+						result = TownGrowthResult::Succeed;
+					}
 					[[fallthrough]];
 
 				case TL_ORIGINAL:
@@ -1721,32 +1709,37 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
 
 				/* And build a house.
 				 * Set result to -1 if we managed to build it. */
-				if (TryBuildTownHouse(t1, house_tile)) {
-					_grow_town_result = GROWTH_SUCCEED;
+				if (TryBuildTownHouse(t1, house_tile, modes)) {
+					result = TownGrowthResult::Succeed;
 				}
 			}
-			return;
+			return result;
 		}
 
-		if (!TownCanGrowRoad(tile)) return;
-
-		_grow_town_result = GROWTH_SEARCH_STOPPED;
+		if (!TownCanGrowRoad(tile)) return result;
 	}
 
 	/* Return if a water tile */
-	if (HasTileWaterGround(tile)) return;
+	if (HasTileWaterGround(tile)) return TownGrowthResult::SearchStopped;
 
 	/* Make the roads look nicer */
 	rcmd = CleanUpRoadBits(tile, rcmd);
-	if (rcmd == ROAD_NONE) return;
+	if (rcmd == ROAD_NONE) return TownGrowthResult::SearchStopped;
 
 	/* Only use the target direction for bridges and tunnels to ensure they're connected.
 	 * The target_dir is as computed previously according to town layout, so
 	 * it will match it perfectly. */
-	if (GrowTownWithBridge(t1, tile, target_dir)) return;
-	if (GrowTownWithTunnel(t1, tile, target_dir)) return;
+	if (GrowTownWithBridge(t1, tile, target_dir)) {
+		return TownGrowthResult::Succeed;
+	}
+	if (GrowTownWithTunnel(t1, tile, target_dir)) {
+		return TownGrowthResult::Succeed;
+	}
 
-	GrowTownWithRoad(t1, tile, rcmd);
+	if (GrowTownWithRoad(t1, tile, rcmd)) {
+		return TownGrowthResult::Succeed;
+	}
+	return TownGrowthResult::SearchStopped;
 }
 
 /**
@@ -1756,14 +1749,14 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t
  * @param dir Direction for road to follow or build.
  * @return true If road is or can be connected in the specified direction.
  */
-static bool CanFollowRoad(TileIndex tile, DiagDirection dir)
+static bool CanFollowRoad(TileIndex tile, DiagDirection dir, TownExpandModes modes)
 {
 	TileIndex target_tile = tile + TileOffsByDiagDir(dir);
 	if (!IsValidTile(target_tile)) return false;
 	if (HasTileWaterGround(target_tile)) return false;
 
 	RoadBits target_rb = GetTownRoadBits(target_tile);
-	if (TownAllowedToBuildRoads()) {
+	if (TownAllowedToBuildRoads(modes)) {
 		/* Check whether a road connection exists or can be build. */
 		switch (GetTileType(target_tile)) {
 			case MP_ROAD:
@@ -1798,7 +1791,7 @@ static bool CanFollowRoad(TileIndex tile, DiagDirection dir)
  * @param tile The road tile to try growing from.
  * @return true if we successfully expanded the town.
  */
-static bool GrowTownAtRoad(Town *t, TileIndex tile)
+static bool GrowTownAtRoad(Town *t, TileIndex tile, TownExpandModes modes)
 {
 	/* Special case.
 	 * @see GrowTownInTile Check the else if
@@ -1810,18 +1803,19 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile)
 	/* Number of times to search.
 	 * Better roads, 2X2 and 3X3 grid grow quite fast so we give
 	 * them a little handicap. */
+	int iterations;
 	switch (t->layout) {
 		case TL_BETTER_ROADS:
-			_grow_town_result = 10 + t->cache.num_houses * 2 / 9;
+			iterations = 10 + t->cache.num_houses * 2 / 9;
 			break;
 
 		case TL_3X3_GRID:
 		case TL_2X2_GRID:
-			_grow_town_result = 10 + t->cache.num_houses * 1 / 9;
+			iterations = 10 + t->cache.num_houses * 1 / 9;
 			break;
 
 		default:
-			_grow_town_result = 10 + t->cache.num_houses * 4 / 9;
+			iterations = 10 + t->cache.num_houses * 4 / 9;
 			break;
 	}
 
@@ -1829,8 +1823,15 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile)
 		RoadBits cur_rb = GetTownRoadBits(tile); // The RoadBits of the current tile
 
 		/* Try to grow the town from this point */
-		GrowTownInTile(&tile, cur_rb, target_dir, t);
-		if (_grow_town_result == GROWTH_SUCCEED) return true;
+		switch (GrowTownInTile(&tile, cur_rb, target_dir, t, modes)) {
+			case TownGrowthResult::Succeed:
+				return true;
+			case TownGrowthResult::SearchStopped:
+				iterations = 0;
+				break;
+			default:
+				break;
+		};
 
 		/* Exclude the source position from the bitmask
 		 * and return if no more road blocks available */
@@ -1851,7 +1852,7 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile)
 					target_bits = DiagDirToRoadBits(target_dir);
 				} while (!(cur_rb & target_bits));
 				cur_rb &= ~target_bits;
-			} while (!CanFollowRoad(tile, target_dir));
+			} while (!CanFollowRoad(tile, target_dir, modes));
 		}
 		tile = TileAddByDiagDir(tile, target_dir);
 
@@ -1868,7 +1869,7 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile)
 		}
 
 		/* Max number of times is checked. */
-	} while (--_grow_town_result >= 0);
+	} while (--iterations >= 0);
 
 	return false;
 }
@@ -1894,7 +1895,7 @@ static RoadBits GenRandomRoadBits()
  * @param t The town to grow
  * @return true if we successfully grew the town with a road or house.
  */
-static bool GrowTown(Town *t)
+static bool GrowTown(Town *t, TownExpandModes modes)
 {
 	static const TileIndexDiffC _town_coord_mod[] = {
 		{-1,  0},
@@ -1920,7 +1921,7 @@ static bool GrowTown(Town *t)
 	/* Find a road that we can base the construction on. */
 	for (const auto &ptr : _town_coord_mod) {
 		if (GetTownRoadBits(tile) != ROAD_NONE) {
-			bool success = GrowTownAtRoad(t, tile);
+			bool success = GrowTownAtRoad(t, tile, modes);
 			cur_company.Restore();
 			return success;
 		}
@@ -1929,7 +1930,7 @@ static bool GrowTown(Town *t)
 
 	/* No road available, try to build a random road block by
 	 * clearing some land and then building a road there. */
-	if (TownAllowedToBuildRoads()) {
+	if (TownAllowedToBuildRoads(modes)) {
 		tile = t->xy;
 		for (const auto &ptr : _town_coord_mod) {
 			/* Only work with plain land that not already has a house */
@@ -1955,7 +1956,7 @@ static bool GrowTown(Town *t)
  */
 void UpdateTownRadius(Town *t)
 {
-	static const std::array<std::array<uint32_t, HZB_END>, 23> _town_squared_town_zone_radius_data = {{
+	static const std::array<std::array<uint32_t, NUM_HOUSE_ZONES>, 23> _town_squared_town_zone_radius_data = {{
 		{  4,  0,  0,  0,  0}, // 0
 		{ 16,  0,  0,  0,  0},
 		{ 25,  0,  0,  0,  0},
@@ -1988,11 +1989,11 @@ void UpdateTownRadius(Town *t)
 		/* Actually we are proportional to sqrt() but that's right because we are covering an area.
 		 * The offsets are to make sure the radii do not decrease in size when going from the table
 		 * to the calculated value.*/
-		t->cache.squared_town_zone_radius[HZB_TOWN_EDGE] = mass * 15 - 40;
-		t->cache.squared_town_zone_radius[HZB_TOWN_OUTSKIRT] = mass * 9 - 15;
-		t->cache.squared_town_zone_radius[HZB_TOWN_OUTER_SUBURB] = 0;
-		t->cache.squared_town_zone_radius[HZB_TOWN_INNER_SUBURB] = mass * 5 - 5;
-		t->cache.squared_town_zone_radius[HZB_TOWN_CENTRE] = mass * 3 + 5;
+		t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)] = mass * 15 - 40;
+		t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownOutskirt)] = mass * 9 - 15;
+		t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownOuterSuburb)] = 0;
+		t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownInnerSuburb)] = mass * 5 - 5;
+		t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownCentre)] = mass * 3 + 5;
 	}
 }
 
@@ -2088,7 +2089,7 @@ static void DoCreateTown(Town *t, TileIndex tile, uint32_t townnameparts, TownSi
 
 	int i = x * 4;
 	do {
-		GrowTown(t);
+		GrowTown(t, {TownExpandMode::Buildings, TownExpandMode::Roads});
 	} while (--i);
 
 	t->UpdateVirtCoord();
@@ -2280,56 +2281,6 @@ static bool IsTileAlignedToGrid(TileIndex tile, TownLayout layout)
 	}
 }
 
-/**
- * Used as the user_data for FindFurthestFromWater
- */
-struct SpotData {
-	TileIndex tile; ///< holds the tile that was found
-	uint max_dist;  ///< holds the distance that tile is from the water
-	TownLayout layout; ///< tells us what kind of town we're building
-};
-
-/**
- * CircularTileSearch callback; finds the tile furthest from any
- * water. slightly bit tricky, since it has to do a search of its own
- * in order to find the distance to the water from each square in the
- * radius.
- *
- * Also, this never returns true, because it needs to take into
- * account all locations being searched before it knows which is the
- * furthest.
- *
- * @param tile Start looking from this tile
- * @param user_data Storage area for data that must last across calls;
- * must be a pointer to struct SpotData
- *
- * @return always false
- */
-static bool FindFurthestFromWater(TileIndex tile, void *user_data)
-{
-	SpotData *sp = (SpotData*)user_data;
-	uint dist = GetClosestWaterDistance(tile, true);
-
-	if (IsTileType(tile, MP_CLEAR) &&
-			IsTileFlat(tile) &&
-			IsTileAlignedToGrid(tile, sp->layout) &&
-			dist > sp->max_dist) {
-		sp->tile = tile;
-		sp->max_dist = dist;
-	}
-
-	return false;
-}
-
-/**
- * CircularTileSearch callback to find the nearest land tile.
- * @param tile Start looking from this tile
- */
-static bool FindNearestEmptyLand(TileIndex tile, void *)
-{
-	return IsTileType(tile, MP_CLEAR);
-}
-
 /**
  * Given a spot on the map (presumed to be a water tile), find a good
  * coastal spot to build a city. We don't want to build too close to
@@ -2344,18 +2295,43 @@ static bool FindNearestEmptyLand(TileIndex tile, void *)
  */
 static TileIndex FindNearestGoodCoastalTownSpot(TileIndex tile, TownLayout layout)
 {
-	SpotData sp = { INVALID_TILE, 0, layout };
+	for (auto coast : SpiralTileSequence(tile, 40)) {
+		/* Find nearest land tile */
+		if (!IsTileType(tile, MP_CLEAR)) continue;
 
-	TileIndex coast = tile;
-	if (CircularTileSearch(&coast, 40, FindNearestEmptyLand, nullptr)) {
-		CircularTileSearch(&coast, 10, FindFurthestFromWater, &sp);
-		return sp.tile;
+		TileIndex furthest = INVALID_TILE;
+		uint max_dist = 0;
+		for (auto test : SpiralTileSequence(coast, 10)) {
+			if (!IsTileType(test, MP_CLEAR) || !IsTileFlat(test) || !IsTileAlignedToGrid(test, layout)) continue;
+
+			uint dist = GetClosestWaterDistance(test, true);
+			if (dist > max_dist) {
+				furthest = test;
+				max_dist = dist;
+			}
+		}
+		return furthest;
 	}
 
 	/* if we get here just give up */
 	return INVALID_TILE;
 }
 
+/**
+ * Get the HouseZones climate mask for the current landscape type.
+ * @return HouseZones climate mask.
+ */
+HouseZones GetClimateMaskForLandscape()
+{
+	switch (_settings_game.game_creation.landscape) {
+		case LandscapeType::Temperate: return HouseZone::ClimateTemperate;
+		case LandscapeType::Arctic: return {HouseZone::ClimateSubarcticAboveSnow, HouseZone::ClimateSubarcticBelowSnow};
+		case LandscapeType::Tropic: return HouseZone::ClimateSubtropic;
+		case LandscapeType::Toyland: return HouseZone::ClimateToyland;
+		default: NOT_REACHED();
+	}
+}
+
 /**
  * Create a random town somewhere in the world.
  * @param attempts How many times should we try?
@@ -2409,19 +2385,39 @@ static Town *CreateRandomTown(uint attempts, uint32_t townnameparts, TownSize si
 	return nullptr;
 }
 
-static const uint8_t _num_initial_towns[4] = {5, 11, 23, 46};  // very low, low, normal, high
+/**
+ * Calculate the number of towns which should be on the map according to the current "town density" newgame setting and the map size.
+ * If the number of towns is set to "custom", the function will always return that value instead.
+ * @return The number of towns.
+ */
+uint GetDefaultTownsForMapSize()
+{
+	static const uint8_t num_initial_towns[4] = {5, 11, 23, 46};  // very low, low, normal, high
+	if (_settings_game.difficulty.number_towns == static_cast<uint>(CUSTOM_TOWN_NUMBER_DIFFICULTY)) {
+		return _settings_newgame.game_creation.custom_town_number;
+	}
+	return Map::ScaleBySize(num_initial_towns[_settings_game.difficulty.number_towns]);
+}
 
 /**
  * Generate a number of towns with a given layout.
  * This function is used by the Random Towns button in Scenario Editor as well as in world generation.
  * @param layout The road layout to build.
+ * @param number The number of towns to create. std::nullopt means to use the game settings.
  * @return true if towns have been successfully created.
  */
-bool GenerateTowns(TownLayout layout)
+bool GenerateTowns(TownLayout layout, std::optional<uint> number)
 {
 	uint current_number = 0;
-	uint difficulty = (_game_mode != GM_EDITOR) ? _settings_game.difficulty.number_towns : 0;
-	uint total = (difficulty == (uint)CUSTOM_TOWN_NUMBER_DIFFICULTY) ? _settings_game.game_creation.custom_town_number : Map::ScaleBySize(_num_initial_towns[difficulty] + (Random() & 7));
+	uint total;
+	if (number.has_value()) {
+		total = number.value();
+	} else if (_settings_game.difficulty.number_towns == static_cast<uint>(CUSTOM_TOWN_NUMBER_DIFFICULTY)) {
+		total = GetDefaultTownsForMapSize();
+	} else {
+		total = GetDefaultTownsForMapSize() + (Random() & 7);
+	}
+
 	total = std::min<uint>(TownPool::MAX_SIZE, total);
 	uint32_t townnameparts;
 	TownNames town_names;
@@ -2478,15 +2474,15 @@ bool GenerateTowns(TownLayout layout)
  * @param tile TileIndex where town zone needs to be found.
  * @return the bit position of the given zone, as defined in HouseZones.
  */
-HouseZonesBits GetTownRadiusGroup(const Town *t, TileIndex tile)
+HouseZone GetTownRadiusGroup(const Town *t, TileIndex tile)
 {
 	uint dist = DistanceSquare(tile, t->xy);
 
-	if (t->fund_buildings_months && dist <= 25) return HZB_TOWN_CENTRE;
+	if (t->fund_buildings_months != 0 && dist <= 25) return HouseZone::TownCentre;
 
-	HouseZonesBits smallest = HZB_TOWN_EDGE;
-	for (HouseZonesBits i = HZB_BEGIN; i < HZB_END; i++) {
-		if (dist < t->cache.squared_town_zone_radius[i]) smallest = i;
+	HouseZone smallest = HouseZone::TownEdge;
+	for (HouseZone i : HZ_ZONE_ALL) {
+		if (dist < t->cache.squared_town_zone_radius[to_underlying(i)]) smallest = i;
 	}
 
 	return smallest;
@@ -2614,10 +2610,12 @@ static bool CheckFree2x2Area(TileIndex tile, int z, bool noslope)
  * @return true iff town layout allows building here.
  * @note see layouts
  */
-static inline bool TownLayoutAllowsHouseHere(Town *t, TileIndex tile)
+static inline bool TownLayoutAllowsHouseHere(Town *t, TileIndex tile, TownExpandModes modes)
 {
+	if (!modes.Test(TownExpandMode::Buildings)) return false;
+
 	/* Allow towns everywhere when we don't build roads */
-	if (!TownAllowedToBuildRoads()) return true;
+	if (!TownAllowedToBuildRoads(modes)) return true;
 
 	TileIndexDiffC grid_pos = TileIndexToTileIndexDiffC(t->xy, tile);
 
@@ -2645,10 +2643,12 @@ static inline bool TownLayoutAllowsHouseHere(Town *t, TileIndex tile)
  * @return true iff town layout allows a 2x2 building here.
  * @note see layouts
  */
-static inline bool TownLayoutAllows2x2HouseHere(Town *t, TileIndex tile)
+static inline bool TownLayoutAllows2x2HouseHere(Town *t, TileIndex tile, TownExpandModes modes)
 {
+	if (!modes.Test(TownExpandMode::Buildings)) return false;
+
 	/* Allow towns everywhere when we don't build roads */
-	if (!TownAllowedToBuildRoads()) return true;
+	if (!TownAllowedToBuildRoads(modes)) return true;
 
 	/* Compute relative position of tile. (Positive offsets are towards north) */
 	TileIndexDiffC grid_pos = TileIndexToTileIndexDiffC(t->xy, tile);
@@ -2682,15 +2682,15 @@ static inline bool TownLayoutAllows2x2HouseHere(Town *t, TileIndex tile)
  * @param noslope Are foundations disallowed for this house?
  * @param second The diagdir from the first tile to the second tile.
  */
-static bool CheckTownBuild2House(TileIndex *tile, Town *t, int maxz, bool noslope, DiagDirection second)
+static bool CheckTownBuild2House(TileIndex *tile, Town *t, int maxz, bool noslope, DiagDirection second, TownExpandModes modes)
 {
 	/* 'tile' is already checked in BuildTownHouse() - CanBuildHouseHere() and slope test */
 
 	TileIndex tile2 = *tile + TileOffsByDiagDir(second);
-	if (TownLayoutAllowsHouseHere(t, tile2) && CheckBuildHouseSameZ(tile2, maxz, noslope)) return true;
+	if (TownLayoutAllowsHouseHere(t, tile2, modes) && CheckBuildHouseSameZ(tile2, maxz, noslope)) return true;
 
 	tile2 = *tile + TileOffsByDiagDir(ReverseDiagDir(second));
-	if (TownLayoutAllowsHouseHere(t, tile2) && CheckBuildHouseSameZ(tile2, maxz, noslope)) {
+	if (TownLayoutAllowsHouseHere(t, tile2, modes) && CheckBuildHouseSameZ(tile2, maxz, noslope)) {
 		*tile = tile2;
 		return true;
 	}
@@ -2707,12 +2707,12 @@ static bool CheckTownBuild2House(TileIndex *tile, Town *t, int maxz, bool noslop
  * @param maxz The maximum Z level, since all tiles must have the same height.
  * @param noslope Are foundations disallowed for this house?
  */
-static bool CheckTownBuild2x2House(TileIndex *tile, Town *t, int maxz, bool noslope)
+static bool CheckTownBuild2x2House(TileIndex *tile, Town *t, int maxz, bool noslope, TownExpandModes modes)
 {
 	TileIndex tile2 = *tile;
 
 	for (DiagDirection d = DIAGDIR_SE;; d++) { // 'd' goes through DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_END
-		if (TownLayoutAllows2x2HouseHere(t, tile2) && CheckFree2x2Area(tile2, maxz, noslope)) {
+		if (TownLayoutAllows2x2HouseHere(t, tile2, modes) && CheckFree2x2Area(tile2, maxz, noslope)) {
 			*tile = tile2;
 			return true;
 		}
@@ -2757,6 +2757,13 @@ static void BuildTownHouse(Town *t, TileIndex tile, const HouseSpec *hs, HouseID
 	MakeTownHouse(tile, t, construction_counter, construction_stage, house, random_bits, is_protected);
 	UpdateTownRadius(t);
 	UpdateTownGrowthRate(t);
+
+	BuildingFlags size = hs->building_flags;
+
+	TriggerHouseAnimation_ConstructionStageChanged(tile, true);
+	if (size.Any(BUILDING_2_TILES_Y)) TriggerHouseAnimation_ConstructionStageChanged(tile + TileDiffXY(0, 1), true);
+	if (size.Any(BUILDING_2_TILES_X)) TriggerHouseAnimation_ConstructionStageChanged(tile + TileDiffXY(1, 0), true);
+	if (size.Any(BUILDING_HAS_4_TILES)) TriggerHouseAnimation_ConstructionStageChanged(tile + TileDiffXY(1, 1), true);
 }
 
 /**
@@ -2765,10 +2772,10 @@ static void BuildTownHouse(Town *t, TileIndex tile, const HouseSpec *hs, HouseID
  * @param tile The tile to try building on.
  * @return false iff no house can be built on this tile.
  */
-static bool TryBuildTownHouse(Town *t, TileIndex tile)
+static bool TryBuildTownHouse(Town *t, TileIndex tile, TownExpandModes modes)
 {
 	/* forbidden building here by town layout */
-	if (!TownLayoutAllowsHouseHere(t, tile)) return false;
+	if (!TownLayoutAllowsHouseHere(t, tile, modes)) return false;
 
 	/* no house allowed at all, bail out */
 	if (!CanBuildHouseHere(tile, false)) return false;
@@ -2778,13 +2785,14 @@ static bool TryBuildTownHouse(Town *t, TileIndex tile)
 
 	/* Get the town zone type of the current tile, as well as the climate.
 	 * This will allow to easily compare with the specs of the new house to build */
-	HouseZonesBits rad = GetTownRadiusGroup(t, tile);
+	HouseZones zones = GetTownRadiusGroup(t, tile);
 
-	/* Above snow? */
-	int land = to_underlying(_settings_game.game_creation.landscape);
-	if (_settings_game.game_creation.landscape == LandscapeType::Arctic && maxz > HighestSnowLine()) land = -1;
-
-	uint bitmask = (1 << rad) + (1 << (land + 12));
+	switch (_settings_game.game_creation.landscape) {
+		case LandscapeType::Temperate: zones.Set(HouseZone::ClimateTemperate); break;
+		case LandscapeType::Arctic: zones.Set(maxz > HighestSnowLine() ? HouseZone::ClimateSubarcticAboveSnow : HouseZone::ClimateSubarcticBelowSnow); break;
+		case LandscapeType::Tropic: zones.Set(HouseZone::ClimateSubtropic); break;
+		case LandscapeType::Toyland: zones.Set(HouseZone::ClimateToyland); break;
+	}
 
 	/* bits 0-4 are used
 	 * bits 11-15 are used
@@ -2797,7 +2805,7 @@ static bool TryBuildTownHouse(Town *t, TileIndex tile)
 	/* Generate a list of all possible houses that can be built. */
 	for (const auto &hs : HouseSpec::Specs()) {
 		/* Verify that the candidate house spec matches the current tile status */
-		if ((~hs.building_availability & bitmask) != 0 || !hs.enabled || hs.grf_prop.override_id != INVALID_HOUSE_ID) continue;
+		if (!hs.building_availability.All(zones) || !hs.enabled || hs.grf_prop.override_id != INVALID_HOUSE_ID) continue;
 
 		/* Don't let these counters overflow. Global counters are 32bit, there will never be that many houses. */
 		if (hs.class_id != HOUSE_NO_CLASS) {
@@ -2861,11 +2869,11 @@ static bool TryBuildTownHouse(Town *t, TileIndex tile)
 		if (noslope && slope != SLOPE_FLAT) continue;
 
 		if (hs->building_flags.Test(BuildingFlag::Size2x2)) {
-			if (!CheckTownBuild2x2House(&tile, t, maxz, noslope)) continue;
+			if (!CheckTownBuild2x2House(&tile, t, maxz, noslope, modes)) continue;
 		} else if (hs->building_flags.Test(BuildingFlag::Size2x1)) {
-			if (!CheckTownBuild2House(&tile, t, maxz, noslope, DIAGDIR_SW)) continue;
+			if (!CheckTownBuild2House(&tile, t, maxz, noslope, DIAGDIR_SW, modes)) continue;
 		} else if (hs->building_flags.Test(BuildingFlag::Size1x2)) {
-			if (!CheckTownBuild2House(&tile, t, maxz, noslope, DIAGDIR_SE)) continue;
+			if (!CheckTownBuild2House(&tile, t, maxz, noslope, DIAGDIR_SE, modes)) continue;
 		} else {
 			/* 1x1 house checks are already done */
 		}
@@ -2873,7 +2881,7 @@ static bool TryBuildTownHouse(Town *t, TileIndex tile)
 		uint8_t random_bits = Random();
 
 		if (hs->callback_mask.Test(HouseCallbackMask::AllowConstruction)) {
-			uint16_t callback_res = GetHouseCallback(CBID_HOUSE_ALLOW_CONSTRUCTION, 0, 0, house, t, tile, true, random_bits);
+			uint16_t callback_res = GetHouseCallback(CBID_HOUSE_ALLOW_CONSTRUCTION, 0, 0, house, t, tile, {}, true, random_bits);
 			if (callback_res != CALLBACK_FAILED && !Convert8bitBooleanCallback(hs->grf_prop.grffile, CBID_HOUSE_ALLOW_CONSTRUCTION, callback_res)) continue;
 		}
 
@@ -3200,9 +3208,10 @@ CommandCost CmdTownRating(DoCommandFlags flags, TownID town_id, CompanyID compan
  * @param grow_amount Amount to grow, or 0 to grow a random size up to the current amount of houses.
  * @return Empty cost or an error.
  */
-CommandCost CmdExpandTown(DoCommandFlags flags, TownID town_id, uint32_t grow_amount)
+CommandCost CmdExpandTown(DoCommandFlags flags, TownID town_id, uint32_t grow_amount, TownExpandModes modes)
 {
 	if (_game_mode != GM_EDITOR && _current_company != OWNER_DEITY) return CMD_ERROR;
+	if (modes.None()) return CMD_ERROR;
 	Town *t = Town::GetIfValid(town_id);
 	if (t == nullptr) return CMD_ERROR;
 
@@ -3214,13 +3223,13 @@ CommandCost CmdExpandTown(DoCommandFlags flags, TownID town_id, uint32_t grow_am
 			UpdateTownRadius(t);
 
 			uint n = amount * 10;
-			do GrowTown(t); while (--n);
+			do GrowTown(t, modes); while (--n);
 
 			t->cache.num_houses -= amount;
 		} else {
 			for (; grow_amount > 0; grow_amount--) {
 				/* Try several times to grow, as we are really suppose to grow */
-				for (uint i = 0; i < 25; i++) if (GrowTown(t)) break;
+				for (uint i = 0; i < 25; i++) if (GrowTown(t, modes)) break;
 			}
 		}
 		UpdateTownRadius(t);
@@ -3428,56 +3437,6 @@ static bool CheckClearTile(TileIndex tile)
 	return r.Succeeded();
 }
 
-/** Structure for storing data while searching the best place to build a statue. */
-struct StatueBuildSearchData {
-	TileIndex best_position; ///< Best position found so far.
-	int tile_count;          ///< Number of tiles tried.
-
-	StatueBuildSearchData(TileIndex best_pos, int count) : best_position(best_pos), tile_count(count) { }
-};
-
-/**
- * Search callback function for #TownActionBuildStatue.
- * @param tile Tile on which to perform the search.
- * @param user_data Reference to the statue search data.
- * @return Result of the test.
- */
-static bool SearchTileForStatue(TileIndex tile, void *user_data)
-{
-	static const int STATUE_NUMBER_INNER_TILES = 25; // Number of tiles int the center of the city, where we try to protect houses.
-
-	StatueBuildSearchData *statue_data = (StatueBuildSearchData *)user_data;
-	statue_data->tile_count++;
-
-	/* Statues can be build on slopes, just like houses. Only the steep slopes is a no go. */
-	if (IsSteepSlope(GetTileSlope(tile))) return false;
-	/* Don't build statues under bridges. */
-	if (IsBridgeAbove(tile)) return false;
-
-	/* A clear-able open space is always preferred. */
-	if ((IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) && CheckClearTile(tile)) {
-		statue_data->best_position = tile;
-		return true;
-	}
-
-	bool house = IsTileType(tile, MP_HOUSE);
-
-	/* Searching inside the inner circle. */
-	if (statue_data->tile_count <= STATUE_NUMBER_INNER_TILES) {
-		/* Save first house in inner circle. */
-		if (house && statue_data->best_position == INVALID_TILE && CheckClearTile(tile)) {
-			statue_data->best_position = tile;
-		}
-
-		/* If we have reached the end of the inner circle, and have a saved house, terminate the search. */
-		return statue_data->tile_count == STATUE_NUMBER_INNER_TILES && statue_data->best_position != INVALID_TILE;
-	}
-
-	/* Searching outside the circle, just pick the first possible spot. */
-	statue_data->best_position = tile; // Is optimistic, the condition below must also hold.
-	return house && CheckClearTile(tile);
-}
-
 /**
  * Perform a 9x9 tiles circular search from the center of the town
  * in order to find a free tile to place a statue
@@ -3489,17 +3448,51 @@ static CommandCost TownActionBuildStatue(Town *t, DoCommandFlags flags)
 {
 	if (!Object::CanAllocateItem()) return CommandCost(STR_ERROR_TOO_MANY_OBJECTS);
 
-	TileIndex tile = t->xy;
-	StatueBuildSearchData statue_data(INVALID_TILE, 0);
-	if (!CircularTileSearch(&tile, 9, SearchTileForStatue, &statue_data)) return CommandCost(STR_ERROR_STATUE_NO_SUITABLE_PLACE);
+	static const int STATUE_NUMBER_INNER_TILES = 25; // Number of tiles int the center of the city, where we try to protect houses.
+
+	TileIndex best_position = INVALID_TILE; ///< Best position found so far.
+	uint tile_count = 0; ///< Number of tiles tried.
+	for (auto tile : SpiralTileSequence(t->xy, 9)) {
+		tile_count++;
+
+		/* Statues can be build on slopes, just like houses. Only the steep slopes is a no go. */
+		if (IsSteepSlope(GetTileSlope(tile))) continue;
+		/* Don't build statues under bridges. */
+		if (IsBridgeAbove(tile)) continue;
+
+		/* A clear-able open space is always preferred. */
+		if ((IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) && CheckClearTile(tile)) {
+			best_position = tile;
+			break;
+		}
+
+		bool house = IsTileType(tile, MP_HOUSE);
+
+		/* Searching inside the inner circle. */
+		if (tile_count <= STATUE_NUMBER_INNER_TILES) {
+			/* Save first house in inner circle. */
+			if (house && best_position == INVALID_TILE && CheckClearTile(tile)) {
+				best_position = tile;
+			}
+
+			/* If we have reached the end of the inner circle, and have a saved house, terminate the search. */
+			if (tile_count == STATUE_NUMBER_INNER_TILES && best_position != INVALID_TILE) break;
+		}
+
+		/* Searching outside the circle, just pick the first possible spot. */
+		if (!house || !CheckClearTile(tile)) continue;
+		best_position = tile;
+		break;
+	}
+	if (best_position == INVALID_TILE) return CommandCost(STR_ERROR_STATUE_NO_SUITABLE_PLACE);
 
 	if (flags.Test(DoCommandFlag::Execute)) {
 		Backup<CompanyID> cur_company(_current_company, OWNER_NONE);
-		Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlag::Execute, statue_data.best_position);
+		Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlag::Execute, best_position);
 		cur_company.Restore();
-		BuildObject(OBJECT_STATUE, statue_data.best_position, _current_company, t);
+		BuildObject(OBJECT_STATUE, best_position, _current_company, t);
 		t->statues.Set(_current_company); // Once found and built, "inform" the Town.
-		MarkTileDirtyByTile(statue_data.best_position);
+		MarkTileDirtyByTile(best_position);
 	}
 	return CommandCost();
 }
@@ -3712,9 +3705,9 @@ static void ForAllStationsNearTown(Town *t, Func func)
 	 * The true radius is not stored or calculated anywhere, only the squared radius. */
 	/* The efficiency of this search might be improved for large towns and many stations on the map,
 	 * by using an integer square root approximation giving a value not less than the true square root. */
-	uint search_radius = t->cache.squared_town_zone_radius[HZB_TOWN_EDGE] / 2;
+	uint search_radius = t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)] / 2;
 	ForAllStationsRadius(t->xy, search_radius, [&](const Station * st) {
-		if (DistanceSquare(st->xy, t->xy) <= t->cache.squared_town_zone_radius[HZB_TOWN_EDGE]) {
+		if (DistanceSquare(st->xy, t->xy) <= t->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]) {
 			func(st);
 		}
 	});
@@ -4065,7 +4058,7 @@ CommandCost CheckforTownRating(DoCommandFlags flags, Town *t, TownRatingCheckTyp
 	return CommandCost();
 }
 
-static IntervalTimer<TimerGameEconomy> _economy_towns_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::TOWN}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_towns_monthly({TimerGameEconomy::MONTH, TimerGameEconomy::Priority::TOWN}, [](auto)
 {
 	for (Town *t : Town::Iterate()) {
 		/* Check for active town actions and decrement their counters. */
@@ -4092,7 +4085,7 @@ static IntervalTimer<TimerGameEconomy> _economy_towns_monthly({TimerGameEconomy:
 	}
 });
 
-static IntervalTimer<TimerGameEconomy> _economy_towns_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::TOWN}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_towns_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::TOWN}, [](auto)
 {
 	/* Increment house ages */
 	for (const auto t : Map::Iterate()) {
diff --git a/src/town_cmd.h b/src/town_cmd.h
index 79151162dc..7d247ce7cf 100644
--- a/src/town_cmd.h
+++ b/src/town_cmd.h
@@ -25,7 +25,7 @@ CommandCost CmdTownGrowthRate(DoCommandFlags flags, TownID town_id, uint16_t gro
 CommandCost CmdTownRating(DoCommandFlags flags, TownID town_id, CompanyID company_id, int16_t rating);
 CommandCost CmdTownCargoGoal(DoCommandFlags flags, TownID town_id, TownAcceptanceEffect tae, uint32_t goal);
 CommandCost CmdTownSetText(DoCommandFlags flags, TownID town_id, const EncodedString &text);
-CommandCost CmdExpandTown(DoCommandFlags flags, TownID town_id, uint32_t grow_amount);
+CommandCost CmdExpandTown(DoCommandFlags flags, TownID town_id, uint32_t grow_amount, TownExpandModes modes);
 CommandCost CmdDeleteTown(DoCommandFlags flags, TownID town_id);
 CommandCost CmdPlaceHouse(DoCommandFlags flags, TileIndex tile, HouseID house, bool house_protected);
 
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index a5c4cc7560..05ffc178de 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -34,6 +34,7 @@
 #include "townname_func.h"
 #include "core/backup_type.hpp"
 #include "core/geometry_func.hpp"
+#include "core/string_consumer.hpp"
 #include "genworld.h"
 #include "fios.h"
 #include "stringfilter_type.h"
@@ -87,25 +88,6 @@ private:
 	Dimension icon_size{}; ///< Dimensions of company icon
 	Dimension exclusive_size{}; ///< Dimensions of exclusive icon
 
-	/**
-	 * Get the position of the Nth set bit.
-	 *
-	 * If there is no Nth bit set return -1
-	 *
-	 * @param n The Nth set bit from which we want to know the position
-	 * @return The position of the Nth set bit, or -1 if no Nth bit set.
-	 */
-	int GetNthSetBit(int n)
-	{
-		if (n >= 0) {
-			for (uint i : SetBitIterator(this->enabled_actions.base())) {
-				n--;
-				if (n < 0) return i;
-			}
-		}
-		return -1;
-	}
-
 	/**
 	 * Gets all town authority actions enabled in settings.
 	 *
@@ -201,7 +183,7 @@ public:
 				DrawCompanyIcon(c->index, icon.left, text.top + icon_y_offset);
 
 				if (this->town->exclusivity == c->index) {
-					DrawSprite(SPR_EXCLUSIVE_TRANSPORT, COMPANY_SPRITE_COLOUR(c->index), exclusive.left, text.top + exclusive_y_offset);
+					DrawSprite(SPR_EXCLUSIVE_TRANSPORT, GetCompanyPalette(c->index), exclusive.left, text.top + exclusive_y_offset);
 				}
 
 				int rating = this->town->ratings[c->index];
@@ -289,7 +271,7 @@ public:
 				break;
 
 			case WID_TA_RATING_INFO:
-				resize.height = std::max({this->icon_size.height + WidgetDimensions::scaled.vsep_normal, this->exclusive_size.height + WidgetDimensions::scaled.vsep_normal, (uint)GetCharacterHeight(FS_NORMAL)});
+				fill.height = resize.height = std::max({this->icon_size.height + WidgetDimensions::scaled.vsep_normal, this->exclusive_size.height + WidgetDimensions::scaled.vsep_normal, (uint)GetCharacterHeight(FS_NORMAL)});
 				size.height = 9 * resize.height + padding.height;
 				break;
 		}
@@ -313,14 +295,14 @@ public:
 			case WID_TA_COMMAND_LIST: {
 				int y = this->GetRowFromWidget(pt.y, WID_TA_COMMAND_LIST, 1, GetCharacterHeight(FS_NORMAL)) - 1;
 
-				y = GetNthSetBit(y);
-				if (y >= 0) {
-					this->sel_action = static_cast<TownAction>(y);
-					this->SetDirty();
-				}
+				auto action = this->enabled_actions.GetNthSetBit(y);
+				if (!action.has_value()) break;
+
+				this->sel_action = *action;
+				this->SetDirty();
 
 				/* When double-clicking, continue */
-				if (click_count == 1 || y < 0 || !this->available_actions.Test(this->sel_action)) break;
+				if (click_count == 1 || !this->available_actions.Test(this->sel_action)) break;
 				[[fallthrough]];
 			}
 
@@ -331,7 +313,7 @@ public:
 	}
 
 	/** Redraw the whole window on a regular interval. */
-	IntervalTimer<TimerWindow> redraw_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> redraw_interval = {std::chrono::seconds(3), [this](auto) {
 		this->SetDirty();
 	}};
 
@@ -372,13 +354,12 @@ public:
 		this->CreateNestedTree();
 
 		this->town = Town::Get(window_number);
-		if (this->town->larger_town) this->GetWidget<NWidgetCore>(WID_TV_CAPTION)->SetString(STR_TOWN_VIEW_CITY_CAPTION);
 
 		this->FinishInitNested(window_number);
 
 		this->flags.Set(WindowFlag::DisableVpScroll);
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_TV_VIEWPORT);
-		nvp->InitializeViewport(this, this->town->xy, ScaleZoomGUI(ZOOM_LVL_TOWN));
+		nvp->InitializeViewport(this, this->town->xy, ScaleZoomGUI(ZoomLevel::Town));
 
 		/* disable renaming town in network games if you are not the server */
 		this->SetWidgetDisabledState(WID_TV_CHANGE_NAME, _networking && !_network_server);
@@ -392,7 +373,7 @@ public:
 
 	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
 	{
-		if (widget == WID_TV_CAPTION) return GetString(STR_TOWN_VIEW_TOWN_CAPTION, this->town->index);
+		if (widget == WID_TV_CAPTION) return GetString(this->town->larger_town ? STR_TOWN_VIEW_CITY_CAPTION : STR_TOWN_VIEW_TOWN_CAPTION, this->town->index);
 
 		return this->Window::GetWidgetString(widget, stringid);
 	}
@@ -507,10 +488,17 @@ public:
 				SetViewportCatchmentTown(Town::Get(this->window_number), !this->IsWidgetLowered(WID_TV_CATCHMENT));
 				break;
 
-			case WID_TV_EXPAND: { // expand town - only available on Scenario editor
-				Command<CMD_EXPAND_TOWN>::Post(STR_ERROR_CAN_T_EXPAND_TOWN, static_cast<TownID>(this->window_number), 0);
+			case WID_TV_EXPAND: // expand town - only available on Scenario editor
+				Command<CMD_EXPAND_TOWN>::Post(STR_ERROR_CAN_T_EXPAND_TOWN, static_cast<TownID>(this->window_number), 0, {TownExpandMode::Buildings, TownExpandMode::Roads});
+				break;
+
+			case WID_TV_EXPAND_BUILDINGS: // expand buildings of town - only available on Scenario editor
+				Command<CMD_EXPAND_TOWN>::Post(STR_ERROR_CAN_T_EXPAND_TOWN, static_cast<TownID>(this->window_number), 0, {TownExpandMode::Buildings});
+				break;
+
+			case WID_TV_EXPAND_ROADS: // expand roads of town - only available on Scenario editor
+				Command<CMD_EXPAND_TOWN>::Post(STR_ERROR_CAN_T_EXPAND_TOWN, static_cast<TownID>(this->window_number), 0, {TownExpandMode::Roads});
 				break;
-			}
 
 			case WID_TV_DELETE: // delete town - only available on Scenario editor
 				Command<CMD_DELETE_TOWN>::Post(STR_ERROR_TOWN_CAN_T_DELETE, static_cast<TownID>(this->window_number));
@@ -577,8 +565,9 @@ public:
 		}
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_TV_VIEWPORT) return;
 		if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
 			DoZoomInOutWindow(wheel < 0 ? ZOOM_IN : ZOOM_OUT, this);
 		}
@@ -604,7 +593,7 @@ public:
 		Command<CMD_RENAME_TOWN>::Post(STR_ERROR_CAN_T_RENAME_TOWN, static_cast<TownID>(this->window_number), *str);
 	}
 
-	IntervalTimer<TimerGameCalendar> daily_interval = {{TimerGameCalendar::DAY, TimerGameCalendar::Priority::NONE}, [this](auto) {
+	const IntervalTimer<TimerGameCalendar> daily_interval = {{TimerGameCalendar::DAY, TimerGameCalendar::Priority::NONE}, [this](auto) {
 		/* Refresh after possible snowline change */
 		this->SetDirty();
 	}};
@@ -644,7 +633,7 @@ static constexpr NWidgetPart _nested_town_editor_view_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
 		NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetAspect(WidgetDimensions::ASPECT_RENAME), SetSpriteTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
-		NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetStringTip(STR_TOWN_VIEW_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetToolTip(STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetAspect(WidgetDimensions::ASPECT_LOCATION), SetSpriteTip(SPR_GOTO_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
 		NWidget(WWT_SHADEBOX, COLOUR_BROWN),
 		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
@@ -656,10 +645,14 @@ static constexpr NWidgetPart _nested_town_editor_view_widgets[] = {
 		EndContainer(),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(),
-	NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP),
-		NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND_BUILDINGS), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON, STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND_ROADS), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_TOWN_VIEW_EXPAND_ROADS_BUTTON, STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP),
+	EndContainer(),
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP),
+		NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetFill(1, 1), SetResize(1, 0), SetStringTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
 		NWidget(WWT_RESIZEBOX, COLOUR_BROWN),
 	EndContainer(),
 };
@@ -708,11 +701,6 @@ static constexpr NWidgetPart _nested_town_directory_widgets[] = {
 	EndContainer(),
 };
 
-/** Enum referring to the Hotkeys in the town directory window */
-enum TownDirectoryHotkeys : int32_t {
-	TDHK_FOCUS_FILTER_BOX, ///< Focus the filter box
-};
-
 /** Town directory window class. */
 struct TownDirectoryWindow : public Window {
 private:
@@ -914,7 +902,7 @@ public:
 				Dimension icon_size = GetSpriteSize(SPR_TOWN_RATING_GOOD);
 				d.width += icon_size.width + 2;
 				d.height = std::max(d.height, icon_size.height);
-				resize.height = d.height;
+				fill.height = resize.height = d.height;
 				d.height *= 5;
 				d.width += padding.width;
 				d.height += padding.height;
@@ -968,7 +956,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_TD_SORT_CRITERIA) return;
 
@@ -986,7 +974,7 @@ public:
 	}
 
 	/** Redraw the whole window on a regular interval. */
-	IntervalTimer<TimerWindow> rebuild_interval = {std::chrono::seconds(3), [this](auto) {
+	const IntervalTimer<TimerWindow> rebuild_interval = {std::chrono::seconds(3), [this](auto) {
 		this->BuildSortTownList();
 		this->SetDirty();
 	}};
@@ -1026,21 +1014,8 @@ public:
 		}
 	}
 
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case TDHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_TD_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				break;
-			default:
-				return ES_NOT_HANDLED;
-		}
-		return ES_HANDLED;
-	}
-
 	static inline HotkeyList hotkeys {"towndirectory", {
-		Hotkey('F', "focus_filter_box", TDHK_FOCUS_FILTER_BOX),
+		Hotkey('F', "focus_filter_box", WID_TD_FILTER),
 	}};
 };
 
@@ -1096,7 +1071,6 @@ static constexpr NWidgetPart _nested_found_town_widgets[] = {
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_TF_RANDOM_TOWN), SetStringTip(STR_FOUND_TOWN_RANDOM_TOWN_BUTTON, STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP), SetFill(1, 0),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_TF_MANY_RANDOM_TOWNS), SetStringTip(STR_FOUND_TOWN_MANY_RANDOM_TOWNS, STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP), SetFill(1, 0),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_TF_LOAD_FROM_FILE), SetStringTip(STR_FOUND_TOWN_LOAD_FROM_FILE, STR_FOUND_TOWN_LOAD_FROM_FILE_TOOLTIP), SetFill(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_TF_EXPAND_ALL_TOWNS), SetStringTip(STR_FOUND_TOWN_EXPAND_ALL_TOWNS, STR_FOUND_TOWN_EXPAND_ALL_TOWNS_TOOLTIP), SetFill(1, 0),
 				EndContainer(),
 			EndContainer(),
 
@@ -1138,6 +1112,18 @@ static constexpr NWidgetPart _nested_found_town_widgets[] = {
 					EndContainer(),
 				EndContainer(),
 			EndContainer(),
+
+			/* Town expansion selection. */
+			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_TF_TOWN_EXPAND_SEL),
+				NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
+					NWidget(WWT_LABEL, INVALID_COLOUR), SetStringTip(STR_FOUND_TOWN_EXPAND_MODE),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_TF_EXPAND_ALL_TOWNS), SetStringTip(STR_FOUND_TOWN_EXPAND_ALL_TOWNS, STR_FOUND_TOWN_EXPAND_ALL_TOWNS_TOOLTIP), SetFill(1, 0),
+					NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
+						NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_TF_EXPAND_BUILDINGS), SetStringTip(STR_FOUND_TOWN_EXPAND_BUILDINGS, STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP), SetFill(1, 0),
+						NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_TF_EXPAND_ROADS), SetStringTip(STR_FOUND_TOWN_EXPAND_ROADS, STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP), SetFill(1, 0),
+					EndContainer(),
+				EndContainer(),
+			EndContainer(),
 		EndContainer(),
 	EndContainer(),
 };
@@ -1152,6 +1138,7 @@ private:
 	bool townnamevalid = false; ///< Is generated town name valid?
 	uint32_t townnameparts = 0; ///< Generated town name
 	TownNameParams params; ///< Town name parameters
+	static inline TownExpandModes expand_modes{TownExpandMode::Buildings, TownExpandMode::Roads};
 
 public:
 	FoundTownWindow(WindowDesc &desc, WindowNumber window_number) :
@@ -1171,6 +1158,7 @@ public:
 		if (_game_mode == GM_EDITOR) return;
 
 		this->GetWidget<NWidgetStacked>(WID_TF_TOWN_ACTION_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL);
+		this->GetWidget<NWidgetStacked>(WID_TF_TOWN_EXPAND_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL);
 		this->GetWidget<NWidgetStacked>(WID_TF_SIZE_SEL)->SetDisplayedPlane(SZSP_VERTICAL);
 		if (_settings_game.economy.found_town != TF_CUSTOM_LAYOUT) {
 			this->GetWidget<NWidgetStacked>(WID_TF_ROAD_LAYOUT_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL);
@@ -1210,6 +1198,9 @@ public:
 			this->SetWidgetLoweredState(i, i == WID_TF_LAYOUT_ORIGINAL + this->town_layout);
 		}
 
+		this->SetWidgetLoweredState(WID_TF_EXPAND_BUILDINGS, FoundTownWindow::expand_modes.Test(TownExpandMode::Buildings));
+		this->SetWidgetLoweredState(WID_TF_EXPAND_ROADS, FoundTownWindow::expand_modes.Test(TownExpandMode::Roads));
+
 		this->SetDirty();
 	}
 
@@ -1250,23 +1241,17 @@ public:
 				break;
 
 			case WID_TF_MANY_RANDOM_TOWNS: {
-				Backup<bool> old_generating_world(_generating_world, true);
-				UpdateNearestTownForRoadTiles(true);
-				if (!GenerateTowns(this->town_layout)) {
-					ShowErrorMessage(GetEncodedString(STR_ERROR_CAN_T_GENERATE_TOWN), GetEncodedString(STR_ERROR_NO_SPACE_FOR_TOWN), WL_INFO);
-				}
-				UpdateNearestTownForRoadTiles(false);
-				old_generating_world.Restore();
+				std::string default_town_number = fmt::format("{}", GetDefaultTownsForMapSize());
+				ShowQueryString(default_town_number, STR_MAPGEN_NUMBER_OF_TOWNS, 5, this, CS_NUMERAL, {QueryStringFlag::AcceptUnchanged});
 				break;
 			}
-
 			case WID_TF_LOAD_FROM_FILE:
 				ShowSaveLoadDialog(FT_TOWN_DATA, SLO_LOAD);
 				break;
 
 			case WID_TF_EXPAND_ALL_TOWNS:
 				for (Town *t : Town::Iterate()) {
-					Command<CMD_EXPAND_TOWN>::Do(DoCommandFlag::Execute, t->index, 0);
+					Command<CMD_EXPAND_TOWN>::Do(DoCommandFlag::Execute, t->index, 0, FoundTownWindow::expand_modes);
 				}
 				break;
 
@@ -1281,6 +1266,16 @@ public:
 				this->SetDirty();
 				break;
 
+			case WID_TF_EXPAND_BUILDINGS:
+				FoundTownWindow::expand_modes.Flip(TownExpandMode::Buildings);
+				this->UpdateButtons(false);
+				break;
+
+			case WID_TF_EXPAND_ROADS:
+				FoundTownWindow::expand_modes.Flip(TownExpandMode::Roads);
+				this->UpdateButtons(false);
+				break;
+
 			case WID_TF_LAYOUT_ORIGINAL: case WID_TF_LAYOUT_BETTER: case WID_TF_LAYOUT_GRID2:
 			case WID_TF_LAYOUT_GRID3: case WID_TF_LAYOUT_RANDOM:
 				this->town_layout = (TownLayout)(widget - WID_TF_LAYOUT_ORIGINAL);
@@ -1294,6 +1289,23 @@ public:
 		}
 	}
 
+	void OnQueryTextFinished(std::optional<std::string> str) override
+	{
+		/* Was 'cancel' pressed? */
+		if (!str.has_value()) return;
+
+		auto value = ParseInteger(*str, 10, true);
+		if (!value.has_value()) return;
+
+		Backup<bool> old_generating_world(_generating_world, true);
+		UpdateNearestTownForRoadTiles(true);
+		if (!GenerateTowns(this->town_layout, value)) {
+			ShowErrorMessage(GetEncodedString(STR_ERROR_CAN_T_GENERATE_TOWN), GetEncodedString(STR_ERROR_NO_SPACE_FOR_TOWN), WL_INFO);
+		}
+		UpdateNearestTownForRoadTiles(false);
+		old_generating_world.Restore();
+	}
+
 	void OnPlaceObject([[maybe_unused]] Point pt, TileIndex tile) override
 	{
 		this->ExecuteFoundTownCommand(tile, false, STR_ERROR_CAN_T_FOUND_TOWN_HERE, CcFoundTown);
@@ -1335,45 +1347,6 @@ void InitializeTownGui()
 	_town_local_authority_kdtree.Clear();
 }
 
-/**
- * Draw representation of a house tile for GUI purposes.
- * @param x Position x of image.
- * @param y Position y of image.
- * @param spec House spec to draw.
- * @param house_id House ID to draw.
- * @param view The house's 'view'.
- */
-void DrawNewHouseTileInGUI(int x, int y, const HouseSpec *spec, HouseID house_id, int view)
-{
-	HouseResolverObject object(house_id, INVALID_TILE, nullptr, CBID_NO_CALLBACK, 0, 0, true, view);
-	const SpriteGroup *group = object.Resolve();
-	if (group == nullptr || group->type != SGT_TILELAYOUT) return;
-
-	uint8_t stage = TOWN_HOUSE_COMPLETED;
-	const DrawTileSprites *dts = reinterpret_cast<const TileLayoutSpriteGroup *>(group)->ProcessRegisters(&stage);
-
-	PaletteID palette = GENERAL_SPRITE_COLOUR(spec->random_colour[0]);
-	if (spec->callback_mask.Test(HouseCallbackMask::Colour)) {
-		uint16_t callback = GetHouseCallback(CBID_HOUSE_COLOUR, 0, 0, house_id, nullptr, INVALID_TILE, true, view);
-		if (callback != CALLBACK_FAILED) {
-			/* If bit 14 is set, we should use a 2cc colour map, else use the callback value. */
-			palette = HasBit(callback, 14) ? GB(callback, 0, 8) + SPR_2CCMAP_BASE : callback;
-		}
-	}
-
-	SpriteID image = dts->ground.sprite;
-	PaletteID pal  = dts->ground.pal;
-
-	if (HasBit(image, SPRITE_MODIFIER_CUSTOM_SPRITE)) image += stage;
-	if (HasBit(pal, SPRITE_MODIFIER_CUSTOM_SPRITE)) pal += stage;
-
-	if (GB(image, 0, SPRITE_WIDTH) != 0) {
-		DrawSprite(image, GroundSpritePaletteTransform(image, pal, palette), x, y);
-	}
-
-	DrawNewGRFTileSeqInGUI(x, y, dts, stage, palette);
-}
-
 /**
  * Draw a house that does not exist.
  * @param x Position x of image.
@@ -1389,7 +1362,7 @@ void DrawHouseInGUI(int x, int y, HouseID house_id, int view)
 			 * spritegroup associated with them, then the sprite for the substitute
 			 * house id is drawn instead. */
 			const HouseSpec *spec = HouseSpec::Get(house_id);
-			if (spec->grf_prop.GetSpriteGroup() != nullptr) {
+			if (spec->grf_prop.HasSpriteGroups()) {
 				DrawNewHouseTileInGUI(x, y, spec, house_id, view);
 				return;
 			} else {
@@ -1437,15 +1410,19 @@ void DrawHouseInGUI(int x, int y, HouseID house_id, int view)
  */
 static StringID GetHouseName(const HouseSpec *hs)
 {
-	uint16_t callback_res = GetHouseCallback(CBID_HOUSE_CUSTOM_NAME, 1, 0, hs->Index(), nullptr, INVALID_TILE, true);
+	std::array<int32_t, 1> regs100;
+	uint16_t callback_res = GetHouseCallback(CBID_HOUSE_CUSTOM_NAME, 1, 0, hs->Index(), nullptr, INVALID_TILE, regs100, true);
 	if (callback_res != CALLBACK_FAILED && callback_res != 0x400) {
-		if (callback_res > 0x400) {
+		StringID new_name = STR_NULL;
+		if (callback_res == 0x40F) {
+			new_name = GetGRFStringID(hs->grf_prop.grffile->grfid, static_cast<GRFStringID>(regs100[0]));
+		} else if (callback_res > 0x400) {
 			ErrorUnknownCallbackResult(hs->grf_prop.grffile->grfid, CBID_HOUSE_CUSTOM_NAME, callback_res);
 		} else {
-			StringID new_name = GetGRFStringID(hs->grf_prop.grffile->grfid, GRFSTR_MISC_GRF_TEXT + callback_res);
-			if (new_name != STR_NULL && new_name != STR_UNDEFINED) {
-				return new_name;
-			}
+			new_name = GetGRFStringID(hs->grf_prop.grffile->grfid, GRFSTR_MISC_GRF_TEXT + callback_res);
+		}
+		if (new_name != STR_NULL && new_name != STR_UNDEFINED) {
+			return new_name;
 		}
 	}
 
@@ -1461,13 +1438,7 @@ public:
 	 */
 	void SetClimateMask()
 	{
-		switch (_settings_game.game_creation.landscape) {
-			case LandscapeType::Temperate: this->climate_mask = HZ_TEMP; break;
-			case LandscapeType::Arctic:    this->climate_mask = HZ_SUBARTC_ABOVE | HZ_SUBARTC_BELOW; break;
-			case LandscapeType::Tropic:    this->climate_mask = HZ_SUBTROPIC; break;
-			case LandscapeType::Toyland:   this->climate_mask = HZ_TOYLND; break;
-			default: NOT_REACHED();
-		}
+		this->climate_mask = GetClimateMaskForLandscape();
 
 		/* In some cases, not all 'classes' (house zones) have distinct houses, so we need to disable those.
 		 * As we need to check all types, and this cannot change with the picker window open, pre-calculate it.
@@ -1495,7 +1466,7 @@ public:
 
 	/* Houses do not have classes like NewGRFClass. We'll make up fake classes based on town zone
 	 * availability instead. */
-	static inline const std::array<StringID, HZB_END> zone_names = {
+	static inline const std::array<StringID, NUM_HOUSE_ZONES> zone_names = {
 		STR_HOUSE_PICKER_CLASS_ZONE1,
 		STR_HOUSE_PICKER_CLASS_ZONE2,
 		STR_HOUSE_PICKER_CLASS_ZONE3,
@@ -1540,16 +1511,19 @@ public:
 	int GetSelectedType() const override { return sel_type; }
 	void SetSelectedType(int id) const override { sel_type = id; }
 
+	static HouseZone GetHouseZoneFromClassId(int cls_id) { return static_cast<HouseZone>(to_underlying(HouseZone::TownEdge) + cls_id); }
+	static int GetClassIdFromHouseZone(HouseZones zones) { return FindFirstBit((zones & HZ_ZONE_ALL).base()) - to_underlying(HouseZone::TownEdge); }
+
 	StringID GetTypeName(int cls_id, int id) const override
 	{
 		const HouseSpec *spec = HouseSpec::Get(id);
 		if (spec == nullptr) return INVALID_STRING_ID;
 		if (!spec->enabled) return INVALID_STRING_ID;
-		if ((spec->building_availability & climate_mask) == 0) return INVALID_STRING_ID;
-		if (!HasBit(spec->building_availability, cls_id)) return INVALID_STRING_ID;
+		if (!spec->building_availability.Any(climate_mask)) return INVALID_STRING_ID;
+		if (!spec->building_availability.Test(GetHouseZoneFromClassId(cls_id))) return INVALID_STRING_ID;
 		for (int i = 0; i < cls_id; i++) {
 			/* Don't include if it's already included in an earlier zone. */
-			if (HasBit(spec->building_availability, i)) return INVALID_STRING_ID;
+			if (spec->building_availability.Test(GetHouseZoneFromClassId(i))) return INVALID_STRING_ID;
 		}
 
 		return GetHouseName(spec);
@@ -1560,11 +1534,11 @@ public:
 		const auto *spec = HouseSpec::Get(id);
 		if (spec == nullptr) return {};
 		if (!spec->enabled) return {};
-		if ((spec->building_availability & climate_mask) == 0) return {};
-		if (!HasBit(spec->building_availability, cls_id)) return {};
+		if (!spec->building_availability.Any(climate_mask)) return {};
+		if (!spec->building_availability.Test(GetHouseZoneFromClassId(cls_id))) return {};
 		for (int i = 0; i < cls_id; i++) {
 			/* Don't include if it's already included in an earlier zone. */
-			if (HasBit(spec->building_availability, i)) return {};
+			if (spec->building_availability.Test(GetHouseZoneFromClassId(i))) return {};
 		}
 
 		return spec->badges;
@@ -1588,7 +1562,7 @@ public:
 			if (*it == 0) continue;
 			HouseID house = static_cast<HouseID>(std::distance(id_count.begin(), it));
 			const HouseSpec *hs = HouseSpec::Get(house);
-			int class_index = FindFirstBit(hs->building_availability & HZ_ZONALL);
+			int class_index = GetClassIdFromHouseZone(hs->building_availability);
 			items.insert({0, house, class_index, house});
 		}
 	}
@@ -1609,7 +1583,7 @@ public:
 					/* Not preset, hide from UI. */
 					dst.insert({item.grfid, item.local_id, -1, -1});
 				} else {
-					int class_index = FindFirstBit(it->building_availability & HZ_ZONALL);
+					int class_index = GetClassIdFromHouseZone(it->building_availability);
 					dst.insert( {item.grfid, item.local_id, class_index, it->Index()});
 				}
 			}
@@ -1632,7 +1606,7 @@ static CargoTypes GetProducedCargoOfHouse(const HouseSpec *hs)
 	CargoTypes produced{};
 	if (hs->callback_mask.Test(HouseCallbackMask::ProduceCargo)) {
 		for (uint i = 0; i < 256; i++) {
-			uint16_t callback = GetHouseCallback(CBID_HOUSE_PRODUCE_CARGO, i, 0, hs->Index(), nullptr, INVALID_TILE, true);
+			uint16_t callback = GetHouseCallback(CBID_HOUSE_PRODUCE_CARGO, i, 0, hs->Index(), nullptr, INVALID_TILE, {}, true);
 
 			if (callback == CALLBACK_FAILED || callback == CALLBACK_HOUSEPRODCARGO_END) break;
 
@@ -1743,7 +1717,7 @@ struct BuildHouseWindow : public PickerWindow {
 
 	void OnInit() override
 	{
-		this->InvalidateData(PickerInvalidation::Position);
+		this->InvalidateData(PICKER_INVALIDATION_ALL);
 		this->PickerWindow::OnInit();
 	}
 
@@ -1805,7 +1779,7 @@ struct BuildHouseWindow : public PickerWindow {
 		Command<CMD_PLACE_HOUSE>::Post(STR_ERROR_CAN_T_BUILD_HOUSE, CcPlaySound_CONSTRUCTION_OTHER, tile, spec->Index(), this->house_protected);
 	}
 
-	IntervalTimer<TimerWindow> view_refresh_interval = {std::chrono::milliseconds(2500), [this](auto) {
+	const IntervalTimer<TimerWindow> view_refresh_interval = {std::chrono::milliseconds(2500), [this](auto) {
 		/* There are four different 'views' that are random based on house tile position. As this is not
 		 * user-controllable, instead we automatically cycle through them. */
 		HousePickerCallbacks::sel_view = (HousePickerCallbacks::sel_view + 1) % 4;
diff --git a/src/town_map.h b/src/town_map.h
index 05d49351f3..1a982bcb82 100644
--- a/src/town_map.h
+++ b/src/town_map.h
@@ -307,10 +307,10 @@ inline uint8_t GetHouseRandomBits(Tile t)
  * @param triggers the activated triggers
  * @pre IsTileType(t, MP_HOUSE)
  */
-inline void SetHouseTriggers(Tile t, uint8_t triggers)
+inline void SetHouseRandomTriggers(Tile t, HouseRandomTriggers triggers)
 {
 	assert(IsTileType(t, MP_HOUSE));
-	SB(t.m3(), 0, 5, triggers);
+	SB(t.m3(), 0, 5, triggers.base());
 }
 
 /**
@@ -320,10 +320,10 @@ inline void SetHouseTriggers(Tile t, uint8_t triggers)
  * @pre IsTileType(t, MP_HOUSE)
  * @return triggers
  */
-inline uint8_t GetHouseTriggers(Tile t)
+inline HouseRandomTriggers GetHouseRandomTriggers(Tile t)
 {
 	assert(IsTileType(t, MP_HOUSE));
-	return GB(t.m3(), 0, 5);
+	return static_cast<HouseRandomTriggers>(GB(t.m3(), 0, 5));
 }
 
 /**
diff --git a/src/town_type.h b/src/town_type.h
index dffd93bb68..b3bca9b3e1 100644
--- a/src/town_type.h
+++ b/src/town_type.h
@@ -91,6 +91,14 @@ enum TownLayout : uint8_t {
 };
 DECLARE_ENUM_AS_ADDABLE(TownLayout)
 
+/** Options for growing towns. */
+enum class TownExpandMode : uint8_t {
+	Buildings, ///< Allow town to place buildings.
+	Roads, ///< Allow town to place roads.
+};
+
+using TownExpandModes = EnumBitSet<TownExpandMode, uint8_t>;
+
 /** Town founding setting values. It needs to be 8bits, because we save and load it as such */
 enum TownFounding : uint8_t {
 	TF_BEGIN = 0,     ///< Used for iterations and limit testing
diff --git a/src/townname.cpp b/src/townname.cpp
index b19bfef79e..aa264a6dba 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -137,10 +137,6 @@ bool GenerateTownName(Randomizer &randomizer, uint32_t *townnameparts, TownNames
 {
 	TownNameParams par(_settings_game.game_creation.town_name);
 
-	/* This function is called very often without entering the gameloop
-	 * in between. So reset layout cache to prevent it from growing too big. */
-	Layouter::ReduceLineCache();
-
 	/* Do not set i too low, since when we run out of names, we loop
 	 * for #tries only one time anyway - then we stop generating more
 	 * towns. Do not set it too high either, since looping through all
@@ -602,8 +598,8 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
 
 	/* The select criteria. */
 	CzechGender gender;
-	CzechChoose choose;
-	CzechAllow allow;
+	CzechChooseFlags choose;
+	CzechAllowFlags allow;
 
 	if (do_prefix) prefix = SeedModChance(5, std::size(_name_czech_adj) * 12, seed) / 12;
 	if (do_suffix) suffix = SeedModChance(7, std::size(_name_czech_suffix), seed);
@@ -632,18 +628,18 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
 		/* Load the postfix (1:1 chance that a postfix will be inserted) */
 		postfix = SeedModChance(14, std::size(_name_czech_subst_postfix) * 2, seed);
 
-		if (choose & CZC_POSTFIX) {
+		if (choose.Test(CzechChooseFlag::Postfix)) {
 			/* Always get a real postfix. */
 			postfix %= std::size(_name_czech_subst_postfix);
 		}
-		if (choose & CZC_NOPOSTFIX) {
+		if (choose.Test(CzechChooseFlag::NoPostfix)) {
 			/* Always drop a postfix. */
 			postfix += std::size(_name_czech_subst_postfix);
 		}
 		if (postfix < std::size(_name_czech_subst_postfix)) {
-			choose |= CZC_POSTFIX;
+			choose.Set(CzechChooseFlag::Postfix);
 		} else {
-			choose |= CZC_NOPOSTFIX;
+			choose.Set(CzechChooseFlag::NoPostfix);
 		}
 
 		/* Localize the array segment containing a good gender */
@@ -671,7 +667,7 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
 		for (ending = ending_start; ending <= ending_stop; ending++) {
 			const CzechNameSubst *e = &_name_czech_subst_ending[ending];
 
-			if ((e->choose & choose) == choose && (e->allow & allow) != 0) {
+			if ((e->choose & choose) == choose && e->allow.Any(allow)) {
 				map[i++] = ending;
 			}
 		}
@@ -702,11 +698,11 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
 	if (dynamic_subst) {
 		builder += _name_czech_subst_stem[stem].name;
 		if (postfix < std::size(_name_czech_subst_postfix)) {
-			const char *poststr = _name_czech_subst_postfix[postfix];
-			const char *endstr = _name_czech_subst_ending[ending].name;
+			std::string_view poststr = _name_czech_subst_postfix[postfix];
+			std::string_view endstr = _name_czech_subst_ending[ending].name;
 
-			size_t postlen = strlen(poststr);
-			size_t endlen = strlen(endstr);
+			size_t postlen = poststr.size();
+			size_t endlen = endstr.size();
 			assert(postlen > 0 && endlen > 0);
 
 			/* Kill the "avava" and "Jananna"-like cases */
@@ -884,7 +880,7 @@ static void MakeItalianTownName(StringBuilder &builder, uint32_t seed)
 		return;
 	}
 
-	static const char * const mascul_femin_italian[] = {
+	static const std::string_view mascul_femin_italian[] = {
 		"o",
 		"a",
 	};
@@ -961,7 +957,7 @@ static void MakeCatalanTownName(StringBuilder &builder, uint32_t seed)
 typedef void TownNameGenerator(StringBuilder &builder, uint32_t seed);
 
 /** Town name generators */
-static TownNameGenerator *_town_name_generators[] = {
+static TownNameGenerator *const _town_name_generators[] = {
 	MakeEnglishOriginalTownName,  // replaces first 4 characters of name
 	MakeFrenchTownName,
 	MakeGermanTownName,
diff --git a/src/train.h b/src/train.h
index 971929fb39..b7ff1a6581 100644
--- a/src/train.h
+++ b/src/train.h
@@ -22,16 +22,17 @@
 struct Train;
 
 /** Rail vehicle flags. */
-enum VehicleRailFlags : uint8_t {
-	VRF_REVERSING                     = 0,
-	VRF_POWEREDWAGON                  = 3, ///< Wagon is powered.
-	VRF_REVERSE_DIRECTION             = 4, ///< Reverse the visible direction of the vehicle.
+enum VehicleRailFlag : uint8_t {
+	Reversing = 0, ///< Train is slowing down to reverse.
+	PoweredWagon = 3, ///< Wagon is powered.
+	Flipped = 4, ///< Reverse the visible direction of the vehicle.
 
-	VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL = 6, ///< Electric train engine is allowed to run on normal rail. */
-	VRF_TOGGLE_REVERSE                = 7, ///< Used for vehicle var 0xFE bit 8 (toggled each time the train is reversed, accurate for first vehicle only).
-	VRF_TRAIN_STUCK                   = 8, ///< Train can't get a path reservation.
-	VRF_LEAVING_STATION               = 9, ///< Train is just leaving a station.
+	AllowedOnNormalRail = 6, ///< Electric train engine is allowed to run on normal rail. */
+	Reversed = 7, ///< Used for vehicle var 0xFE bit 8 (toggled each time the train is reversed, accurate for first vehicle only).
+	Stuck = 8, ///< Train can't get a path reservation.
+	LeavingStation = 9, ///< Train is just leaving a station.
 };
+using VehicleRailFlags = EnumBitSet<VehicleRailFlag, uint16_t>;
 
 /** Modes for ignoring signals. */
 enum TrainForceProceeding : uint8_t {
@@ -88,7 +89,7 @@ struct TrainCache {
  * 'Train' is either a loco or a wagon.
  */
 struct Train final : public GroundVehicle<Train, VEH_TRAIN> {
-	uint16_t flags = 0;
+	VehicleRailFlags flags{};
 	uint16_t crash_anim_pos = 0; ///< Crash animation counter.
 	uint16_t wait_counter = 0; ///< Ticks waiting in front of a signal, ticks being stuck or a counter for forced proceeding through signals.
 
@@ -205,7 +206,7 @@ protected: // These functions should not be called outside acceleration code.
 	inline uint16_t GetPoweredPartPower(const Train *head) const
 	{
 		/* For powered wagons the engine defines the type of engine (i.e. railtype) */
-		if (HasBit(this->flags, VRF_POWEREDWAGON) && HasPowerOnRail(head->railtype, GetRailType(this->tile))) {
+		if (this->flags.Test(VehicleRailFlag::PoweredWagon) && HasPowerOnRail(head->railtype, GetRailType(this->tile))) {
 			return RailVehInfo(this->gcache.first_engine)->pow_wag_power;
 		}
 
@@ -226,7 +227,7 @@ protected: // These functions should not be called outside acceleration code.
 		}
 
 		/* Powered wagons have extra weight added. */
-		if (HasBit(this->flags, VRF_POWEREDWAGON)) {
+		if (this->flags.Test(VehicleRailFlag::PoweredWagon)) {
 			weight += RailVehInfo(this->gcache.first_engine)->pow_wag_weight;
 		}
 
@@ -273,7 +274,7 @@ protected: // These functions should not be called outside acceleration code.
 	 */
 	inline AccelStatus GetAccelerationStatus() const
 	{
-		return this->vehstatus.Test(VehState::Stopped) || HasBit(this->flags, VRF_REVERSING) || HasBit(this->flags, VRF_TRAIN_STUCK) ? AS_BRAKE : AS_ACCEL;
+		return this->vehstatus.Test(VehState::Stopped) || this->flags.Any({VehicleRailFlag::Reversing, VehicleRailFlag::Stuck}) ? AS_BRAKE : AS_ACCEL;
 	}
 
 	/**
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index b7b10f543e..4d3428e9f5 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -163,9 +163,9 @@ void Train::ConsistChanged(ConsistChangeFlags allowed_changes)
 		if (rvi_v->pow_wag_power != 0 && rvi_u->railveh_type == RAILVEH_WAGON &&
 				UsesWagonOverride(u) && !HasBit(u->vcache.cached_vis_effect, VE_DISABLE_WAGON_POWER)) {
 			/* wagon is powered */
-			SetBit(u->flags, VRF_POWEREDWAGON); // cache 'powered' status
+			u->flags.Set(VehicleRailFlag::PoweredWagon); // cache 'powered' status
 		} else {
-			ClrBit(u->flags, VRF_POWEREDWAGON);
+			u->flags.Reset(VehicleRailFlag::PoweredWagon);
 		}
 
 		if (!u->IsArticulatedPart()) {
@@ -177,7 +177,7 @@ void Train::ConsistChanged(ConsistChangeFlags allowed_changes)
 
 			/* Some electric engines can be allowed to run on normal rail. It happens to all
 			 * existing electric engines when elrails are disabled and then re-enabled */
-			if (HasBit(u->flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL)) {
+			if (u->flags.Test(VehicleRailFlag::AllowedOnNormalRail)) {
 				u->railtype = RAILTYPE_RAIL;
 				u->compatible_railtypes.Set(RAILTYPE_RAIL);
 			}
@@ -437,11 +437,11 @@ void Train::UpdateAcceleration()
 
 int Train::GetCursorImageOffset() const
 {
-	if (this->gcache.cached_veh_length != 8 && HasBit(this->flags, VRF_REVERSE_DIRECTION) && !EngInfo(this->engine_type)->misc_flags.Test(EngineMiscFlag::RailFlips)) {
+	if (this->gcache.cached_veh_length != 8 && this->flags.Test(VehicleRailFlag::Flipped) && !EngInfo(this->engine_type)->misc_flags.Test(EngineMiscFlag::RailFlips)) {
 		int reference_width = TRAININFO_DEFAULT_VEHICLE_WIDTH;
 
 		const Engine *e = this->GetEngine();
-		if (e->GetGRF() != nullptr && is_custom_sprite(e->u.rail.image_index)) {
+		if (e->GetGRF() != nullptr && IsCustomVehicleSpriteNum(e->u.rail.image_index)) {
 			reference_width = e->GetGRF()->traininfo_vehicle_width;
 		}
 
@@ -461,13 +461,13 @@ int Train::GetDisplayImageWidth(Point *offset) const
 	int vehicle_pitch = 0;
 
 	const Engine *e = this->GetEngine();
-	if (e->GetGRF() != nullptr && is_custom_sprite(e->u.rail.image_index)) {
+	if (e->GetGRF() != nullptr && IsCustomVehicleSpriteNum(e->u.rail.image_index)) {
 		reference_width = e->GetGRF()->traininfo_vehicle_width;
 		vehicle_pitch = e->GetGRF()->traininfo_vehicle_pitch;
 	}
 
 	if (offset != nullptr) {
-		if (HasBit(this->flags, VRF_REVERSE_DIRECTION) && !EngInfo(this->engine_type)->misc_flags.Test(EngineMiscFlag::RailFlips)) {
+		if (this->flags.Test(VehicleRailFlag::Flipped) && !EngInfo(this->engine_type)->misc_flags.Test(EngineMiscFlag::RailFlips)) {
 			offset->x = ScaleSpriteTrad(((int)this->gcache.cached_veh_length - (int)VEHICLE_LENGTH / 2) * reference_width / (int)VEHICLE_LENGTH);
 		} else {
 			offset->x = ScaleSpriteTrad(reference_width) / 2;
@@ -493,10 +493,11 @@ void Train::GetImage(Direction direction, EngineImageType image_type, VehicleSpr
 {
 	uint8_t spritenum = this->spritenum;
 
-	if (HasBit(this->flags, VRF_REVERSE_DIRECTION)) direction = ReverseDir(direction);
+	if (this->flags.Test(VehicleRailFlag::Flipped)) direction = ReverseDir(direction);
 
-	if (is_custom_sprite(spritenum)) {
-		GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(spritenum)), image_type, result);
+	if (IsCustomVehicleSpriteNum(spritenum)) {
+		if (spritenum == CUSTOM_VEHICLE_SPRITENUM_REVERSED) direction = ReverseDir(direction);
+		GetCustomVehicleSprite(this, direction, image_type, result);
 		if (result->IsValid()) return;
 
 		spritenum = this->GetEngine()->original_image_index;
@@ -516,7 +517,7 @@ static void GetRailIcon(EngineID engine, bool rear_head, int &y, EngineImageType
 	Direction dir = rear_head ? DIR_E : DIR_W;
 	uint8_t spritenum = e->u.rail.image_index;
 
-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleIcon(engine, dir, image_type, result);
 		if (result->IsValid()) {
 			if (e->GetGRF() != nullptr) {
@@ -603,6 +604,28 @@ void GetTrainSpriteSize(EngineID engine, uint &width, uint &height, int &xoffs,
 	}
 }
 
+/**
+ * Get a list of free wagons in a depot.
+ * @param tile Tile of depot.
+ * @return List of free wagons, sorted by vehicle index.
+ */
+static std::vector<VehicleID> GetFreeWagonsInDepot(TileIndex tile)
+{
+	std::vector<VehicleID> free_wagons;
+
+	for (Vehicle *v : VehiclesOnTile(tile)) {
+		if (v->type != VEH_TRAIN) continue;
+		if (v->vehstatus.Test(VehState::Crashed)) continue;
+		if (!Train::From(v)->IsFreeWagon()) continue;
+
+		free_wagons.push_back(v->index);
+	}
+
+	/* Sort by vehicle index for consistency across clients. */
+	std::ranges::sort(free_wagons);
+	return free_wagons;
+}
+
 /**
  * Build a railroad wagon.
  * @param flags    type of operation.
@@ -661,7 +684,8 @@ static CommandCost CmdBuildRailWagon(DoCommandFlags flags, TileIndex tile, const
 
 		v->group_id = DEFAULT_GROUP;
 
-		if (TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(v->flags, VRF_REVERSE_DIRECTION);
+		auto prob = TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed);
+		if (prob.has_value()) v->flags.Set(VehicleRailFlag::Flipped, prob.value());
 		AddArticulatedParts(v);
 
 		v->UpdatePosition();
@@ -671,15 +695,15 @@ static CommandCost CmdBuildRailWagon(DoCommandFlags flags, TileIndex tile, const
 		CheckConsistencyOfArticulatedVehicle(v);
 
 		/* Try to connect the vehicle to one of free chains of wagons. */
-		for (Train *w : Train::Iterate()) {
-			if (w->tile == tile &&              ///< Same depot
-					w->IsFreeWagon() &&             ///< A free wagon chain
-					w->engine_type == e->index &&   ///< Same type
-					w->First() != v &&              ///< Don't connect to ourself
-					!w->vehstatus.Test(VehState::Crashed)) { ///< Not crashed/flooded
-				if (Command<CMD_MOVE_RAIL_VEHICLE>::Do(DoCommandFlag::Execute, v->index, w->Last()->index, true).Succeeded()) {
-					break;
-				}
+		for (VehicleID vehicle : GetFreeWagonsInDepot(tile)) {
+			if (vehicle == v->index) continue;
+
+			const Train *w = Train::Get(vehicle);
+			if (w->engine_type != v->engine_type) continue; ///< Must be same type
+			if (w->First() == v) continue; ///< Don't connect to ourself
+
+			if (Command<CMD_MOVE_RAIL_VEHICLE>::Do(DoCommandFlag::Execute, v->index, w->Last()->index, true).Succeeded()) {
+				break;
 			}
 		}
 	}
@@ -691,12 +715,9 @@ static CommandCost CmdBuildRailWagon(DoCommandFlags flags, TileIndex tile, const
 void NormalizeTrainVehInDepot(const Train *u)
 {
 	assert(u->IsEngine());
-	for (const Train *v : Train::Iterate()) {
-		if (v->IsFreeWagon() && v->tile == u->tile &&
-				v->track == TRACK_BIT_DEPOT) {
-			if (Command<CMD_MOVE_RAIL_VEHICLE>::Do(DoCommandFlag::Execute, v->index, u->index, true).Failed()) {
-				break;
-			}
+	for (VehicleID vehicle : GetFreeWagonsInDepot(u->tile)) {
+		if (Command<CMD_MOVE_RAIL_VEHICLE>::Do(DoCommandFlag::Execute, vehicle, u->index, true).Failed()) {
+			break;
 		}
 	}
 }
@@ -730,7 +751,8 @@ static void AddRearEngineToMultiheadedTrain(Train *v)
 	v->SetMultiheaded();
 	u->SetMultiheaded();
 	v->SetNext(u);
-	if (TestVehicleBuildProbability(u, u->engine_type, BuildProbabilityType::Reversed)) SetBit(u->flags, VRF_REVERSE_DIRECTION);
+	auto prob = TestVehicleBuildProbability(u, u->engine_type, BuildProbabilityType::Reversed);
+	if (prob.has_value()) u->flags.Set(VehicleRailFlag::Flipped, prob.value());
 	u->UpdatePosition();
 
 	/* Now we need to link the front and rear engines together */
@@ -803,7 +825,8 @@ CommandCost CmdBuildRailVehicle(DoCommandFlags flags, TileIndex tile, const Engi
 		v->SetFrontEngine();
 		v->SetEngine();
 
-		if (TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(v->flags, VRF_REVERSE_DIRECTION);
+		auto prob = TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed);
+		if (prob.has_value()) v->flags.Set(VehicleRailFlag::Flipped, prob.value());
 		v->UpdatePosition();
 
 		if (rvi->railveh_type == RAILVEH_MULTIHEAD) {
@@ -824,16 +847,15 @@ CommandCost CmdBuildRailVehicle(DoCommandFlags flags, TileIndex tile, const Engi
 static Train *FindGoodVehiclePos(const Train *src)
 {
 	EngineID eng = src->engine_type;
-	TileIndex tile = src->tile;
 
-	for (Train *dst : Train::Iterate()) {
-		if (dst->IsFreeWagon() && dst->tile == tile && !dst->vehstatus.Test(VehState::Crashed)) {
-			/* check so all vehicles in the line have the same engine. */
-			Train *t = dst;
-			while (t->engine_type == eng) {
-				t = t->Next();
-				if (t == nullptr) return dst;
-			}
+	for (VehicleID vehicle : GetFreeWagonsInDepot(src->tile)) {
+		Train *dst = Train::Get(vehicle);
+
+		/* check so all vehicles in the line have the same engine. */
+		Train *t = dst;
+		while (t->engine_type == eng) {
+			t = t->Next();
+			if (t == nullptr) return dst;
 		}
 	}
 
@@ -1040,7 +1062,8 @@ static CommandCost CheckTrainAttachment(Train *t)
 			 * the loop and after each callback does not need to be cleared here. */
 			t->InvalidateNewGRFCache();
 
-			uint16_t callback = GetVehicleCallbackParent(CBID_TRAIN_ALLOW_WAGON_ATTACH, 0, 0, head->engine_type, t, head);
+			std::array<int32_t, 1> regs100;
+			uint16_t callback = GetVehicleCallbackParent(CBID_TRAIN_ALLOW_WAGON_ATTACH, 0, 0, head->engine_type, t, head, regs100);
 
 			/* Restore original first_engine data */
 			t->gcache.first_engine = first_engine;
@@ -1066,6 +1089,10 @@ static CommandCost CheckTrainAttachment(Train *t)
 							case 0x401: // allow
 								break;
 
+							case 0x40F:
+								error = GetGRFStringID(head->GetGRFID(), static_cast<GRFStringID>(regs100[0]));
+								break;
+
 							default:    // unknown reason -> disallow
 							case 0x402: // disallow attaching
 								error = STR_ERROR_INCOMPATIBLE_RAIL_TYPES;
@@ -1473,7 +1500,7 @@ void Train::UpdateDeltaXY()
 	this->y_bb_offs =  0;
 
 	/* Set if flipped and engine is NOT flagged with custom flip handling. */
-	int flipped = HasBit(this->flags, VRF_REVERSE_DIRECTION) && !EngInfo(this->engine_type)->misc_flags.Test(EngineMiscFlag::RailFlips);
+	int flipped = this->flags.Test(VehicleRailFlag::Flipped) && !EngInfo(this->engine_type)->misc_flags.Test(EngineMiscFlag::RailFlips);
 	/* If flipped and vehicle length is odd, we need to adjust the bounding box offset slightly. */
 	int flip_offs = flipped && (this->gcache.cached_veh_length & 1);
 
@@ -1539,9 +1566,9 @@ void Train::UpdateDeltaXY()
  */
 static void MarkTrainAsStuck(Train *v)
 {
-	if (!HasBit(v->flags, VRF_TRAIN_STUCK)) {
+	if (!v->flags.Test(VehicleRailFlag::Stuck)) {
 		/* It is the first time the problem occurred, set the "train stuck" flag. */
-		SetBit(v->flags, VRF_TRAIN_STUCK);
+		v->flags.Set(VehicleRailFlag::Stuck);
 
 		v->wait_counter = 0;
 
@@ -1663,15 +1690,14 @@ void ReverseTrainSwapVeh(Train *v, int l, int r)
 	}
 }
 
-
 /**
  * Check if the vehicle is a train
  * @param v vehicle on tile
- * @return v if it is a train, nullptr otherwise
+ * @return true if v is a train
  */
-static Vehicle *TrainOnTileEnum(Vehicle *v, void *)
+static bool IsTrain(const Vehicle *v)
 {
-	return (v->type == VEH_TRAIN) ? v : nullptr;
+	return v->type == VEH_TRAIN;
 }
 
 /**
@@ -1684,28 +1710,23 @@ bool TrainOnCrossing(TileIndex tile)
 {
 	assert(IsLevelCrossingTile(tile));
 
-	return HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum);
+	return HasVehicleOnTile(tile, IsTrain);
 }
 
-
 /**
  * Checks if a train is approaching a rail-road crossing
  * @param v vehicle on tile
- * @param data tile with crossing we are testing
- * @return v if it is approaching a crossing, nullptr otherwise
+ * @param tile tile with crossing we are testing
+ * @return true if v is approaching a crossing
  */
-static Vehicle *TrainApproachingCrossingEnum(Vehicle *v, void *data)
+static bool TrainApproachingCrossingEnum(const Vehicle *v, TileIndex tile)
 {
-	if (v->type != VEH_TRAIN || v->vehstatus.Test(VehState::Crashed)) return nullptr;
+	if (v->type != VEH_TRAIN || v->vehstatus.Test(VehState::Crashed)) return false;
 
-	Train *t = Train::From(v);
-	if (!t->IsFrontEngine()) return nullptr;
+	const Train *t = Train::From(v);
+	if (!t->IsFrontEngine()) return false;
 
-	TileIndex tile = *(TileIndex *)data;
-
-	if (TrainApproachingCrossingTile(t) != tile) return nullptr;
-
-	return t;
+	return TrainApproachingCrossingTile(t) == tile;
 }
 
 
@@ -1722,12 +1743,16 @@ static bool TrainApproachingCrossing(TileIndex tile)
 	DiagDirection dir = AxisToDiagDir(GetCrossingRailAxis(tile));
 	TileIndex tile_from = tile + TileOffsByDiagDir(dir);
 
-	if (HasVehicleOnPos(tile_from, &tile, &TrainApproachingCrossingEnum)) return true;
+	if (HasVehicleOnTile(tile_from, [&](const Vehicle *v) {
+			return TrainApproachingCrossingEnum(v, tile);
+		})) return true;
 
 	dir = ReverseDiagDir(dir);
 	tile_from = tile + TileOffsByDiagDir(dir);
 
-	return HasVehicleOnPos(tile_from, &tile, &TrainApproachingCrossingEnum);
+	return HasVehicleOnTile(tile_from, [&](const Vehicle *v) {
+		return TrainApproachingCrossingEnum(v, tile);
+	});
 }
 
 /**
@@ -1972,7 +1997,7 @@ void ReverseTrainDirection(Train *v)
 	}
 
 	/* Clear path reservation in front if train is not stuck. */
-	if (!HasBit(v->flags, VRF_TRAIN_STUCK)) FreeTrainTrackReservation(v);
+	if (!v->flags.Test(VehicleRailFlag::Stuck)) FreeTrainTrackReservation(v);
 
 	/* Check if we were approaching a rail/road-crossing */
 	TileIndex crossing = TrainApproachingCrossingTile(v);
@@ -1994,9 +2019,8 @@ void ReverseTrainDirection(Train *v)
 		InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
 	}
 
-	ToggleBit(v->flags, VRF_TOGGLE_REVERSE);
-
-	ClrBit(v->flags, VRF_REVERSING);
+	v->flags.Flip(VehicleRailFlag::Reversed);
+	v->flags.Reset(VehicleRailFlag::Reversing);
 
 	/* recalculate cached data */
 	v->ConsistChanged(CCF_TRACK);
@@ -2014,8 +2038,8 @@ void ReverseTrainDirection(Train *v)
 	/* If we are inside a depot after reversing, don't bother with path reserving. */
 	if (v->track == TRACK_BIT_DEPOT) {
 		/* Can't be stuck here as inside a depot is always a safe tile. */
-		if (HasBit(v->flags, VRF_TRAIN_STUCK)) SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
-		ClrBit(v->flags, VRF_TRAIN_STUCK);
+		if (v->flags.Test(VehicleRailFlag::Stuck)) SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
+		v->flags.Reset(VehicleRailFlag::Stuck);
 		return;
 	}
 
@@ -2042,9 +2066,9 @@ void ReverseTrainDirection(Train *v)
 			/* Do not wait for a way out when we're still loading */
 			MarkTrainAsStuck(v);
 		}
-	} else if (HasBit(v->flags, VRF_TRAIN_STUCK)) {
+	} else if (v->flags.Test(VehicleRailFlag::Stuck)) {
 		/* A train not inside a PBS block can't be stuck. */
-		ClrBit(v->flags, VRF_TRAIN_STUCK);
+		v->flags.Reset(VehicleRailFlag::Stuck);
 		v->wait_counter = 0;
 	}
 }
@@ -2078,7 +2102,7 @@ CommandCost CmdReverseTrainDirection(DoCommandFlags flags, VehicleID veh_id, boo
 		}
 
 		if (flags.Test(DoCommandFlag::Execute)) {
-			ToggleBit(v->flags, VRF_REVERSE_DIRECTION);
+			v->flags.Flip(VehicleRailFlag::Flipped);
 
 			front->ConsistChanged(CCF_ARRANGE);
 			SetWindowDirty(WC_VEHICLE_DEPOT, front->tile);
@@ -2108,7 +2132,7 @@ CommandCost CmdReverseTrainDirection(DoCommandFlags flags, VehicleID veh_id, boo
 			SetWindowDirty(WC_VEHICLE_VIEW, v->index);
 
 			if (_settings_game.vehicle.train_acceleration_model != AM_ORIGINAL && v->cur_speed != 0) {
-				ToggleBit(v->flags, VRF_REVERSING);
+				v->flags.Flip(VehicleRailFlag::Reversing);
 			} else {
 				v->cur_speed = 0;
 				v->SetLastSpeed();
@@ -2146,7 +2170,7 @@ CommandCost CmdForceTrainProceed(DoCommandFlags flags, VehicleID veh_id)
 		 * to proceed to the next signal. In the other cases we
 		 * would like to pass the signal at danger and run till the
 		 * next signal we encounter. */
-		t->force_proceed = t->force_proceed == TFP_SIGNAL ? TFP_NONE : HasBit(t->flags, VRF_TRAIN_STUCK) || t->IsChainInDepot() ? TFP_STUCK : TFP_SIGNAL;
+		t->force_proceed = t->force_proceed == TFP_SIGNAL ? TFP_NONE : t->flags.Test(VehicleRailFlag::Stuck) || t->IsChainInDepot() ? TFP_STUCK : TFP_SIGNAL;
 		SetWindowDirty(WC_VEHICLE_VIEW, t->index);
 
 		/* Unbunching data is no longer valid. */
@@ -2895,8 +2919,8 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
 	/* If we have a reserved path and the path ends at a safe tile, we are finished already. */
 	if (origin.okay && (v->tile != origin.tile || first_tile_okay)) {
 		/* Can't be stuck then. */
-		if (HasBit(v->flags, VRF_TRAIN_STUCK)) SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
-		ClrBit(v->flags, VRF_TRAIN_STUCK);
+		if (v->flags.Test(VehicleRailFlag::Stuck)) SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
+		v->flags.Reset(VehicleRailFlag::Stuck);
 		return true;
 	}
 
@@ -2921,11 +2945,11 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
 		return false;
 	}
 
-	if (HasBit(v->flags, VRF_TRAIN_STUCK)) {
+	if (v->flags.Test(VehicleRailFlag::Stuck)) {
 		v->wait_counter = 0;
 		SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
 	}
-	ClrBit(v->flags, VRF_TRAIN_STUCK);
+	v->flags.Reset(VehicleRailFlag::Stuck);
 	return true;
 }
 
@@ -3023,8 +3047,8 @@ static void TrainEnterStation(Train *v, StationID station)
 
 	v->BeginLoading();
 
-	TriggerStationRandomisation(st, v->tile, SRT_TRAIN_ARRIVES);
-	TriggerStationAnimation(st, v->tile, SAT_TRAIN_ARRIVES);
+	TriggerStationRandomisation(st, v->tile, StationRandomTrigger::VehicleArrives);
+	TriggerStationAnimation(st, v->tile, StationAnimationTrigger::VehicleArrives);
 }
 
 /* Check if the vehicle is compatible with the specified tile */
@@ -3114,7 +3138,7 @@ uint Train::Crash(bool flooded)
 
 		/* Remove the reserved path in front of the train if it is not stuck.
 		 * Also clear all reserved tracks the train is currently on. */
-		if (!HasBit(this->flags, VRF_TRAIN_STUCK)) FreeTrainTrackReservation(this);
+		if (!this->flags.Test(VehicleRailFlag::Stuck)) FreeTrainTrackReservation(this);
 		for (const Train *v = this; v != nullptr; v = v->Next()) {
 			ClearPathReservation(v, v->tile, v->GetVehicleTrackdir());
 			if (IsTileType(v->tile, MP_TUNNELBRIDGE)) {
@@ -3163,56 +3187,45 @@ static uint TrainCrashed(Train *v)
 	return victims;
 }
 
-/** Temporary data storage for testing collisions. */
-struct TrainCollideChecker {
-	Train *v; ///< %Vehicle we are testing for collision.
-	uint num; ///< Total number of victims if train collided.
-};
-
 /**
  * Collision test function.
  * @param v %Train vehicle to test collision with.
- * @param data %Train being examined.
- * @return \c nullptr (always continue search)
+ * @param t %Train being examined.
+ * @return Number of victims.
  */
-static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data)
+static uint CheckTrainCollision(Vehicle *v, Train *t)
 {
-	TrainCollideChecker *tcc = (TrainCollideChecker*)data;
-
 	/* not a train or in depot */
-	if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return nullptr;
+	if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return 0;
 
 	/* do not crash into trains of another company. */
-	if (v->owner != tcc->v->owner) return nullptr;
+	if (v->owner != t->owner) return 0;
 
 	/* get first vehicle now to make most usual checks faster */
 	Train *coll = Train::From(v)->First();
 
 	/* can't collide with own wagons */
-	if (coll == tcc->v) return nullptr;
+	if (coll == t) return 0;
 
-	int x_diff = v->x_pos - tcc->v->x_pos;
-	int y_diff = v->y_pos - tcc->v->y_pos;
+	int x_diff = v->x_pos - t->x_pos;
+	int y_diff = v->y_pos - t->y_pos;
 
 	/* Do fast calculation to check whether trains are not in close vicinity
 	 * and quickly reject trains distant enough for any collision.
 	 * Differences are shifted by 7, mapping range [-7 .. 8] into [0 .. 15]
 	 * Differences are then ORed and then we check for any higher bits */
 	uint hash = (y_diff + 7) | (x_diff + 7);
-	if (hash & ~15) return nullptr;
+	if (hash & ~15) return 0;
 
 	/* Slower check using multiplication */
-	int min_diff = (Train::From(v)->gcache.cached_veh_length + 1) / 2 + (tcc->v->gcache.cached_veh_length + 1) / 2 - 1;
-	if (x_diff * x_diff + y_diff * y_diff > min_diff * min_diff) return nullptr;
+	int min_diff = (Train::From(v)->gcache.cached_veh_length + 1) / 2 + (t->gcache.cached_veh_length + 1) / 2 - 1;
+	if (x_diff * x_diff + y_diff * y_diff > min_diff * min_diff) return 0;
 
 	/* Happens when there is a train under bridge next to bridge head */
-	if (abs(v->z_pos - tcc->v->z_pos) > 5) return nullptr;
+	if (abs(v->z_pos - t->z_pos) > 5) return 0;
 
 	/* crash both trains */
-	tcc->num += TrainCrashed(tcc->v);
-	tcc->num += TrainCrashed(coll);
-
-	return nullptr; // continue searching
+	return TrainCrashed(t) + TrainCrashed(coll);
 }
 
 /**
@@ -3229,43 +3242,32 @@ static bool CheckTrainCollision(Train *v)
 
 	assert(v->track == TRACK_BIT_WORMHOLE || TileVirtXY(v->x_pos, v->y_pos) == v->tile);
 
-	TrainCollideChecker tcc;
-	tcc.v = v;
-	tcc.num = 0;
+	uint num_victims = 0;
 
 	/* find colliding vehicles */
 	if (v->track == TRACK_BIT_WORMHOLE) {
-		FindVehicleOnPos(v->tile, &tcc, FindTrainCollideEnum);
-		FindVehicleOnPos(GetOtherTunnelBridgeEnd(v->tile), &tcc, FindTrainCollideEnum);
+		for (Vehicle *u : VehiclesOnTile(v->tile)) {
+			num_victims += CheckTrainCollision(u, v);
+		}
+		for (Vehicle *u : VehiclesOnTile(GetOtherTunnelBridgeEnd(v->tile))) {
+			num_victims += CheckTrainCollision(u, v);
+		}
 	} else {
-		FindVehicleOnPosXY(v->x_pos, v->y_pos, &tcc, FindTrainCollideEnum);
+		for (Vehicle *u : VehiclesNearTileXY(v->x_pos, v->y_pos, 7)) {
+			num_victims += CheckTrainCollision(u, v);
+		}
 	}
 
 	/* any dead -> no crash */
-	if (tcc.num == 0) return false;
+	if (num_victims == 0) return false;
 
-	AddTileNewsItem(GetEncodedString(STR_NEWS_TRAIN_CRASH, tcc.num), NewsType::Accident, v->tile);
+	AddTileNewsItem(GetEncodedString(STR_NEWS_TRAIN_CRASH, num_victims), NewsType::Accident, v->tile);
 
 	ModifyStationRatingAround(v->tile, v->owner, -160, 30);
 	if (_settings_client.sound.disaster) SndPlayVehicleFx(SND_13_TRAIN_COLLISION, v);
 	return true;
 }
 
-static Vehicle *CheckTrainAtSignal(Vehicle *v, void *data)
-{
-	if (v->type != VEH_TRAIN || v->vehstatus.Test(VehState::Crashed)) return nullptr;
-
-	Train *t = Train::From(v);
-	DiagDirection exitdir = *(DiagDirection *)data;
-
-	/* not front engine of a train, inside wormhole or depot, crashed */
-	if (!t->IsFrontEngine() || !(t->track & TRACK_BIT_MASK)) return nullptr;
-
-	if (t->cur_speed > 5 || VehicleExitDir(t->direction, t->track) != exitdir) return nullptr;
-
-	return t;
-}
-
 /**
  * Move a vehicle chain one movement stop forwards.
  * @param v First vehicle to move.
@@ -3299,13 +3301,13 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
 					/* Reverse when we are at the end of the track already, do not move to the new position */
 					if (v->IsFrontEngine() && !TrainCheckIfLineEnds(v, reverse)) return false;
 
-					uint32_t r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
-					if (HasBit(r, VETS_CANNOT_ENTER)) {
+					auto vets = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
+					if (vets.Test(VehicleEnterTileState::CannotEnter)) {
 						goto invalid_rail;
 					}
-					if (HasBit(r, VETS_ENTERED_STATION)) {
+					if (vets.Test(VehicleEnterTileState::EnteredStation)) {
 						/* The new position is the end of the platform */
-						TrainEnterStation(v, StationID(r >> VETS_STATION_ID_OFFSET));
+						TrainEnterStation(v, GetStationIndex(gp.new_tile));
 					}
 				}
 			} else {
@@ -3365,7 +3367,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
 						Trackdir i = FindFirstTrackdir(trackdirbits);
 
 						/* Don't handle stuck trains here. */
-						if (HasBit(v->flags, VRF_TRAIN_STUCK)) return false;
+						if (v->flags.Test(VehicleRailFlag::Stuck)) return false;
 
 						if (!HasSignalOnTrackdir(gp.new_tile, ReverseTrackdir(i))) {
 							v->cur_speed = 0;
@@ -3383,7 +3385,17 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
 								exitdir = ReverseDiagDir(exitdir);
 
 								/* check if a train is waiting on the other side */
-								if (!HasVehicleOnPos(o_tile, &exitdir, &CheckTrainAtSignal)) return false;
+								if (!HasVehicleOnTile(o_tile, [&exitdir](const Vehicle *u) {
+										if (u->type != VEH_TRAIN || u->vehstatus.Test(VehState::Crashed)) return false;
+										const Train *t = Train::From(u);
+
+										/* not front engine of a train, inside wormhole or depot, crashed */
+										if (!t->IsFrontEngine() || !(t->track & TRACK_BIT_MASK)) return false;
+
+										if (t->cur_speed > 5 || VehicleExitDir(t->direction, t->track) != exitdir) return false;
+
+										return true;
+									})) return false;
 							}
 						}
 
@@ -3446,12 +3458,12 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
 				Direction chosen_dir = (Direction)b[2];
 
 				/* Call the landscape function and tell it that the vehicle entered the tile */
-				uint32_t r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
-				if (HasBit(r, VETS_CANNOT_ENTER)) {
+				auto vets = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
+				if (vets.Test(VehicleEnterTileState::CannotEnter)) {
 					goto invalid_rail;
 				}
 
-				if (!HasBit(r, VETS_ENTERED_WORMHOLE)) {
+				if (!vets.Test(VehicleEnterTileState::EnteredWormhole)) {
 					Track track = FindFirstTrack(chosen_track);
 					Trackdir tdir = TrackDirectionToTrackdir(track, chosen_dir);
 					if (v->IsFrontEngine() && HasPbsSignalOnTrackdir(gp.new_tile, tdir)) {
@@ -3497,13 +3509,13 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
 					CheckNextTrainTile(v);
 				}
 
-				if (HasBit(r, VETS_ENTERED_STATION)) {
+				if (vets.Test(VehicleEnterTileState::EnteredStation)) {
 					/* The new position is the location where we want to stop */
-					TrainEnterStation(v, StationID(r >> VETS_STATION_ID_OFFSET));
+					TrainEnterStation(v, GetStationIndex(gp.new_tile));
 				}
 			}
 		} else {
-			if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
+			if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && VehicleEnterTile(v, gp.new_tile, gp.x, gp.y).Test(VehicleEnterTileState::EnteredWormhole)) {
 				/* Perform look-ahead on tunnel exit. */
 				if (v->IsFrontEngine()) {
 					TryReserveRailTrack(gp.new_tile, DiagDirToDiagTrack(GetTunnelBridgeDirection(gp.new_tile)));
@@ -3588,38 +3600,15 @@ reverse_train_direction:
 	return false;
 }
 
-/**
- * Collect trackbits of all crashed train vehicles on a tile
- * @param v Vehicle passed from Find/HasVehicleOnPos()
- * @param data trackdirbits for the result
- * @return nullptr to iterate over all vehicles on the tile.
- */
-static Vehicle *CollectTrackbitsFromCrashedVehiclesEnum(Vehicle *v, void *data)
-{
-	TrackBits *trackbits = (TrackBits *)data;
-
-	if (v->type == VEH_TRAIN && v->vehstatus.Test(VehState::Crashed)) {
-		TrackBits train_tbits = Train::From(v)->track;
-		if (train_tbits == TRACK_BIT_WORMHOLE) {
-			/* Vehicle is inside a wormhole, v->track contains no useful value then. */
-			*trackbits |= DiagDirToDiagTrackBits(GetTunnelBridgeDirection(v->tile));
-		} else if (train_tbits != TRACK_BIT_DEPOT) {
-			*trackbits |= train_tbits;
-		}
-	}
-
-	return nullptr;
-}
-
 static bool IsRailStationPlatformOccupied(TileIndex tile)
 {
 	TileIndexDiff delta = TileOffsByAxis(GetRailStationAxis(tile));
 
 	for (TileIndex t = tile; IsCompatibleTrainStationTile(t, tile); t -= delta) {
-		if (HasVehicleOnPos(t, nullptr, &TrainOnTileEnum)) return true;
+		if (HasVehicleOnTile(t, IsTrain)) return true;
 	}
 	for (TileIndex t = tile + delta; IsCompatibleTrainStationTile(t, tile); t += delta) {
-		if (HasVehicleOnPos(t, nullptr, &TrainOnTileEnum)) return true;
+		if (HasVehicleOnTile(t, IsTrain)) return true;
 	}
 
 	return false;
@@ -3637,11 +3626,11 @@ static void DeleteLastWagon(Train *v)
 	Train *first = v->First();
 
 	/* Go to the last wagon and delete the link pointing there
-	 * *u is then the one-before-last wagon, and *v the last
+	 * new_last is then the one-before-last wagon, and v the last
 	 * one which will physically be removed */
-	Train *u = v;
-	for (; v->Next() != nullptr; v = v->Next()) u = v;
-	u->SetNext(nullptr);
+	Train *new_last = v;
+	for (; v->Next() != nullptr; v = v->Next()) new_last = v;
+	new_last->SetNext(nullptr);
 
 	if (first != v) {
 		/* Recalculate cached train properties */
@@ -3673,7 +3662,16 @@ static void DeleteLastWagon(Train *v)
 
 		/* If there are still crashed vehicles on the tile, give the track reservation to them */
 		TrackBits remaining_trackbits = TRACK_BIT_NONE;
-		FindVehicleOnPos(tile, &remaining_trackbits, CollectTrackbitsFromCrashedVehiclesEnum);
+		for (const Vehicle *u : VehiclesOnTile(tile)) {
+			if (u->type != VEH_TRAIN || !u->vehstatus.Test(VehState::Crashed)) continue;
+			TrackBits train_tbits = Train::From(u)->track;
+			if (train_tbits == TRACK_BIT_WORMHOLE) {
+				/* Vehicle is inside a wormhole, u->track contains no useful value then. */
+				remaining_trackbits |= DiagDirToDiagTrackBits(GetTunnelBridgeDirection(u->tile));
+			} else if (train_tbits != TRACK_BIT_DEPOT) {
+				remaining_trackbits |= train_tbits;
+			}
+		}
 
 		/* It is important that these two are the first in the loop, as reservation cannot deal with every trackbit combination */
 		assert(TRACK_BEGIN == TRACK_X && TRACK_Y == TRACK_BEGIN + 1);
@@ -3943,14 +3941,14 @@ static bool TrainLocoHandler(Train *v, bool mode)
 	}
 
 	if (v->force_proceed != TFP_NONE) {
-		ClrBit(v->flags, VRF_TRAIN_STUCK);
+		v->flags.Reset(VehicleRailFlag::Stuck);
 		SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
 	}
 
 	/* train is broken down? */
 	if (v->HandleBreakdown()) return true;
 
-	if (HasBit(v->flags, VRF_REVERSING) && v->cur_speed == 0) {
+	if (v->flags.Test(VehicleRailFlag::Reversing) && v->cur_speed == 0) {
 		ReverseTrainDirection(v);
 	}
 
@@ -3962,10 +3960,10 @@ static bool TrainLocoHandler(Train *v, bool mode)
 		v->wait_counter = 0;
 		v->cur_speed = 0;
 		v->subspeed = 0;
-		ClrBit(v->flags, VRF_LEAVING_STATION);
+		v->flags.Reset(VehicleRailFlag::LeavingStation);
 		ReverseTrainDirection(v);
 		return true;
-	} else if (HasBit(v->flags, VRF_LEAVING_STATION)) {
+	} else if (v->flags.Test(VehicleRailFlag::LeavingStation)) {
 		/* Try to reserve a path when leaving the station as we
 		 * might not be marked as wanting a reservation, e.g.
 		 * when an overlength train gets turned around in a station. */
@@ -3975,7 +3973,7 @@ static bool TrainLocoHandler(Train *v, bool mode)
 		if (UpdateSignalsOnSegment(v->tile, dir, v->owner) == SIGSEG_PBS || _settings_game.pf.reserve_paths) {
 			TryPathReserve(v, true, true);
 		}
-		ClrBit(v->flags, VRF_LEAVING_STATION);
+		v->flags.Reset(VehicleRailFlag::LeavingStation);
 	}
 
 	v->HandleLoading(mode);
@@ -3992,7 +3990,7 @@ static bool TrainLocoHandler(Train *v, bool mode)
 	}
 
 	/* Handle stuck trains. */
-	if (!mode && HasBit(v->flags, VRF_TRAIN_STUCK)) {
+	if (!mode && v->flags.Test(VehicleRailFlag::Stuck)) {
 		++v->wait_counter;
 
 		/* Should we try reversing this tick if still stuck? */
@@ -4003,7 +4001,7 @@ static bool TrainLocoHandler(Train *v, bool mode)
 			/* Still stuck. */
 			if (turn_around) ReverseTrainDirection(v);
 
-			if (HasBit(v->flags, VRF_TRAIN_STUCK) && v->wait_counter > 2 * _settings_game.pf.wait_for_pbs_path * Ticks::DAY_TICKS) {
+			if (v->flags.Test(VehicleRailFlag::Stuck) && v->wait_counter > 2 * _settings_game.pf.wait_for_pbs_path * Ticks::DAY_TICKS) {
 				/* Show message to player. */
 				if (_settings_client.gui.lost_vehicle_warn && v->owner == _local_company) {
 					AddVehicleAdviceNewsItem(AdviceType::TrainStuck, GetEncodedString(STR_NEWS_TRAIN_IS_STUCK, v->index), v->index);
@@ -4012,7 +4010,7 @@ static bool TrainLocoHandler(Train *v, bool mode)
 			}
 			/* Exit if force proceed not pressed, else reset stuck flag anyway. */
 			if (v->force_proceed == TFP_NONE) return true;
-			ClrBit(v->flags, VRF_TRAIN_STUCK);
+			v->flags.Reset(VehicleRailFlag::Stuck);
 			v->wait_counter = 0;
 			SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
 		}
@@ -4241,7 +4239,7 @@ uint16_t Train::GetMaxWeight() const
 	}
 
 	/* Powered wagons have extra weight added. */
-	if (HasBit(this->flags, VRF_POWEREDWAGON)) {
+	if (this->flags.Test(VehicleRailFlag::PoweredWagon)) {
 		weight += RailVehInfo(this->gcache.first_engine)->pow_wag_weight;
 	}
 
diff --git a/src/train_cmd.h b/src/train_cmd.h
index cbc84eca85..45a7b5eff1 100644
--- a/src/train_cmd.h
+++ b/src/train_cmd.h
@@ -12,6 +12,7 @@
 
 #include "command_type.h"
 #include "engine_type.h"
+#include "network/network_type.h"
 #include "vehicle_type.h"
 
 CommandCost CmdBuildRailVehicle(DoCommandFlags flags, TileIndex tile, const Engine *e, Vehicle **ret);
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index a0c5804e56..fc4262c89f 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -32,8 +32,13 @@ void CcBuildWagon(Commands, const CommandCost &result, VehicleID new_veh_id, uin
 
 	/* find a locomotive in the depot. */
 	const Vehicle *found = nullptr;
-	for (const Train *t : Train::Iterate()) {
-		if (t->IsFrontEngine() && t->tile == tile && t->IsStoppedInDepot()) {
+	/* The non-deterministic order returned from VehiclesOnTile() does not
+	 * matter here as there must only be one locomotive for anything to happen. */
+	for (const Vehicle *v : VehiclesOnTile(tile)) {
+		if (v->type != VEH_TRAIN) continue;
+
+		const Train *t = Train::From(v);
+		if (t->IsFrontEngine() && t->IsStoppedInDepot()) {
 			if (found != nullptr) return; // must be exactly one.
 			found = t;
 		}
@@ -167,7 +172,7 @@ void DrawTrainImage(const Train *v, const Rect &r, VehicleID selection, EngineIm
 		 * the next engine after the highlight could overlap it. */
 		int height = ScaleSpriteTrad(12);
 		Rect hr = {highlight_l, 0, highlight_r, height - 1};
-		DrawFrameRect(hr.Translate(r.left, CenterBounds(r.top, r.bottom, height)).Expand(WidgetDimensions::scaled.bevel), COLOUR_WHITE, FrameFlag::BorderOnly);
+		DrawFrameRect(hr.Translate(r.left, CentreBounds(r.top, r.bottom, height)).Expand(WidgetDimensions::scaled.bevel), COLOUR_WHITE, FrameFlag::BorderOnly);
 	}
 }
 
diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp
index 4591a610c8..889f73f58b 100644
--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@@ -133,15 +133,15 @@ static constexpr NWidgetPart _nested_transparency_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_SIGNS), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SIGN, STR_TRANSPARENT_SIGNS_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_TREES), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_PLANTTREES, STR_TRANSPARENT_TREES_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_HOUSES), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TOWN, STR_TRANSPARENT_HOUSES_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_INDUSTRIES), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_INDUSTRY, STR_TRANSPARENT_INDUSTRIES_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BUILDINGS), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BRIDGES), SetMinimalSize(43, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BRIDGE, STR_TRANSPARENT_BRIDGES_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_STRUCTURES), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRANSMITTER, STR_TRANSPARENT_STRUCTURES_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_CATENARY), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_BUILD_X_ELRAIL, STR_TRANSPARENT_CATENARY_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_TEXT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRAINLIST, STR_TRANSPARENT_TEXT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_SIGNS), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SIGN, STR_TRANSPARENT_SIGNS_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_TREES), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_PLANTTREES, STR_TRANSPARENT_TREES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_HOUSES), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TOWN, STR_TRANSPARENT_HOUSES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_INDUSTRIES), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_INDUSTRY, STR_TRANSPARENT_INDUSTRIES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BUILDINGS), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BRIDGES), SetToolbarMinimalSize(2), SetFill(0, 1), SetSpriteTip(SPR_IMG_BRIDGE, STR_TRANSPARENT_BRIDGES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_STRUCTURES), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRANSMITTER, STR_TRANSPARENT_STRUCTURES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_CATENARY), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_BUILD_X_ELRAIL, STR_TRANSPARENT_CATENARY_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_TEXT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRAINLIST, STR_TRANSPARENT_TEXT_TOOLTIP),
 		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(1, 1), EndContainer(),
 	EndContainer(),
 	/* Panel with 'invisibility' buttons. */
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index e177146cd9..79cf837db3 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -134,7 +134,7 @@ class BuildTreesWindow : public Window
 		}
 		const uint radius = this->mode == PM_FOREST_LG ? 12 : 5;
 		const uint count = this->mode == PM_FOREST_LG ? 12 : 5;
-		// Create tropic zones only when the tree type is selected by the user and not picked randomly.
+		/* Create tropic zones only when the tree type is selected by the user and not picked randomly. */
 		PlaceTreeGroupAroundTile(tile, treetype, radius, count, this->tree_to_plant != TREE_INVALID);
 	}
 
@@ -167,7 +167,7 @@ public:
 		if (widget >= WID_BT_TYPE_BUTTON_FIRST) {
 			const int index = widget - WID_BT_TYPE_BUTTON_FIRST;
 			/* Trees "grow" in the centre on the bottom line of the buttons */
-			DrawSprite(tree_sprites[index].sprite, tree_sprites[index].pal, CenterBounds(r.left, r.right, 0), r.bottom - ScaleGUITrad(BUTTON_BOTTOM_OFFSET));
+			DrawSprite(tree_sprites[index].sprite, tree_sprites[index].pal, CentreBounds(r.left, r.right, 0), r.bottom - ScaleGUITrad(BUTTON_BOTTOM_OFFSET));
 		}
 	}
 
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index a54789e1f7..458fa5b785 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -281,7 +281,7 @@ CommandCost CmdBuildBridge(DoCommandFlags flags, TileIndex tile_end, TileIndex t
 		company = OWNER_TOWN;
 
 		/* If we are not within a town, we are not owned by the town */
-		if (town == nullptr || DistanceSquare(tile_start, town->xy) > town->cache.squared_town_zone_radius[HZB_TOWN_EDGE]) {
+		if (town == nullptr || DistanceSquare(tile_start, town->xy) > town->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]) {
 			company = OWNER_NONE;
 		}
 	}
@@ -635,7 +635,7 @@ CommandCost CmdBuildTunnel(DoCommandFlags flags, TileIndex start_tile, Transport
 		company = OWNER_TOWN;
 
 		/* If we are not within a town, we are not owned by the town */
-		if (town == nullptr || DistanceSquare(start_tile, town->xy) > town->cache.squared_town_zone_radius[HZB_TOWN_EDGE]) {
+		if (town == nullptr || DistanceSquare(start_tile, town->xy) > town->cache.squared_town_zone_radius[to_underlying(HouseZone::TownEdge)]) {
 			company = OWNER_NONE;
 		}
 	}
@@ -1882,11 +1882,11 @@ static const uint8_t TUNNEL_SOUND_FRAME = 1;
  */
 extern const uint8_t _tunnel_visibility_frame[DIAGDIR_END] = {12, 8, 8, 12};
 
-static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y)
+static VehicleEnterTileStates VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y)
 {
 	int z = GetSlopePixelZ(x, y, true) - v->z_pos;
 
-	if (abs(z) > 2) return VETSB_CANNOT_ENTER;
+	if (abs(z) > 2) return VehicleEnterTileState::CannotEnter;
 	/* Direction into the wormhole */
 	const DiagDirection dir = GetTunnelBridgeDirection(tile);
 	/* Direction of the vehicle */
@@ -1905,13 +1905,13 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 					if (!PlayVehicleSound(t, VSE_TUNNEL) && RailVehInfo(t->engine_type)->engclass == 0) {
 						SndPlayVehicleFx(SND_05_TRAIN_THROUGH_TUNNEL, v);
 					}
-					return VETSB_CONTINUE;
+					return {};
 				}
 				if (frame == _tunnel_visibility_frame[dir]) {
 					t->tile = tile;
 					t->track = TRACK_BIT_WORMHOLE;
 					t->vehstatus.Set(VehState::Hidden);
-					return VETSB_ENTERED_WORMHOLE;
+					return VehicleEnterTileState::EnteredWormhole;
 				}
 			}
 
@@ -1921,7 +1921,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 				t->track = DiagDirToDiagTrackBits(vdir);
 				assert(t->track);
 				t->vehstatus.Reset(VehState::Hidden);
-				return VETSB_ENTERED_WORMHOLE;
+				return VehicleEnterTileState::EnteredWormhole;
 			}
 		} else if (v->type == VEH_ROAD) {
 			RoadVehicle *rv = RoadVehicle::From(v);
@@ -1934,9 +1934,9 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 					rv->tile = tile;
 					rv->state = RVSB_WORMHOLE;
 					rv->vehstatus.Set(VehState::Hidden);
-					return VETSB_ENTERED_WORMHOLE;
+					return VehicleEnterTileState::EnteredWormhole;
 				} else {
-					return VETSB_CONTINUE;
+					return {};
 				}
 			}
 
@@ -1946,7 +1946,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 				rv->state = DiagDirToDiagTrackdir(vdir);
 				rv->frame = frame;
 				rv->vehstatus.Reset(VehState::Hidden);
-				return VETSB_ENTERED_WORMHOLE;
+				return VehicleEnterTileState::EnteredWormhole;
 			}
 		}
 	} else { // IsBridge(tile)
@@ -1961,7 +1961,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 
 		if (vdir == dir) {
 			/* Vehicle enters bridge at the last frame inside this tile. */
-			if (frame != TILE_SIZE - 1) return VETSB_CONTINUE;
+			if (frame != TILE_SIZE - 1) return {};
 			switch (v->type) {
 				case VEH_TRAIN: {
 					Train *t = Train::From(v);
@@ -1983,7 +1983,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 
 				default: NOT_REACHED();
 			}
-			return VETSB_ENTERED_WORMHOLE;
+			return VehicleEnterTileState::EnteredWormhole;
 		} else if (vdir == ReverseDiagDir(dir)) {
 			v->tile = tile;
 			switch (v->type) {
@@ -1991,7 +1991,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 					Train *t = Train::From(v);
 					if (t->track == TRACK_BIT_WORMHOLE) {
 						t->track = DiagDirToDiagTrackBits(vdir);
-						return VETSB_ENTERED_WORMHOLE;
+						return VehicleEnterTileState::EnteredWormhole;
 					}
 					break;
 				}
@@ -2001,7 +2001,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 					if (rv->state == RVSB_WORMHOLE) {
 						rv->state = DiagDirToDiagTrackdir(vdir);
 						rv->frame = 0;
-						return VETSB_ENTERED_WORMHOLE;
+						return VehicleEnterTileState::EnteredWormhole;
 					}
 					break;
 				}
@@ -2010,7 +2010,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 					Ship *ship = Ship::From(v);
 					if (ship->state == TRACK_BIT_WORMHOLE) {
 						ship->state = DiagDirToDiagTrackBits(vdir);
-						return VETSB_ENTERED_WORMHOLE;
+						return VehicleEnterTileState::EnteredWormhole;
 					}
 					break;
 				}
@@ -2019,7 +2019,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
 			}
 		}
 	}
-	return VETSB_CONTINUE;
+	return {};
 }
 
 static CommandCost TerraformTile_TunnelBridge(TileIndex tile, DoCommandFlags flags, int z_new, Slope tileh_new)
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 04aaf7d225..4765b07c41 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -74,17 +74,28 @@ static const uint GEN_HASHX_BUCKET_BITS = 7;
 static const uint GEN_HASHY_BUCKET_BITS = 6;
 
 /* Compute hash for vehicle coord */
-#define GEN_HASHX(x)    GB((x), GEN_HASHX_BUCKET_BITS + ZOOM_BASE_SHIFT, GEN_HASHX_BITS)
-#define GEN_HASHY(y)   (GB((y), GEN_HASHY_BUCKET_BITS + ZOOM_BASE_SHIFT, GEN_HASHY_BITS) << GEN_HASHX_BITS)
-#define GEN_HASH(x, y) (GEN_HASHY(y) + GEN_HASHX(x))
+static inline uint GetViewportHashX(int x)
+{
+	return GB(x, GEN_HASHX_BUCKET_BITS + ZOOM_BASE_SHIFT, GEN_HASHX_BITS);
+}
+
+static inline uint GetViewportHashY(int y)
+{
+	return GB(y, GEN_HASHY_BUCKET_BITS + ZOOM_BASE_SHIFT, GEN_HASHY_BITS) << GEN_HASHX_BITS;
+}
+
+static inline uint GetViewportHash(int x, int y)
+{
+	return GetViewportHashX(x) + GetViewportHashY(y);
+}
 
 /* Maximum size until hash repeats */
-static const int GEN_HASHX_SIZE = 1 << (GEN_HASHX_BUCKET_BITS + GEN_HASHX_BITS + ZOOM_BASE_SHIFT);
-static const int GEN_HASHY_SIZE = 1 << (GEN_HASHY_BUCKET_BITS + GEN_HASHY_BITS + ZOOM_BASE_SHIFT);
+static const uint GEN_HASHX_SIZE = 1 << (GEN_HASHX_BUCKET_BITS + GEN_HASHX_BITS + ZOOM_BASE_SHIFT);
+static const uint GEN_HASHY_SIZE = 1 << (GEN_HASHY_BUCKET_BITS + GEN_HASHY_BITS + ZOOM_BASE_SHIFT);
 
 /* Increments to reach next bucket in hash table */
-static const int GEN_HASHX_INC = 1;
-static const int GEN_HASHY_INC = 1 << GEN_HASHX_BITS;
+static const uint GEN_HASHX_INC = 1;
+static const uint GEN_HASHY_INC = 1 << GEN_HASHX_BITS;
 
 /* Mask to wrap-around buckets */
 static const uint GEN_HASHX_MASK =  (1 << GEN_HASHX_BITS) - 1;
@@ -371,168 +382,141 @@ Vehicle::Vehicle(VehicleType type)
 
 /* Size of the hash, 6 = 64 x 64, 7 = 128 x 128. Larger sizes will (in theory) reduce hash
  * lookup times at the expense of memory usage. */
-const int HASH_BITS = 7;
-const int HASH_SIZE = 1 << HASH_BITS;
-const int HASH_MASK = HASH_SIZE - 1;
-const int TOTAL_HASH_SIZE = 1 << (HASH_BITS * 2);
-const int TOTAL_HASH_MASK = TOTAL_HASH_SIZE - 1;
+constexpr uint TILE_HASH_BITS = 7;
+constexpr uint TILE_HASH_SIZE = 1 << TILE_HASH_BITS;
+constexpr uint TILE_HASH_MASK = TILE_HASH_SIZE - 1;
+constexpr uint TOTAL_TILE_HASH_SIZE = 1 << (TILE_HASH_BITS * 2);
 
 /* Resolution of the hash, 0 = 1*1 tile, 1 = 2*2 tiles, 2 = 4*4 tiles, etc.
  * Profiling results show that 0 is fastest. */
-const int HASH_RES = 0;
+constexpr uint TILE_HASH_RES = 0;
 
-static std::array<Vehicle *, TOTAL_HASH_SIZE> _vehicle_tile_hash{};
-
-static Vehicle *VehicleFromTileHash(int xl, int yl, int xu, int yu, void *data, VehicleFromPosProc *proc, bool find_first)
+/**
+ * Compute hash for 1D tile coordinate.
+ */
+static inline uint GetTileHash1D(uint p)
 {
-	for (int y = yl; ; y = (y + (1 << HASH_BITS)) & (HASH_MASK << HASH_BITS)) {
-		for (int x = xl; ; x = (x + 1) & HASH_MASK) {
-			Vehicle *v = _vehicle_tile_hash[(x + y) & TOTAL_HASH_MASK];
-			for (; v != nullptr; v = v->hash_tile_next) {
-				Vehicle *a = proc(v, data);
-				if (find_first && a != nullptr) return a;
-			}
-			if (x == xu) break;
+	return GB(p, TILE_HASH_RES, TILE_HASH_BITS);
+}
+
+/**
+ * Increment 1D hash to next bucket.
+ */
+static inline uint IncTileHash1D(uint h)
+{
+	return (h + 1) & TILE_HASH_MASK;
+}
+
+/**
+ * Compose two 1D hashes into 2D hash.
+ */
+static inline uint ComposeTileHash(uint hx, uint hy)
+{
+	return hx | hy << TILE_HASH_BITS;
+}
+
+/**
+ * Compute hash for tile coordinate.
+ */
+static inline uint GetTileHash(uint x, uint y)
+{
+	return ComposeTileHash(GetTileHash1D(x), GetTileHash1D(y));
+}
+
+static std::array<Vehicle *, TOTAL_TILE_HASH_SIZE> _vehicle_tile_hash{};
+
+/**
+ * Iterator constructor.
+ * Find first vehicle near (x, y).
+ */
+VehiclesNearTileXY::Iterator::Iterator(int32_t x, int32_t y, uint max_dist)
+{
+	/* There are no negative tile coordinates */
+	this->pos_rect.left = std::max<int>(0, x - max_dist);
+	this->pos_rect.right = std::max<int>(0, x + max_dist);
+	this->pos_rect.top = std::max<int>(0, y - max_dist);
+	this->pos_rect.bottom = std::max<int>(0, y + max_dist);
+
+	if (2 * max_dist < TILE_HASH_MASK * TILE_SIZE) {
+		/* Hash area to scan */
+		this->hxmin = this->hx = GetTileHash1D(this->pos_rect.left / TILE_SIZE);
+		this->hxmax = GetTileHash1D(this->pos_rect.right / TILE_SIZE);
+		this->hymin = this->hy = GetTileHash1D(this->pos_rect.top / TILE_SIZE);
+		this->hymax = GetTileHash1D(this->pos_rect.bottom / TILE_SIZE);
+	} else {
+		/* Scan all */
+		this->hxmin = this->hx = 0;
+		this->hxmax = TILE_HASH_MASK;
+		this->hymin = this->hy = 0;
+		this->hymax = TILE_HASH_MASK;
+	}
+
+	this->current_veh = _vehicle_tile_hash[ComposeTileHash(this->hx, this->hy)];
+	this->SkipEmptyBuckets();
+	this->SkipFalseMatches();
+}
+
+/**
+ * Advance the internal state to the next potential vehicle.
+ */
+void VehiclesNearTileXY::Iterator::Increment()
+{
+	assert(this->current_veh != nullptr);
+	this->current_veh = this->current_veh->hash_tile_next;
+	this->SkipEmptyBuckets();
+}
+
+/**
+ * Advance the internal state until we reach a non-empty bucket, or the end.
+ */
+void VehiclesNearTileXY::Iterator::SkipEmptyBuckets()
+{
+	while (this->current_veh == nullptr) {
+		if (this->hx != this->hxmax) {
+			this->hx = IncTileHash1D(this->hx);
+		} else if (this->hy != this->hymax) {
+			this->hx = this->hxmin;
+			this->hy = IncTileHash1D(this->hy);
+		} else {
+			return;
 		}
-		if (y == yu) break;
+		this->current_veh = _vehicle_tile_hash[ComposeTileHash(this->hx, this->hy)];
 	}
-
-	return nullptr;
-}
-
-
-/**
- * Helper function for FindVehicleOnPos/HasVehicleOnPos.
- * @note Do not call this function directly!
- * @param x    The X location on the map
- * @param y    The Y location on the map
- * @param data Arbitrary data passed to proc
- * @param proc The proc that determines whether a vehicle will be "found".
- * @param find_first Whether to return on the first found or iterate over
- *                   all vehicles
- * @return the best matching or first vehicle (depending on find_first).
- */
-static Vehicle *VehicleFromPosXY(int x, int y, void *data, VehicleFromPosProc *proc, bool find_first)
-{
-	const int COLL_DIST = 6;
-
-	/* Hash area to scan is from xl,yl to xu,yu */
-	int xl = GB((x - COLL_DIST) / TILE_SIZE, HASH_RES, HASH_BITS);
-	int xu = GB((x + COLL_DIST) / TILE_SIZE, HASH_RES, HASH_BITS);
-	int yl = GB((y - COLL_DIST) / TILE_SIZE, HASH_RES, HASH_BITS) << HASH_BITS;
-	int yu = GB((y + COLL_DIST) / TILE_SIZE, HASH_RES, HASH_BITS) << HASH_BITS;
-
-	return VehicleFromTileHash(xl, yl, xu, yu, data, proc, find_first);
 }
 
 /**
- * Find a vehicle from a specific location. It will call proc for ALL vehicles
- * on the tile and YOU must make SURE that the "best one" is stored in the
- * data value and is ALWAYS the same regardless of the order of the vehicles
- * where proc was called on!
- * When you fail to do this properly you create an almost untraceable DESYNC!
- * @note The return value of proc will be ignored.
- * @note Use this when you have the intention that all vehicles
- *       should be iterated over.
- * @param x    The X location on the map
- * @param y    The Y location on the map
- * @param data Arbitrary data passed to proc
- * @param proc The proc that determines whether a vehicle will be "found".
+ * Advance the internal state until it reaches a vehicle within the search area.
  */
-void FindVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc)
+void VehiclesNearTileXY::Iterator::SkipFalseMatches()
 {
-	VehicleFromPosXY(x, y, data, proc, false);
+	while (this->current_veh != nullptr && !this->pos_rect.Contains({this->current_veh->x_pos, this->current_veh->y_pos})) this->Increment();
 }
 
 /**
- * Checks whether a vehicle in on a specific location. It will call proc for
- * vehicles until it returns non-nullptr.
- * @note Use FindVehicleOnPosXY when you have the intention that all vehicles
- *       should be iterated over.
- * @param x    The X location on the map
- * @param y    The Y location on the map
- * @param data Arbitrary data passed to proc
- * @param proc The proc that determines whether a vehicle will be "found".
- * @return True if proc returned non-nullptr.
+ * Iterator constructor.
+ * Find first vehicle on tile.
  */
-bool HasVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc)
+VehiclesOnTile::Iterator::Iterator(TileIndex tile) : tile(tile)
 {
-	return VehicleFromPosXY(x, y, data, proc, true) != nullptr;
+	this->current = _vehicle_tile_hash[GetTileHash(TileX(tile), TileY(tile))];
+	this->SkipFalseMatches();
 }
 
 /**
- * Helper function for FindVehicleOnPos/HasVehicleOnPos.
- * @note Do not call this function directly!
- * @param tile The location on the map
- * @param data Arbitrary data passed to \a proc.
- * @param proc The proc that determines whether a vehicle will be "found".
- * @param find_first Whether to return on the first found or iterate over
- *                   all vehicles
- * @return the best matching or first vehicle (depending on find_first).
+ * Advance the internal state to the next potential vehicle.
+ * The vehicle may not be on the correct tile though.
  */
-static Vehicle *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc, bool find_first)
+void VehiclesOnTile::Iterator::Increment()
 {
-	int x = GB(TileX(tile), HASH_RES, HASH_BITS);
-	int y = GB(TileY(tile), HASH_RES, HASH_BITS) << HASH_BITS;
-
-	Vehicle *v = _vehicle_tile_hash[(x + y) & TOTAL_HASH_MASK];
-	for (; v != nullptr; v = v->hash_tile_next) {
-		if (v->tile != tile) continue;
-
-		Vehicle *a = proc(v, data);
-		if (find_first && a != nullptr) return a;
-	}
-
-	return nullptr;
+	this->current = this->current->hash_tile_next;
 }
 
 /**
- * Find a vehicle from a specific location. It will call \a proc for ALL vehicles
- * on the tile and YOU must make SURE that the "best one" is stored in the
- * data value and is ALWAYS the same regardless of the order of the vehicles
- * where proc was called on!
- * When you fail to do this properly you create an almost untraceable DESYNC!
- * @note The return value of \a proc will be ignored.
- * @note Use this function when you have the intention that all vehicles
- *       should be iterated over.
- * @param tile The location on the map
- * @param data Arbitrary data passed to \a proc.
- * @param proc The proc that determines whether a vehicle will be "found".
+ * Advance the internal state until it reaches a vehicle on the correct tile or the end.
  */
-void FindVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc)
+void VehiclesOnTile::Iterator::SkipFalseMatches()
 {
-	VehicleFromPos(tile, data, proc, false);
-}
-
-/**
- * Checks whether a vehicle is on a specific location. It will call \a proc for
- * vehicles until it returns non-nullptr.
- * @note Use #FindVehicleOnPos when you have the intention that all vehicles
- *       should be iterated over.
- * @param tile The location on the map
- * @param data Arbitrary data passed to \a proc.
- * @param proc The \a proc that determines whether a vehicle will be "found".
- * @return True if proc returned non-nullptr.
- */
-bool HasVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc)
-{
-	return VehicleFromPos(tile, data, proc, true) != nullptr;
-}
-
-/**
- * Callback that returns 'real' vehicles lower or at height \c *(int*)data .
- * @param v Vehicle to examine.
- * @param data Pointer to height data.
- * @return \a v if conditions are met, else \c nullptr.
- */
-static Vehicle *EnsureNoVehicleProcZ(Vehicle *v, void *data)
-{
-	int z = *(int*)data;
-
-	if (v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) return nullptr;
-	if (v->z_pos > z) return nullptr;
-
-	return v;
+	while (this->current != nullptr && this->current->tile != this->tile) this->Increment();
 }
 
 /**
@@ -548,20 +532,15 @@ CommandCost EnsureNoVehicleOnGround(TileIndex tile)
 	 * error message only (which may be different for different machines).
 	 * Such a message does not affect MP synchronisation.
 	 */
-	Vehicle *v = VehicleFromPos(tile, &z, &EnsureNoVehicleProcZ, true);
-	if (v != nullptr) return CommandCost(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
+	for (const Vehicle *v : VehiclesOnTile(tile)) {
+		if (v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) continue;
+		if (v->z_pos > z) continue;
+
+		return CommandCost(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
+	}
 	return CommandCost();
 }
 
-/** Procedure called for every vehicle found in tunnel/bridge in the hash map */
-static Vehicle *GetVehicleTunnelBridgeProc(Vehicle *v, void *data)
-{
-	if (v->type != VEH_TRAIN && v->type != VEH_ROAD && v->type != VEH_SHIP) return nullptr;
-	if (v == (const Vehicle *)data) return nullptr;
-
-	return v;
-}
-
 /**
  * Finds vehicle in tunnel / bridge
  * @param tile first end
@@ -571,29 +550,20 @@ static Vehicle *GetVehicleTunnelBridgeProc(Vehicle *v, void *data)
  */
 CommandCost TunnelBridgeIsFree(TileIndex tile, TileIndex endtile, const Vehicle *ignore)
 {
-	/* Value v is not safe in MP games, however, it is used to generate a local
-	 * error message only (which may be different for different machines).
-	 * Such a message does not affect MP synchronisation.
-	 */
-	Vehicle *v = VehicleFromPos(tile, const_cast<Vehicle *>(ignore), &GetVehicleTunnelBridgeProc, true);
-	if (v == nullptr) v = VehicleFromPos(endtile, const_cast<Vehicle *>(ignore), &GetVehicleTunnelBridgeProc, true);
-
-	if (v != nullptr) return CommandCost(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
+	for (TileIndex t : {tile, endtile}) {
+		/* Value v is not safe in MP games, however, it is used to generate a local
+		 * error message only (which may be different for different machines).
+		 * Such a message does not affect MP synchronisation.
+		 */
+		for (const Vehicle *v : VehiclesOnTile(t)) {
+			if (v->type != VEH_TRAIN && v->type != VEH_ROAD && v->type != VEH_SHIP) continue;
+			if (v == ignore) continue;
+			return CommandCost(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
+		}
+	}
 	return CommandCost();
 }
 
-static Vehicle *EnsureNoTrainOnTrackProc(Vehicle *v, void *data)
-{
-	TrackBits rail_bits = *(TrackBits *)data;
-
-	if (v->type != VEH_TRAIN) return nullptr;
-
-	Train *t = Train::From(v);
-	if ((t->track != rail_bits) && !TracksOverlap(t->track | rail_bits)) return nullptr;
-
-	return v;
-}
-
 /**
  * Tests if a vehicle interacts with the specified track bits.
  * All track bits interact except parallel #TRACK_BIT_HORZ or #TRACK_BIT_VERT.
@@ -608,8 +578,14 @@ CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits)
 	 * error message only (which may be different for different machines).
 	 * Such a message does not affect MP synchronisation.
 	 */
-	Vehicle *v = VehicleFromPos(tile, &track_bits, &EnsureNoTrainOnTrackProc, true);
-	if (v != nullptr) return CommandCost(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
+	for (const Vehicle *v : VehiclesOnTile(tile)) {
+		if (v->type != VEH_TRAIN) continue;
+
+		const Train *t = Train::From(v);
+		if ((t->track != track_bits) && !TracksOverlap(t->track | track_bits)) continue;
+
+		return CommandCost(STR_ERROR_TRAIN_IN_THE_WAY + v->type);
+	}
 	return CommandCost();
 }
 
@@ -621,9 +597,7 @@ static void UpdateVehicleTileHash(Vehicle *v, bool remove)
 	if (remove) {
 		new_hash = nullptr;
 	} else {
-		int x = GB(TileX(v->tile), HASH_RES, HASH_BITS);
-		int y = GB(TileY(v->tile), HASH_RES, HASH_BITS) << HASH_BITS;
-		new_hash = &_vehicle_tile_hash[(x + y) & TOTAL_HASH_MASK];
+		new_hash = &_vehicle_tile_hash[GetTileHash(TileX(v->tile), TileY(v->tile))];
 	}
 
 	if (old_hash == new_hash) return;
@@ -652,8 +626,8 @@ static void UpdateVehicleViewportHash(Vehicle *v, int x, int y, int old_x, int o
 {
 	Vehicle **old_hash, **new_hash;
 
-	new_hash = (x == INVALID_COORD) ? nullptr : &_vehicle_viewport_hash[GEN_HASH(x, y)];
-	old_hash = (old_x == INVALID_COORD) ? nullptr : &_vehicle_viewport_hash[GEN_HASH(old_x, old_y)];
+	new_hash = (x == INVALID_COORD) ? nullptr : &_vehicle_viewport_hash[GetViewportHash(x, y)];
+	old_hash = (old_x == INVALID_COORD) ? nullptr : &_vehicle_viewport_hash[GetViewportHash(old_x, old_y)];
 
 	if (old_hash == new_hash) return;
 
@@ -914,7 +888,7 @@ Vehicle::~Vehicle()
  * Adds a vehicle to the list of vehicles that visited a depot this tick
  * @param *v vehicle to add
  */
-void VehicleEnteredDepotThisTick(Vehicle *v)
+static void VehicleEnteredDepotThisTick(Vehicle *v)
 {
 	/* Vehicle should stop in the depot if it was in 'stopping' state */
 	_vehicles_to_autoreplace[v->index] = !v->vehstatus.Test(VehState::Stopped);
@@ -961,7 +935,7 @@ static void RunEconomyVehicleDayProc()
 			uint16_t callback = GetVehicleCallback(CBID_VEHICLE_32DAY_CALLBACK, 0, 0, v->engine_type, v);
 			if (callback != CALLBACK_FAILED) {
 				if (HasBit(callback, 0)) {
-					TriggerVehicle(v, VEHICLE_TRIGGER_CALLBACK_32); // Trigger vehicle trigger 10
+					TriggerVehicleRandomisation(v, VehicleRandomTrigger::Callback32); // Trigger vehicle trigger 10
 				}
 
 				/* After a vehicle trigger, the graphics and properties of the vehicle could change.
@@ -1158,28 +1132,28 @@ void ViewportAddVehicles(DrawPixelInfo *dpi)
 	const int yb = MAX_VEHICLE_PIXEL_Y * ZOOM_BASE;
 
 	/* The hash area to scan */
-	int xl, xu, yl, yu;
+	uint xl, xu, yl, yu;
 
-	if (dpi->width + xb < GEN_HASHX_SIZE) {
-		xl = GEN_HASHX(l - xb);
-		xu = GEN_HASHX(r);
+	if (static_cast<uint>(dpi->width + xb) < GEN_HASHX_SIZE) {
+		xl = GetViewportHashX(l - xb);
+		xu = GetViewportHashX(r);
 	} else {
 		/* scan whole hash row */
 		xl = 0;
 		xu = GEN_HASHX_MASK;
 	}
 
-	if (dpi->height + yb < GEN_HASHY_SIZE) {
-		yl = GEN_HASHY(t - yb);
-		yu = GEN_HASHY(b);
+	if (static_cast<uint>(dpi->height + yb) < GEN_HASHY_SIZE) {
+		yl = GetViewportHashY(t - yb);
+		yu = GetViewportHashY(b);
 	} else {
 		/* scan whole column */
 		yl = 0;
 		yu = GEN_HASHY_MASK;
 	}
 
-	for (int y = yl;; y = (y + GEN_HASHY_INC) & GEN_HASHY_MASK) {
-		for (int x = xl;; x = (x + GEN_HASHX_INC) & GEN_HASHX_MASK) {
+	for (uint y = yl;; y = (y + GEN_HASHY_INC) & GEN_HASHY_MASK) {
+		for (uint x = xl;; x = (x + GEN_HASHX_INC) & GEN_HASHX_MASK) {
 			const Vehicle *v = _vehicle_viewport_hash[x + y]; // already masked & 0xFFF
 
 			while (v != nullptr) {
@@ -1256,13 +1230,13 @@ Vehicle *CheckClickOnVehicle(const Viewport &vp, int x, int y)
 	const int yb = MAX_VEHICLE_PIXEL_Y * ZOOM_BASE;
 
 	/* The hash area to scan */
-	int xl = GEN_HASHX(x - xb);
-	int xu = GEN_HASHX(x);
-	int yl = GEN_HASHY(y - yb);
-	int yu = GEN_HASHY(y);
+	uint xl = GetViewportHashX(x - xb);
+	uint xu = GetViewportHashX(x);
+	uint yl = GetViewportHashY(y - yb);
+	uint yu = GetViewportHashY(y);
 
-	for (int hy = yl;; hy = (hy + GEN_HASHY_INC) & GEN_HASHY_MASK) {
-		for (int hx = xl;; hx = (hx + GEN_HASHX_INC) & GEN_HASHX_MASK) {
+	for (uint hy = yl;; hy = (hy + GEN_HASHY_INC) & GEN_HASHY_MASK) {
+		for (uint hx = xl;; hx = (hx + GEN_HASHX_INC) & GEN_HASHX_MASK) {
 			Vehicle *v = _vehicle_viewport_hash[hx + hy]; // already masked & 0xFFF
 
 			while (v != nullptr) {
@@ -1560,7 +1534,7 @@ void VehicleEnterDepot(Vehicle *v)
 			UpdateSignalsOnSegment(t->tile, INVALID_DIAGDIR, t->owner);
 			t->wait_counter = 0;
 			t->force_proceed = TFP_NONE;
-			ClrBit(t->flags, VRF_TOGGLE_REVERSE);
+			t->flags.Reset(VehicleRailFlag::Reversed);
 			t->ConsistChanged(CCF_ARRANGE);
 			break;
 		}
@@ -1599,8 +1573,11 @@ void VehicleEnterDepot(Vehicle *v)
 
 	VehicleServiceInDepot(v);
 
+	/* Store that the vehicle entered a depot this tick */
+	VehicleEnteredDepotThisTick(v);
+
 	/* After a vehicle trigger, the graphics and properties of the vehicle could change. */
-	TriggerVehicle(v, VEHICLE_TRIGGER_DEPOT);
+	TriggerVehicleRandomisation(v, VehicleRandomTrigger::Depot);
 	v->MarkDirty();
 
 	InvalidateWindowData(WC_VEHICLE_VIEW, v->index);
@@ -1756,7 +1733,7 @@ void Vehicle::UpdateViewport(bool dirty)
  */
 void Vehicle::UpdatePositionAndViewport()
 {
-	this->UpdatePosition();
+	if (this->type != VEH_EFFECT) this->UpdatePosition();
 	this->UpdateViewport(true);
 }
 
@@ -1826,9 +1803,9 @@ Direction GetDirectionTowards(const Vehicle *v, int x, int y)
  * @param x    X position
  * @param y    Y position
  * @return Some meta-data over the to be entered tile.
- * @see VehicleEnterTileStatus to see what the bits in the return value mean.
+ * @see VehicleEnterTileStates to see what the bits in the return value mean.
  */
-VehicleEnterTileStatus VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y)
+VehicleEnterTileStates VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y)
 {
 	return _tile_type_procs[GetTileType(tile)]->vehicle_enter_tile_proc(v, tile, x, y);
 }
@@ -2167,24 +2144,23 @@ void Vehicle::DeleteUnreachedImplicitOrders()
 		}
 	}
 
-	const Order *order = this->GetOrder(this->cur_implicit_order_index);
-	while (order != nullptr) {
+	auto orders = this->Orders();
+	VehicleOrderID cur = this->cur_implicit_order_index;
+	while (cur != INVALID_VEH_ORDER_ID) {
 		if (this->cur_implicit_order_index == this->cur_real_order_index) break;
 
-		if (order->IsType(OT_IMPLICIT)) {
+		if (orders[cur].IsType(OT_IMPLICIT)) {
 			DeleteOrder(this, this->cur_implicit_order_index);
 			/* DeleteOrder does various magic with order_indices, so resync 'order' with 'cur_implicit_order_index' */
-			order = this->GetOrder(this->cur_implicit_order_index);
 		} else {
 			/* Skip non-implicit orders, e.g. service-orders */
-			order = order->next;
-			this->cur_implicit_order_index++;
-		}
-
-		/* Wrap around */
-		if (order == nullptr) {
-			order = this->GetOrder(0);
-			this->cur_implicit_order_index = 0;
+			if (cur < this->orders->GetNext(cur)) {
+				this->cur_implicit_order_index++;
+			} else {
+				/* Wrapped around. */
+				this->cur_implicit_order_index = 0;
+			}
+			cur = this->orders->GetNext(cur);
 		}
 	}
 }
@@ -2224,7 +2200,7 @@ void Vehicle::BeginLoading()
 				in_list->GetDestination() != this->last_station_visited)) {
 			bool suppress_implicit_orders = HasBit(this->GetGroundVehicleFlags(), GVF_SUPPRESS_IMPLICIT_ORDERS);
 			/* Do not create consecutive duplicates of implicit orders */
-			Order *prev_order = this->cur_implicit_order_index > 0 ? this->GetOrder(this->cur_implicit_order_index - 1) : (this->GetNumOrders() > 1 ? this->GetLastOrder() : nullptr);
+			const Order *prev_order = this->cur_implicit_order_index > 0 ? this->GetOrder(this->cur_implicit_order_index - 1) : (this->GetNumOrders() > 1 ? this->GetLastOrder() : nullptr);
 			if (prev_order == nullptr ||
 					(!prev_order->IsType(OT_IMPLICIT) && !prev_order->IsType(OT_GOTO_STATION)) ||
 					prev_order->GetDestination() != this->last_station_visited) {
@@ -2261,33 +2237,30 @@ void Vehicle::BeginLoading()
 						InvalidateVehicleOrder(this, 0);
 					} else {
 						/* Delete all implicit orders up to the station we just reached */
-						const Order *order = this->GetOrder(this->cur_implicit_order_index);
-						while (!order->IsType(OT_IMPLICIT) || order->GetDestination() != this->last_station_visited) {
-							if (order->IsType(OT_IMPLICIT)) {
+						VehicleOrderID cur = this->cur_implicit_order_index;
+						auto orders = this->Orders();
+						while (!orders[cur].IsType(OT_IMPLICIT) || orders[cur].GetDestination() != this->last_station_visited) {
+							if (orders[cur].IsType(OT_IMPLICIT)) {
 								DeleteOrder(this, this->cur_implicit_order_index);
 								/* DeleteOrder does various magic with order_indices, so resync 'order' with 'cur_implicit_order_index' */
-								order = this->GetOrder(this->cur_implicit_order_index);
 							} else {
 								/* Skip non-implicit orders, e.g. service-orders */
-								order = order->next;
-								this->cur_implicit_order_index++;
+								if (cur < this->orders->GetNext(cur)) {
+									this->cur_implicit_order_index++;
+								} else {
+									/* Wrapped around. */
+									this->cur_implicit_order_index = 0;
+								}
+								cur = this->orders->GetNext(cur);
 							}
-
-							/* Wrap around */
-							if (order == nullptr) {
-								order = this->GetOrder(0);
-								this->cur_implicit_order_index = 0;
-							}
-							assert(order != nullptr);
 						}
 					}
 				} else if (!suppress_implicit_orders &&
-						((this->orders == nullptr ? OrderList::CanAllocateItem() : this->orders->GetNumOrders() < MAX_VEH_ORDER_ID)) &&
-						Order::CanAllocateItem()) {
+						(this->orders == nullptr ? OrderList::CanAllocateItem() : this->orders->GetNumOrders() < MAX_VEH_ORDER_ID)) {
 					/* Insert new implicit order */
-					Order *implicit_order = new Order();
-					implicit_order->MakeImplicit(this->last_station_visited);
-					InsertOrder(this, implicit_order, this->cur_implicit_order_index);
+					Order implicit_order{};
+					implicit_order.MakeImplicit(this->last_station_visited);
+					InsertOrder(this, std::move(implicit_order), this->cur_implicit_order_index);
 					if (this->cur_implicit_order_index > 0) --this->cur_implicit_order_index;
 
 					/* InsertOrder disabled creation of implicit orders for all vehicles with the same implicit order.
@@ -2380,17 +2353,17 @@ void Vehicle::LeaveStation()
 	if (this->type == VEH_TRAIN && !this->vehstatus.Test(VehState::Crashed)) {
 		/* Trigger station animation (trains only) */
 		if (IsTileType(this->tile, MP_STATION)) {
-			TriggerStationRandomisation(st, this->tile, SRT_TRAIN_DEPARTS);
-			TriggerStationAnimation(st, this->tile, SAT_TRAIN_DEPARTS);
+			TriggerStationRandomisation(st, this->tile, StationRandomTrigger::VehicleDeparts);
+			TriggerStationAnimation(st, this->tile, StationAnimationTrigger::VehicleDeparts);
 		}
 
-		SetBit(Train::From(this)->flags, VRF_LEAVING_STATION);
+		Train::From(this)->flags.Set(VehicleRailFlag::LeavingStation);
 	}
 	if (this->type == VEH_ROAD && !this->vehstatus.Test(VehState::Crashed)) {
 		/* Trigger road stop animation */
 		if (IsStationRoadStopTile(this->tile)) {
-			TriggerRoadStopRandomisation(st, this->tile, RSRT_VEH_DEPARTS);
-			TriggerRoadStopAnimation(st, this->tile, SAT_TRAIN_DEPARTS);
+			TriggerRoadStopRandomisation(st, this->tile, StationRandomTrigger::VehicleDeparts);
+			TriggerRoadStopAnimation(st, this->tile, StationAnimationTrigger::VehicleDeparts);
 		}
 	}
 
@@ -2457,10 +2430,9 @@ void Vehicle::HandleLoading(bool mode)
  */
 bool Vehicle::HasFullLoadOrder() const
 {
-	for (Order *o : this->Orders()) {
-		if (o->IsType(OT_GOTO_STATION) && o->GetLoadType() & (OLFB_FULL_LOAD | OLF_FULL_LOAD_ANY)) return true;
-	}
-	return false;
+	return std::ranges::any_of(this->Orders(), [](const Order &o) {
+		return o.IsType(OT_GOTO_STATION) && o.GetLoadType() & (OLFB_FULL_LOAD | OLF_FULL_LOAD_ANY);
+	});
 }
 
 /**
@@ -2469,10 +2441,7 @@ bool Vehicle::HasFullLoadOrder() const
  */
 bool Vehicle::HasConditionalOrder() const
 {
-	for (Order *o : this->Orders()) {
-		if (o->IsType(OT_CONDITIONAL)) return true;
-	}
-	return false;
+	return std::ranges::any_of(this->Orders(), [](const Order &o) { return o.IsType(OT_CONDITIONAL); });
 }
 
 /**
@@ -2481,10 +2450,9 @@ bool Vehicle::HasConditionalOrder() const
  */
 bool Vehicle::HasUnbunchingOrder() const
 {
-	for (Order *o : this->Orders()) {
-		if (o->IsType(OT_GOTO_DEPOT) && o->GetDepotActionType() & ODATFB_UNBUNCH) return true;
-	}
-	return false;
+	return std::ranges::any_of(this->Orders(), [](const Order &o) {
+		return o.IsType(OT_GOTO_DEPOT) && (o.GetDepotActionType() & ODATFB_UNBUNCH);
+	});
 }
 
 /**
@@ -2495,7 +2463,7 @@ static bool PreviousOrderIsUnbunching(const Vehicle *v)
 {
 	/* If we are headed for the first order, we must wrap around back to the last order. */
 	bool is_first_order = (v->GetOrder(v->cur_implicit_order_index) == v->GetFirstOrder());
-	Order *previous_order = (is_first_order) ? v->GetLastOrder() : v->GetOrder(v->cur_implicit_order_index - 1);
+	const Order *previous_order = (is_first_order) ? v->GetLastOrder() : v->GetOrder(v->cur_implicit_order_index - 1);
 
 	if (previous_order == nullptr || !previous_order->IsType(OT_GOTO_DEPOT)) return false;
 	return (previous_order->GetDepotActionType() & ODATFB_UNBUNCH) != 0;
@@ -2633,7 +2601,7 @@ CommandCost Vehicle::SendToDepot(DoCommandFlags flags, DepotCommandFlags command
 		SetWindowWidgetDirty(WC_VEHICLE_VIEW, this->index, WID_VV_START_STOP);
 
 		/* If there is no depot in front and the train is not already reversing, reverse automatically (trains only) */
-		if (this->type == VEH_TRAIN && (closest_depot.reverse ^ HasBit(Train::From(this)->flags, VRF_REVERSING))) {
+		if (this->type == VEH_TRAIN && (closest_depot.reverse ^ Train::From(this)->flags.Test(VehicleRailFlag::Reversing))) {
 			Command<CMD_REVERSE_TRAIN_DIRECTION>::Do(DoCommandFlag::Execute, this->index, false);
 		}
 
@@ -2724,10 +2692,12 @@ static const int8_t _vehicle_smoke_pos[8] = {
  */
 static void SpawnAdvancedVisualEffect(const Vehicle *v)
 {
-	uint16_t callback = GetVehicleCallback(CBID_VEHICLE_SPAWN_VISUAL_EFFECT, 0, Random(), v->engine_type, v);
+	std::array<int32_t, 4> regs100;
+	uint16_t callback = GetVehicleCallback(CBID_VEHICLE_SPAWN_VISUAL_EFFECT, 0, Random(), v->engine_type, v, regs100);
 	if (callback == CALLBACK_FAILED) return;
 
 	uint count = GB(callback, 0, 2);
+	assert(count <= std::size(regs100));
 	bool auto_center = HasBit(callback, 13);
 	bool auto_rotate = !HasBit(callback, 14);
 
@@ -2741,14 +2711,14 @@ static void SpawnAdvancedVisualEffect(const Vehicle *v)
 	}
 
 	Direction l_dir = v->direction;
-	if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION)) l_dir = ReverseDir(l_dir);
+	if (v->type == VEH_TRAIN && Train::From(v)->flags.Test(VehicleRailFlag::Flipped)) l_dir = ReverseDir(l_dir);
 	Direction t_dir = ChangeDir(l_dir, DIRDIFF_90RIGHT);
 
 	int8_t x_center = _vehicle_smoke_pos[l_dir] * l_center;
 	int8_t y_center = _vehicle_smoke_pos[t_dir] * l_center;
 
 	for (uint i = 0; i < count; i++) {
-		uint32_t reg = GetRegister(0x100 + i);
+		int32_t reg = regs100[i];
 		uint type = GB(reg,  0, 8);
 		int8_t x    = GB(reg,  8, 8);
 		int8_t y    = GB(reg, 16, 8);
@@ -2802,7 +2772,7 @@ void Vehicle::ShowVisualEffect() const
 		 * - the train is reversing
 		 * - is entering a station with an order to stop there and its speed is equal to maximum station entering speed
 		 */
-		if (HasBit(t->flags, VRF_REVERSING) ||
+		if (t->flags.Test(VehicleRailFlag::Reversing) ||
 				(IsRailStationTile(t->tile) && t->IsFrontEngine() && t->current_order.ShouldStopAtStation(t, GetStationIndex(t->tile)) &&
 				t->cur_speed >= max_speed)) {
 			return;
@@ -2911,7 +2881,7 @@ void Vehicle::ShowVisualEffect() const
 			int x = _vehicle_smoke_pos[v->direction] * effect_offset;
 			int y = _vehicle_smoke_pos[(v->direction + 2) % 8] * effect_offset;
 
-			if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION)) {
+			if (v->type == VEH_TRAIN && Train::From(v)->flags.Test(VehicleRailFlag::Flipped)) {
 				x = -x;
 				y = -y;
 			}
@@ -2963,7 +2933,7 @@ void Vehicle::AddToShared(Vehicle *shared_chain)
 	if (shared_chain->orders == nullptr) {
 		assert(shared_chain->previous_shared == nullptr);
 		assert(shared_chain->next_shared == nullptr);
-		this->orders = shared_chain->orders = new OrderList(nullptr, shared_chain);
+		this->orders = shared_chain->orders = new OrderList(shared_chain);
 	}
 
 	this->next_shared     = shared_chain->next_shared;
@@ -3010,7 +2980,7 @@ void Vehicle::RemoveFromShared()
 	this->previous_shared = nullptr;
 }
 
-static IntervalTimer<TimerGameEconomy> _economy_vehicles_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::VEHICLE}, [](auto)
+static const IntervalTimer<TimerGameEconomy> _economy_vehicles_yearly({TimerGameEconomy::YEAR, TimerGameEconomy::Priority::VEHICLE}, [](auto)
 {
 	for (Vehicle *v : Vehicle::Iterate()) {
 		if (v->IsPrimaryVehicle()) {
@@ -3279,13 +3249,5 @@ bool VehiclesHaveSameEngineList(const Vehicle *v1, const Vehicle *v2)
  */
 bool VehiclesHaveSameOrderList(const Vehicle *v1, const Vehicle *v2)
 {
-	const Order *o1 = v1->GetFirstOrder();
-	const Order *o2 = v2->GetFirstOrder();
-	while (true) {
-		if (o1 == nullptr && o2 == nullptr) return true;
-		if (o1 == nullptr || o2 == nullptr) return false;
-		if (!o1->Equals(*o2)) return false;
-		o1 = o1->next;
-		o2 = o2->next;
-	}
+	return std::ranges::equal(v1->Orders(), v2->Orders(), [](const Order &o1, const Order &o2) { return o1.Equals(o2); });
 }
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index 920ebcb452..58c311e804 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -311,7 +311,7 @@ public:
 	uint32_t motion_counter = 0; ///< counter to occasionally play a vehicle sound.
 	uint8_t progress = 0; ///< The percentage (if divided by 256) this vehicle already crossed the tile unit.
 
-	uint8_t waiting_triggers = 0; ///< Triggers to be yet matched before rerandomizing the random bits.
+	VehicleRandomTriggers waiting_random_triggers; ///< Triggers to be yet matched before rerandomizing the random bits.
 	uint16_t random_bits = 0; ///< Bits used for randomized variational spritegroups.
 
 	StationID last_station_visited = StationID::Invalid(); ///< The last station we stopped at.
@@ -337,7 +337,7 @@ public:
 
 	union {
 		OrderList *orders = nullptr; ///< Pointer to the order list for this vehicle
-		Order *old_orders; ///< Only used during conversion of old save games
+		uint32_t old_orders; ///< Only used during conversion of old save games
 	};
 
 	NewGRFCache grf_cache{}; ///< Cache of often used calculated NewGRF values
@@ -682,7 +682,19 @@ public:
 	 * Get the first order of the vehicles order list.
 	 * @return first order of order list.
 	 */
-	inline Order *GetFirstOrder() const { return (this->orders == nullptr) ? nullptr : this->orders->GetFirstOrder(); }
+	inline const Order *GetFirstOrder() const { return (this->orders == nullptr) ? nullptr : this->GetOrder(this->orders->GetFirstOrder()); }
+
+	inline std::span<const Order> Orders() const
+	{
+		if (this->orders == nullptr) return {};
+		return this->orders->GetOrders();
+	}
+
+	inline std::span<Order> Orders()
+	{
+		if (this->orders == nullptr) return {};
+		return this->orders->GetOrders();
+	}
 
 	void AddToShared(Vehicle *shared_chain);
 	void RemoveFromShared();
@@ -908,9 +920,9 @@ public:
 	 * Returns the last order of a vehicle, or nullptr if it doesn't exists
 	 * @return last order of a vehicle, if available
 	 */
-	inline Order *GetLastOrder() const
+	inline const Order *GetLastOrder() const
 	{
-		return (this->orders == nullptr) ? nullptr : this->orders->GetLastOrder();
+		return (this->orders == nullptr) ? nullptr : this->orders->GetOrderAt(this->orders->GetLastOrder());
 	}
 
 	bool IsEngineCountable() const;
@@ -1014,54 +1026,6 @@ public:
 		return v;
 	}
 
-	/**
-	 * Iterator to iterate orders
-	 * Supports deletion of current order
-	 */
-	struct OrderIterator {
-		typedef Order value_type;
-		typedef Order *pointer;
-		typedef Order &reference;
-		typedef size_t difference_type;
-		typedef std::forward_iterator_tag iterator_category;
-
-		explicit OrderIterator(OrderList *list) : list(list), prev(nullptr)
-		{
-			this->order = (this->list == nullptr) ? nullptr : this->list->GetFirstOrder();
-		}
-
-		bool operator==(const OrderIterator &other) const { return this->order == other.order; }
-		Order * operator*() const { return this->order; }
-		OrderIterator & operator++()
-		{
-			this->prev = (this->prev == nullptr) ? this->list->GetFirstOrder() : this->prev->next;
-			this->order = (this->prev == nullptr) ? nullptr : this->prev->next;
-			return *this;
-		}
-
-	private:
-		OrderList *list;
-		Order *order;
-		Order *prev;
-	};
-
-	/**
-	 * Iterable ensemble of orders
-	 */
-	struct IterateWrapper {
-		OrderList *list;
-		IterateWrapper(OrderList *list = nullptr) : list(list) {}
-		OrderIterator begin() { return OrderIterator(this->list); }
-		OrderIterator end() { return OrderIterator(nullptr); }
-		bool empty() { return this->begin() == this->end(); }
-	};
-
-	/**
-	 * Returns an iterable ensemble of orders of a vehicle
-	 * @return an iterable ensemble of orders of a vehicle
-	 */
-	IterateWrapper Orders() const { return IterateWrapper(this->orders); }
-
 	uint32_t GetDisplayMaxWeight() const;
 	uint32_t GetDisplayMinPowerToWeight() const;
 };
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 89bae13ccd..75baae2051 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -139,7 +139,7 @@ std::tuple<CommandCost, VehicleID, uint, uint16_t, CargoArray> CmdBuildVehicle(D
 	/* If we are refitting we need to temporarily purchase the vehicle to be able to
 	 * test it. */
 	DoCommandFlags subflags = flags;
-	if (refitting && !flags.Test(DoCommandFlag::Execute)) subflags.Set(DoCommandFlag::Execute).Set(DoCommandFlag::AutoReplace);
+	if (refitting && !flags.Test(DoCommandFlag::Execute)) subflags.Set({DoCommandFlag::Execute, DoCommandFlag::AutoReplace});
 
 	/* Vehicle construction needs random bits, so we have to save the random
 	 * seeds to prevent desyncs. */
@@ -247,16 +247,6 @@ CommandCost CmdSellVehicle(DoCommandFlags flags, VehicleID v_id, bool sell_chain
 
 	if (!front->IsStoppedInDepot()) return CommandCost(STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT + front->type);
 
-	/* Can we actually make the order backup, i.e. are there enough orders? */
-	if (backup_order &&
-			front->orders != nullptr &&
-			!front->orders->IsShared() &&
-			!Order::CanAllocateItem(front->orders->GetNumOrders())) {
-		/* Only happens in exceptional cases when there aren't enough orders anyhow.
-		 * Thus it should be safe to just drop the orders in that case. */
-		backup_order = false;
-	}
-
 	if (v->type == VEH_TRAIN) {
 		ret = CmdSellRailWagon(flags, v, sell_chain, backup_order, client_id);
 	} else {
@@ -617,7 +607,8 @@ CommandCost CmdStartStopVehicle(DoCommandFlags flags, VehicleID veh_id, bool eva
 
 	if (evaluate_startstop_cb) {
 		/* Check if this vehicle can be started/stopped. Failure means 'allow'. */
-		uint16_t callback = GetVehicleCallback(CBID_VEHICLE_START_STOP_CHECK, 0, 0, v->engine_type, v);
+		std::array<int32_t, 1> regs100;
+		uint16_t callback = GetVehicleCallback(CBID_VEHICLE_START_STOP_CHECK, 0, 0, v->engine_type, v, regs100);
 		StringID error = STR_NULL;
 		if (callback != CALLBACK_FAILED) {
 			if (v->GetGRF()->grf_version < 8) {
@@ -631,6 +622,10 @@ CommandCost CmdStartStopVehicle(DoCommandFlags flags, VehicleID veh_id, bool eva
 						case 0x400: // allow
 							break;
 
+						case 0x40F:
+							error = GetGRFStringID(v->GetGRFID(), static_cast<GRFStringID>(regs100[0]));
+							break;
+
 						default: // unknown reason -> disallow
 							error = STR_ERROR_INCOMPATIBLE_RAIL_TYPES;
 							break;
@@ -900,8 +895,12 @@ std::tuple<CommandCost, VehicleID> CmdCloneVehicle(DoCommandFlags flags, TileInd
 		if (flags.Test(DoCommandFlag::Execute)) {
 			w = Vehicle::Get(new_veh_id);
 
-			if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION)) {
-				SetBit(Train::From(w)->flags, VRF_REVERSE_DIRECTION);
+			if (v->type == VEH_TRAIN && Train::From(v)->flags.Test(VehicleRailFlag::Flipped)) {
+				/* Only copy the reverse state if neither old or new vehicle implements reverse-on-build probability callback. */
+				if (!TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed).has_value() &&
+					!TestVehicleBuildProbability(w, w->engine_type, BuildProbabilityType::Reversed).has_value()) {
+					Train::From(w)->flags.Set(VehicleRailFlag::Flipped);
+				}
 			}
 
 			if (v->type == VEH_TRAIN && !v->IsFrontEngine()) {
diff --git a/src/vehicle_func.h b/src/vehicle_func.h
index e5207e969e..f1aadce4d8 100644
--- a/src/vehicle_func.h
+++ b/src/vehicle_func.h
@@ -21,9 +21,18 @@
 #include "track_type.h"
 #include "livery.h"
 
-#define is_custom_sprite(x) (x >= 0xFD)
-#define IS_CUSTOM_FIRSTHEAD_SPRITE(x) (x == 0xFD)
-#define IS_CUSTOM_SECONDHEAD_SPRITE(x) (x == 0xFE)
+/**
+ * Special values for Vehicle::spritenum and (Aircraft|Rail|Road|Ship)VehicleInfo::image_index
+ */
+enum CustomVehicleSpriteNum {
+	CUSTOM_VEHICLE_SPRITENUM = 0xFD, ///< Vehicle sprite from NewGRF
+	CUSTOM_VEHICLE_SPRITENUM_REVERSED = 0xFE, ///< Vehicle sprite from NewGRF with reverse driving direction (from articulation callback)
+};
+
+static inline bool IsCustomVehicleSpriteNum(uint8_t spritenum)
+{
+	return spritenum >= CUSTOM_VEHICLE_SPRITENUM;
+}
 
 static const TimerGameEconomy::Date VEHICLE_PROFIT_MIN_AGE{CalendarTime::DAYS_IN_YEAR * 2}; ///< Only vehicles older than this have a meaningful profit.
 static const Money VEHICLE_PROFIT_THRESHOLD = 10000;        ///< Threshold for a vehicle to be considered making good profit.
@@ -37,14 +46,143 @@ static const Money VEHICLE_PROFIT_THRESHOLD = 10000;        ///< Threshold for a
 template <VehicleType T>
 bool IsValidImageIndex(uint8_t image_index);
 
-typedef Vehicle *VehicleFromPosProc(Vehicle *v, void *data);
+/**
+ * Iterate over all vehicles on a tile.
+ * @warning The order is non-deterministic. You have to make sure, that your processing is not order dependant.
+ */
+class VehiclesOnTile {
+public:
+	/**
+	 * Forward iterator
+	 */
+	class Iterator {
+	public:
+		using value_type = Vehicle *;
+		using difference_type = std::ptrdiff_t;
+		using iterator_category = std::forward_iterator_tag;
+		using pointer = void;
+		using reference = void;
+
+		explicit Iterator(TileIndex tile);
+
+		bool operator==(const Iterator &rhs) const { return this->current == rhs.current; }
+		bool operator==(const std::default_sentinel_t &) const { return this->current == nullptr; }
+
+		Vehicle *operator*() const { return this->current; }
+
+		Iterator &operator++()
+		{
+			this->Increment();
+			this->SkipFalseMatches();
+			return *this;
+		}
+
+		Iterator operator++(int)
+		{
+			Iterator result = *this;
+			++*this;
+			return result;
+		}
+	private:
+		TileIndex tile;
+		Vehicle *current;
+
+		void Increment();
+		void SkipFalseMatches();
+	};
+
+	explicit VehiclesOnTile(TileIndex tile) : start(tile) {}
+	Iterator begin() const { return this->start; }
+	std::default_sentinel_t end() const { return std::default_sentinel_t(); }
+private:
+	Iterator start;
+};
+
+/**
+ * Loop over vehicles on a tile, and check whether a predicate is true for any of them.
+ * The predicate must have the signature: bool Predicate(const Vehicle *);
+ */
+template <class UnaryPred>
+bool HasVehicleOnTile(TileIndex tile, UnaryPred &&predicate)
+{
+	for (const auto *v : VehiclesOnTile(tile)) {
+		if (predicate(v)) return true;
+	}
+	return false;
+}
+
+/**
+ * Iterate over all vehicles near a given world coordinate.
+ * @warning This only works for vehicles with proper Vehicle::Tile, so only ground vehicles outside wormholes.
+ * @warning The order is non-deterministic. You have to make sure, that your processing is not order dependant.
+ */
+class VehiclesNearTileXY {
+public:
+	/**
+	 * Forward iterator
+	 */
+	class Iterator {
+	public:
+		using value_type = Vehicle *;
+		using difference_type = std::ptrdiff_t;
+		using iterator_category = std::forward_iterator_tag;
+		using pointer = void;
+		using reference = void;
+
+		explicit Iterator(int32_t x, int32_t y, uint max_dist);
+
+		bool operator==(const Iterator &rhs) const { return this->current_veh == rhs.current_veh; }
+		bool operator==(const std::default_sentinel_t &) const { return this->current_veh == nullptr; }
+
+		Vehicle *operator*() const { return this->current_veh; }
+
+		Iterator &operator++()
+		{
+			this->Increment();
+			this->SkipFalseMatches();
+			return *this;
+		}
+
+		Iterator operator++(int)
+		{
+			Iterator result = *this;
+			++*this;
+			return result;
+		}
+	private:
+		Rect pos_rect;
+		uint hxmin, hxmax, hymin, hymax;
+		uint hx, hy;
+		Vehicle *current_veh;
+
+		void Increment();
+		void SkipEmptyBuckets();
+		void SkipFalseMatches();
+	};
+
+	explicit VehiclesNearTileXY(int32_t x, int32_t y, uint max_dist) : start(x, y, max_dist) {}
+	Iterator begin() const { return this->start; }
+	std::default_sentinel_t end() const { return std::default_sentinel_t(); }
+private:
+	Iterator start;
+};
+
+/**
+ * Loop over vehicles near a given world coordinate, and check whether a predicate is true for any of them.
+ * The predicate must have the signature: bool Predicate(const Vehicle *);
+ * @warning This only works for vehicles with proper Vehicle::Tile, so only ground vehicles outside wormholes.
+ */
+template <class UnaryPred>
+bool HasVehicleNearTileXY(int32_t x, int32_t y, uint max_dist, UnaryPred &&predicate)
+{
+	for (const auto *v : VehiclesNearTileXY(x, y, max_dist)) {
+		if (predicate(v)) return true;
+	}
+	return false;
+}
 
 void VehicleServiceInDepot(Vehicle *v);
 uint CountVehiclesInChain(const Vehicle *v);
-void FindVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
-void FindVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc);
-bool HasVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
-bool HasVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc);
 void CallVehicleTicks();
 uint8_t CalcPercentVehicleFilled(const Vehicle *v, StringID *colour);
 
@@ -65,7 +203,6 @@ void CheckVehicleBreakdown(Vehicle *v);
 void EconomyAgeVehicle(Vehicle *v);
 void AgeVehicle(Vehicle *v);
 void RunVehicleCalendarDayProc();
-void VehicleEnteredDepotThisTick(Vehicle *v);
 
 UnitID GetFreeUnitNumber(VehicleType type);
 
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index ed9d4b6a98..6727ed5796 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -51,8 +51,8 @@
 #include "safeguards.h"
 
 
-std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping{};
-std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting{};
+static std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping{};
+static std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting{};
 
 static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNumberSorter;
 static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNameSorter;
@@ -477,7 +477,7 @@ Dimension BaseVehicleListWindow::GetActionDropdownSize(bool show_autoreplace, bo
 
 void BaseVehicleListWindow::OnInit()
 {
-	this->order_arrow_width = GetStringBoundingBox(STR_JUST_RIGHT_ARROW, FS_SMALL).width;
+	this->order_arrow_width = std::max(GetStringBoundingBox(STR_JUST_LEFT_ARROW, FS_SMALL).width, GetStringBoundingBox(STR_JUST_RIGHT_ARROW, FS_SMALL).width);
 	this->SetCargoFilterArray();
 }
 
@@ -977,7 +977,7 @@ struct RefitWindow : public Window {
 	{
 		switch (widget) {
 			case WID_VR_MATRIX:
-				resize.height = GetCharacterHeight(FS_NORMAL) + padding.height;
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL) + padding.height;
 				size.height = resize.height * 8;
 				break;
 
@@ -1058,7 +1058,7 @@ struct RefitWindow : public Window {
 
 						/* Determine top & bottom position of the highlight.*/
 						const int height = ScaleSpriteTrad(12);
-						const int highlight_top = CenterBounds(r.top, r.bottom, height);
+						const int highlight_top = CentreBounds(r.top, r.bottom, height);
 						const int highlight_bottom = highlight_top + height - 1;
 
 						for (Train *u = Train::From(v); u != nullptr; u = u->Next()) {
@@ -1387,17 +1387,19 @@ uint ShowRefitOptionsList(int left, int right, int y, EngineID engine)
 /** Get the cargo subtype text from NewGRF for the vehicle details window. */
 StringID GetCargoSubtypeText(const Vehicle *v)
 {
-	if (EngInfo(v->engine_type)->callback_mask.Test(VehicleCallbackMask::CargoSuffix)) {
-		uint16_t cb = GetVehicleCallback(CBID_VEHICLE_CARGO_SUFFIX, 0, 0, v->engine_type, v);
-		if (cb != CALLBACK_FAILED) {
-			if (cb > 0x400) ErrorUnknownCallbackResult(v->GetGRFID(), CBID_VEHICLE_CARGO_SUFFIX, cb);
-			if (cb >= 0x400 || (v->GetGRF()->grf_version < 8 && cb == 0xFF)) cb = CALLBACK_FAILED;
-		}
-		if (cb != CALLBACK_FAILED) {
-			return GetGRFStringID(v->GetGRFID(), GRFSTR_MISC_GRF_TEXT + cb);
-		}
+	if (!EngInfo(v->engine_type)->callback_mask.Test(VehicleCallbackMask::CargoSuffix)) return STR_EMPTY;
+	std::array<int32_t, 1> regs100;
+	uint16_t cb = GetVehicleCallback(CBID_VEHICLE_CARGO_SUFFIX, 0, 0, v->engine_type, v, regs100);
+	if (v->GetGRF()->grf_version < 8 && cb == 0xFF) return STR_EMPTY;
+	if (cb == CALLBACK_FAILED || cb == 0x400) return STR_EMPTY;
+	if (cb == 0x40F) {
+		return GetGRFStringID(v->GetGRFID(), static_cast<GRFStringID>(regs100[0]));
 	}
-	return STR_EMPTY;
+	if (cb > 0x400) {
+		ErrorUnknownCallbackResult(v->GetGRFID(), CBID_VEHICLE_CARGO_SUFFIX, cb);
+		return STR_EMPTY;
+	}
+	return GetGRFStringID(v->GetGRFID(), GRFSTR_MISC_GRF_TEXT + cb);
 }
 
 /** Sort vehicle groups by the number of vehicles in the group */
@@ -1656,8 +1658,8 @@ static constexpr NWidgetPart _nested_vehicle_list[] = {
 
 static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y, uint order_arrow_width, VehicleOrderID start)
 {
-	const Order *order = v->GetOrder(start);
-	if (order == nullptr) return;
+	auto orders = v->Orders();
+	if (orders.empty()) return;
 
 	bool rtl = _current_text_dir == TD_RTL;
 	int l_offset = rtl ? 0 : order_arrow_width;
@@ -1666,39 +1668,34 @@ static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y, uin
 	VehicleOrderID oid = start;
 
 	do {
-		if (oid == v->cur_real_order_index) DrawString(left, right, y, STR_JUST_RIGHT_ARROW, TC_BLACK, SA_LEFT, false, FS_SMALL);
+		if (oid == v->cur_real_order_index) DrawString(left, right, y, rtl ? STR_JUST_LEFT_ARROW : STR_JUST_RIGHT_ARROW, TC_BLACK, SA_LEFT, false, FS_SMALL);
 
-		if (order->IsType(OT_GOTO_STATION)) {
-			DrawString(left + l_offset, right - r_offset, y, GetString(STR_STATION_NAME, order->GetDestination()), TC_BLACK, SA_LEFT, false, FS_SMALL);
+		if (orders[oid].IsType(OT_GOTO_STATION)) {
+			DrawString(left + l_offset, right - r_offset, y, GetString(STR_STATION_NAME, orders[oid].GetDestination()), TC_BLACK, SA_LEFT, false, FS_SMALL);
 
 			y += GetCharacterHeight(FS_SMALL);
 			if (++i == 4) break;
 		}
 
-		oid++;
-		order = order->next;
-		if (order == nullptr) {
-			order = v->orders->GetFirstOrder();
-			oid = 0;
-		}
+		oid = v->orders->GetNext(oid);
 	} while (oid != start);
 }
 
 /** Draw small order list in the vehicle GUI, but without the little black arrow.  This is used for shared order groups. */
-static void DrawSmallOrderList(const Order *order, int left, int right, int y, uint order_arrow_width)
+static void DrawSmallOrderList(const OrderList &orderlist, int left, int right, int y, uint order_arrow_width)
 {
 	bool rtl = _current_text_dir == TD_RTL;
 	int l_offset = rtl ? 0 : order_arrow_width;
 	int r_offset = rtl ? order_arrow_width : 0;
 	int i = 0;
-	while (order != nullptr) {
-		if (order->IsType(OT_GOTO_STATION)) {
-			DrawString(left + l_offset, right - r_offset, y, GetString(STR_STATION_NAME, order->GetDestination()), TC_BLACK, SA_LEFT, false, FS_SMALL);
+
+	for (const Order &order : orderlist.GetOrders()) {
+		if (order.IsType(OT_GOTO_STATION)) {
+			DrawString(left + l_offset, right - r_offset, y, GetString(STR_STATION_NAME, order.GetDestination()), TC_BLACK, SA_LEFT, false, FS_SMALL);
 
 			y += GetCharacterHeight(FS_SMALL);
 			if (++i == 4) break;
 		}
-		order = order->next;
 	}
 }
 
@@ -1847,7 +1844,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int
 					DrawVehicleImage(vehgroup.vehicles_begin[i], {image_left + WidgetDimensions::scaled.hsep_wide * i, ir.top, image_right, ir.bottom}, selected_vehicle, EIT_IN_LIST, 0);
 				}
 
-				if (show_orderlist) DrawSmallOrderList((vehgroup.vehicles_begin[0])->GetFirstOrder(), olr.left, olr.right, ir.top + GetCharacterHeight(FS_SMALL), this->order_arrow_width);
+				if (show_orderlist) DrawSmallOrderList(*(vehgroup.vehicles_begin[0])->orders, olr.left, olr.right, ir.top + GetCharacterHeight(FS_SMALL), this->order_arrow_width);
 
 				DrawString(ir.left, ir.right, ir.top + WidgetDimensions::scaled.framerect.top, GetString(STR_JUST_COMMA, vehgroup.NumVehicles()), TC_BLACK);
 				break;
@@ -1950,7 +1947,7 @@ public:
 	{
 		switch (widget) {
 			case WID_VL_LIST:
-				resize.height = GetVehicleListHeight(this->vli.vtype, 1);
+				fill.height = resize.height = GetVehicleListHeight(this->vli.vtype, 1);
 
 				switch (this->vli.vtype) {
 					case VEH_TRAIN:
@@ -2173,7 +2170,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_VL_GROUP_BY_PULLDOWN:
@@ -2391,13 +2388,13 @@ extern void DrawRoadVehDetails(const Vehicle *v, const Rect &r);
 extern void DrawShipDetails(const Vehicle *v, const Rect &r);
 extern void DrawAircraftDetails(const Aircraft *v, const Rect &r);
 
-static StringID _service_interval_dropdown_calendar[] = {
+static const StringID _service_interval_dropdown_calendar[] = {
 	STR_VEHICLE_DETAILS_DEFAULT,
 	STR_VEHICLE_DETAILS_DAYS,
 	STR_VEHICLE_DETAILS_PERCENT,
 };
 
-static StringID _service_interval_dropdown_wallclock[] = {
+static const StringID _service_interval_dropdown_wallclock[] = {
 	STR_VEHICLE_DETAILS_DEFAULT,
 	STR_VEHICLE_DETAILS_MINUTES,
 	STR_VEHICLE_DETAILS_PERCENT,
@@ -2506,7 +2503,7 @@ struct VehicleDetailsWindow : Window {
 			}
 
 			case WID_VD_MATRIX:
-				resize.height = std::max<uint>(ScaleGUITrad(14), GetCharacterHeight(FS_NORMAL) + padding.height);
+				fill.height = resize.height = std::max<uint>(ScaleGUITrad(14), GetCharacterHeight(FS_NORMAL) + padding.height);
 				size.height = 4 * resize.height;
 				break;
 
@@ -2667,14 +2664,14 @@ struct VehicleDetailsWindow : Window {
 				/* We're using wallclock units. Show minutes since last serviced. */
 				if (TimerGameEconomy::UsingWallclockUnits()) {
 					int minutes_since_serviced = (TimerGameEconomy::date - v->date_of_last_service).base() / EconomyTime::DAYS_IN_ECONOMY_MONTH;
-					DrawString(tr.left, tr.right, CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)),
+					DrawString(tr.left, tr.right, CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)),
 							GetString(v->ServiceIntervalIsPercent() ? STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT : STR_VEHICLE_DETAILS_SERVICING_INTERVAL_MINUTES,
 									v->GetServiceInterval(), STR_VEHICLE_DETAILS_LAST_SERVICE_MINUTES_AGO, minutes_since_serviced));
 					break;
 				}
 
 				/* We're using calendar dates. Show the date of last service. */
-				DrawString(tr.left, tr.right, CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)),
+				DrawString(tr.left, tr.right, CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)),
 						GetString(v->ServiceIntervalIsPercent() ? STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT : STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS,
 								v->GetServiceInterval(), STR_VEHICLE_DETAILS_LAST_SERVICE_DATE, v->date_of_last_service));
 				break;
@@ -2771,7 +2768,7 @@ struct VehicleDetailsWindow : Window {
 		return false;
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_VD_SERVICE_INTERVAL_DROPDOWN: {
@@ -2873,10 +2870,10 @@ static_assert(VEH_AIRCRAFT == 3);
 
 /** Zoom levels for vehicle views indexed by vehicle type. */
 static const ZoomLevel _vehicle_view_zoom_levels[] = {
-	ZOOM_LVL_TRAIN,
-	ZOOM_LVL_ROADVEH,
-	ZOOM_LVL_SHIP,
-	ZOOM_LVL_AIRCRAFT,
+	ZoomLevel::Train,
+	ZoomLevel::RoadVehicle,
+	ZoomLevel::Ship,
+	ZoomLevel::Aircraft,
 };
 
 /* Constants for geometry of vehicle view viewport */
@@ -3133,7 +3130,7 @@ public:
 
 		if (v->IsInDepot() && v->IsWaitingForUnbunching()) return GetString(STR_VEHICLE_STATUS_WAITING_UNBUNCHING);
 
-		if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) return GetString(STR_VEHICLE_STATUS_TRAIN_STUCK);
+		if (v->type == VEH_TRAIN && Train::From(v)->flags.Test(VehicleRailFlag::Stuck) && !v->current_order.IsType(OT_LOADING)) return GetString(STR_VEHICLE_STATUS_TRAIN_STUCK);
 
 		if (v->type == VEH_AIRCRAFT && HasBit(Aircraft::From(v)->flags, VAF_DEST_TOO_FAR) && !v->current_order.IsType(OT_LOADING)) return GetString(STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR);
 
@@ -3141,7 +3138,7 @@ public:
 		if (mouse_over_start_stop) {
 			if (v->vehstatus.Test(VehState::Stopped)) {
 				text_colour = TC_RED | TC_FORCED;
-			} else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) {
+			} else if (v->type == VEH_TRAIN && Train::From(v)->flags.Test(VehicleRailFlag::Stuck) && !v->current_order.IsType(OT_LOADING)) {
 				text_colour = TC_ORANGE | TC_FORCED;
 			}
 		}
@@ -3212,7 +3209,7 @@ public:
 
 		TextColour text_colour = TC_FROMSTRING;
 		std::string str = GetVehicleStatusString(v, text_colour);
-		DrawString(tr.left, tr.right, CenterBounds(tr.top, tr.bottom, GetCharacterHeight(FS_NORMAL)), str, text_colour, SA_HOR_CENTER);
+		DrawString(tr.left, tr.right, CentreBounds(tr.top, tr.bottom, GetCharacterHeight(FS_NORMAL)), str, text_colour, SA_HOR_CENTER);
 	}
 
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
@@ -3332,8 +3329,9 @@ public:
 		}
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_VV_VIEWPORT) return;
 		if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
 			DoZoomInOutWindow(wheel < 0 ? ZOOM_IN : ZOOM_OUT, this);
 		}
diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h
index d7e3cdb388..d1097c499c 100644
--- a/src/vehicle_gui_base.h
+++ b/src/vehicle_gui_base.h
@@ -164,7 +164,4 @@ struct Sorting {
 	Listing train;
 };
 
-extern std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping;
-extern std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting;
-
 #endif /* VEHICLE_GUI_BASE_H */
diff --git a/src/vehicle_type.h b/src/vehicle_type.h
index 49028c0eac..09aa86d1a1 100644
--- a/src/vehicle_type.h
+++ b/src/vehicle_type.h
@@ -80,4 +80,14 @@ enum EngineImageType : uint8_t {
 	EIT_PREVIEW    = 0x21,  ///< Vehicle drawn in preview window, news, ...
 };
 
+/** Randomisation triggers for vehicles */
+enum class VehicleRandomTrigger : uint8_t {
+	NewCargo, ///< Affected vehicle only: Vehicle is loaded with cargo, after it was empty.
+	Depot, ///< Front vehicle only: Consist arrived in depot.
+	Empty, ///< Front vehicle only: Entire consist is empty.
+	AnyNewCargo, ///< All vehicles in consist: Any vehicle in the consist received new cargo.
+	Callback32, ///< All vehicles in consist: 32 day callback requested rerandomisation
+};
+using VehicleRandomTriggers = EnumBitSet<VehicleRandomTrigger, uint8_t>;
+
 #endif /* VEHICLE_TYPE_H */
diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp
index 1bfebabf54..bf5ac560b8 100644
--- a/src/vehiclelist.cpp
+++ b/src/vehiclelist.cpp
@@ -32,39 +32,6 @@ WindowNumber VehicleListIdentifier::ToWindowNumber() const
 	return c << 28 | this->type << 23 | this->vtype << 26 | this->index;
 }
 
-/** Data for building a depot vehicle list. */
-struct BuildDepotVehicleListData
-{
-	VehicleList *engines; ///< Pointer to list to add vehicles to.
-	VehicleList *wagons; ///< Pointer to list to add wagons to (can be nullptr).
-	VehicleType type; ///< Type of vehicle.
-	bool individual_wagons; ///< If true add every wagon to \a wagons which is not attached to an engine. If false only add the first wagon of every row.
-};
-
-/**
- * Add vehicles to a depot vehicle list.
- * @param v The found vehicle.
- * @param data The depot vehicle list data.
- * @return Always nullptr.
- */
-static Vehicle *BuildDepotVehicleListProc(Vehicle *v, void *data)
-{
-	auto bdvld = static_cast<BuildDepotVehicleListData *>(data);
-	if (v->type != bdvld->type || !v->IsInDepot()) return nullptr;
-
-	if (bdvld->type == VEH_TRAIN) {
-		const Train *t = Train::From(v);
-		if (t->IsArticulatedPart() || t->IsRearDualheaded()) return nullptr;
-		if (bdvld->wagons != nullptr && t->First()->IsFreeWagon()) {
-			if (bdvld->individual_wagons || t->IsFreeWagon()) bdvld->wagons->push_back(t);
-			return nullptr;
-		}
-	}
-
-	if (v->IsPrimaryVehicle()) bdvld->engines->push_back(v);
-	return nullptr;
-};
-
 /**
  * Generate a list of vehicles inside a depot.
  * @param type    Type of vehicle
@@ -78,8 +45,20 @@ void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine
 	engines->clear();
 	if (wagons != nullptr && wagons != engines) wagons->clear();
 
-	BuildDepotVehicleListData bdvld{engines, wagons, type, individual_wagons};
-	FindVehicleOnPos(tile, &bdvld, BuildDepotVehicleListProc);
+	for (Vehicle *v : VehiclesOnTile(tile)) {
+		if (v->type != type || !v->IsInDepot()) continue;
+
+		if (type == VEH_TRAIN) {
+			const Train *t = Train::From(v);
+			if (t->IsArticulatedPart() || t->IsRearDualheaded()) continue;
+			if (wagons != nullptr && t->First()->IsFreeWagon()) {
+				if (individual_wagons || t->IsFreeWagon()) wagons->push_back(t);
+				continue;
+			}
+		}
+
+		if (v->IsPrimaryVehicle()) engines->push_back(v);
+	}
 }
 
 /**
diff --git a/src/vehiclelist_func.h b/src/vehiclelist_func.h
index 3e44610164..2a78fb0470 100644
--- a/src/vehiclelist_func.h
+++ b/src/vehiclelist_func.h
@@ -30,9 +30,9 @@ void FindVehiclesWithOrder(VehiclePredicate veh_pred, OrderPredicate ord_pred, V
 		if (!veh_pred(v)) continue;
 
 		/* Vehicle is a candidate, search for a matching order. */
-		for (const Order *order = orderlist->GetFirstOrder(); order != nullptr; order = order->next) {
+		for (const Order &order : orderlist->GetOrders()) {
 
-			if (!ord_pred(order)) continue;
+			if (!ord_pred(&order)) continue;
 
 			/* An order matches, we can add all shared vehicles to the list. */
 			for (; v != nullptr; v = v->NextShared()) {
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp
index 7f831e0da4..424fafa2a9 100644
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -40,14 +40,13 @@ static FVideoDriver_Allegro iFVideoDriver_Allegro;
 
 static BITMAP *_allegro_screen;
 
-#define MAX_DIRTY_RECTS 100
-static PointDimension _dirty_rects[MAX_DIRTY_RECTS];
-static int _num_dirty_rects;
+static PointDimension _dirty_rects[100];
+static size_t _num_dirty_rects;
 static Palette _local_palette; ///< Current palette to use for drawing.
 
 void VideoDriver_Allegro::MakeDirty(int left, int top, int width, int height)
 {
-	if (_num_dirty_rects < MAX_DIRTY_RECTS) {
+	if (_num_dirty_rects < std::size(_dirty_rects)) {
 		_dirty_rects[_num_dirty_rects].x = left;
 		_dirty_rects[_num_dirty_rects].y = top;
 		_dirty_rects[_num_dirty_rects].width = width;
@@ -60,16 +59,16 @@ void VideoDriver_Allegro::Paint()
 {
 	PerformanceMeasurer framerate(PFE_VIDEO);
 
-	int n = _num_dirty_rects;
+	size_t n = _num_dirty_rects;
 	if (n == 0) return;
 
 	_num_dirty_rects = 0;
-	if (n > MAX_DIRTY_RECTS) {
+	if (n > std::size(_dirty_rects)) {
 		blit(_allegro_screen, screen, 0, 0, 0, 0, _allegro_screen->w, _allegro_screen->h);
 		return;
 	}
 
-	for (int i = 0; i < n; i++) {
+	for (size_t i = 0; i < n; i++) {
 		blit(_allegro_screen, screen, _dirty_rects[i].x, _dirty_rects[i].y, _dirty_rects[i].x, _dirty_rects[i].y, _dirty_rects[i].width, _dirty_rects[i].height);
 	}
 }
@@ -204,7 +203,7 @@ static bool CreateMainSurface(uint w, uint h)
 	_screen.dst_ptr = _allegro_screen->line[0];
 
 	/* Initialise the screen so we don't blit garbage to the screen */
-	memset(_screen.dst_ptr, 0, static_cast<size_t>(_screen.height) * _screen.pitch);
+	std::fill_n(static_cast<std::byte *>(_screen.dst_ptr), static_cast<size_t>(_screen.height) * _screen.pitch, static_cast<std::byte>(0));
 
 	/* Set the mouse at the place where we expect it */
 	poll_mouse();
diff --git a/src/video/cocoa/cocoa_ogl.mm b/src/video/cocoa/cocoa_ogl.mm
index 415b950787..308a4db220 100644
--- a/src/video/cocoa/cocoa_ogl.mm
+++ b/src/video/cocoa/cocoa_ogl.mm
@@ -25,7 +25,6 @@
 #include "../../debug.h"
 #include "../../core/geometry_func.hpp"
 #include "../../core/math_func.hpp"
-#include "../../core/mem_func.hpp"
 #include "cocoa_ogl.h"
 #include "cocoa_wnd.h"
 #include "../../blitter/factory.hpp"
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 48f175921b..d01733f12d 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -247,7 +247,7 @@ void VideoDriver_Cocoa::EditBoxLostFocus()
 {
 	[ [ this->cocoaview inputContext ] performSelectorOnMainThread:@selector(discardMarkedText) withObject:nil waitUntilDone:[ NSThread isMainThread ] ];
 	/* Clear any marked string from the current edit box. */
-	HandleTextInput(nullptr, true);
+	HandleTextInput({}, true);
 }
 
 /**
diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm
index e746ee1e16..99e3dc3f3b 100644
--- a/src/video/cocoa/cocoa_wnd.mm
+++ b/src/video/cocoa/cocoa_wnd.mm
@@ -102,10 +102,10 @@ static OTTDMain *_ottd_main;
  * @param to End of the range.
  * @return Number of UTF-16 code points in the range.
  */
-static NSUInteger CountUtf16Units(const char *from, const char *to)
+static NSUInteger CountUtf16Units(std::string_view str)
 {
 	NSUInteger i = 0;
-	for (char32_t c : Utf8View(std::string_view(from, to))) {
+	for (char32_t c : Utf8View(str)) {
 		i += c < 0x10000 ? 1 : 2; // Watch for surrogate pairs.
 	}
 	return i;
@@ -115,9 +115,9 @@ static NSUInteger CountUtf16Units(const char *from, const char *to)
  * Advance an UTF-8 string by a number of equivalent UTF-16 code points.
  * @param str UTF-8 string.
  * @param count Number of UTF-16 code points to advance the string by.
- * @return Advanced string pointer.
+ * @return Position inside str.
  */
-static const char *Utf8AdvanceByUtf16Units(const char *str, NSUInteger count)
+static size_t Utf8AdvanceByUtf16Units(std::string_view str, NSUInteger count)
 {
 	Utf8View view(str);
 	auto it = view.begin();
@@ -125,7 +125,7 @@ static const char *Utf8AdvanceByUtf16Units(const char *str, NSUInteger count)
 	for (NSUInteger i = 0; it != end && i < count; ++it) {
 		i += *it < 0x10000 ? 1 : 2; // Watch for surrogate pairs.
 	}
-	return str + it.GetByteOffset();
+	return it.GetByteOffset();
 }
 
 /**
@@ -394,7 +394,7 @@ void CocoaExitApplication()
  *
  * @note This is needed since sometimes assert is called before the videodriver is initialized .
  */
-void CocoaDialog(const char *title, const char *message, const char *buttonLabel)
+void CocoaDialog(std::string_view title, std::string_view message, std::string_view buttonLabel)
 {
 	_cocoa_video_dialog = true;
 
@@ -413,9 +413,9 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 #else
 		[ alert setAlertStyle: NSCriticalAlertStyle ];
 #endif
-		[ alert setMessageText:[ NSString stringWithUTF8String:title ] ];
-		[ alert setInformativeText:[ NSString stringWithUTF8String:message ] ];
-		[ alert addButtonWithTitle: [ NSString stringWithUTF8String:buttonLabel ] ];
+		[ alert setMessageText:[ [ NSString alloc ] initWithBytes:title.data() length:title.size() encoding:NSUTF8StringEncoding ] ];
+		[ alert setInformativeText:[ [ NSString alloc ] initWithBytes:message.data() length:message.size() encoding:NSUTF8StringEncoding ] ];
+		[ alert addButtonWithTitle: [ [ NSString alloc ] initWithBytes:buttonLabel.data() length:buttonLabel.size() encoding:NSUTF8StringEncoding ] ];
 		[ alert runModal ];
 		[ alert release ];
 	}
@@ -462,7 +462,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 		[ self setContentMinSize:NSMakeSize(64.0f, 64.0f) ];
 
 		std::string caption = VideoDriver::GetCaption();
-		NSString *nsscaption = [ [ NSString alloc ] initWithUTF8String:caption.c_str() ];
+		NSString *nsscaption = [ [ NSString alloc ] initWithBytes:caption.data() length:caption.size() encoding:NSUTF8StringEncoding ];
 		[ self setTitle:nsscaption ];
 		[ self setMiniwindowTitle:nsscaption ];
 		[ nsscaption release ];
@@ -940,16 +940,17 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 
 	NSString *s = [ aString isKindOfClass:[ NSAttributedString class ] ] ? [ aString string ] : (NSString *)aString;
 
-	const char *insert_point = nullptr;
-	const char *replace_range = nullptr;
+	std::optional<size_t> insert_point;
+	std::optional<size_t> replace_range;
 	if (replacementRange.location != NSNotFound) {
 		/* Calculate the part to be replaced. */
-		insert_point = Utf8AdvanceByUtf16Units(_focused_window->GetFocusedTextbuf()->GetText(), replacementRange.location);
-		replace_range = Utf8AdvanceByUtf16Units(insert_point, replacementRange.length);
+		std::string_view focused_text{_focused_window->GetFocusedTextbuf()->GetText()};
+		insert_point = Utf8AdvanceByUtf16Units(focused_text, replacementRange.location);
+		replace_range = *insert_point + Utf8AdvanceByUtf16Units(focused_text.substr(*insert_point), replacementRange.length);
 	}
 
-	HandleTextInput(nullptr, true);
-	HandleTextInput([ s UTF8String ], false, nullptr, insert_point, replace_range);
+	HandleTextInput({}, true);
+	HandleTextInput([ s UTF8String ], false, std::nullopt, insert_point, replace_range);
 }
 
 /** Insert the given text at the caret. */
@@ -967,17 +968,18 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 
 	const char *utf8 = [ s UTF8String ];
 	if (utf8 != nullptr) {
-		const char *insert_point = nullptr;
-		const char *replace_range = nullptr;
+		std::optional<size_t> insert_point;
+		std::optional<size_t> replace_range;
 		if (replacementRange.location != NSNotFound) {
 			/* Calculate the part to be replaced. */
 			NSRange marked = [ self markedRange ];
-			insert_point = Utf8AdvanceByUtf16Units(_focused_window->GetFocusedTextbuf()->GetText(), replacementRange.location + (marked.location != NSNotFound ? marked.location : 0u));
-			replace_range = Utf8AdvanceByUtf16Units(insert_point, replacementRange.length);
+			std::string_view focused_text{_focused_window->GetFocusedTextbuf()->GetText()};
+			insert_point = Utf8AdvanceByUtf16Units(focused_text, replacementRange.location + (marked.location != NSNotFound ? marked.location : 0u));
+			replace_range = *insert_point + Utf8AdvanceByUtf16Units(focused_text.substr(*insert_point), replacementRange.length);
 		}
 
 		/* Convert caret index into a pointer in the UTF-8 string. */
-		const char *selection = Utf8AdvanceByUtf16Units(utf8, selRange.location);
+		size_t selection = Utf8AdvanceByUtf16Units(utf8, selRange.location);
 
 		HandleTextInput(utf8, true, selection, insert_point, replace_range);
 	}
@@ -992,7 +994,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 /** Unmark the current marked text. */
 - (void)unmarkText
 {
-	HandleTextInput(nullptr, true);
+	HandleTextInput({}, true);
 }
 
 /** Get the caret position. */
@@ -1001,8 +1003,8 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 	if (!EditBoxInGlobalFocus()) return NSMakeRange(NSNotFound, 0);
 
 	const Textbuf *text_buf = _focused_window->GetFocusedTextbuf();
-	const char *text = text_buf->GetText();
-	NSUInteger start = CountUtf16Units(text, text + text_buf->caretpos);
+	std::string_view text = text_buf->GetText();
+	NSUInteger start = CountUtf16Units(text.substr(0, text_buf->caretpos));
 	return NSMakeRange(start, 0);
 }
 
@@ -1013,10 +1015,9 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 
 	const Textbuf *text_buf = _focused_window->GetFocusedTextbuf();
 	if (text_buf->markend != 0) {
-		const char *text = text_buf->GetText();
-		const char *mark = text + text_buf->markpos;
-		NSUInteger start = CountUtf16Units(text, mark);
-		NSUInteger len = CountUtf16Units(mark, text + text_buf->markend);
+		std::string_view text = text_buf->GetText();
+		NSUInteger start = CountUtf16Units(text.substr(0, text_buf->markpos));
+		NSUInteger len = CountUtf16Units(text.substr(text_buf->markpos, text_buf->markend - text_buf->markpos));
 
 		return NSMakeRange(start, len);
 	}
@@ -1037,7 +1038,8 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 {
 	if (!EditBoxInGlobalFocus()) return nil;
 
-	NSString *s = [ NSString stringWithUTF8String:_focused_window->GetFocusedTextbuf()->GetText() ];
+	auto text = _focused_window->GetFocusedTextbuf()->GetText();
+	NSString *s = [ [ NSString alloc] initWithBytes:text.data() length:text.size() encoding:NSUTF8StringEncoding ];
 	NSRange valid_range = NSIntersectionRange(NSMakeRange(0, [ s length ]), theRange);
 
 	if (actualRange != nullptr) *actualRange = valid_range;
@@ -1057,7 +1059,8 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 {
 	if (!EditBoxInGlobalFocus()) return [ [ [ NSAttributedString alloc ] initWithString:@"" ] autorelease ];
 
-	return [ [ [ NSAttributedString alloc ] initWithString:[ NSString stringWithUTF8String:_focused_window->GetFocusedTextbuf()->GetText() ] ] autorelease ];
+	auto text = _focused_window->GetFocusedTextbuf()->GetText();
+	return [ [ [ NSAttributedString alloc ] initWithString:[ [ NSString alloc ] initWithBytes:text.data() length:text.size() encoding:NSUTF8StringEncoding ] ] autorelease ];
 }
 
 /** Get the character that is rendered at the given point. */
@@ -1073,7 +1076,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 	if (index == -1) return NSNotFound;
 
 	auto text = _focused_window->GetFocusedTextbuf()->GetText();
-	return CountUtf16Units(text, text + index);
+	return CountUtf16Units(text.substr(0, index));
 }
 
 /** Get the bounding rect for the given range. */
@@ -1081,10 +1084,10 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 {
 	if (!EditBoxInGlobalFocus()) return NSMakeRect(0, 0, 0, 0);
 
-	const char *focused_text = _focused_window->GetFocusedTextbuf()->GetText();
+	std::string_view focused_text = _focused_window->GetFocusedTextbuf()->GetText();
 	/* Convert range to UTF-8 string pointers. */
-	const char *start = Utf8AdvanceByUtf16Units(focused_text, aRange.location);
-	const char *end = aRange.length != 0 ? Utf8AdvanceByUtf16Units(focused_text, aRange.location + aRange.length) : start;
+	size_t start = Utf8AdvanceByUtf16Units(focused_text, aRange.location);
+	size_t end = start + Utf8AdvanceByUtf16Units(focused_text.substr(start), aRange.length);
 
 	/* Get the bounding rect for the text range.*/
 	Rect r = _focused_window->GetTextBoundingRect(start, end);
diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp
index 561324d6f1..008d3f998d 100644
--- a/src/video/opengl.cpp
+++ b/src/video/opengl.cpp
@@ -34,6 +34,7 @@
 #include "../debug.h"
 #include "../blitter/factory.hpp"
 #include "../zoom_func.h"
+#include "../core/string_consumer.hpp"
 
 #include "../table/opengl_shader.h"
 #include "../table/sprites.h"
@@ -132,30 +133,28 @@ static const int MAX_CACHED_CURSORS = 48;
 
 GetOGLProcAddressProc GetOGLProcAddress;
 
+static std::optional<std::string_view> GlGetString(GLenum name)
+{
+	auto str = reinterpret_cast<const char *>(_glGetString(name));
+	if (str == nullptr) return {};
+	return str;
+}
+
 /**
  * Find a substring in a string made of space delimited elements. The substring
  * has to match the complete element, partial matches don't count.
  * @param string List of space delimited elements.
  * @param substring Substring to find.
- * @return Pointer to the start of the match or nullptr if the substring is not present.
+ * @return Whether the substring was found.
  */
-const char *FindStringInExtensionList(const char *string, const char *substring)
+bool HasStringInExtensionList(std::string_view string, std::string_view substring)
 {
-	while (true) {
-		/* Is the extension string present at all? */
-		const char *pos = strstr(string, substring);
-		if (pos == nullptr) break;
-
-		/* Is this a real match, i.e. are the chars before and after the matched string
-		 * indeed spaces (or the start or end of the string, respectively)? */
-		const char *end = pos + strlen(substring);
-		if ((pos == string || pos[-1] == ' ') && (*end == ' ' || *end == '\0')) return pos;
-
-		/* False hit, try again for the remaining string. */
-		string = end;
+	StringConsumer consumer{string};
+	while (consumer.AnyBytesLeft()) {
+		if (substring == consumer.ReadUntil(" ", StringConsumer::SKIP_ALL_SEPARATORS)) return true;
 	}
 
-	return nullptr;
+	return false;
 }
 
 /**
@@ -163,7 +162,7 @@ const char *FindStringInExtensionList(const char *string, const char *substring)
  * @param extension The extension string to test.
  * @return True if the extension is supported, false if not.
  */
-static bool IsOpenGLExtensionSupported(const char *extension)
+static bool IsOpenGLExtensionSupported(std::string_view extension)
 {
 	static PFNGLGETSTRINGIPROC glGetStringi = nullptr;
 	static bool glGetStringi_loaded = false;
@@ -181,12 +180,12 @@ static bool IsOpenGLExtensionSupported(const char *extension)
 		_glGetIntegerv(GL_NUM_EXTENSIONS, &num_exts);
 
 		for (GLint i = 0; i < num_exts; i++) {
-			const char *entry = (const char *)glGetStringi(GL_EXTENSIONS, i);
-			if (strcmp(entry, extension) == 0) return true;
+			const char *entry = reinterpret_cast<const char *>(glGetStringi(GL_EXTENSIONS, i));
+			if (entry != nullptr && entry == extension) return true;
 		}
-	} else {
+	} else if (auto str = GlGetString(GL_EXTENSIONS); str.has_value()) {
 		/* Old style: A single, space-delimited string for all extensions. */
-		return FindStringInExtensionList((const char *)_glGetString(GL_EXTENSIONS), extension) != nullptr;
+		return HasStringInExtensionList(*str, extension);
 	}
 
 	return false;
@@ -406,7 +405,7 @@ static bool BindPersistentBufferExtensions()
 void APIENTRY DebugOutputCallback([[maybe_unused]] GLenum source, GLenum type, [[maybe_unused]] GLuint id, GLenum severity, [[maybe_unused]] GLsizei length, const GLchar *message, [[maybe_unused]] const void *userParam)
 {
 	/* Make severity human readable. */
-	const char *severity_str = "";
+	std::string_view severity_str;
 	switch (severity) {
 		case GL_DEBUG_SEVERITY_HIGH:   severity_str = "high"; break;
 		case GL_DEBUG_SEVERITY_MEDIUM: severity_str = "medium"; break;
@@ -414,7 +413,7 @@ void APIENTRY DebugOutputCallback([[maybe_unused]] GLenum source, GLenum type, [
 	}
 
 	/* Make type human readable.*/
-	const char *type_str = "Other";
+	std::string_view type_str = "Other";
 	switch (type) {
 		case GL_DEBUG_TYPE_ERROR:               type_str = "Error"; break;
 		case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: type_str = "Deprecated"; break;
@@ -515,6 +514,14 @@ OpenGLBackend::~OpenGLBackend()
 	}
 }
 
+static std::tuple<uint8_t, uint8_t> DecodeVersion(std::string_view ver)
+{
+	StringConsumer consumer{ver};
+	int major = consumer.ReadIntegerBase<uint8_t>(10);
+	if (consumer.ReadIf(".")) return {major, consumer.ReadIntegerBase<uint8_t>(10)};
+	return {major, 0};
+}
+
 /**
  * Check for the needed OpenGL functionality and allocate all resources.
  * @param screen_res Current display resolution.
@@ -525,23 +532,21 @@ std::optional<std::string_view> OpenGLBackend::Init(const Dimension &screen_res)
 	if (!BindBasicInfoProcs()) return "OpenGL not supported";
 
 	/* Always query the supported OpenGL version as the current context might have changed. */
-	const char *ver = (const char *)_glGetString(GL_VERSION);
-	const char *vend = (const char *)_glGetString(GL_VENDOR);
-	const char *renderer = (const char *)_glGetString(GL_RENDERER);
+	auto ver = GlGetString(GL_VERSION);
+	auto vend = GlGetString(GL_VENDOR);
+	auto renderer = GlGetString(GL_RENDERER);
 
-	if (ver == nullptr || vend == nullptr || renderer == nullptr) return "OpenGL not supported";
+	if (!ver.has_value() || !vend.has_value() || !renderer.has_value()) return "OpenGL not supported";
 
-	Debug(driver, 1, "OpenGL driver: {} - {} ({})", vend, renderer, ver);
+	Debug(driver, 1, "OpenGL driver: {} - {} ({})", *vend, *renderer, *ver);
 
 #ifndef GL_ALLOW_SOFTWARE_RENDERER
 	/* Don't use MESA software rendering backends as they are slower than
 	 * just using a non-OpenGL video driver. */
-	if (strncmp(renderer, "llvmpipe", 8) == 0 || strncmp(renderer, "softpipe", 8) == 0) return "Software renderer detected, not using OpenGL";
+	if (renderer->starts_with("llvmpipe") || renderer->starts_with("softpipe")) return "Software renderer detected, not using OpenGL";
 #endif
 
-	const char *minor = strchr(ver, '.');
-	_gl_major_ver = atoi(ver);
-	_gl_minor_ver = minor != nullptr ? atoi(minor + 1) : 0;
+	std::tie(_gl_major_ver, _gl_minor_ver) = DecodeVersion(*ver);
 
 #ifdef _WIN32
 	/* Old drivers on Windows (especially if made by Intel) seem to be
@@ -594,7 +599,7 @@ std::optional<std::string_view> OpenGLBackend::Init(const Dimension &screen_res)
 	_glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_tex_units);
 	if (max_tex_units < 4) return "Not enough simultaneous textures supported";
 
-	Debug(driver, 2, "OpenGL shading language version: {}, texture units = {}", (const char *)_glGetString(GL_SHADING_LANGUAGE_VERSION), (int)max_tex_units);
+	Debug(driver, 2, "OpenGL shading language version: {}, texture units = {}", GlGetString(GL_SHADING_LANGUAGE_VERSION).value_or("Unknown version"), max_tex_units);
 
 	if (!this->InitShaders()) return "Failed to initialize shaders";
 
@@ -695,7 +700,7 @@ std::optional<std::string_view> OpenGLBackend::Init(const Dimension &screen_res)
 	/* Prime vertex buffer with a full-screen quad and store
 	 * the corresponding state in a vertex array object. */
 	static const Simple2DVertex vert_array[] = {
-		//  x     y    u    v
+		/*  x     y    u    v */
 		{  1.f, -1.f, 1.f, 1.f },
 		{  1.f,  1.f, 1.f, 0.f },
 		{ -1.f, -1.f, 0.f, 1.f },
@@ -741,12 +746,10 @@ void OpenGLBackend::PrepareContext()
 
 std::string OpenGLBackend::GetDriverName()
 {
-	std::string res{};
+	auto renderer = GlGetString(GL_RENDERER);
+	auto version = GlGetString(GL_VERSION);
 	/* Skipping GL_VENDOR as it tends to be "obvious" from the renderer and version data, and just makes the string pointlessly longer */
-	res += reinterpret_cast<const char *>(_glGetString(GL_RENDERER));
-	res += ", ";
-	res += reinterpret_cast<const char *>(_glGetString(GL_VERSION));
-	return res;
+	return fmt::format("{}, {}", renderer.value_or("Unknown renderer"), version.value_or("Unknown version"));
 }
 
 /**
@@ -801,11 +804,10 @@ static bool VerifyProgram(GLuint program)
  */
 bool OpenGLBackend::InitShaders()
 {
-	const char *ver = (const char *)_glGetString(GL_SHADING_LANGUAGE_VERSION);
-	if (ver == nullptr) return false;
+	auto ver = GlGetString(GL_SHADING_LANGUAGE_VERSION);
+	if (!ver.has_value()) return false;
 
-	int glsl_major  = ver[0] - '0';
-	int glsl_minor = ver[2] - '0';
+	auto [glsl_major, glsl_minor] = DecodeVersion(*ver);
 
 	bool glsl_150 = (IsOpenGLVersionAtLeast(3, 2) || glsl_major > 1 || (glsl_major == 1 && glsl_minor >= 5)) && _glBindFragDataLocation != nullptr;
 
@@ -1075,7 +1077,7 @@ void OpenGLBackend::DrawMouseCursor()
 	for (const auto &cs : this->cursor_sprites) {
 		/* Sprites are cached by PopulateCursorCache(). */
 		if (this->cursor_cache.Contains(cs.image.sprite)) {
-			OpenGLSprite *spr = this->cursor_cache.Get(cs.image.sprite);
+			const OpenGLSprite *spr = this->cursor_cache.Get(cs.image.sprite).get();
 
 			this->RenderOglSprite(spr, cs.image.pal,
 					this->cursor_pos.x + cs.pos.x + UnScaleByZoom(spr->x_offs, ZOOM_LVL_GUI),
@@ -1087,10 +1089,10 @@ void OpenGLBackend::DrawMouseCursor()
 
 class OpenGLSpriteAllocator : public SpriteAllocator {
 public:
-	LRUCache<SpriteID, OpenGLSprite> &lru;
+	OpenGLSpriteLRUCache &lru;
 	SpriteID sprite;
 
-	OpenGLSpriteAllocator(LRUCache<SpriteID, OpenGLSprite> &lru, SpriteID sprite) : lru(lru), sprite(sprite) {}
+	OpenGLSpriteAllocator(OpenGLSpriteLRUCache &lru, SpriteID sprite) : lru(lru), sprite(sprite) {}
 protected:
 	void *AllocatePtr(size_t) override { NOT_REACHED(); }
 };
@@ -1256,11 +1258,11 @@ void OpenGLBackend::ReleaseAnimBuffer(const Rect &update_rect)
 	}
 }
 
-/* virtual */ Sprite *OpenGLBackend::Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
+/* virtual */ Sprite *OpenGLBackend::Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator)
 {
 	/* This encoding is only called for mouse cursors. We don't need real sprites but OpenGLSprites to show as cursor. These need to be put in the LRU cache. */
 	OpenGLSpriteAllocator &gl_allocator = static_cast<OpenGLSpriteAllocator&>(allocator);
-	gl_allocator.lru.Insert(gl_allocator.sprite, std::make_unique<OpenGLSprite>(sprite));
+	gl_allocator.lru.Insert(gl_allocator.sprite, std::make_unique<OpenGLSprite>(sprite_type, sprite));
 
 	return nullptr;
 }
@@ -1272,7 +1274,7 @@ void OpenGLBackend::ReleaseAnimBuffer(const Rect &update_rect)
  * @param y Y position of the sprite.
  * @param zoom Zoom level to use.
  */
-void OpenGLBackend::RenderOglSprite(OpenGLSprite *gl_sprite, PaletteID pal, int x, int y, ZoomLevel zoom)
+void OpenGLBackend::RenderOglSprite(const OpenGLSprite *gl_sprite, PaletteID pal, int x, int y, ZoomLevel zoom)
 {
 	/* Set textures. */
 	bool rgb = gl_sprite->BindTextures();
@@ -1395,10 +1397,15 @@ void OpenGLBackend::RenderOglSprite(OpenGLSprite *gl_sprite, PaletteID pal, int
  * Create an OpenGL sprite with a palette remap part.
  * @param sprite The sprite to create the OpenGL sprite for
  */
-OpenGLSprite::OpenGLSprite(const SpriteLoader::SpriteCollection &sprite) :
-	dim(sprite[ZOOM_LVL_MIN].width, sprite[ZOOM_LVL_MIN].height), x_offs(sprite[ZOOM_LVL_MIN].x_offs), y_offs(sprite[ZOOM_LVL_MIN].y_offs)
+OpenGLSprite::OpenGLSprite(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite)
 {
-	int levels = sprite[ZOOM_LVL_MIN].type == SpriteType::Font ? 1 : ZOOM_LVL_END;
+	const auto &root_sprite = sprite.Root();
+	this->dim.width = root_sprite.width;
+	this->dim.height = root_sprite.height;
+	this->x_offs = root_sprite.x_offs;
+	this->y_offs = root_sprite.y_offs;
+
+	int levels = sprite_type == SpriteType::Font ? 1 : to_underlying(ZoomLevel::End);
 	assert(levels > 0);
 	(void)_glGetError();
 
@@ -1408,8 +1415,8 @@ OpenGLSprite::OpenGLSprite(const SpriteLoader::SpriteCollection &sprite) :
 
 	for (int t = TEX_RGBA; t < NUM_TEX; t++) {
 		/* Sprite component present? */
-		if (t == TEX_RGBA && sprite[ZOOM_LVL_MIN].colours == SpriteComponent::Palette) continue;
-		if (t == TEX_REMAP && !sprite[ZOOM_LVL_MIN].colours.Test(SpriteComponent::Palette)) continue;
+		if (t == TEX_RGBA && root_sprite.colours == SpriteComponent::Palette) continue;
+		if (t == TEX_REMAP && !root_sprite.colours.Test(SpriteComponent::Palette)) continue;
 
 		/* Allocate texture. */
 		_glGenTextures(1, &this->tex[t]);
@@ -1433,8 +1440,9 @@ OpenGLSprite::OpenGLSprite(const SpriteLoader::SpriteCollection &sprite) :
 	}
 
 	/* Upload texture data. */
-	for (int i = 0; i < (sprite[ZOOM_LVL_MIN].type == SpriteType::Font ? 1 : ZOOM_LVL_END); i++) {
-		this->Update(sprite[i].width, sprite[i].height, i, sprite[i].data);
+	for (ZoomLevel zoom = ZoomLevel::Min; zoom <= (sprite_type == SpriteType::Font ? ZoomLevel::Min : ZoomLevel::Max); ++zoom) {
+		const auto &src_sprite = sprite[zoom];
+		this->Update(src_sprite.width, src_sprite.height, to_underlying(zoom), src_sprite.data);
 	}
 
 	assert(_glGetError() == GL_NO_ERROR);
@@ -1510,7 +1518,7 @@ inline Dimension OpenGLSprite::GetSize(ZoomLevel level) const
  * Bind textures for rendering this sprite.
  * @return True if the sprite has RGBA data.
  */
-bool OpenGLSprite::BindTextures()
+bool OpenGLSprite::BindTextures() const
 {
 	_glActiveTexture(GL_TEXTURE0);
 	_glBindTexture(GL_TEXTURE_2D, this->tex[TEX_RGBA] != 0 ? this->tex[TEX_RGBA] : OpenGLSprite::dummy_tex[TEX_RGBA]);
diff --git a/src/video/opengl.h b/src/video/opengl.h
index 7de533abdb..75515f7210 100644
--- a/src/video/opengl.h
+++ b/src/video/opengl.h
@@ -19,10 +19,12 @@ typedef void (*OGLProc)();
 typedef OGLProc (*GetOGLProcAddressProc)(const char *proc);
 
 bool IsOpenGLVersionAtLeast(uint8_t major, uint8_t minor);
-const char *FindStringInExtensionList(const char *string, const char *substring);
+bool HasStringInExtensionList(std::string_view string, std::string_view substring);
 
 class OpenGLSprite;
 
+using OpenGLSpriteLRUCache = LRUCache<SpriteID, std::unique_ptr<OpenGLSprite>>;
+
 /** Platform-independent back-end class for OpenGL video drivers. */
 class OpenGLBackend : public SpriteEncoder {
 private:
@@ -58,7 +60,7 @@ private:
 	GLint  sprite_rgb_loc = 0; ///< Uniform location for RGB mode flag.
 	GLint  sprite_crash_loc = 0; ///< Uniform location for crash remap mode flag.
 
-	LRUCache<SpriteID, OpenGLSprite> cursor_cache; ///< Cache of encoded cursor sprites.
+	OpenGLSpriteLRUCache cursor_cache; ///< Cache of encoded cursor sprites.
 	PaletteID last_sprite_pal = (PaletteID)-1; ///< Last uploaded remap palette.
 	bool clear_cursor_cache = false; ///< A clear of the cursor cache is pending.
 
@@ -74,7 +76,7 @@ private:
 
 	void InternalClearCursorCache();
 
-	void RenderOglSprite(OpenGLSprite *gl_sprite, PaletteID pal, int x, int y, ZoomLevel zoom);
+	void RenderOglSprite(const OpenGLSprite *gl_sprite, PaletteID pal, int x, int y, ZoomLevel zoom);
 
 public:
 	/** Get singleton instance of this class. */
@@ -105,8 +107,8 @@ public:
 	/* SpriteEncoder */
 
 	bool Is32BppSupported() override { return true; }
-	uint GetSpriteAlignment() override { return 1u << (ZOOM_LVL_END - 1); }
-	Sprite *Encode(const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
+	uint GetSpriteAlignment() override { return 1u << to_underlying(ZoomLevel::Max); }
+	Sprite *Encode(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite, SpriteAllocator &allocator) override;
 };
 
 
@@ -134,10 +136,10 @@ private:
 	static bool Create();
 	static void Destroy();
 
-	bool BindTextures();
+	bool BindTextures() const;
 
 public:
-	OpenGLSprite(const SpriteLoader::SpriteCollection &sprite);
+	OpenGLSprite(SpriteType sprite_type, const SpriteLoader::SpriteCollection &sprite);
 
 	/* No support for moving/copying the textures is implemented. */
 	OpenGLSprite(const OpenGLSprite&) = delete;
diff --git a/src/video/sdl2_default_v.cpp b/src/video/sdl2_default_v.cpp
index 45108ac36d..b7e94dae48 100644
--- a/src/video/sdl2_default_v.cpp
+++ b/src/video/sdl2_default_v.cpp
@@ -18,7 +18,6 @@
 #include "../progress.h"
 #include "../core/random_func.hpp"
 #include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
 #include "../core/geometry_func.hpp"
 #include "../fileio_func.h"
 #include "../framerate_type.h"
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index 799f05c960..7f4312a289 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -15,7 +15,6 @@
 #include "../progress.h"
 #include "../core/random_func.hpp"
 #include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
 #include "../core/geometry_func.hpp"
 #include "../core/utf8.hpp"
 #include "../fileio_func.h"
@@ -471,8 +470,8 @@ bool VideoDriver_SDL_Base::PollEvent()
 				char32_t character;
 
 				uint keycode = ConvertSdlKeyIntoMy(&ev.key.keysym, &character);
-				// Only handle non-text keys here. Text is handled in
-				// SDL_TEXTINPUT below.
+				/* Only handle non-text keys here. Text is handled in
+				 * SDL_TEXTINPUT below. */
 				if (!this->edit_box_focused ||
 					keycode == WKC_DELETE ||
 					keycode == WKC_NUM_ENTER ||
@@ -507,19 +506,19 @@ bool VideoDriver_SDL_Base::PollEvent()
 		}
 		case SDL_WINDOWEVENT: {
 			if (ev.window.event == SDL_WINDOWEVENT_EXPOSED) {
-				// Force a redraw of the entire screen.
+				/* Force a redraw of the entire screen. */
 				this->MakeDirty(0, 0, _screen.width, _screen.height);
 			} else if (ev.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
 				int w = std::max(ev.window.data1, 64);
 				int h = std::max(ev.window.data2, 64);
 				CreateMainSurface(w, h, w != ev.window.data1 || h != ev.window.data2);
 			} else if (ev.window.event == SDL_WINDOWEVENT_ENTER) {
-				// mouse entered the window, enable cursor
+				/* mouse entered the window, enable cursor */
 				_cursor.in_window = true;
 				/* Ensure pointer lock will not occur. */
 				SDL_SetRelativeMouseMode(SDL_FALSE);
 			} else if (ev.window.event == SDL_WINDOWEVENT_LEAVE) {
-				// mouse left the window, undraw cursor
+				/* mouse left the window, undraw cursor */
 				UndrawMouseCursor();
 				_cursor.in_window = false;
 			}
diff --git a/src/video/video_driver.cpp b/src/video/video_driver.cpp
index 32d6ed9725..ba0997b3d9 100644
--- a/src/video/video_driver.cpp
+++ b/src/video/video_driver.cpp
@@ -22,6 +22,8 @@
 #include "../window_func.h"
 #include "video_driver.hpp"
 
+#include "../safeguards.h"
+
 bool _video_hw_accel; ///< Whether to consider hardware accelerated video drivers on startup.
 bool _video_vsync; ///< Whether we should use vsync (only if active video driver supports HW acceleration).
 
diff --git a/src/video/video_driver.hpp b/src/video/video_driver.hpp
index d79d4c393c..c6229da341 100644
--- a/src/video/video_driver.hpp
+++ b/src/video/video_driver.hpp
@@ -10,6 +10,7 @@
 #ifndef VIDEO_VIDEO_DRIVER_HPP
 #define VIDEO_VIDEO_DRIVER_HPP
 
+#include "../debug.h"
 #include "../driver.h"
 #include "../core/geometry_type.hpp"
 #include "../core/math_func.hpp"
@@ -318,6 +319,8 @@ protected:
 		if (_ddc_fastforward) return std::chrono::microseconds(0);
 #endif /* DEBUG_DUMP_COMMANDS */
 
+		TicToc::Tick("GameTick");
+
 		/* If we are paused, run on normal speed. */
 		if (_pause_mode.Any()) return std::chrono::milliseconds(MILLISECONDS_PER_TICK);
 		/* Infinite speed, as quickly as you can. */
@@ -328,6 +331,8 @@ protected:
 
 	std::chrono::steady_clock::duration GetDrawInterval()
 	{
+		TicToc::Tick("DrawTick");
+
 		/* If vsync, draw interval is decided by the display driver */
 		if (_video_vsync && this->uses_hardware_acceleration) return std::chrono::microseconds(0);
 		return std::chrono::microseconds(1000000 / _settings_client.gui.refresh_rate);
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index c692ff9fc2..798a2dc475 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -152,9 +152,7 @@ bool VideoDriver_Win32Base::MakeWindow(bool full_screen, bool resize)
 	}
 
 	if (full_screen) {
-		DEVMODE settings;
-
-		memset(&settings, 0, sizeof(settings));
+		DEVMODE settings{};
 		settings.dmSize = sizeof(settings);
 		settings.dmFields =
 			DM_BITSPERPEL |
@@ -346,8 +344,8 @@ static LRESULT HandleIMEComposition(HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 			/* Transmit text to windowing system. */
 			if (len > 0) {
-				HandleTextInput(nullptr, true); // Clear marked string.
-				HandleTextInput(FS2OTTD(str).c_str());
+				HandleTextInput({}, true); // Clear marked string.
+				HandleTextInput(FS2OTTD(str));
 			}
 			SetCompositionPos(hwnd);
 
@@ -364,7 +362,7 @@ static LRESULT HandleIMEComposition(HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 			if (len > 0) {
 				static char utf8_buf[1024];
-				convert_from_fs(str.c_str(), utf8_buf);
+				convert_from_fs(str, utf8_buf);
 
 				/* Convert caret position from bytes in the input string to a position in the UTF-8 encoded string. */
 				LONG caret_bytes = ImmGetCompositionString(hIMC, GCS_CURSORPOS, nullptr, 0);
@@ -380,9 +378,9 @@ static LRESULT HandleIMEComposition(HWND hwnd, WPARAM wParam, LPARAM lParam)
 					++caret;
 				}
 
-				HandleTextInput(utf8_buf, true, utf8_buf + caret.GetByteOffset());
+				HandleTextInput(utf8_buf, true, caret.GetByteOffset());
 			} else {
-				HandleTextInput(nullptr, true);
+				HandleTextInput({}, true);
 			}
 
 			lParam &= ~(GCS_COMPSTR | GCS_COMPATTR | GCS_COMPCLAUSE | GCS_CURSORPOS | GCS_DELTASTART);
@@ -400,7 +398,7 @@ static void CancelIMEComposition(HWND hwnd)
 	if (hIMC != nullptr) ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
 	ImmReleaseContext(hwnd, hIMC);
 	/* Clear any marked string from the current edit box. */
-	HandleTextInput(nullptr, true);
+	HandleTextInput({}, true);
 }
 
 static bool IsDarkModeEnabled()
@@ -442,7 +440,7 @@ static void SetDarkModeForWindow(HWND hWnd, bool dark_mode)
 	 * reason, the code uses dynamic loading and ignores any errors for a best-effort result. */
 	static LibraryLoader _dwmapi("dwmapi.dll");
 	typedef HRESULT(WINAPI *PFNDWMSETWINDOWATTRIBUTE)(HWND, DWORD, LPCVOID, DWORD);
-	static PFNDWMSETWINDOWATTRIBUTE DwmSetWindowAttribute = _dwmapi.GetFunction("DwmSetWindowAttribute");
+	static const PFNDWMSETWINDOWATTRIBUTE DwmSetWindowAttribute = _dwmapi.GetFunction("DwmSetWindowAttribute");
 
 	if (DwmSetWindowAttribute != nullptr) {
 		/* Contrary to the published documentation, DWMWA_USE_IMMERSIVE_DARK_MODE does not change the
@@ -597,7 +595,7 @@ LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
 		case WM_IME_ENDCOMPOSITION:
 			/* Clear any pending composition string. */
-			HandleTextInput(nullptr, true);
+			HandleTextInput({}, true);
 			if (DrawIMECompositionString()) return 0;
 			break;
 
@@ -1379,13 +1377,13 @@ static void LoadWGLExtensions()
 			/* Get list of WGL extensions. */
 			PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
 			if (wglGetExtensionsStringARB != nullptr) {
-				const char *wgl_exts = wglGetExtensionsStringARB(dc);
+				std::string_view wgl_exts = wglGetExtensionsStringARB(dc);
 				/* Bind supported functions. */
-				if (FindStringInExtensionList(wgl_exts, "WGL_ARB_create_context") != nullptr) {
+				if (HasStringInExtensionList(wgl_exts, "WGL_ARB_create_context")) {
 					_wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)wglGetProcAddress("wglCreateContextAttribsARB");
 				}
-				_hasWGLARBCreateContextProfile = FindStringInExtensionList(wgl_exts, "WGL_ARB_create_context_profile") != nullptr;
-				if (FindStringInExtensionList(wgl_exts, "WGL_EXT_swap_control") != nullptr) {
+				_hasWGLARBCreateContextProfile = HasStringInExtensionList(wgl_exts, "WGL_ARB_create_context_profile");
+				if (HasStringInExtensionList(wgl_exts, "WGL_EXT_swap_control")) {
 					_wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
 				}
 			}
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 01d6c70897..4699990cce 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -227,7 +227,7 @@ void InitializeWindowViewport(Window *w, int x, int y,
 	vp->width = width;
 	vp->height = height;
 
-	vp->zoom = static_cast<ZoomLevel>(Clamp(zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max));
+	vp->zoom = Clamp(zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
 
 	vp->virtual_width = ScaleByZoom(width, zoom);
 	vp->virtual_height = ScaleByZoom(height, zoom);
@@ -1352,7 +1352,7 @@ static Rect ExpandRectWithViewportSignMargins(Rect r, ZoomLevel zoom)
 static void ViewportAddTownStrings(DrawPixelInfo *dpi, const std::vector<const Town *> &towns, bool small)
 {
 	ViewportStringFlags flags{};
-	if (small) flags.Set(ViewportStringFlag::Small).Set(ViewportStringFlag::Shadow);
+	if (small) flags.Set({ViewportStringFlag::Small, ViewportStringFlag::Shadow});
 
 	StringID stringid = !small && _settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_TOWN_NAME;
 	for (const Town *t : towns) {
@@ -1435,7 +1435,7 @@ static void ViewportAddKdtreeSigns(DrawPixelInfo *dpi)
 
 				/* If no facilities are present the station is a ghost station. */
 				StationFacilities facilities = st->facilities;
-				if (facilities == StationFacilities{}) facilities = STATION_FACILITY_GHOST;
+				if (facilities.None()) facilities = STATION_FACILITY_GHOST;
 
 				if (!facilities.Any(_facility_display_opt)) break;
 
@@ -1481,7 +1481,7 @@ static void ViewportAddKdtreeSigns(DrawPixelInfo *dpi)
 	});
 
 	/* Small versions of signs are used zoom level 4X and higher. */
-	bool small = dpi->zoom >= ZOOM_LVL_OUT_4X;
+	bool small = dpi->zoom >= ZoomLevel::Out4x;
 
 	/* Layering order (bottom to top): Town names, signs, stations */
 	ViewportAddTownStrings(dpi, towns, small);
@@ -1525,17 +1525,17 @@ void ViewportSign::UpdatePosition(int center, int top, std::string_view str, std
  */
 void ViewportSign::MarkDirty(ZoomLevel maxzoom) const
 {
-	Rect zoomlevels[ZOOM_LVL_END];
+	Rect zoomlevels[to_underlying(ZoomLevel::End)];
 
 	/* We don't know which size will be drawn, so mark the largest area dirty. */
 	const uint half_width = std::max(this->width_normal, this->width_small) / 2 + 1;
 	const uint height = WidgetDimensions::scaled.fullbevel.top + std::max(GetCharacterHeight(FS_NORMAL), GetCharacterHeight(FS_SMALL)) + WidgetDimensions::scaled.fullbevel.bottom + 1;
 
-	for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
-		zoomlevels[zoom].left   = this->center - ScaleByZoom(half_width, zoom);
-		zoomlevels[zoom].top    = this->top    - ScaleByZoom(1, zoom);
-		zoomlevels[zoom].right  = this->center + ScaleByZoom(half_width, zoom);
-		zoomlevels[zoom].bottom = this->top    + ScaleByZoom(height, zoom);
+	for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
+		zoomlevels[to_underlying(zoom)].left = this->center - ScaleByZoom(half_width, zoom);
+		zoomlevels[to_underlying(zoom)].top = this->top - ScaleByZoom(1, zoom);
+		zoomlevels[to_underlying(zoom)].right = this->center + ScaleByZoom(half_width, zoom);
+		zoomlevels[to_underlying(zoom)].bottom = this->top + ScaleByZoom(height, zoom);
 	}
 
 	for (const Window *w : Window::Iterate()) {
@@ -1544,7 +1544,7 @@ void ViewportSign::MarkDirty(ZoomLevel maxzoom) const
 		Viewport &vp = *w->viewport;
 		if (vp.zoom <= maxzoom) {
 			assert(vp.width != 0);
-			Rect &zl = zoomlevels[vp.zoom];
+			Rect &zl = zoomlevels[to_underlying(vp.zoom)];
 			MarkViewportDirty(vp, zl.left, zl.top, zl.right, zl.bottom);
 		}
 	}
@@ -1820,7 +1820,7 @@ void ViewportDoDraw(const Viewport &vp, int left, int top, int right, int bottom
 
 	DrawPixelInfo dp = _vd.dpi;
 	ZoomLevel zoom = _vd.dpi.zoom;
-	dp.zoom = ZOOM_LVL_MIN;
+	dp.zoom = ZoomLevel::Min;
 	dp.width = UnScaleByZoom(dp.width, zoom);
 	dp.height = UnScaleByZoom(dp.height, zoom);
 	AutoRestoreBackup cur_dpi(_cur_dpi, &dp);
@@ -2026,8 +2026,8 @@ void UpdateViewportPosition(Window *w, uint32_t delta_ms)
 static bool MarkViewportDirty(const Viewport &vp, int left, int top, int right, int bottom)
 {
 	/* Rounding wrt. zoom-out level */
-	right  += (1 << vp.zoom) - 1;
-	bottom += (1 << vp.zoom) - 1;
+	right += (1 << to_underlying(vp.zoom)) - 1;
+	bottom += (1 << to_underlying(vp.zoom)) - 1;
 
 	right -= vp.virtual_left;
 	if (right <= 0) return false;
@@ -2055,10 +2055,10 @@ static bool MarkViewportDirty(const Viewport &vp, int left, int top, int right,
 
 /**
  * Mark all viewports that display an area as dirty (in need of repaint).
- * @param left   Left   edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
- * @param top    Top    edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
- * @param right  Right  edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
- * @param bottom Bottom edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
+ * @param left   Left   edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
+ * @param top    Top    edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
+ * @param right  Right  edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
+ * @param bottom Bottom edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
  * @return true if at least one viewport has a dirty block
  * @ingroup dirty
  */
@@ -2081,7 +2081,7 @@ void ConstrainAllViewportsZoom()
 	for (Window *w : Window::Iterate()) {
 		if (w->viewport == nullptr) continue;
 
-		ZoomLevel zoom = static_cast<ZoomLevel>(Clamp(w->viewport->zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max));
+		ZoomLevel zoom = Clamp(w->viewport->zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max);
 		if (zoom != w->viewport->zoom) {
 			while (w->viewport->zoom < zoom) DoZoomInOutWindow(ZOOM_OUT, w);
 			while (w->viewport->zoom > zoom) DoZoomInOutWindow(ZOOM_IN, w);
@@ -2240,7 +2240,7 @@ void SetSelectionRed(bool b)
  */
 static bool CheckClickOnViewportSign(const Viewport &vp, int x, int y, const ViewportSign *sign)
 {
-	bool small = (vp.zoom >= ZOOM_LVL_OUT_4X);
+	bool small = (vp.zoom >= ZoomLevel::Out4x);
 	int sign_half_width = ScaleByZoom((small ? sign->width_small : sign->width_normal) / 2, vp.zoom);
 	int sign_height = ScaleByZoom(WidgetDimensions::scaled.fullbevel.top + GetCharacterHeight(small ? FS_SMALL : FS_NORMAL) + WidgetDimensions::scaled.fullbevel.bottom, vp.zoom);
 
@@ -2280,12 +2280,18 @@ static bool CheckClickOnViewportSign(const Viewport &vp, int x, int y)
 	/* See ViewportAddKdtreeSigns() for details on the search logic */
 	_viewport_sign_kdtree.FindContained(search_rect.left, search_rect.top, search_rect.right, search_rect.bottom, [&](const ViewportSignKdtreeItem & item) {
 		switch (item.type) {
-			case ViewportSignKdtreeItem::VKI_STATION:
+			case ViewportSignKdtreeItem::VKI_STATION: {
 				if (!show_stations) break;
 				st = BaseStation::Get(std::get<StationID>(item.id));
 				if (!show_competitors && _local_company != st->owner && st->owner != OWNER_NONE) break;
+
+				StationFacilities facilities = st->facilities;
+				if (facilities.None()) facilities = STATION_FACILITY_GHOST;
+				if (!facilities.Any(_facility_display_opt)) break;
+
 				if (CheckClickOnViewportSign(vp, x, y, &st->sign)) last_st = st;
 				break;
+			}
 
 			case ViewportSignKdtreeItem::VKI_WAYPOINT:
 				if (!show_waypoints) break;
@@ -3559,7 +3565,7 @@ struct ViewportSSCSS {
 };
 
 /** List of sorters ordered from best to worst. */
-static ViewportSSCSS _vp_sprite_sorters[] = {
+static const ViewportSSCSS _vp_sprite_sorters[] = {
 #ifdef WITH_SSE
 	{ &ViewportSortParentSpritesSSE41Checker, &ViewportSortParentSpritesSSE41 },
 #endif
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index 3d4271e08d..0ea8b683da 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -57,7 +57,7 @@ public:
 		this->InitNested(window_number);
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_EV_VIEWPORT);
-		nvp->InitializeViewport(this, tile, ScaleZoomGUI(ZOOM_LVL_VIEWPORT));
+		nvp->InitializeViewport(this, tile, ScaleZoomGUI(ZoomLevel::Viewport));
 		if (_settings_client.gui.zoom_min == viewport->zoom) this->DisableWidget(WID_EV_ZOOM_IN);
 	}
 
@@ -124,8 +124,9 @@ public:
 		return widget == WID_EV_VIEWPORT;
 	}
 
-	void OnMouseWheel(int wheel) override
+	void OnMouseWheel(int wheel, WidgetID widget) override
 	{
+		if (widget != WID_EV_VIEWPORT) return;
 		if (_settings_client.gui.scrollwheel_scrolling != SWS_OFF) {
 			ZoomInOrOutToCursorWindow(wheel < 0, this);
 		}
diff --git a/src/viewport_sprite_sorter.h b/src/viewport_sprite_sorter.h
index e277ff3708..7f8b8daf44 100644
--- a/src/viewport_sprite_sorter.h
+++ b/src/viewport_sprite_sorter.h
@@ -7,7 +7,6 @@
 
 /** @file viewport_sprite_sorter.h Types related to sprite sorting. */
 
-#include "stdafx.h"
 #include "gfx_type.h"
 
 #ifndef VIEWPORT_SPRITE_SORTER_H
diff --git a/src/viewport_type.h b/src/viewport_type.h
index 6a3c7cbd35..6e7f8b2dc7 100644
--- a/src/viewport_type.h
+++ b/src/viewport_type.h
@@ -53,7 +53,7 @@ struct ViewportSign {
 	auto operator<=>(const ViewportSign &) const = default;
 
 	void UpdatePosition(int center, int top, std::string_view str, std::string_view str_small = {});
-	void MarkDirty(ZoomLevel maxzoom = ZOOM_LVL_MAX) const;
+	void MarkDirty(ZoomLevel maxzoom = ZoomLevel::Max) const;
 };
 
 /** Specialised ViewportSign that tracks whether it is valid for entering into a Kdtree */
diff --git a/src/water.h b/src/water.h
index 26dc5986d1..3bad4fba5a 100644
--- a/src/water.h
+++ b/src/water.h
@@ -39,7 +39,7 @@ void MakeWaterKeepingClass(TileIndex tile, Owner o);
 void CheckForDockingTile(TileIndex t);
 
 void MakeRiverAndModifyDesertZoneAround(TileIndex tile);
-static const uint RIVER_OFFSET_DESERT_DISTANCE = 5; ///< Circular tile search radius to create non-desert around a river tile.
+static const uint RIVER_OFFSET_DESERT_DISTANCE = 5; ///< Circular tile search diameter to create non-desert around a river tile.
 
 bool IsWateredTile(TileIndex tile, Direction from);
 
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 89d4ebab24..9d0f976d5f 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -48,22 +48,22 @@
 /**
  * Describes from which directions a specific slope can be flooded (if the tile is floodable at all).
  */
-static const uint8_t _flood_from_dirs[] = {
-	(1 << DIR_NW) | (1 << DIR_SW) | (1 << DIR_SE) | (1 << DIR_NE), // SLOPE_FLAT
-	(1 << DIR_NE) | (1 << DIR_SE),                                 // SLOPE_W
-	(1 << DIR_NW) | (1 << DIR_NE),                                 // SLOPE_S
-	(1 << DIR_NE),                                                 // SLOPE_SW
-	(1 << DIR_NW) | (1 << DIR_SW),                                 // SLOPE_E
-	0,                                                             // SLOPE_EW
-	(1 << DIR_NW),                                                 // SLOPE_SE
-	(1 << DIR_N ) | (1 << DIR_NW) | (1 << DIR_NE),                 // SLOPE_WSE, SLOPE_STEEP_S
-	(1 << DIR_SW) | (1 << DIR_SE),                                 // SLOPE_N
-	(1 << DIR_SE),                                                 // SLOPE_NW
-	0,                                                             // SLOPE_NS
-	(1 << DIR_E ) | (1 << DIR_NE) | (1 << DIR_SE),                 // SLOPE_NWS, SLOPE_STEEP_W
-	(1 << DIR_SW),                                                 // SLOPE_NE
-	(1 << DIR_S ) | (1 << DIR_SW) | (1 << DIR_SE),                 // SLOPE_ENW, SLOPE_STEEP_N
-	(1 << DIR_W ) | (1 << DIR_SW) | (1 << DIR_NW),                 // SLOPE_SEN, SLOPE_STEEP_E
+static const Directions _flood_from_dirs[] = {
+	{DIR_NW, DIR_SW, DIR_SE, DIR_NE}, // SLOPE_FLAT
+	{DIR_NE, DIR_SE},                 // SLOPE_W
+	{DIR_NW, DIR_NE},                 // SLOPE_S
+	{DIR_NE},                         // SLOPE_SW
+	{DIR_NW, DIR_SW},                 // SLOPE_E
+	{},                               // SLOPE_EW
+	{DIR_NW},                         // SLOPE_SE
+	{DIR_N, DIR_NW, DIR_NE},          // SLOPE_WSE, SLOPE_STEEP_S
+	{DIR_SW, DIR_SE},                 // SLOPE_N
+	{DIR_SE},                         // SLOPE_NW
+	{},                               // SLOPE_NS
+	{DIR_E, DIR_NE, DIR_SE},          // SLOPE_NWS, SLOPE_STEEP_W
+	{DIR_SW},                         // SLOPE_NE
+	{DIR_S, DIR_SW, DIR_SE},          // SLOPE_ENW, SLOPE_STEEP_N
+	{DIR_W, DIR_SW, DIR_NW},          // SLOPE_SEN, SLOPE_STEEP_E
 };
 
 /**
@@ -439,13 +439,6 @@ CommandCost CmdBuildLock(DoCommandFlags flags, TileIndex tile)
 	return DoBuildLock(tile, dir, flags);
 }
 
-/** Callback to create non-desert around a river tile. */
-static bool RiverModifyDesertZone(TileIndex tile, void *)
-{
-	if (GetTropicZone(tile) == TROPICZONE_DESERT) SetTropicZone(tile, TROPICZONE_NORMAL);
-	return false;
-}
-
 /**
  * Make a river tile and remove desert directly around it.
  * @param tile The tile to change into river and create non-desert around
@@ -456,7 +449,9 @@ void MakeRiverAndModifyDesertZoneAround(TileIndex tile)
 	MarkTileDirtyByTile(tile);
 
 	/* Remove desert directly around the river tile. */
-	CircularTileSearch(&tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr);
+	for (auto t : SpiralTileSequence(tile, RIVER_OFFSET_DESERT_DISTANCE)) {
+		if (GetTropicZone(t) == TROPICZONE_DESERT) SetTropicZone(t, TROPICZONE_NORMAL);
+	}
 }
 
 /**
@@ -510,8 +505,10 @@ CommandCost CmdBuildCanal(DoCommandFlags flags, TileIndex tile, TileIndex start_
 				case WATER_CLASS_RIVER:
 					MakeRiver(current_tile, Random());
 					if (_game_mode == GM_EDITOR) {
-						TileIndex tile2 = current_tile;
-						CircularTileSearch(&tile2, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, nullptr);
+						/* Remove desert directly around the river tile. */
+						for (auto t : SpiralTileSequence(current_tile, RIVER_OFFSET_DESERT_DISTANCE)) {
+							if (GetTropicZone(t) == TROPICZONE_DESERT) SetTropicZone(t, TROPICZONE_NORMAL);
+						}
 					}
 					break;
 
@@ -860,7 +857,7 @@ static void DrawWaterLock(const TileInfo *ti)
 static void DrawWaterDepot(const TileInfo *ti)
 {
 	DrawWaterClassGround(ti);
-	DrawWaterTileStruct(ti, _shipdepot_display_data[GetShipDepotAxis(ti->tile)][GetShipDepotPart(ti->tile)].seq, 0, 0, COMPANY_SPRITE_COLOUR(GetTileOwner(ti->tile)), CF_END);
+	DrawWaterTileStruct(ti, _shipdepot_display_data[GetShipDepotAxis(ti->tile)][GetShipDepotPart(ti->tile)].seq, 0, 0, GetCompanyPalette(GetTileOwner(ti->tile)), CF_END);
 }
 
 static void DrawRiverWater(const TileInfo *ti)
@@ -957,7 +954,7 @@ void DrawShipDepotSprite(int x, int y, Axis axis, DepotPart part)
 	const DrawTileSprites &dts = _shipdepot_display_data[axis][part];
 
 	DrawSprite(dts.ground.sprite, dts.ground.pal, x, y);
-	DrawOrigTileSeqInGUI(x, y, &dts, COMPANY_SPRITE_COLOUR(_local_company));
+	DrawOrigTileSeqInGUI(x, y, &dts, GetCompanyPalette(_local_company));
 }
 
 
@@ -1015,12 +1012,11 @@ static void FloodVehicle(Vehicle *v)
 /**
  * Flood a vehicle if we are allowed to flood it, i.e. when it is on the ground.
  * @param v    The vehicle to test for flooding.
- * @param data The z of level to flood.
- * @return nullptr as we always want to remove everything.
+ * @param z    The z of level to flood.
  */
-static Vehicle *FloodVehicleProc(Vehicle *v, void *data)
+static void FloodVehicleProc(Vehicle *v, int z)
 {
-	if (v->vehstatus.Test(VehState::Crashed)) return nullptr;
+	if (v->vehstatus.Test(VehState::Crashed)) return;
 
 	switch (v->type) {
 		default: break;
@@ -1041,14 +1037,18 @@ static Vehicle *FloodVehicleProc(Vehicle *v, void *data)
 
 		case VEH_TRAIN:
 		case VEH_ROAD: {
-			int z = *(int*)data;
 			if (v->z_pos > z) break;
 			FloodVehicle(v->First());
 			break;
 		}
 	}
+}
 
-	return nullptr;
+static void FloodVehiclesOnTile(TileIndex tile, int z)
+{
+	for (Vehicle *v : VehiclesOnTile(tile)) {
+		FloodVehicleProc(v, z);
+	}
 }
 
 /**
@@ -1058,12 +1058,10 @@ static Vehicle *FloodVehicleProc(Vehicle *v, void *data)
  */
 static void FloodVehicles(TileIndex tile)
 {
-	int z = 0;
-
 	if (IsAirportTile(tile)) {
 		const Station *st = Station::GetByTile(tile);
 		for (TileIndex airport_tile : st->airport) {
-			if (st->TileBelongsToAirport(airport_tile)) FindVehicleOnPos(airport_tile, &z, &FloodVehicleProc);
+			if (st->TileBelongsToAirport(airport_tile)) FloodVehiclesOnTile(airport_tile, 0);
 		}
 
 		/* No vehicle could be flooded on this airport anymore */
@@ -1071,15 +1069,15 @@ static void FloodVehicles(TileIndex tile)
 	}
 
 	if (!IsBridgeTile(tile)) {
-		FindVehicleOnPos(tile, &z, &FloodVehicleProc);
+		FloodVehiclesOnTile(tile, 0);
 		return;
 	}
 
 	TileIndex end = GetOtherBridgeEnd(tile);
-	z = GetBridgePixelHeight(tile);
+	int z = GetBridgePixelHeight(tile);
 
-	FindVehicleOnPos(tile, &z, &FloodVehicleProc);
-	FindVehicleOnPos(end, &z, &FloodVehicleProc);
+	FloodVehiclesOnTile(tile, z);
+	FloodVehiclesOnTile(end, z);
 }
 
 /**
@@ -1270,7 +1268,7 @@ void TileLoop_Water(TileIndex tile)
 				auto [slope_dest, z_dest] = GetFoundationSlope(dest);
 				if (z_dest > 0) continue;
 
-				if (!HasBit(_flood_from_dirs[slope_dest & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP], ReverseDir(dir))) continue;
+				if (!_flood_from_dirs[slope_dest & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP].Test(ReverseDir(dir))) continue;
 
 				DoFloodTile(dest);
 			}
@@ -1280,7 +1278,7 @@ void TileLoop_Water(TileIndex tile)
 
 		case FLOOD_DRYUP: {
 			Slope slope_here = std::get<0>(GetFoundationSlope(tile)) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP;
-			for (Direction dir : SetBitIterator<Direction>(_flood_from_dirs[slope_here])) {
+			for (Direction dir : _flood_from_dirs[slope_here]) {
 				TileIndex dest = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir(dir));
 				/* Contrary to flooding, drying up does consider MP_VOID tiles. */
 				if (dest == INVALID_TILE) continue;
@@ -1317,7 +1315,7 @@ void ConvertGroundTilesIntoWaterTiles()
 					break;
 
 				default:
-					for (Direction dir : SetBitIterator<Direction>(_flood_from_dirs[slope & ~SLOPE_STEEP])) {
+					for (Direction dir : _flood_from_dirs[slope & ~SLOPE_STEEP]) {
 						TileIndex dest = TileAddByDir(tile, dir);
 						Slope slope_dest = GetTileSlope(dest) & ~SLOPE_STEEP;
 						if (slope_dest == SLOPE_FLAT || IsSlopeWithOneCornerRaised(slope_dest) || IsTileType(dest, MP_VOID)) {
@@ -1403,9 +1401,9 @@ static void ChangeTileOwner_Water(TileIndex tile, Owner old_owner, Owner new_own
 	}
 }
 
-static VehicleEnterTileStatus VehicleEnter_Water(Vehicle *, TileIndex, int, int)
+static VehicleEnterTileStates VehicleEnter_Water(Vehicle *, TileIndex, int, int)
 {
-	return VETSB_CONTINUE;
+	return {};
 }
 
 static CommandCost TerraformTile_Water(TileIndex tile, DoCommandFlags flags, int, Slope)
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 559d2e55a3..8814cfc0a7 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -405,11 +405,11 @@ CommandCost CmdBuildRoadWaypoint(DoCommandFlags flags, TileIndex start_tile, Axi
 		if (roadstopspec != nullptr) {
 			/* Include this road stop spec's animation trigger bitmask
 			 * in the station's cached copy. */
-			wp->cached_roadstop_anim_triggers |= roadstopspec->animation.triggers;
+			wp->cached_roadstop_anim_triggers.Set(roadstopspec->animation.triggers);
 		}
 
 		wp->delete_ctr = 0;
-		wp->facilities.Set(StationFacility::BusStop).Set(StationFacility::TruckStop);
+		wp->facilities.Set({StationFacility::BusStop, StationFacility::TruckStop});
 		wp->build_date = TimerGameCalendar::date;
 		wp->string_id = STR_SV_STNAME_WAYPOINT;
 
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index c8165f64c4..7d61c1af01 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -97,7 +97,7 @@ public:
 		this->flags.Set(WindowFlag::DisableVpScroll);
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_W_VIEWPORT);
-		nvp->InitializeViewport(this, this->GetCenterTile(), ScaleZoomGUI(ZOOM_LVL_VIEWPORT));
+		nvp->InitializeViewport(this, this->GetCenterTile(), ScaleZoomGUI(ZoomLevel::Viewport));
 
 		this->OnInvalidateData(0);
 	}
diff --git a/src/widget.cpp b/src/widget.cpp
index 2609362796..a9d68d2669 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -10,6 +10,7 @@
 #include "stdafx.h"
 #include "core/backup_type.hpp"
 #include "company_func.h"
+#include "settings_gui.h"
 #include "strings_type.h"
 #include "window_gui.h"
 #include "viewport_func.h"
@@ -67,7 +68,7 @@ static inline Dimension ScaleGUITrad(const Dimension &dim)
 Dimension GetScaledSpriteSize(SpriteID sprid)
 {
 	Point offset;
-	Dimension d = GetSpriteSize(sprid, &offset, ZOOM_LVL_NORMAL);
+	Dimension d = GetSpriteSize(sprid, &offset, ZoomLevel::Normal);
 	d.width  -= offset.x;
 	d.height -= offset.y;
 	return ScaleGUITrad(d);
@@ -123,13 +124,13 @@ static inline Point GetAlignedPosition(const Rect &r, const Dimension &d, String
 	if (!(align & SA_FORCE) && _current_text_dir == TD_RTL && (align & SA_HOR_MASK) != SA_HOR_CENTER) align ^= SA_RIGHT;
 	switch (align & SA_HOR_MASK) {
 		case SA_LEFT:       p.x = r.left; break;
-		case SA_HOR_CENTER: p.x = CenterBounds(r.left, r.right, d.width); break;
+		case SA_HOR_CENTER: p.x = CentreBounds(r.left, r.right, d.width); break;
 		case SA_RIGHT:      p.x = r.right + 1 - d.width; break;
 		default: NOT_REACHED();
 	}
 	switch (align & SA_VERT_MASK) {
 		case SA_TOP:         p.y = r.top; break;
-		case SA_VERT_CENTER: p.y = CenterBounds(r.top, r.bottom, d.height); break;
+		case SA_VERT_CENTER: p.y = CentreBounds(r.top, r.bottom, d.height); break;
 		case SA_BOTTOM:      p.y = r.bottom + 1 - d.height; break;
 		default: NOT_REACHED();
 	}
@@ -155,19 +156,19 @@ static Point HandleScrollbarHittest(const Scrollbar *sb, int top, int bottom, bo
 	} else {
 		button_size = NWidgetScrollbar::GetVerticalDimension().height;
 	}
-	top += button_size;    // top    points to just below the up-button
-	bottom -= button_size; // bottom points to top of the down-button
+	top += button_size;    // top points to just below the up-button
+	bottom -= button_size; // bottom points to just before the down-button
 
 	int count = sb->GetCount();
 	int cap = sb->GetCapacity();
 
 	if (count > cap) {
-		int height = (bottom - top);
+		int height = bottom + 1 - top;
 		int slider_height = std::max(button_size, cap * height / count);
 		height -= slider_height;
 
 		top += height * sb->GetPosition() / (count - cap);
-		bottom = top + slider_height;
+		bottom = top + slider_height - 1;
 	}
 
 	Point pt;
@@ -239,6 +240,7 @@ static void ScrollbarClickPositioning(Window *w, NWidgetScrollbar *sb, int x, in
 
 	if (changed) {
 		/* Position changed so refresh the window */
+		w->OnScrollbarScroll(sb->GetIndex());
 		w->SetDirty();
 	} else {
 		/* No change so only refresh this scrollbar */
@@ -357,6 +359,37 @@ static inline void DrawImageButtons(const Rect &r, WidgetType type, Colours colo
 	DrawSpriteIgnorePadding(img, PAL_NONE, r, align);
 }
 
+/**
+ * Draw a button with image and rext.
+ * @param r       Rectangle of the button.
+ * @param colour  Colour of the button.
+ * @param clicked Button is clicked.
+ * @param img     Image caption.
+ * @param text_colour Colour of the text.
+ * @param text    Text caption.
+ * @param align   Alignment of the caption.
+ * @param fs      Font size of the text.
+ */
+static inline void DrawImageTextButtons(const Rect &r, Colours colour, bool clicked, SpriteID img, TextColour text_colour, const std::string &text, StringAlignment align, FontSize fs)
+{
+	DrawFrameRect(r.left, r.top, r.right, r.bottom, colour, (clicked) ? FrameFlag::Lowered : FrameFlags{});
+
+	bool rtl = _current_text_dir == TD_RTL;
+	int image_width = img != 0 ? GetScaledSpriteSize(img).width : 0;
+	Rect r_img = r.Shrink(WidgetDimensions::scaled.framerect).WithWidth(image_width, rtl);
+	Rect r_text = r.Shrink(WidgetDimensions::scaled.framerect).Indent(image_width + WidgetDimensions::scaled.hsep_wide, rtl);
+
+	if (img != 0) {
+		DrawSpriteIgnorePadding(img, PAL_NONE, r_img, SA_HOR_CENTER | (align & SA_VERT_MASK));
+	}
+
+	if (!text.empty()) {
+		Dimension d = GetStringBoundingBox(text, fs);
+		Point p = GetAlignedPosition(r_text, d, align);
+		DrawString(r_text.left, r_text.right, p.y, text, text_colour, align, false, fs);
+	}
+}
+
 /**
  * Draw the label-part of a widget.
  * @param r       Rectangle of the label background.
@@ -676,7 +709,7 @@ static inline void DrawCloseBox(const Rect &r, Colours colour)
 	d.width  -= offset.x;
 	d.height -= offset.y;
 	int s = ScaleSpriteTrad(1); /* Offset to account for shadow of SPR_CLOSEBOX */
-	DrawSprite(SPR_CLOSEBOX, (colour != COLOUR_WHITE ? TC_BLACK : TC_SILVER) | (1U << PALETTE_TEXT_RECOLOUR), CenterBounds(r.left, r.right, d.width - s) - offset.x, CenterBounds(r.top, r.bottom, d.height - s) - offset.y);
+	DrawSprite(SPR_CLOSEBOX, (colour != COLOUR_WHITE ? TC_BLACK : TC_SILVER) | (1U << PALETTE_TEXT_RECOLOUR), CentreBounds(r.left, r.right, d.width - s) - offset.x, CentreBounds(r.top, r.bottom, d.height - s) - offset.y);
 }
 
 /**
@@ -727,13 +760,13 @@ static inline void DrawButtonDropdown(const Rect &r, Colours colour, bool clicke
 		DrawFrameRect(r.left, r.top, r.right - dd_width, r.bottom, colour, clicked_button ? FrameFlag::Lowered : FrameFlags{});
 		DrawImageButtons(r.WithWidth(dd_width, true), WWT_DROPDOWN, colour, clicked_dropdown, SPR_ARROW_DOWN, SA_CENTER);
 		if (!str.empty()) {
-			DrawString(r.left + WidgetDimensions::scaled.dropdowntext.left, r.right - dd_width - WidgetDimensions::scaled.dropdowntext.right, CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), str, TC_BLACK, align);
+			DrawString(r.left + WidgetDimensions::scaled.dropdowntext.left, r.right - dd_width - WidgetDimensions::scaled.dropdowntext.right, CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), str, TC_BLACK, align);
 		}
 	} else {
 		DrawFrameRect(r.left + dd_width, r.top, r.right, r.bottom, colour, clicked_button ? FrameFlag::Lowered : FrameFlags{});
 		DrawImageButtons(r.WithWidth(dd_width, false), WWT_DROPDOWN, colour, clicked_dropdown, SPR_ARROW_DOWN, SA_CENTER);
 		if (!str.empty()) {
-			DrawString(r.left + dd_width + WidgetDimensions::scaled.dropdowntext.left, r.right - WidgetDimensions::scaled.dropdowntext.right, CenterBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), str, TC_BLACK, align);
+			DrawString(r.left + dd_width + WidgetDimensions::scaled.dropdowntext.left, r.right - WidgetDimensions::scaled.dropdowntext.right, CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), str, TC_BLACK, align);
 		}
 	}
 }
@@ -890,6 +923,10 @@ static void DrawOutline(const Window *, const NWidgetBase *wid)
  * Fill the Window::widget_lookup with pointers to nested widgets in the tree.
  * @param widget_lookup The WidgetLookup.
  */
+void NWidgetBase::FillWidgetLookup(WidgetLookup &widget_lookup)
+{
+	if (this->index >= 0) widget_lookup[this->index] = this;
+}
 
 /**
  * @fn void NWidgetBase::Draw(const Window *w)
@@ -952,7 +989,7 @@ void NWidgetBase::AdjustPaddingForZoom()
  * @param fill_x Horizontal fill step size, \c 0 means no filling is allowed.
  * @param fill_y Vertical fill step size, \c 0 means no filling is allowed.
  */
-NWidgetResizeBase::NWidgetResizeBase(WidgetType tp, uint fill_x, uint fill_y) : NWidgetBase(tp)
+NWidgetResizeBase::NWidgetResizeBase(WidgetType tp, WidgetID index, uint fill_x, uint fill_y) : NWidgetBase(tp, index)
 {
 	this->fill_x = fill_x;
 	this->fill_y = fill_y;
@@ -1113,7 +1150,7 @@ void NWidgetResizeBase::AssignSizePosition(SizingType sizing, int x, int y, uint
  * @param widget_data Data component of the widget. @see Widget::data
  * @param tool_tip    Tool tip of the widget. @see Widget::tooltips
  */
-NWidgetCore::NWidgetCore(WidgetType tp, Colours colour, WidgetID index, uint fill_x, uint fill_y, const WidgetData &widget_data, StringID tool_tip) : NWidgetResizeBase(tp, fill_x, fill_y), index(index)
+NWidgetCore::NWidgetCore(WidgetType tp, Colours colour, WidgetID index, uint fill_x, uint fill_y, const WidgetData &widget_data, StringID tool_tip) : NWidgetResizeBase(tp, index, fill_x, fill_y)
 {
 	this->colour = colour;
 	this->widget_data = widget_data;
@@ -1227,15 +1264,6 @@ StringID NWidgetCore::GetString() const
 	return this->widget_data.string;
 }
 
-/**
- * Get the \c WidgetID of this nested widget.
- * @return The \c WidgetID.
- */
-WidgetID NWidgetCore::GetIndex() const
-{
-	return this->index;
-}
-
 /**
  * Get the \c WidgetID of this nested widget's scrollbar.
  * @return The \c WidgetID.
@@ -1245,11 +1273,6 @@ WidgetID NWidgetCore::GetScrollbarIndex() const
 	return this->scrollbar_index;
 }
 
-void NWidgetCore::FillWidgetLookup(WidgetLookup &widget_lookup)
-{
-	if (this->index >= 0) widget_lookup[this->index] = this;
-}
-
 NWidgetCore *NWidgetCore::GetWidgetFromPos(int x, int y)
 {
 	return (IsInsideBS(x, this->pos_x, this->current_x) && IsInsideBS(y, this->pos_y, this->current_y)) ? this : nullptr;
@@ -1286,6 +1309,7 @@ void NWidgetContainer::Add(std::unique_ptr<NWidgetBase> &&wid)
 
 void NWidgetContainer::FillWidgetLookup(WidgetLookup &widget_lookup)
 {
+	this->NWidgetBase::FillWidgetLookup(widget_lookup);
 	for (const auto &child_wid : this->children) {
 		child_wid->FillWidgetLookup(widget_lookup);
 	}
@@ -1377,8 +1401,7 @@ void NWidgetStacked::FillWidgetLookup(WidgetLookup &widget_lookup)
 	/* We need to update widget_lookup later. */
 	this->widget_lookup = &widget_lookup;
 
-	if (this->index >= 0) widget_lookup[this->index] = this;
-	NWidgetContainer::FillWidgetLookup(widget_lookup);
+	this->NWidgetContainer::FillWidgetLookup(widget_lookup);
 	/* In case widget IDs are repeated, make sure Window::GetWidget works on displayed widgets. */
 	if (static_cast<size_t>(this->shown_plane) < this->children.size()) this->children[shown_plane]->FillWidgetLookup(widget_lookup);
 }
@@ -1418,14 +1441,12 @@ bool NWidgetStacked::SetDisplayedPlane(int plane)
 
 class NWidgetLayer : public NWidgetContainer {
 public:
-	NWidgetLayer(WidgetID index) : NWidgetContainer(NWID_LAYER), index(index) {}
+	NWidgetLayer(WidgetID index) : NWidgetContainer(NWID_LAYER, index) {}
 
 	void SetupSmallestSize(Window *w) override;
 	void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override;
 
 	void Draw(const Window *w) override;
-
-	const WidgetID index; ///< If non-negative, index in the #Window::widget_lookup.
 };
 
 void NWidgetLayer::SetupSmallestSize(Window *w)
@@ -1478,11 +1499,6 @@ void NWidgetLayer::Draw(const Window *w)
 	DrawOutline(w, this);
 }
 
-NWidgetPIPContainer::NWidgetPIPContainer(WidgetType tp, NWidContainerFlags flags) : NWidgetContainer(tp)
-{
-	this->flags = flags;
-}
-
 void NWidgetPIPContainer::AdjustPaddingForZoom()
 {
 	this->pip_pre = ScaleGUITrad(this->uz_pip_pre);
@@ -1527,11 +1543,6 @@ void NWidgetPIPContainer::SetPIPRatio(uint8_t pip_ratio_pre, uint8_t pip_ratio_i
 	this->pip_ratio_post = pip_ratio_post;
 }
 
-/** Horizontal container widget. */
-NWidgetHorizontal::NWidgetHorizontal(NWidContainerFlags flags) : NWidgetPIPContainer(NWID_HORIZONTAL, flags)
-{
-}
-
 void NWidgetHorizontal::SetupSmallestSize(Window *w)
 {
 	this->smallest_x = 0; // Sum of minimal size of all children.
@@ -1710,22 +1721,11 @@ void NWidgetHorizontal::AssignSizePosition(SizingType sizing, int x, int y, uint
 	}
 }
 
-/** Horizontal left-to-right container widget. */
-NWidgetHorizontalLTR::NWidgetHorizontalLTR(NWidContainerFlags flags) : NWidgetHorizontal(flags)
-{
-	this->type = NWID_HORIZONTAL_LTR;
-}
-
 void NWidgetHorizontalLTR::AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool)
 {
 	NWidgetHorizontal::AssignSizePosition(sizing, x, y, given_width, given_height, false);
 }
 
-/** Vertical container widget. */
-NWidgetVertical::NWidgetVertical(NWidContainerFlags flags) : NWidgetPIPContainer(NWID_VERTICAL, flags)
-{
-}
-
 void NWidgetVertical::SetupSmallestSize(Window *w)
 {
 	this->smallest_x = 0; // Biggest child.
@@ -1898,7 +1898,7 @@ void NWidgetVertical::AssignSizePosition(SizingType sizing, int x, int y, uint g
  * @param width  Horizontal size of the spacer widget.
  * @param height Vertical size of the spacer widget.
  */
-NWidgetSpacer::NWidgetSpacer(int width, int height) : NWidgetResizeBase(NWID_SPACER, 0, 0)
+NWidgetSpacer::NWidgetSpacer(int width, int height) : NWidgetResizeBase(NWID_SPACER, -1, 0, 0)
 {
 	this->SetMinimalSize(width, height);
 	this->SetResize(0, 0);
@@ -1911,10 +1911,6 @@ void NWidgetSpacer::SetupSmallestSize(Window *)
 	this->ApplyAspectRatio();
 }
 
-void NWidgetSpacer::FillWidgetLookup(WidgetLookup &)
-{
-}
-
 void NWidgetSpacer::Draw(const Window *w)
 {
 	/* Spacer widget is never normally visible. */
@@ -1937,11 +1933,6 @@ NWidgetCore *NWidgetSpacer::GetWidgetFromPos(int, int)
 	return nullptr;
 }
 
-NWidgetMatrix::NWidgetMatrix(Colours colour, WidgetID index) : NWidgetPIPContainer(NWID_MATRIX, NWidContainerFlag::EqualSize), index(index)
-{
-	this->colour = colour;
-}
-
 /**
  * Sets the clicked element in the matrix.
  * @param clicked The clicked element.
@@ -2047,12 +2038,6 @@ void NWidgetMatrix::AssignSizePosition(SizingType, int x, int y, uint given_widt
 	this->SetCount(this->count);
 }
 
-void NWidgetMatrix::FillWidgetLookup(WidgetLookup &widget_lookup)
-{
-	if (this->index >= 0) widget_lookup[this->index] = this;
-	NWidgetContainer::FillWidgetLookup(widget_lookup);
-}
-
 NWidgetCore *NWidgetMatrix::GetWidgetFromPos(int x, int y)
 {
 	/* Falls outside of the matrix widget. */
@@ -2279,9 +2264,11 @@ void NWidgetBackground::SetupSmallestSize(Window *w)
 		if (w != nullptr) { // A non-nullptr window pointer acts as switch to turn dynamic widget size on.
 			if (this->type == WWT_FRAME || this->type == WWT_INSET) {
 				std::string text = GetStringForWidget(w, this);
-				Dimension background = GetStringBoundingBox(text, this->text_size);
-				background.width += (this->type == WWT_FRAME) ? (WidgetDimensions::scaled.frametext.Horizontal()) : (WidgetDimensions::scaled.inset.Horizontal());
-				d = maxdim(d, background);
+				if (!text.empty()) {
+					Dimension background = GetStringBoundingBox(text, this->text_size);
+					background.width += (this->type == WWT_FRAME) ? (WidgetDimensions::scaled.frametext.Horizontal()) : (WidgetDimensions::scaled.inset.Horizontal());
+					d = maxdim(d, background);
+				}
 			}
 			if (this->index >= 0) {
 				Dimension padding;
@@ -2318,7 +2305,7 @@ void NWidgetBackground::AssignSizePosition(SizingType sizing, int x, int y, uint
 
 void NWidgetBackground::FillWidgetLookup(WidgetLookup &widget_lookup)
 {
-	if (this->index >= 0) widget_lookup[this->index] = this;
+	this->NWidgetCore::FillWidgetLookup(widget_lookup);
 	if (this->child != nullptr) this->child->FillWidgetLookup(widget_lookup);
 }
 
@@ -2719,6 +2706,9 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, WidgetID index, const Wi
 		case WWT_TEXTBTN:
 		case WWT_PUSHTXTBTN:
 		case WWT_TEXTBTN_2:
+		case WWT_IMGTEXTBTN:
+		case WWT_PUSHIMGTEXTBTN:
+		case WWT_BOOLBTN:
 		case WWT_MATRIX:
 		case NWID_BUTTON_DROPDOWN:
 		case NWID_PUSHBUTTON_DROPDOWN:
@@ -2879,6 +2869,12 @@ void NWidgetLeaf::SetupSmallestSize(Window *w)
 			padding = {WidgetDimensions::scaled.frametext.Horizontal(), WidgetDimensions::scaled.framerect.Vertical()};
 			break;
 		}
+
+		case WWT_BOOLBTN:
+			size.width = SETTING_BUTTON_WIDTH;
+			size.height = SETTING_BUTTON_HEIGHT;
+			break;
+
 		case WWT_IMGBTN:
 		case WWT_IMGBTN_2:
 		case WWT_PUSHIMGBTN: {
@@ -2890,6 +2886,20 @@ void NWidgetLeaf::SetupSmallestSize(Window *w)
 			size = maxdim(size, d2);
 			break;
 		}
+
+		case WWT_IMGTEXTBTN:
+		case WWT_PUSHIMGTEXTBTN: {
+			padding = {WidgetDimensions::scaled.framerect.Horizontal(), WidgetDimensions::scaled.framerect.Vertical()};
+			Dimension di = GetScaledSpriteSize(this->widget_data.sprite);
+			Dimension dt = GetStringBoundingBox(GetStringForWidget(w, this), this->text_size);
+			Dimension d2{
+				padding.width + di.width + WidgetDimensions::scaled.hsep_wide + dt.width,
+				padding.height + std::max(di.height, dt.height)
+			};
+			size = maxdim(size, d2);
+			break;
+		}
+
 		case WWT_ARROWBTN:
 		case WWT_PUSHARROWBTN: {
 			padding = {WidgetDimensions::scaled.imgbtn.Horizontal(), WidgetDimensions::scaled.imgbtn.Vertical()};
@@ -2992,6 +3002,14 @@ void NWidgetLeaf::Draw(const Window *w)
 			DrawFrameRect(r.left, r.top, r.right, r.bottom, this->colour, (clicked) ? FrameFlag::Lowered : FrameFlags{});
 			break;
 
+		case WWT_BOOLBTN: {
+			Point pt = GetAlignedPosition(r, Dimension(SETTING_BUTTON_WIDTH, SETTING_BUTTON_HEIGHT), this->align);
+			Colours button_colour = this->widget_data.alternate_colour;
+			if (button_colour == INVALID_COLOUR) button_colour = this->colour;
+			DrawBoolButton(pt.x, pt.y, button_colour, this->colour, clicked, !this->IsDisabled());
+			break;
+		}
+
 		case WWT_IMGBTN:
 		case WWT_PUSHIMGBTN:
 		case WWT_IMGBTN_2:
@@ -3005,6 +3023,11 @@ void NWidgetLeaf::Draw(const Window *w)
 			DrawLabel(r, this->text_colour, GetStringForWidget(w, this, (type & WWT_MASK) == WWT_TEXTBTN_2 && clicked), this->align, this->text_size);
 			break;
 
+		case WWT_IMGTEXTBTN:
+		case WWT_PUSHIMGTEXTBTN:
+			DrawImageTextButtons(r, this->colour, clicked, this->widget_data.sprite, this->text_colour, GetStringForWidget(w, this), this->align, this->text_size);
+			break;
+
 		case WWT_ARROWBTN:
 		case WWT_PUSHARROWBTN: {
 			SpriteID sprite;
@@ -3079,7 +3102,8 @@ void NWidgetLeaf::Draw(const Window *w)
 	}
 	if (this->index >= 0) w->DrawWidget(r, this->index);
 
-	if (this->IsDisabled()) {
+	if (this->IsDisabled() && this->type != WWT_BOOLBTN) {
+		/* WWT_BOOLBTN is excluded as it draws its own disabled state. */
 		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(this->colour, SHADE_DARKER), FILLRECT_CHECKER);
 	}
 
@@ -3242,9 +3266,9 @@ static std::unique_ptr<NWidgetBase> MakeNWidget(const NWidgetPart &nwid)
 		case WWT_INSET: [[fallthrough]];
 		case WWT_FRAME: return std::make_unique<NWidgetBackground>(nwid.type, nwid.u.widget.colour, nwid.u.widget.index);
 
-		case NWID_HORIZONTAL: return std::make_unique<NWidgetHorizontal>(nwid.u.cont_flags);
-		case NWID_HORIZONTAL_LTR: return std::make_unique<NWidgetHorizontalLTR>(nwid.u.cont_flags);
-		case NWID_VERTICAL: return std::make_unique<NWidgetVertical>(nwid.u.cont_flags);
+		case NWID_HORIZONTAL: return std::make_unique<NWidgetHorizontal>(nwid.u.container.flags, nwid.u.container.index);
+		case NWID_HORIZONTAL_LTR: return std::make_unique<NWidgetHorizontalLTR>(nwid.u.container.flags, nwid.u.container.index);
+		case NWID_VERTICAL: return std::make_unique<NWidgetVertical>(nwid.u.container.flags, nwid.u.container.index);
 		case NWID_SELECTION: return std::make_unique<NWidgetStacked>(nwid.u.widget.index);
 		case NWID_MATRIX: return std::make_unique<NWidgetMatrix>(nwid.u.widget.colour, nwid.u.widget.index);
 		case NWID_VIEWPORT: return std::make_unique<NWidgetViewport>(nwid.u.widget.index);
@@ -3426,7 +3450,7 @@ std::unique_ptr<NWidgetBase> MakeCompanyButtonRows(WidgetID widget_first, Widget
 	std::unique_ptr<NWidgetHorizontal> hor = nullptr; // Storage for buttons in one row.
 	int hor_length = 0;
 
-	Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON, nullptr, ZOOM_LVL_NORMAL);
+	Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON, nullptr, ZoomLevel::Normal);
 	sprite_size.width  += WidgetDimensions::unscaled.matrix.Horizontal();
 	sprite_size.height += WidgetDimensions::unscaled.matrix.Vertical();
 
diff --git a/src/widget_type.h b/src/widget_type.h
index 52abde5565..b7bb0ce925 100644
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -44,6 +44,8 @@ enum WidgetType : uint8_t {
 	WWT_ARROWBTN,   ///< (Toggle) Button with an arrow
 	WWT_TEXTBTN,    ///< (Toggle) Button with text
 	WWT_TEXTBTN_2,  ///< (Toggle) Button with diff text when clicked
+	WWT_BOOLBTN,    ///< Standard boolean toggle button.
+	WWT_IMGTEXTBTN, ///< (Toggle) Button with image and text
 	WWT_LABEL,      ///< Centered label
 	WWT_TEXT,       ///< Pure simple text
 	WWT_MATRIX,     ///< Grid of rows and columns. @see MatrixWidgetValues
@@ -103,6 +105,7 @@ enum WidgetType : uint8_t {
 	WWT_PUSHTXTBTN    = WWT_TEXTBTN  | WWB_PUSHBUTTON,    ///< Normal push-button (no toggle button) with text caption
 	WWT_PUSHIMGBTN    = WWT_IMGBTN   | WWB_PUSHBUTTON,    ///< Normal push-button (no toggle button) with image caption
 	WWT_PUSHARROWBTN  = WWT_ARROWBTN | WWB_PUSHBUTTON,    ///< Normal push-button (no toggle button) with arrow caption
+	WWT_PUSHIMGTEXTBTN = WWT_IMGTEXTBTN | WWB_PUSHBUTTON, ///< Normal push-button (no toggle button) with image and text caption
 	NWID_PUSHBUTTON_DROPDOWN = NWID_BUTTON_DROPDOWN | WWB_PUSHBUTTON,
 };
 
@@ -133,7 +136,7 @@ using WidgetLookup = std::map<WidgetID, class NWidgetBase *>;
  */
 class NWidgetBase {
 public:
-	NWidgetBase(WidgetType tp) : type(tp) {}
+	NWidgetBase(WidgetType tp, WidgetID index = -1) : type(tp), index(index) {}
 	virtual ~NWidgetBase() = default;
 
 	void ApplyAspectRatio();
@@ -141,7 +144,7 @@ public:
 	virtual void SetupSmallestSize(Window *w) = 0;
 	virtual void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) = 0;
 
-	virtual void FillWidgetLookup(WidgetLookup &widget_lookup) = 0;
+	virtual void FillWidgetLookup(WidgetLookup &widget_lookup);
 
 	virtual NWidgetCore *GetWidgetFromPos(int x, int y) = 0;
 	virtual NWidgetBase *GetWidgetOfType(WidgetType tp);
@@ -174,6 +177,7 @@ public:
 		return nullptr;
 	}
 
+	inline WidgetID GetIndex() const { return this->index; }
 	virtual bool IsHighlighted() const { return false; }
 	virtual TextColour GetHighlightColour() const { return TC_INVALID; }
 	virtual void SetHighlighted([[maybe_unused]] TextColour highlight_colour) {}
@@ -245,6 +249,8 @@ public:
 	NWidgetBase *parent = nullptr; ///< Parent widget of this widget, automatically filled in when added to container.
 
 protected:
+	const WidgetID index = -1; ///< Index of the nested widget (\c -1 means 'not used').
+
 	inline void StoreSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height);
 };
 
@@ -293,7 +299,7 @@ inline void NWidgetBase::StoreSizePosition(SizingType sizing, int x, int y, uint
  */
 class NWidgetResizeBase : public NWidgetBase {
 public:
-	NWidgetResizeBase(WidgetType tp, uint fill_x, uint fill_y);
+	NWidgetResizeBase(WidgetType tp, WidgetID index, uint fill_x, uint fill_y);
 
 	void AdjustPaddingForZoom() override;
 	void SetMinimalSize(uint min_x, uint min_y);
@@ -352,6 +358,7 @@ struct WidgetData {
 	SpriteID sprite{};
 	ArrowWidgetValues arrow_widget_type{};
 	ResizeWidgetValues resize_widget_type{};
+	Colours alternate_colour = INVALID_COLOUR;
 	Dimension matrix{};
 };
 
@@ -375,7 +382,6 @@ public:
 	void SetAlignment(StringAlignment align);
 
 	StringID GetString() const;
-	WidgetID GetIndex() const;
 	WidgetID GetScrollbarIndex() const;
 
 	inline void SetLowered(bool lowered);
@@ -386,7 +392,6 @@ public:
 	inline TextColour GetTextColour() const { return this->text_colour; }
 	inline FontSize GetFontSize() const { return this->text_size; }
 
-	void FillWidgetLookup(WidgetLookup &widget_lookup) override;
 	NWidgetCore *GetWidgetFromPos(int x, int y) override;
 	bool IsHighlighted() const override;
 	TextColour GetHighlightColour() const override;
@@ -395,7 +400,6 @@ public:
 	NWidgetDisplayFlags disp_flags; ///< Flags that affect display and interaction with the widget.
 	Colours colour;            ///< Colour of this widget.
 protected:
-	const WidgetID index = -1; ///< Index of the nested widget (\c -1 means 'not used').
 	WidgetData widget_data{}; ///< Data of the widget. @see Widget::data
 	StringID tool_tip{}; ///< Tooltip of the widget. @see Widget::tool_tips
 	WidgetID scrollbar_index = -1; ///< Index of an attached scrollbar.
@@ -467,7 +471,7 @@ inline bool NWidgetCore::IsDisabled() const
  */
 class NWidgetContainer : public NWidgetBase {
 public:
-	NWidgetContainer(WidgetType tp) : NWidgetBase(tp) { }
+	NWidgetContainer(WidgetType tp, WidgetID index = -1) : NWidgetBase(tp, index) {}
 
 	void AdjustPaddingForZoom() override;
 	void Add(std::unique_ptr<NWidgetBase> &&wid);
@@ -480,6 +484,7 @@ public:
 	inline bool IsEmpty() { return this->children.empty(); }
 
 	NWidgetBase *GetWidgetOfType(WidgetType tp) override;
+	void Clear() { this->children.clear(); }
 
 protected:
 	std::vector<std::unique_ptr<NWidgetBase>> children{}; ///< Child widgets in container.
@@ -506,7 +511,7 @@ enum StackedZeroSizePlanes : int {
  */
 class NWidgetStacked : public NWidgetContainer {
 public:
-	NWidgetStacked(WidgetID index) : NWidgetContainer(NWID_SELECTION), index(index) {}
+	NWidgetStacked(WidgetID index) : NWidgetContainer(NWID_SELECTION, index) {}
 
 	void SetupSmallestSize(Window *w) override;
 	void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override;
@@ -518,7 +523,6 @@ public:
 	bool SetDisplayedPlane(int plane);
 
 	int shown_plane = 0; ///< Plane being displayed (for #NWID_SELECTION only).
-	const WidgetID index = -1; ///< If non-negative, index in the #Window::widget_lookup.
 private:
 	WidgetLookup *widget_lookup = nullptr; ///< Window's widget lookup, updated in SetDisplayedPlane().
 };
@@ -533,7 +537,7 @@ using NWidContainerFlags = EnumBitSet<NWidContainerFlag, uint8_t>;
 /** Container with pre/inter/post child space. */
 class NWidgetPIPContainer : public NWidgetContainer {
 public:
-	NWidgetPIPContainer(WidgetType tp, NWidContainerFlags flags = {});
+	NWidgetPIPContainer(WidgetType tp, NWidContainerFlags flags = {}, WidgetID index = -1) : NWidgetContainer(tp, index), flags(flags) {}
 
 	void AdjustPaddingForZoom() override;
 	void SetPIP(uint8_t pip_pre, uint8_t pip_inter, uint8_t pip_post);
@@ -561,7 +565,7 @@ protected:
  */
 class NWidgetHorizontal : public NWidgetPIPContainer {
 public:
-	NWidgetHorizontal(NWidContainerFlags flags = {});
+	NWidgetHorizontal(NWidContainerFlags flags = {}, WidgetID index = -1, WidgetType type = NWID_HORIZONTAL) : NWidgetPIPContainer(type, flags, index) {}
 
 	void SetupSmallestSize(Window *w) override;
 	void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override;
@@ -573,7 +577,7 @@ public:
  */
 class NWidgetHorizontalLTR : public NWidgetHorizontal {
 public:
-	NWidgetHorizontalLTR(NWidContainerFlags flags = {});
+	NWidgetHorizontalLTR(NWidContainerFlags flags = {}, WidgetID index = -1) : NWidgetHorizontal(flags, index, NWID_HORIZONTAL_LTR) {}
 
 	void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override;
 };
@@ -584,7 +588,7 @@ public:
  */
 class NWidgetVertical : public NWidgetPIPContainer {
 public:
-	NWidgetVertical(NWidContainerFlags flags = {});
+	NWidgetVertical(NWidContainerFlags flags = {}, WidgetID index = -1) : NWidgetPIPContainer(NWID_VERTICAL, flags, index) {}
 
 	void SetupSmallestSize(Window *w) override;
 	void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override;
@@ -600,7 +604,7 @@ public:
  */
 class NWidgetMatrix : public NWidgetPIPContainer {
 public:
-	NWidgetMatrix(Colours colour, WidgetID index);
+	NWidgetMatrix(Colours colour, WidgetID index) : NWidgetPIPContainer(NWID_MATRIX, NWidContainerFlag::EqualSize, index), colour(colour) {}
 
 	void SetClicked(int clicked);
 	void SetCount(int count);
@@ -609,15 +613,13 @@ public:
 
 	void SetupSmallestSize(Window *w) override;
 	void AssignSizePosition(SizingType sizing, int x, int y, uint given_width, uint given_height, bool rtl) override;
-	void FillWidgetLookup(WidgetLookup &widget_lookup) override;
 
 	NWidgetCore *GetWidgetFromPos(int x, int y) override;
 	void Draw(const Window *w) override;
 protected:
-	const WidgetID index = -1; ///< If non-negative, index in the #Window::widget_lookup.
 	Colours colour{}; ///< Colour of this widget.
 	int clicked = -1; ///< The currently clicked element.
-	int count = -1; ///< Amount of valid elements.
+	int count = 0; ///< Amount of valid elements.
 	int current_element = 0; ///< The element currently being processed.
 	Scrollbar *sb = nullptr;  ///< The scrollbar we're associated with.
 private:
@@ -639,7 +641,6 @@ public:
 	NWidgetSpacer(int width, int height);
 
 	void SetupSmallestSize(Window *w) override;
-	void FillWidgetLookup(WidgetLookup &widget_lookup) override;
 
 	void Draw(const Window *w) override;
 	void SetDirty(const Window *w) const override;
@@ -1019,6 +1020,11 @@ struct NWidgetPartWidget {
 	WidgetID index; ///< Index of the widget.
 };
 
+struct NWidgetPartContainer {
+	NWidContainerFlags flags;
+	WidgetID index;
+};
+
 /**
  * Widget part for storing padding.
  * @ingroup NestedWidgetParts
@@ -1070,7 +1076,7 @@ struct NWidgetPartAspect {
  * Pointer to function returning a nested widget.
  * @return Nested widget (tree).
  */
-typedef std::unique_ptr<NWidgetBase> NWidgetFunctionType();
+using NWidgetFunctionType = std::unique_ptr<NWidgetBase>();
 
 /**
  * Partial widget specification to allow NWidgets to be written nested.
@@ -1088,7 +1094,7 @@ struct NWidgetPart {
 		NWidgetPartTextStyle text_style; ///< Part with text style data.
 		NWidgetPartAlignment align;      ///< Part with internal alignment.
 		NWidgetFunctionType *func_ptr;   ///< Part with a function call.
-		NWidContainerFlags cont_flags;   ///< Part with container flags.
+		NWidgetPartContainer container;   ///< Part with container flags.
 		NWidgetPartAspect aspect; ///< Part to set aspect ratio.
 
 		/* Constructors for each NWidgetPartUnion data type. */
@@ -1102,7 +1108,7 @@ struct NWidgetPart {
 		constexpr NWidgetPartUnion(NWidgetPartTextStyle text_style) : text_style(text_style) {}
 		constexpr NWidgetPartUnion(NWidgetPartAlignment align) : align(align) {}
 		constexpr NWidgetPartUnion(NWidgetFunctionType *func_ptr) : func_ptr(func_ptr) {}
-		constexpr NWidgetPartUnion(NWidContainerFlags cont_flags) : cont_flags(cont_flags) {}
+		constexpr NWidgetPartUnion(NWidgetPartContainer container) : container(container) {}
 		constexpr NWidgetPartUnion(NWidgetPartAspect aspect) : aspect(aspect) {}
 	} u;
 
@@ -1117,7 +1123,7 @@ struct NWidgetPart {
 	constexpr NWidgetPart(WidgetType type, NWidgetPartTextStyle text_style) : type(type), u(text_style) {}
 	constexpr NWidgetPart(WidgetType type, NWidgetPartAlignment align) : type(type), u(align) {}
 	constexpr NWidgetPart(WidgetType type, NWidgetFunctionType *func_ptr) : type(type), u(func_ptr) {}
-	constexpr NWidgetPart(WidgetType type, NWidContainerFlags cont_flags) : type(type), u(cont_flags) {}
+	constexpr NWidgetPart(WidgetType type, NWidgetPartContainer container) : type(type), u(container) {}
 	constexpr NWidgetPart(WidgetType type, NWidgetPartAspect aspect) : type(type), u(aspect) {}
 };
 
@@ -1143,6 +1149,25 @@ constexpr NWidgetPart SetMinimalSize(int16_t x, int16_t y)
 	return NWidgetPart{WPT_MINSIZE, Point{x, y}};
 }
 
+/**
+ * Widget part function to setting the minimal size for a toolbar spacer.
+ * @ingroup NestedWidgetParts
+ */
+constexpr NWidgetPart SetToolbarSpacerMinimalSize()
+{
+	return NWidgetPart{WPT_MINSIZE, Point{4, 0}};
+}
+
+/**
+ * Widget part function to setting the minimal size for a toolbar button.
+ * @param width Width of button, measured in multiples of the standard toolbar button size.
+ * @ingroup NestedWidgetParts
+ */
+constexpr NWidgetPart SetToolbarMinimalSize(int width)
+{
+	return NWidgetPart{WPT_MINSIZE, Point{20 * width + 2, 22}};
+}
+
 /**
  * Widget part function for setting the minimal text lines.
  * @param lines   Number of text lines.
@@ -1210,7 +1235,7 @@ constexpr NWidgetPart SetStringTip(StringID string, StringID tip = {})
 
 /**
  * Widget part function for setting the sprite and tooltip.
- * @param data Sprite of the widget.
+ * @param sprite Sprite of the widget.
  * @param tip  Tooltip of the widget.
  * @ingroup NestedWidgetParts
  */
@@ -1219,6 +1244,18 @@ constexpr NWidgetPart SetSpriteTip(SpriteID sprite, StringID tip = {})
 	return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.sprite = sprite}, tip}};
 }
 
+/**
+ * Widget part function for setting the sprite, string and tooltip.
+ * @param sprite Sprite of the widget.
+ * @param string String of the widget.
+ * @param tip  Tooltip of the widget.
+ * @ingroup NestedWidgetParts
+ */
+constexpr NWidgetPart SetSpriteStringTip(SpriteID sprite, StringID string, StringID tip = {})
+{
+	return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.string = string, .sprite = sprite}, tip}};
+}
+
 /**
  * Widget part function for setting the arrow widget type and tooltip.
  * @param widget_type Type of the widget to draw.
@@ -1241,6 +1278,17 @@ constexpr NWidgetPart SetResizeWidgetTypeTip(ResizeWidgetValues widget_type, Str
 	return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.resize_widget_type = widget_type}, tip}};
 }
 
+/**
+ * Widget part function for setting the alternate colour and tooltip.
+ * @param colour Alternate colour of the widget.
+ * @param tip Tooltip of the widget.
+ * @ingroup NestedWidgetParts
+ */
+constexpr NWidgetPart SetAlternateColourTip(Colours colour, StringID tip)
+{
+	return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.alternate_colour = colour}, tip}};
+}
+
 /**
  * Widget part function for setting the data and tooltip of WWT_MATRIX widgets
  * @param cols Number of columns. \c 0 means to use draw columns with width according to the resize step size.
@@ -1375,9 +1423,9 @@ constexpr NWidgetPart NWidget(WidgetType tp, Colours col, WidgetID idx = -1)
  * @param cont_flags Flags for the containers (#NWID_HORIZONTAL and #NWID_VERTICAL).
  * @ingroup NestedWidgetParts
  */
-constexpr NWidgetPart NWidget(WidgetType tp, NWidContainerFlags cont_flags = {})
+constexpr NWidgetPart NWidget(WidgetType tp, NWidContainerFlags cont_flags = {}, WidgetID idx = -1)
 {
-	return NWidgetPart{tp, NWidContainerFlags{cont_flags}};
+	return NWidgetPart{tp, NWidgetPartContainer{cont_flags, idx}};
 }
 
 /**
diff --git a/src/widgets/build_vehicle_widget.h b/src/widgets/build_vehicle_widget.h
index df541b8c0f..5969449f09 100644
--- a/src/widgets/build_vehicle_widget.h
+++ b/src/widgets/build_vehicle_widget.h
@@ -25,6 +25,8 @@ enum BuildVehicleWidgets : WidgetID {
 	WID_BV_SHOW_HIDE,                 ///< Button to hide or show the selected engine.
 	WID_BV_BUILD_SEL,                 ///< Build button.
 	WID_BV_RENAME,                    ///< Rename button.
+	WID_BV_CONFIGURE_BADGES, ///< Button to configure badges.
+	WID_BV_BADGE_FILTER, ///< Container for dropdown badge filters.
 };
 
 #endif /* WIDGETS_BUILD_VEHICLE_WIDGET_H */
diff --git a/src/widgets/company_widget.h b/src/widgets/company_widget.h
index 452632dccb..88605f60ef 100644
--- a/src/widgets/company_widget.h
+++ b/src/widgets/company_widget.h
@@ -169,19 +169,9 @@ enum SelectCompanyManagerFaceWidgets : WidgetID {
 
 /** Widgets of the #CompanyInfrastructureWindow class. */
 enum CompanyInfrastructureWidgets : WidgetID {
-	WID_CI_CAPTION,       ///< Caption of window.
-	WID_CI_RAIL_DESC,     ///< Description of rail.
-	WID_CI_RAIL_COUNT,    ///< Count of rail.
-	WID_CI_ROAD_DESC,     ///< Description of road.
-	WID_CI_ROAD_COUNT,    ///< Count of road.
-	WID_CI_TRAM_DESC,     ///< Description of tram.
-	WID_CI_TRAM_COUNT,    ///< Count of tram.
-	WID_CI_WATER_DESC,    ///< Description of water.
-	WID_CI_WATER_COUNT,   ///< Count of water.
-	WID_CI_STATION_DESC,  ///< Description of station.
-	WID_CI_STATION_COUNT, ///< Count of station.
-	WID_CI_TOTAL_DESC,    ///< Description of total.
-	WID_CI_TOTAL,         ///< Count of total.
+	WID_CI_CAPTION, ///< Caption of window.
+	WID_CI_LIST, ///< Infrastructure list.
+	WID_CI_SCROLLBAR, ///< Infrastructure list scrollbar.
 };
 
 /** Widgets of the #BuyCompanyWindow class. */
diff --git a/src/widgets/intro_widget.h b/src/widgets/intro_widget.h
index dcefc172be..06b0509ef2 100644
--- a/src/widgets/intro_widget.h
+++ b/src/widgets/intro_widget.h
@@ -18,10 +18,6 @@ enum SelectGameIntroWidgets : WidgetID {
 	WID_SGI_PLAY_HEIGHTMAP,        ///< Play heightmap button.
 	WID_SGI_EDIT_SCENARIO,         ///< Edit scenario button.
 	WID_SGI_PLAY_NETWORK,          ///< Play network button.
-	WID_SGI_TEMPERATE_LANDSCAPE,   ///< Select temperate landscape button.
-	WID_SGI_ARCTIC_LANDSCAPE,      ///< Select arctic landscape button.
-	WID_SGI_TROPIC_LANDSCAPE,      ///< Select tropic landscape button.
-	WID_SGI_TOYLAND_LANDSCAPE,     ///< Select toyland landscape button.
 	WID_SGI_BASESET_SELECTION,     ///< Baseset selection.
 	WID_SGI_BASESET,               ///< Baseset errors.
 	WID_SGI_TRANSLATION_SELECTION, ///< Translation selection.
@@ -29,11 +25,7 @@ enum SelectGameIntroWidgets : WidgetID {
 	WID_SGI_OPTIONS,               ///< Options button.
 	WID_SGI_HIGHSCORE,             ///< Highscore button.
 	WID_SGI_HELP,                  ///< Help and manuals button.
-	WID_SGI_SETTINGS_OPTIONS,      ///< Settings button.
-	WID_SGI_GRF_SETTINGS,          ///< NewGRF button.
 	WID_SGI_CONTENT_DOWNLOAD,      ///< Content Download button.
-	WID_SGI_AI_SETTINGS,           ///< AI button.
-	WID_SGI_GS_SETTINGS,           ///< Game Script button.
 	WID_SGI_EXIT,                  ///< Exit button.
 };
 
diff --git a/src/widgets/network_content_widget.h b/src/widgets/network_content_widget.h
index 38158272ba..3aa1d46de4 100644
--- a/src/widgets/network_content_widget.h
+++ b/src/widgets/network_content_widget.h
@@ -40,7 +40,6 @@ enum NetworkContentListWidgets : WidgetID {
 	WID_NCL_SELECT_UPDATE,  ///< 'Select updates' button.
 	WID_NCL_UNSELECT,       ///< 'Unselect all' button.
 	WID_NCL_OPEN_URL,       ///< 'Open url' button.
-	WID_NCL_CANCEL,         ///< 'Cancel' button.
 	WID_NCL_DOWNLOAD,       ///< 'Download' button.
 
 	WID_NCL_SEL_ALL_UPDATE, ///< #NWID_SELECTION widget for select all/update buttons..
diff --git a/src/widgets/network_widget.h b/src/widgets/network_widget.h
index 42aba87e18..19fe8f9cef 100644
--- a/src/widgets/network_widget.h
+++ b/src/widgets/network_widget.h
@@ -45,7 +45,6 @@ enum NetworkGameWidgets : WidgetID {
 	WID_NG_SEARCH_LAN,         ///< 'Search LAN server' button.
 	WID_NG_ADD,                ///< 'Add server' button.
 	WID_NG_START,              ///< 'Start server' button.
-	WID_NG_CANCEL,             ///< 'Cancel' button.
 };
 
 /** Widgets of the #NetworkStartServerWindow class. */
diff --git a/src/widgets/newgrf_debug_widget.h b/src/widgets/newgrf_debug_widget.h
index b4dffcaad2..1ba6524281 100644
--- a/src/widgets/newgrf_debug_widget.h
+++ b/src/widgets/newgrf_debug_widget.h
@@ -37,8 +37,8 @@ enum SpriteAlignerWidgets : WidgetID {
 	WID_SA_PICKER,      ///< Sprite picker.
 	WID_SA_LIST,        ///< Queried sprite list.
 	WID_SA_SCROLLBAR,   ///< Scrollbar for sprite list.
-	WID_SA_ZOOM,        ///< Zoom level buttons (from ZOOM_LVL_BEGIN to ZOOM_LVL_END).
-	WID_SA_ZOOM_LAST = WID_SA_ZOOM + ZOOM_LVL_END - 1, ///< Marker for last zoom level button.
+	WID_SA_ZOOM,        ///< Zoom level buttons (from ZoomLevel::Begin to ZoomLevel::Max).
+	WID_SA_ZOOM_LAST = WID_SA_ZOOM + to_underlying(ZoomLevel::Max), ///< Marker for last zoom level button.
 	WID_SA_RESET_REL,   ///< Reset relative sprite offset
 	WID_SA_CENTRE,      ///< Toggle centre sprite.
 	WID_SA_CROSSHAIR,   ///< Toggle crosshair.
diff --git a/src/widgets/newgrf_widget.h b/src/widgets/newgrf_widget.h
index d4bab8e200..d58624ab1d 100644
--- a/src/widgets/newgrf_widget.h
+++ b/src/widgets/newgrf_widget.h
@@ -23,7 +23,6 @@ enum NewGRFParametersWidgets : WidgetID {
 	WID_NP_NUMPAR_TEXT,      ///< Text description.
 	WID_NP_BACKGROUND,       ///< Panel to draw the settings on.
 	WID_NP_SCROLLBAR,        ///< Scrollbar to scroll through all settings.
-	WID_NP_ACCEPT,           ///< Accept button.
 	WID_NP_RESET,            ///< Reset button.
 	WID_NP_SHOW_DESCRIPTION, ///< #NWID_SELECTION to optionally display parameter descriptions.
 	WID_NP_DESCRIPTION,      ///< Multi-line description of a parameter.
@@ -59,7 +58,8 @@ enum NewGRFStateWidgets : WidgetID {
 	WID_NS_CONTENT_DOWNLOAD,  ///< Open content download (available NewGRFs).
 	WID_NS_CONTENT_DOWNLOAD2, ///< Open content download (active NewGRFs).
 	WID_NS_SHOW_REMOVE,       ///< Select active list buttons (0 = normal, 1 = simple layout).
-	WID_NS_SHOW_APPLY,        ///< Select display of the buttons below the 'details'.
+	WID_NS_SHOW_EDIT,         ///< Select display of the buttons below the 'details'.
+	WID_NS_SHOW_APPLY,        ///< Select display of the apply button.
 };
 
 /** Widgets of the #SavePresetWindow class. */
@@ -67,7 +67,6 @@ enum SavePresetWidgets : WidgetID {
 	WID_SVP_PRESET_LIST, ///< List with available preset names.
 	WID_SVP_SCROLLBAR,   ///< Scrollbar for the list available preset names.
 	WID_SVP_EDITBOX,     ///< Edit box for changing the preset name.
-	WID_SVP_CANCEL,      ///< Button to cancel saving the preset.
 	WID_SVP_SAVE,        ///< Button to save the preset.
 };
 
diff --git a/src/widgets/picker_widget.h b/src/widgets/picker_widget.h
index c6612c2b9d..1cc5db48a5 100644
--- a/src/widgets/picker_widget.h
+++ b/src/widgets/picker_widget.h
@@ -29,6 +29,8 @@ enum PickerClassWindowWidgets : WidgetID {
 	WID_PW_TYPE_SCROLL, ///< Scrollbar for the matrix.
 	WID_PW_TYPE_NAME, ///< Name of selected item.
 	WID_PW_TYPE_RESIZE, ///< Type resize handle.
+	WID_PW_CONFIGURE_BADGES, ///< Button to configure badges.
+	WID_PW_BADGE_FILTER, ///< Container for dropdown badge filters.
 };
 
 #endif /* WIDGETS_PICKER_WIDGET_H */
diff --git a/src/widgets/script_widget.h b/src/widgets/script_widget.h
index 253e1673ed..7b9905dcc9 100644
--- a/src/widgets/script_widget.h
+++ b/src/widgets/script_widget.h
@@ -19,7 +19,6 @@ enum ScriptListWidgets : WidgetID {
 	WID_SCRL_SCROLLBAR, ///< Scrollbar next to the Script list.
 	WID_SCRL_INFO_BG,   ///< Panel to draw some Script information on.
 	WID_SCRL_ACCEPT,    ///< Accept button.
-	WID_SCRL_CANCEL,    ///< Cancel button.
 };
 
 /** Widgets of the #ScriptSettingsWindow class. */
@@ -27,7 +26,6 @@ enum ScriptSettingsWidgets : WidgetID {
 	WID_SCRS_CAPTION,    ///< Caption of the window.
 	WID_SCRS_BACKGROUND, ///< Panel to draw the settings on.
 	WID_SCRS_SCROLLBAR,  ///< Scrollbar to scroll through all settings.
-	WID_SCRS_ACCEPT,     ///< Accept button.
 	WID_SCRS_RESET,      ///< Reset button.
 
 	WID_SCRS_SETTING_DROPDOWN = -1, ///< Dynamically created dropdown for changing setting value.
diff --git a/src/widgets/settings_widget.h b/src/widgets/settings_widget.h
index 9063d79bba..858f17f104 100644
--- a/src/widgets/settings_widget.h
+++ b/src/widgets/settings_widget.h
@@ -16,6 +16,7 @@ enum GameOptionsWidgets : WidgetID {
 	WID_GO_TAB_GRAPHICS,           ///< Graphics tab.
 	WID_GO_TAB_SOUND,              ///< Sound tab.
 	WID_GO_TAB_SOCIAL,             ///< Social tab.
+	WID_GO_TAB_ADVANCED,           ///< Advanced tab.
 	WID_GO_TAB_SELECTION,          ///< Background of the tab selection.
 	WID_GO_CURRENCY_DROPDOWN,      ///< Currency dropdown.
 	WID_GO_DISTANCE_DROPDOWN,      ///< Measuring unit dropdown.
@@ -23,11 +24,16 @@ enum GameOptionsWidgets : WidgetID {
 	WID_GO_LANG_DROPDOWN,          ///< Language dropdown.
 	WID_GO_RESOLUTION_DROPDOWN,    ///< Dropdown for the resolution.
 	WID_GO_FULLSCREEN_BUTTON,      ///< Toggle fullscreen.
+	WID_GO_FULLSCREEN_TEXT,        ///< Text for toggle fullscreen.
 	WID_GO_GUI_SCALE,              ///< GUI Scale slider.
 	WID_GO_GUI_SCALE_AUTO,         ///< Autodetect GUI scale button.
+	WID_GO_GUI_SCALE_AUTO_TEXT,    ///< Text for Autodetect GUI scale.
 	WID_GO_GUI_SCALE_BEVEL_BUTTON, ///< Toggle for chunky bevels.
+	WID_GO_GUI_SCALE_BEVEL_TEXT,   ///< Text for chunky bevels.
 	WID_GO_GUI_FONT_SPRITE,        ///< Toggle whether to prefer the sprite font over TTF fonts.
+	WID_GO_GUI_FONT_SPRITE_TEXT,   ///< Text for sprite font toggle.
 	WID_GO_GUI_FONT_AA,            ///< Toggle whether to anti-alias fonts.
+	WID_GO_GUI_FONT_AA_TEXT,       ///< Text for anti-alias toggle.
 	WID_GO_BASE_GRF_DROPDOWN,      ///< Use to select a base GRF.
 	WID_GO_BASE_GRF_PARAMETERS,    ///< Base GRF parameters.
 	WID_GO_BASE_GRF_CONTENT_DOWNLOAD, ///< 'Get Content' button for base GRF.
@@ -50,34 +56,36 @@ enum GameOptionsWidgets : WidgetID {
 	WID_GO_BASE_MUSIC_TEXTFILE,    ///< Open base music readme, changelog (+1) or license (+2).
 	WID_GO_BASE_MUSIC_DESCRIPTION = WID_GO_BASE_MUSIC_TEXTFILE + TFT_CONTENT_END, ///< Description of selected base music set.
 	WID_GO_VIDEO_ACCEL_BUTTON,     ///< Toggle for video acceleration.
+	WID_GO_VIDEO_ACCEL_TEXT,       ///< Text for video acceleration toggle.
 	WID_GO_VIDEO_VSYNC_BUTTON,     ///< Toggle for video vsync.
+	WID_GO_VIDEO_VSYNC_TEXT,       ///< Text for video vsync toggle.
 	WID_GO_REFRESH_RATE_DROPDOWN,  ///< Dropdown for all available refresh rates.
 	WID_GO_VIDEO_DRIVER_INFO,      ///< Label showing details about the current video driver.
 	WID_GO_SURVEY_SEL,             ///< Selection to hide survey if no JSON library is compiled in.
 	WID_GO_SURVEY_PARTICIPATE_BUTTON, ///< Toggle for participating in the automated survey.
+	WID_GO_SURVEY_PARTICIPATE_TEXT, ///< Text for automated survey toggle.
 	WID_GO_SURVEY_LINK_BUTTON,     ///< Button to open browser to go to the survey website.
 	WID_GO_SURVEY_PREVIEW_BUTTON,  ///< Button to open a preview window with the survey results
 	WID_GO_SOCIAL_PLUGINS,         ///< Main widget handling the social plugins.
 	WID_GO_SOCIAL_PLUGIN_TITLE,    ///< Title of the frame of the social plugin.
 	WID_GO_SOCIAL_PLUGIN_PLATFORM, ///< Platform of the social plugin.
 	WID_GO_SOCIAL_PLUGIN_STATE,    ///< State of the social plugin.
-};
 
-/** Widgets of the #GameSettingsWindow class. */
-enum GameSettingsWidgets : WidgetID {
-	WID_GS_FILTER,             ///< Text filter.
-	WID_GS_OPTIONSPANEL,       ///< Panel widget containing the option lists.
-	WID_GS_SCROLLBAR,          ///< Scrollbar.
-	WID_GS_HELP_TEXT,          ///< Information area to display help text of the selected option.
-	WID_GS_EXPAND_ALL,         ///< Expand all button.
-	WID_GS_COLLAPSE_ALL,       ///< Collapse all button.
-	WID_GS_RESET_ALL,          ///< Reset all button.
-	WID_GS_RESTRICT_CATEGORY,  ///< Label upfront to the category drop-down box to restrict the list of settings to show
-	WID_GS_RESTRICT_TYPE,      ///< Label upfront to the type drop-down box to restrict the list of settings to show
-	WID_GS_RESTRICT_DROPDOWN,  ///< The drop down box to restrict the list of settings
-	WID_GS_TYPE_DROPDOWN,      ///< The drop down box to choose client/game/company/all settings
+	WID_GO_FILTER,             ///< Text filter.
+	WID_GO_OPTIONSPANEL,       ///< Panel widget containing the option lists.
+	WID_GO_SCROLLBAR,          ///< Scrollbar.
+	WID_GO_SETTING_PROPERTIES, ///< Information area to display setting type and default value.
+	WID_GO_HELP_TEXT,          ///< Information area to display help text of the selected option.
+	WID_GO_HELP_TEXT_SCROLL,   ///< Scrollbar for setting description.
+	WID_GO_EXPAND_ALL,         ///< Expand all button.
+	WID_GO_COLLAPSE_ALL,       ///< Collapse all button.
+	WID_GO_RESET_ALL,          ///< Reset all button.
+	WID_GO_RESTRICT_CATEGORY,  ///< Label upfront to the category drop-down box to restrict the list of settings to show
+	WID_GO_RESTRICT_TYPE,      ///< Label upfront to the type drop-down box to restrict the list of settings to show
+	WID_GO_RESTRICT_DROPDOWN,  ///< The drop down box to restrict the list of settings
+	WID_GO_TYPE_DROPDOWN,      ///< The drop down box to choose client/game/company/all settings
 
-	WID_GS_SETTING_DROPDOWN = -1, ///< Dynamically created dropdown for changing setting value.
+	WID_GO_SETTING_DROPDOWN = -1, ///< Dynamically created dropdown for changing setting value.
 };
 
 /** Widgets of the #CustomCurrencyWindow class. */
diff --git a/src/widgets/town_widget.h b/src/widgets/town_widget.h
index 25446fc825..fe901339ac 100644
--- a/src/widgets/town_widget.h
+++ b/src/widgets/town_widget.h
@@ -42,6 +42,8 @@ enum TownViewWidgets : WidgetID {
 	WID_TV_CHANGE_NAME,    ///< Change the name of this town.
 	WID_TV_CATCHMENT,      ///< Toggle catchment area highlight.
 	WID_TV_EXPAND,         ///< Expand this town (scenario editor only).
+	WID_TV_EXPAND_BUILDINGS, ///< Expand number of buildings this town (scenario editor only).
+	WID_TV_EXPAND_ROADS, ///< Expand roads of this town (scenario editor only).
 	WID_TV_DELETE,         ///< Delete this town (scenario editor only).
 };
 
@@ -67,6 +69,9 @@ enum TownFoundingWidgets : WidgetID {
 	WID_TF_LAYOUT_GRID2,      ///< Selection for the 2x2 grid town layout.
 	WID_TF_LAYOUT_GRID3,      ///< Selection for the 3x3 grid town layout.
 	WID_TF_LAYOUT_RANDOM,     ///< Selection for a randomly chosen town layout.
+	WID_TF_TOWN_EXPAND_SEL, ///< Container of town expansion buttons.
+	WID_TF_EXPAND_BUILDINGS, ///< Expand buildings toggle.
+	WID_TF_EXPAND_ROADS, ///< Expand roads toggle.
 };
 
 /** Widgets of the #BuildHouseWindow class. */
diff --git a/src/window.cpp b/src/window.cpp
index 0e36096d2a..6ae18eda28 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -104,7 +104,7 @@ std::vector<WindowDesc*> *_window_descs = nullptr;
 std::string _windows_file;
 
 /** Window description constructor. */
-WindowDesc::WindowDesc(WindowPosition def_pos, const char *ini_key, int16_t def_width_trad, int16_t def_height_trad,
+WindowDesc::WindowDesc(WindowPosition def_pos, std::string_view ini_key, int16_t def_width_trad, int16_t def_height_trad,
 			WindowClass window_class, WindowClass parent_class, WindowDefaultFlags flags,
 			const std::span<const NWidgetPart> nwid_parts, HotkeyList *hotkeys,
 			const std::source_location location) :
@@ -156,7 +156,7 @@ void WindowDesc::LoadFromConfig()
 	IniFile ini;
 	ini.LoadFromDisk(_windows_file, NO_DIRECTORY);
 	for (WindowDesc *wd : *_window_descs) {
-		if (wd->ini_key == nullptr) continue;
+		if (wd->ini_key.empty()) continue;
 		IniLoadWindowSettings(ini, wd->ini_key, wd);
 	}
 }
@@ -166,8 +166,7 @@ void WindowDesc::LoadFromConfig()
  */
 static bool DescSorter(WindowDesc * const &a, WindowDesc * const &b)
 {
-	if (a->ini_key != nullptr && b->ini_key != nullptr) return strcmp(a->ini_key, b->ini_key) < 0;
-	return a->ini_key != nullptr;
+	return a->ini_key < b->ini_key;
 }
 
 /**
@@ -181,7 +180,7 @@ void WindowDesc::SaveToConfig()
 	IniFile ini;
 	ini.LoadFromDisk(_windows_file, NO_DIRECTORY);
 	for (WindowDesc *wd : *_window_descs) {
-		if (wd->ini_key == nullptr) continue;
+		if (wd->ini_key.empty()) continue;
 		IniSaveWindowSettings(ini, wd->ini_key, wd);
 	}
 	ini.SaveToDisk(_windows_file);
@@ -283,7 +282,7 @@ bool Window::IsWidgetHighlighted(WidgetID widget_index) const
  * @param index the element in the dropdown that is selected.
  * @param instant_close whether the dropdown was configured to close on mouse up.
  */
-void Window::OnDropdownClose(Point pt, WidgetID widget, int index, bool instant_close)
+void Window::OnDropdownClose(Point pt, WidgetID widget, int index, int click_result, bool instant_close)
 {
 	if (widget < 0) return;
 
@@ -291,7 +290,7 @@ void Window::OnDropdownClose(Point pt, WidgetID widget, int index, bool instant_
 		/* Send event for selected option if we're still
 		 * on the parent button of the dropdown (behaviour of the dropdowns in the main toolbar). */
 		if (GetWidgetFromPos(this, pt.x, pt.y) == widget) {
-			this->OnDropdownSelect(widget, index);
+			this->OnDropdownSelect(widget, index, click_result);
 		}
 	}
 
@@ -390,7 +389,7 @@ void Window::UpdateQueryStringSize()
  * @param to End of the string range.
  * @return Rectangle encompassing the string range, relative to the window.
  */
-/* virtual */ Rect Window::GetTextBoundingRect(const char *from, const char *to) const
+/* virtual */ Rect Window::GetTextBoundingRect(size_t from, size_t to) const
 {
 	if (this->nested_focus != nullptr && this->nested_focus->type == WWT_EDITBOX) {
 		return this->GetQueryString(this->nested_focus->GetIndex())->GetBoundingRect(this, this->nested_focus->GetIndex(), from, to);
@@ -685,8 +684,13 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, int click_count)
 
 		case WWT_DEFSIZEBOX: {
 			if (_ctrl_pressed) {
-				w->window_desc.pref_width = w->width;
-				w->window_desc.pref_height = w->height;
+				if (click_count > 1) {
+					w->window_desc.pref_width = 0;
+					w->window_desc.pref_height = 0;
+				} else {
+					w->window_desc.pref_width = w->width;
+					w->window_desc.pref_height = w->height;
+				}
 			} else {
 				int16_t def_width = std::max<int16_t>(std::min<int16_t>(w->window_desc.GetDefaultWidth(), _screen.width), w->nested_root->smallest_x);
 				int16_t def_height = std::max<int16_t>(std::min<int16_t>(w->window_desc.GetDefaultHeight(), _screen.height - 50), w->nested_root->smallest_y);
@@ -814,7 +818,10 @@ static void DispatchMouseWheelEvent(Window *w, NWidgetCore *nwid, int wheel)
 	if (nwid->type == NWID_VSCROLLBAR) {
 		NWidgetScrollbar *sb = static_cast<NWidgetScrollbar *>(nwid);
 		if (sb->GetCount() > sb->GetCapacity()) {
-			if (sb->UpdatePosition(wheel)) w->SetDirty();
+			if (sb->UpdatePosition(wheel)) {
+				w->OnScrollbarScroll(nwid->GetIndex());
+				w->SetDirty();
+			}
 		}
 		return;
 	}
@@ -822,7 +829,10 @@ static void DispatchMouseWheelEvent(Window *w, NWidgetCore *nwid, int wheel)
 	/* Scroll the widget attached to the scrollbar. */
 	Scrollbar *sb = (nwid->GetScrollbarIndex() >= 0 ? w->GetScrollbar(nwid->GetScrollbarIndex()) : nullptr);
 	if (sb != nullptr && sb->GetCount() > sb->GetCapacity()) {
-		if (sb->UpdatePosition(wheel)) w->SetDirty();
+		if (sb->UpdatePosition(wheel)) {
+			w->OnScrollbarScroll(nwid->GetScrollbarIndex());
+			w->SetDirty();
+		}
 	}
 }
 
@@ -909,7 +919,7 @@ static void DrawOverlappedWindow(Window *w, int left, int top, int right, int bo
 	dp->top = top - w->top;
 	dp->pitch = _screen.pitch;
 	dp->dst_ptr = BlitterFactory::GetCurrentBlitter()->MoveTo(_screen.dst_ptr, left, top);
-	dp->zoom = ZOOM_LVL_MIN;
+	dp->zoom = ZoomLevel::Min;
 	w->OnPaint();
 }
 
@@ -985,7 +995,7 @@ void Window::ReInit(int rx, int ry, bool reposition)
 	if (reposition) {
 		Point pt = this->OnInitialPosition(this->nested_root->smallest_x, this->nested_root->smallest_y, window_number);
 		this->InitializePositionSize(pt.x, pt.y, this->nested_root->smallest_x, this->nested_root->smallest_y);
-		this->FindWindowPlacementAndResize(this->window_desc.GetDefaultWidth(), this->window_desc.GetDefaultHeight());
+		this->FindWindowPlacementAndResize(this->window_desc.GetDefaultWidth(), this->window_desc.GetDefaultHeight(), false);
 	}
 
 	ResizeWindow(this, dx, dy, true, false);
@@ -1020,9 +1030,8 @@ void Window::SetShaded(bool make_shaded)
 
 /**
  * Find the Window whose parent pointer points to this window
- * @param w parent Window to find child of
- * @param wc Window class of the window to remove; #WC_INVALID if class does not matter
- * @return a Window pointer that is the child of \a w, or \c nullptr otherwise
+ * @param wc Window class of the window to find; #WC_INVALID if class does not matter
+ * @return a Window pointer that is the child of this window, or \c nullptr otherwise
  */
 Window *Window::FindChildWindow(WindowClass wc) const
 {
@@ -1033,6 +1042,21 @@ Window *Window::FindChildWindow(WindowClass wc) const
 	return nullptr;
 }
 
+/**
+ * Find the Window whose parent pointer points to this window
+ * @param wc Window class of the window to find.
+ * @param number Window number of the window to find.
+ * @return a Window pointer that is the child of this window, or \c nullptr otherwise
+ */
+Window *Window::FindChildWindowById(WindowClass wc, WindowNumber number) const
+{
+	for (Window *v : Window::Iterate()) {
+		if (wc == v->window_class && number == v->window_number && v->parent == this) return v;
+	}
+
+	return nullptr;
+}
+
 /**
  * Close all children a window might have in a head-recursive manner
  * @param wc Window class of the window to remove; #WC_INVALID if class does not matter
@@ -1046,6 +1070,21 @@ void Window::CloseChildWindows(WindowClass wc) const
 	}
 }
 
+
+/**
+ * Close all children a window might have in a head-recursive manner
+ * @param wc Window class of the window to remove.
+ * @param number Window number of the window to remove.
+ */
+void Window::CloseChildWindowById(WindowClass wc, WindowNumber number) const
+{
+	Window *child = this->FindChildWindowById(wc, number);
+	while (child != nullptr) {
+		child->Close();
+		child = this->FindChildWindowById(wc, number);
+	}
+}
+
 /**
  * Hide the window and all its child windows, and mark them for a later deletion.
  */
@@ -1418,39 +1457,42 @@ void Window::InitializePositionSize(int x, int y, int sm_width, int sm_height)
  * done here.
  * @param def_width default width in pixels of the window
  * @param def_height default height in pixels of the window
+ * @param allow_resize Set if resizing is permitted.
  * @see Window::Window(), Window::InitializeData(), Window::InitializePositionSize()
  */
-void Window::FindWindowPlacementAndResize(int def_width, int def_height)
+void Window::FindWindowPlacementAndResize(int def_width, int def_height, bool allow_resize)
 {
-	def_width  = std::max(def_width,  this->width); // Don't allow default size to be smaller than smallest size
-	def_height = std::max(def_height, this->height);
-	/* Try to make windows smaller when our window is too small.
-	 * w->(width|height) is normally the same as min_(width|height),
-	 * but this way the GUIs can be made a little more dynamic;
-	 * one can use the same spec for multiple windows and those
-	 * can then determine the real minimum size of the window. */
-	if (this->width != def_width || this->height != def_height) {
-		/* Think about the overlapping toolbars when determining the minimum window size */
-		int free_height = _screen.height;
-		const Window *wt = FindWindowById(WC_STATUS_BAR, 0);
-		if (wt != nullptr) free_height -= wt->height;
-		wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
-		if (wt != nullptr) free_height -= wt->height;
+	if (allow_resize) {
+		def_width  = std::max(def_width,  this->width); // Don't allow default size to be smaller than smallest size
+		def_height = std::max(def_height, this->height);
+		/* Try to make windows smaller when our window is too small.
+		 * w->(width|height) is normally the same as min_(width|height),
+		 * but this way the GUIs can be made a little more dynamic;
+		 * one can use the same spec for multiple windows and those
+		 * can then determine the real minimum size of the window. */
+		if (this->width != def_width || this->height != def_height) {
+			/* Think about the overlapping toolbars when determining the minimum window size */
+			int free_height = _screen.height;
+			const Window *wt = FindWindowById(WC_STATUS_BAR, 0);
+			if (wt != nullptr) free_height -= wt->height;
+			wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
+			if (wt != nullptr) free_height -= wt->height;
 
-		int enlarge_x = std::max(std::min(def_width  - this->width,  _screen.width - this->width),  0);
-		int enlarge_y = std::max(std::min(def_height - this->height, free_height   - this->height), 0);
+			int enlarge_x = std::max(std::min(def_width  - this->width,  _screen.width - this->width),  0);
+			int enlarge_y = std::max(std::min(def_height - this->height, free_height   - this->height), 0);
 
-		/* X and Y has to go by step.. calculate it.
-		 * The cast to int is necessary else x/y are implicitly casted to
-		 * unsigned int, which won't work. */
-		if (this->resize.step_width  > 1) enlarge_x -= enlarge_x % (int)this->resize.step_width;
-		if (this->resize.step_height > 1) enlarge_y -= enlarge_y % (int)this->resize.step_height;
+			/* X and Y has to go by step.. calculate it.
+			 * The cast to int is necessary else x/y are implicitly casted to
+			 * unsigned int, which won't work. */
+			if (this->resize.step_width  > 1) enlarge_x -= enlarge_x % (int)this->resize.step_width;
+			if (this->resize.step_height > 1) enlarge_y -= enlarge_y % (int)this->resize.step_height;
 
-		ResizeWindow(this, enlarge_x, enlarge_y, true, false);
-		/* ResizeWindow() calls this->OnResize(). */
-	} else {
-		/* Always call OnResize; that way the scrollbars and matrices get initialized. */
-		this->OnResize();
+			ResizeWindow(this, enlarge_x, enlarge_y, true, false);
+			/* ResizeWindow() calls this->OnResize(). */
+		} else {
+			/* Always call OnResize; that way the scrollbars and matrices get initialized. */
+			this->OnResize();
+		}
 	}
 
 	int nx = this->left;
@@ -1739,7 +1781,7 @@ void Window::FinishInitNested(WindowNumber window_number)
 	this->ApplyDefaults();
 	Point pt = this->OnInitialPosition(this->nested_root->smallest_x, this->nested_root->smallest_y, window_number);
 	this->InitializePositionSize(pt.x, pt.y, this->nested_root->smallest_x, this->nested_root->smallest_y);
-	this->FindWindowPlacementAndResize(this->window_desc.GetDefaultWidth(), this->window_desc.GetDefaultHeight());
+	this->FindWindowPlacementAndResize(this->window_desc.GetDefaultWidth(), this->window_desc.GetDefaultHeight(), true);
 }
 
 /**
@@ -1837,7 +1879,7 @@ static void DecreaseWindowCounters()
 				if (nwid->type == NWID_HSCROLLBAR || nwid->type == NWID_VSCROLLBAR) {
 					NWidgetScrollbar *sb = static_cast<NWidgetScrollbar*>(nwid);
 					if (sb->disp_flags.Any({NWidgetDisplayFlag::ScrollbarUp, NWidgetDisplayFlag::ScrollbarDown})) {
-						sb->disp_flags.Reset(NWidgetDisplayFlag::ScrollbarUp).Reset(NWidgetDisplayFlag::ScrollbarDown);
+						sb->disp_flags.Reset({NWidgetDisplayFlag::ScrollbarUp, NWidgetDisplayFlag::ScrollbarDown});
 						w->mouse_capture_widget = -1;
 						sb->SetDirty(w);
 					}
@@ -2306,7 +2348,10 @@ static void HandleScrollbarScrolling(Window *w)
 	if (sb->disp_flags.Any({NWidgetDisplayFlag::ScrollbarUp, NWidgetDisplayFlag::ScrollbarDown})) {
 		if (_scroller_click_timeout == 1) {
 			_scroller_click_timeout = 3;
-			if (sb->UpdatePosition(rtl == sb->disp_flags.Test(NWidgetDisplayFlag::ScrollbarUp) ? 1 : -1)) w->SetDirty();
+			if (sb->UpdatePosition(rtl == sb->disp_flags.Test(NWidgetDisplayFlag::ScrollbarUp) ? 1 : -1)) {
+				w->OnScrollbarScroll(w->mouse_capture_widget);
+				w->SetDirty();
+			}
 		}
 		return;
 	}
@@ -2315,9 +2360,12 @@ static void HandleScrollbarScrolling(Window *w)
 	int range = sb->GetCount() - sb->GetCapacity();
 	if (range <= 0) return;
 
-	int pos = RoundDivSU((i + _scrollbar_start_pos) * range, _scrollbar_size);
+	int pos = RoundDivSU((i + _scrollbar_start_pos) * range, std::max(1, _scrollbar_size));
 	if (rtl) pos = range - pos;
-	if (sb->SetPosition(pos)) w->SetDirty();
+	if (sb->SetPosition(pos)) {
+		w->OnScrollbarScroll(w->mouse_capture_widget);
+		w->SetDirty();
+	}
 }
 
 /**
@@ -2532,7 +2580,7 @@ EventState Window::HandleEditBoxKey(WidgetID wid, char32_t key, uint16_t keycode
 			break;
 
 		case QueryString::ACTION_CLEAR:
-			if (StrEmpty(query->text.GetText())) {
+			if (query->text.GetText().empty()) {
 				/* If already empty, unfocus instead */
 				this->UnfocusFocusedWidget();
 			} else {
@@ -2639,7 +2687,7 @@ void HandleCtrlChanged()
  * @param wid Edit box widget.
  * @param str Text string to insert.
  */
-/* virtual */ void Window::InsertTextString(WidgetID wid, const char *str, bool marked, const char *caret, const char *insert_location, const char *replacement_end)
+/* virtual */ void Window::InsertTextString(WidgetID wid, std::string_view str, bool marked, std::optional<size_t> caret, std::optional<size_t> insert_location, std::optional<size_t> replacement_end)
 {
 	QueryString *query = this->GetQueryString(wid);
 	if (query == nullptr) return;
@@ -2656,21 +2704,13 @@ void HandleCtrlChanged()
  * @param marked Is the input a marked composition string from an IME?
  * @param caret Move the caret to this point in the insertion string.
  */
-void HandleTextInput(const char *str, bool marked, const char *caret, const char *insert_location, const char *replacement_end)
+void HandleTextInput(std::string_view str, bool marked, std::optional<size_t> caret, std::optional<size_t> insert_location, std::optional<size_t> replacement_end)
 {
 	if (!EditBoxInGlobalFocus()) return;
 
 	_focused_window->InsertTextString(_focused_window->window_class == WC_CONSOLE ? 0 : _focused_window->nested_focus->GetIndex(), str, marked, caret, insert_location, replacement_end);
 }
 
-/**
- * Local counter that is incremented each time an mouse input event is detected.
- * The counter is used to stop auto-scrolling.
- * @see HandleAutoscroll()
- * @see HandleMouseEvents()
- */
-static int _input_events_this_tick = 0;
-
 /**
  * If needed and switched on, perform auto scrolling (automatically
  * moving window contents when mouse is near edge of the window).
@@ -2816,7 +2856,11 @@ static void MouseLoop(MouseClick click, int mousewheel)
 
 	if (mousewheel != 0) {
 		/* Send mousewheel event to window, unless we're scrolling a viewport or the map */
-		if (!scrollwheel_scrolling || (vp == nullptr && w->window_class != WC_SMALLMAP)) w->OnMouseWheel(mousewheel);
+		if (!scrollwheel_scrolling || (vp == nullptr && w->window_class != WC_SMALLMAP)) {
+			if (NWidgetCore *nwid = w->nested_root->GetWidgetFromPos(x - w->left, y - w->top); nwid != nullptr) {
+				w->OnMouseWheel(mousewheel, nwid->GetIndex());
+			}
+		}
 
 		/* Dispatch a MouseWheelEvent for widgets if it is not a viewport */
 		if (vp == nullptr) DispatchMouseWheelEvent(w, w->nested_root->GetWidgetFromPos(x - w->left, y - w->top), mousewheel);
@@ -2893,14 +2937,6 @@ void HandleMouseEvents()
 	 * But there is no company related window open anyway, so _current_company is not used. */
 	assert(HasModalProgress() || IsLocalCompany());
 
-	/* Handle sprite picker before any GUI interaction */
-	if (_newgrf_debug_sprite_picker.mode == SPM_REDRAW && _input_events_this_tick == 0) {
-		/* We are done with the last draw-frame, so we know what sprites we
-		 * clicked on. Reset the picker mode and invalidate the window. */
-		_newgrf_debug_sprite_picker.mode = SPM_NONE;
-		InvalidateWindowData(WC_SPRITE_ALIGNER, 0, 1);
-	}
-
 	static std::chrono::steady_clock::time_point double_click_time = {};
 	static Point double_click_pos = {0, 0};
 
@@ -2916,18 +2952,15 @@ void HandleMouseEvents()
 		double_click_time = std::chrono::steady_clock::now();
 		double_click_pos = _cursor.pos;
 		_left_button_clicked = true;
-		_input_events_this_tick++;
 	} else if (_right_button_clicked) {
 		_right_button_clicked = false;
 		click = MC_RIGHT;
-		_input_events_this_tick++;
 	}
 
 	int mousewheel = 0;
 	if (_cursor.wheel) {
 		mousewheel = _cursor.wheel;
 		_cursor.wheel = 0;
-		_input_events_this_tick++;
 	}
 
 	static std::chrono::steady_clock::time_point hover_time = {};
@@ -2943,7 +2976,6 @@ void HandleMouseEvents()
 		} else if (!_mouse_hovering) {
 			if (std::chrono::steady_clock::now() > hover_time + std::chrono::milliseconds(_settings_client.gui.hover_delay_ms)) {
 				click = MC_HOVER;
-				_input_events_this_tick++;
 				_mouse_hovering = true;
 				hover_time = std::chrono::steady_clock::now();
 			}
@@ -3006,29 +3038,31 @@ void InputLoop()
 	/* Process scheduled window deletion. */
 	Window::DeleteClosedWindows();
 
-	if (_input_events_this_tick != 0) {
-		/* The input loop is called only once per GameLoop() - so we can clear the counter here */
-		_input_events_this_tick = 0;
-		/* there were some inputs this tick, don't scroll ??? */
-		return;
-	}
-
 	/* HandleMouseEvents was already called for this tick */
 	HandleMouseEvents();
 }
 
+static std::chrono::time_point<std::chrono::steady_clock> _realtime_tick_start;
+
+bool CanContinueRealtimeTick()
+{
+	auto now = std::chrono::steady_clock::now();
+	return std::chrono::duration_cast<std::chrono::milliseconds>(now - _realtime_tick_start).count() < (MILLISECONDS_PER_TICK * 3 / 4);
+}
+
 /**
  * Dispatch OnRealtimeTick event over all windows
  */
 void CallWindowRealtimeTickEvent(uint delta_ms)
 {
+	_realtime_tick_start = std::chrono::steady_clock::now();
 	for (Window *w : Window::Iterate()) {
 		w->OnRealtimeTick(delta_ms);
 	}
 }
 
 /** Update various of window-related information on a regular interval. */
-static IntervalTimer<TimerWindow> window_interval(std::chrono::milliseconds(30), [](auto) {
+static const IntervalTimer<TimerWindow> window_interval(std::chrono::milliseconds(30), [](auto) {
 	extern int _caret_timer;
 	_caret_timer += 3;
 	CursorTick();
@@ -3039,12 +3073,12 @@ static IntervalTimer<TimerWindow> window_interval(std::chrono::milliseconds(30),
 });
 
 /** Blink the window highlight colour constantly. */
-static IntervalTimer<TimerWindow> highlight_interval(std::chrono::milliseconds(450), [](auto) {
+static const IntervalTimer<TimerWindow> highlight_interval(TIMER_BLINK_INTERVAL, [](auto) {
 	_window_highlight_colour = !_window_highlight_colour;
 });
 
 /** Blink all windows marked with a white border. */
-static IntervalTimer<TimerWindow> white_border_interval(std::chrono::milliseconds(30), [](auto) {
+static const IntervalTimer<TimerWindow> white_border_interval(std::chrono::milliseconds(30), [](auto) {
 	if (_network_dedicated) return;
 
 	for (Window *w : Window::Iterate()) {
@@ -3096,6 +3130,13 @@ void UpdateWindows()
 	NetworkDrawChatMessage();
 	/* Redraw mouse cursor in case it was hidden */
 	DrawMouseCursor();
+
+	if (_newgrf_debug_sprite_picker.mode == SPM_REDRAW) {
+		/* We are done with the last draw-frame, so we know what sprites we
+		 * clicked on. Reset the picker mode and invalidate the window. */
+		_newgrf_debug_sprite_picker.mode = SPM_NONE;
+		InvalidateWindowData(WC_SPRITE_ALIGNER, 0, 1);
+	}
 }
 
 /**
diff --git a/src/window_gui.h b/src/window_gui.h
index 6da0e607a9..edfbf94da8 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -67,7 +67,6 @@ public:
 
 	static constexpr float ASPECT_LOCATION = 12.f / 14.f;
 	static constexpr float ASPECT_RENAME = 12.f / 14.f;
-	static constexpr float ASPECT_SETTINGS_BUTTON = 21.f / 12.f;
 	static constexpr float ASPECT_TOGGLE_SIZE = 12.f / 14.f;
 	static constexpr float ASPECT_LEFT_RIGHT_BUTTON = 8.f / 12.f;
 	static constexpr float ASPECT_UP_DOWN_BUTTON = 11.f / 12.f;
@@ -167,7 +166,7 @@ struct HotkeyList;
  */
 struct WindowDesc {
 
-	WindowDesc(WindowPosition default_pos, const char *ini_key, int16_t def_width_trad, int16_t def_height_trad,
+	WindowDesc(WindowPosition default_pos, std::string_view ini_key, int16_t def_width_trad, int16_t def_height_trad,
 			WindowClass window_class, WindowClass parent_class, WindowDefaultFlags flags,
 			const std::span<const NWidgetPart> nwid_parts, HotkeyList *hotkeys = nullptr,
 			const std::source_location location = std::source_location::current());
@@ -178,7 +177,7 @@ struct WindowDesc {
 	const WindowPosition default_pos; ///< Preferred position of the window. @see WindowPosition()
 	const WindowClass cls; ///< Class of the window, @see WindowClass.
 	const WindowClass parent_cls; ///< Class of the parent window. @see WindowClass
-	const char *ini_key; ///< Key to store window defaults in openttd.cfg. \c nullptr if nothing shall be stored.
+	const std::string_view ini_key; ///< Key to store window defaults in openttd.cfg. An empty string if nothing shall be stored.
 	const WindowDefaultFlags flags; ///< Flags. @see WindowDefaultFlag
 	const std::span<const NWidgetPart> nwid_parts; ///< Span of nested widget parts describing the window.
 	const HotkeyList *hotkeys; ///< Hotkeys for the window.
@@ -278,7 +277,7 @@ private:
 protected:
 	void InitializeData(WindowNumber window_number);
 	void InitializePositionSize(int x, int y, int min_width, int min_height);
-	virtual void FindWindowPlacementAndResize(int def_width, int def_height);
+	virtual void FindWindowPlacementAndResize(int def_width, int def_height, bool allow_resize);
 
 	std::vector<int> scheduled_invalidation_data{}; ///< Data of scheduled OnInvalidateData() calls.
 	bool scheduled_resize = false; ///< Set if window has been resized.
@@ -343,7 +342,7 @@ public:
 
 	virtual const struct Textbuf *GetFocusedTextbuf() const;
 	virtual Point GetCaretPosition() const;
-	virtual Rect GetTextBoundingRect(const char *from, const char *to) const;
+	virtual Rect GetTextBoundingRect(size_t from, size_t to) const;
 	virtual ptrdiff_t GetTextCharacterAtPosition(const Point &pt) const;
 
 	void InitNested(WindowNumber number = 0);
@@ -498,7 +497,7 @@ public:
 	bool SetFocusedWidget(WidgetID widget_index);
 
 	EventState HandleEditBoxKey(WidgetID wid, char32_t key, uint16_t keycode);
-	virtual void InsertTextString(WidgetID wid, const char *str, bool marked, const char *caret, const char *insert_location, const char *replacement_end);
+	virtual void InsertTextString(WidgetID wid, std::string_view str, bool marked, std::optional<size_t> caret, std::optional<size_t> insert_location, std::optional<size_t> replacement_end);
 
 	void HandleButtonClick(WidgetID widget);
 	int GetRowFromWidget(int clickpos, WidgetID widget, int padding, int line_height = -1) const;
@@ -547,7 +546,9 @@ public:
 	static int SortButtonWidth();
 
 	Window *FindChildWindow(WindowClass wc = WC_INVALID) const;
+	Window *FindChildWindowById(WindowClass wc, WindowNumber number) const;
 	void CloseChildWindows(WindowClass wc = WC_INVALID) const;
+	void CloseChildWindowById(WindowClass wc, WindowNumber number) const;
 	virtual void Close(int data = 0);
 	static void DeleteClosedWindows();
 
@@ -710,6 +711,13 @@ public:
 	 */
 	virtual void OnScroll([[maybe_unused]] Point delta) {}
 
+	/**
+	 * Notify window that a scrollbar position has been updated.
+	 * @note Only called when the user scrolls, not if a window moves its scrollbar.
+	 * @param widget the scrollbar widget index.
+	 */
+	virtual void OnScrollbarScroll([[maybe_unused]] WidgetID widget) {}
+
 	/**
 	 * The mouse is currently moving over the window or has just moved outside
 	 * of the window. In the latter case pt is (-1, -1).
@@ -721,8 +729,9 @@ public:
 	/**
 	 * The mouse wheel has been turned.
 	 * @param wheel the amount of movement of the mouse wheel.
+	 * @param widget the widget the mouse hovers over.
 	 */
-	virtual void OnMouseWheel([[maybe_unused]] int wheel) {}
+	virtual void OnMouseWheel([[maybe_unused]] int wheel, [[maybe_unused]] WidgetID widget) {}
 
 
 	/**
@@ -757,9 +766,9 @@ public:
 	 * @param widget the widget (button) that the dropdown is associated with.
 	 * @param index  the element in the dropdown that is selected.
 	 */
-	virtual void OnDropdownSelect([[maybe_unused]] WidgetID widget, [[maybe_unused]] int index) {}
+	virtual void OnDropdownSelect([[maybe_unused]] WidgetID widget, [[maybe_unused]] int index, [[maybe_unused]] int click_result) {}
 
-	virtual void OnDropdownClose(Point pt, WidgetID widget, int index, bool instant_close);
+	virtual void OnDropdownClose(Point pt, WidgetID widget, int index, int click_result, bool instant_close);
 
 	/**
 	 * The text in an editbox has been edited.
diff --git a/src/window_type.h b/src/window_type.h
index 62de2281cf..28f72486b7 100644
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -733,7 +733,6 @@ enum GameOptionsInvalidationData : uint8_t {
 	GOID_NEWGRF_CURRENT_LOADED,  ///< The current list of active NewGRF has been loaded.
 	GOID_NEWGRF_LIST_EDITED,     ///< List of active NewGRFs is being edited.
 	GOID_NEWGRF_CHANGES_MADE,    ///< Changes have been made to a given NewGRF either through the palette or its parameters.
-	GOID_NEWGRF_CHANGES_APPLIED, ///< The active NewGRF list changes have been applied.
 };
 
 struct Window;
diff --git a/src/zoom_func.h b/src/zoom_func.h
index 4b998839f0..5c0ba18bcf 100644
--- a/src/zoom_func.h
+++ b/src/zoom_func.h
@@ -13,7 +13,7 @@
 #include "zoom_type.h"
 
 /**
- * Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_MIN)
+ * Scale by zoom level, usually shift left (when zoom > ZoomLevel::Min)
  * When shifting right, value is rounded up
  * @param value value to shift
  * @param zoom  zoom level to shift to
@@ -21,11 +21,11 @@
  */
 inline int ScaleByZoom(int value, ZoomLevel zoom)
 {
-	return value << zoom;
+	return value << to_underlying(zoom);
 }
 
 /**
- * Scale by zoom level, usually shift right (when zoom > ZOOM_LVL_MIN)
+ * Scale by zoom level, usually shift right (when zoom > ZoomLevel::Min)
  * When shifting right, value is rounded up
  * @param value value to shift
  * @param zoom  zoom level to shift to
@@ -33,7 +33,7 @@ inline int ScaleByZoom(int value, ZoomLevel zoom)
  */
 inline int UnScaleByZoom(int value, ZoomLevel zoom)
 {
-	return (value + (1 << zoom) - 1) >> zoom;
+	return (value + (1 << to_underlying(zoom)) - 1) >> to_underlying(zoom);
 }
 
 /**
@@ -44,34 +44,34 @@ inline int UnScaleByZoom(int value, ZoomLevel zoom)
  */
 inline int AdjustByZoom(int value, int zoom)
 {
-	return zoom < 0 ? UnScaleByZoom(value, ZoomLevel(-zoom)) : ScaleByZoom(value, ZoomLevel(zoom));
+	return zoom < 0 ? UnScaleByZoom(value, static_cast<ZoomLevel>(-zoom)) : ScaleByZoom(value, static_cast<ZoomLevel>(zoom));
 }
 
 /**
- * Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_MIN)
+ * Scale by zoom level, usually shift left (when zoom > ZoomLevel::Min)
  * @param value value to shift
  * @param zoom  zoom level to shift to
  * @return shifted value
  */
 inline int ScaleByZoomLower(int value, ZoomLevel zoom)
 {
-	return value << zoom;
+	return value << to_underlying(zoom);
 }
 
 /**
- * Scale by zoom level, usually shift right (when zoom > ZOOM_LVL_MIN)
+ * Scale by zoom level, usually shift right (when zoom > ZoomLevel::Min)
  * @param value value to shift
  * @param zoom  zoom level to shift to
  * @return shifted value
  */
 inline int UnScaleByZoomLower(int value, ZoomLevel zoom)
 {
-	return value >> zoom;
+	return value >> to_underlying(zoom);
 }
 
 /**
  * Short-hand to apply GUI zoom level.
- * @param value Pixel amount at #ZOOM_LVL_MIN (full zoom in).
+ * @param value Pixel amount at #ZoomLevel::Min (full zoom in).
  * @return Pixel amount at #ZOOM_LVL_GUI (current interface size).
  */
 inline int UnScaleGUI(int value)
@@ -86,7 +86,7 @@ inline int UnScaleGUI(int value)
  */
 inline ZoomLevel ScaleZoomGUI(ZoomLevel value)
 {
-	return std::clamp(ZoomLevel(value + (ZOOM_LVL_GUI - ZOOM_LVL_NORMAL)), ZOOM_LVL_MIN, ZOOM_LVL_MAX);
+	return std::clamp(value + (ZOOM_LVL_GUI - ZoomLevel::Normal), ZoomLevel::Min, ZoomLevel::Max);
 }
 
 /**
@@ -96,7 +96,7 @@ inline ZoomLevel ScaleZoomGUI(ZoomLevel value)
  */
 inline ZoomLevel UnScaleZoomGUI(ZoomLevel value)
 {
-	return std::clamp(ZoomLevel(value - (ZOOM_LVL_GUI - ZOOM_LVL_NORMAL)), ZOOM_LVL_MIN, ZOOM_LVL_MAX);
+	return std::clamp(value - (ZOOM_LVL_GUI - ZoomLevel::Normal), ZoomLevel::Min, ZoomLevel::Max);
 }
 
 /**
diff --git a/src/zoom_type.h b/src/zoom_type.h
index 2308ac6dd0..4a026c29c1 100644
--- a/src/zoom_type.h
+++ b/src/zoom_type.h
@@ -13,38 +13,38 @@
 #include "core/enum_type.hpp"
 
 /** All zoom levels we know. */
-enum ZoomLevel : uint8_t {
+enum class ZoomLevel : uint8_t {
 	/* Our possible zoom-levels */
-	ZOOM_LVL_BEGIN  = 0, ///< Begin for iteration.
-	ZOOM_LVL_IN_4X  = 0, ///< Zoomed 4 times in.
-	ZOOM_LVL_IN_2X,      ///< Zoomed 2 times in.
-	ZOOM_LVL_NORMAL,     ///< The normal zoom level.
-	ZOOM_LVL_OUT_2X,     ///< Zoomed 2 times out.
-	ZOOM_LVL_OUT_4X,     ///< Zoomed 4 times out.
-	ZOOM_LVL_OUT_8X,     ///< Zoomed 8 times out.
-	ZOOM_LVL_END,        ///< End for iteration.
+	Begin = 0, ///< Begin for iteration.
+	Min = Begin, ///< Minimum zoom level.
+	In4x = Begin, ///< Zoomed 4 times in.
+	In2x, ///< Zoomed 2 times in.
+	Normal, ///< The normal zoom level.
+	Out2x, ///< Zoomed 2 times out.
+	Out4x, ///< Zoomed 4 times out.
+	Out8x, ///< Zoomed 8 times out.
+	Max = Out8x, ///< Maximum zoom level.
+	End, ///< End for iteration.
 
 	/* Here we define in which zoom viewports are */
-	ZOOM_LVL_VIEWPORT = ZOOM_LVL_NORMAL, ///< Default zoom level for viewports.
-	ZOOM_LVL_NEWS     = ZOOM_LVL_NORMAL, ///< Default zoom level for the news messages.
-	ZOOM_LVL_INDUSTRY = ZOOM_LVL_OUT_2X, ///< Default zoom level for the industry view.
-	ZOOM_LVL_TOWN     = ZOOM_LVL_NORMAL, ///< Default zoom level for the town view.
-	ZOOM_LVL_AIRCRAFT = ZOOM_LVL_NORMAL, ///< Default zoom level for the aircraft view.
-	ZOOM_LVL_SHIP     = ZOOM_LVL_NORMAL, ///< Default zoom level for the ship view.
-	ZOOM_LVL_TRAIN    = ZOOM_LVL_NORMAL, ///< Default zoom level for the train view.
-	ZOOM_LVL_ROADVEH  = ZOOM_LVL_NORMAL, ///< Default zoom level for the road vehicle view.
-	ZOOM_LVL_WORLD_SCREENSHOT = ZOOM_LVL_NORMAL, ///< Default zoom level for the world screen shot.
+	Viewport = Normal, ///< Default zoom level for viewports.
+	News = Normal, ///< Default zoom level for the news messages.
+	Industry = Out2x, ///< Default zoom level for the industry view.
+	Town = Normal, ///< Default zoom level for the town view.
+	Aircraft = Normal, ///< Default zoom level for the aircraft view.
+	Ship = Normal, ///< Default zoom level for the ship view.
+	Train = Normal, ///< Default zoom level for the train view.
+	RoadVehicle = Normal, ///< Default zoom level for the road vehicle view.
+	WorldScreenshot = Normal, ///< Default zoom level for the world screen shot.
 
-	ZOOM_LVL_DETAIL = ZOOM_LVL_OUT_2X, ///< All zoom levels below or equal to this will result in details on the screen, like road-work, ...
-	ZOOM_LVL_TEXT_EFFECT = ZOOM_LVL_OUT_2X, ///< All zoom levels above this will not show text effects.
-
-	ZOOM_LVL_MIN      = ZOOM_LVL_IN_4X, ///< Minimum zoom level.
-	ZOOM_LVL_MAX      = ZOOM_LVL_OUT_8X, ///< Maximum zoom level.
+	Detail = Out2x, ///< All zoom levels below or equal to this will result in details on the screen, like road-work, ...
+	TextEffect = Out2x, ///< All zoom levels above this will not show text effects.
 };
 DECLARE_INCREMENT_DECREMENT_OPERATORS(ZoomLevel)
-DECLARE_ENUM_AS_ADDABLE(ZoomLevel)
+DECLARE_ENUM_AS_SEQUENTIAL(ZoomLevel)
+using ZoomLevels = EnumBitSet<ZoomLevel, uint8_t>;
 
-static uint const ZOOM_BASE_SHIFT = static_cast<uint>(ZOOM_LVL_NORMAL);
+static const uint ZOOM_BASE_SHIFT = to_underlying(ZoomLevel::Normal);
 static uint const ZOOM_BASE = 1U << ZOOM_BASE_SHIFT;
 
 extern int _gui_scale;