diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt
index 4ba9797d4d..8e48c5a8fe 100644
--- a/src/lang/extra/english.txt
+++ b/src/lang/extra/english.txt
@@ -2192,6 +2192,8 @@ STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_DETAILED         :Detailed
 STR_CONFIG_SETTING_CITY_IN_LABEL                                :Show city in town name label: {STRING2}
 STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT                       :Display if a town is also a city in their label on the map
 
+STR_CONFIG_SETTING_RESTRICT_PATCH                               :Non-standard settings which are not in vanilla OpenTTD
+
 ###length 4
 STR_VIEWPORT_TOWN_COLOUR                                        :{1:COLOUR}{0:TOWN}
 STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {COLOUR}({COMMA})
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 8081449663..87d4b9f7c8 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1021,6 +1021,7 @@ enum RestrictionMode {
 	RM_ALL,                              ///< List all settings regardless of the default/newgame/... values.
 	RM_CHANGED_AGAINST_DEFAULT,          ///< Show only settings which are different compared to default values.
 	RM_CHANGED_AGAINST_NEW,              ///< Show only settings which are different compared to the user's new game setting values.
+	RM_PATCH,                            ///< Show only "patch" settings which are not in vanilla.
 	RM_END,                              ///< End for iteration.
 };
 DECLARE_POSTFIX_INCREMENT(RestrictionMode)
@@ -1376,6 +1377,7 @@ bool SettingEntry::IsVisibleByRestrictionMode(RestrictionMode mode) const
 
 	if (mode == RM_BASIC) return (this->setting->cat & SC_BASIC_LIST) != 0;
 	if (mode == RM_ADVANCED) return (this->setting->cat & SC_ADVANCED_LIST) != 0;
+	if (mode == RM_PATCH) return (this->setting->cat & SC_PATCH_LIST) != 0;
 
 	/* Read the current value. */
 	const void *object = ResolveObject(&GetGameSettings(), sd);
@@ -1436,6 +1438,7 @@ bool SettingEntry::UpdateFilterState(SettingFilter &filter, bool force_visible)
 			visible = false;
 		}
 		if (!this->IsVisibleByRestrictionMode(filter.mode)) {
+			if (filter.mode == RM_PATCH) filter.min_cat = RM_ALL;
 			while (filter.min_cat < RM_ALL && (filter.min_cat == filter.mode || !this->IsVisibleByRestrictionMode(filter.min_cat))) filter.min_cat++;
 			visible = false;
 		}
@@ -2527,6 +2530,7 @@ static const StringID _game_settings_restrict_dropdown[] = {
 	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
+	STR_CONFIG_SETTING_RESTRICT_PATCH,                            // RM_PATCH
 };
 static_assert(lengthof(_game_settings_restrict_dropdown) == RM_END);
 
@@ -3100,14 +3104,14 @@ struct GameSettingsWindow : Window {
 		if (!gui_scope) return;
 
 		/* Update which settings are to be visible. */
-		RestrictionMode min_level = (this->filter.mode <= RM_ALL) ? this->filter.mode : RM_BASIC;
+		RestrictionMode min_level = (this->filter.mode <= RM_ALL || this->filter.mode == RM_PATCH) ? this->filter.mode : RM_BASIC;
 		this->filter.min_cat = min_level;
 		this->filter.type_hides = false;
 		GetSettingsTree().UpdateFilterState(this->filter, false);
 
 		if (this->filter.string.IsEmpty()) {
 			this->warn_missing = WHR_NONE;
-		} else if (min_level < this->filter.min_cat) {
+		} else if (min_level < this->filter.min_cat || (min_level == RM_PATCH && min_level != this->filter.min_cat)) {
 			this->warn_missing = this->filter.type_hides ? WHR_CATEGORY_TYPE : WHR_CATEGORY;
 		} else {
 			this->warn_missing = this->filter.type_hides ? WHR_TYPE : WHR_NONE;
diff --git a/src/settings_internal.h b/src/settings_internal.h
index 63b7b6ab5a..a6954ab5b9 100644
--- a/src/settings_internal.h
+++ b/src/settings_internal.h
@@ -62,14 +62,17 @@ enum SettingCategory {
 	SC_BASIC_LIST      = 1 << 0,    ///< Settings displayed in the list of basic settings.
 	SC_ADVANCED_LIST   = 1 << 1,    ///< Settings displayed in the list of advanced settings.
 	SC_EXPERT_LIST     = 1 << 2,    ///< Settings displayed in the list of expert settings.
+	SC_PATCH_LIST      = 1 << 3,    ///< Settings displayed in the list of non-vanilla settings.
 
 	/* Setting classification */
 	SC_BASIC           = SC_BASIC_LIST | SC_ADVANCED_LIST | SC_EXPERT_LIST,  ///< Basic settings are part of all lists.
 	SC_ADVANCED        = SC_ADVANCED_LIST | SC_EXPERT_LIST,                  ///< Advanced settings are part of advanced and expert list.
 	SC_EXPERT          = SC_EXPERT_LIST,                                     ///< Expert settings can only be seen in the expert list.
+	SC_PATCH           = SC_PATCH_LIST,                                      ///< Patch settings which are shown in the patch list.
 
 	SC_END,
 };
+DECLARE_ENUM_AS_BIT_SET(SettingCategory)
 
 /**
  * Type of settings for filtering.
diff --git a/src/table/settings/company_settings.ini b/src/table/settings/company_settings.ini
index 2b339dbd4b..790a3c2a72 100644
--- a/src/table/settings/company_settings.ini
+++ b/src/table/settings/company_settings.ini
@@ -16,8 +16,8 @@ static const SettingTable _company_settings{
 [post-amble]
 };
 [templates]
-SDT_BOOL = SDT_BOOL(CompanySettings, $var,        $flags, $def,                        $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname),
-SDT_VAR  =  SDT_VAR(CompanySettings, $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat, $guiproc, $startup, $patxname),
+SDT_BOOL = SDT_BOOL(CompanySettings, $var,        $flags, $def,                        $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname),
+SDT_VAR  =  SDT_VAR(CompanySettings, $var, $type, $flags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $cat | $patchcat, $guiproc, $startup, $patxname),
 SDT_NULL =  SDT_NULL($length, $from, $to, $extver),
 
 [validation]
@@ -36,6 +36,7 @@ load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
+patchcat = SC_NONE
 startup  = false
 extver   = SlXvFeatureTest()
 patxname = nullptr
@@ -150,6 +151,7 @@ flags    = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT
 strhelp  = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""vehicle.auto_timetable_by_default""
 
 [SDT_BOOL]
@@ -159,6 +161,7 @@ flags    = SF_PER_COMPANY
 def      = true
 str      = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_BY_DEFAULT
 strhelp  = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_BY_DEFAULT_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""vehicle.auto_separation_by_default""
 
 [SDT_VAR]
@@ -174,6 +177,7 @@ str      = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE
 strhelp  = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE_HELPTEXT
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""auto_timetable_separation_rate""
 
 [SDT_VAR]
@@ -189,6 +193,7 @@ str      = STR_CONFIG_SETTING_TIMETABLE_AUTOFILL_ROUNDING_TICKS
 strhelp  = STR_CONFIG_SETTING_TIMETABLE_AUTOFILL_ROUNDING_TICKS_HELPTEXT
 strval   = STR_CONFIG_SETTING_TIMETABLE_AUTOFILL_ROUNDING_TICKS_VALUE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""timetable_autofill_rounding""
 
 [SDT_VAR]
@@ -204,6 +209,7 @@ str      = STR_CONFIG_OCCUPANCY_SMOOTHNESS
 strhelp  = STR_CONFIG_OCCUPANCY_SMOOTHNESS_HELPTEXT
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""order_occupancy_smoothness""
 
 [SDT_BOOL]
@@ -212,6 +218,7 @@ var      = infra_others_buy_in_depot[0]
 flags    = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_RAIL
+patchcat = SC_PATCH
 patxname = ""infra_sharing.infra_others_buy_in_depot.rail""
 
 [SDT_BOOL]
@@ -220,6 +227,7 @@ var      = infra_others_buy_in_depot[1]
 flags    = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_ROAD
+patchcat = SC_PATCH
 patxname = ""infra_sharing.infra_others_buy_in_depot.road""
 
 [SDT_BOOL]
@@ -228,6 +236,7 @@ var      = infra_others_buy_in_depot[2]
 flags    = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_WATER
+patchcat = SC_PATCH
 patxname = ""infra_sharing.infra_others_buy_in_depot.water""
 
 [SDT_BOOL]
@@ -236,6 +245,7 @@ var      = infra_others_buy_in_depot[3]
 flags    = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_AIR
+patchcat = SC_PATCH
 patxname = ""infra_sharing.infra_others_buy_in_depot.air""
 
 
@@ -246,6 +256,7 @@ flags    = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_ADVANCE_ORDER_ON_CLONE
 strhelp  = STR_CONFIG_SETTING_ADVANCE_ORDER_ON_CLONE_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""advance_order_on_clone""
 
 [SDT_BOOL]
@@ -255,6 +266,7 @@ flags    = SF_PER_COMPANY
 def      = true
 str      = STR_CONFIG_SETTING_COPY_CLONE_ADD_TO_GROUP
 strhelp  = STR_CONFIG_SETTING_COPY_CLONE_ADD_TO_GROUP_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""copy_clone_add_to_group""
 
 [SDT_BOOL]
@@ -264,6 +276,7 @@ flags    = SF_PER_COMPANY
 def      = true
 str      = STR_CONFIG_SETTING_REMAIN_IF_NEXT_ORDER_SAME_STATION
 strhelp  = STR_CONFIG_SETTING_REMAIN_IF_NEXT_ORDER_SAME_STATION_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""remain_if_next_order_same_station""
 
 [SDT_VAR]
diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini
index adec173922..cfa5d6209b 100644
--- a/src/table/settings/settings.ini
+++ b/src/table/settings/settings.ini
@@ -186,26 +186,26 @@ const SettingTable _settings{
 [post-amble]
 };
 [templates]
-SDTG_BOOL  =  SDTG_BOOL($name,                     $flags, $var, $def,                        $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTG_VAR   =   SDTG_VAR($name,              $type, $flags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTG_ENUM   = SDTG_ENUM($name,              $type, $flags, $var, $def,                        $str, $strhelp,          $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname, $enumlist),
-SDTG_OMANY = SDTG_OMANY($name,              $type, $flags, $var, $def,       $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTC_BOOL  =  SDTC_BOOL(              $var,        $flags, $def,                              $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTC_LIST  =  SDTC_LIST(              $var, $type, $flags, $def,                                                                          $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTC_OMANY = SDTC_OMANY(              $var, $type, $flags, $def,             $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTC_SSTR  =  SDTC_SSTR(              $var, $type, $flags, $def,             $length,                                  $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTC_VAR   =   SDTC_VAR(              $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDTC_ENUM   = SDTC_ENUM(              $var, $type, $flags, $def,                              $str, $strhelp,          $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname, $enumlist),
-SDT_BOOL   =   SDT_BOOL(GameSettings, $var,        $flags, $def,                              $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDT_OMANY  =  SDT_OMANY(GameSettings, $var, $type, $flags, $def,             $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $load, $cat, $guiproc, $startup, $patxname),
-SDT_SSTR   =   SDT_SSTR(GameSettings, $var, $type, $flags, $def,                                                       $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDT_VAR    =    SDT_VAR(GameSettings, $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname),
-SDT_ENUM   =   SDT_ENUM(GameSettings, $var, $type, $flags, $def,                              $str, $strhelp,          $pre_cb, $post_cb, $from, $to, $extver,        $cat, $guiproc, $startup, $patxname, $enumlist),
+SDTG_BOOL  =  SDTG_BOOL($name,                     $flags, $var, $def,                        $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTG_VAR   =   SDTG_VAR($name,              $type, $flags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTG_ENUM   = SDTG_ENUM($name,              $type, $flags, $var, $def,                        $str, $strhelp,          $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist),
+SDTG_OMANY = SDTG_OMANY($name,              $type, $flags, $var, $def,       $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTC_BOOL  =  SDTC_BOOL(              $var,        $flags, $def,                              $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTC_LIST  =  SDTC_LIST(              $var, $type, $flags, $def,                                                                          $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTC_OMANY = SDTC_OMANY(              $var, $type, $flags, $def,             $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTC_SSTR  =  SDTC_SSTR(              $var, $type, $flags, $def,             $length,                                  $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTC_VAR   =   SDTC_VAR(              $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDTC_ENUM   = SDTC_ENUM(              $var, $type, $flags, $def,                              $str, $strhelp,          $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist),
+SDT_BOOL   =   SDT_BOOL(GameSettings, $var,        $flags, $def,                              $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDT_OMANY  =  SDT_OMANY(GameSettings, $var, $type, $flags, $def,             $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver, $load, $cat | $patchcat, $guiproc, $startup, $patxname),
+SDT_SSTR   =   SDT_SSTR(GameSettings, $var, $type, $flags, $def,                                                       $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDT_VAR    =    SDT_VAR(GameSettings, $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname),
+SDT_ENUM   =   SDT_ENUM(GameSettings, $var, $type, $flags, $def,                              $str, $strhelp,          $pre_cb, $post_cb, $from, $to, $extver,        $cat | $patchcat, $guiproc, $startup, $patxname, $enumlist),
 SDT_NULL   =   SDT_NULL($length, $from, $to, $extver),
 SDT_NAMED_NULL = SDT_NAMED_NULL($name, $length, $from, $to, $extver, $patxname),
 SDT_XREF     = SDT_XREF(         $from, $to, $extver, $xref, $xrefcvt),
 
-SDT_LINKGRAPH_PER_CARGO = SDT_ENUM(GameSettings, linkgraph.distribution_per_cargo[$linkgraph_cargo], SLE_UINT8, $flags | SF_NOT_IN_CONFIG | SF_NO_NEWGAME, DT_PER_CARGO_DEFAULT, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO_HELPTEXT, $pre_cb, $post_cb, $from, $to, SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_MODES), SC_EXPERT, LinkGraphDistributionSettingGUI, false, nullptr, _linkgraph_mode_per_cargo),
+SDT_LINKGRAPH_PER_CARGO = SDT_ENUM(GameSettings, linkgraph.distribution_per_cargo[$linkgraph_cargo], SLE_UINT8, $flags | SF_NOT_IN_CONFIG | SF_NO_NEWGAME, DT_PER_CARGO_DEFAULT, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO, STR_CONFIG_SETTING_DISTRIBUTION_PER_CARGO_HELPTEXT, $pre_cb, $post_cb, $from, $to, SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_MODES), SC_EXPERT | SC_PATCH, LinkGraphDistributionSettingGUI, false, nullptr, _linkgraph_mode_per_cargo),
 
 [validation]
 SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
@@ -228,6 +228,7 @@ load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
+patchcat = SC_NONE
 startup  = false
 extver   = SlXvFeatureTest()
 patxname = nullptr
@@ -340,19 +341,18 @@ cat      = SC_BASIC
 [SDT_VAR]
 var      = difficulty.vehicle_costs_in_depot
 type     = SLE_UINT8
-from     = SLV_97
 def      = 1
 min      = 1
 max      = 8
 str      = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT
 strhelp  = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT_HELPTEXT
 strval   = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT_VALUE
+patchcat = SC_PATCH
 patxname = ""difficulty.vehicle_costs_in_depot""
 
 [SDT_VAR]
 var      = difficulty.vehicle_costs_when_stopped
 type     = SLE_UINT8
-from     = SLV_97
 def      = 1
 min      = 1
 max      = 8
@@ -360,6 +360,7 @@ str      = STR_CONFIG_SETTING_RUNNING_COSTS_WHEN_STOPPED
 strhelp  = STR_CONFIG_SETTING_RUNNING_COSTS_WHEN_STOPPED_HELPTEXT
 strval   = STR_CONFIG_SETTING_RUNNING_COSTS_WHEN_STOPPED_VALUE
 strval   = STR_CONFIG_SETTING_RUNNING_COSTS_IN_DEPOT_VALUE
+patchcat = SC_PATCH
 patxname = ""difficulty.vehicle_costs_when_stopped""
 
 [SDT_VAR]
@@ -502,6 +503,7 @@ str      = STR_CONFIG_SETTING_MONEY_CHEAT_MULTIPLAYER
 strhelp  = STR_CONFIG_SETTING_MONEY_CHEAT_MULTIPLAYER_HELPTEXT
 post_cb  = DifficultyMoneyCheatMultiplayerChange
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""cheat.difficulty.money_cheat_in_multiplayer""
 
 [SDT_BOOL]
@@ -511,6 +513,7 @@ str      = STR_CONFIG_SETTING_RENAME_TOWNS_MULTIPLAYER
 strhelp  = STR_CONFIG_SETTING_RENAME_TOWNS_MULTIPLAYER_HELPTEXT
 post_cb  = DifficultyRenameTownsMultiplayerChange
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""cheat.difficulty.rename_towns_in_multiplayer""
 
 [SDT_BOOL]
@@ -520,6 +523,7 @@ str      = STR_CONFIG_SETTING_OVERRIDE_TOWN_SETTINGS_MULTIPLAYER
 strhelp  = STR_CONFIG_SETTING_OVERRIDE_TOWN_SETTINGS_MULTIPLAYER_HELPTEXT
 post_cb  = DifficultyOverrideTownSettingsMultiplayerChange
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""cheat.difficulty.override_town_settings_in_multiplayer""
 
 [SDTG_VAR]
@@ -684,6 +688,7 @@ def      = false
 cat      = SC_BASIC
 str      = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER
 strhelp  = STR_CONFIG_SETTING_ENABLE_BUILD_RIVER_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""enable_build_river.construction.enable_build_river""
 
 [SDT_BOOL]
@@ -692,6 +697,7 @@ def      = true
 cat      = SC_BASIC
 str      = STR_CONFIG_SETTING_ENABLE_REMOVE_WATER
 strhelp  = STR_CONFIG_SETTING_ENABLE_REMOVE_WATER_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""enable_build_river.construction.enable_remove_water""
 
 [SDT_VAR]
@@ -762,6 +768,7 @@ min      = 0
 max      = 1 << 30
 interval = 1
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""buy_land_rate_limit.construction.purchase_land_per_64k_frames""
 
 [SDT_VAR]
@@ -772,6 +779,7 @@ min      = 0
 max      = 1 << 15
 interval = 1
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""buy_land_rate_limit.construction.purchase_land_frame_burst""
 
 [SDT_VAR]
@@ -869,6 +877,7 @@ def      = false
 str      = STR_CONFIG_SETTING_CHUNNEL
 strhelp  = STR_CONFIG_SETTING_CHUNNEL_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""chunnel.construction.chunnel""
 
 [SDT_VAR]
@@ -996,6 +1005,7 @@ str      = STR_CONFIG_SETTING_TOWN_TUNNELS
 strhelp  = STR_CONFIG_SETTING_TOWN_TUNNELS_HELPTEXT
 strval   = STR_CONFIG_SETTING_TOWN_TUNNELS_FORBIDDEN
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""economy.town_build_tunnels""
 
 [SDT_VAR]
@@ -1010,6 +1020,7 @@ str      = STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE
 strhelp  = STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_HELPTEXT
 strval   = STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_VALUE
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""economy.town_max_road_slope""
 
 [SDT_BOOL]
@@ -1018,6 +1029,7 @@ def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_BRIDGES
 strhelp  = STR_CONFIG_SETTING_ALLOW_TOWN_BRIDGES_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""economy.allow_town_bridges""
 
 [SDT_XREF]
@@ -1053,6 +1065,7 @@ str      = STR_CONFIG_SETTING_TOWN_ABOVE_HEIGHT
 strhelp  = STR_CONFIG_SETTING_TOWN_ABOVE_HEIGHT_HELPTEXT
 strval   = STR_JUST_INT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""max_town_heightlevel.economy.max_town_heightlevel""
 
 [SDT_VAR]
@@ -1068,6 +1081,7 @@ str      = STR_CONFIG_SETTING_MIN_TOWN_LAND_AREA
 strhelp  = STR_CONFIG_SETTING_MIN_TOWN_LAND_AREA_HELPTEXT
 strval   = STR_CONFIG_SETTING_MIN_LAND_AREA_VALUE
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""max_town_heightlevel.economy.min_town_land_area""
 
 [SDT_VAR]
@@ -1083,6 +1097,7 @@ str      = STR_CONFIG_SETTING_MIN_CITY_LAND_AREA
 strhelp  = STR_CONFIG_SETTING_MIN_CITY_LAND_AREA_HELPTEXT
 strval   = STR_CONFIG_SETTING_MIN_LAND_AREA_VALUE
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""max_town_heightlevel.economy.min_city_land_area""
 
 ; link graph
@@ -1344,6 +1359,7 @@ interval = 50
 str      = STR_CONFIG_SETTING_AIRCRAFT_PATH_COST
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 strhelp  = STR_CONFIG_SETTING_AIRCRAFT_PATH_COST_HELPTEXT
+patchcat = SC_PATCH
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_AIRCRAFT)
 
 [SDT_VAR]
@@ -1386,6 +1402,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR
 strval   = STR_DECIMAL1_WITH_SCALE
 strhelp  = STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""industry_cargo_adj.economy.industry_cargo_scale_factor""
 
 ; Vehicles
@@ -1413,6 +1430,7 @@ strhelp  = STR_CONFIG_SETTING_TRAIN_BRAKING_MODEL_HELPTEXT
 pre_cb   = CheckTrainBrakingModelChange
 post_cb  = TrainBrakingModelChanged
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""realistic_braking.vehicle.train_braking_model""
 
 [SDT_ENUM]
@@ -1423,6 +1441,7 @@ enumlist = _realistic_braking_aspect_limited
 str      = STR_CONFIG_SETTING_REALISTIC_BRAKING_ASPECT_LIMITED
 strhelp  = STR_CONFIG_SETTING_REALISTIC_BRAKING_ASPECT_LIMITED_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""realistic_braking.vehicle.realistic_braking_aspect_limited""
 
 [SDT_BOOL]
@@ -1431,6 +1450,7 @@ def      = false
 str      = STR_CONFIG_SETTING_LIMIT_TRAIN_ACCELERATION
 strhelp  = STR_CONFIG_SETTING_LIMIT_TRAIN_ACCELERATION_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""realistic_braking.vehicle.limit_train_acceleration""
 
 [SDT_VAR]
@@ -1487,6 +1507,7 @@ str      = STR_CONFIG_SETTING_THROUGH_LOAD_SPEED_LIMIT
 strhelp  = STR_CONFIG_SETTING_THROUGH_LOAD_SPEED_LIMIT_HELPTEXT
 strval   = STR_JUST_VELOCITY
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""vehicle.through_load_speed_limit""
 
 [SDT_VAR]
@@ -1501,6 +1522,7 @@ str      = STR_CONFIG_SETTING_RAIL_DEPOT_SPEED_LIMIT
 strhelp  = STR_CONFIG_SETTING_RAIL_DEPOT_SPEED_LIMIT_HELPTEXT
 strval   = STR_JUST_VELOCITY
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""vehicle.rail_depot_speed_limit""
 
 [SDT_BOOL]
@@ -1509,6 +1531,7 @@ def      = false
 str      = STR_CONFIG_SETTING_NON_LEADING_ENGINES_KEEP_NAME
 strhelp  = STR_CONFIG_SETTING_NON_LEADING_ENGINES_KEEP_NAME_HELPTEXT
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 patxname = ""vehicle.non_leading_engines_keep_name""
 
 [SDT_BOOL]
@@ -1532,6 +1555,7 @@ def      = true
 str      = STR_CONFIG_SETTING_BACK_ONE_WAY_PBS_SAFE_WAITING
 str      = STR_CONFIG_SETTING_BACK_ONE_WAY_PBS_SAFE_WAITING_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""pf.back_of_one_way_pbs_waiting_point""
 
 [SDT_VAR]
@@ -1593,6 +1617,7 @@ str      = STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE
 strhelp  = STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE_HELPTEXT
 strval   = STR_CONFIG_SETTING_REROUTE_RV_ON_LAYOUT_CHANGE_NO
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 patxname = ""pf.reroute_rv_on_layout_change""
 
 [SDT_BOOL]
@@ -1685,6 +1710,7 @@ str      = STR_CONFIG_SETTING_NO_EXPIRE_VEHICLES_AFTER
 strhelp  = STR_CONFIG_SETTING_NO_EXPIRE_VEHICLES_AFTER_HELPTEXT
 strval   = STR_CONFIG_SETTING_NO_EXPIRE_VEHICLES_AFTER_VALUE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""vehicle.no_expire_vehicles_after""
 
 [SDT_VAR]
@@ -1699,6 +1725,7 @@ str      = STR_CONFIG_SETTING_NO_INTRODUCE_VEHICLES_AFTER
 strhelp  = STR_CONFIG_SETTING_NO_INTRODUCE_VEHICLES_AFTER_HELPTEXT
 strval   = STR_CONFIG_SETTING_NO_INTRODUCE_VEHICLES_AFTER_VALUE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""vehicle.no_introduce_vehicles_after""
 
 ;; vehicle.exact_intro_date
@@ -1826,6 +1853,7 @@ def      = true
 str      = STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES
 strhelp  = STR_CONFIG_SETTING_SLOW_ROAD_VEHICLES_IN_CURVES_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""slow_road_vehicles_in_curves.vehicle.slow_road_vehicles_in_curves""
 
 [SDT_XREF]
@@ -1938,6 +1966,7 @@ var      = vehicle.improved_breakdowns
 def      = false
 str      = STR_CONFIG_SETTING_IMPROVED_BREAKDOWNS
 post_cb  = ImprovedBreakdownsSettingChanged
+patchcat = SC_PATCH
 patxname = ""improved_breakdowns.vehicle.improved_breakdowns""
 
 [SDT_BOOL]
@@ -1947,6 +1976,7 @@ str      = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE
 strhelp  = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE_HELPTEXT
 patxname = ""ship_collision_avoidance.vehicle.ship_collision_avoidance""
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDT_BOOL]
 var      = vehicle.no_train_crash_other_company
@@ -1954,6 +1984,7 @@ def      = false
 str      = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY
 strhelp  = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.vehicle.no_train_crash_other_company""
 
 [SDT_BOOL]
@@ -1963,6 +1994,7 @@ str      = STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING
 strhelp  = STR_CONFIG_SETTING_ROADVEH_ARTICULATED_OVERTAKING_HELPTEXT
 patxname = ""roadveh_articulated_overtaking.vehicle.roadveh_articulated_overtaking""
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDT_BOOL]
 var      = vehicle.roadveh_cant_quantum_tunnel
@@ -1971,12 +2003,14 @@ str      = STR_CONFIG_SETTING_ROADVEH_CANT_QUANTUM_TUNNEL
 strhelp  = STR_CONFIG_SETTING_ROADVEH_CANT_QUANTUM_TUNNEL_HELPTEXT
 patxname = ""roadveh_cant_quantum_tunnel.vehicle.roadveh_cant_quantum_tunnel""
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDT_BOOL]
 var      = vehicle.drive_through_train_depot
 def      = false
 str      = STR_CONFIG_SETTING_DRIVE_THROUGH_TRAIN_DEPOT
 strhelp  = STR_CONFIG_SETTING_DRIVE_THROUGH_TRAIN_DEPOT_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""drive_through_train_depot.vehicle.drive_through_train_depot""
 
 ; station.join_stations
@@ -2056,6 +2090,7 @@ def      = false
 str      = STR_CONFIG_SETTING_NONSTOP_ORDER_ONLY
 strhelp  = STR_CONFIG_SETTING_NONSTOP_ORDER_ONLY_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""nonstop_only.order.nonstop_only""
 
 [SDT_BOOL]
@@ -2077,6 +2112,7 @@ strhelp  = STR_CONFIG_SETTING_CATCHMENT_INCREASE_HELPTEXT
 strval   = STR_JUST_COMMA
 post_cb  = StationCatchmentChanged
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_STATION_CATCHMENT_INC)
+patchcat = SC_PATCH
 patxname = ""station_catchment_inc.station.catchment_increase""
 
 [SDT_BOOL]
@@ -2084,6 +2120,7 @@ var      = station.cargo_class_rating_wait_time
 def      = false
 str      = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME
 strhelp  = STR_CONFIG_SETTING_STATION_RATING_CARGO_CLASS_WAIT_TIME_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""station_rating.station.cargo_class_rating_wait_time""
 
 [SDT_BOOL]
@@ -2091,6 +2128,7 @@ var      = station.station_size_rating_cargo_amount
 def      = false
 str      = STR_CONFIG_SETTING_STATION_RATING_SIZE_CARGO_AMOUNT
 strhelp  = STR_CONFIG_SETTING_STATION_RATING_SIZE_CARGO_AMOUNT_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""station_rating.station.station_size_rating_cargo_amount""
 
 [SDT_BOOL]
@@ -2108,6 +2146,7 @@ def      = SD_NEAREST_FIRST
 enumlist = _station_delivery_mode
 str      = STR_CONFIG_SETTING_CARGO_DELIVERY_MODE
 strhelp  = STR_CONFIG_SETTING_CARGO_DELIVERY_MODE_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""station.station_delivery_mode""
 
 [SDT_BOOL]
@@ -2139,6 +2178,7 @@ def      = true
 cat      = SC_BASIC
 str      = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS
 strhelp  = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""custom_bridge_heads.construction.road_custom_bridge_heads""
 
 [SDT_XREF]
@@ -2151,6 +2191,7 @@ def      = true
 cat      = SC_BASIC
 str      = STR_CONFIG_SETTING_ENABLE_RAIL_CUSTOM_BRIDGE_HEADS
 strhelp  = STR_CONFIG_SETTING_ENABLE_RAIL_CUSTOM_BRIDGE_HEADS_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""custom_bridge_heads.construction.rail_custom_bridge_heads""
 
 [SDT_BOOL]
@@ -2159,6 +2200,7 @@ def      = false
 cat      = SC_ADVANCED
 str      = STR_CONFIG_SETTING_ALLOW_GRF_OBJECTS_UNDER_BRIDGES
 strhelp  = STR_CONFIG_SETTING_ALLOW_GRF_OBJECTS_UNDER_BRIDGES_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""allow_grf_objects_under_bridges.construction.allow_grf_objects_under_bridges""
 
 [SDT_BOOL]
@@ -2167,6 +2209,7 @@ def      = false
 cat      = SC_ADVANCED
 str      = STR_CONFIG_SETTING_ALLOW_GRF_STATIONS_UNDER_BRIDGES
 strhelp  = STR_CONFIG_SETTING_ALLOW_GRF_STATIONS_UNDER_BRIDGES_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""allow_stations_under_bridges.construction.allow_stations_under_bridges""
 
 [SDT_BOOL]
@@ -2175,6 +2218,7 @@ def      = true
 cat      = SC_ADVANCED
 str      = STR_CONFIG_SETTING_ALLOW_ROAD_STATIONS_UNDER_BRIDGES
 strhelp  = STR_CONFIG_SETTING_ALLOW_ROAD_STATIONS_UNDER_BRIDGES_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""allow_stations_under_bridges.construction.allow_road_stops_under_bridges""
 guiproc  = AllowRoadStopsUnderBridgesSettingGUI
 
@@ -2184,6 +2228,7 @@ def      = false
 cat      = SC_ADVANCED
 str      = STR_CONFIG_SETTING_ALLOW_DOCKS_UNDER_BRIDGES
 strhelp  = STR_CONFIG_SETTING_ALLOW_DOCKS_UNDER_BRIDGES_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""allow_stations_under_bridges.construction.allow_docks_under_bridges""
 
 [SDT_VAR]
@@ -2197,6 +2242,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_PURCHASE_LAND_PERMITTED
 strhelp  = STR_CONFIG_SETTING_PURCHASE_LAND_PERMITTED_HELPTEXT
 strval   = STR_PURCHASE_LAND_PERMITTED_NO
+patchcat = SC_PATCH
 patxname = ""purchase_land_permitted.construction.purchase_land_permitted""
 
 [SDT_BOOL]
@@ -2204,6 +2250,7 @@ var      = construction.build_object_area_permitted
 def      = true
 str      = STR_CONFIG_SETTING_BUILD_OBJECT_PERMITTED
 strhelp  = STR_CONFIG_SETTING_BUILD_OBJECT_PERMITTED_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""build_object_area_permitted.construction.build_object_area_permitted""
 
 [SDT_VAR]
@@ -2218,6 +2265,7 @@ str      = STR_CONFIG_SETTING_NO_EXPIRE_OBJECTS_AFTER
 strhelp  = STR_CONFIG_SETTING_NO_EXPIRE_OBJECTS_AFTER_HELPTEXT
 strval   = STR_CONFIG_SETTING_NO_EXPIRE_OBJECTS_AFTER_VALUE
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 patxname = ""construction.no_expire_objects_after""
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_BUILD_OBJECT, 0); }
 
@@ -2227,6 +2275,7 @@ def      = false
 str      = STR_CONFIG_SETTING_IGNORE_OBJECT_INTRO_DATES
 strhelp  = STR_CONFIG_SETTING_IGNORE_OBJECT_INTRO_DATES_HELPTEXT
 patxname = ""construction.ignore_object_intro_dates""
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_BUILD_OBJECT, 0); }
 
 [SDT_BOOL]
@@ -2235,6 +2284,7 @@ def      = false
 str      = STR_CONFIG_SETTING_ALLOW_CONVERT_TOWN_ROAD_NO_HOUSES
 strhelp  = STR_CONFIG_SETTING_ALLOW_CONVERT_TOWN_ROAD_NO_HOUSES_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""construction.convert_town_road_no_houses""
 
 [SDT_BOOL]
@@ -2284,6 +2334,7 @@ var      = economy.inflation_fixed_dates
 def      = true
 str      = STR_CONFIG_SETTING_INFLATION_FIXED_DATES
 strhelp  = STR_CONFIG_SETTING_INFLATION_FIXED_DATES_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""inflation_fixed_dates.economy.inflation_fixed_dates""
 
 [SDT_VAR]
@@ -2298,6 +2349,7 @@ strval   = STR_JUST_COMMA
 pre_cb   = DayLengthPreChange
 post_cb  = DayLengthChanged
 cat      = SC_BASIC
+patchcat = SC_PATCH
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_VARIABLE_DAY_LENGTH)
 patxname = ""variable_day_length.economy.day_length_factor""
 
@@ -2431,6 +2483,7 @@ str      = STR_CONFIG_SETTING_RAINFORESTLINE_HEIGHT
 strhelp  = STR_CONFIG_SETTING_RAINFORESTLINE_HEIGHT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""rainforest_line_height.game_creation.rainforest_line_height""
 
 [SDT_VAR]
@@ -2444,6 +2497,7 @@ str      = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_MODE
 strhelp  = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_MODE_HELPTEXT
 strval   = STR_CONFIG_SETTING_CLIMATE_THRESHOLD_COVERAGE
 post_cb  = ClimateThresholdModeChanged
+patchcat = SC_PATCH
 patxname = ""climate.game_creation.climate_threshold_mode""
 
 ;;game_creation.desert_amount
@@ -2641,6 +2695,7 @@ def      = false
 str      = STR_CONFIG_SETTING_TOWN_ZONE_CALC_MODE
 strhelp  = STR_CONFIG_SETTING_TOWN_ZONE_CALC_MODE_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneModeChanged
 patxname = ""town_zone.economy.town_zone_calc_mode""
 
@@ -2655,6 +2710,7 @@ str      = STR_CONFIG_SETTING_TOWN_ZONE_0_MULT
 strhelp  = STR_CONFIG_SETTING_TOWN_ZONE_0_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.town_zone_0_mult""
 
@@ -2669,6 +2725,7 @@ str      = STR_CONFIG_SETTING_TOWN_ZONE_1_MULT
 strhelp  = STR_CONFIG_SETTING_TOWN_ZONE_1_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.town_zone_1_mult""
 
@@ -2683,6 +2740,7 @@ str      = STR_CONFIG_SETTING_TOWN_ZONE_2_MULT
 strhelp  = STR_CONFIG_SETTING_TOWN_ZONE_2_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.town_zone_2_mult""
 
@@ -2697,6 +2755,7 @@ str      = STR_CONFIG_SETTING_TOWN_ZONE_3_MULT
 strhelp  = STR_CONFIG_SETTING_TOWN_ZONE_3_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.town_zone_3_mult""
 
@@ -2711,6 +2770,7 @@ str      = STR_CONFIG_SETTING_TOWN_ZONE_4_MULT
 strhelp  = STR_CONFIG_SETTING_TOWN_ZONE_4_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.town_zone_4_mult""
 
@@ -2725,6 +2785,7 @@ str      = STR_CONFIG_SETTING_CITY_ZONE_0_MULT
 strhelp  = STR_CONFIG_SETTING_CITY_ZONE_0_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.city_zone_0_mult""
 
@@ -2739,6 +2800,7 @@ str      = STR_CONFIG_SETTING_CITY_ZONE_1_MULT
 strhelp  = STR_CONFIG_SETTING_CITY_ZONE_1_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.city_zone_1_mult""
 
@@ -2753,7 +2815,9 @@ str      = STR_CONFIG_SETTING_CITY_ZONE_2_MULT
 strhelp  = STR_CONFIG_SETTING_CITY_ZONE_2_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
+
 patxname = ""town_zone.economy.city_zone_2_mult""
 
 [SDT_VAR]
@@ -2767,6 +2831,7 @@ str      = STR_CONFIG_SETTING_CITY_ZONE_3_MULT
 strhelp  = STR_CONFIG_SETTING_CITY_ZONE_3_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.city_zone_3_mult""
 
@@ -2781,6 +2846,7 @@ str      = STR_CONFIG_SETTING_CITY_ZONE_4_MULT
 strhelp  = STR_CONFIG_SETTING_CITY_ZONE_4_MULT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = TownZoneCustomValueChanged
 patxname = ""town_zone.economy.city_zone_4_mult""
 
@@ -2795,6 +2861,7 @@ str      = STR_CONFIG_SETTING_TOWN_GROWTH_CARGO_TRANSPORTED
 strhelp  = STR_CONFIG_SETTING_TOWN_GROWTH_CARGO_TRANSPORTED_HELPTEXT
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""town_growth.economy.town_growth_cargo_transported""
 
 [SDT_VAR]
@@ -2847,6 +2914,7 @@ interval = 5
 str      = STR_CONFIG_SETTING_TOWN_MIN_DISTANCE
 strhelp  = STR_CONFIG_SETTING_TOWN_MIN_DISTANCE_HELPTEXT
 strval   = STR_JUST_INT
+patchcat = SC_PATCH
 patxname = ""town_min_distance.economy.town_min_distance""
 
 [SDT_XREF]
@@ -2937,6 +3005,7 @@ strhelp  = STR_CONFIG_SETTING_MAX_SIGNAL_EVALUATIONS_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_EXPERT
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_PROG_SIGS)
+patchcat = SC_PATCH
 patxname = ""programmable_signals.construction.maximum_signal_evaluations""
 
 [SDT_BOOL]
@@ -2946,6 +3015,7 @@ str      = STR_CONFIG_SETTING_SHARING_RAIL
 pre_cb   = CheckSharingRail
 post_cb  = SharingRailChanged
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.infrastructure_sharing.rail""
 
 [SDT_BOOL]
@@ -2954,6 +3024,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SHARING_ROAD
 pre_cb   = CheckSharingRoad
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.infrastructure_sharing.road""
 
 [SDT_BOOL]
@@ -2962,6 +3033,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SHARING_WATER
 pre_cb   = CheckSharingWater
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.infrastructure_sharing.water""
 
 [SDT_BOOL]
@@ -2970,6 +3042,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SHARING_AIR
 pre_cb   = CheckSharingAir
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.infrastructure_sharing.air""
 
 [SDT_VAR]
@@ -2984,6 +3057,7 @@ str      = STR_CONFIG_SETTING_SHARING_FEE_RAIL
 strhelp  = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT
 strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.sharing_fee.rail""
 
 [SDT_VAR]
@@ -2998,6 +3072,7 @@ str      = STR_CONFIG_SETTING_SHARING_FEE_ROAD
 strhelp  = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT
 strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.sharing_fee.road""
 
 [SDT_VAR]
@@ -3012,6 +3087,7 @@ str      = STR_CONFIG_SETTING_SHARING_FEE_WATER
 strhelp  = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT
 strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.sharing_fee.water""
 
 [SDT_VAR]
@@ -3026,6 +3102,7 @@ str      = STR_CONFIG_SETTING_SHARING_FEE_AIR
 strhelp  = STR_CONFIG_SETTING_SHARING_FEE_HELPTEXT
 strval   = STR_JUST_CURRENCY_LONG
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.sharing_fee.air""
 
 [SDT_BOOL]
@@ -3033,6 +3110,7 @@ var      = economy.sharing_payment_in_debt
 def      = false
 str      = STR_CONFIG_SETTING_SHARING_PAYMENT_IN_DEBT
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
+patchcat = SC_PATCH
 patxname = ""infra_sharing.economy.sharing_payment_in_debt""
 
 [SDT_XREF]
@@ -3264,12 +3342,14 @@ str      = STR_CONFIG_SETTING_RANDOM_ROAD_RECONSTRUCTION
 strhelp  = STR_CONFIG_SETTING_RANDOM_ROAD_RECONSTRUCTION_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""economy.random_road_reconstruction""
 
 [SDT_BOOL]
 var      = economy.disable_inflation_newgrf_flag
 def      = false
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""economy.disable_inflation_newgrf_flag""
 
 [SDT_VAR]
@@ -3284,6 +3364,7 @@ str      = STR_CONFIG_SETTING_CARGO_PAYMENT_ALGORITHM
 strhelp  = STR_CONFIG_SETTING_CARGO_PAYMENT_ALGORITHM_HELPTEXT
 strval   = STR_CONFIG_SETTING_CARGO_PAYMENT_ALGORITHM_TRADITIONAL
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""economy.payment_algorithm""
 
 [SDT_VAR]
@@ -3298,6 +3379,7 @@ str      = STR_CONFIG_SETTING_TICK_RATE
 strhelp  = STR_CONFIG_SETTING_TICK_RATE_HELPTEXT
 strval   = STR_CONFIG_SETTING_TICK_RATE_TRADITIONAL
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 post_cb  = [](auto) { SetupTickRate(); }
 patxname = ""economy.tick_rate""
 
@@ -3957,6 +4039,7 @@ def      = true
 str      = STR_CONFIG_SETTING_FLOOD_FROM_EDGES
 strhelp  = STR_CONFIG_SETTING_FLOOD_FROM_EDGES_HELPTEXT
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 patxname = ""construction.flood_from_edges""
 
 [SDT_VAR]
@@ -4010,6 +4093,7 @@ def      = true
 str      = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE
 strhelp  = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""everest_treeline.construction.trees_around_snow_line_enabled""
 
 [SDT_VAR]
@@ -4022,6 +4106,7 @@ str      = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_RANGE
 strhelp  = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_RANGE_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""everest_treeline.construction.trees_around_snow_line_range""
 
 [SDT_VAR]
@@ -4035,6 +4120,7 @@ str      = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_DYNAMIC_RANGE
 strhelp  = STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_DYNAMIC_RANGE_HELPTEXT
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""everest_treeline.construction.trees_around_snow_line_dynamic_range""
 post_cb  = [](auto) { UpdateCachedSnowLineBounds(); }
 
@@ -4049,6 +4135,7 @@ str      = STR_CONFIG_SETTING_TREE_GROWTH
 strhelp  = STR_CONFIG_SETTING_TREE_GROWTH_HELPTEXT
 strval   = STR_CONFIG_SETTING_TREE_GROWTH_NORMAL
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""reduced_tree_growth.construction.tree_growth_rate""
 
 [SDT_XREF]
@@ -4111,6 +4198,7 @@ def      = true
 cat      = SC_EXPERT
 str      = STR_CONFIG_SETTING_RIVERS_TOP_OF_HILL
 strhelp  = STR_CONFIG_SETTING_RIVERS_TOP_OF_HILL_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""rivers.game_creation.rivers_top_of_hill""
 
 [SDT_VAR]
@@ -4125,6 +4213,7 @@ str      = STR_CONFIG_SETTING_RIVER_TROPICS_WIDTH
 strhelp  = STR_CONFIG_SETTING_RIVER_TROPICS_WIDTH_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""rivers.game_creation.river_tropics_width""
 
 [SDT_VAR]
@@ -4139,6 +4228,7 @@ str      = STR_CONFIG_SETTING_LAKE_TROPICS_WIDTH
 strhelp  = STR_CONFIG_SETTING_LAKE_TROPICS_WIDTH_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""rivers.game_creation.lake_tropics_width""
 
 [SDT_VAR]
@@ -4153,6 +4243,7 @@ str      = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH
 strhelp  = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH_HELPTEXT
 strval   = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH_DEFAULT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""rivers.game_creation.coast_tropics_width""
 
 [SDT_VAR]
@@ -4166,6 +4257,7 @@ cat      = SC_EXPERT
 str      = STR_CONFIG_SETTING_LAKE_SIZE
 strhelp  = STR_CONFIG_SETTING_LAKE_SIZE_HELPTEXT
 strval   = STR_CONFIG_SETTING_LAKE_SIZE_VALUE
+patchcat = SC_PATCH
 patxname = ""rivers.game_creation.lake_size""
 
 [SDT_BOOL]
@@ -4175,6 +4267,7 @@ def      = false
 cat      = SC_EXPERT
 str      = STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS
 strhelp  = STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS_HELPTEXT
+patchcat = SC_PATCH
 patxname = ""rivers.game_creation.lakes_allowed_in_deserts""
 
 [SDT_VAR]
@@ -4200,6 +4293,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_ROCKS_AMOUNT
 strhelp  = STR_CONFIG_SETTING_ROCKS_AMOUNT_HELPTEXT
 strval   = STR_JUST_COMMA
+patchcat = SC_PATCH
 patxname = ""rocks.game_creation.amount_of_rocks""
 
 [SDT_VAR]
@@ -4213,6 +4307,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_HEIGHT_ROCKS
 strhelp  = STR_CONFIG_SETTING_HEIGHT_ROCKS_HELPTEXT
 strval   = STR_JUST_COMMA
+patchcat = SC_PATCH
 patxname = ""rocks.game_creation.height_affects_rocks""
 
 [SDT_XREF]
@@ -4230,6 +4325,7 @@ str      = STR_CONFIG_SETTING_BUILD_PUBLIC_ROADS
 strhelp  = STR_CONFIG_SETTING_BUILD_PUBLIC_ROADS_HELPTEXT
 strval   = STR_CONFIG_SETTING_BUILD_PUBLIC_ROADS_NONE
 post_cb  = PublicRoadsSettingChange
+patchcat = SC_PATCH
 patxname = ""public_roads.game_creation.build_public_roads""
 
 ; locale
@@ -4399,6 +4495,7 @@ def      = true
 str      = STR_CONFIG_SETTING_ADJACENT_CROSSINGS
 strhelp  = STR_CONFIG_SETTING_ADJACENT_CROSSINGS_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""adjacent_crossings.vehicle.adjacent_crossings""
 
 [SDT_BOOL]
@@ -4407,6 +4504,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SAFER_CROSSINGS
 strhelp  = STR_CONFIG_SETTING_SAFER_CROSSINGS_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 patxname = ""safer_crossings.vehicle.safer_crossings""
 
 
@@ -4577,11 +4675,12 @@ strval   = STR_CONFIG_SETTING_HOVER_DELAY_VALUE
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); }
 
 [SDTC_BOOL]
-var     = gui.instant_tile_tooltip
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = false
-str     = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP
-strhelp = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT
+var      = gui.instant_tile_tooltip
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = false
+str      = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP
+strhelp  = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.town_name_tooltip_mode
@@ -4593,82 +4692,92 @@ max      = 2
 str      = STR_CONFIG_SETTING_TOWN_NAME_TOOLTIP_MODE
 strhelp  = STR_CONFIG_SETTING_TOWN_NAME_TOOLTIP_MODE_HELPTEXT
 strval   = STR_CONFIG_SETTING_TOWN_NAME_TOOLTIP_MODE_OFF
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
-var     = gui.industry_tooltip_show
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = true
-str     = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_SHOW
-strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_SHOW_HELPTEXT
+var      = gui.industry_tooltip_show
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = true
+str      = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_SHOW
+strhelp  = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_SHOW_HELPTEXT
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); }
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
-var     = gui.industry_tooltip_show_name
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = true
-str     = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_NAME
-strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_NAME_HELPTEXT
+var      = gui.industry_tooltip_show_name
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = true
+str      = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_NAME
+strhelp  = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_NAME_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
-var     = gui.industry_tooltip_show_required
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = false
-str     = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_REQUIRED
-strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_REQUIRED_HELPTEXT
+var      = gui.industry_tooltip_show_required
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = false
+str      = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_REQUIRED
+strhelp  = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_REQUIRED_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
-var     = gui.industry_tooltip_show_stockpiled
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = false
-str     = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_STOCKPILED
-strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_STOCKPILED_HELPTEXT
+var      = gui.industry_tooltip_show_stockpiled
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = false
+str      = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_STOCKPILED
+strhelp  = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_STOCKPILED_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
-var     = gui.industry_tooltip_show_produced
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = true
-str     = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_PRODUCED
-strhelp = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_PRODUCED_HELPTEXT
+var      = gui.industry_tooltip_show_produced
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = true
+str      = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_PRODUCED
+strhelp  = STR_CONFIG_SETTING_INDUSTRY_TOOLTIP_PRODUCED_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
-var     = gui.depot_tooltip_mode
-type    = SLE_UINT8
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def     = 1
-min     = 0
-max     = 2
-str     = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE
-strhelp = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE_HELPTEXT
-strval  = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE_OFF
+var      = gui.depot_tooltip_mode
+type     = SLE_UINT8
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
+def      = 1
+min      = 0
+max      = 2
+str      = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE
+strhelp  = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE_HELPTEXT
+strval   = STR_CONFIG_SETTING_DEPOT_TOOLTIP_MODE_OFF
+patchcat = SC_PATCH
 
 [SDTC_VAR]
-var     = gui.waypoint_viewport_tooltip_name
-type    = SLE_UINT8
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def     = 1
-min     = 0
-max     = 2
-str     = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME
-strhelp = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME_HELPTEXT
-strval  = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME_OFF
+var      = gui.waypoint_viewport_tooltip_name
+type     = SLE_UINT8
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
+def      = 1
+min      = 0
+max      = 2
+str      = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME
+strhelp  = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME_HELPTEXT
+strval   = STR_CONFIG_SETTING_WAYPOINT_VIEWPORT_TOOLTIP_NAME_OFF
+patchcat = SC_PATCH
 
 [SDTC_VAR]
-var     = gui.station_viewport_tooltip_name
-type    = SLE_UINT8
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
-def     = 1
-min     = 0
-max     = 2
-str     = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME
-strhelp = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME_HELPTEXT
-strval  = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME_OFF
+var      = gui.station_viewport_tooltip_name
+type     = SLE_UINT8
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
+def      = 1
+min      = 0
+max      = 2
+str      = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME
+strhelp  = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME_HELPTEXT
+strval   = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_NAME_OFF
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
-var     = gui.station_viewport_tooltip_cargo
-flags   = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
-def     = true
-str     = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_CARGO
-strhelp = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_CARGO_HELPTEXT
+var      = gui.station_viewport_tooltip_cargo
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = true
+str      = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_CARGO
+strhelp  = STR_CONFIG_SETTING_STATION_VIEWPORT_TOOLTIP_CARGO_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.station_rating_tooltip_mode
@@ -4680,6 +4789,7 @@ max      = 2
 str      = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE
 strhelp  = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_HELPTEXT
 strval   = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF
+patchcat = SC_PATCH
 
 [SDTC_OMANY]
 var      = gui.osk_activation
@@ -4800,6 +4910,7 @@ def      = false
 str      = STR_CONFIG_SETTING_CITY_IN_LABEL
 strhelp  = STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT
 post_cb  = [](auto) { UpdateAllTownVirtCoords(); }
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.link_terraform_toolbar
@@ -4890,6 +5001,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SLOPES_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = ViewportMapLandscapeModeChanged
 
 [SDTC_BOOL]
@@ -4898,6 +5010,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_HEIGHT
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_HEIGHT_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = ViewportMapLandscapeModeChanged
 
 [SDTC_BOOL]
@@ -4906,6 +5019,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_BRIDGES_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = ViewportMapLandscapeModeChanged
 
 [SDTC_BOOL]
@@ -4914,6 +5028,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_TUNNELS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = ViewportMapShowTunnelModeChanged
 
 [SDTC_VAR]
@@ -4927,6 +5042,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_MODE
 strhelp  = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_MODE_HELPTEXT
 strval   = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_MODE_OFF
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); }
 
 [SDTC_BOOL]
@@ -4935,6 +5051,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_STEPS
 strhelp  = STR_CONFIG_SETTING_SHOW_VEHICLE_ROUTE_STEPS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); }
 
 [SDTC_BOOL]
@@ -4943,6 +5060,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_VEHICLE_ROUTE
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_VEHICLE_ROUTE_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); }
 
 [SDTC_VAR]
@@ -4956,6 +5074,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_DRAW_ROUTE_DASH
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_DRAW_ROUTE_DASH_HELPTEXT
 strval   = STR_CONFIG_SETTING_VIEWPORT_MAP_DRAW_ROUTE_DASH_VALUE
+patchcat = SC_PATCH
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_EXPERT
 
@@ -4965,6 +5084,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = ViewportMapLandscapeModeChanged
 
 [SDTC_VAR]
@@ -4978,6 +5098,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_HELPTEXT
 strval   = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_NOTHING
+patchcat = SC_PATCH
 
 [SDTC_ENUM]
 var      = gui.default_viewport_map_mode
@@ -4987,6 +5108,7 @@ def      = 0
 enumlist = _viewport_map_modes
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.action_when_viewport_map_is_dblclicked
@@ -4999,6 +5121,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK
 strhelp  = STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_HELPTEXT
 strval   = STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.pause_on_newgame
@@ -5040,6 +5163,7 @@ def      = false
 str      = STR_CONFIG_SETTING_TIMETABLE_LEFTOVER_TICKS
 strhelp  = STR_CONFIG_SETTING_TIMETABLE_LEFTOVER_TICKS_HELPTEXT
 post_cb  = InvalidateVehTimetableWindow
+patchcat = SC_PATCH
 cat      = SC_EXPERT
 
 [SDTC_BOOL]
@@ -5048,6 +5172,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_OVERRIDE_TIME_SETTINGS
 strhelp  = STR_CONFIG_SETTING_OVERRIDE_TIME_SETTINGS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = ChangeTimeOverrideMode
 
 [SDTC_BOOL]
@@ -5056,6 +5181,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_TIME_IN_MINUTES
 strhelp  = STR_CONFIG_SETTING_TIME_IN_MINUTES_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = UpdateTimeSettings
 
 [SDTC_VAR]
@@ -5069,6 +5195,7 @@ max      = 8192
 interval = 10
 str      = STR_CONFIG_SETTING_TICKS_PER_MINUTE
 strhelp  = STR_CONFIG_SETTING_TICKS_PER_MINUTE_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = UpdateTimeSettings
 
 [SDTC_VAR]
@@ -5082,6 +5209,7 @@ max      = 1439
 interval = 60
 str      = STR_CONFIG_SETTING_CLOCK_OFFSET
 strhelp  = STR_CONFIG_SETTING_CLOCK_OFFSET_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = UpdateTimeSettings
 
 [SDT_BOOL]
@@ -5090,6 +5218,7 @@ def      = false
 str      = STR_CONFIG_SETTING_TIME_IN_MINUTES
 strhelp  = STR_CONFIG_SETTING_TIME_IN_MINUTES_HELPTEXT
 post_cb  = UpdateTimeSettings
+patchcat = SC_PATCH
 patxname = ""game_time.time_in_minutes""
 
 [SDT_VAR]
@@ -5103,6 +5232,7 @@ interval = 10
 str      = STR_CONFIG_SETTING_TICKS_PER_MINUTE
 strhelp  = STR_CONFIG_SETTING_TICKS_PER_MINUTE_HELPTEXT
 post_cb  = UpdateTimeSettings
+patchcat = SC_PATCH
 patxname = ""game_time.ticks_per_minute""
 
 [SDT_VAR]
@@ -5116,6 +5246,7 @@ interval = 60
 str      = STR_CONFIG_SETTING_CLOCK_OFFSET
 strhelp  = STR_CONFIG_SETTING_CLOCK_OFFSET_HELPTEXT
 post_cb  = UpdateTimeSettings
+patchcat = SC_PATCH
 patxname = ""game_time.clock_offset""
 
 ;; gui.ticks_per_minute
@@ -5133,6 +5264,7 @@ max      = 3
 str      = STR_CONFIG_SETTING_DATE_WITH_TIME
 strval   = STR_CONFIG_SETTING_DATE_WITH_TIME_NONE
 strhelp  = STR_CONFIG_SETTING_DATE_WITH_TIME_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = UpdateTimeSettings
 
 [SDTC_BOOL]
@@ -5141,6 +5273,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_TIMETABLE_START_TEXT_ENTRY
 strhelp  = STR_CONFIG_SETTING_TIMETABLE_START_TEXT_ENTRY_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.timetable_arrival_departure
@@ -5161,6 +5294,7 @@ max      = 30
 interval = 1
 str      = STR_CONFIG_MAX_DEPARTURES
 strhelp  = STR_CONFIG_MAX_DEPARTURES_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_VAR]
@@ -5174,6 +5308,7 @@ max      = 365
 interval = 1
 str      = STR_CONFIG_MAX_DEPARTURE_TIME
 strhelp  = STR_CONFIG_MAX_DEPARTURE_TIME_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_VAR]
@@ -5187,6 +5322,7 @@ max      = 5000
 interval = 30
 str      = STR_CONFIG_MAX_DEPARTURE_TIME_MINUTES
 strhelp  = STR_CONFIG_MAX_DEPARTURE_TIME_MINUTES_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_VAR]
@@ -5200,6 +5336,7 @@ max      = 120
 interval = 1
 str      = STR_CONFIG_DEPARTURE_CALC_FREQUENCY
 strhelp  = STR_CONFIG_DEPARTURE_CALC_FREQUENCY_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.departure_show_vehicle
@@ -5207,6 +5344,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_VEHICLE_NAME
 strhelp  = STR_CONFIG_DEPARTURE_VEHICLE_NAME_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5215,6 +5353,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_GROUP_NAME
 strhelp  = STR_CONFIG_DEPARTURE_GROUP_NAME_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5223,6 +5362,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_COMPANY_NAME
 strhelp  = STR_CONFIG_DEPARTURE_COMPANY_NAME_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5231,6 +5371,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_VEHICLE_TYPE
 strhelp  = STR_CONFIG_DEPARTURE_VEHICLE_TYPE_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5239,6 +5380,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_VEHICLE_COLOR
 strhelp  = STR_CONFIG_DEPARTURE_VEHICLE_COLOR_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5247,6 +5389,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_LARGER_FONT
 strhelp  = STR_CONFIG_DEPARTURE_LARGER_FONT_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5255,6 +5398,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_DESTINATION_TYPE
 strhelp  = STR_CONFIG_DEPARTURE_DESTINATION_TYPE_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5263,6 +5407,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_SHOW_BOTH
 strhelp  = STR_CONFIG_DEPARTURE_SHOW_BOTH_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5271,6 +5416,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_ONLY_PASSENGERS
 strhelp  = STR_CONFIG_DEPARTURE_ONLY_PASSENGERS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5279,6 +5425,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_SMART_TERMINUS
 strhelp  = STR_CONFIG_DEPARTURE_SMART_TERMINUS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5287,6 +5434,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS
 strhelp  = STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5295,6 +5443,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_DEPARTURE_MERGE_IDENTICAL
 strhelp  = STR_CONFIG_DEPARTURE_MERGE_IDENTICAL_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_VAR]
@@ -5307,6 +5456,7 @@ max      = 2
 str      = STR_CONFIG_DEPARTURE_CONDITIONALS
 strval   = STR_CONFIG_DEPARTURE_CONDITIONALS_1
 strhelp  = STR_CONFIG_DEPARTURE_CONDITIONALS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_DEPARTURES_BOARD, 1); }
 
 [SDTC_BOOL]
@@ -5463,6 +5613,7 @@ def      = 0
 enumlist = _no_depot_order_warn
 str      = STR_CONFIG_SETTING_WARN_NO_DEPOT_ORDER
 strhelp  = STR_CONFIG_SETTING_WARN_NO_DEPOT_ORDER_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.lost_vehicle_warn
@@ -5470,6 +5621,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_WARN_LOST_VEHICLE
 strhelp  = STR_CONFIG_SETTING_WARN_LOST_VEHICLE_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.restriction_wait_vehicle_warn
@@ -5477,6 +5629,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_WARN_RESTRICTION_WAIT_VEHICLE
 strhelp  = STR_CONFIG_SETTING_WARN_RESTRICTION_WAIT_VEHICLE_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.new_nonstop
@@ -5533,6 +5686,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = 8
 min      = 0
 max      = 255
+patchcat = SC_PATCH
 
 [SDTC_OMANY]
 var      = gui.savegame_overwrite_confirm
@@ -5545,6 +5699,7 @@ full     = _savegame_overwrite_confirm
 def      = 3
 min      = 0
 max      = 3
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.auto_euro
@@ -5661,6 +5816,7 @@ str      = STR_CONFIG_SETTING_SHOW_TRAIN_LENGTH_IN_DETAILS
 strhelp  = STR_CONFIG_SETTING_SHOW_TRAIN_LENGTH_IN_DETAILS_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_train_weight_ratios_in_details
@@ -5670,6 +5826,7 @@ str      = STR_CONFIG_SETTING_SHOW_TRAIN_WEIGHT_RATIOS_IN_DETAILS
 strhelp  = STR_CONFIG_SETTING_SHOW_TRAIN_WEIGHT_RATIOS_IN_DETAILS_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_vehicle_group_in_details
@@ -5679,6 +5836,7 @@ str      = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_IN_DETAILS
 strhelp  = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_IN_DETAILS_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_vehicle_list_company_colour
@@ -5688,6 +5846,7 @@ str      = STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR
 strhelp  = STR_CONFIG_SETTING_SHOW_VEHICLE_LIST_COMPANY_COLOUR_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_restricted_signal_default
@@ -5695,6 +5854,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SHOW_RESTRICTED_SIG_DEF
 strhelp  = STR_CONFIG_SETTING_SHOW_RESTRICTED_SIG_DEF_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 
 [SDTC_BOOL]
@@ -5703,6 +5863,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SHOW_ALL_SIG_DEF
 strhelp  = STR_CONFIG_SETTING_SHOW_ALL_SIG_DEF_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { UpdateRailGuiSprites(); MarkWholeScreenDirty(); }
 
 [SDTC_BOOL]
@@ -5713,6 +5874,7 @@ str      = STR_CONFIG_SETTING_SHOW_ADV_TRACE_RESTRICT_FEATURES
 strhelp  = STR_CONFIG_SETTING_SHOW_ADV_TRACE_RESTRICT_FEATURES_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_progsig_ui
@@ -5722,6 +5884,7 @@ str      = STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES
 strhelp  = STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT
 post_cb  = ProgrammableSignalsShownChanged
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_noentrysig_ui
@@ -5731,6 +5894,7 @@ str      = STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES
 strhelp  = STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT
 post_cb  = ProgrammableSignalsShownChanged
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_veh_list_cargo_filter
@@ -5738,6 +5902,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER
 strhelp  = STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = VehListCargoFilterShownChanged
 
 [SDTC_BOOL]
@@ -5748,6 +5913,7 @@ str      = STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI
 strhelp  = STR_CONFIG_SETTING_ENABLE_SINGLE_VEH_SHARED_ORDER_GUI_HELPTEXT
 post_cb  = EnableSingleVehSharedOrderGuiChanged
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_adv_load_mode_features
@@ -5756,6 +5922,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES
 strhelp  = STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.disable_top_veh_list_mass_actions
@@ -5765,6 +5932,7 @@ str      = STR_CONFIG_SETTING_DISABLE_TOP_VEH_LIST_MASS_ACTIONS
 strhelp  = STR_CONFIG_SETTING_DISABLE_TOP_VEH_LIST_MASS_ACTIONS_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.adv_sig_bridge_tun_modes
@@ -5773,6 +5941,7 @@ def      = false
 str      = STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES
 strhelp  = STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.sort_track_types_by_speed
@@ -5782,6 +5951,7 @@ str      = STR_CONFIG_SETTING_SORT_TRACK_TYPES_BY_SPEED
 strhelp  = STR_CONFIG_SETTING_SORT_TRACK_TYPES_BY_SPEED_HELPTEXT
 post_cb  = ChangeTrackTypeSortMode
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_depot_sell_gui
@@ -5790,6 +5960,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SHOW_DEPOT_SELL_GUI
 strhelp  = STR_CONFIG_SETTING_SHOW_DEPOT_SELL_GUI_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.open_vehicle_gui_clone_share
@@ -5798,6 +5969,7 @@ def      = false
 str      = STR_CONFIG_SETTING_OPEN_VEHICLE_GUI_CLONE_SHARE
 strhelp  = STR_CONFIG_SETTING_OPEN_VEHICLE_GUI_CLONE_SHARE_HELPTEXT
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_newgrf_name
@@ -5807,6 +5979,7 @@ str      = STR_CONFIG_SETTING_SHOW_NEWGRF_NAME
 strhelp  = STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_cargo_in_vehicle_lists
@@ -5816,6 +5989,7 @@ str      = STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS
 strhelp  = STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.scale_bevels
@@ -5831,6 +6005,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 post_cb  = [](auto) { ReInitAllWindows(true); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 startup  = true
 
 [SDTC_BOOL]
@@ -5841,6 +6016,7 @@ str      = STR_CONFIG_SETTING_SHOW_WAGON_INTRO_YEAR
 strhelp  = STR_CONFIG_SETTING_SHOW_WAGON_INTRO_YEAR_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.linkgraph_colours
@@ -5867,6 +6043,7 @@ strhelp  = STR_CONFIG_SETTING_VEHICLE_NAMES_HELPTEXT
 strval   = STR_CONFIG_SETTING_VEHICLE_NAMES_TRADITIONAL
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.shade_trees_on_slopes
@@ -5876,6 +6053,7 @@ str      = STR_CONFIG_SETTING_SHADED_TREES_ON_SLOPES
 strhelp  = STR_CONFIG_SETTING_SHADED_TREES_ON_SLOPES_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.demolish_confirm_mode
@@ -5888,6 +6066,7 @@ str      = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE
 strhelp  = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_HELPTEXT
 strval   = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_OFF
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.dual_pane_train_purchase_window
@@ -5895,6 +6074,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW
 strhelp  = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); }
 
 [SDTC_BOOL]
@@ -5903,6 +6083,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = true
 str      = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_DUAL_BUTTONS
 strhelp  = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_DUAL_BUTTONS_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_BUILD_VEHICLE); InvalidateWindowClassesData(WC_BUILD_VIRTUAL_TRAIN); }
 
 [SDTC_BOOL]
@@ -5911,6 +6092,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_ALLOW_HIDE_WAYPOINT_LABEL
 strhelp  = STR_CONFIG_SETTING_ALLOW_HIDE_WAYPOINT_LABEL_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { MarkWholeScreenDirty(); InvalidateWindowClassesData(WC_WAYPOINT_VIEW, 0); }
 
 [SDTC_ENUM]
@@ -5921,6 +6103,7 @@ def      = 255
 enumlist = _disable_water_animation
 str      = STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION
 strhelp  = STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = SpriteZoomMinChanged
 
 [SDTC_BOOL]
@@ -5930,6 +6113,7 @@ def      = false
 str      = STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT
 strhelp  = STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_order_management_button
@@ -5939,6 +6123,7 @@ str      = STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT
 strhelp  = STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_VEHICLE_ORDERS); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_group_hierarchy_name
@@ -5948,6 +6133,7 @@ str      = STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME
 strhelp  = STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT
 post_cb  = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); MarkWholeScreenDirty(); }
 cat      = SC_BASIC
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_vehicle_group_hierarchy_name
@@ -5957,6 +6143,7 @@ str      = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_HIERARCHY_NAME
 strhelp  = STR_CONFIG_SETTING_SHOW_VEHICLE_GROUP_HIERARCHY_NAME_HELPTEXT
 post_cb  = [](auto) { MarkWholeScreenDirty(); }
 cat      = SC_ADVANCED
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.show_order_number_vehicle_view
@@ -5964,6 +6151,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SHOW_ORDER_NUMBER_IN_VEHICLE_VIEW
 strhelp  = STR_CONFIG_SETTING_SHOW_ORDER_NUMBER_IN_VEHICLE_VIEW_HELPTEXT
+patchcat = SC_PATCH
 post_cb  = [](auto) { SetWindowClassesDirty(WC_VEHICLE_VIEW); }
 
 ; For the dedicated build we'll enable dates in logs by default.
@@ -6039,12 +6227,14 @@ var      = gui.console_show_unlisted
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = gui.newgrf_disable_big_gui
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.console_backlog_timeout
@@ -6379,6 +6569,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SCENARIO_MULTIPLE_BUILDINGS
 strhelp  = STR_CONFIG_SETTING_SCENARIO_MULTIPLE_BUILDINGS_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = scenario.house_ignore_dates
@@ -6386,6 +6577,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_DATES
 strhelp  = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_DATES_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = scenario.house_ignore_zones
@@ -6398,6 +6590,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_ZONES
 strhelp  = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_ZONES_HELPTEXT
 strval   = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_ZONES_OFF
+patchcat = SC_PATCH
 
 [SDTC_BOOL]
 var      = scenario.house_ignore_grf
@@ -6405,6 +6598,7 @@ flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 str      = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_GRF
 strhelp  = STR_CONFIG_SETTING_SCENARIO_HOUSE_IGNORE_GRF_HELPTEXT
+patchcat = SC_PATCH
 
 [SDTC_VAR]
 var      = gui.network_chat_box_width_pct
@@ -6440,6 +6634,7 @@ str      = STR_CONFIG_SETTING_PAY_FOR_REPAIR_VEHICLE
 strhelp  = STR_CONFIG_SETTING_PAY_FOR_REPAIR_VEHICLE_HELPTEXT
 cat      = SC_EXPERT
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_VEHICLE_REPAIR_COST)
+patchcat = SC_PATCH
 patxname = ""vehicle_repair_cost.vehicle.pay_for_repair""
 
 [SDT_VAR]
@@ -6454,6 +6649,7 @@ strhelp  = STR_CONFIG_SETTING_REPAIR_COST_HELPTEXT
 strval   = STR_JUST_INT
 cat      = SC_EXPERT
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_VEHICLE_REPAIR_COST)
+patchcat = SC_PATCH
 patxname = ""vehicle_repair_cost.vehicle.repair_cost""
 
 [SDT_VAR]
@@ -6464,6 +6660,7 @@ def      = 0
 min      = 0
 max      = 0xFFFFFFFF
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""debug.chicken_bits""
 
 [SDT_VAR]
@@ -6474,4 +6671,5 @@ def      = 0
 min      = 0
 max      = 0xFFFFFFFF
 cat      = SC_EXPERT
+patchcat = SC_PATCH
 patxname = ""debug.newgrf_optimiser_flags""