diff --git a/src/table/gameopt_settings.ini b/src/table/gameopt_settings.ini
--- a/src/table/gameopt_settings.ini
+++ b/src/table/gameopt_settings.ini
@@ -23,7 +23,7 @@ static const char *_osk_activation = "di
 static const char *_settings_profiles = "easy|medium|hard";
 static const char *_news_display = "off|summarized|full";
 
-static const SettingDesc _gameopt_settings[] = {
+static const SettingTable _gameopt_settings{
 /* In version 4 a new difficulty setting has been added to the difficulty settings,
  * town attitude towards demolishing. Needs special handling because some dimwit thought
  * it funny to have the GameDifficulty struct be an array while it is a struct of
@@ -43,7 +43,6 @@ SDTC_OMANY   = SDTC_OMANY(       $var, $
 SDTG_OMANY   = SDTG_OMANY($name,       $type, $flags, $guiflags, $var, $def, $max, $full,            $str, $strhelp, $strval, $proc, $from, $to,        $cat, $extra, $startup),
 SDT_OMANY    =  SDT_OMANY($base, $var, $type, $flags, $guiflags, $def,       $max, $full,            $str, $strhelp, $strval, $proc, $from, $to, $load, $cat, $extra, $startup),
 SDT_VAR      =    SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max,        $interval, $str, $strhelp, $strval, $proc, $from, $to,        $cat, $extra, $startup),
-SDT_END      = SDT_END()
 
 [validation]
 SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
@@ -186,6 +185,3 @@ def      = 1
 max      = 1
 full     = _roadsides
 cat      = SC_BASIC
-
-[SDT_END]
-