diff --git a/src/table/settings/cmclient_settings.ini b/src/table/settings/cmclient_settings.ini
index a97086bc28..a8f00d1796 100644
--- a/src/table/settings/cmclient_settings.ini
+++ b/src/table/settings/cmclient_settings.ini
@@ -74,3 +74,254 @@ full     = _station_mod_actions
 str      = CM_STR_CONFIG_SETTING_STATION_MOD_CTRL
 strval   = CM_STR_CONFIG_SETTING_STATION_MOD_ACTION_NONE
 cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_shift_station_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 0
+max      = 6
+full     = _station_mod_actions
+str      = CM_STR_CONFIG_SETTING_STATION_MOD_SHIFT
+strval   = CM_STR_CONFIG_SETTING_STATION_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_ctrl_shift_station_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 2
+max      = 6
+full     = _station_mod_actions
+str      = CM_STR_CONFIG_SETTING_STATION_MOD_CTRL_SHIFT
+strval   = CM_STR_CONFIG_SETTING_STATION_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_alt_station_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 4
+max      = 6
+full     = _station_mod_actions
+str      = CM_STR_CONFIG_SETTING_STATION_MOD_ALT
+strval   = CM_STR_CONFIG_SETTING_STATION_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_alt_shift_station_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 3
+max      = 6
+full     = _station_mod_actions
+str      = CM_STR_CONFIG_SETTING_STATION_MOD_ALT_SHIFT
+strval   = CM_STR_CONFIG_SETTING_STATION_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_alt_ctrl_station_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 5
+max      = 6
+full     = _station_mod_actions
+str      = CM_STR_CONFIG_SETTING_STATION_MOD_ALT_CTRL
+strval   = CM_STR_CONFIG_SETTING_STATION_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_ctrl_depot_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 3
+max      = 3
+full     = _depot_mod_actions
+str      = CM_STR_CONFIG_SETTING_DEPOT_MOD_CTRL
+strval   = CM_STR_CONFIG_SETTING_DEPOT_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_shift_depot_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 1
+max      = 3
+full     = _depot_mod_actions
+str      = CM_STR_CONFIG_SETTING_DEPOT_MOD_SHIFT
+strval   = CM_STR_CONFIG_SETTING_DEPOT_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_OMANY]
+var      = gui.cm_ctrl_shift_depot_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+def      = 2
+max      = 3
+full     = _depot_mod_actions
+str      = CM_STR_CONFIG_SETTING_DEPOT_MOD_CTRL_SHIFT
+strval   = CM_STR_CONFIG_SETTING_DEPOT_MOD_ACTION_NONE
+cat      = SC_BASIC
+
+[SDTC_BOOL]
+var      = gui.cm_show_industry_forbidden_tiles
+def      = false
+cat      = SC_BASIC
+
+[SDTC_BOOL]
+var      = gui.cm_runway_too_short_warning
+def      = true
+str      = CM_STR_CONFIG_SETTING_WARN_IF_RUNWAY_IS_TOO_SHORT
+
+[SDTC_VAR]
+var      = gui.cm_powerfund_money
+type     = SLE_UINT
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiCurrency, SettingFlag::CityMania
+def      = 200000
+min      = 0
+max      = 2000000
+str      = CM_STR_CONFIG_SETTING_POWERFUND_MONEY
+strval   = STR_JUST_CURRENCY_LONG
+
+[SDTC_VAR]
+var      = gui.cm_powerfund_houses
+type     = SLE_UINT16
+def      = 10000
+min      = 0
+max      = 10000
+interval = 10
+str      = CM_STR_CONFIG_SETTING_POWERFUND_HOUSES
+strval   = STR_JUST_COMMA
+
+[SDTC_BOOL]
+var      = gui.cm_land_tooltips_for_industries
+def      = true
+str      = CM_STR_CONFIG_SETTING_LAND_TOOLTIPS_FOR_INDUSTRIES
+strhelp  = CM_STR_CONFIG_SETTING_LAND_TOOLTIPS_FOR_INDUSTRIES_HELPTEXT
+
+[SDTC_BOOL]
+var      = gui.cm_land_tooltips_for_stations
+def      = true
+str      = CM_STR_CONFIG_SETTING_LAND_TOOLTIPS_FOR_STATIONS
+strhelp  = CM_STR_CONFIG_SETTING_LAND_TOOLTIPS_FOR_STATIONS_HELPTEXT
+
+[SDTC_BOOL]
+var      = gui.cm_land_tooltips_for_houses
+def      = false
+str      = CM_STR_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES
+strhelp  = CM_STR_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES_HELPTEXT
+
+[SDTC_OMANY]
+var      = gui.cm_fn_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+full     = _mod_keys
+def      = 2
+min      = 0
+max      = 4
+str      = CM_STR_CONFIG_SETTING_MODIFIER_FN
+strhelp  = CM_STR_CONFIG_SETTING_MODIFIER_FN_HELPTEXT
+strval   = CM_STR_CONFIG_SETTING_MODIFIER_NONE
+cat      = SC_ADVANCED
+
+[SDTC_OMANY]
+var      = gui.cm_remove_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+full     = _mod_keys
+def      = 2
+min      = 0
+max      = 4
+str      = CM_STR_CONFIG_SETTING_MODIFIER_REMOVE
+strhelp  = CM_STR_CONFIG_SETTING_MODIFIER_REMOVE_HELPTEXT
+strval   = CM_STR_CONFIG_SETTING_MODIFIER_NONE
+cat      = SC_ADVANCED
+
+[SDTC_OMANY]
+var      = gui.cm_estimate_mod
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+full     = _mod_keys
+def      = 1
+min      = 0
+max      = 4
+str      = CM_STR_CONFIG_SETTING_MODIFIER_ESTIMATE
+strhelp  = CM_STR_CONFIG_SETTING_MODIFIER_ESTIMATE_HELPTEXT
+strval   = CM_STR_CONFIG_SETTING_MODIFIER_NONE
+cat      = SC_ADVANCED
+
+[SDTC_OMANY]
+var      = gui.cm_shaded_trees
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+full     = _shaded_tree_options
+def      = 2
+min      = 0
+max      = 2
+str      = CM_STR_CONFIG_SETTING_SHADED_TREES
+strhelp  = CM_STR_CONFIG_SETTING_SHADED_TREES_HELPTEXT
+strval   = CM_STR_CONFIG_SETTING_SHADED_TREES_OFF
+cat      = SC_ADVANCED
+post_cb  = [](auto) { MarkWholeScreenDirty(); }
+
+[SDTC_BOOL]
+var      = gui.cm_show_apm
+def      = false
+str      = CM_STR_CONFIG_SETTING_SHOW_APM
+strhelp  = CM_STR_CONFIG_SETTING_SHOW_APM_HELPTEXT
+cat      = SC_ADVANCED
+post_cb  = cm_v_RedrawStatusBar
+
+[SDTC_OMANY]
+var      = gui.cm_graph_background
+type     = SLE_UINT8
+flags    = SettingFlag::NotInSave, SettingFlag::NoNetworkSync, SettingFlag::GuiDropdown, SettingFlag::CityMania
+full     = _graph_background_options
+def      = 0
+min      = 0
+max      = 1
+str      = CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND
+strhelp  = CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_HELPTEXT
+strval   = CM_STR_CONFIG_SETTING_GRAPH_BACKGROUND_BLACK
+cat      = SC_ADVANCED
+post_cb  = cm_v_RedrawGraphs
+
+[SDTC_BOOL]
+var      = gui.cm_open_vehicle_for_shared_clone
+def      = false
+str      = CM_STR_CONFIG_SETTING_OPEN_VEHICLE_FOR_SHARED_CLONE
+strhelp  = CM_STR_CONFIG_SETTING_OPEN_VEHICLE_FOR_SHARED_CLONE_HELPTEXT
+cat      = SC_BASIC
+
+[SDTC_BOOL]
+var      = gui.cm_open_orders_for_new_vehicles
+def      = false
+str      = CM_STR_CONFIG_SETTING_OPEN_ORDERS_FOR_NEW_VEHICLES
+strhelp  = CM_STR_CONFIG_SETTING_OPEN_ORDERS_FOR_NEW_VEHICLES_HELPTEXT
+cat      = SC_BASIC
+
+[SDTC_BOOL]
+var      = gui.cm_use_improved_station_join
+def      = false
+str      = CM_STR_CONFIG_SETTING_IMPROVED_STATION_JOIN
+strhelp  = CM_STR_CONFIG_SETTING_IMPROVED_STATION_JOIN_HELPTEXT
+cat      = SC_BASIC
+
+[SDTC_BOOL]
+var      = gui.cm_show_client_overlay
+def      = false
+cat      = SC_BASIC
+
+[SDTC_BOOL]
+var      = gui.cm_enable_polyrail_terraform
+def      = false
+str      = CM_STR_CONFIG_SETTING_ENABLE_POLYRAIL_TERRAFORM
+strhelp  = CM_STR_CONFIG_SETTING_ENABLE_POLYRAIL_TERRAFORM_HELPTEXT
+cat      = SC_EXPERT
+
+[SDTC_BOOL]
+var      = gui.cm_invert_fn_for_signal_drag
+def      = false
+str      = CM_STR_CONFIG_SETTING_INVERT_FN_FOR_SIGNAL_DRAG
+strhelp  = CM_STR_CONFIG_SETTING_INVERT_FN_FOR_SIGNAL_DRAG_HELPTEXT
+cat      = SC_BASIC