diff --git a/src/table/window_settings.ini b/src/table/window_settings.ini
--- a/src/table/window_settings.ini
+++ b/src/table/window_settings.ini
@@ -6,13 +6,12 @@
 
 [pre-amble]
 
-static const SettingDesc _window_settings[] = {
+static const SettingTable _window_settings{
 [post-amble]
 };
 [templates]
 SDT_BOOL = SDT_BOOL($base, $var,        $flags, $guiflags, $def,                        $str, $strhelp, $strval, $proc, $from, $to, $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]
 SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for $base.$var exceeds storage size");
@@ -52,7 +51,3 @@ type     = SLE_INT16
 def      = 0
 min      = 0
 max      = 32000
-
-[SDT_END]
-
-};