diff --git a/gtk2_ardour/configuration_metadata.h b/gtk2_ardour/configuration_metadata.h
index 4e48d5fac5..ad7af4cfce 100644
--- a/gtk2_ardour/configuration_metadata.h
+++ b/gtk2_ardour/configuration_metadata.h
@@ -6,6 +6,30 @@ UIConfiguration::build_metadata ()
 
 #define VAR_META(name,...)  { char const * _x[] { __VA_ARGS__ }; all_metadata.insert (std::make_pair<std::string,Metadata> ((name), PBD::upcase (_x))); }
 
+	VAR_META (X_("blink-rec-arm"), _("appearance"), _("blink"), _("record"), _("rec"), _("enable"), _("rec-enable"), _("record-enable"),  NULL);
+	VAR_META (X_("boxy-buttons"), _("appearance"), _("style"), _("boxy"), _("buttons"), _("theme"),  NULL);
+	VAR_META (X_("buggy-gradients"), _("appearance"), _("bugs"), _("tweaks"), _("kwirks"),  NULL);
+	VAR_META (X_("check-announcements"), _("check"), _("announcements"), _("phone"), _("home"),  NULL);
+	VAR_META (X_("clock-display-limit"), _("clock"), _("display"), _("limit"), _("length"), _("maximum"), _("duration"),  NULL);
+	VAR_META (X_("color-file"), _("theme"), _("colors"), _("appearance"), _("style"), _("themeing"),  NULL);
+	VAR_META (X_("color-regions-using-track-color"), _("theme"), _("colors"), _("appearance"), _("style"), _("themeing"),  NULL);
+	VAR_META (X_("default-bindings"), _("shortcuts"), _("keys"), _("keybindings"), _("bindings"),  NULL);
+	VAR_META (X_("default-lower-midi-note"), _("MIDI"), _("low"), _("lowest"), _("lower"),  NULL);
+	VAR_META (X_("default-narrow_ms"), _("appearance"), _("width"), _("mixer"),  NULL);
+	VAR_META (X_("default-upper-midi-note"), _("MIDI"), _("upper"), _("high"), _("highest"),  NULL);
+	VAR_META (X_("draggable-playhead"), _("playhead"), _("drag"), _("dragging"),  NULL);
+	VAR_META (X_("draggable-playhead-speed"), _("playhead"), _("drag"), _("dragging"),  NULL);
+	VAR_META (X_("editor-stereo-only-meters"), _("editor"), _("stereo"), _("meters"),  NULL);
+	VAR_META (X_("flat-buttons"), _("appearance"), _("style"), _("flat"), _("buttons"), _("theme"), _("ableton"),  NULL);
+	VAR_META (X_("floating-monitor-section"), _("appearance"), _("monitor"), _("floating"), _("separate"), _("window"),  NULL);
 	VAR_META (X_("font-scale"), _("fonts"), _("font"), _("size"), _("scaling"), _("readable"), _("readability"),  NULL);
+	VAR_META (X_("freesound-dir"), _("freesound"), _("folder"), _("folders"), _("directory"), _("directories"), _("download"),  NULL);
+	VAR_META (X_("hide-splash-screen"), _("appearance"), _("hide"), _("splash"), _("screen"),  NULL);
+	VAR_META (X_("afl-position"), _("monitoring"), _("monitor"), _("afl"), _("pfl"), _("pre"), _("post"), _("position"),  NULL);
+	VAR_META (X_("auto-analyse-audio"), _("automatic"), _("automated"), _("audio"), _("analysis"), _("transients"),  NULL);
+	VAR_META (X_("click-sound"), _("metronome"), _("click"), _("beat"), _("sound"), _("sample"),  NULL);
+	VAR_META (X_("clip-library-dir"), _("folder"), _("folders"), _("directory"), _("directories"), _("download"), _("clips"), _("library"),  NULL);
+	VAR_META (X_("cpu-dma-latency"), _("cpu"), _("dma"), _("latency"), _("performance"), _("xrun"),  NULL);
+	VAR_META (X_("create-xrun-marker"), _("xrun"), _("xmarker"),  NULL);
 
 }
diff --git a/gtk2_ardour/preference-metadata b/gtk2_ardour/preference-metadata
index fe52fbf9d6..6454880eb9 100644
--- a/gtk2_ardour/preference-metadata
+++ b/gtk2_ardour/preference-metadata
@@ -28,31 +28,48 @@
 [autoscroll-editor]
 [blink-alert-indicators]
 [blink-rec-arm]
+  appearance blink record rec enable rec-enable record-enable
 [boxy-buttons]
+  appearance style boxy buttons theme
 [buggy-gradients]
+  appearance bugs tweaks kwirks
 [cairo-image-surface]
 [check-announcements]
+  check announcements phone home
 [clock-display-limit]
+  clock display limit length maximum duration
 [color-file]
+ theme colors appearance style themeing
 [color-regions-using-track-color]
+ theme colors appearance style themeing
 [default-bindings]
+ shortcuts keys keybindings bindings
 [default-lower-midi-note]
+ MIDI low lowest lower
 [default-narrow_ms]
+ appearance width mixer
 [default-upper-midi-note]
+ MIDI upper high highest
 [draggable-playhead]
+ playhead drag dragging
 [draggable-playhead-speed]
+ playhead drag dragging
 [editor-stereo-only-meters]
+ editor stereo meters
 [extra-ui-extents-time]
 [flat-buttons]
+  appearance style flat buttons theme ableton
 [floating-monitor-section]
+  appearance monitor floating separate window
 [follow-edits]
 [font-scale]
   fonts font size scaling
   readable readability
-
 [freesound-dir]
+  freesound folder folders directory directories download
 [grid-follows-internal]
 [hide-splash-screen]
+  appearance hide splash screen 
 [highlight-auditioned-clips]
 [icon-set]
 [input-meter-layout]
@@ -212,6 +229,7 @@
 [SECTION:Global]
 
 [afl-position]
+  monitoring monitor afl pfl pre post position
 [all-safe]
 [allow-special-bus-removal]
 [ask-replace-instrument]
@@ -219,6 +237,7 @@
 [auditioner-output-left]
 [auditioner-output-right]
 [auto-analyse-audio]
+  automatic automated audio analysis transients
 [auto-connect-standard-busses]
 [auto-input-does-talkback]
 [auto-return-after-rewind-ffwd]
@@ -232,13 +251,17 @@
 [click-gain]
 [click-record-only]
 [click-sound]
+ metronome click beat sound sample 
 [clicking]
 [clip-library-dir]
+  folder folders directory directories download clips library
 [conceal-lv1-if-lv2-exists]
 [conceal-vst2-if-vst3-exists]
 [copy-demo-sessions]
 [cpu-dma-latency]
+  cpu dma latency performance xrun
 [create-xrun-marker]
+  xrun xmarker
 [default-automation-time-domain]
 [default-fade-shape]
 [default-session-parent-dir]
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index a6af0a558e..e33f6bd9d7 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -875,4 +875,4 @@ UIConfiguration::color_to_hex_string_no_alpha (Gtkmm2ext::Color c)
 	return buf;
 }
 
-#include "configuration_metadata.cc"
+#include "configuration_metadata.h"