remove explicit line-break (rely on wrap)
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 96e25522f582ed92ef96925fec6fb0c611e10a7e..6b8a96b284dfd6000b589bd9d74fa5f8981fd8ba 100644 (file)
@@ -65,7 +65,6 @@
 #include "midi_tracer.h"
 #include "rc_option_editor.h"
 #include "sfdb_ui.h"
-#include "theme_manager.h"
 #include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
@@ -85,43 +84,44 @@ public:
                , _click_browse_button (_("Browse..."))
                , _click_emphasis_browse_button (_("Browse..."))
        {
+               // TODO get rid of GTK -> use OptionEditor Widgets
                Table* t = &table;
 
-               Label* l = manage (left_aligned_label (_("Emphasis on first beat:")));
+               Label* l = manage (left_aligned_label (_("Emphasis on first beat")));
                _use_emphasis_on_click_check_button.add (*l);
                t->attach (_use_emphasis_on_click_check_button, 1, 3, 0, 1, FILL);
                _use_emphasis_on_click_check_button.signal_toggled().connect (
                    sigc::mem_fun (*this, &ClickOptions::use_emphasis_on_click_toggled));
 
-               l = manage (left_aligned_label (_("Use default Click:")));
+               l = manage (left_aligned_label (_("Use built-in default sounds")));
                _use_default_click_check_button.add (*l);
                t->attach (_use_default_click_check_button, 1, 3, 1, 2, FILL);
                _use_default_click_check_button.signal_toggled().connect (
                    sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
 
-               l = manage (left_aligned_label (_("Click audio file:")));
+               l = manage (left_aligned_label (_("Audio file:")));
                t->attach (*l, 1, 2, 2, 3, FILL);
                t->attach (_click_path_entry, 2, 3, 2, 3, FILL);
                _click_browse_button.signal_clicked ().connect (
                    sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
                t->attach (_click_browse_button, 3, 4, 2, 3, FILL);
 
-               l = manage (left_aligned_label (_("Click emphasis audio file:")));
+               l = manage (left_aligned_label (_("Emphasis audio file:")));
                t->attach (*l, 1, 2, 3, 4, FILL);
                t->attach (_click_emphasis_path_entry, 2, 3, 3, 4, FILL);
                _click_emphasis_browse_button.signal_clicked ().connect (
                    sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
                t->attach (_click_emphasis_browse_button, 3, 4, 3, 4, FILL);
 
-               FaderOption* fo = new FaderOption (
+               _click_fader = new FaderOption (
                                "click-gain",
-                               _("Click gain level"),
+                               _("Gain level"),
                                sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
                                sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
                                );
 
-               fo->add_to_page (this);
-               fo->set_state_from_config ();
+               _click_fader->add_to_page (this);
+               _click_fader->set_state_from_config ();
 
                _click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));
                _click_emphasis_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_changed));
@@ -146,6 +146,8 @@ public:
                } else if (p == "use-click-emphasis") {
                        bool x = _rc_config->get_use_click_emphasis ();
                        _use_emphasis_on_click_check_button.set_active (x);
+               } else if (p == "click-gain") {
+                       _click_fader->set_state_from_config ();
                }
        }
 
@@ -237,6 +239,7 @@ private:
        Entry _click_emphasis_path_entry;
        Button _click_browse_button;
        Button _click_emphasis_browse_button;
+       FaderOption* _click_fader;
 };
 
 class UndoOptions : public OptionEditorComponent
@@ -247,6 +250,7 @@ public:
                _limit_undo_button (_("Limit undo history to")),
                _save_undo_button (_("Save undo history of"))
        {
+               // TODO get rid of GTK -> use OptionEditor SpinOption
                _limit_undo_spin.set_range (0, 512);
                _limit_undo_spin.set_increments (1, 10);
 
@@ -392,14 +396,16 @@ static const struct {
 class KeyboardOptions : public OptionEditorMiniPage
 {
 public:
-       KeyboardOptions () :
-                 _delete_button_adjustment (3, 1, 12),
-                 _delete_button_spin (_delete_button_adjustment),
-                 _edit_button_adjustment (3, 1, 5),
-                 _edit_button_spin (_edit_button_adjustment),
-                 _insert_note_button_adjustment (3, 1, 5),
-                 _insert_note_button_spin (_insert_note_button_adjustment)
+       KeyboardOptions ()
+               : _delete_button_adjustment (3, 1, 12)
+               , _delete_button_spin (_delete_button_adjustment)
+               , _edit_button_adjustment (3, 1, 5)
+               , _edit_button_spin (_edit_button_adjustment)
+               , _insert_note_button_adjustment (3, 1, 5)
+               , _insert_note_button_spin (_insert_note_button_adjustment)
        {
+               // TODO get rid of GTK -> use OptionEditor Widgets
+
                const std::string restart_msg = _("\nChanges to this setting will only persist after your project has been saved.");
                /* internationalize and prepare for use with combos */
 
@@ -411,13 +417,7 @@ public:
                set_popdown_strings (_edit_modifier_combo, dumb);
                _edit_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_edit_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"),  Keyboard::primary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
-                               _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"),  Keyboard::primary_modifier_name (), restart_msg)));
 
                Table* t = &table;
 
@@ -437,7 +437,7 @@ public:
                _keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
                _keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed));
 
-               t->attach (*l, col, col + 2, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col + 1, col + 2, row, row + 1, FILL, FILL);
                t->attach (_keyboard_layout_selector, col + 2, col + 3, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -454,17 +454,16 @@ public:
                l = manage (left_aligned_label (_("Edit using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_edit_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                l = manage (new Label (_("+ button")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col + 3, col + 4, row, row + 1, FILL | EXPAND, FILL);
-               t->attach (_edit_button_spin, col + 4, col + 5, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col + 3, col + 4, row, row + 1, FILL, FILL);
+               t->attach (_edit_button_spin, col + 4, col + 5, row, row + 1, SHRINK , FILL);
 
                _edit_button_spin.set_name ("OptionsEntry");
-               _edit_button_adjustment.set_value (Keyboard::edit_button());
                _edit_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_button_changed));
 
                ++row;
@@ -473,28 +472,21 @@ public:
                set_popdown_strings (_delete_modifier_combo, dumb);
                _delete_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_delete_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
-                               _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1 + button 3 (right mouse button)</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Delete using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_delete_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                l = manage (new Label (_("+ button")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col + 3, col + 4, row, row + 1, FILL | EXPAND, FILL);
-               t->attach (_delete_button_spin, col + 4, col + 5, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col + 3, col + 4, row, row + 1, FILL, FILL);
+               t->attach (_delete_button_spin, col + 4, col + 5, row, row + 1, SHRINK, FILL);
 
                _delete_button_spin.set_name ("OptionsEntry");
-               _delete_button_adjustment.set_value (Keyboard::delete_button());
                _delete_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_button_changed));
 
                ++row;
@@ -503,28 +495,21 @@ public:
                set_popdown_strings (_insert_note_modifier_combo, dumb);
                _insert_note_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_insert_note_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1 + button 1 (left mouse button)</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
-                               _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1 + button 1 (left mouse button)</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Insert note using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_insert_note_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                l = manage (new Label (_("+ button")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col + 3, col + 4, row, row + 1, FILL | EXPAND, FILL);
-               t->attach (_insert_note_button_spin, col + 4, col + 5, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col + 3, col + 4, row, row + 1, FILL, FILL);
+               t->attach (_insert_note_button_spin, col + 4, col + 5, row, row + 1, SHRINK, FILL);
 
                _insert_note_button_spin.set_name ("OptionsEntry");
-               _insert_note_button_adjustment.set_value (Keyboard::insert_note_button());
                _insert_note_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_button_changed));
 
                ++row;
@@ -548,17 +533,11 @@ public:
                                                                     Keyboard::primary_modifier_name (),
 #endif
                                                                     restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
-                               _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
 
                l = manage (left_aligned_label (_("Copy items using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_copy_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                                ++row;
@@ -567,7 +546,6 @@ public:
                /* constraint modifier */
                set_popdown_strings (_constraint_modifier_combo, dumb);
                _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
-               std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
                                                    (string_compose (_("<b>Recommended Setting: %1</b>%2"),
 #ifdef __APPLE__
@@ -576,17 +554,11 @@ public:
                                                                     Keyboard::tertiary_modifier_name (),
 #endif
                                                                     restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
-                               _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
 
                l = manage (left_aligned_label (_("Constrain drag using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_constraint_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -596,20 +568,14 @@ public:
                set_popdown_strings (_push_points_combo, dumb);
                _push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
 
-               mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
+               std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
-                               _push_points_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Push points using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_push_points_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -626,18 +592,12 @@ public:
                set_popdown_strings (_trim_contents_combo, dumb);
                _trim_contents_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_contents_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_trim_contents_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_contents_modifier ()) {
-                               _trim_contents_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Trim contents using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_trim_contents_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -649,18 +609,12 @@ public:
 
                mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::tertiary_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_trim_anchored_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_anchored_modifier ()) {
-                               _trim_anchored_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Anchored trim using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                ++col;
                t->attach (_trim_anchored_combo, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
 
@@ -671,17 +625,10 @@ public:
                set_popdown_strings (_trim_jump_combo, dumb);
                _trim_jump_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_jump_modifier_chosen));
 
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) Keyboard::trim_jump_modifier ()) {
-                               _trim_jump_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
-
                l = manage (left_aligned_label (_("Jump after trim using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                ++col;
                t->attach (_trim_jump_combo, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
 
@@ -693,18 +640,12 @@ public:
                set_popdown_strings (_note_size_relative_combo, dumb);
                _note_size_relative_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::note_size_relative_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_note_size_relative_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
-                               _note_size_relative_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg))); // XXX 2ndary
 
                l = manage (left_aligned_label (_("Resize notes relatively using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                ++col;
                t->attach (_note_size_relative_combo, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
 
@@ -727,18 +668,12 @@ public:
                mod_str = Keyboard::secondary_modifier_name();
 #endif
                Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
-                               _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Ignore snap using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_snap_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -753,18 +688,12 @@ public:
                mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
 #endif
                Gtkmm2ext::UI::instance()->set_tip (_snap_delta_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) Keyboard::snap_delta_modifier ()) {
-                               _snap_delta_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Snap relatively using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_snap_delta_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -782,18 +711,12 @@ public:
                _trim_overlap_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_overlap_modifier_chosen));
 
                Gtkmm2ext::UI::instance()->set_tip (_trim_overlap_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_overlap_modifier ()) {
-                               _trim_overlap_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
 
                l = manage (left_aligned_label (_("Resize overlapped regions using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_trim_overlap_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
                ++row;
@@ -810,21 +733,24 @@ public:
                set_popdown_strings (_fine_adjust_combo, dumb);
                _fine_adjust_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::fine_adjust_modifier_chosen));
 
-               mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::secondary_modifier_name ());
+               mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::secondary_modifier_name ()); // XXX just 2ndary ?!
                Gtkmm2ext::UI::instance()->set_tip (_fine_adjust_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::fine_adjust_modifier ()) {
-                               _fine_adjust_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
+                               (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
 
                l = manage (left_aligned_label (_("Fine adjust using:")));
                l->set_name ("OptionsLabel");
 
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (*l, col, col + 1, row, row + 1, FILL, FILL);
                t->attach (_fine_adjust_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+               OptionEditorHeading* h = new OptionEditorHeading (_("Reset"));
+               h->add_to_page (this);
+
+               RcActionButton* rb = new RcActionButton (_("Reset to recommended defaults"),
+                               sigc::mem_fun (*this, &KeyboardOptions::reset_to_defaults));
+               rb->add_to_page (this);
+
+               set_state_from_config ();
        }
 
        void parameter_changed (string const &)
@@ -834,7 +760,56 @@ public:
 
        void set_state_from_config ()
        {
-               /* XXX: these aren't really config options... */
+               _delete_button_adjustment.set_value (Keyboard::delete_button());
+               _insert_note_button_adjustment.set_value (Keyboard::insert_note_button());
+               _edit_button_adjustment.set_value (Keyboard::edit_button());
+
+               for (int x = 0; modifiers[x].name; ++x) {
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_overlap_modifier ()) {
+                               _trim_overlap_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
+                               _delete_modifier_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
+                               _edit_modifier_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
+                               _insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
+                               _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
+                               _constraint_modifier_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
+                               _push_points_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_contents_modifier ()) {
+                               _trim_contents_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_anchored_modifier ()) {
+                               _trim_anchored_combo.set_active_text (S_(modifiers[x].name));
+                       }
+#if 0
+                       if (modifiers[x].modifier == (guint) Keyboard::trim_jump_modifier ()) {
+                               _trim_jump_combo.set_active_text (S_(modifiers[x].name));
+                       }
+#endif
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
+                               _note_size_relative_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
+                               _snap_modifier_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) Keyboard::snap_delta_modifier ()) {
+                               _snap_delta_combo.set_active_text (S_(modifiers[x].name));
+                       }
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::fine_adjust_modifier ()) {
+                               _fine_adjust_combo.set_active_text (S_(modifiers[x].name));
+                       }
+               }
        }
 
        void add_to_page (OptionEditorPage* p)
@@ -1032,6 +1007,56 @@ private:
                Keyboard::set_insert_note_button (_insert_note_button_spin.get_value_as_int());
        }
 
+       void reset_to_defaults ()
+       {
+               /* when clicking*/
+               Keyboard::set_edit_modifier (Keyboard::PrimaryModifier);
+               Keyboard::set_edit_button (3);
+               Keyboard::set_delete_modifier (Keyboard::TertiaryModifier);
+               Keyboard::set_delete_button (3);
+               Keyboard::set_insert_note_modifier (Keyboard::PrimaryModifier);
+               Keyboard::set_insert_note_button (1);
+
+               /* when beginning a drag */
+#ifdef __APPLE__
+               Keyboard::set_copy_modifier (Keyboard::SecondaryModifier);
+#else
+               Keyboard::set_copy_modifier (Keyboard::PrimaryModifier);
+#endif
+
+#ifdef __APPLE__
+               ArdourKeyboard::set_constraint_modifier (Keyboard::PrimaryModifier);
+#else
+               ArdourKeyboard::set_constraint_modifier (Keyboard::TertiaryModifier);
+#endif
+               ArdourKeyboard::set_push_points_modifier (Keyboard::PrimaryModifier | Keyboard::Level4Modifier);
+
+               /* when beginning a trim */
+               ArdourKeyboard::set_trim_contents_modifier (Keyboard::PrimaryModifier);
+               ArdourKeyboard::set_trim_anchored_modifier (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier);
+               ArdourKeyboard::set_note_size_relative_modifier (Keyboard::TertiaryModifier); // XXX better: 2ndary
+
+               /* while dragging */
+#ifdef __APPLE__
+               Keyboard::set_snap_modifier (Keyboard::TertiaryModifier);
+#else
+               Keyboard::set_snap_modifier (Keyboard::SecondaryModifier);
+#endif
+#ifdef __APPLE__
+               Keyboard::set_snap_delta_modifier (Keyboard::Level4Modifier);
+#else
+               Keyboard::set_snap_delta_modifier (Keyboard::SecondaryModifier | Keyboard::Level4Modifier);
+#endif
+
+               /* while trimming */
+               ArdourKeyboard::set_trim_overlap_modifier (Keyboard::TertiaryModifier);
+
+               /* while dragging ctrl points */
+               ArdourKeyboard::set_fine_adjust_modifier (/*Keyboard::PrimaryModifier | */Keyboard::SecondaryModifier); // XXX
+
+               set_state_from_config ();
+       }
+
        ComboBoxText _keyboard_layout_selector;
        ComboBoxText _edit_modifier_combo;
        ComboBoxText _delete_modifier_combo;
@@ -1141,11 +1166,15 @@ public:
                if (p == "waveform-clip-level") {
                        _clip_level_adjustment.set_value (UIConfiguration::instance().get_waveform_clip_level());
                }
+               if (p == "show-waveform-clipping") {
+                       _clip_level_slider.set_sensitive (UIConfiguration::instance().get_show_waveform_clipping ());
+               }
        }
 
        void set_state_from_config ()
        {
                parameter_changed ("waveform-clip-level");
+               parameter_changed ("show-waveform-clipping");
        }
 
        void add_to_page (OptionEditorPage* p) {
@@ -1433,7 +1462,7 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
                         * tear_down_gui() hides an deletes the Window if it exists.
                         */
                        ArdourWindow* win = new ArdourWindow (*((Gtk::Window*) _view.get_toplevel()), title.get_string());
-                       win->set_title ("Control Protocol Options");
+                       win->set_title (_("Control Protocol Settings"));
                        win->add (*box);
                        box->show ();
                        win->present ();
@@ -2085,7 +2114,11 @@ MidiPortOptions::pretty_name_edit (std::string const & path, string const & new_
 
 RCOptionEditor::RCOptionEditor ()
        : OptionEditorContainer (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
-       , Tabbable (*this, _("Preferences")) /* pack self-as-vbox into tabbable */
+       , Tabbable (*this, _("Preferences")
+#ifdef MIXBUS
+                       , false // detached by default (first start, no instant.xml)
+#endif
+                       ) /* pack self-as-vbox into tabbable */
        , _rc_config (Config)
        , _mixer_strip_visibility ("mixer-element-visibility")
 {
@@ -2098,7 +2131,7 @@ RCOptionEditor::RCOptionEditor ()
        BoolComboOption* bco;
 
        if (hwcpus > 1) {
-               add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization")));
+               add_option (_("General"), new OptionEditorHeading (_("DSP CPU Utilization")));
 
                ComboOption<int32_t>* procs = new ComboOption<int32_t> (
                                "processor-usage",
@@ -2116,14 +2149,90 @@ RCOptionEditor::RCOptionEditor ()
 
                procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME));
 
-               add_option (_("Misc"), procs);
+               add_option (_("General"), procs);
        }
 
-       add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo")));
+       /* Image cache size */
+       add_option (_("General"), new OptionEditorHeading (_("Memory Usage")));
+
+       HSliderOption *sics = new HSliderOption ("waveform-cache-size",
+                       _("Waveform image cache size (megabytes)"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size),
+                       1, 1024, 10 /* 1 MB to 1GB in steps of 10MB */
+                       );
+       sics->scale().set_digits (0);
+       Gtkmm2ext::UI::instance()->set_tip (
+                       sics->tip_widget(),
+                _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
+       add_option (_("General"), sics);
+
+       add_option (_("General"), new OptionEditorHeading (_("Engine")));
+
+       add_option (_("General"),
+            new BoolOption (
+                    "try-autostart-engine",
+                    _("Try to auto-launch audio/midi engine"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_try_autostart_engine),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_try_autostart_engine)
+                    ));
+
+       add_option (_("General"), new OptionEditorHeading (_("Automation")));
+
+       add_option (_("General"),
+            new SpinOption<double> (
+                    "automation-thinning-factor",
+                    _("Thinning factor (larger value => less data)"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_thinning_factor),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_thinning_factor),
+                    0, 1000, 1, 20
+                    ));
+
+       add_option (_("General"),
+            new SpinOption<double> (
+                    "automation-interval-msecs",
+                    _("Automation sampling interval (milliseconds)"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs),
+                    1, 1000, 1, 20
+                    ));
+
+       add_option (_("General"), new OptionEditorHeading (_("Tempo")));
+
+       bo = new BoolOption (
+               "allow-non-quarter-pulse",
+               _("Allow non quarter-note pulse"),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_allow_non_quarter_pulse),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_allow_non_quarter_pulse)
+               );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           string_compose (_("<b>When enabled</b> %1 will allow tempo to be expressed in divisions per minute\n"
+                                                             "<b>When disabled</b> %1 will only allow tempo to be expressed in quarter notes per minute"),
+                                                           PROGRAM_NAME));
+       add_option (_("General"), bo);
+
+       if (!ARDOUR::Profile->get_mixbus()) {
+               add_option (_("General"), new OptionEditorHeading (_("GUI Lock")));
+               /* Lock GUI timeout */
+
+               HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
+                               _("Lock timeout (seconds)"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds),
+                               0, 1000, 1, 10
+                               );
+               slts->scale().set_digits (0);
+               Gtkmm2ext::UI::instance()->set_tip (
+                               slts->tip_widget(),
+                               _("Lock GUI after this many idle seconds (zero to never lock)"));
+               add_option (_("General"), slts);
+       } // !mixbus
+
+       add_option (_("General/Session"), new OptionEditorHeading (S_("Options|Undo")));
 
-       add_option (_("Misc"), new UndoOptions (_rc_config));
+       add_option (_("General/Session"), new UndoOptions (_rc_config));
 
-       add_option (_("Misc"),
+       add_option (_("General/Session"),
             new BoolOption (
                     "verify-remove-last-capture",
                     _("Verify removal of last capture"),
@@ -2131,9 +2240,9 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
                     ));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Session Management")));
+       add_option (_("General/Session"), new OptionEditorHeading (_("Session Management")));
 
-       add_option (_("Misc"),
+       add_option (_("General/Session"),
             new BoolOption (
                     "periodic-safety-backups",
                     _("Make periodic backups of the session file"),
@@ -2141,7 +2250,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
                     ));
 
-       add_option (_("Misc"),
+       add_option (_("General/Session"),
             new BoolOption (
                     "only-copy-imported-files",
                     _("Always copy imported files"),
@@ -2149,14 +2258,14 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files)
                     ));
 
-       add_option (_("Misc"), new DirectoryOption (
+       add_option (_("General/Session"), new DirectoryOption (
                            X_("default-session-parent-dir"),
                            _("Default folder for new sessions:"),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
                            ));
 
-       add_option (_("Misc"),
+       add_option (_("General/Session"),
             new SpinOption<uint32_t> (
                     "max-recent-sessions",
                     _("Maximum number of recent sessions"),
@@ -2165,45 +2274,42 @@ RCOptionEditor::RCOptionEditor ()
                     0, 1000, 1, 20
                     ));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Automation")));
-
-       add_option (_("Misc"),
-            new SpinOption<double> (
-                    "automation-thinning-factor",
-                    _("Thinning factor (larger value => less data)"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_thinning_factor),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_thinning_factor),
-                    0, 1000, 1, 20
-                    ));
 
-       add_option (_("Misc"),
-            new SpinOption<double> (
-                    "automation-interval-msecs",
-                    _("Automation sampling interval (milliseconds)"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs),
-                    1, 1000, 1, 20
-                    ));
+#ifdef ENABLE_NLS
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Tempo")));
+       add_option (_("General/Translation"), new OptionEditorHeading (_("Internationalization")));
 
-       BoolOption* tsf;
+       bo = new BoolOption (
+                       "enable-translation",
+                       _("Use translations"),
+                       sigc::ptr_fun (ARDOUR::translations_are_enabled),
+                       sigc::ptr_fun (ARDOUR::set_translations_enabled)
+                       );
 
-       tsf = new BoolOption (
-               "allow-non-quarter-pulse",
-               _("Allow non quarter-note pulse"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_allow_non_quarter_pulse),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_allow_non_quarter_pulse)
-               );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
-                                           string_compose (_("<b>When enabled</b> %1 will allow tempo to be expressed in divisions per minute\n"
-                                                             "<b>When disabled</b> %1 will only allow tempo to be expressed in quarter notes per minute"),
-                                                           PROGRAM_NAME));
-       add_option (_("Misc"), tsf);
+       bo->set_note (string_compose (_("These settings will only take effect after %1 is restarted (if available for your language preferences)."), PROGRAM_NAME));
 
-       /* EDITOR */
+       add_option (_("General/Translation"), bo);
 
-       add_option (_("Editor"), new OptionEditorHeading (_("Editor Settings")));
+       _l10n = new ComboOption<ARDOUR::LocaleMode> (
+               "locale-mode",
+               _("Localization"),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_locale_mode),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_locale_mode)
+               );
+
+       _l10n->add (ARDOUR::SET_LC_ALL, _("Set complete locale"));
+       _l10n->add (ARDOUR::SET_LC_MESSAGES, _("Enable only message translation"));
+       _l10n->add (ARDOUR::SET_LC_MESSAGES_AND_LC_NUMERIC, _("Translate messages and format numeric format"));
+       _l10n->set_note (_("This setting is provided for plugin compatibility. e.g. some plugins on some systems expect the decimal point to be a dot."));
+
+       add_option (_("General/Translation"), _l10n);
+       parameter_changed ("enable-translation");
+#endif // ENABLE_NLS
+
+
+       /* EDITOR */
+
+       add_option (_("Editor"), new OptionEditorHeading (_("General")));
 
        add_option (_("Editor"),
             new BoolOption (
@@ -2215,7 +2321,7 @@ RCOptionEditor::RCOptionEditor ()
 
        bo = new BoolOption (
                     "name-new-markers",
-                    _("Name new markers"),
+                    _("Prompt for new marker names"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_name_new_markers),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_name_new_markers)
                );
@@ -2223,7 +2329,7 @@ RCOptionEditor::RCOptionEditor ()
        Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("If enabled, popup a dialog when a new marker is created to allow its name to be set as it is created."
                                                                "\n\nYou can always rename markers by right-clicking on them"));
 
-       add_option (S_("Editor"),
+       add_option (_("Editor"),
             new BoolOption (
                     "draggable-playhead",
                     _("Allow dragging of playhead"),
@@ -2231,23 +2337,16 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
                     ));
 
-if (!Profile->get_mixbus()) {
-       add_option (_("Editor"),
-                   new BoolOption (
-                           "show-zoom-tools",
-                           _("Show zoom toolbar (if torn off)"),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_zoom_tools),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_zoom_tools)
-                           ));
+       if (!Profile->get_mixbus()) {
 
-       add_option (_("Editor"),
-                   new BoolOption (
-                           "use-mouse-position-as-zoom-focus-on-scroll",
-                           _("Zoom to mouse position when zooming with scroll wheel"),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_mouse_position_as_zoom_focus_on_scroll),
-                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_mouse_position_as_zoom_focus_on_scroll)
-                           ));
-}  // !mixbus
+               add_option (_("Editor"),
+                               new BoolOption (
+                                       "use-mouse-position-as-zoom-focus-on-scroll",
+                                       _("Zoom to mouse position when zooming with scroll wheel"),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_mouse_position_as_zoom_focus_on_scroll),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_mouse_position_as_zoom_focus_on_scroll)
+                                       ));
+       }  // !mixbus
 
        add_option (_("Editor"),
                    new BoolOption (
@@ -2359,6 +2458,10 @@ if (!Profile->get_mixbus()) {
 
        add_option (_("Editor"), rsas);
 
+       add_option (_("Editor/Modifiers"), new OptionEditorHeading (_("Keyboard Modifiers")));
+       add_option (_("Editor/Modifiers"), new KeyboardOptions);
+       add_option (_("Editor/Modifiers"), new OptionEditorBlank ());
+
        /* MIXER -- SOLO AND MUTE */
 
        add_option (_("Mixer"), new OptionEditorHeading (_("Solo")));
@@ -2440,7 +2543,7 @@ if (!Profile->get_mixbus()) {
 
        add_option (_("Mixer"), pa);
 
-       add_option (_("Mixer"), new OptionEditorHeading (_("Default track / bus muting options")));
+       add_option (_("Mixer"), new OptionEditorHeading (_("Default Track / Bus Muting Options")));
 
        add_option (_("Mixer"),
             new BoolOption (
@@ -2475,25 +2578,20 @@ if (!Profile->get_mixbus()) {
                     ));
 
 
-if (!ARDOUR::Profile->get_mixbus()) {
-       add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
-       add_option (_("Mixer"),
-            new BoolOption (
-                    "link-send-and-route-panner",
-                    _("Link panners of Aux and External Sends with main panner by default"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
-                    ));
-}
-
-
-       /* AUDIO */
-
-       add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
+       if (!ARDOUR::Profile->get_mixbus()) {
+               add_option (_("Mixer"), new OptionEditorHeading (_("Send Routing")));
+               add_option (_("Mixer"),
+                               new BoolOption (
+                                       "link-send-and-route-panner",
+                                       _("Link panners of Aux and External Sends with main panner by default"),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
+                                       ));
+       }
 
-       add_option (_("Audio"), new BufferingOptions (_rc_config));
+       /* Signal Flow */
 
-       add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
+       add_option (_("Signal Flow"), new OptionEditorHeading (_("Monitoring")));
 
        ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
                "monitoring-model",
@@ -2511,64 +2609,75 @@ if (!ARDOUR::Profile->get_mixbus()) {
        mm->add (SoftwareMonitoring, string_compose (_("%1"), prog));
        mm->add (ExternalMonitoring, _("audio hardware"));
 
-       add_option (_("Audio"), mm);
+       add_option (_("Signal Flow"), mm);
 
-       add_option (_("Audio"),
-            new BoolOption (
+       bo = new BoolOption (
                     "tape-machine-mode",
                     _("Tape machine mode"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_tape_machine_mode),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
-                    ));
+                    );
+       add_option (_("Signal Flow"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       string_compose (_("<b>When enabled</b> %1 will not monitor a track's input if the transport is stopped."),
+                                       PROGRAM_NAME));
 
-       add_option (_("Audio"), new OptionEditorHeading (_("Track and Bus Connections")));
-if (!Profile->get_mixbus()) {
+       if (!Profile->get_mixbus()) {
 
-       add_option (_("Audio"),
-                   new BoolOption (
-                           "auto-connect-standard-busses",
-                           _("Auto-connect master/monitor busses"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_auto_connect_standard_busses),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_auto_connect_standard_busses)
-                           ));
+               add_option (_("Signal Flow"), new OptionEditorHeading (_("Track and Bus Connections")));
 
-       ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
-               "input-auto-connect",
-               _("Connect track inputs"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
-               );
+               add_option (_("Signal Flow"),
+                               new BoolOption (
+                                       "auto-connect-standard-busses",
+                                       _("Auto-connect master/monitor busses"),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_auto_connect_standard_busses),
+                                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_auto_connect_standard_busses)
+                                       ));
 
-       iac->add (AutoConnectPhysical, _("automatically to physical inputs"));
-       iac->add (ManualConnect, _("manually"));
+               ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
+                               "input-auto-connect",
+                               _("Connect track inputs"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
+                               );
 
-       add_option (_("Audio"), iac);
+               iac->add (AutoConnectPhysical, _("automatically to physical inputs"));
+               iac->add (ManualConnect, _("manually"));
 
-       ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> (
-               "output-auto-connect",
-               _("Connect track and bus outputs"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_output_auto_connect),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_output_auto_connect)
-               );
+               add_option (_("Signal Flow"), iac);
 
-       oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
-       oac->add (AutoConnectMaster, _("automatically to master bus"));
-       oac->add (ManualConnect, _("manually"));
+               ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> (
+                               "output-auto-connect",
+                               _("Connect track and bus outputs"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_output_auto_connect),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::set_output_auto_connect)
+                               );
 
-       add_option (_("Audio"), oac);
+               oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
+               oac->add (AutoConnectMaster, _("automatically to master bus"));
+               oac->add (ManualConnect, _("manually"));
 
-       bo = new BoolOption (
-                       "strict-io",
-                       _("Use 'Strict-I/O' for new tracks or Busses"),
-                       sigc::mem_fun (*_rc_config, &RCConfiguration::get_strict_io),
-                       sigc::mem_fun (*_rc_config, &RCConfiguration::set_strict_io)
-                       );
+               add_option (_("Signal Flow"), oac);
 
-       add_option (_("Audio"), bo);
-       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
-                       _("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
+               bo = new BoolOption (
+                               "strict-io",
+                               _("Use 'Strict-I/O' for new tracks or Busses"),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::get_strict_io),
+                               sigc::mem_fun (*_rc_config, &RCConfiguration::set_strict_io)
+                               );
+
+               add_option (_("Signal Flow"), bo);
+               Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                               _("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
+
+       }  // !mixbus
+
+
+       /* AUDIO */
+
+       add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
 
-}  // !mixbus
+       add_option (_("Audio"), new BufferingOptions (_rc_config));
 
        add_option (_("Audio"), new OptionEditorHeading (_("Denormals")));
 
@@ -2639,7 +2748,7 @@ if (!Profile->get_mixbus()) {
 
        /* MIDI */
 
-       add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Preferences")));
+       add_option (_("MIDI"), new OptionEditorHeading (_("Buffering")));
 
        add_option (_("MIDI"),
                    new SpinOption<float> (
@@ -2651,6 +2760,8 @@ if (!Profile->get_mixbus()) {
                            "", 1.0, 2
                            ));
 
+       add_option (_("MIDI"), new OptionEditorHeading (_("Session")));
+
        add_option (_("MIDI"),
             new SpinOption<int32_t> (
                     "initial-program-change",
@@ -2660,21 +2771,7 @@ if (!Profile->get_mixbus()) {
                     -1, 65536, 1, 10
                     ));
 
-       add_option (_("MIDI"),
-                   new BoolOption (
-                           "display-first-midi-bank-as-zero",
-                           _("Display first MIDI bank/program as 0"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
-                           ));
-
-       add_option (_("MIDI"),
-            new BoolOption (
-                    "never-display-periodic-midi",
-                    _("Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
-                    ));
+       add_option (_("MIDI"), new OptionEditorHeading (_("Audition")));
 
        add_option (_("MIDI"),
             new BoolOption (
@@ -2684,16 +2781,6 @@ if (!Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_sound_midi_notes)
                     ));
 
-       add_option (_("MIDI"),
-                   new BoolOption (
-                           "midi-feedback",
-                           _("Send MIDI control feedback"),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_feedback),
-                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback)
-                           ));
-
-       add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Audition")));
-
        ComboOption<std::string>* audition_synth = new ComboOption<std::string> (
                "midi-audition-synth-uri",
                _("MIDI Audition Synth (LV2)"),
@@ -2723,168 +2810,329 @@ if (!Profile->get_mixbus()) {
 
        /* Click */
 
-       add_option (_("Metronome"), new OptionEditorHeading (_("Click")));
+       add_option (_("Metronome"), new OptionEditorHeading (_("Metronome")));
        add_option (_("Metronome"), new ClickOptions (_rc_config));
 
+       /* Meters */
 
-       /* TRANSPORT & Sync */
-
-       add_option (_("Transport"), new OptionEditorHeading (S_("Transport Options")));
+       add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering")));
 
-       tsf = new BoolOption (
-                    "latched-record-enable",
-                    _("Keep record-enable engaged on stop"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
-                    );
-       add_option (_("Transport"), tsf);
+       ComboOption<float>* mht = new ComboOption<float> (
+               "meter-hold",
+               _("Peak hold time"),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_hold),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_hold)
+               );
 
-       tsf = new BoolOption (
-                    "loop-is-mode",
-                    _("Play loop is a transport mode"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_loop_is_mode),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_loop_is_mode)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
-                                           (_("<b>When enabled</b> the loop button does not start playback but forces playback to always play the loop\n\n"
-                                              "<b>When disabled</b> the loop button starts playing the loop, but stop then cancels loop playback")));
-       add_option (_("Transport"), tsf);
+       mht->add (MeterHoldOff, _("off"));
+       mht->add (MeterHoldShort, _("short"));
+       mht->add (MeterHoldMedium, _("medium"));
+       mht->add (MeterHoldLong, _("long"));
 
-       tsf = new BoolOption (
-                    "stop-recording-on-xrun",
-                    _("Stop recording when an xrun occurs"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
-                                           string_compose (_("<b>When enabled</b> %1 will stop recording if an over- or underrun is detected by the audio engine"),
-                                                           PROGRAM_NAME));
-       add_option (_("Transport"), tsf);
+       add_option (S_("Preferences|Metering"), mht);
 
-       tsf = new BoolOption (
-                    "create-xrun-marker",
-                    _("Create markers where xruns occur"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
-                    );
-       // Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _(""));
-       add_option (_("Transport"), tsf);
+       ComboOption<float>* mfo = new ComboOption<float> (
+               "meter-falloff",
+               _("DPM fall-off"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
+               );
 
-       tsf = new BoolOption (
-                    "stop-at-session-end",
-                    _("Stop at the end of the session"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
-                                           string_compose (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
-                                                             "when it reaches the current session end marker\n\n"
-                                                             "<b>When disabled</b> %1 will continue to roll past the session end marker at all times"),
-                                                           PROGRAM_NAME));
-       add_option (_("Transport"), tsf);
+       mfo->add (METER_FALLOFF_OFF,      _("off"));
+       mfo->add (METER_FALLOFF_SLOWEST,  _("slowest [6.6dB/sec]"));
+       mfo->add (METER_FALLOFF_SLOW,     _("slow [8.6dB/sec] (BBC PPM, EBU PPM)"));
+       mfo->add (METER_FALLOFF_SLOWISH,  _("moderate [12.0dB/sec] (DIN)"));
+       mfo->add (METER_FALLOFF_MODERATE, _("medium [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"));
+       mfo->add (METER_FALLOFF_MEDIUM,   _("fast [20dB/sec]"));
+       mfo->add (METER_FALLOFF_FAST,     _("very fast [32dB/sec]"));
 
-       tsf = new BoolOption (
-                    "seamless-loop",
-                    _("Do seamless looping (not possible when slaved to MTC, LTC etc)"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
-                                           string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, "
-                                                             "preventing any need to do a transport locate at the end of the loop\n\n"
-                                                             "<b>When disabled</b> looping is done by locating back to the start of the loop when %1 reaches the end "
-                                                             "which will often cause a small click or delay"), PROGRAM_NAME));
-       add_option (_("Transport"), tsf);
+       add_option (S_("Preferences|Metering"), mfo);
 
-       tsf = new BoolOption (
-                    "disable-disarm-during-roll",
-                    _("Disable per-track record disarm while rolling"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_disable_disarm_during_roll),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<b>When enabled</b> this will prevent you from accidentally stopping specific tracks recording during a take"));
-       add_option (_("Transport"), tsf);
+       ComboOption<MeterLineUp>* mlu = new ComboOption<MeterLineUp> (
+               "meter-line-up-level",
+               _("Meter line-up level; 0dBu"),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_line_up_level),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_line_up_level)
+               );
 
-       tsf = new BoolOption (
-                    "quieten_at_speed",
-                    _("12dB gain reduction during fast-forward and fast-rewind"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("This will reduce the unpleasant increase in perceived volume "
-                                                  "that occurs when fast-forwarding or rewinding through some kinds of audio"));
-       add_option (_("Transport"), tsf);
+       mlu->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
+       mlu->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
+       mlu->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
+       mlu->add (MeteringLineUp15, _("-15dBFS (DIN)"));
 
-       ComboOption<float>* psc = new ComboOption<float> (
-                    "preroll-seconds",
-                    _("Preroll"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_preroll_seconds),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_preroll_seconds)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip (psc->tip_widget(),
-                                           (_("The amount of preroll (in seconds) to apply when <b>Play with Preroll</b> is initiated.\n\n"
-                                              "If <b>Follow Edits</b> is enabled, the preroll is applied to the playhead position when a region is selected or trimmed.")));
-       psc->add (0.0, _("0 (no pre-roll)"));
-       psc->add (0.1, _("0.1 second"));
-       psc->add (0.25, _("0.25 second"));
-       psc->add (0.5, _("0.5 second"));
-       psc->add (1.0, _("1.0 second"));
-       psc->add (2.0, _("2.0 seconds"));
-       add_option (_("Transport"), psc);
+       Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-marks and color-knee point for dBFS scale DPM, set reference level for IEC1/Nordic, IEC2 PPM and VU meter."));
 
-       add_option (_("Sync"), new OptionEditorHeading (S_("Synchronization and Slave Options")));
+       add_option (S_("Preferences|Metering"), mlu);
 
-       _sync_source = new ComboOption<SyncSource> (
-               "sync-source",
-               _("External timecode source"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_source),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source)
+       ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
+               "meter-line-up-din",
+               _("IEC1/DIN Meter line-up level; 0dBu"),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_line_up_din),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_line_up_din)
                );
 
-       add_option (_("Sync"), _sync_source);
+       mld->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
+       mld->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
+       mld->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
+       mld->add (MeteringLineUp15, _("-15dBFS (DIN)"));
 
-       _sync_framerate = new BoolOption (
-                    "timecode-sync-frame-rate",
-                    _("Match session video frame rate to external timecode"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
-                    );
-       Gtkmm2ext::UI::instance()->set_tip
-               (_sync_framerate->tip_widget(),
-                string_compose (_("This option controls the value of the video frame rate <i>while chasing</i> an external timecode source.\n\n"
-                                  "<b>When enabled</b> the session video frame rate will be changed to match that of the selected external timecode source.\n\n"
-                                  "<b>When disabled</b> the session video frame rate will not be changed to match that of the selected external timecode source."
-                                  "Instead the frame rate indication in the main clock will flash red and %1 will convert between the external "
-                                  "timecode standard and the session standard."), PROGRAM_NAME));
+       Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter."));
 
-       add_option (_("Sync"), _sync_framerate);
+       add_option (S_("Preferences|Metering"), mld);
 
-       _sync_genlock = new BoolOption (
-               "timecode-source-is-synced",
-               _("Sync-lock timecode to clock (disable drift compensation)"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
+       ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
+               "meter-vu-standard",
+               _("VU Meter standard"),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_vu_standard),
+               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_vu_standard)
                );
-       Gtkmm2ext::UI::instance()->set_tip
-               (_sync_genlock->tip_widget(),
-                string_compose (_("<b>When enabled</b> %1 will never varispeed when slaved to external timecode. "
-                                  "Sync Lock indicates that the selected external timecode source shares clock-sync "
-                                  "(Black &amp; Burst, Wordclock, etc) with the audio interface. "
-                                  "This option disables drift compensation. The transport speed is fixed at 1.0. "
-                                  "Vari-speed LTC will be ignored and cause drift."
-                                  "\n\n"
-                                  "<b>When disabled</b> %1 will compensate for potential drift, regardless if the "
-                                  "timecode sources shares clock sync."
-                                 ), PROGRAM_NAME));
 
+       mvu->add (MeteringVUfrench,   _("0VU = -2dBu (France)"));
+       mvu->add (MeteringVUamerican, _("0VU = 0dBu (North America, Australia)"));
+       mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)"));
+       mvu->add (MeteringVUeight,    _("0VU = +8dBu"));
 
-       add_option (_("Sync"), _sync_genlock);
+       add_option (S_("Preferences|Metering"), mvu);
 
-       _sync_source_2997 = new BoolOption (
-               "timecode-source-2997",
-               _("Lock to 29.9700 fps instead of 30000/1001"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_2997),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_2997)
+       ComboOption<MeterType>* mtm = new ComboOption<MeterType> (
+               "meter-type-master",
+               _("Default Meter Type for Master Bus"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_master),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_master)
+               );
+       mtm->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
+       mtm->add (MeterK20,     ArdourMeter::meter_type_string(MeterK20));
+       mtm->add (MeterK14,     ArdourMeter::meter_type_string(MeterK14));
+       mtm->add (MeterK12,     ArdourMeter::meter_type_string(MeterK12));
+       mtm->add (MeterIEC1DIN, ArdourMeter::meter_type_string(MeterIEC1DIN));
+       mtm->add (MeterIEC1NOR, ArdourMeter::meter_type_string(MeterIEC1NOR));
+       mtm->add (MeterIEC2BBC, ArdourMeter::meter_type_string(MeterIEC2BBC));
+       mtm->add (MeterIEC2EBU, ArdourMeter::meter_type_string(MeterIEC2EBU));
+
+       add_option (S_("Preferences|Metering"), mtm);
+
+
+       ComboOption<MeterType>* mtb = new ComboOption<MeterType> (
+               "meter-type-bus",
+               _("Default Meter Type for Busses"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_bus),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_bus)
+               );
+       mtb->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
+       mtb->add (MeterK20,     ArdourMeter::meter_type_string(MeterK20));
+       mtb->add (MeterK14,     ArdourMeter::meter_type_string(MeterK14));
+       mtb->add (MeterK12,     ArdourMeter::meter_type_string(MeterK12));
+       mtb->add (MeterIEC1DIN, ArdourMeter::meter_type_string(MeterIEC1DIN));
+       mtb->add (MeterIEC1NOR, ArdourMeter::meter_type_string(MeterIEC1NOR));
+       mtb->add (MeterIEC2BBC, ArdourMeter::meter_type_string(MeterIEC2BBC));
+       mtb->add (MeterIEC2EBU, ArdourMeter::meter_type_string(MeterIEC2EBU));
+
+       add_option (S_("Preferences|Metering"), mtb);
+
+       ComboOption<MeterType>* mtt = new ComboOption<MeterType> (
+               "meter-type-track",
+               _("Default Meter Type for Tracks"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_track),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_track)
+               );
+       mtt->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
+       mtt->add (MeterPeak0dB, ArdourMeter::meter_type_string(MeterPeak0dB));
+
+       add_option (S_("Preferences|Metering"), mtt);
+
+       HSliderOption *mpks = new HSliderOption("meter-peak",
+                       _("Peak threshold [dBFS]"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
+                       -10, 0, .1, .1
+                       );
+
+       Gtkmm2ext::UI::instance()->set_tip (
+                       mpks->tip_widget(),
+                       _("Specify the audio signal level in dBFS at and above which the meter-peak indicator will flash red."));
+
+       add_option (S_("Preferences|Metering"), mpks);
+
+       add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
+
+       add_option (S_("Preferences|Metering"),
+            new BoolOption (
+                    "save-export-analysis-image",
+                    _("Save loudness analysis as image file"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_save_export_analysis_image),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_save_export_analysis_image)
+                    ));
+
+       /* TRANSPORT & Sync */
+
+       add_option (_("Transport"), new OptionEditorHeading (_("General")));
+
+       bo = new BoolOption (
+                    "stop-at-session-end",
+                    _("Stop at the end of the session"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           string_compose (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
+                                                             "when it reaches the current session end marker\n\n"
+                                                             "<b>When disabled</b> %1 will continue to roll past the session end marker at all times"),
+                                                           PROGRAM_NAME));
+       add_option (_("Transport"), bo);
+
+       bo = new BoolOption (
+                    "latched-record-enable",
+                    _("Keep record-enable engaged on stop"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
+                    );
+       add_option (_("Transport"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> master record will remain engaged when the transport transitions to stop.\n<b>When disabled</b> master record will be disabled when the transport transitions to stop."));
+
+       bo = new BoolOption (
+                    "disable-disarm-during-roll",
+                    _("Disable per-track record disarm while rolling"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_disable_disarm_during_roll),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("<b>When enabled</b> this will prevent you from accidentally stopping specific tracks recording during a take."));
+       add_option (_("Transport"), bo);
+
+       bo = new BoolOption (
+                    "quieten_at_speed",
+                    _("12dB gain reduction during fast-forward and fast-rewind"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> rhis will reduce the unpleasant increase in perceived volume "
+                               "that occurs when fast-forwarding or rewinding through some kinds of audio"));
+       add_option (_("Transport"), bo);
+
+       ComboOption<float>* psc = new ComboOption<float> (
+                    "preroll-seconds",
+                    _("Preroll"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_preroll_seconds),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_preroll_seconds)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (psc->tip_widget(),
+                                           (_("The amount of preroll to apply when <b>Play with Preroll</b> or <b>Record with Preroll</b>is initiated.\n\n"
+                                              "If <b>Follow Edits</b> is enabled, the preroll is applied to the playhead position when a region is selected or trimmed.")));
+       psc->add (-4.0, _("4 Bars"));
+       psc->add (-2.0, _("2 Bars"));
+       psc->add (-1.0, _("1 Bar"));
+       psc->add (0.0, _("0 (no pre-roll)"));
+       psc->add (0.1, _("0.1 second"));
+       psc->add (0.25, _("0.25 second"));
+       psc->add (0.5, _("0.5 second"));
+       psc->add (1.0, _("1.0 second"));
+       psc->add (2.0, _("2.0 seconds"));
+       add_option (_("Transport"), psc);
+
+
+       add_option (_("Transport"), new OptionEditorHeading (_("Looping")));
+
+       bo = new BoolOption (
+                    "loop-is-mode",
+                    _("Play loop is a transport mode"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_loop_is_mode),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_loop_is_mode)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           (_("<b>When enabled</b> the loop button does not start playback but forces playback to always play the loop\n\n"
+                                              "<b>When disabled</b> the loop button starts playing the loop, but stop then cancels loop playback")));
+       add_option (_("Transport"), bo);
+
+       bo = new BoolOption (
+                    "seamless-loop",
+                    _("Do seamless looping (not possible when slaved to MTC, LTC etc)"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, "
+                                                             "preventing any need to do a transport locate at the end of the loop\n\n"
+                                                             "<b>When disabled</b> looping is done by locating back to the start of the loop when %1 reaches the end "
+                                                             "which will often cause a small click or delay"), PROGRAM_NAME));
+       add_option (_("Transport"), bo);
+
+       add_option (_("Transport"), new OptionEditorHeading (_("Dropout (xrun) Handling")));
+       bo = new BoolOption (
+                    "stop-recording-on-xrun",
+                    _("Stop recording when an xrun occurs"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                                           string_compose (_("<b>When enabled</b> %1 will stop recording if an over- or underrun is detected by the audio engine"),
+                                                           PROGRAM_NAME));
+       add_option (_("Transport"), bo);
+
+       bo = new BoolOption (
+                    "create-xrun-marker",
+                    _("Create markers where xruns occur"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
+                    );
+       add_option (_("Transport"), bo);
+
+
+       /* SYNC */
+
+       add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
+
+       _sync_source = new ComboOption<SyncSource> (
+               "sync-source",
+               _("External timecode source"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_source),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source)
+               );
+
+       add_option (_("Sync"), _sync_source);
+
+       _sync_framerate = new BoolOption (
+                    "timecode-sync-frame-rate",
+                    _("Match session video frame rate to external timecode"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
+                    );
+       Gtkmm2ext::UI::instance()->set_tip
+               (_sync_framerate->tip_widget(),
+                string_compose (_("This option controls the value of the video frame rate <i>while chasing</i> an external timecode source.\n\n"
+                                  "<b>When enabled</b> the session video frame rate will be changed to match that of the selected external timecode source.\n\n"
+                                  "<b>When disabled</b> the session video frame rate will not be changed to match that of the selected external timecode source."
+                                  "Instead the frame rate indication in the main clock will flash red and %1 will convert between the external "
+                                  "timecode standard and the session standard."), PROGRAM_NAME));
+
+       add_option (_("Sync"), _sync_framerate);
+
+       _sync_genlock = new BoolOption (
+               "timecode-source-is-synced",
+               _("Sync-lock timecode to clock (disable drift compensation)"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
+               );
+       Gtkmm2ext::UI::instance()->set_tip
+               (_sync_genlock->tip_widget(),
+                string_compose (_("<b>When enabled</b> %1 will never varispeed when slaved to external timecode. "
+                                  "Sync Lock indicates that the selected external timecode source shares clock-sync "
+                                  "(Black &amp; Burst, Wordclock, etc) with the audio interface. "
+                                  "This option disables drift compensation. The transport speed is fixed at 1.0. "
+                                  "Vari-speed LTC will be ignored and cause drift."
+                                  "\n\n"
+                                  "<b>When disabled</b> %1 will compensate for potential drift, regardless if the "
+                                  "timecode sources shares clock sync."
+                                 ), PROGRAM_NAME));
+
+
+       add_option (_("Sync"), _sync_genlock);
+
+       _sync_source_2997 = new BoolOption (
+               "timecode-source-2997",
+               _("Lock to 29.9700 fps instead of 30000/1001"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_2997),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_2997)
                );
        Gtkmm2ext::UI::instance()->set_tip
                (_sync_source_2997->tip_widget(),
@@ -2898,7 +3146,7 @@ if (!Profile->get_mixbus()) {
 
        add_option (_("Sync"), _sync_source_2997);
 
-       add_option (_("Sync/LTC"), new OptionEditorHeading (S_("LTC Reader")));
+       add_option (_("Sync/LTC"), new OptionEditorHeading (_("Linear Timecode (LTC) Reader")));
 
        _ltc_port = new ComboStringOption (
                "ltc-source-port",
@@ -2917,7 +3165,7 @@ if (!Profile->get_mixbus()) {
 
        add_option (_("Sync/LTC"), _ltc_port);
 
-       add_option (_("Sync/LTC"), new OptionEditorHeading (S_("LTC Generator")));
+       add_option (_("Sync/LTC"), new OptionEditorHeading (_("Linear Timecode (LTC) Generator")));
 
        add_option (_("Sync/LTC"),
                    new BoolOption (
@@ -2938,7 +3186,7 @@ if (!Profile->get_mixbus()) {
                 string_compose (_("<b>When enabled</b> %1 will continue to send LTC information even when the transport (playhead) is not moving"), PROGRAM_NAME));
        add_option (_("Sync/LTC"), _ltc_send_continuously);
 
-       _ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level"),
+       _ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level [dBFS]"),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_output_volume),
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_output_volume),
                                        -50, 0, .5, 5,
@@ -3244,7 +3492,7 @@ if (!Profile->get_mixbus()) {
 
        /* INTERFACE */
 #if (defined OPTIONAL_CAIRO_IMAGE_SURFACE || defined CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE)
-       add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphics Acceleration")));
+       add_option (_("Appearance"), new OptionEditorHeading (_("Graphics Acceleration")));
 #endif
 
 #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
@@ -3257,7 +3505,7 @@ if (!Profile->get_mixbus()) {
 
        Gtkmm2ext::UI::instance()->set_tip (bgc->tip_widget(), string_compose (
                                _("Render large parts of the application user-interface in software, instead of using 2D-graphics acceleration.\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
-       add_option (S_("Preferences|GUI"), bgc);
+       add_option (_("Appearance"), bgc);
 #endif
 
 #ifdef CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE
@@ -3269,11 +3517,11 @@ if (!Profile->get_mixbus()) {
                );
 
        Gtkmm2ext::UI::instance()->set_tip (bgo->tip_widget(), string_compose (_("Disables hardware gradient rendering on buggy video drivers (\"buggy gradients patch\").\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
-       add_option (S_("Preferences|GUI"), bgo);
+       add_option (_("Appearance"), bgo);
 #endif
-       add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphical User Interface")));
+       add_option (_("Appearance"), new OptionEditorHeading (_("Graphical User Interface")));
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("Appearance"),
             new BoolOption (
                     "widget-prelight",
                     _("Highlight widgets on mouseover"),
@@ -3281,7 +3529,7 @@ if (!Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_widget_prelight)
                     ));
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("Appearance"),
             new BoolOption (
                     "use-tooltips",
                     _("Show tooltips if mouse hovers over a control"),
@@ -3299,9 +3547,9 @@ if (!Profile->get_mixbus()) {
                        _("<b>When enabled</b> clock displays are updated every Timecode Frame (fps).\n\n"
                                "<b>When disabled</b> clock displays are updated only every 100ms."
                         ));
-       add_option (S_("Preferences|GUI"), bo);
+       add_option (_("Appearance"), bo);
 
-       add_option (S_("Preferences|GUI"),
+       add_option (_("Appearance"),
                        new BoolOption (
                                "blink-rec-arm",
                                _("Blink Rec-Arm buttons"),
@@ -3312,41 +3560,10 @@ if (!Profile->get_mixbus()) {
 
 #ifndef __APPLE__
        /* font scaling does nothing with GDK/Quartz */
-       add_option (S_("Preferences|GUI"), new FontScalingOptions ());
+       add_option (_("Appearance"), new FontScalingOptions ());
 #endif
-
-       /* Image cache size */
-
-       HSliderOption *sics = new HSliderOption ("waveform-cache-size",
-                       _("Waveform image cache size (megabytes)"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size),
-                       1, 1024, 10 /* 1 MB to 1GB in steps of 10MB */
-                       );
-       sics->scale().set_digits (0);
-       Gtkmm2ext::UI::instance()->set_tip (
-                       sics->tip_widget(),
-                _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
-       add_option (S_("Preferences|GUI"), sics);
-
-if (!ARDOUR::Profile->get_mixbus()) {
-       /* Lock GUI timeout */
-
-       HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
-                                               _("Lock timeout (seconds)"),
-                                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
-                                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds),
-                                               0, 1000, 1, 10
-                       );
-       slts->scale().set_digits (0);
-       Gtkmm2ext::UI::instance()->set_tip (
-                       slts->tip_widget(),
-                _("Lock GUI after this many idle seconds (zero to never lock)"));
-       add_option (S_("Preferences|GUI"), slts);
-} // !mixbus
-
-       add_option (_("GUI/Editor"), new OptionEditorHeading (_("Editor UI Options")));
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("General")));
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "show-name-highlight",
                     _("Use name highlight bars in region displays (requires a restart)"),
@@ -3354,7 +3571,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
                     ));
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
                        new BoolOption (
                        "color-regions-using-track-color",
                        _("Region color follows track color"),
@@ -3362,28 +3579,19 @@ if (!ARDOUR::Profile->get_mixbus()) {
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color)
                        ));
 
-       add_option (_("GUI/Editor"),
-                       new BoolOption (
-                       "show-waveform-clipping",
-                       _("Show waveform clipping"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveform_clipping),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
-                       ));
-
-
-       add_option (_("GUI/Editor"), new OptionEditorHeading (_("Waveforms")));
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("Waveforms")));
 
-if (!Profile->get_mixbus()) {
-       add_option (_("GUI/Editor"),
-            new BoolOption (
-                    "show-waveforms",
-                    _("Show waveforms in regions"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms)
-                    ));
-}  // !mixbus
+       if (!Profile->get_mixbus()) {
+               add_option (_("Appearance/Editor"),
+                               new BoolOption (
+                                       "show-waveforms",
+                                       _("Show waveforms in regions"),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms),
+                                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms)
+                                       ));
+       }  // !mixbus
 
-       add_option (_("GUI/Editor"),
+       add_option (_("Appearance/Editor"),
             new BoolOption (
                     "show-waveforms-while-recording",
                     _("Show waveforms while recording"),
@@ -3391,6 +3599,16 @@ if (!Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms_while_recording)
                     ));
 
+       add_option (_("Appearance/Editor"),
+                       new BoolOption (
+                       "show-waveform-clipping",
+                       _("Show waveform clipping"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveform_clipping),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping)
+                       ));
+
+       add_option (_("Appearance/Editor"), new ClipLevelOptions ());
+
        ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
                "waveform-scale",
                _("Waveform scale"),
@@ -3401,7 +3619,7 @@ if (!Profile->get_mixbus()) {
        wfs->add (Linear, _("linear"));
        wfs->add (Logarithmic, _("logarithmic"));
 
-       add_option (_("GUI/Editor"), wfs);
+       add_option (_("Appearance/Editor"), wfs);
 
        ComboOption<WaveformShape>* wfsh = new ComboOption<WaveformShape> (
                "waveform-shape",
@@ -3413,12 +3631,45 @@ if (!Profile->get_mixbus()) {
        wfsh->add (Traditional, _("traditional"));
        wfsh->add (Rectified, _("rectified"));
 
-       add_option (_("GUI/Editor"), wfsh);
+       add_option (_("Appearance/Editor"), wfsh);
+
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("Editor Meters")));
+
+       add_option (_("Appearance/Editor"),
+            new BoolOption (
+                    "show-track-meters",
+                    _("Show meters in track headers"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_track_meters),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
+                    ));
+
+       add_option (_("Appearance/Editor"),
+            new BoolOption (
+                    "editor-stereo-only-meters",
+                    _("Limit track header meters to stereo"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_editor_stereo_only_meters),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_editor_stereo_only_meters)
+                    ));
+
+       add_option (_("Appearance/Editor"), new OptionEditorHeading (_("MIDI Regions")));
 
-       add_option (_("GUI/Editor"), new ClipLevelOptions ());
+       add_option (_("Appearance/Editor"),
+                   new BoolOption (
+                           "display-first-midi-bank-as-zero",
+                           _("Display first MIDI bank/program as 0"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
+                           ));
 
+       add_option (_("Appearance/Editor"),
+            new BoolOption (
+                    "never-display-periodic-midi",
+                    _("Don't display periodic (MTC, MMC) SysEx messages in MIDI Regions"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
+                    ));
 
-       add_option (_("GUI/Editor"), new OptionEditorBlank ());
+       add_option (_("Appearance/Editor"), new OptionEditorBlank ());
 
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
@@ -3431,7 +3682,7 @@ if (!Profile->get_mixbus()) {
        _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
        _mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns"));
 
-       add_option (_("GUI/Mixer"),
+       add_option (_("Appearance/Mixer"),
                new VisibilityOption (
                        _("Mixer Strip"),
                        &_mixer_strip_visibility,
@@ -3440,54 +3691,35 @@ if (!Profile->get_mixbus()) {
                        )
                );
 
-       add_option (_("GUI/Mixer"),
+       add_option (_("Appearance/Mixer"),
             new BoolOption (
                     "default-narrow_ms",
-                    _("Use narrow strips in the mixer by default"),
+                    _("Use narrow strips in the mixer for new strips by default"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_default_narrow_ms),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
                     ));
 
-       add_option (_("GUI/Mixer"), new OptionEditorBlank ());
-
-#ifdef ENABLE_NLS
-       OptionEditorHeading* i18n_head = new OptionEditorHeading (_("Internationalization"));
-
-       add_option (_("GUI/Translation"), i18n_head);
-
-       bo = new BoolOption (
-                       "enable-translation",
-                       _("Use translations"),
-                       sigc::ptr_fun (ARDOUR::translations_are_enabled),
-                       sigc::ptr_fun (ARDOUR::set_translations_enabled)
-                       );
-
-       bo->set_note (string_compose (_("These settings will only take effect after %1 is restarted (if available for your language preferences)."), PROGRAM_NAME));
-
-       add_option (_("GUI/Translation"), bo);
-
-       _l10n = new ComboOption<ARDOUR::LocaleMode> (
-               "locale-mode",
-               _("Localization"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_locale_mode),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_locale_mode)
-               );
-
-       _l10n->add (ARDOUR::SET_LC_ALL, _("Set complete locale"));
-       _l10n->add (ARDOUR::SET_LC_MESSAGES, _("Enable only message translation"));
-       _l10n->add (ARDOUR::SET_LC_MESSAGES_AND_LC_NUMERIC, _("Translate messages and format numeric format"));
-       _l10n->set_note (_("This setting is provided for plugin compatibility. e.g. some plugins on some systems expect the decimal point to be a dot."));
+       add_option (_("Appearance/Mixer"), new OptionEditorBlank ());
 
-       add_option (_("GUI/Translation"), _l10n);
-       parameter_changed ("enable-translation");
-#endif // ENABLE_NLS
+       add_option (_("Appearance/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
 
-       add_option (_("GUI/Keyboard"), new OptionEditorHeading (_("Keyboard")));
-       add_option (_("GUI/Keyboard"), new KeyboardOptions);
+       add_option (_("Appearance/Toolbar"),
+            new BoolOption (
+                    "show-toolbar-recpunch",
+                    _("Display Record/Punch Options"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_recpunch),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_recpunch)
+                    ));
 
-       add_option (_("GUI/Toolbar"), new OptionEditorHeading (_("Main Transport Toolbar Items")));
+       add_option (_("Appearance/Toolbar"),
+            new BoolOption (
+                    "show-toolbar-monitoring",
+                    _("Display Monitor Options"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_toolbar_monitoring),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_toolbar_monitoring)
+                    ));
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-toolbar-selclock",
                     _("Display Selection Clock"),
@@ -3496,7 +3728,7 @@ if (!Profile->get_mixbus()) {
                     ));
 
        if (!ARDOUR::Profile->get_small_screen()) {
-               add_option (_("GUI/Toolbar"),
+               add_option (_("Appearance/Toolbar"),
                                new BoolOption (
                                        "show-secondary-clock",
                                        _("Display Secondary Clock"),
@@ -3505,7 +3737,7 @@ if (!Profile->get_mixbus()) {
                                        ));
        }
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-mini-timeline",
                     _("Display Navigation Timeline"),
@@ -3513,7 +3745,7 @@ if (!Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_mini_timeline)
                     ));
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-editor-meter",
                     _("Display Master Level Meter"),
@@ -3521,23 +3753,93 @@ if (!Profile->get_mixbus()) {
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_editor_meter)
                     ));
 
-       add_option (_("GUI/Toolbar"),
+       add_option (_("Appearance/Toolbar"),
                        new ColumVisibilityOption (
                                "action-table-columns", _("Lua Action Script Button Visibility"), 4,
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_action_table_columns),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_action_table_columns)
                                )
                        );
-       add_option (_("GUI/Toolbar"), new OptionEditorBlank ());
+       add_option (_("Appearance/Toolbar"), new OptionEditorBlank ());
 
-       add_option (_("GUI/Quirks"), new OptionEditorHeading (_("Various Workarounds for Windowing Systems")));
-       add_option (_("GUI/Quirks"),
-            new BoolOption (
+
+       OptionEditorHeading* quirks_head = new OptionEditorHeading (_("Various Workarounds for Windowing Systems"));
+
+       quirks_head->set_note (string_compose (_("Rules for closing, minimizing, maximizing, and stay-on-top can vary\
+with each version of your OS, and the preferences that you've set in your OS.\n\n\
+You can adjust the options, below, to change how %1's windows and dialogs behave.\n\n\
+These settings will only take effect after %1 is restarted.\n\
+       "), PROGRAM_NAME));
+
+       /* and now the theme manager */
+
+       add_option (_("Appearance/Theme"), new OptionEditorHeading (_("Theme")));
+
+       add_option (_("Appearance/Theme"), new BoolOption (
+                               "flat-buttons",
+                               _("Draw \"flat\" buttons"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_flat_buttons),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_flat_buttons)
+                               ));
+
+       add_option (_("Appearance/Theme"), new BoolOption (
+                               "meter-style-led",
+                               _("LED meter style"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_style_led),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_style_led)
+                               ));
+
+
+       HSliderOption *gui_hs = new HSliderOption(
+                       "timeline-item-gradient-depth",
+                       _("Waveforms color gradient depth"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_gradient_depth),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_gradient_depth),
+                       0, 1.0, 0.05
+                       );
+       gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED);
+       add_option (_("Appearance/Theme"), gui_hs);
+
+       gui_hs = new HSliderOption(
+                       "timeline-item-gradient-depth",
+                       _("Timeline item gradient depth"),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_timeline_item_gradient_depth),
+                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_timeline_item_gradient_depth),
+                       0, 1.0, 0.05
+                       );
+       gui_hs->scale().set_update_policy (Gtk::UPDATE_DELAYED);
+       add_option (_("Appearance/Theme"), gui_hs);
+
+       vector<string> icon_sets = ::get_icon_sets ();
+       if (icon_sets.size() > 1) {
+               ComboOption<std::string>* io = new ComboOption<std::string> (
+                               "icon-set", _("Icon Set"),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_icon_set),
+                               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_icon_set)
+                               );
+               for (vector<string>::const_iterator i = icon_sets.begin (); i != icon_sets.end (); ++i) {
+                       io->add (*i, *i);
+               }
+               add_option (_("Appearance/Theme"), io);
+       }
+
+       add_option (_("Appearance/Colors"), new OptionEditorHeading (_("Colors")));
+       add_option (_("Appearance/Colors"), new ColorThemeManager);
+       add_option (_("Appearance/Colors"), new OptionEditorBlank ());
+
+       /* Quirks */
+
+       add_option (_("Appearance/Quirks"), quirks_head);
+
+       bo = new BoolOption (
                     "use-wm-visibility",
-                    _("Use Window Manager/Desktop visibility information"),
+                    _("Use visibility information provided by your Window Manager/Desktop"),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_wm_visibility),
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_wm_visibility)
-                    ));
+                    );
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
+                               _("If you have trouble toggling between hidden Editor and Mixer windows, try changing this setting."));
+       add_option (_("Appearance/Quirks"), bo);
 
 #ifndef __APPLE__
        bo = new BoolOption (
@@ -3546,11 +3848,9 @@ if (!Profile->get_mixbus()) {
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_all_floating_windows_are_dialogs),
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_all_floating_windows_are_dialogs)
                        );
-       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose (
-                               _("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\n"
-                                       "This may help with some window managers. This requires a restart of %1 to take effect"),
-                               PROGRAM_NAME));
-       add_option (_("GUI/Quirks"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
+                       _("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\nThis may help with some window managers."));
+       add_option (_("Appearance/Quirks"), bo);
 
        bo = new BoolOption (
                        "transients-follow-front",
@@ -3558,10 +3858,9 @@ if (!Profile->get_mixbus()) {
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_transients_follow_front),
                        sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_transients_follow_front)
                        );
-       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose (
-                               _("Make transient windows follow the front window when toggling between the editor and mixer.\n"
-                                       "This requires a restart of %1 to take effect"), PROGRAM_NAME));
-       add_option (_("GUI/Quirks"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
+                               _("Make transient windows follow the front window when toggling between the editor and mixer."));
+       add_option (_("Appearance/Quirks"), bo);
 #endif
 
        if (!Profile->get_mixbus()) {
@@ -3571,200 +3870,17 @@ if (!Profile->get_mixbus()) {
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_floating_monitor_section),
                                sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_floating_monitor_section)
                                );
-               Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose (
-                                       _("When detaching the monitoring section, mark it as \"Utility\" window to stay in front.\n"
-                                               "This requires a restart of %1 to take effect"), PROGRAM_NAME));
-               add_option (_("GUI/Quirks"), bo);
+               Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (),
+                                       _("When detaching the monitoring section, mark it as \"Utility\" window to stay in front."));
+               add_option (_("Appearance/Quirks"), bo);
        }
 
-       add_option (_("GUI/Quirks"), new OptionEditorBlank ());
-
-       add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering")));
-
-       ComboOption<float>* mht = new ComboOption<float> (
-               "meter-hold",
-               _("Peak hold time"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_hold),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_hold)
-               );
-
-       mht->add (MeterHoldOff, _("off"));
-       mht->add (MeterHoldShort, _("short"));
-       mht->add (MeterHoldMedium, _("medium"));
-       mht->add (MeterHoldLong, _("long"));
-
-       add_option (S_("Preferences|Metering"), mht);
-
-       ComboOption<float>* mfo = new ComboOption<float> (
-               "meter-falloff",
-               _("DPM fall-off"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
-               );
-
-       mfo->add (METER_FALLOFF_OFF,      _("off"));
-       mfo->add (METER_FALLOFF_SLOWEST,  _("slowest [6.6dB/sec]"));
-       mfo->add (METER_FALLOFF_SLOW,     _("slow [8.6dB/sec] (BBC PPM, EBU PPM)"));
-       mfo->add (METER_FALLOFF_SLOWISH,  _("moderate [12.0dB/sec] (DIN)"));
-       mfo->add (METER_FALLOFF_MODERATE, _("medium [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"));
-       mfo->add (METER_FALLOFF_MEDIUM,   _("fast [20dB/sec]"));
-       mfo->add (METER_FALLOFF_FAST,     _("very fast [32dB/sec]"));
-
-       add_option (S_("Preferences|Metering"), mfo);
-
-       ComboOption<MeterLineUp>* mlu = new ComboOption<MeterLineUp> (
-               "meter-line-up-level",
-               _("Meter line-up level; 0dBu"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_line_up_level),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_line_up_level)
-               );
-
-       mlu->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
-       mlu->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
-       mlu->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
-       mlu->add (MeteringLineUp15, _("-15dBFS (DIN)"));
-
-       Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-marks and color-knee point for dBFS scale DPM, set reference level for IEC1/Nordic, IEC2 PPM and VU meter."));
-
-       add_option (S_("Preferences|Metering"), mlu);
-
-       ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
-               "meter-line-up-din",
-               _("IEC1/DIN Meter line-up level; 0dBu"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_line_up_din),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_line_up_din)
-               );
-
-       mld->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
-       mld->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
-       mld->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
-       mld->add (MeteringLineUp15, _("-15dBFS (DIN)"));
-
-       Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter."));
-
-       add_option (S_("Preferences|Metering"), mld);
-
-       ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
-               "meter-vu-standard",
-               _("VU Meter standard"),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_vu_standard),
-               sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_vu_standard)
-               );
-
-       mvu->add (MeteringVUfrench,   _("0VU = -2dBu (France)"));
-       mvu->add (MeteringVUamerican, _("0VU = 0dBu (North America, Australia)"));
-       mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)"));
-       mvu->add (MeteringVUeight,    _("0VU = +8dBu"));
-
-       add_option (S_("Preferences|Metering"), mvu);
-
-       ComboOption<MeterType>* mtm = new ComboOption<MeterType> (
-               "meter-type-master",
-               _("Default Meter Type for Master Bus"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_master),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_master)
-               );
-       mtm->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
-       mtm->add (MeterK20,     ArdourMeter::meter_type_string(MeterK20));
-       mtm->add (MeterK14,     ArdourMeter::meter_type_string(MeterK14));
-       mtm->add (MeterK12,     ArdourMeter::meter_type_string(MeterK12));
-       mtm->add (MeterIEC1DIN, ArdourMeter::meter_type_string(MeterIEC1DIN));
-       mtm->add (MeterIEC1NOR, ArdourMeter::meter_type_string(MeterIEC1NOR));
-       mtm->add (MeterIEC2BBC, ArdourMeter::meter_type_string(MeterIEC2BBC));
-       mtm->add (MeterIEC2EBU, ArdourMeter::meter_type_string(MeterIEC2EBU));
-
-       add_option (S_("Preferences|Metering"), mtm);
-
-
-       ComboOption<MeterType>* mtb = new ComboOption<MeterType> (
-               "meter-type-bus",
-               _("Default Meter Type for Busses"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_bus),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_bus)
-               );
-       mtb->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
-       mtb->add (MeterK20,     ArdourMeter::meter_type_string(MeterK20));
-       mtb->add (MeterK14,     ArdourMeter::meter_type_string(MeterK14));
-       mtb->add (MeterK12,     ArdourMeter::meter_type_string(MeterK12));
-       mtb->add (MeterIEC1DIN, ArdourMeter::meter_type_string(MeterIEC1DIN));
-       mtb->add (MeterIEC1NOR, ArdourMeter::meter_type_string(MeterIEC1NOR));
-       mtb->add (MeterIEC2BBC, ArdourMeter::meter_type_string(MeterIEC2BBC));
-       mtb->add (MeterIEC2EBU, ArdourMeter::meter_type_string(MeterIEC2EBU));
-
-       add_option (S_("Preferences|Metering"), mtb);
-
-       ComboOption<MeterType>* mtt = new ComboOption<MeterType> (
-               "meter-type-track",
-               _("Default Meter Type for Tracks"),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_track),
-               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_track)
-               );
-       mtt->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
-       mtt->add (MeterPeak0dB, ArdourMeter::meter_type_string(MeterPeak0dB));
-
-       add_option (S_("Preferences|Metering"), mtt);
-
-       HSliderOption *mpks = new HSliderOption("meter-peak",
-                       _("Peak threshold [dBFS]"),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
-                       sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak),
-                       -10, 0, .1, .1
-                       );
-
-       Gtkmm2ext::UI::instance()->set_tip (
-                       mpks->tip_widget(),
-                       _("Specify the audio signal level in dBFS at and above which the meter-peak indicator will flash red."));
-
-       add_option (S_("Preferences|Metering"), mpks);
-
-       add_option (S_("Preferences|Metering"),
-            new BoolOption (
-                    "meter-style-led",
-                    _("LED meter style"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_style_led),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_style_led)
-                    ));
-
-       add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Editor Meters")));
-
-       add_option (S_("Preferences|Metering"),
-            new BoolOption (
-                    "show-track-meters",
-                    _("Show meters on tracks in the editor"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_track_meters),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
-                    ));
-
-       add_option (S_("Preferences|Metering"),
-            new BoolOption (
-                    "editor-stereo-only-meters",
-                    _("Show at most stereo meters in the track-header"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_editor_stereo_only_meters),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_editor_stereo_only_meters)
-                    ));
-
-       add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Post Export Analysis")));
-
-       add_option (S_("Preferences|Metering"),
-            new BoolOption (
-                    "save-export-analysis-image",
-                    _("Save loudness analysis as image file"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_save_export_analysis_image),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_save_export_analysis_image)
-                    ));
+       add_option (_("Appearance/Quirks"), new OptionEditorBlank ());
 
        /* VIDEO Timeline */
        add_option (_("Video"), new OptionEditorHeading (_("Video Server")));
        add_option (_("Video"), new VideoTimelineOptions (_rc_config));
 
-       /* and now the theme manager */
-
-       add_option (_("Theme"), new OptionEditorHeading (_("Theme")));
-       add_option (_("Theme"), new ThemeManager);
-
-       add_option (_("Theme/Colors"), new OptionEditorHeading (_("Colors")));
-       add_option (_("Theme/Colors"), new ColorThemeManager);
-
        Widget::show_all ();
 
        //trigger some parameter-changed messages which affect widget-visibility or -sensitivity
@@ -3781,7 +3897,7 @@ if (!Profile->get_mixbus()) {
                Tabbable::set_state (*node, Stateful::loading_state_version);
        }
 
-       set_current_page (_("Misc"));
+       set_current_page (_("General"));
 }
 
 void
@@ -3861,6 +3977,13 @@ void RCOptionEditor::edit_lxvst_path () {
        pd->hide();
        if (r == RESPONSE_ACCEPT) {
                _rc_config->set_plugin_path_lxvst(pd->get_serialized_paths());
+
+               MessageDialog msg (_("Re-scan Plugins now?"),
+                               false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
+               msg.set_default_response (Gtk::RESPONSE_YES);
+               if (msg.run() == Gtk::RESPONSE_YES) {
+                       plugin_scan_refresh ();
+               }
        }
        delete pd;
 }
@@ -3875,6 +3998,12 @@ void RCOptionEditor::edit_vst_path () {
        pd->hide();
        if (r == RESPONSE_ACCEPT) {
                _rc_config->set_plugin_path_vst(pd->get_serialized_paths());
+               MessageDialog msg (_("Re-scan Plugins now?"),
+                               false /*no markup*/, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true /*modal*/);
+               msg.set_default_response (Gtk::RESPONSE_YES);
+               if (msg.run() == Gtk::RESPONSE_YES) {
+                       plugin_scan_refresh ();
+               }
        }
        delete pd;
 }
@@ -3912,6 +4041,8 @@ RCOptionEditor::use_own_window (bool and_fill_it)
        if (win && new_window) {
                win->set_name ("PreferencesWindow");
                ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Preferences"), this);
+               win->resize (1, 1);
+               win->set_resizable (false);
        }
 
        return win;