diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade
index cdbf08d1..a4d3bf56 100644
--- a/terminatorlib/preferences.glade
+++ b/terminatorlib/preferences.glade
@@ -234,7 +234,7 @@
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog_vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
@@ -754,7 +754,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkNotebook" id="profile-editor-notebook">
+                  <object class="GtkNotebook" id="profile_editor_notebook">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">5</property>
@@ -765,7 +765,7 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="system-font-checkbutton">
+                          <object class="GtkCheckButton" id="system_font_checkbutton">
                             <property name="label" translatable="yes">_Use the system fixed width font</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -785,11 +785,11 @@
                             <property name="visible">True</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkHBox" id="font-hbox">
+                              <object class="GtkHBox" id="font_hbox">
                                 <property name="visible">True</property>
                                 <property name="spacing">12</property>
                                 <child>
-                                  <object class="GtkLabel" id="font-selector-label">
+                                  <object class="GtkLabel" id="font_selector_label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Font:</property>
@@ -863,13 +863,13 @@
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
                             <child>
-                              <object class="GtkLabel" id="word-chars-entry-label">
+                              <object class="GtkLabel" id="word_chars_entry_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Select-by-_word characters:</property>
                                 <property name="use_underline">True</property>
                                 <property name="justify">center</property>
-                                <property name="mnemonic_widget">word-chars-entry</property>
+                                <property name="mnemonic_widget">word_chars_entry</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -878,7 +878,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="word-chars-entry">
+                              <object class="GtkEntry" id="word_chars_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">&#x2022;</property>
@@ -930,7 +930,7 @@
                                             <property name="column_spacing">12</property>
                                             <property name="row_spacing">6</property>
                                             <child>
-                                              <object class="GtkComboBox" id="cursor-shape-combobox">
+                                              <object class="GtkComboBox" id="cursor_shape_combobox">
                                                 <property name="visible">True</property>
                                                 <property name="model">CursorShapeListStore</property>
                                                 <property name="active">0</property>
@@ -979,7 +979,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="label" translatable="yes">Cursor _shape:</property>
                                                 <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">cursor-shape-combobox</property>
+                                                <property name="mnemonic_widget">cursor_shape_combobox</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1053,7 +1053,7 @@
                                     <property name="visible">True</property>
                                     <property name="orientation">vertical</property>
                                     <child>
-                                      <object class="GtkCheckButton" id="icon-bell-checkbutton">
+                                      <object class="GtkCheckButton" id="icon_bell_checkbutton">
                                         <property name="label" translatable="yes">Titlebar icon</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -1065,7 +1065,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="visual-bell-checkbutton">
+                                      <object class="GtkCheckButton" id="visual_bell_checkbutton">
                                         <property name="label" translatable="yes">Visual flash</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -1080,7 +1080,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="audible-bell-checkbutton">
+                                      <object class="GtkCheckButton" id="audible_bell_checkbutton">
                                         <property name="label" translatable="yes">Audible beep</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -1095,7 +1095,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="urgent-bell-checkbutton">
+                                      <object class="GtkCheckButton" id="urgent_bell_checkbutton">
                                         <property name="label" translatable="yes">Window list flash</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -1177,7 +1177,7 @@
                                         <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
-                                          <object class="GtkCheckButton" id="login-shell-checkbutton">
+                                          <object class="GtkCheckButton" id="login_shell_checkbutton">
                                             <property name="label" translatable="yes">_Run command as a login shell</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -1192,7 +1192,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkCheckButton" id="update-records-checkbutton">
+                                          <object class="GtkCheckButton" id="update_records_checkbutton">
                                             <property name="label" translatable="yes">_Update login records when command is launched</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -1207,7 +1207,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkCheckButton" id="use-custom-command-checkbutton">
+                                          <object class="GtkCheckButton" id="use_custom_command_checkbutton">
                                             <property name="label" translatable="yes">Ru_n a custom command instead of my shell</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -1223,7 +1223,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="custom-command-box">
+                                          <object class="GtkAlignment" id="custom_command_box">
                                             <property name="visible">True</property>
                                             <property name="left_padding">12</property>
                                             <child>
@@ -1231,13 +1231,13 @@
                                                 <property name="visible">True</property>
                                                 <property name="spacing">12</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="custom-command-entry-label">
+                                                  <object class="GtkLabel" id="custom_command_entry_label">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Custom co_mmand:</property>
                                                     <property name="use_underline">True</property>
                                                     <property name="justify">center</property>
-                                                    <property name="mnemonic_widget">custom-command-entry</property>
+                                                    <property name="mnemonic_widget">custom_command_entry</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -1246,7 +1246,7 @@
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkEntry" id="custom-command-entry">
+                                                  <object class="GtkEntry" id="custom_command_entry">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="invisible_char">&#x2022;</property>
@@ -1268,13 +1268,13 @@
                                             <property name="visible">True</property>
                                             <property name="spacing">12</property>
                                             <child>
-                                              <object class="GtkLabel" id="exit-action-combobox-label">
+                                              <object class="GtkLabel" id="exit_action_combobox_label">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">When command _exits:</property>
                                                 <property name="use_underline">True</property>
                                                 <property name="justify">center</property>
-                                                <property name="mnemonic_widget">exit-action-combobox</property>
+                                                <property name="mnemonic_widget">exit_action_combobox</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -1283,7 +1283,7 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkComboBox" id="exit-action-combobox">
+                                              <object class="GtkComboBox" id="exit_action_combobox">
                                                 <property name="visible">True</property>
                                                 <property name="model">ChildExitedListStore</property>
                                                 <property name="active">0</property>
@@ -1372,13 +1372,13 @@
                                     <property name="column_spacing">12</property>
                                     <property name="row_spacing">6</property>
                                     <child>
-                                      <object class="GtkLabel" id="foreground-colorpicker-label">
+                                      <object class="GtkLabel" id="foreground_colorpicker_label">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">_Text color:</property>
                                         <property name="use_underline">True</property>
                                         <property name="justify">center</property>
-                                        <property name="mnemonic_widget">foreground-colorpicker</property>
+                                        <property name="mnemonic_widget">foreground_colorpicker</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">2</property>
@@ -1388,7 +1388,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="use-theme-colors-checkbutton">
+                                      <object class="GtkCheckButton" id="use_theme_colors_checkbutton">
                                         <property name="label" translatable="yes">_Use colors from system theme</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -1404,13 +1404,13 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="background-colorpicker-label">
+                                      <object class="GtkLabel" id="background_colorpicker_label">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">_Background color:</property>
                                         <property name="use_underline">True</property>
                                         <property name="justify">center</property>
-                                        <property name="mnemonic_widget">background-colorpicker</property>
+                                        <property name="mnemonic_widget">background_colorpicker</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">3</property>
@@ -1420,13 +1420,13 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="color-scheme-combobox-label">
+                                      <object class="GtkLabel" id="color_scheme_combobox_label">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Built-in sche_mes:</property>
                                         <property name="use_underline">True</property>
                                         <property name="justify">center</property>
-                                        <property name="mnemonic_widget">color-scheme-combobox</property>
+                                        <property name="mnemonic_widget">color_scheme_combobox</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">1</property>
@@ -1439,7 +1439,7 @@
                                       <object class="GtkHBox" id="hbox18">
                                         <property name="visible">True</property>
                                         <child>
-                                          <object class="GtkColorButton" id="foreground-colorpicker">
+                                          <object class="GtkColorButton" id="foreground_colorpicker">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1469,7 +1469,7 @@
                                       <object class="GtkHBox" id="hbox19">
                                         <property name="visible">True</property>
                                         <child>
-                                          <object class="GtkColorButton" id="background-colorpicker">
+                                          <object class="GtkColorButton" id="background_colorpicker">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1496,7 +1496,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="color-scheme-combobox">
+                                      <object class="GtkComboBox" id="color_scheme_combobox">
                                         <property name="visible">True</property>
                                         <property name="model">ColourSchemeListStore</property>
                                         <property name="active">2</property>
@@ -1560,13 +1560,13 @@
                                     <property name="column_spacing">12</property>
                                     <property name="row_spacing">6</property>
                                     <child>
-                                      <object class="GtkLabel" id="palette-optionmenu-label">
+                                      <object class="GtkLabel" id="palette_optionmenu_label">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Built-in _schemes:</property>
                                         <property name="use_underline">True</property>
                                         <property name="justify">center</property>
-                                        <property name="mnemonic_widget">palette-combobox</property>
+                                        <property name="mnemonic_widget">palette_combobox</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">1</property>
@@ -1576,14 +1576,14 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkTable" id="palette-table">
+                                      <object class="GtkTable" id="palette_table">
                                         <property name="visible">True</property>
                                         <property name="n_rows">2</property>
                                         <property name="n_columns">8</property>
                                         <property name="column_spacing">6</property>
                                         <property name="row_spacing">6</property>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-1">
+                                          <object class="GtkColorButton" id="palette_colorpicker_1">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1595,7 +1595,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-2">
+                                          <object class="GtkColorButton" id="palette_colorpicker_2">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1609,7 +1609,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-3">
+                                          <object class="GtkColorButton" id="palette_colorpicker_3">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1623,7 +1623,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-4">
+                                          <object class="GtkColorButton" id="palette_colorpicker_4">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1637,7 +1637,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-5">
+                                          <object class="GtkColorButton" id="palette_colorpicker_5">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1651,7 +1651,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-6">
+                                          <object class="GtkColorButton" id="palette_colorpicker_6">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1665,7 +1665,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-8">
+                                          <object class="GtkColorButton" id="palette_colorpicker_8">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1679,7 +1679,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-9">
+                                          <object class="GtkColorButton" id="palette_colorpicker_9">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1693,7 +1693,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-10">
+                                          <object class="GtkColorButton" id="palette_colorpicker_10">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1709,7 +1709,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-12">
+                                          <object class="GtkColorButton" id="palette_colorpicker_12">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1725,7 +1725,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-11">
+                                          <object class="GtkColorButton" id="palette_colorpicker_11">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1741,7 +1741,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-13">
+                                          <object class="GtkColorButton" id="palette_colorpicker_13">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1757,7 +1757,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-16">
+                                          <object class="GtkColorButton" id="palette_colorpicker_16">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1773,7 +1773,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-14">
+                                          <object class="GtkColorButton" id="palette_colorpicker_14">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1789,7 +1789,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-7">
+                                          <object class="GtkColorButton" id="palette_colorpicker_7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1803,7 +1803,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkColorButton" id="palette-colorpicker-15">
+                                          <object class="GtkColorButton" id="palette_colorpicker_15">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -1843,7 +1843,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="palette-combobox">
+                                      <object class="GtkComboBox" id="palette_combobox">
                                         <property name="visible">True</property>
                                       </object>
                                       <packing>
@@ -1862,7 +1862,7 @@
                                         <property name="label" translatable="yes">Color p_alette:</property>
                                         <property name="use_underline">True</property>
                                         <property name="justify">center</property>
-                                        <property name="mnemonic_widget">palette-colorpicker-1</property>
+                                        <property name="mnemonic_widget">palette_colorpicker_1</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">2</property>
@@ -1909,7 +1909,7 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkRadioButton" id="solid-radiobutton">
+                          <object class="GtkRadioButton" id="solid_radiobutton">
                             <property name="label" translatable="yes">_Solid color</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1931,14 +1931,14 @@
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkRadioButton" id="image-radiobutton">
+                              <object class="GtkRadioButton" id="image_radiobutton">
                                 <property name="label" translatable="yes">_Background image</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">solid-radiobutton</property>
+                                <property name="group">solid_radiobutton</property>
                                 <signal name="toggled" handler="on_background_type_toggled"/>
                               </object>
                               <packing>
@@ -1961,13 +1961,13 @@
                                         <property name="visible">True</property>
                                         <property name="spacing">12</property>
                                         <child>
-                                          <object class="GtkLabel" id="background-image-filechooser-label">
+                                          <object class="GtkLabel" id="background_image_filechooser_label">
                                             <property name="visible">True</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Image _file:</property>
                                             <property name="use_underline">True</property>
                                             <property name="justify">center</property>
-                                            <property name="mnemonic_widget">background-image-filechooser</property>
+                                            <property name="mnemonic_widget">background_image_filechooser</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1976,7 +1976,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkFileChooserButton" id="background-image-filechooser">
+                                          <object class="GtkFileChooserButton" id="background_image_filechooser">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="create_folders">False</property>
@@ -1992,7 +1992,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="scroll-background-checkbutton">
+                                      <object class="GtkCheckButton" id="scroll_background_checkbutton">
                                         <property name="label" translatable="yes">Background image _scrolls</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -2021,14 +2021,14 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkRadioButton" id="transparent-radiobutton">
+                          <object class="GtkRadioButton" id="transparent_radiobutton">
                             <property name="label" translatable="yes">_Transparent background</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">solid-radiobutton</property>
+                            <property name="group">solid_radiobutton</property>
                             <signal name="toggled" handler="on_background_type_toggled"/>
                           </object>
                           <packing>
@@ -2038,17 +2038,17 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="darken-background-vbox">
+                          <object class="GtkVBox" id="darken_background_vbox">
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkLabel" id="darken-background-scale-label">
+                              <object class="GtkLabel" id="darken_background_scale_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">S_hade transparent or image background:</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">darken-background-scale</property>
+                                <property name="mnemonic_widget">darken_background_scale</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2075,7 +2075,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHScale" id="darken-background-scale">
+                                  <object class="GtkHScale" id="darken_background_scale">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="update_policy">delayed</property>
@@ -2140,7 +2140,7 @@
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="scroll-on-keystroke-checkbutton">
+                          <object class="GtkCheckButton" id="scroll_on_keystroke_checkbutton">
                             <property name="label" translatable="yes">Scroll on _keystroke</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2156,7 +2156,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="scroll-on-output-checkbutton">
+                          <object class="GtkCheckButton" id="scroll_on_output_checkbutton">
                             <property name="label" translatable="yes">Scroll on _output</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2175,7 +2175,7 @@
                           <object class="GtkHBox" id="hbox139">
                             <property name="visible">True</property>
                             <child>
-                              <object class="GtkComboBox" id="scrollbar-position-combobox">
+                              <object class="GtkComboBox" id="scrollbar_position_combobox">
                                 <property name="visible">True</property>
                                 <property name="model">ScrollbarPositionListStore</property>
                                 <property name="active">0</property>
@@ -2199,11 +2199,11 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="scrollback-box">
+                          <object class="GtkHBox" id="scrollback_box">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkSpinButton" id="scrollback-lines-spinbutton">
+                              <object class="GtkSpinButton" id="scrollback_lines_spinbutton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">&#x2022;</property>
@@ -2217,13 +2217,13 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="scrollback-lines-spinbutton-label">
+                              <object class="GtkLabel" id="scrollback_lines_spinbutton_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">lines &lt;small&gt;&lt;b&gt;(Note: for infinite scrollback choose -1)&lt;/b&gt;&lt;/small&gt;</property>
                                 <property name="use_markup">True</property>
                                 <property name="justify">center</property>
-                                <property name="mnemonic_widget">scrollback-lines-spinbutton</property>
+                                <property name="mnemonic_widget">scrollback_lines_spinbutton</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2242,13 +2242,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="scrollbar-position-combobox-label">
+                          <object class="GtkLabel" id="scrollbar_position_combobox_label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Scrollbar is:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
-                            <property name="mnemonic_widget">scrollbar-position-combobox</property>
+                            <property name="mnemonic_widget">scrollbar_position_combobox</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
@@ -2256,13 +2256,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="scrollback-label">
+                          <object class="GtkLabel" id="scrollback_label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Scroll_back:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">center</property>
-                            <property name="mnemonic_widget">scrollback-lines-spinbutton</property>
+                            <property name="mnemonic_widget">scrollback_lines_spinbutton</property>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
@@ -2315,13 +2315,13 @@
                             <property name="column_spacing">12</property>
                             <property name="row_spacing">6</property>
                             <child>
-                              <object class="GtkLabel" id="delete-binding-combobox-label">
+                              <object class="GtkLabel" id="delete_binding_combobox_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Delete key generates:</property>
                                 <property name="use_underline">True</property>
                                 <property name="justify">center</property>
-                                <property name="mnemonic_widget">delete-binding-combobox</property>
+                                <property name="mnemonic_widget">delete_binding_combobox</property>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -2331,13 +2331,13 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="backspace-binding-combobox-label">
+                              <object class="GtkLabel" id="backspace_binding_combobox_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Backspace key generates:</property>
                                 <property name="use_underline">True</property>
                                 <property name="justify">center</property>
-                                <property name="mnemonic_widget">backspace-binding-combobox</property>
+                                <property name="mnemonic_widget">backspace_binding_combobox</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -2345,7 +2345,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="backspace-binding-combobox">
+                              <object class="GtkComboBox" id="backspace_binding_combobox">
                                 <property name="visible">True</property>
                                 <property name="model">BackspaceKeyListStore</property>
                                 <property name="active">1</property>
@@ -2364,7 +2364,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkComboBox" id="delete-binding-combobox">
+                              <object class="GtkComboBox" id="delete_binding_combobox">
                                 <property name="visible">True</property>
                                 <property name="model">DeleteKeyListStore</property>
                                 <property name="active">2</property>
@@ -2395,7 +2395,7 @@
                             <property name="visible">True</property>
                             <property name="layout_style">start</property>
                             <child>
-                              <object class="GtkButton" id="reset-compat-defaults-button">
+                              <object class="GtkButton" id="reset_compat_defaults_button">
                                 <property name="label" translatable="yes">_Reset Compatibility Options to Defaults</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -2787,7 +2787,7 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog_action_area1">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py
index 7533f960..2464f158 100755
--- a/terminatorlib/prefseditor.py
+++ b/terminatorlib/prefseditor.py
@@ -305,38 +305,38 @@ class PrefsEditor:
 
         ## General tab
         # Use system font
-        widget = guiget('system-font-checkbutton')
+        widget = guiget('system_font_checkbutton')
         widget.set_active(self.config['use_system_font'])
         self.on_system_font_checkbutton_toggled(widget)
         # Font selector
-        widget = guiget('font-selector')
+        widget = guiget('font_selector')
         if self.config['use_system_font'] == True:
             widget.set_font_name(self.config.get_system_font())
         else:
             widget.set_font_name(self.config['font'])
         # Allow bold text
-        widget = guiget('allow-bold-checkbutton')
+        widget = guiget('allow_bold_checkbutton')
         widget.set_active(self.config['allow_bold'])
         # Icon terminal bell
-        widget = guiget('icon-bell-checkbutton')
+        widget = guiget('icon_bell_checkbutton')
         widget.set_active(self.config['icon_bell'])
         # Visual terminal bell
-        widget = guiget('visual-bell-checkbutton')
+        widget = guiget('visual_bell_checkbutton')
         widget.set_active(self.config['visible_bell'])
         # Audible terminal bell
-        widget = guiget('audible-bell-checkbutton')
+        widget = guiget('audible_bell_checkbutton')
         widget.set_active(self.config['audible_bell'])
         # WM_URGENT terminal bell
-        widget = guiget('urgent-bell-checkbutton')
+        widget = guiget('urgent_bell_checkbutton')
         widget.set_active(self.config['urgent_bell'])
         # Show titlebar
         widget = guiget('show_titlebar')
         widget.set_active(self.config['show_titlebar'])
         # Word chars
-        widget = guiget('word-chars-entry')
+        widget = guiget('word_chars_entry')
         widget.set_text(self.config['word_chars'])
         # Cursor shape
-        widget = guiget('cursor-shape-combobox')
+        widget = guiget('cursor_shape_combobox')
         if self.config['cursor_shape'] == 'underline':
             active = 1
         elif self.config['cursor_shape'] == 'ibeam':
@@ -353,20 +353,20 @@ class PrefsEditor:
 
         ## Command tab
         # Login shell
-        widget = guiget('login-shell-checkbutton')
+        widget = guiget('login_shell_checkbutton')
         widget.set_active(self.config['login_shell'])
         # Login records
-        widget = guiget('update-records-checkbutton')
+        widget = guiget('update_records_checkbutton')
         widget.set_active(self.config['update_records'])
         # Use Custom command
-        widget = guiget('use-custom-command-checkbutton')
+        widget = guiget('use_custom_command_checkbutton')
         widget.set_active(self.config['use_custom_command'])
         self.on_use_custom_command_checkbutton_toggled(widget)
         # Custom Command
-        widget = guiget('custom-command-entry')
+        widget = guiget('custom_command_entry')
         widget.set_text(self.config['custom_command'])
         # Exit action
-        widget = guiget('exit-action-combobox')
+        widget = guiget('exit_action_combobox')
         if self.config['exit_action'] == 'restart':
             widget.set_active(1)
         elif self.config['exit_action'] == 'hold':
@@ -377,23 +377,23 @@ class PrefsEditor:
 
         ## Colors tab
         # Use system colors
-        widget = guiget('use-theme-colors-checkbutton')
+        widget = guiget('use_theme_colors_checkbutton')
         widget.set_active(self.config['use_theme_colors'])
         # Colorscheme
-        widget = guiget('color-scheme-combobox')
+        widget = guiget('color_scheme_combobox')
         scheme = self.config['color_scheme']
         if scheme not in self.colorschemevalues:
             scheme = 'grey_on_black'
         widget.set_active(self.colorschemevalues[scheme])
         # Foreground color
-        widget = guiget('foreground-colorpicker')
+        widget = guiget('foreground_colorpicker')
         widget.set_color(gtk.gdk.Color(self.config['foreground_color']))
         if scheme == 'custom':
             widget.set_sensitive(True)
         else:
             widget.set_sensitive(False)
         # Background color
-        widget = guiget('background-colorpicker')
+        widget = guiget('background_colorpicker')
         widget.set_color(gtk.gdk.Color(self.config['background_color']))
         if scheme == 'custom':
             widget.set_sensitive(True)
@@ -402,7 +402,7 @@ class PrefsEditor:
         # Palette
         palette = self.config['palette'].split(':')
         for i in xrange(1, 17):
-            widget = guiget('palette-colorpicker-%d' % i)
+            widget = guiget('palette_colorpicker_%d' % i)
             widget.set_color(gtk.gdk.Color(palette[i - 1]))
         # Titlebar colors
         for bit in ['title_transmit_fg_color', 'title_transmit_bg_color',
@@ -414,20 +414,20 @@ class PrefsEditor:
         ## Background tab
         # Radio values
         if self.config['background_type'] == 'solid':
-            guiget('solid-radiobutton').set_active(True)
+            guiget('solid_radiobutton').set_active(True)
         elif self.config['background_type'] == 'image':
-            guiget('image-radiobutton').set_active(True)
+            guiget('image_radiobutton').set_active(True)
         elif self.config['background_type'] == 'transparent':
-            guiget('transparent-radiobutton').set_active(True)
+            guiget('transparent_radiobutton').set_active(True)
         self.update_background_tab()
         # Background image file
         if self.config['background_image'] != '':
-            widget = guiget('background-image-filechooser')
+            widget = guiget('background_image_filechooser')
             if self.config['background_image'] is not None and \
                self.config['background_image'] != '':
                 widget.set_filename(self.config['background_image'])
         # Background image scrolls
-        widget = guiget('scroll-background-checkbutton')
+        widget = guiget('scroll_background_checkbutton')
         widget.set_active(self.config['scroll_background'])
         # Background shading
         widget = guiget('background_darkness_scale')
@@ -435,7 +435,7 @@ class PrefsEditor:
 
         ## Scrolling tab
         # Scrollbar position
-        widget = guiget('scrollbar-position-combobox')
+        widget = guiget('scrollbar_position_combobox')
         value = self.config['scrollbar_position']
         if value == 'left':
             widget.set_active(0)
@@ -444,18 +444,18 @@ class PrefsEditor:
         else:
             widget.set_active(1)
         # Scrollback lines
-        widget = guiget('scrollback-lines-spinbutton')
+        widget = guiget('scrollback_lines_spinbutton')
         widget.set_value(self.config['scrollback_lines'])
         # Scroll on outut
-        widget = guiget('scroll-on-output-checkbutton')
+        widget = guiget('scroll_on_output_checkbutton')
         widget.set_active(self.config['scroll_on_output'])
         # Scroll on keystroke
-        widget = guiget('scroll-on-keystroke-checkbutton')
+        widget = guiget('scroll_on_keystroke_checkbutton')
         widget.set_active(self.config['scroll_on_keystroke'])
 
         ## Compatibility tab
         # Backspace key
-        widget = guiget('backspace-binding-combobox')
+        widget = guiget('backspace_binding_combobox')
         value = self.config['backspace_binding']
         if value == 'control-h':
             widget.set_active(1)
@@ -466,7 +466,7 @@ class PrefsEditor:
         else:
             widget.set_active(0)
         # Delete key
-        widget = guiget('delete-binding-combobox')
+        widget = guiget('delete_binding_combobox')
         value = self.config['delete_binding']
         if value == 'control-h':
             widget.set_active(1)
@@ -483,34 +483,34 @@ class PrefsEditor:
 
         ## General tab
         # Use system font
-        widget = guiget('system-font-checkbutton')
+        widget = guiget('system_font_checkbutton')
         self.config['use_system_font'] = widget.get_active()
         # Font
-        widget = guiget('font-selector')
+        widget = guiget('font_selector')
         self.config['font'] = widget.get_font_name()
         # Allow bold
-        widget = guiget('allow-bold-checkbutton')
+        widget = guiget('allow_bold_checkbutton')
         self.config['allow_bold'] = widget.get_active()
         # Icon Bell
-        widget = guiget('icon-bell-checkbutton')
+        widget = guiget('icon_bell_checkbutton')
         self.config['icon_bell'] = widget.get_active()
         # Visual Bell
-        widget = guiget('visual-bell-checkbutton')
+        widget = guiget('visual_bell_checkbutton')
         self.config['visible_bell'] = widget.get_active()
         # Audible Bell
-        widget = guiget('audible-bell-checkbutton')
+        widget = guiget('audible_bell_checkbutton')
         self.config['audible_bell'] = widget.get_active()
         # Urgent Bell
-        widget = guiget('urgent-bell-checkbutton')
+        widget = guiget('urgent_bell_checkbutton')
         self.config['urgent_bell'] = widget.get_active()
         # Show titlebar
         widget = guiget('show_titlebar')
         self.config['show_titlebar'] = widget.get_active()
         # Word chars
-        widget = guiget('word-chars-entry')
+        widget = guiget('word_chars_entry')
         self.config['word_chars'] = widget.get_text()
         # Cursor Shape
-        widget = guiget('cursor-shape-combobox')
+        widget = guiget('cursor_shape_combobox')
         selected = widget.get_active()
         if selected == 0:
             value = 'block'
@@ -528,19 +528,19 @@ class PrefsEditor:
         
         ## Command tab
         # Login shell
-        widget = guiget('login-shell-checkbutton')
+        widget = guiget('login_shell_checkbutton')
         self.config['login_shell'] = widget.get_active()
         # Update records
-        widget = guiget('update-records-checkbutton')
+        widget = guiget('update_records_checkbutton')
         self.config['update_records'] = widget.get_active()
         # Use custom command
-        widget = guiget('use-custom-command-checkbutton')
+        widget = guiget('use_custom_command_checkbutton')
         self.config['use_custom_command'] = widget.get_active()
         # Custom command
-        widget = guiget('custom-command-entry')
+        widget = guiget('custom_command_entry')
         self.config['custom_command'] = widget.get_text()
         # Exit action
-        widget = guiget('exit-action-combobox')
+        widget = guiget('exit_action_combobox')
         selected = widget.get_active()
         if selected == 0:
             value = 'close'
@@ -552,10 +552,10 @@ class PrefsEditor:
 
         ## Colours tab
         # Use system colours
-        widget = guiget('use-theme-colors-checkbutton')
+        widget = guiget('use_theme_colors_checkbutton')
         self.config['use_theme_colors'] = widget.get_active()
         # Colour scheme
-        widget = guiget('color-scheme-combobox')
+        widget = guiget('color_scheme_combobox')
         selected = widget.get_active()
         if selected == 0:
             value = 'black_on_yellow'
@@ -575,15 +575,15 @@ class PrefsEditor:
             value = 'custom'
         self.config['color_scheme'] = value
         # Foreground colour
-        widget = guiget('foreground-colorpicker')
+        widget = guiget('foreground_colorpicker')
         self.config['foreground_color'] = widget.get_color().to_string()
         # Background colour
-        widget = guiget('background-colorpicker')
+        widget = guiget('background_colorpicker')
         self.config['background_color'] = widget.get_color().to_string()
         # Palette
         palette = []
         for i in xrange(1, 17):
-            widget = guiget('palette-colorpicker-%d' % i)
+            widget = guiget('palette_colorpicker_%d' % i)
             palette.append(widget.get_color().to_string())
         self.config['palette'] = ':'.join(palette)
         # Titlebar colours
@@ -595,29 +595,29 @@ class PrefsEditor:
 
         ## Background tab
         # Background type
-        widget = guiget('solid-radiobutton')
+        widget = guiget('solid_radiobutton')
         if widget.get_active() == True:
             value = 'solid'
-        widget = guiget('image-radiobutton')
+        widget = guiget('image_radiobutton')
         if widget.get_active() == True:
             value = 'image'
-        widget = guiget('transparent-radiobutton')
+        widget = guiget('transparent_radiobutton')
         if widget.get_active() == True:
             value = 'transparent'
         self.config['background_type'] = value
         # Background image
-        widget = guiget('background-image-filechooser')
+        widget = guiget('background_image_filechooser')
         self.config['background_image'] = widget.get_filename()
         # Background scrolls
-        widget = guiget('scroll-background-checkbutton')
+        widget = guiget('scroll_background_checkbutton')
         self.config['scroll_background'] = widget.get_active()
         # Background darkness
-        widget = guiget('darken-background-scale')
+        widget = guiget('darken_background_scale')
         self.config['background_darkness'] = widget.get_value()
 
         ## Scrolling tab
         # Scrollbar
-        widget = guiget('scrollbar-position-combobox')
+        widget = guiget('scrollbar_position_combobox')
         selected = widget.get_active()
         if selected == 0:
             value = 'left'
@@ -627,18 +627,18 @@ class PrefsEditor:
             value = 'hidden'
         self.config['scrollbar_position'] = value
         # Scrollback lines
-        widget = guiget('scrollback-lines-spinbutton')
+        widget = guiget('scrollback_lines_spinbutton')
         self.config['scrollback_lines'] = int(widget.get_value())
         # Scroll on output
-        widget = guiget('scroll-on-output-checkbutton')
+        widget = guiget('scroll_on_output_checkbutton')
         self.config['scroll_on_output'] = widget.get_active()
         # Scroll on keystroke
-        widget = guiget('scroll-on-keystroke-checkbutton')
+        widget = guiget('scroll_on_keystroke_checkbutton')
         self.config['scroll_on_keystroke'] = widget.get_active()
 
         ## Compatibility tab
         # Backspace key
-        widget = guiget('backspace-binding-combobox')
+        widget = guiget('backspace_binding_combobox')
         selected = widget.get_active()
         if selected == 0:
             value = 'automatic'
@@ -650,7 +650,7 @@ class PrefsEditor:
             value == 'escape-sequence'
         self.config['backspace_binding'] = value
         # Delete key
-        widget = guiget('delete-binding-combobox')
+        widget = guiget('delete_binding_combobox')
         selected = widget.get_active()
         if selected == 0:
             valud = 'automatic'
@@ -760,7 +760,7 @@ class PrefsEditor:
         sensitivity of the custom_command entrybox"""
         guiget = self.builder.get_object
 
-        widget = guiget('custom-command-entry')
+        widget = guiget('custom_command_entry')
         if checkbox.get_active() == True:
             widget.set_sensitive(True)
         else:
@@ -771,7 +771,7 @@ class PrefsEditor:
         sensitivity of the font selector"""
         guiget = self.builder.get_object
 
-        widget = guiget('font-selector')
+        widget = guiget('font_selector')
         if checkbox.get_active() == True:
             widget.set_sensitive(False)
         else:
@@ -782,9 +782,9 @@ class PrefsEditor:
         safest values"""
         guiget = self.builder.get_object
 
-        widget = guiget('backspace-binding-combobox')
+        widget = guiget('backspace_binding_combobox')
         widget.set_active(2)
-        widget = guiget('delete-binding-combobox')
+        widget = guiget('delete_binding_combobox')
         widget.set_active(3)
 
     def on_background_type_toggled(self, _widget):
@@ -797,8 +797,8 @@ class PrefsEditor:
 
         # Background type
         backtype = None
-        imagewidget = guiget('image-radiobutton')
-        transwidget = guiget('transparent-radiobutton')
+        imagewidget = guiget('image_radiobutton')
+        transwidget = guiget('transparent_radiobutton')
         if transwidget.get_active() == True:
             backtype = 'trans'
         elif imagewidget.get_active() == True:
@@ -806,15 +806,15 @@ class PrefsEditor:
         else:
             backtype = 'solid'
         if backtype == 'image':
-            guiget('background-image-filechooser').set_sensitive(True)
-            guiget('scroll-background-checkbutton').set_sensitive(True)
+            guiget('background_image_filechooser').set_sensitive(True)
+            guiget('scroll_background_checkbutton').set_sensitive(True)
         else:
-            guiget('background-image-filechooser').set_sensitive(False)
-            guiget('scroll-background-checkbutton').set_sensitive(False)
+            guiget('background_image_filechooser').set_sensitive(False)
+            guiget('scroll_background_checkbutton').set_sensitive(False)
         if backtype == 'trans':
-            guiget('darken-background-scale').set_sensitive(True)
+            guiget('darken_background_scale').set_sensitive(True)
         else:
-            guiget('darken-background-scale').set_sensitive(False)
+            guiget('darken_background_scale').set_sensitive(False)
 
     def on_profile_selection_changed(self, selection):
         """A different profile was selected"""
@@ -898,8 +898,8 @@ class PrefsEditor:
             if self.colorschemevalues[key] == active:
                 value = key
 
-        fore = guiget('foreground-colorpicker')
-        back = guiget('background-colorpicker')
+        fore = guiget('foreground_colorpicker')
+        back = guiget('background_colorpicker')
         if value == 'custom':
             fore.set_sensitive(True)
             back.set_sensitive(True)
@@ -941,9 +941,9 @@ class PrefsEditor:
         guiget = self.builder.get_object
         active = widget.get_active()
 
-        scheme = guiget('color-scheme-combobox')
-        fore = guiget('foreground-colorpicker')
-        back = guiget('background-colorpicker')
+        scheme = guiget('color_scheme_combobox')
+        fore = guiget('foreground_colorpicker')
+        back = guiget('background_colorpicker')
 
         if active:
             for widget in [scheme, fore, back]: