[glade] Migrate from intltool to gettext



commit 2c460bd113678b20519cdec4447815b05a3cca1c
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Thu Sep 7 12:20:17 2017 +0200

    Migrate from intltool to gettext
    
    Recent gettext version can extract and merge back strings from and to
    various file formats, no need for  intltool anymore.
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
    
    https://gitlab.gnome.org/GNOME/glade/issues/279

 .gitignore                         |    1 -
 Makefile.am                        |    9 +-
 configure.ac                       |    8 +-
 data/Makefile.am                   |    8 +-
 data/gettext/Makefile.am           |    1 +
 data/gettext/its/Makefile.am       |    9 +
 data/gettext/its/glade-catalog.its |   16 +
 data/gettext/its/glade-catalog.loc |    6 +
 data/glade.appdata.xml.in          |   16 +-
 data/glade.desktop.in.in           |   10 +-
 m4/.gitignore                      |    1 -
 plugins/gtk+/Makefile.am           |   14 +-
 plugins/gtk+/gtk+.xml.in           | 2604 ++++++++++++++++++------------------
 plugins/gtk+/gtkunixprint.xml.in   |   45 +-
 plugins/webkit2gtk/Makefile.am     |    8 +-
 po/.gitignore                      |    1 -
 po/Makevars                        |   80 ++
 po/POTFILES.in                     |  122 +-
 po/POTFILES.skip                   |    8 +-
 19 files changed, 1539 insertions(+), 1428 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48265944..396b7d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,6 @@ Makefile.in
 /*.tar.gz
 /junk
 /install-sh
-/intltool-*
 /libtool
 /ltmain.sh
 /missing
diff --git a/Makefile.am b/Makefile.am
index 1dba0484..90686111 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,14 +9,9 @@ DIST_SUBDIRS = po data gladeui src plugins tests doc help man
 EXTRA_DIST = \
        autogen.sh \
        COPYING.GPL \
-       COPYING.LGPL \
-       intltool-extract.in \
-       intltool-merge.in \
-       intltool-update.in
+       COPYING.LGPL
 
-DISTCLEANFILES = intltool-extract \
-                 intltool-merge \
-                 intltool-update
+DISTCLEANFILES =
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --enable-man-pages
 
diff --git a/configure.ac b/configure.ac
index f1e80131..a3524656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,8 @@ AC_SUBST(GLADE_DEBUG_FLAGS)
 dnl ================================================================
 dnl Gettext stuff.
 dnl ================================================================
-IT_PROG_INTLTOOL([0.41.0])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
@@ -351,6 +352,8 @@ data/icons/hicolor/256x256/Makefile
 data/icons/hicolor/256x256/apps/Makefile
 data/icons/hicolor/scalable/Makefile
 data/icons/hicolor/scalable/apps/Makefile
+data/gettext/Makefile
+data/gettext/its/Makefile
 gladeui/Makefile
 gladeui/gladeui.rc
 gladeui/glade-previewer.rc
@@ -361,9 +364,12 @@ plugins/gtk+/Makefile
 plugins/gtk+/icons/Makefile
 plugins/gtk+/icons/16x16/Makefile
 plugins/gtk+/icons/22x22/Makefile
+plugins/gtk+/gtk+.xml
+plugins/gtk+/gtkunixprint.xml
 plugins/python/Makefile
 plugins/gladeui/Makefile
 plugins/webkit2gtk/Makefile
+plugins/webkit2gtk/webkit2gtk.xml
 po/Makefile.in
 doc/Makefile
 doc/version.xml
diff --git a/data/Makefile.am b/data/Makefile.am
index 807aedb3..e685d0c8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,19 +1,21 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = icons
+SUBDIRS = icons gettext
 
 desktopdir = $(datadir)/applications
 desktop_in_files = glade.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(desktop_DATA): $(desktop_in_files)
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gladeui-2.0.pc
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = glade.appdata.xml.in
+$(appdata_DATA): $(appdata_in_files)
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST =                           \
        $(appdata_in_files)             \
diff --git a/data/gettext/Makefile.am b/data/gettext/Makefile.am
new file mode 100644
index 00000000..c74346bc
--- /dev/null
+++ b/data/gettext/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = its
diff --git a/data/gettext/its/Makefile.am b/data/gettext/its/Makefile.am
new file mode 100644
index 00000000..a938e67c
--- /dev/null
+++ b/data/gettext/its/Makefile.am
@@ -0,0 +1,9 @@
+its_filesdir = $(datadir)/gettext/its
+its_files = \
+       glade-catalog.its \
+       glade-catalog.loc \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(its_files) \
+       $(NULL)
diff --git a/data/gettext/its/glade-catalog.its b/data/gettext/its/glade-catalog.its
new file mode 100644
index 00000000..a925f35e
--- /dev/null
+++ b/data/gettext/its/glade-catalog.its
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its";
+           xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0";
+           version="2.0">
+  <its:translateRule selector="/glade-catalog//glade-widget-class/@title" translate="yes"/>
+  <its:translateRule selector="/glade-catalog//glade-widget-class//action/@name" translate="yes"/>
+  <its:translateRule selector="/glade-catalog//glade-widget-class//property/@name" translate="yes"/>
+  <its:translateRule selector="/glade-catalog//glade-widget-class//property//value/@name" translate="yes"/>
+  <its:translateRule selector="/glade-catalog//glade-widget-class//property/tooltip" translate="yes"/>
+
+  <its:translateRule selector="/glade-catalog//glade-widget-group/@title" translate="yes"/>
+
+  <!-- Extracted strings are consumed by the library and are never
+       merged back; we don't want to escape special characters.  -->
+  <gt:escapeRule selector="/glade-catalog" escape="no"/>
+</its:rules>
diff --git a/data/gettext/its/glade-catalog.loc b/data/gettext/its/glade-catalog.loc
new file mode 100644
index 00000000..bebd91fb
--- /dev/null
+++ b/data/gettext/its/glade-catalog.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="GladeCatalog" pattern="*.xml">
+    <documentRule localName="glade-catalog" target="glade-catalog.its"/>
+  </locatingRule>
+</locatingRules>
diff --git a/data/glade.appdata.xml.in b/data/glade.appdata.xml.in
index 1ab84a4a..ef7ef666 100644
--- a/data/glade.appdata.xml.in
+++ b/data/glade.appdata.xml.in
@@ -3,29 +3,29 @@
   <id>glade.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and LGPL-2.0+</project_license>
-  <_name>Glade</_name>
-  <_summary>Create or open user interface designs for GTK+ applications</_summary>
+  <name>Glade</name>
+  <summary>Create or open user interface designs for GTK+ applications</summary>
   <description>
 
     <!-- To translators: AppData description first paragraph -->
-    <_p>
+    <p>
       Glade is a RAD tool to enable quick &amp; easy development of user interfaces
       for the GTK+ 3 toolkit and the GNOME desktop environment. 
-    </_p>
+    </p>
 
     <!-- To translators: AppData description second paragraph -->
-    <_p>
+    <p>
       The user interfaces designed in Glade are saved as XML and these can be
       loaded by applications dynamically as needed by using GtkBuilder or used
       directly to define a new GtkWidget derived object class using
       GTK+ new template feature.
-    </_p>
+    </p>
 
     <!-- To translators: AppData description third paragraph -->
-    <_p>
+    <p>
       By using GtkBuilder, Glade XML files can be used in numerous programming 
       languages including C, C++, C#, Vala, Java, Perl, Python, and others. 
-    </_p>
+    </p>
   </description>
   <screenshots>
     <screenshot type="default">
diff --git a/data/glade.desktop.in.in b/data/glade.desktop.in.in
index 940d7ea6..89495b35 100644
--- a/data/glade.desktop.in.in
+++ b/data/glade.desktop.in.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=Glade
-_GenericName=Interface Designer
-_X-GNOME-FullName=Glade Interface Designer
-_Comment=Create or open user interface designs for GTK+ applications
-_Keywords=GUI designer;user interface;ui builder;
+Name=Glade
+GenericName=Interface Designer
+X-GNOME-FullName=Glade Interface Designer
+Comment=Create or open user interface designs for GTK+ applications
+Keywords=GUI designer;user interface;ui builder;
 Exec=glade %F
 Terminal=false
 StartupNotify=true
diff --git a/m4/.gitignore b/m4/.gitignore
index 33c6b21e..e27191eb 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -8,7 +8,6 @@
 /intl.m4
 /intldir.m4
 /intlmacosx.m4
-/intltool.m4
 /intmax.m4
 /inttypes-pri.m4
 /inttypes_h.m4
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 28e3c2da..bb251665 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -262,13 +262,13 @@ endif
 # catalog data
 catalogsdir = $(pkgdatadir)/catalogs
 
-catalogs_DATA = gtk+.xml
+catalogs_in_files = gtk+.xml.in
 
 if HAVE_GTK_UNIX_PRINT
-catalogs_DATA += gtkunixprint.xml
+catalogs_in_files += gtkunixprint.xml.in
 endif
 
-@INTLTOOL_XML_NOMERGE_RULE@
+catalogs_DATA = $(catalogs_in_files:.xml.in=.xml)
 
 BUILT_SOURCES =                \
        glade-gtk-marshallers.c \
@@ -335,11 +335,13 @@ UI_FILES =                                \
 EXTRA_DIST =                                   \
        $(UI_FILES)                             \
        glade-gtk-marshallers.list              \
-       gtk+.xml gtk+.xml.in                    \
-       gtkunixprint.xml gtkunixprint.xml.in    \
+       $(catalogs_in_files)                    \
+       $(catalog_DATA)                         \
        glade-gtk-resources.gresource.xml
 
-CLEANFILES = gtk+.xml gtkunixprint.xml $(BUILT_SOURCES)
+CLEANFILES =                   \
+       $(BUILT_SOURCES)        \
+       $(catalog_DATA)
 
 #
 # Marshaller generation
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 004add81..a90b5182 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1,13 +1,14 @@
 <glade-catalog name="gtk+"
-              version="3.22"
-              targetable="3.20,3.18,3.16,3.14,3.12,3.10,3.8,3.6,3.4,3.2,3.0"
-              icon-prefix="gtk"
-              library="gladegtk"
-              domain="glade"
-              book="gtk3">
+               version="3.22"
+               targetable="3.20,3.18,3.16,3.14,3.12,3.10,3.8,3.6,3.4,3.2,3.0"
+               icon-prefix="gtk"
+               library="gladegtk"
+               domain="glade"
+               book="gtk3">
+
   <glade-widget-classes>
-    
-    <glade-widget-class name="GtkWidget" _title="Widget" default-width="100" default-height="60">
+
+    <glade-widget-class name="GtkWidget" title="Widget" default-width="100" default-height="60">
       
       <destroy-object-function>glade_gtk_widget_destroy_object</destroy-object-function>
       <deep-post-create-function>glade_gtk_widget_deep_post_create</deep-post-create-function>
@@ -34,31 +35,31 @@
       </signals>
       
       <actions>
-        <action id="preview" _name="Preview snapshot" stock="system-run" important="True"/>
-        <action id="edit_separate" _name="Edit Separately" stock="gtk-edit"/>
-        <action id="remove_parent" _name="Remove Parent" stock="list-remove"/>
-        <action id="add_parent" _name="Add Parent" stock="list-add">
-          <action id="alignment" _name="Alignment"/>
-          <action id="viewport" _name="Viewport"/>
-          <action id="eventbox" _name="Event Box"/>
-          <action id="frame" _name="Frame"/>
-          <action id="aspect_frame" _name="Aspect Frame"/>
-          <action id="scrolled_window" _name="Scrolled Window"/>
-          <action id="expander" _name="Expander"/>
-          <action id="grid" _name="Grid"/>
-          <action id="box" _name="Box"/>
-          <action id="paned" _name="Paned"/>
-          <action id="stack" _name="Stack"/>
+        <action id="preview" name="Preview snapshot" stock="system-run" important="True"/>
+        <action id="edit_separate" name="Edit Separately" stock="gtk-edit"/>
+        <action id="remove_parent" name="Remove Parent" stock="list-remove"/>
+        <action id="add_parent" name="Add Parent" stock="list-add">
+          <action id="alignment" name="Alignment"/>
+          <action id="viewport" name="Viewport"/>
+          <action id="eventbox" name="Event Box"/>
+          <action id="frame" name="Frame"/>
+          <action id="aspect_frame" name="Aspect Frame"/>
+          <action id="scrolled_window" name="Scrolled Window"/>
+          <action id="expander" name="Expander"/>
+          <action id="grid" name="Grid"/>
+          <action id="box" name="Box"/>
+          <action id="paned" name="Paned"/>
+          <action id="stack" name="Stack"/>
         </action>
-        <action id="sizegroup_add" _name="Add to Size Group"/>
-        <action id="clear_properties" _name="Clear properties" stock="edit-clear"/>
-        <action id="read_documentation" _name="Read documentation" stock="glade-devhelp" important="True"/>
+        <action id="sizegroup_add" name="Add to Size Group"/>
+        <action id="clear_properties" name="Clear properties" stock="edit-clear"/>
+        <action id="read_documentation" name="Read documentation" stock="glade-devhelp" important="True"/>
       </actions>
         
         <properties>
           <property id="opacity" since="3.8" custom-layout="True"/>
           <property id="tooltip-text" since="2.12" weight="4.2" translatable="True" custom-layout="True"
-                 multiline="True" ignore="True"/>
+                    multiline="True" ignore="True"/>
           <property id="has-tooltip" custom-layout="True" ignore="True"/>
           <property id="can-focus" custom-layout="True" save-always="True"/>
           <property id="has-focus" custom-layout="True"/>
@@ -66,17 +67,17 @@
           <property id="has-default" custom-layout="True" ignore="True"/>
           <property id="can-default" custom-layout="True"/>
           <property id="receives-default" custom-layout="True"/>
-          <property id="tooltip-markup" since="2.12" weight="4.1" translatable="True" custom-layout="True" 
-                 multiline="True" ignore="True"/>
+          <property id="tooltip-markup" since="2.12" weight="4.1" translatable="True" custom-layout="True"
+                    multiline="True" ignore="True"/>
           <property id="visible" default="True" custom-layout="True" ignore="True"/>
           <property id="width-request"  custom-layout="True" optional="True" optional-default="False" 
default="0"/>
           <property id="height-request" custom-layout="True" optional="True" optional-default="False" 
default="0"/>
           <property id="no-show-all" weight="4.6" custom-layout="True" ignore="True"/>
           <property id="expand" disabled="True" since="3.0"/>
           <property id="hexpand" since="3.0" needs-sync="True" custom-layout="True"
-                 optional="True" optional-default="False"/>
+                    optional="True" optional-default="False"/>
           <property id="vexpand" since="3.0" needs-sync="True" custom-layout="True"
-                 optional="True" optional-default="False"/>
+                    optional="True" optional-default="False"/>
           <property id="hexpand-set" disabled="True" since="3.0"/>
           <property id="vexpand-set" disabled="True" since="3.0"/>
           <property id="margin" disabled="True" since="3.0"/>
@@ -92,28 +93,28 @@
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          
-          <property id="glade-style-classes" _name="Style Classes" weight="4.25" custom-layout="True"
-                 save="False" since="3.0">
+
+          <property id="glade-style-classes" name="Style Classes" weight="4.25" custom-layout="True"
+                    save="False" since="3.0">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>A list of style class names to apply to this widget</_tooltip>
+            <tooltip>A list of style class names to apply to this widget</tooltip>
           </property>
           
           <property id="halign" custom-layout="True" since="3.0">
             <displayable-values>
               <!-- GtkAlign enumeration value -->
-              <value id="GTK_ALIGN_FILL" _name="Fill"/>
+              <value id="GTK_ALIGN_FILL" name="Fill"/>
               <!-- GtkAlign enumeration value -->
-              <value id="GTK_ALIGN_START" _name="Start"/>
+              <value id="GTK_ALIGN_START" name="Start"/>
               <!-- GtkAlign enumeration value -->
-              <value id="GTK_ALIGN_CENTER" _name="Center"/>
+              <value id="GTK_ALIGN_CENTER" name="Center"/>
               <!-- GtkAlign enumeration value -->
-              <value id="GTK_ALIGN_END" _name="End"/>
+              <value id="GTK_ALIGN_END" name="End"/>
               <!-- GtkAlign enumeration value -->
-              <value id="GTK_ALIGN_BASELINE" _name="Baseline"/>
+              <value id="GTK_ALIGN_BASELINE" name="Baseline"/>
             </displayable-values>
           </property>
           <property id="valign" custom-layout="True" since="3.0"/>
@@ -121,55 +122,55 @@
           <property id="events" custom-layout="True" ignore="True">
             <displayable-values>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_EXPOSURE_MASK" _name="Exposure"/>
+              <value id="GDK_EXPOSURE_MASK" name="Exposure"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_POINTER_MOTION_MASK" _name="Pointer Motion"/>
+              <value id="GDK_POINTER_MOTION_MASK" name="Pointer Motion"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_POINTER_MOTION_HINT_MASK" _name="Pointer Motion Hint"/>
+              <value id="GDK_POINTER_MOTION_HINT_MASK" name="Pointer Motion Hint"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_BUTTON_MOTION_MASK" _name="Button Motion"/>
+              <value id="GDK_BUTTON_MOTION_MASK" name="Button Motion"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_BUTTON1_MOTION_MASK" _name="Button 1 Motion"/>
+              <value id="GDK_BUTTON1_MOTION_MASK" name="Button 1 Motion"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_BUTTON2_MOTION_MASK" _name="Button 2 Motion"/>
+              <value id="GDK_BUTTON2_MOTION_MASK" name="Button 2 Motion"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_BUTTON3_MOTION_MASK" _name="Button 3 Motion"/>
+              <value id="GDK_BUTTON3_MOTION_MASK" name="Button 3 Motion"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_BUTTON_PRESS_MASK" _name="Button Press"/>
+              <value id="GDK_BUTTON_PRESS_MASK" name="Button Press"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_BUTTON_RELEASE_MASK" _name="Button Release"/>
+              <value id="GDK_BUTTON_RELEASE_MASK" name="Button Release"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_KEY_PRESS_MASK" _name="Key Press"/>
+              <value id="GDK_KEY_PRESS_MASK" name="Key Press"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_KEY_RELEASE_MASK" _name="Key Release"/>
+              <value id="GDK_KEY_RELEASE_MASK" name="Key Release"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_ENTER_NOTIFY_MASK" _name="Enter Notify"/>
+              <value id="GDK_ENTER_NOTIFY_MASK" name="Enter Notify"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_LEAVE_NOTIFY_MASK" _name="Leave Notify"/>
+              <value id="GDK_LEAVE_NOTIFY_MASK" name="Leave Notify"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_FOCUS_CHANGE_MASK" _name="Focus Change"/>
+              <value id="GDK_FOCUS_CHANGE_MASK" name="Focus Change"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_STRUCTURE_MASK" _name="Structure"/>
+              <value id="GDK_STRUCTURE_MASK" name="Structure"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_PROPERTY_CHANGE_MASK" _name="Property Change"/>
+              <value id="GDK_PROPERTY_CHANGE_MASK" name="Property Change"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_VISIBILITY_NOTIFY_MASK" _name="Visibility Notify"/>
+              <value id="GDK_VISIBILITY_NOTIFY_MASK" name="Visibility Notify"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_PROXIMITY_IN_MASK" _name="Proximity In"/>
+              <value id="GDK_PROXIMITY_IN_MASK" name="Proximity In"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_PROXIMITY_OUT_MASK" _name="Proximity  Out"/>
+              <value id="GDK_PROXIMITY_OUT_MASK" name="Proximity  Out"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_SUBSTRUCTURE_MASK" _name="Substructure"/>
+              <value id="GDK_SUBSTRUCTURE_MASK" name="Substructure"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_SCROLL_MASK" _name="Scroll"/>
+              <value id="GDK_SCROLL_MASK" name="Scroll"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_TOUCH_MASK" _name="Touch"/>
+              <value id="GDK_TOUCH_MASK" name="Touch"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_SMOOTH_SCROLL_MASK" _name="Smooth scroll"/>
+              <value id="GDK_SMOOTH_SCROLL_MASK" name="Smooth scroll"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_TOUCHPAD_GESTURE_MASK" _name="Touchpad Gesture"/>
+              <value id="GDK_TOUCHPAD_GESTURE_MASK" name="Touchpad Gesture"/>
               <!-- GdkEventMask enumeration value -->
-              <value id="GDK_ALL_EVENTS_MASK" _name="All Events"/>
+              <value id="GDK_ALL_EVENTS_MASK" name="All Events"/>
             </displayable-values>
           </property>
           
@@ -184,425 +185,425 @@
           <property id="double-buffered" custom-layout="True" since="2.18"/>
           
           <!-- Accelerators -->
-          <property id="accelerator" _name="Accelerators" ignore="True" custom-layout="True" save="False">
+          <property id="accelerator" name="Accelerators" ignore="True" custom-layout="True" save="False">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeAccelGList</value-type>
             </parameter-spec>
-            <_tooltip>A list of accelerator keys</_tooltip>
+            <tooltip>A list of accelerator keys</tooltip>
           </property>
           
           <!-- Atk name and description properties -->
-          <property id="AtkObject::accessible-name" _name="Accessible Name" ignore="True" 
atk-property="True" 
-                 translatable="True" save="False" multiline="True">
+          <property id="AtkObject::accessible-name" name="Accessible Name" ignore="True" atk-property="True"
+                    translatable="True" save="False" multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Object instance's name formatted for assistive technology access</_tooltip>
+            <tooltip>Object instance's name formatted for assistive technology access</tooltip>
           </property>
-          
-          <property id="AtkObject::accessible-description" _name="Accessible Description" ignore="True" 
-                 atk-property="True" translatable="True" save="False" multiline="True">
+
+          <property id="AtkObject::accessible-description" name="Accessible Description" ignore="True"
+                    atk-property="True" translatable="True" save="False" multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Description of an object, formatted for assistive technology access</_tooltip>
+            <tooltip>Description of an object, formatted for assistive technology access</tooltip>
           </property>
-          
-          <property id="AtkObject::accessible-role" _name="Role" ignore="True" 
-                 atk-property="True" save="False" default="invalid">
+
+          <property id="AtkObject::accessible-role" name="Role" ignore="True"
+                    atk-property="True" save="False" default="invalid">
             <parameter-spec>
               <type>GParamEnum</type>
               <value-type>AtkRole</value-type>
             </parameter-spec>
-            <_tooltip>The accessible role of this object</_tooltip>
+            <tooltip>The accessible role of this object</tooltip>
             <displayable-values>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_INVALID" _name="Invalid"/>
+              <value id="ATK_ROLE_INVALID" name="Invalid"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ACCEL_LABEL" _name="Accelerator Label"/>
+              <value id="ATK_ROLE_ACCEL_LABEL" name="Accelerator Label"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ALERT" _name="Alert"/>
+              <value id="ATK_ROLE_ALERT" name="Alert"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ANIMATION" _name="Animation"/>
+              <value id="ATK_ROLE_ANIMATION" name="Animation"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ARROW" _name="Arrow"/>
+              <value id="ATK_ROLE_ARROW" name="Arrow"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_CALENDAR" _name="Calendar"/>
+              <value id="ATK_ROLE_CALENDAR" name="Calendar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_CANVAS" _name="Canvas"/>
+              <value id="ATK_ROLE_CANVAS" name="Canvas"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_CHECK_BOX" _name="Check Box"/>
+              <value id="ATK_ROLE_CHECK_BOX" name="Check Box"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_CHECK_MENU_ITEM" _name="Check Menu Item"/>
+              <value id="ATK_ROLE_CHECK_MENU_ITEM" name="Check Menu Item"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_COLOR_CHOOSER" _name="Color Chooser"/>
+              <value id="ATK_ROLE_COLOR_CHOOSER" name="Color Chooser"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_COLUMN_HEADER" _name="Column Header"/>
+              <value id="ATK_ROLE_COLUMN_HEADER" name="Column Header"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_COMBO_BOX" _name="Combo Box"/>
+              <value id="ATK_ROLE_COMBO_BOX" name="Combo Box"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DATE_EDITOR" _name="Date Editor"/>
+              <value id="ATK_ROLE_DATE_EDITOR" name="Date Editor"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DESKTOP_ICON" _name="Desktop Icon"/>
+              <value id="ATK_ROLE_DESKTOP_ICON" name="Desktop Icon"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DESKTOP_FRAME" _name="Desktop Frame"/>
+              <value id="ATK_ROLE_DESKTOP_FRAME" name="Desktop Frame"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DIAL" _name="Dial"/>
+              <value id="ATK_ROLE_DIAL" name="Dial"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DIALOG" _name="Dialog"/>
+              <value id="ATK_ROLE_DIALOG" name="Dialog"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DIRECTORY_PANE" _name="Directory Pane"/>
+              <value id="ATK_ROLE_DIRECTORY_PANE" name="Directory Pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DRAWING_AREA" _name="Drawing Area"/>
+              <value id="ATK_ROLE_DRAWING_AREA" name="Drawing Area"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_FILE_CHOOSER" _name="File Chooser"/>
+              <value id="ATK_ROLE_FILE_CHOOSER" name="File Chooser"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_FILLER" _name="Filler"/>
+              <value id="ATK_ROLE_FILLER" name="Filler"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_FONT_CHOOSER" _name="Font Chooser"/>
+              <value id="ATK_ROLE_FONT_CHOOSER" name="Font Chooser"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_FRAME" _name="Frame"/>
+              <value id="ATK_ROLE_FRAME" name="Frame"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_GLASS_PANE" _name="Glass Pane"/>
+              <value id="ATK_ROLE_GLASS_PANE" name="Glass Pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_HTML_CONTAINER" _name="HTML Container"/>
+              <value id="ATK_ROLE_HTML_CONTAINER" name="HTML Container"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ICON" _name="Icon"/>
+              <value id="ATK_ROLE_ICON" name="Icon"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_IMAGE" _name="Image"/>
+              <value id="ATK_ROLE_IMAGE" name="Image"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_INTERNAL_FRAME" _name="Internal Frame"/>
+              <value id="ATK_ROLE_INTERNAL_FRAME" name="Internal Frame"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LABEL" _name="Label"/>
+              <value id="ATK_ROLE_LABEL" name="Label"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LAYERED_PANE" _name="Layered Pane"/>
+              <value id="ATK_ROLE_LAYERED_PANE" name="Layered Pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LIST" _name="List"/>
+              <value id="ATK_ROLE_LIST" name="List"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LIST_ITEM" _name="List Item"/>
+              <value id="ATK_ROLE_LIST_ITEM" name="List Item"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MENU" _name="Menu"/>
+              <value id="ATK_ROLE_MENU" name="Menu"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MENU_BAR" _name="Menu Bar"/>
+              <value id="ATK_ROLE_MENU_BAR" name="Menu Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MENU_ITEM" _name="Menu Item"/>
+              <value id="ATK_ROLE_MENU_ITEM" name="Menu Item"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_OPTION_PANE" _name="Option Pane"/>
+              <value id="ATK_ROLE_OPTION_PANE" name="Option Pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PAGE_TAB" _name="Page Tab"/>
+              <value id="ATK_ROLE_PAGE_TAB" name="Page Tab"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PAGE_TAB_LIST" _name="Page Tab List"/>
+              <value id="ATK_ROLE_PAGE_TAB_LIST" name="Page Tab List"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PANEL" _name="Panel"/>
+              <value id="ATK_ROLE_PANEL" name="Panel"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PASSWORD_TEXT" _name="Password Text"/>
+              <value id="ATK_ROLE_PASSWORD_TEXT" name="Password Text"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_POPUP_MENU" _name="Popup Menu"/>
+              <value id="ATK_ROLE_POPUP_MENU" name="Popup Menu"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PROGRESS_BAR" _name="Progress bar"/>
+              <value id="ATK_ROLE_PROGRESS_BAR" name="Progress bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PUSH_BUTTON" _name="Push Button"/>
+              <value id="ATK_ROLE_PUSH_BUTTON" name="Push Button"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_RADIO_BUTTON" _name="Radio Button"/>
+              <value id="ATK_ROLE_RADIO_BUTTON" name="Radio Button"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_RADIO_MENU_ITEM" _name="Radio Menu Item"/>
+              <value id="ATK_ROLE_RADIO_MENU_ITEM" name="Radio Menu Item"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ROOT_PANE" _name="Root Pane"/>
+              <value id="ATK_ROLE_ROOT_PANE" name="Root Pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ROW_HEADER" _name="Row Header"/>
+              <value id="ATK_ROLE_ROW_HEADER" name="Row Header"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SCROLL_BAR" _name="Scroll Bar"/>
+              <value id="ATK_ROLE_SCROLL_BAR" name="Scroll Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SCROLL_PANE" _name="Scroll pane"/>
+              <value id="ATK_ROLE_SCROLL_PANE" name="Scroll pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SEPARATOR" _name="Separator"/>
+              <value id="ATK_ROLE_SEPARATOR" name="Separator"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SLIDER" _name="Slider"/>
+              <value id="ATK_ROLE_SLIDER" name="Slider"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SPLIT_PANE" _name="Split Pane"/>
+              <value id="ATK_ROLE_SPLIT_PANE" name="Split Pane"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SPIN_BUTTON" _name="Spin Button"/>
+              <value id="ATK_ROLE_SPIN_BUTTON" name="Spin Button"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_STATUSBAR" _name="Status Bar"/>
+              <value id="ATK_ROLE_STATUSBAR" name="Status Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TABLE" _name="Table"/>
+              <value id="ATK_ROLE_TABLE" name="Table"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TABLE_CELL" _name="Table Cell"/>
+              <value id="ATK_ROLE_TABLE_CELL" name="Table Cell"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TABLE_COLUMN_HEADER" _name="Column Header"/>
+              <value id="ATK_ROLE_TABLE_COLUMN_HEADER" name="Column Header"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TABLE_ROW_HEADER" _name="Row Header"/>
+              <value id="ATK_ROLE_TABLE_ROW_HEADER" name="Row Header"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TEAR_OFF_MENU_ITEM" _name="Tear Off Menu Item"/>
+              <value id="ATK_ROLE_TEAR_OFF_MENU_ITEM" name="Tear Off Menu Item"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TERMINAL" _name="Terminal"/>
+              <value id="ATK_ROLE_TERMINAL" name="Terminal"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TEXT" _name="Text"/>
+              <value id="ATK_ROLE_TEXT" name="Text"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TOGGLE_BUTTON" _name="Toggle Button"/>
+              <value id="ATK_ROLE_TOGGLE_BUTTON" name="Toggle Button"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TOOL_BAR" _name="Tool Bar"/>
+              <value id="ATK_ROLE_TOOL_BAR" name="Tool Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TOOL_TIP" _name="Tool Tip"/>
+              <value id="ATK_ROLE_TOOL_TIP" name="Tool Tip"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TREE" _name="Tree"/>
+              <value id="ATK_ROLE_TREE" name="Tree"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TREE_TABLE" _name="Tree Table"/>
+              <value id="ATK_ROLE_TREE_TABLE" name="Tree Table"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_UNKNOWN" _name="Unknown"/>
+              <value id="ATK_ROLE_UNKNOWN" name="Unknown"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_VIEWPORT" _name="Viewport"/>
+              <value id="ATK_ROLE_VIEWPORT" name="Viewport"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_WINDOW" _name="Window"/>
+              <value id="ATK_ROLE_WINDOW" name="Window"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_HEADER" _name="Header"/>
+              <value id="ATK_ROLE_HEADER" name="Header"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_FOOTER" _name="Footer"/>
+              <value id="ATK_ROLE_FOOTER" name="Footer"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PARAGRAPH" _name="Paragraph"/>
+              <value id="ATK_ROLE_PARAGRAPH" name="Paragraph"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_RULER" _name="Ruler"/>
+              <value id="ATK_ROLE_RULER" name="Ruler"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_APPLICATION" _name="Application"/>
+              <value id="ATK_ROLE_APPLICATION" name="Application"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_AUTOCOMPLETE" _name="Autocomplete"/>
+              <value id="ATK_ROLE_AUTOCOMPLETE" name="Autocomplete"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_EDITBAR" _name="Editbar"/>
+              <value id="ATK_ROLE_EDITBAR" name="Editbar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_EMBEDDED" _name="Embedded"/>
+              <value id="ATK_ROLE_EMBEDDED" name="Embedded"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ENTRY" _name="Entry"/>
+              <value id="ATK_ROLE_ENTRY" name="Entry"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_CHART" _name="Chart"/>
+              <value id="ATK_ROLE_CHART" name="Chart"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_CAPTION" _name="Caption"/>
+              <value id="ATK_ROLE_CAPTION" name="Caption"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DOCUMENT_FRAME" _name="Document Frame"/>
+              <value id="ATK_ROLE_DOCUMENT_FRAME" name="Document Frame"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_HEADING" _name="Heading"/>
+              <value id="ATK_ROLE_HEADING" name="Heading"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_PAGE" _name="Page"/>
+              <value id="ATK_ROLE_PAGE" name="Page"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SECTION" _name="Section"/>
+              <value id="ATK_ROLE_SECTION" name="Section"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_REDUNDANT_OBJECT" _name="Redundant Object"/>
+              <value id="ATK_ROLE_REDUNDANT_OBJECT" name="Redundant Object"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_FORM" _name="Form"/>
+              <value id="ATK_ROLE_FORM" name="Form"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LINK" _name="Link"/>
+              <value id="ATK_ROLE_LINK" name="Link"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_INPUT_METHOD_WINDOW" _name="Input Method Window"/>
+              <value id="ATK_ROLE_INPUT_METHOD_WINDOW" name="Input Method Window"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TABLE_ROW" _name="Table Row"/>
+              <value id="ATK_ROLE_TABLE_ROW" name="Table Row"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TREE_ITEM" _name="Tree Item"/>
+              <value id="ATK_ROLE_TREE_ITEM" name="Tree Item"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DOCUMENT_SPREADSHEET" _name="Document Spreadsheet"/>
+              <value id="ATK_ROLE_DOCUMENT_SPREADSHEET" name="Document Spreadsheet"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DOCUMENT_PRESENTATION" _name="Document Presentation"/>
+              <value id="ATK_ROLE_DOCUMENT_PRESENTATION" name="Document Presentation"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DOCUMENT_TEXT" _name="Document Text"/>
+              <value id="ATK_ROLE_DOCUMENT_TEXT" name="Document Text"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DOCUMENT_WEB" _name="Document Web"/>
+              <value id="ATK_ROLE_DOCUMENT_WEB" name="Document Web"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DOCUMENT_EMAIL" _name="Document Email"/>
+              <value id="ATK_ROLE_DOCUMENT_EMAIL" name="Document Email"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_COMMENT" _name="Comment"/>
+              <value id="ATK_ROLE_COMMENT" name="Comment"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LIST_BOX" _name="List Box"/>
+              <value id="ATK_ROLE_LIST_BOX" name="List Box"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_GROUPING" _name="Grouping"/>
+              <value id="ATK_ROLE_GROUPING" name="Grouping"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_IMAGE_MAP" _name="Image Map"/>
+              <value id="ATK_ROLE_IMAGE_MAP" name="Image Map"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_NOTIFICATION" _name="Notification"/>
+              <value id="ATK_ROLE_NOTIFICATION" name="Notification"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_INFO_BAR" _name="Info Bar"/>
+              <value id="ATK_ROLE_INFO_BAR" name="Info Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LEVEL_BAR" _name="Level Bar"/>
+              <value id="ATK_ROLE_LEVEL_BAR" name="Level Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TITLE_BAR" _name="Title Bar"/>
+              <value id="ATK_ROLE_TITLE_BAR" name="Title Bar"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_BLOCK_QUOTE" _name="Block Quote"/>
+              <value id="ATK_ROLE_BLOCK_QUOTE" name="Block Quote"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_AUDIO" _name="Audio"/>
+              <value id="ATK_ROLE_AUDIO" name="Audio"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_VIDEO" _name="Video"/>
+              <value id="ATK_ROLE_VIDEO" name="Video"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DEFINITION" _name="Definition"/>
+              <value id="ATK_ROLE_DEFINITION" name="Definition"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_ARTICLE" _name="Article"/>
+              <value id="ATK_ROLE_ARTICLE" name="Article"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LANDMARK" _name="Landmark"/>
+              <value id="ATK_ROLE_LANDMARK" name="Landmark"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_LOG" _name="Log"/>
+              <value id="ATK_ROLE_LOG" name="Log"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MARQUEE" _name="Marquee"/>
+              <value id="ATK_ROLE_MARQUEE" name="Marquee"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MATH" _name="Math"/>
+              <value id="ATK_ROLE_MATH" name="Math"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_RATING" _name="Rating"/>
+              <value id="ATK_ROLE_RATING" name="Rating"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_TIMER" _name="Time"/>
+              <value id="ATK_ROLE_TIMER" name="Time"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DESCRIPTION_LIST" _name="Description List"/>
+              <value id="ATK_ROLE_DESCRIPTION_LIST" name="Description List"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DESCRIPTION_TERM" _name="Description Term"/>
+              <value id="ATK_ROLE_DESCRIPTION_TERM" name="Description Term"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_DESCRIPTION_VALUE" _name="Description Value"/>
+              <value id="ATK_ROLE_DESCRIPTION_VALUE" name="Description Value"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_STATIC" _name="Generic object"/>
+              <value id="ATK_ROLE_STATIC" name="Generic object"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MATH_FRACTION" _name="Mathematical fraction"/>
+              <value id="ATK_ROLE_MATH_FRACTION" name="Mathematical fraction"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_MATH_ROOT" _name="A radical expression (in math)"/>
+              <value id="ATK_ROLE_MATH_ROOT" name="A radical expression (in math)"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SUBSCRIPT" _name="Subscript text"/>
+              <value id="ATK_ROLE_SUBSCRIPT" name="Subscript text"/>
               <!-- AtkRole enumeration value -->
-              <value id="ATK_ROLE_SUPERSCRIPT" _name="Superscript text"/>
+              <value id="ATK_ROLE_SUPERSCRIPT" name="Superscript text"/>
               <!-- Atk role enumeration value -->
-              <value id="ATK_ROLE_LAST_DEFINED" _name="Last Defined"/>
+              <value id="ATK_ROLE_LAST_DEFINED" name="Last Defined"/>
             </displayable-values>
           </property>
           
           <!-- Atk relationset properties -->
-          <property id="controlled-by" _name="Controlled By" ignore="True" atk-property="True" save="False">
+          <property id="controlled-by" name="Controlled By" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates an object controlled by one or more target objects</_tooltip>
+            <tooltip>Indicates an object controlled by one or more target objects</tooltip>
           </property>
-          
-          <property id="controller-for" _name="Controller For" ignore="True" atk-property="True" 
save="False">
+
+          <property id="controller-for" name="Controller For" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates an object is a controller for one or more target objects</_tooltip>
+            <tooltip>Indicates an object is a controller for one or more target objects</tooltip>
           </property>
-          
-          <property id="labelled-by" _name="Labeled By" ignore="True" atk-property="True" save="False">
+
+          <property id="labelled-by" name="Labeled By" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates an object is labeled by one or more target objects</_tooltip>
+            <tooltip>Indicates an object is labeled by one or more target objects</tooltip>
           </property>
-          
-          <property id="label-for" _name="Label For" ignore="True" atk-property="True" save="False">
+
+          <property id="label-for" name="Label For" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates an object is a label for one or more target objects</_tooltip>
+            <tooltip>Indicates an object is a label for one or more target objects</tooltip>
           </property>
-          
-          <property id="member-of" _name="Member Of" ignore="True" atk-property="True" save="False">
+
+          <property id="member-of" name="Member Of" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates an object is a member of a group of one or more target objects</_tooltip>
+            <tooltip>Indicates an object is a member of a group of one or more target objects</tooltip>
           </property>
-          
-          <property id="node-child-of" _name="Node Child Of" ignore="True" atk-property="True" save="False">
+
+          <property id="node-child-of" name="Node Child Of" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates an object is a cell in a treetable which is displayed because a 
+            <tooltip>Indicates an object is a cell in a treetable which is displayed because a
               cell in the same column is expanded and identifies that cell
-            </_tooltip>
+            </tooltip>
           </property>
-          
-          <property id="flows-to" _name="Flows To" ignore="True" atk-property="True" save="False">
+
+          <property id="flows-to" name="Flows To" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that the object has content that flows logically to another 
+            <tooltip>Indicates that the object has content that flows logically to another
               AtkObject in a sequential way, (for instance text-flow)
-            </_tooltip>
+            </tooltip>
           </property>
-          
-          <property id="flows-from" _name="Flows From" ignore="True" atk-property="True" save="False">
+
+          <property id="flows-from" name="Flows From" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that the object has content that flows logically from another 
+            <tooltip>Indicates that the object has content that flows logically from another
               AtkObject in a sequential way, (for instance text-flow)
-            </_tooltip>
+            </tooltip>
           </property>
-          
-          <property id="subwindow-of" _name="Subwindow Of" ignore="True" atk-property="True" save="False">
+
+          <property id="subwindow-of" name="Subwindow Of" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates a subwindow attached to a component but otherwise has no 
+            <tooltip>Indicates a subwindow attached to a component but otherwise has no
               connection in the UI hierarchy to that component
-            </_tooltip>
+            </tooltip>
           </property>
-          
-          <property id="embeds" _name="Embeds" ignore="True" atk-property="True" save="False">
+
+          <property id="embeds" name="Embeds" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that the object visually embeds another object's content, i.e. 
+            <tooltip>Indicates that the object visually embeds another object's content, i.e.
               this object's content flows around another's content
-            </_tooltip>
+            </tooltip>
           </property>
-          
-          <property id="embedded-by" _name="Embedded By" ignore="True" atk-property="True" save="False">
+
+          <property id="embedded-by" name="Embedded By" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Inverse of 'Embeds', indicates that this object's content is visually 
+            <tooltip>Inverse of 'Embeds', indicates that this object's content is visually
               embedded in another object
-            </_tooltip>
+            </tooltip>
           </property>
-          
-          <property id="popup-for" _name="Popup For" ignore="True" atk-property="True" save="False">
+
+          <property id="popup-for" name="Popup For" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that an object is a popup for another object</_tooltip>
+            <tooltip>Indicates that an object is a popup for another object</tooltip>
           </property>
-          
-          <property id="parent-window-of" _name="Parent Window Of" ignore="True" atk-property="True" 
save="False">
+
+          <property id="parent-window-of" name="Parent Window Of" ignore="True" atk-property="True" 
save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that an object is a parent window of another object</_tooltip>
+            <tooltip>Indicates that an object is a parent window of another object</tooltip>
           </property>
-          
-          <property id="described-by" _name="Described By" ignore="True" atk-property="True" save="False">
+
+          <property id="described-by" name="Described By" ignore="True" atk-property="True" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that another object provides descriptive information about this object; more 
verbose than 'Labelled By'</_tooltip>
+            <tooltip>Indicates that another object provides descriptive information about this object; more 
verbose than 'Labelled By'</tooltip>
           </property>
-          
-          <property id="description-for" _name="Description For" ignore="True" atk-property="True" 
save="False">
+
+          <property id="description-for" name="Description For" ignore="True" atk-property="True" 
save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>Indicates that an object provides descriptive information about another object; more 
verbose than 'Label For'</_tooltip>
+            <tooltip>Indicates that an object provides descriptive information about another object; more 
verbose than 'Label For'</tooltip>
           </property>
         </properties>
         
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkContainer" _title="Container" use-placeholders="True">
+
+      <glade-widget-class name="GtkContainer" title="Container" use-placeholders="True">
         <post-create-function>glade_gtk_container_post_create</post-create-function>
         <add-child-verify-function>glade_gtk_container_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_container_add_child</add-child-function>
@@ -614,24 +615,24 @@
         
         <properties>
           <property id="border-width" custom-layout="True"
-                 optional="True" optional-default="False"/>
+                    optional="True" optional-default="False"/>
           <property id="resize-mode" ignore="True" custom-layout="True">
             <displayable-values>
               <!-- GtkResizeMode enumeration value -->
-              <value id="GTK_RESIZE_PARENT" _name="Parent"/>
+              <value id="GTK_RESIZE_PARENT" name="Parent"/>
               <!-- GtkResizeMode enumeration value -->
-              <value id="GTK_RESIZE_QUEUE" _name="Queue"/>
+              <value id="GTK_RESIZE_QUEUE" name="Queue"/>
               <!-- GtkResizeMode enumeration value -->
-              <value id="GTK_RESIZE_IMMEDIATE" _name="Immediate"/>
+              <value id="GTK_RESIZE_IMMEDIATE" name="Immediate"/>
             </displayable-values>
           </property>
           <property id="child" disabled="True"/>
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GladeInstantiableGtkBin" generic-name="bin" _title="Bin" toplevel="True" />
+      <glade-widget-class name="GladeInstantiableGtkBin" generic-name="bin" title="Bin" toplevel="True" />
 
-      <glade-widget-class name="GtkBox" generic-name="box" _title="Box">
+      <glade-widget-class name="GtkBox" generic-name="box" title="Box">
         <create-widget-function>glade_gtk_create_fixed_widget</create-widget-function>
         <create-editable-function>glade_gtk_box_create_editable</create-editable-function>
         <post-create-function>glade_gtk_box_post_create</post-create-function>
@@ -647,33 +648,33 @@
         <special-child-type>type</special-child-type>
         
         <packing-actions>
-          <action id="insert_before" _name="Insert Before" stock="list-add"/>
-          <action id="insert_after" _name="Insert After" stock="list-add"/>
-          <action id="remove_slot" _name="Remove Slot" stock="list-remove"/>
+          <action id="insert_before" name="Insert Before" stock="list-add"/>
+          <action id="insert_after" name="Insert After" stock="list-add"/>
+          <action id="remove_slot" name="Remove Slot" stock="list-remove"/>
         </packing-actions>
         
         <properties>
           <property id="orientation" default="GTK_ORIENTATION_VERTICAL" custom-layout="True"/>
           <property id="homogeneous" custom-layout="True"/>
           <property id="spacing" custom-layout="True"/>
-          <property id="size" _name="Number of items" query="True" default="3" save="False" 
custom-layout="True">
+          <property id="size" name="Number of items" query="True" default="3" save="False" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>1</min>
             </parameter-spec>
-            <_tooltip>The number of items in the box</_tooltip>
+            <tooltip>The number of items in the box</tooltip>
           </property>
           <property id="baseline-position" since="3.10" custom-layout="True">
             <displayable-values>
               <!-- GtkBaselinePosition enumeration value -->
-              <value id="GTK_BASELINE_POSITION_TOP" _name="Top"/>
+              <value id="GTK_BASELINE_POSITION_TOP" name="Top"/>
               <!-- GtkBaselinePosition enumeration value -->
-              <value id="GTK_BASELINE_POSITION_CENTER" _name="Center"/>
+              <value id="GTK_BASELINE_POSITION_CENTER" name="Center"/>
               <!-- GtkBaselinePosition enumeration value -->
-              <value id="GTK_BASELINE_POSITION_BOTTOM" _name="Bottom"/>
+              <value id="GTK_BASELINE_POSITION_BOTTOM" name="Bottom"/>
             </displayable-values>
           </property>
-          <property save="False" id="use-center-child" since="3.12" default="FALSE" _name="Center Child" 
custom-layout="True">
+          <property save="False" id="use-center-child" since="3.12" default="FALSE" name="Center Child" 
custom-layout="True">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
@@ -689,26 +690,26 @@
           <property id="pack-type" transfer-on-paste="True">
             <displayable-values>
               <!-- GtkPackType enumeration value -->
-              <value id="GTK_PACK_START" _name="Start"/>
+              <value id="GTK_PACK_START" name="Start"/>
               <!-- GtkPackType enumeration value -->
-              <value id="GTK_PACK_END" _name="End"/>
+              <value id="GTK_PACK_END" name="End"/>
             </displayable-values>
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkHBox" deprecated="True" generic-name="hbox" _title="Horizontal Box">
+
+      <glade-widget-class name="GtkHBox" deprecated="True" generic-name="hbox" title="Horizontal Box">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      <glade-widget-class name="GtkVBox" deprecated="True" generic-name="vbox" _title="Vertical Box">
+      <glade-widget-class name="GtkVBox" deprecated="True" generic-name="vbox" title="Vertical Box">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkActionBar" generic-name="actionbar" _title="Action Bar" since="3.12">
+
+      <glade-widget-class name="GtkActionBar" generic-name="actionbar" title="Action Bar" since="3.12">
         <create-editable-function>glade_gtk_action_bar_create_editable</create-editable-function>
         <post-create-function>glade_gtk_action_bar_post_create</post-create-function>
         <get-children-function>glade_gtk_action_bar_get_children</get-children-function>
@@ -722,14 +723,14 @@
         <special-child-type>type</special-child-type>
         
         <properties>
-          <property id="size" _name="Number of items" default="1" save="False" custom-layout="True">
+          <property id="size" name="Number of items" default="1" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>1</min>
             </parameter-spec>
-            <_tooltip>The number of items in the action bar</_tooltip>
+            <tooltip>The number of items in the action bar</tooltip>
           </property>
-          <property save="False" id="use-center-child" since="3.12" default="FALSE" _name="Center Child" 
custom-layout="True">
+          <property save="False" id="use-center-child" since="3.12" default="FALSE" name="Center Child" 
custom-layout="True">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
@@ -741,8 +742,8 @@
           <property id="pack-type" transfer-on-paste="True"/>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkWindow" generic-name="window" _title="Window" toplevel="True" 
default-width="440" default-height="250">
+
+      <glade-widget-class name="GtkWindow" generic-name="window" title="Window" toplevel="True" 
default-width="440" default-height="250">
         <post-create-function>glade_gtk_window_post_create</post-create-function>
         <read-widget-function>glade_gtk_window_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_window_write_widget</write-widget-function>
@@ -755,12 +756,12 @@
         
         <properties> 
           <!-- Virtual accel-groups property to record accel groups -->
-          <property id="accel-groups" _name="Accel Groups" ignore="True" since="2.16" save="False" 
weight="0.5" custom-layout="True">
+          <property id="accel-groups" name="Accel Groups" ignore="True" since="2.16" save="False" 
weight="0.5" custom-layout="True">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkAccelGroup</value-type>
             </parameter-spec>
-            <_tooltip>A list of accel groups to be added to this window</_tooltip>
+            <tooltip>A list of accel groups to be added to this window</tooltip>
           </property>
           <!-- Virtual csd mode property -->
           <property id="use-csd" name="CSD" save="False" custom-layout="True">
@@ -779,25 +780,25 @@
           <property id="gravity" custom-layout="True">
             <displayable-values>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_NORTH_WEST" _name="North West"/>
+              <value id="GDK_GRAVITY_NORTH_WEST" name="North West"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_NORTH" _name="North"/>
+              <value id="GDK_GRAVITY_NORTH" name="North"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_NORTH_EAST" _name="North East"/>
+              <value id="GDK_GRAVITY_NORTH_EAST" name="North East"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_WEST" _name="West"/>
+              <value id="GDK_GRAVITY_WEST" name="West"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_CENTER" _name="Center"/>
+              <value id="GDK_GRAVITY_CENTER" name="Center"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_EAST" _name="East"/>
+              <value id="GDK_GRAVITY_EAST" name="East"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_SOUTH_WEST" _name="South West"/>
+              <value id="GDK_GRAVITY_SOUTH_WEST" name="South West"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_SOUTH" _name="South"/>
+              <value id="GDK_GRAVITY_SOUTH" name="South"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_SOUTH_EAST" _name="South East"/>
+              <value id="GDK_GRAVITY_SOUTH_EAST" name="South East"/>
               <!-- GdkGravity enumeration value -->
-              <value id="GDK_GRAVITY_STATIC" _name="Static"/>
+              <value id="GDK_GRAVITY_STATIC" name="Static"/>
             </displayable-values>
           </property>
           <property id="modal" ignore="True" custom-layout="True"/>
@@ -806,43 +807,43 @@
           <property id="type-hint" ignore="True" custom-layout="True">
             <displayable-values>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_NORMAL" _name="Normal"/>
+              <value id="GDK_WINDOW_TYPE_HINT_NORMAL" name="Normal"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_DIALOG" _name="Dialog"/>
+              <value id="GDK_WINDOW_TYPE_HINT_DIALOG" name="Dialog"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_MENU" _name="Menu"/>
+              <value id="GDK_WINDOW_TYPE_HINT_MENU" name="Menu"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_TOOLBAR" _name="Toolbar"/>
+              <value id="GDK_WINDOW_TYPE_HINT_TOOLBAR" name="Toolbar"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" _name="Splash Screen"/>
+              <value id="GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" name="Splash Screen"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_UTILITY" _name="Utility"/>
+              <value id="GDK_WINDOW_TYPE_HINT_UTILITY" name="Utility"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_DOCK" _name="Dock"/>
+              <value id="GDK_WINDOW_TYPE_HINT_DOCK" name="Dock"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_DESKTOP" _name="Desktop"/>
+              <value id="GDK_WINDOW_TYPE_HINT_DESKTOP" name="Desktop"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" _name="Drop Down Menu"/>
+              <value id="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" name="Drop Down Menu"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_POPUP_MENU" _name="Popup Menu"/>
+              <value id="GDK_WINDOW_TYPE_HINT_POPUP_MENU" name="Popup Menu"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_TOOLTIP" _name="Tooltip"/>
+              <value id="GDK_WINDOW_TYPE_HINT_TOOLTIP" name="Tooltip"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_NOTIFICATION" _name="Notification"/>
+              <value id="GDK_WINDOW_TYPE_HINT_NOTIFICATION" name="Notification"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_COMBO" _name="Combo"/>
+              <value id="GDK_WINDOW_TYPE_HINT_COMBO" name="Combo"/>
               <!-- GdkWindowTypeHint enumeration value -->
-              <value id="GDK_WINDOW_TYPE_HINT_DND" _name="Drag and Drop"/>
+              <value id="GDK_WINDOW_TYPE_HINT_DND" name="Drag and Drop"/>
             </displayable-values>
           </property>
           <property id="type" ignore="True" custom-layout="True">
             <displayable-values>
               <!-- GtkWindowType enumeration value -->
-              <value id="GTK_WINDOW_TOPLEVEL" _name="Top Level"/>
+              <value id="GTK_WINDOW_TOPLEVEL" name="Top Level"/>
               <!-- GtkWindowType enumeration value -->
-              <value id="GTK_WINDOW_POPUP" _name="Popup"/>
+              <value id="GTK_WINDOW_POPUP" name="Popup"/>
               <!-- GtkWindowType enumeration value -->
-              <value id="GTK_WINDOW_OFFSCREEN" _name="Offscreen"/>
+              <value id="GTK_WINDOW_OFFSCREEN" name="Offscreen"/>
             </displayable-values>
           </property>
           <property id="allow-shrink" disabled="True" />
@@ -855,15 +856,15 @@
           <property id="window-position" ignore="True" custom-layout="True">
             <displayable-values>
               <!-- GtkWindowPosition enumeration value -->
-              <value id="GTK_WIN_POS_NONE" _name="None"/>
+              <value id="GTK_WIN_POS_NONE" name="None"/>
               <!-- GtkWindowPosition enumeration value -->
-              <value id="GTK_WIN_POS_CENTER" _name="Center"/>
+              <value id="GTK_WIN_POS_CENTER" name="Center"/>
               <!-- GtkWindowPosition enumeration value -->
-              <value id="GTK_WIN_POS_MOUSE" _name="Mouse"/>
+              <value id="GTK_WIN_POS_MOUSE" name="Mouse"/>
               <!-- GtkWindowPosition enumeration value -->
-              <value id="GTK_WIN_POS_CENTER_ALWAYS" _name="Always Center"/>
+              <value id="GTK_WIN_POS_CENTER_ALWAYS" name="Always Center"/>
               <!-- GtkWindowPosition enumeration value -->
-              <value id="GTK_WIN_POS_CENTER_ON_PARENT" _name="Center on Parent"/>
+              <value id="GTK_WIN_POS_CENTER_ON_PARENT" name="Center on Parent"/>
             </displayable-values>
           </property>
           
@@ -888,14 +889,14 @@
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkOffscreenWindow" generic-name="offscreenwindow" _title="Offscreen Window" 
-                       parent="GtkWindow" toplevel="True" default-width="440" default-height="250" 
-                       since="2.20">
+
+      <glade-widget-class name="GtkOffscreenWindow" generic-name="offscreenwindow" title="Offscreen Window"
+                           parent="GtkWindow" toplevel="True" default-width="440" default-height="250"
+                           since="2.20">
         <properties> 
           <!-- Disable a handful of properties that dont make sense for GtkOffScreenWindow
-            (all window properties actually)
-         -->
+               (all window properties actually)
+          -->
           <property id="accel-groups" disabled="True"/>
           <property id="opacity" disabled="True"/>
           <property id="type" disabled="True"/>
@@ -935,11 +936,11 @@
       </glade-widget-class>
       
       <glade-widget-class name="GtkApplicationWindow" generic-name="applicationwindow"
-                       _title="Application Window" toplevel="True"
-                       default-width="440" default-height="250"/>
-      
-      <glade-widget-class name="GtkOverlay" generic-name="overlay" _title="Overlay" since="3.2"
-                       use-placeholders="False">
+                          title="Application Window" toplevel="True"
+                          default-width="440" default-height="250"/>
+
+      <glade-widget-class name="GtkOverlay" generic-name="overlay" title="Overlay" since="3.2"
+                          use-placeholders="False">
         <post-create-function>glade_gtk_overlay_post_create</post-create-function>
         <add-child-verify-function>glade_gtk_overlay_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_overlay_add_child</add-child-function>
@@ -947,8 +948,8 @@
         
<get-child-at-position-function>glade_gtk_overlay_get_child_at_position</get-child-at-position-function>
         <special-child-type>overlay</special-child-type>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkMenuShell" _title="Menu Shell" use-placeholders="False" since="2.16">
+
+      <glade-widget-class name="GtkMenuShell" title="Menu Shell" use-placeholders="False" since="2.16">
         <post-create-function>empty</post-create-function>
         <add-child-verify-function>glade_gtk_menu_shell_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_menu_shell_add_child</add-child-function>
@@ -963,18 +964,18 @@
         </signals>
         
         <packing-properties>
-          <property id="position" _name="Position" default="-1" save="False">
+          <property id="position" name="Position" default="-1" save="False">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The position of the menu item in the menu shell</_tooltip>
+            <tooltip>The position of the menu item in the menu shell</tooltip>
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkMenuItem" generic-name="menuitem" _title="Menu Item" 
use-placeholders="False"
-                        since="2.16">
+
+      <glade-widget-class name="GtkMenuItem" generic-name="menuitem" title="Menu Item" 
use-placeholders="False"
+                          since="2.16">
         <constructor-function>glade_gtk_menu_item_constructor</constructor-function>
         <post-create-function>glade_gtk_menu_item_post_create</post-create-function>
         <get-children-function>glade_gtk_menu_item_get_children</get-children-function>
@@ -987,92 +988,92 @@
         <special-child-type>submenu</special-child-type>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         <properties>
           <property id="accel-path" since="2.14"/>
           <property id="right-justified" since="2.14"/>
           <property id="width-chars" since="2.14"/>
-          <property id="label" _name="Label" translatable="True" since="2.16"/>
-          <property id="use-underline" _name="Use Underline" since="2.16"/>
+          <property id="label" name="Label" translatable="True" since="2.16"/>
+          <property id="use-underline" name="Use Underline" since="2.16"/>
           
           <!-- GtkActivatable -->
-          <property id="related-action" _name="Related Action" custom-layout="True" since="2.16" 
save="False" needs-sync="True"
-                 optional="True" optional-default="False" deprecated="True"/>
-          <property id="use-action-appearance" _name="Use Action Appearance" save="False" 
custom-layout="True" needs-sync="True"
-                 since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
+          <property id="related-action" name="Related Action" custom-layout="True" since="2.16" save="False" 
needs-sync="True"
+                    optional="True" optional-default="False" deprecated="True"/>
+          <property id="use-action-appearance" name="Use Action Appearance" save="False" 
custom-layout="True" needs-sync="True"
+                    since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
           
           <!-- GtkActionable -->
-          <property id="action-name" _name="Action Name" custom-layout="True" since="3.4"/>
-          <property id="action-target" _name="Action Target" custom-layout="True" since="3.4"/>
+          <property id="action-name" name="Action Name" custom-layout="True" since="3.4"/>
+          <property id="action-target" name="Action Target" custom-layout="True" since="3.4"/>
 
           <!-- Atk click property -->
-          <property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" 
-                 multiline="True">
+          <property id="atk-click" name="Click" ignore="True" atk-property="True" save="False"
+                    multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Click atk action</_tooltip>
+            <tooltip>Set the description of the Click atk action</tooltip>
           </property>
           <property id="submenu" since="2.12" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkImageMenuItem" deprecated-since="3.10" generic-name="imagemenuitem" 
_title="Image Menu Item">
+
+      <glade-widget-class name="GtkImageMenuItem" deprecated-since="3.10" generic-name="imagemenuitem" 
title="Image Menu Item">
         <read-widget-function>glade_gtk_image_menu_item_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_image_menu_item_write_widget</write-widget-function>
         <set-property-function>glade_gtk_image_menu_item_set_property</set-property-function>
         <create-editable-function>glade_gtk_image_menu_item_create_editable</create-editable-function>
         <properties>
           <property id="use-stock" default="True" visible="False" save-always="True" since="2.16"/>
-          <property id="stock" stock="True" _name="Stock Item" save="False" custom-layout="True">
+          <property id="stock" stock="True" name="Stock Item" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>The stock item for this menu item</_tooltip>
+            <tooltip>The stock item for this menu item</tooltip>
           </property>
           <!-- We save the label manually with the stock value if use_stock is set. -->
           <property id="label" save="False" custom-layout="True"/>
           <property id="use-underline" custom-layout="True"/>
           <property id="image" parentless-widget="True" visible="False"/>
-          <property id="accel-group" _name="Accel Group" custom-layout="True" since="2.16" />
+          <property id="accel-group" name="Accel Group" custom-layout="True" since="2.16" />
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCheckMenuItem" generic-name="checkmenuitem" _title="Check Menu Item"/>
-      
-      <glade-widget-class name="GtkRadioMenuItem" generic-name="radiomenuitem" _title="Radio Menu Item">
+
+      <glade-widget-class name="GtkCheckMenuItem" generic-name="checkmenuitem" title="Check Menu Item"/>
+
+      <glade-widget-class name="GtkRadioMenuItem" generic-name="radiomenuitem" title="Radio Menu Item">
         <set-property-function>glade_gtk_radio_menu_item_set_property</set-property-function>
         <properties>
           <property id="draw-as-radio" default="True"/>
           <property id="inconsistent" visible="False" save="False" default="False"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSeparatorMenuItem" generic-name="separatormenuitem" _title="Separator 
Menu Item">
+
+      <glade-widget-class name="GtkSeparatorMenuItem" generic-name="separatormenuitem" title="Separator Menu 
Item">
         <properties>
           <property id="label" disabled="True"/>
           <property id="use-underline" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkMenuBar" generic-name="menubar" _title="Menu Bar">
+
+      <glade-widget-class name="GtkMenuBar" generic-name="menubar" title="Menu Bar">
         <post-create-function>glade_gtk_menu_bar_post_create</post-create-function>
         <!-- menubar is a container you can't add placeholders to it -->
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         <properties>
           <property id="child-pack-direction">
             <displayable-values>
               <!-- GtkPackDirection enumeration value -->
-              <value id="GTK_PACK_DIRECTION_LTR" _name="Left to Right"/>
+              <value id="GTK_PACK_DIRECTION_LTR" name="Left to Right"/>
               <!-- GtkPackDirection enumeration value -->
-              <value id="GTK_PACK_DIRECTION_RTL" _name="Right to Left"/>
+              <value id="GTK_PACK_DIRECTION_RTL" name="Right to Left"/>
               <!-- GtkPackDirection enumeration value -->
-              <value id="GTK_PACK_DIRECTION_TTB" _name="Top to Bottom"/>
+              <value id="GTK_PACK_DIRECTION_TTB" name="Top to Bottom"/>
               <!-- GtkPackDirection enumeration value -->
-              <value id="GTK_PACK_DIRECTION_BTT" _name="Bottom to Top"/>
+              <value id="GTK_PACK_DIRECTION_BTT" name="Bottom to Top"/>
             </displayable-values>
           </property>
         </properties>
@@ -1082,8 +1083,8 @@
           </parent-class>
         </packing-defaults>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkToolbar" generic-name="toolbar" _title="Tool Bar" 
use-placeholders="False">
+
+      <glade-widget-class name="GtkToolbar" generic-name="toolbar" title="Tool Bar" use-placeholders="False">
         <post-create-function>glade_gtk_toolbar_post_create</post-create-function>
         <add-child-verify-function>glade_gtk_toolbar_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_toolbar_add_child</add-child-function>
@@ -1094,64 +1095,64 @@
         <write-widget-function>glade_gtk_toolbar_write_widget</write-widget-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         <properties>
           <property id="icon-size-set" since="2.10" disabled="True"/>
           <property id="orientation">
             <displayable-values>
               <!-- GtkOrientation enumeration value -->
-              <value id="GTK_ORIENTATION_HORIZONTAL" _name="Horizontal"/>
+              <value id="GTK_ORIENTATION_HORIZONTAL" name="Horizontal"/>
               <!-- GtkOrientation enumeration value -->
-              <value id="GTK_ORIENTATION_VERTICAL" _name="Vertical"/>
+              <value id="GTK_ORIENTATION_VERTICAL" name="Vertical"/>
             </displayable-values>
           </property>
           <property id="toolbar-style" save-always="True" optional="True" optional-default="False" 
weight="0.4">
             <displayable-values>
               <!-- GtkToolbarStyle enumeration value -->
-              <value id="GTK_TOOLBAR_ICONS" _name="Icons only"/>
+              <value id="GTK_TOOLBAR_ICONS" name="Icons only"/>
               <!-- GtkToolbarStyle enumeration value -->
-              <value id="GTK_TOOLBAR_TEXT" _name="Text only"/>
+              <value id="GTK_TOOLBAR_TEXT" name="Text only"/>
               <!-- GtkToolbarStyle enumeration value -->
-              <value id="GTK_TOOLBAR_BOTH" _name="Text below icons"/>
+              <value id="GTK_TOOLBAR_BOTH" name="Text below icons"/>
               <!-- GtkToolbarStyle enumeration value -->
-              <value id="GTK_TOOLBAR_BOTH_HORIZ" _name="Text beside icons"/>
+              <value id="GTK_TOOLBAR_BOTH_HORIZ" name="Text beside icons"/>
             </displayable-values>
           </property>
           <!-- We have to save/load icon-size as int, and fake the enum -->
           <property id="icon-size" since="2.10" optional="True" optional-default="False" weight="0.5"
-                 default="GTK_ICON_SIZE_LARGE_TOOLBAR" save="False">
+                    default="GTK_ICON_SIZE_LARGE_TOOLBAR" save="False">
             <parameter-spec>
               <type>GParamEnum</type>
               <value-type>GtkIconSize</value-type>
             </parameter-spec>
-            <_tooltip>A symbolic icon size for the stock icon</_tooltip>
+            <tooltip>A symbolic icon size for the stock icon</tooltip>
             <displayable-values>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_INVALID" _name="Invalid"/>
+              <value id="GTK_ICON_SIZE_INVALID" name="Invalid"/>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_MENU" _name="Menu"/>
+              <value id="GTK_ICON_SIZE_MENU" name="Menu"/>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" _name="Small Toolbar"/>
+              <value id="GTK_ICON_SIZE_SMALL_TOOLBAR" name="Small Toolbar"/>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" _name="Large Toolbar"/>
+              <value id="GTK_ICON_SIZE_LARGE_TOOLBAR" name="Large Toolbar"/>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_BUTTON" _name="Button"/>
+              <value id="GTK_ICON_SIZE_BUTTON" name="Button"/>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_DND" _name="Drag &amp; Drop"/>
+              <value id="GTK_ICON_SIZE_DND" name="Drag &amp; Drop"/>
               <!-- GtkIconSize enumeration value -->
-              <value id="GTK_ICON_SIZE_DIALOG" _name="Dialog"/>
+              <value id="GTK_ICON_SIZE_DIALOG" name="Dialog"/>
             </displayable-values>
           </property>
         </properties>
         
         <packing-properties>
-          <property id="position" _name="Position" default="-1" save="False">
+          <property id="position" name="Position" default="-1" save="False">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The position of the tool item in the toolbar</_tooltip>
+            <tooltip>The position of the tool item in the toolbar</tooltip>
           </property>
           <property id="expand" transfer-on-paste="True" save-always="True"/>
           <property id="homogeneous" transfer-on-paste="True" save-always="True"/>
@@ -1163,9 +1164,9 @@
           </parent-class>
         </packing-defaults>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkToolPalette" generic-name="toolpalette" _title="Tool Palette" 
-                       use-placeholders="False" since="2.20">
+
+      <glade-widget-class name="GtkToolPalette" generic-name="toolpalette" title="Tool Palette"
+                          use-placeholders="False" since="2.20">
         <create-editable-function>glade_gtk_tool_palette_create_editable</create-editable-function>
         <post-create-function>glade_gtk_toolbar_post_create</post-create-function>
         <add-child-verify-function>glade_gtk_tool_palette_add_verify</add-child-verify-function>
@@ -1176,7 +1177,7 @@
         <action-activate-function>glade_gtk_tool_palette_action_activate</action-activate-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         <properties>
           <property id="icon-size-set" disabled="True"/>
@@ -1187,34 +1188,34 @@
           <property id="hadjustment" custom-layout="True"/>
           <property id="vadjustment" custom-layout="True"/>
           <property id="hscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural width</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural width</tooltip>
             <displayable-values>
               <!-- GtkScrollablePolicy enumeration value -->
-              <value id="GTK_SCROLL_MINIMUM" _name="Minimum"/>
+              <value id="GTK_SCROLL_MINIMUM" name="Minimum"/>
               <!-- GtkScrollablePolicy enumeration value -->
-              <value id="GTK_SCROLL_NATURAL" _name="Natural"/>
+              <value id="GTK_SCROLL_NATURAL" name="Natural"/>
             </displayable-values>
           </property>
           <property id="vscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural height</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural height</tooltip>
           </property>
         </properties>
         
         <packing-properties>
-          <property id="position" _name="Position" default="-1" save="False">
+          <property id="position" name="Position" default="-1" save="False">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The position of the tool item group in the palette</_tooltip>
+            <tooltip>The position of the tool item group in the palette</tooltip>
           </property>
           <property id="expand" transfer-on-paste="True" save-always="True"/>
           <property id="exclusive" transfer-on-paste="True"/>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkToolItemGroup" generic-name="toolitemgroup" _title="Tool Item Group" 
-                       use-placeholders="False" since="2.20">
+
+      <glade-widget-class name="GtkToolItemGroup" generic-name="toolitemgroup" title="Tool Item Group"
+                          use-placeholders="False" since="2.20">
         <post-create-function>empty</post-create-function>
         <set-property-function>glade_gtk_tool_item_group_set_property</set-property-function>
         <add-child-verify-function>glade_gtk_tool_item_group_add_verify</add-child-verify-function>
@@ -1227,10 +1228,10 @@
           <property id="label" translatable="True" multiline="True" default="toolitemgroup" 
custom-layout="True"/>
           <property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"/>
 
-         <!--
-             Note xalign and yalign properties were added here, but they do the same as 
GtkMisc:xalign/yalign does,
-             so no need to 'since' them, if you target < 3.16, you will hit the misc properties
-         -->
+          <!--
+              Note xalign and yalign properties were added here, but they do the same as 
GtkMisc:xalign/yalign does,
+              so no need to 'since' them, if you target < 3.16, you will hit the misc properties
+          -->
           
           <!-- Virtual label type property -->
           <property id="custom-label" default="False" visible="False" save="False">
@@ -1241,23 +1242,23 @@
           <property id="ellipsize">
             <displayable-values>
               <!-- PangoEllipsizeMode enumeration value -->
-              <value id="PANGO_ELLIPSIZE_NONE" _name="None"/>
+              <value id="PANGO_ELLIPSIZE_NONE" name="None"/>
               <!-- PangoEllipsizeMode enumeration value -->
-              <value id="PANGO_ELLIPSIZE_START" _name="Start"/>
+              <value id="PANGO_ELLIPSIZE_START" name="Start"/>
               <!-- PangoEllipsizeMode enumeration value -->
-              <value id="PANGO_ELLIPSIZE_MIDDLE" _name="Middle"/>
+              <value id="PANGO_ELLIPSIZE_MIDDLE" name="Middle"/>
               <!-- PangoEllipsizeMode enumeration value -->
-              <value id="PANGO_ELLIPSIZE_END" _name="End"/>
+              <value id="PANGO_ELLIPSIZE_END" name="End"/>
             </displayable-values>
           </property>
           <property id="header-relief">
             <displayable-values>
               <!-- GtkReliefStyle enumeration value -->
-              <value id="GTK_RELIEF_NORMAL" _name="Normal"/>
+              <value id="GTK_RELIEF_NORMAL" name="Normal"/>
               <!-- GtkReliefStyle enumeration value -->
-              <value id="GTK_RELIEF_HALF" _name="Half"/>
+              <value id="GTK_RELIEF_HALF" name="Half"/>
               <!-- GtkReliefStyle enumeration value -->
-              <value id="GTK_RELIEF_NONE" _name="None"/>
+              <value id="GTK_RELIEF_NONE" name="None"/>
             </displayable-values>
           </property>
         </properties>
@@ -1278,18 +1279,18 @@
         
         <properties>
           <!-- GtkActivatable -->
-          <property id="related-action" _name="Related Action" custom-layout="True" since="2.16" 
save="False" needs-sync="True"
-                 optional="True" optional-default="False" deprecated="True"/>
-          <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
-                 since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
+          <property id="related-action" name="Related Action" custom-layout="True" since="2.16" save="False" 
needs-sync="True"
+                    optional="True" optional-default="False" deprecated="True"/>
+          <property id="use-action-appearance" name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
+                    since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
         </properties>
         
       </glade-widget-class>
       
-      <glade-widget-class name="GtkSeparatorToolItem" generic-name="separatortoolitem" 
-                       _title="Separator Tool Item"/>
-      
-      <glade-widget-class name="GtkToolButton" generic-name="toolbutton" _title="Tool Button">
+      <glade-widget-class name="GtkSeparatorToolItem" generic-name="separatortoolitem"
+                          title="Separator Tool Item"/>
+
+      <glade-widget-class name="GtkToolButton" generic-name="toolbutton" title="Tool Button">
         <create-editable-function>glade_gtk_tool_button_create_editable</create-editable-function>
         <set-property-function>glade_gtk_tool_button_set_property</set-property-function>
         <read-widget-function>glade_gtk_tool_button_read_widget</read-widget-function>
@@ -1298,11 +1299,11 @@
           <property id="visible-horizontal" custom-layout="True"/>
           <property id="is-important" custom-layout="True"/>
           <property id="use-underline" custom-layout="True"/>
-          
+
           <!-- GtkActionable -->
-          <property id="action-name" _name="Action Name" custom-layout="True" since="3.4"/>
-          <property id="action-target" _name="Action Target" custom-layout="True" since="3.4"/>
-          
+          <property id="action-name" name="Action Name" custom-layout="True" since="3.4"/>
+          <property id="action-target" name="Action Target" custom-layout="True" since="3.4"/>
+
           <!-- Virtual label type property -->
           <property id="custom-label" visible="False" save="False">
             <parameter-spec>
@@ -1318,7 +1319,7 @@
           
           <!-- Virtual stock comboentry property -->
           <property id="stock-id" visible="False" stock-icon="True" custom-layout="True">
-            <_tooltip>The stock icon displayed on the item (choose an item from GTK+ stock or from an icon 
factory)</_tooltip>
+            <tooltip>The stock icon displayed on the item (choose an item from GTK+ stock or from an icon 
factory)</tooltip>
           </property>
           <property id="label" translatable="True" default="toolbutton" custom-layout="True"/>
           <property id="label-widget" parentless-widget="True" create-type="GtkLabel" custom-layout="True"/>
@@ -1326,21 +1327,21 @@
           <property id="icon-widget" parentless-widget="True" create-type="GtkImage" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkToggleToolButton" generic-name="toggletoolbutton" _title="Toggle Tool 
Button">
+
+      <glade-widget-class name="GtkToggleToolButton" generic-name="toggletoolbutton" title="Toggle Tool 
Button">
         <properties>
           <property id="active" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRadioToolButton" generic-name="radiotoolbutton" _title="Radio Tool 
Button">
+
+      <glade-widget-class name="GtkRadioToolButton" generic-name="radiotoolbutton" title="Radio Tool Button">
         <properties>
           <property id="group" custom-layout="True"/>
         </properties>
       </glade-widget-class>
       
       <glade-widget-class name="GtkMenuToolButton" generic-name="menutoolbutton" use-placeholders="False"
-                       _title="Menu Tool Button">
+                          title="Menu Tool Button">
         <add-child-verify-function>glade_gtk_menu_tool_button_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_menu_tool_button_add_child</add-child-function>
         <remove-child-function>glade_gtk_menu_tool_button_remove_child</remove-child-function>
@@ -1353,42 +1354,42 @@
         </properties>
         
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkHandleBox" deprecated="True" generic-name="handlebox" _title="Handle Box">
+
+      <glade-widget-class name="GtkHandleBox" deprecated="True" generic-name="handlebox" title="Handle Box">
         <properties>
           <property id="handle-position">
             <displayable-values>
               <!-- GtkPositionType enumeration value -->
-              <value id="GTK_POS_LEFT" _name="Left"/>
+              <value id="GTK_POS_LEFT" name="Left"/>
               <!-- GtkPositionType enumeration value -->
-              <value id="GTK_POS_RIGHT" _name="Right"/>
+              <value id="GTK_POS_RIGHT" name="Right"/>
               <!-- GtkPositionType enumeration value -->
-              <value id="GTK_POS_TOP" _name="Top"/>
+              <value id="GTK_POS_TOP" name="Top"/>
               <!-- GtkPositionType enumeration value -->
-              <value id="GTK_POS_BOTTOM" _name="Bottom"/>
+              <value id="GTK_POS_BOTTOM" name="Bottom"/>
             </displayable-values>
           </property>
           <property id="shadow" disabled="True"/>
           <property id="shadow-type">
             <displayable-values>
               <!-- GtkShadowType enumeration value -->
-              <value id="GTK_SHADOW_NONE" _name="None"/>
+              <value id="GTK_SHADOW_NONE" name="None"/>
               <!-- GtkShadowType enumeration value -->
-              <value id="GTK_SHADOW_IN" _name="In"/>
+              <value id="GTK_SHADOW_IN" name="In"/>
               <!-- GtkShadowType enumeration value -->
-              <value id="GTK_SHADOW_OUT" _name="Out"/>
+              <value id="GTK_SHADOW_OUT" name="Out"/>
               <!-- GtkShadowType enumeration value -->
-              <value id="GTK_SHADOW_ETCHED_IN" _name="Etched In"/>
+              <value id="GTK_SHADOW_ETCHED_IN" name="Etched In"/>
               <!-- GtkShadowType enumeration value -->
-              <value id="GTK_SHADOW_ETCHED_OUT" _name="Etched Out"/>
+              <value id="GTK_SHADOW_ETCHED_OUT" name="Etched Out"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSpinner" generic-name="spinner" _title="Spinner" since="2.20"/>
-      
-      <glade-widget-class name="GtkLabel" generic-name="label" _title="Label">
+
+      <glade-widget-class name="GtkSpinner" generic-name="spinner" title="Spinner" since="2.20"/>
+
+      <glade-widget-class name="GtkLabel" generic-name="label" title="Label">
         <post-create-function>glade_gtk_label_post_create</post-create-function>
         <create-editor-property-function>glade_gtk_label_create_eprop</create-editor-property-function>
         <create-editable-function>glade_gtk_label_create_editable</create-editable-function>
@@ -1411,12 +1412,12 @@
             </parameter-spec>
           </property>
           <property id="label" default="label" translatable="True" custom-layout="True" multiline="True"/>
-          <property id="glade-attributes" _name="Attributes" save="False" custom-layout="True" since="2.16">
+          <property id="glade-attributes" name="Attributes" save="False" custom-layout="True" since="2.16">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeAttrGList</value-type>
             </parameter-spec>
-            <_tooltip>The pango attributes for this label</_tooltip>
+            <tooltip>The pango attributes for this label</tooltip>
           </property>
           <property id="pattern" custom-layout="True"/>
           <property id="use-markup" custom-layout="True"/>
@@ -1430,34 +1431,34 @@
           <property id="width-chars" custom-layout="True"/>
           <property id="wrap" custom-layout="True"/>
 
-         <!-- Shove it in there ! -->
-         <property id="lines" since="3.10" custom-layout="True"/>
+          <!-- Shove it in there ! -->
+          <property id="lines" since="3.10" custom-layout="True"/>
           <property id="selectable" ignore="True" custom-layout="True"/>
           <property id="justify" custom-layout="True">
             <displayable-values>
               <!-- GtkJustification enumeration value -->
-              <value id="GTK_JUSTIFY_LEFT" _name="Left"/>
+              <value id="GTK_JUSTIFY_LEFT" name="Left"/>
               <!-- GtkJustification enumeration value -->
-              <value id="GTK_JUSTIFY_RIGHT" _name="Right"/>
+              <value id="GTK_JUSTIFY_RIGHT" name="Right"/>
               <!-- GtkJustification enumeration value -->
-              <value id="GTK_JUSTIFY_CENTER" _name="Center"/>
+              <value id="GTK_JUSTIFY_CENTER" name="Center"/>
               <!-- GtkJustification enumeration value -->
-              <value id="GTK_JUSTIFY_FILL" _name="Fill"/>
+              <value id="GTK_JUSTIFY_FILL" name="Fill"/>
             </displayable-values>
           </property>
           <property id="wrap-mode" since="2.10" custom-layout="True">
             <displayable-values>
               <!-- PangoWrapMode enumeration value -->
-              <value id="PANGO_WRAP_WORD" _name="Word"/>
+              <value id="PANGO_WRAP_WORD" name="Word"/>
               <!-- PangoWrapMode enumeration value -->
-              <value id="PANGO_WRAP_CHAR" _name="Character"/>
+              <value id="PANGO_WRAP_CHAR" name="Character"/>
               <!-- PangoWrapMode enumeration value -->
-              <value id="PANGO_WRAP_WORD_CHAR" _name="Word Character"/>
+              <value id="PANGO_WRAP_WORD_CHAR" name="Word Character"/>
             </displayable-values>
           </property>
           <property id="track-visited-links" since="2.18" custom-layout="True"/>
-          
-         <!-- These properties have been deprecated in GtkMisc in 3.14, and appeared in GtkLabel in 3.16 -->
+
+          <!-- These properties have been deprecated in GtkMisc in 3.14, and appeared in GtkLabel in 3.16 -->
           <property id="xalign" custom-layout="True" optional="True" optional-default="False"/>
           <property id="yalign" custom-layout="True" optional="True" optional-default="False"/>
           
@@ -1471,8 +1472,8 @@
           <signal id="activate-link" since="2.18"/>
         </signals>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkEntry" generic-name="entry" _title="Text Entry">
+
+      <glade-widget-class name="GtkEntry" generic-name="entry" title="Text Entry">
         <post-create-function>glade_gtk_entry_post_create</post-create-function>
         <create-editable-function>glade_gtk_entry_create_editable</create-editable-function>
         <set-property-function>glade_gtk_entry_set_property</set-property-function>
@@ -1489,49 +1490,49 @@
           <property id="input-purpose" since="3.6" custom-layout="True">
             <displayable-values>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_FREE_FORM" _name="Free Form"/>
+              <value id="GTK_INPUT_PURPOSE_FREE_FORM" name="Free Form"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_ALPHA" _name="Alpha"/>
+              <value id="GTK_INPUT_PURPOSE_ALPHA" name="Alpha"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_DIGITS" _name="Digits"/>
+              <value id="GTK_INPUT_PURPOSE_DIGITS" name="Digits"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_NUMBER" _name="Number"/>
+              <value id="GTK_INPUT_PURPOSE_NUMBER" name="Number"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_PHONE" _name="Phone"/>
+              <value id="GTK_INPUT_PURPOSE_PHONE" name="Phone"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_URL" _name="URL"/>
+              <value id="GTK_INPUT_PURPOSE_URL" name="URL"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_EMAIL" _name="Email"/>
+              <value id="GTK_INPUT_PURPOSE_EMAIL" name="Email"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_NAME" _name="Name"/>
+              <value id="GTK_INPUT_PURPOSE_NAME" name="Name"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_PASSWORD" _name="Password"/>
+              <value id="GTK_INPUT_PURPOSE_PASSWORD" name="Password"/>
               <!-- GtkInputPurpose enumeration value -->
-              <value id="GTK_INPUT_PURPOSE_PIN" _name="Pin Code"/>
+              <value id="GTK_INPUT_PURPOSE_PIN" name="Pin Code"/>
             </displayable-values>
           </property>
           <property id="input-hints" since="3.6" custom-layout="True">
             <displayable-values>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_NONE" _name="None"/>
+              <value id="GTK_INPUT_HINT_NONE" name="None"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_SPELLCHECK" _name="Spellcheck"/>
+              <value id="GTK_INPUT_HINT_SPELLCHECK" name="Spellcheck"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_NO_SPELLCHECK" _name="No Spellcheck"/>
+              <value id="GTK_INPUT_HINT_NO_SPELLCHECK" name="No Spellcheck"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_WORD_COMPLETION" _name="Word Completion"/>
+              <value id="GTK_INPUT_HINT_WORD_COMPLETION" name="Word Completion"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_LOWERCASE" _name="Lowercase"/>
+              <value id="GTK_INPUT_HINT_LOWERCASE" name="Lowercase"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_UPPERCASE_CHARS" _name="Uppercase Chars"/>
+              <value id="GTK_INPUT_HINT_UPPERCASE_CHARS" name="Uppercase Chars"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_UPPERCASE_WORDS" _name="Uppercase Words"/>
+              <value id="GTK_INPUT_HINT_UPPERCASE_WORDS" name="Uppercase Words"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_UPPERCASE_SENTENCES" _name="Uppercase Sentences"/>
+              <value id="GTK_INPUT_HINT_UPPERCASE_SENTENCES" name="Uppercase Sentences"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_INHIBIT_OSK" _name="Inhibit On-screen Keyboard"/>
+              <value id="GTK_INPUT_HINT_INHIBIT_OSK" name="Inhibit On-screen Keyboard"/>
               <!-- GtkInputHints enumeration value -->
-              <value id="GTK_INPUT_HINT_VERTICAL_WRITING" _name="Vertical Writing"/>
+              <value id="GTK_INPUT_HINT_VERTICAL_WRITING" name="Vertical Writing"/>
             </displayable-values>
           </property>
           
@@ -1552,38 +1553,38 @@
           <property id="editing-canceled" disabled="True" since="2.20"/>
           <property id="primary-icon-gicon" disabled="True"/>
           <property id="secondary-icon-gicon" disabled="True"/>
-          <property id="primary-icon-stock" _name="Primary Stock Icon" since="2.16" custom-layout="True" 
-                 stock-icon="True"/>
-          <property id="secondary-icon-stock" _name="Secondary Stock Icon" since="2.16" custom-layout="True" 
-                 stock-icon="True"/>
-          <property id="primary-icon-pixbuf" _name="Primary Icon Pixbuf" since="2.16" custom-layout="True"/>
-          <property id="secondary-icon-pixbuf" _name="Secondary Icon Pixbuf" since="2.16" 
custom-layout="True"/>
-          <property id="primary-icon-name" _name="Primary Icon Name" since="2.16" custom-layout="True" 
-                 themed-icon="True"/>
-          <property id="secondary-icon-name" _name="Secondary Icon Name" since="2.16" custom-layout="True" 
-                 themed-icon="True"/>
-          <property id="primary-icon-activatable" _name="Primary Icon Activatable" since="2.16" 
-                 custom-layout="True"/>
-          <property id="secondary-icon-activatable" _name="Secondary Icon Activatable" since="2.16" 
-                 custom-layout="True"/>
-          <property id="primary-icon-sensitive" _name="Primary Icon Sensitive" since="2.16" 
-                 custom-layout="True"/>
-          <property id="secondary-icon-sensitive" _name="Secondary Icon Sensitive" since="2.16" 
-                 custom-layout="True"/>
-          <property id="progress-fraction" _name="Progress Fraction" since="2.16" custom-layout="True"/>
-          <property id="progress-pulse-step" _name="Progress Pulse Step" since="2.16" custom-layout="True"/>
+          <property id="primary-icon-stock" name="Primary Stock Icon" since="2.16" custom-layout="True"
+                    stock-icon="True"/>
+          <property id="secondary-icon-stock" name="Secondary Stock Icon" since="2.16" custom-layout="True"
+                    stock-icon="True"/>
+          <property id="primary-icon-pixbuf" name="Primary Icon Pixbuf" since="2.16" custom-layout="True"/>
+          <property id="secondary-icon-pixbuf" name="Secondary Icon Pixbuf" since="2.16" 
custom-layout="True"/>
+          <property id="primary-icon-name" name="Primary Icon Name" since="2.16" custom-layout="True"
+                    themed-icon="True"/>
+          <property id="secondary-icon-name" name="Secondary Icon Name" since="2.16" custom-layout="True"
+                    themed-icon="True"/>
+          <property id="primary-icon-activatable" name="Primary Icon Activatable" since="2.16"
+                    custom-layout="True"/>
+          <property id="secondary-icon-activatable" name="Secondary Icon Activatable" since="2.16"
+                    custom-layout="True"/>
+          <property id="primary-icon-sensitive" name="Primary Icon Sensitive" since="2.16"
+                    custom-layout="True"/>
+          <property id="secondary-icon-sensitive" name="Secondary Icon Sensitive" since="2.16"
+                    custom-layout="True"/>
+          <property id="progress-fraction" name="Progress Fraction" since="2.16" custom-layout="True"/>
+          <property id="progress-pulse-step" name="Progress Pulse Step" since="2.16" custom-layout="True"/>
           
           <property id="populate-all" custom-layout="True" since="3.8"/>
           <property id="invisible-char" custom-layout="True" optional="True" optional-default="False"/>
           <property id="invisible-char-set" disabled="True" since="2.16"/>
-          <property id="primary-icon-tooltip-text" translatable="True" multiline="True" 
-                 _name="Primary Icon Tooltip Text" custom-layout="True" since="2.16"/>
+          <property id="primary-icon-tooltip-text" translatable="True" multiline="True"
+                    name="Primary Icon Tooltip Text" custom-layout="True" since="2.16"/>
           <property id="secondary-icon-tooltip-text" translatable="True" multiline="True"
-                 _name="Secondary Icon Tooltip Text" custom-layout="True" since="2.16"/>
+                    name="Secondary Icon Tooltip Text" custom-layout="True" since="2.16"/>
           <property id="primary-icon-tooltip-markup" translatable="True" multiline="True"
-                 _name="Primary Icon Tooltip Markup" custom-layout="True" since="2.16"/>
+                    name="Primary Icon Tooltip Markup" custom-layout="True" since="2.16"/>
           <property id="secondary-icon-tooltip-markup" translatable="True" multiline="True"
-                 _name="Secondary Icon Tooltip Markup" custom-layout="True" since="2.16"/>
+                    name="Secondary Icon Tooltip Markup" custom-layout="True" since="2.16"/>
           
           <property id="im-module" disabled="True"/>
           <property id="completion" since="3.2" custom-layout="True"/>
@@ -1616,19 +1617,19 @@
           </property>
           
           <!-- Atk activate property -->
-          <property id="atk-activate" _name="Activate" ignore="True" atk-property="True" save="False"
-                 multiline="True">
+          <property id="atk-activate" name="Activate" ignore="True" atk-property="True" save="False"
+                    multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Activate atk action</_tooltip>
+            <tooltip>Set the description of the Activate atk action</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSearchEntry" generic-name="searchentry" _title="Search Entry" 
since="3.6"/>
-      
-      <glade-widget-class name="GtkTextView" generic-name="textview" _title="Text View">
+
+      <glade-widget-class name="GtkSearchEntry" generic-name="searchentry" title="Search Entry" since="3.6"/>
+
+      <glade-widget-class name="GtkTextView" generic-name="textview" title="Text View">
         <post-create-function>glade_gtk_text_view_post_create</post-create-function>
         <set-property-function>glade_gtk_text_view_set_property</set-property-function>
         <create-editable-function>glade_gtk_text_view_create_editable</create-editable-function>
@@ -1656,13 +1657,13 @@
           <property id="wrap-mode" custom-layout="True">
             <displayable-values>
               <!-- GtkWrapMode enumeration value -->
-              <value id="GTK_WRAP_NONE" _name="None"/>
+              <value id="GTK_WRAP_NONE" name="None"/>
               <!-- GtkWrapMode enumeration value -->
-              <value id="GTK_WRAP_CHAR" _name="Character"/>
+              <value id="GTK_WRAP_CHAR" name="Character"/>
               <!-- GtkWrapMode enumeration value -->
-              <value id="GTK_WRAP_WORD" _name="Word"/>
+              <value id="GTK_WRAP_WORD" name="Word"/>
               <!-- GtkWrapMode enumeration value -->
-              <value id="GTK_WRAP_WORD_CHAR" _name="Word Character"/>
+              <value id="GTK_WRAP_WORD_CHAR" name="Word Character"/>
             </displayable-values>
           </property>
           
@@ -1670,15 +1671,15 @@
           <property id="hadjustment" custom-layout="True"/>
           <property id="vadjustment" custom-layout="True"/>
           <property id="hscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural width</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural width</tooltip>
           </property>
           <property id="vscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural height</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural height</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSearchBar" generic-name="searchbar" _title="Search Bar" since="3.10">
+
+      <glade-widget-class name="GtkSearchBar" generic-name="searchbar" title="Search Bar" since="3.10">
         <post-create-function>glade_gtk_search_bar_post_create</post-create-function>
         <get-children-function>glade_gtk_search_bar_get_children</get-children-function>
         <add-child-verify-function>glade_gtk_search_bar_add_verify</add-child-verify-function>
@@ -1692,7 +1693,7 @@
 
       </glade-widget-class>
 
-      <glade-widget-class name="GtkButton" generic-name="button" _title="Button">
+      <glade-widget-class name="GtkButton" generic-name="button" title="Button">
         <post-create-function>glade_gtk_button_post_create</post-create-function>
         <create-editor-property-function>glade_gtk_button_create_eprop</create-editor-property-function>
         <create-editable-function>glade_gtk_button_create_editable</create-editable-function>
@@ -1706,51 +1707,51 @@
           <property id="register-response-id-displayables" visible="False" save="False" ignore="True">
             <parameter-spec>
               <type>GParamEnum</type>
-             <value-type>GtkResponseType</value-type>
+                <value-type>GtkResponseType</value-type>
             </parameter-spec>
             <displayable-values>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_NONE" _name="None"/>
+              <value id="GTK_RESPONSE_NONE" name="None"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_REJECT" _name="Reject"/>
+              <value id="GTK_RESPONSE_REJECT" name="Reject"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_ACCEPT" _name="Accept"/>
+              <value id="GTK_RESPONSE_ACCEPT" name="Accept"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_DELETE_EVENT" _name="Delete Event"/>
+              <value id="GTK_RESPONSE_DELETE_EVENT" name="Delete Event"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_OK" _name="OK"/>
+              <value id="GTK_RESPONSE_OK" name="OK"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_CANCEL" _name="Cancel"/>
+              <value id="GTK_RESPONSE_CANCEL" name="Cancel"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_CLOSE" _name="Close"/>
+              <value id="GTK_RESPONSE_CLOSE" name="Close"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_YES" _name="Yes"/>
+              <value id="GTK_RESPONSE_YES" name="Yes"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_NO" _name="No"/>
+              <value id="GTK_RESPONSE_NO" name="No"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_APPLY" _name="Apply"/>
+              <value id="GTK_RESPONSE_APPLY" name="Apply"/>
               <!-- GtkResponseType enumeration value -->
-              <value id="GTK_RESPONSE_HELP" _name="Help"/>
+              <value id="GTK_RESPONSE_HELP" name="Help"/>
             </displayable-values>
-         </property>
+          </property>
 
-         <property id="always-show-image" since="3.6" custom-layout="True"/>
+          <property id="always-show-image" since="3.6" custom-layout="True"/>
           <property id="receives-default" save-always="True"/>
           <property id="image" parentless-widget="True" create-type="GtkImage" custom-layout="True"/>
           <property id="use-stock" visible="False" custom-layout="True"/>
           <property id="label" default="button" translatable="True" custom-layout="True" save="False"
-                 multiline="True"/>
+                    multiline="True"/>
           <property id="use-underline" custom-layout="True"/>
           <property id="xalign" custom-layout="True" optional="True" optional-default="False" 
deprecated="True"/>
           <property id="yalign" custom-layout="True" optional="True" optional-default="False" 
deprecated="True"/>
           <property id="relief" custom-layout="True"/>
           <property id="focus-on-click" custom-layout="True"/>
-          
-          <property id="stock" _name="Stock Button" stock="True" save="False" custom-layout="True">
+
+          <property id="stock" name="Stock Button" stock="True" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>The stock item for this button</_tooltip>
+            <tooltip>The stock item for this button</tooltip>
           </property>
           <property id="custom-child" save="False" custom-layout="True" default="False">
             <parameter-spec>
@@ -1758,47 +1759,47 @@
             </parameter-spec>
           </property>
           <property id="image-position" custom-layout="True"/>
-          <property id="response-id" _name="Response ID" default="0" optional="True"
-                 optional-default="False" common="False" ignore="True" save="False" custom-layout="True">
+          <property id="response-id" name="Response ID" default="0" optional="True"
+                    optional-default="False" common="False" ignore="True" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
             </parameter-spec>
-            <_tooltip>The response ID of this button in a dialog</_tooltip>
+            <tooltip>The response ID of this button in a dialog</tooltip>
           </property>
           
           <!-- GtkActivatable -->
-          <property id="related-action" _name="Related Action" custom-layout="True" since="2.16" 
save="False" needs-sync="True"
-                 optional="True" optional-default="False" deprecated="True"/>
-          <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
-                 since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
-          
+          <property id="related-action" name="Related Action" custom-layout="True" since="2.16" save="False" 
needs-sync="True"
+                    optional="True" optional-default="False" deprecated="True"/>
+          <property id="use-action-appearance" name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
+                    since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
+
           <!-- GtkActionable -->
-          <property id="action-name" _name="Action Name" custom-layout="True" since="3.4"/>
-          <property id="action-target" _name="Action Target" custom-layout="True" since="3.4"/>
-          
+          <property id="action-name" name="Action Name" custom-layout="True" since="3.4"/>
+          <property id="action-target" name="Action Target" custom-layout="True" since="3.4"/>
+
           <!-- Atk click property -->
-          <property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" 
multiline="True">
+          <property id="atk-click" name="Click" ignore="True" atk-property="True" save="False" 
multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Click atk action</_tooltip>
+            <tooltip>Set the description of the Click atk action</tooltip>
           </property>
           
           <!-- Atk press property -->
-          <property id="atk-press" _name="Press" ignore="True" atk-property="True" save="False" 
multiline="True">
+          <property id="atk-press" name="Press" ignore="True" atk-property="True" save="False" 
multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Press atk action</_tooltip>
+            <tooltip>Set the description of the Press atk action</tooltip>
           </property>
           
           <!-- Atk release property -->
-          <property id="atk-release" _name="Release" ignore="True" atk-property="True" save="False" 
-                 multiline="True">
+          <property id="atk-release" name="Release" ignore="True" atk-property="True" save="False"
+                    multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Release atk action</_tooltip>
+            <tooltip>Set the description of the Release atk action</tooltip>
           </property>
         </properties>
         
@@ -1810,8 +1811,8 @@
         </signals>
         
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkToggleButton" generic-name="togglebutton" _title="Toggle Button">
+
+      <glade-widget-class name="GtkToggleButton" generic-name="togglebutton" title="Toggle Button">
         <properties>
           <property id="draw-indicator" custom-layout="True"/>
           <property id="inconsistent" custom-layout="True"/>
@@ -1819,15 +1820,15 @@
           <property id="label" default="togglebutton"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCheckButton" generic-name="checkbutton" _title="Check Button">
+
+      <glade-widget-class name="GtkCheckButton" generic-name="checkbutton" title="Check Button">
         <properties>
           <property id="label" default="checkbutton"/>
           <property id="draw-indicator" default="True" save-always="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSpinButton" generic-name="spinbutton" _title="Spin Button">
+
+      <glade-widget-class name="GtkSpinButton" generic-name="spinbutton" title="Spin Button">
         <post-create-function>empty</post-create-function>
         <set-property-function>glade_gtk_spin_button_set_property</set-property-function>
         <create-editable-function>glade_gtk_spin_button_create_editable</create-editable-function>
@@ -1849,52 +1850,52 @@
           <property id="update-policy" custom-layout="True">
             <displayable-values>
               <!-- GtkSpinButtonUpdatePolicy enumeration value -->
-              <value id="GTK_UPDATE_ALWAYS" _name="Always"/>
+              <value id="GTK_UPDATE_ALWAYS" name="Always"/>
               <!-- GtkSpinButtonUpdatePolicy enumeration value -->
-              <value id="GTK_UPDATE_IF_VALID" _name="If Valid"/>
+              <value id="GTK_UPDATE_IF_VALID" name="If Valid"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRadioButton" generic-name="radiobutton" _title="Radio Button">
+
+      <glade-widget-class name="GtkRadioButton" generic-name="radiobutton" title="Radio Button">
         <set-property-function>glade_gtk_radio_button_set_property</set-property-function>
         <properties>
           <property id="group" custom-layout="True"/>
           <property id="label" default="radiobutton"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSwitch" generic-name="switch" _title="Switch">
+
+      <glade-widget-class name="GtkSwitch" generic-name="switch" title="Switch">
         <post-create-function>glade_gtk_switch_post_create</post-create-function>
         <create-editable-function>glade_gtk_switch_create_editable</create-editable-function>
         <properties>
 
-         <!-- The GtkSwitch state is meant to be set in a state-set signal -->
+          <!-- The GtkSwitch state is meant to be set in a state-set signal -->
           <property id="state" disabled="True" since="3.14"/>
           
           <!-- GtkActivatable -->
-          <property id="related-action" _name="Related Action" custom-layout="True" save="False" 
needs-sync="True"
-                 optional="True" optional-default="False" deprecated="True">
+          <property id="related-action" name="Related Action" custom-layout="True" save="False" 
needs-sync="True"
+                    optional="True" optional-default="False" deprecated="True">
             <parameter-spec>
               <type>GParamObject</type>
               <value-type>GtkToggleAction</value-type>
             </parameter-spec>
           </property>
-          <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
-                 default="False" optional="True" optional-default="False" deprecated="True"/>
-          
+          <property id="use-action-appearance" name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
+                    default="False" optional="True" optional-default="False" deprecated="True"/>
+
           <!-- GtkActionable -->
-          <property id="action-name" _name="Action Name" custom-layout="True" since="3.4"/>
-          <property id="action-target" _name="Action Target" custom-layout="True" since="3.4"/>
+          <property id="action-name" name="Action Name" custom-layout="True" since="3.4"/>
+          <property id="action-target" name="Action Target" custom-layout="True" since="3.4"/>
         </properties>
-        
+
         <signals>
           <signal id="state-set" since="3.14"/>
         </signals>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFileChooserButton" generic-name="filechooserbutton" _title="File Chooser 
Button">
+
+      <glade-widget-class name="GtkFileChooserButton" generic-name="filechooserbutton" title="File Chooser 
Button">
         <set-property-function>glade_gtk_file_chooser_button_set_property</set-property-function>
         <create-editable-function>glade_gtk_file_chooser_button_create_editable</create-editable-function>
         
@@ -1923,13 +1924,13 @@
           <property id="action" custom-layout="True">
             <displayable-values>
               <!-- GtkFileChooserAction enumeration value -->
-              <value id="GTK_FILE_CHOOSER_ACTION_SAVE" _name="Save"/>
+              <value id="GTK_FILE_CHOOSER_ACTION_SAVE" name="Save"/>
               <!-- GtkFileChooserAction enumeration value -->
-              <value id="GTK_FILE_CHOOSER_ACTION_OPEN" _name="Open"/>
+              <value id="GTK_FILE_CHOOSER_ACTION_OPEN" name="Open"/>
               <!-- GtkFileChooserAction enumeration value -->
-              <value id="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" _name="Select Folder"/>
+              <value id="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" name="Select Folder"/>
               <!-- GtkFileChooserAction enumeration value -->
-              <value id="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" _name="Create Folder"/>
+              <value id="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" name="Create Folder"/>
             </displayable-values>
           </property>
           <property id="filter" custom-layout="True"/>
@@ -1941,21 +1942,21 @@
           <property id="select-multiple" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkScaleButton" generic-name="scalebutton" _title="Scale Button" 
since="2.12">
+
+      <glade-widget-class name="GtkScaleButton" generic-name="scalebutton" title="Scale Button" since="2.12">
         <properties>
           <property id="orientation" custom-layout="True"/>
           <property id="size" custom-layout="True"/>
           <property id="adjustment" custom-layout="True"/>
           <property id="value" custom-layout="True"/>
           <property id="icons" custom-layout="True">
-            <_tooltip>The names of the icons to be used by the scale button.
+            <tooltip>The names of the icons to be used by the scale button.
               The first item in the array will be used in the button
               when the current value is the lowest value, the second
               item for the highest value. All the subsequent icons will
               be used for all the other values, spread evenly over the
               range of values
-            </_tooltip>
+            </tooltip>
           </property>
         </properties>
         
@@ -1965,15 +1966,15 @@
         </internal-children>
         
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkVolumeButton" generic-name="volumebutton" _title="Volume Button">
+
+      <glade-widget-class name="GtkVolumeButton" generic-name="volumebutton" title="Volume Button">
         <properties>
           <property id="use-symbolic" since="3.0" custom-layout="True"/>
         </properties>
       </glade-widget-class>
       
-      <glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget" 
-                       _title="File Chooser Widget">
+      <glade-widget-class name="GtkFileChooserWidget" generic-name="filechooserwidget"
+                          title="File Chooser Widget">
         <post-create-function>glade_gtk_file_chooser_widget_post_create</post-create-function>
         <create-editable-function>glade_gtk_file_chooser_widget_create_editable</create-editable-function>
         <properties>
@@ -2006,8 +2007,8 @@
         </signals>
       </glade-widget-class>
       
-      <glade-widget-class name="GtkAppChooserWidget" generic-name="appchooserwidget" 
-                       _title="Application Chooser Widget" since="3.0">
+      <glade-widget-class name="GtkAppChooserWidget" generic-name="appchooserwidget"
+                          title="Application Chooser Widget" since="3.0">
         <create-editable-function>glade_gtk_app_chooser_widget_create_editable</create-editable-function>
         <properties>
           <property id="size" disabled="True"/>
@@ -2032,21 +2033,21 @@
           <property id="open-flags">
             <displayable-values>
               <!-- GtkPlacesOpenFlags enumeration value -->
-              <value id="GTK_PLACES_OPEN_NORMAL" _name="Normal"/>
+              <value id="GTK_PLACES_OPEN_NORMAL" name="Normal"/>
               <!-- GtkPlacesOpenFlags enumeration value -->
-              <value id="GTK_PLACES_OPEN_NEW_TAB" _name="New Tab"/>
+              <value id="GTK_PLACES_OPEN_NEW_TAB" name="New Tab"/>
               <!-- GtkPlacesOpenFlags enumeration value -->
-              <value id="GTK_PLACES_OPEN_NEW_WINDOW" _name="New Window"/>
+              <value id="GTK_PLACES_OPEN_NEW_WINDOW" name="New Window"/>
             </displayable-values>
           </property>
           <property id="populate-all" since="3.18"/>
         </properties>
-       <signals>
+        <signals>
           <signal id="show-other-locations" since="3.18"/>
         </signals>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkColorButton" generic-name="colorbutton" _title="Color Button">
+
+      <glade-widget-class name="GtkColorButton" generic-name="colorbutton" title="Color Button">
         <create-editable-function>glade_gtk_container_create_editable</create-editable-function>
         <set-property-function>glade_gtk_color_button_set_property</set-property-function>
         <properties>
@@ -2062,8 +2063,8 @@
           <property id="stock" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFontButton" generic-name="fontbutton" _title="Font Button">
+
+      <glade-widget-class name="GtkFontButton" generic-name="fontbutton" title="Font Button">
         <create-editable-function>glade_gtk_button_create_editable</create-editable-function>
         <properties>
           <property id="title" translatable="True"/>
@@ -2090,8 +2091,8 @@
           <property id="stock" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkComboBox" generic-name="combobox" _title="Combo Box">
+
+      <glade-widget-class name="GtkComboBox" generic-name="combobox" title="Combo Box">
         <create-editable-function>glade_gtk_combo_box_create_editable</create-editable-function>
         <post-create-function>glade_gtk_combo_box_post_create</post-create-function>
         <set-property-function>glade_gtk_combo_box_set_property</set-property-function>
@@ -2106,7 +2107,7 @@
         <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         
         <internal-children>
@@ -2139,27 +2140,27 @@
           <property id="button-sensitivity" custom-layout="True">
             <displayable-values>
               <!-- GtkSensitivityType enumeration value -->
-              <value id="GTK_SENSITIVITY_AUTO" _name="Automatic"/>
+              <value id="GTK_SENSITIVITY_AUTO" name="Automatic"/>
               <!-- GtkSensitivityType enumeration value -->
-              <value id="GTK_SENSITIVITY_ON" _name="On"/>
+              <value id="GTK_SENSITIVITY_ON" name="On"/>
               <!-- GtkSensitivityType enumeration value -->
-              <value id="GTK_SENSITIVITY_OFF" _name="Off"/>
+              <value id="GTK_SENSITIVITY_OFF" name="Off"/>
             </displayable-values>
           </property>
           <property id="editing-canceled" disabled="True" since="2.20"/>
           
           <!-- Atk press property -->
-          <property id="atk-press" _name="Press" ignore="True" atk-property="True" save="False" 
multiline="True">
+          <property id="atk-press" name="Press" ignore="True" atk-property="True" save="False" 
multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Press atk action</_tooltip>
+            <tooltip>Set the description of the Press atk action</tooltip>
           </property>
         </properties>
       </glade-widget-class>
       
-      
-      <glade-widget-class name="GtkComboBoxText" generic-name="comboboxtext" _title="Combo Box Text">
+
+      <glade-widget-class name="GtkComboBoxText" generic-name="comboboxtext" title="Combo Box Text">
         <create-editable-function>glade_gtk_combo_box_text_create_editable</create-editable-function>
         <post-create-function>glade_gtk_combo_box_text_post_create</post-create-function>
         
<create-editor-property-function>glade_gtk_combo_box_text_create_eprop</create-editor-property-function>
@@ -2186,18 +2187,18 @@
           <property id="active-id" custom-layout="True"/>
           <property id="focus-on-click" custom-layout="True"/>
           <property id="popup-fixed-width" custom-layout="True"/>
-          <property id="glade-items" _name="Items" save="False" since="2.24" custom-layout="True">
+          <property id="glade-items" name="Items" save="False" since="2.24" custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>The list of items to show in the combo box</_tooltip>
+            <tooltip>The list of items to show in the combo box</tooltip>
           </property>
         </properties>
       </glade-widget-class>
       
-      <glade-widget-class name="GtkAppChooserButton" generic-name="appchooserbutton" 
-                       _title="Application Chooser Button" since="3.0">
+      <glade-widget-class name="GtkAppChooserButton" generic-name="appchooserbutton"
+                          title="Application Chooser Button" since="3.0">
         <post-create-function>glade_gtk_app_chooser_button_post_create</post-create-function>
         <create-editable-function>glade_gtk_app_chooser_button_create_editable</create-editable-function>
         <properties>
@@ -2224,8 +2225,8 @@
           <property id="content-type" ignore="True" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkProgressBar" generic-name="progressbar" _title="Progress Bar">
+
+      <glade-widget-class name="GtkProgressBar" generic-name="progressbar" title="Progress Bar">
         <create-editable-function>glade_gtk_progress_bar_create_editable</create-editable-function>
         <set-property-function>glade_gtk_progress_bar_set_property</set-property-function>
         <properties>
@@ -2238,8 +2239,8 @@
           <property id="ellipsize" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkLevelBar" generic-name="levelbar" _title="Level Bar" since="3.6">
+
+      <glade-widget-class name="GtkLevelBar" generic-name="levelbar" title="Level Bar" since="3.6">
         <create-editable-function>glade_gtk_level_bar_create_editable</create-editable-function>
         <properties>
           <property id="orientation" custom-layout="True"/>
@@ -2250,15 +2251,15 @@
           <property id="mode" custom-layout="True">
             <displayable-values>
               <!-- GtkLevelBarMode enumeration value -->
-              <value id="GTK_LEVEL_BAR_MODE_CONTINUOUS" _name="Continuous"/>
+              <value id="GTK_LEVEL_BAR_MODE_CONTINUOUS" name="Continuous"/>
               <!-- GtkLevelBarMode enumeration value -->
-              <value id="GTK_LEVEL_BAR_MODE_DISCRETE" _name="Discrete"/>
+              <value id="GTK_LEVEL_BAR_MODE_DISCRETE" name="Discrete"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkImage" generic-name="image" _title="Image">
+
+      <glade-widget-class name="GtkImage" generic-name="image" title="Image">
         <set-property-function>glade_gtk_image_set_property</set-property-function>
         <get-property-function>glade_gtk_image_get_property</get-property-function>
         <create-editable-function>glade_gtk_image_create_editable</create-editable-function>
@@ -2271,19 +2272,19 @@
             </parameter-spec>
           </property>
           <property id="stock" stock-icon="True" custom-layout="True" default="gtk-missing-image"/>
-          <property id="icon-name" _name="Icon Name" themed-icon="True" custom-layout="True" />
+          <property id="icon-name" name="Icon Name" themed-icon="True" custom-layout="True" />
           <property id="use-fallback" custom-layout="True"/>
-          <property id="pixbuf" _name="File Name" custom-layout="True"/>
-          <property id="resource" _name="Resource Name" custom-layout="True" ignore="True" since="3.8"/>
+          <property id="pixbuf" name="File Name" custom-layout="True"/>
+          <property id="resource" name="Resource Name" custom-layout="True" ignore="True" since="3.8"/>
           <property id="pixel-size" custom-layout="True"/>
           <!-- We have to save/load icon-size as int, and fake the enum -->
-          <property id="icon-size" _name="Icon Size" custom-layout="True" 
-                 default="GTK_ICON_SIZE_BUTTON" save="False">
+          <property id="icon-size" name="Icon Size" custom-layout="True"
+                    default="GTK_ICON_SIZE_BUTTON" save="False">
             <parameter-spec>
               <type>GParamEnum</type>
               <value-type>GtkIconSize</value-type>
             </parameter-spec>
-            <_tooltip>A symbolic icon size for the stock icon</_tooltip>
+            <tooltip>A symbolic icon size for the stock icon</tooltip>
           </property>
           <property id="pixbuf-animation" disabled="True"/>
           <property id="file" disabled="True"/>
@@ -2299,9 +2300,9 @@
           <property id="ypad" custom-layout="True" optional="True" optional-default="False" 
deprecated="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkDialog" generic-name="dialog" _title="Dialog Box" 
-                       default-width="320" default-height="260">
+
+      <glade-widget-class name="GtkDialog" generic-name="dialog" title="Dialog Box"
+                          default-width="320" default-height="260">
         <post-create-function>glade_gtk_dialog_post_create</post-create-function>
         <read-child-function>glade_gtk_dialog_read_child</read-child-function>
         <write-child-function>glade_gtk_dialog_write_child</write-child-function>
@@ -2321,8 +2322,8 @@
         </properties>
         
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTable" deprecated="True" generic-name="table" _title="Table">
+
+      <glade-widget-class name="GtkTable" deprecated="True" generic-name="table" title="Table">
         <child-set-property-function>glade_gtk_table_set_child_property</child-set-property-function>
         <child-verify-function>glade_gtk_table_child_verify_property</child-verify-function>
         <get-children-function>glade_gtk_table_get_children</get-children-function>
@@ -2334,16 +2335,16 @@
         
<child-action-activate-function>glade_gtk_table_child_action_activate</child-action-activate-function>
         
         <packing-actions>
-          <action id="insert_row" _name="Insert Row" stock="list-add">
-            <action id="before" _name="Before"/>
-            <action id="after" _name="After"/>
+          <action id="insert_row" name="Insert Row" stock="list-add">
+            <action id="before" name="Before"/>
+            <action id="after" name="After"/>
           </action>
-          <action id="insert_column" _name="Insert Column" stock="list-add">
-            <action id="before" _name="Before"/>
-            <action id="after" _name="After"/>
+          <action id="insert_column" name="Insert Column" stock="list-add">
+            <action id="before" name="Before"/>
+            <action id="after" name="After"/>
           </action>
-          <action id="remove_row" _name="Remove Row" stock="list-remove"/>
-          <action id="remove_column" _name="Remove Column" stock="list-remove"/>
+          <action id="remove_row" name="Remove Row" stock="list-remove"/>
+          <action id="remove_column" name="Remove Column" stock="list-remove"/>
         </packing-actions>
         
         <properties>
@@ -2355,11 +2356,11 @@
           <property id="x-options" transfer-on-paste="True">
             <displayable-values>
               <!-- GtkAttachOptions enumeration value -->
-              <value id="GTK_EXPAND" _name="Expand"/>
+              <value id="GTK_EXPAND" name="Expand"/>
               <!-- GtkAttachOptions enumeration value -->
-              <value id="GTK_SHRINK" _name="Shrink"/>
+              <value id="GTK_SHRINK" name="Shrink"/>
               <!-- GtkAttachOptions enumeration value -->
-              <value id="GTK_FILL" _name="Fill"/>
+              <value id="GTK_FILL" name="Fill"/>
             </displayable-values>
           </property>
           <property id="y-options" transfer-on-paste="True"/>
@@ -2367,8 +2368,8 @@
           <property id="y-padding" transfer-on-paste="True"/>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkGrid" generic-name="grid" _title="Grid">
+
+      <glade-widget-class name="GtkGrid" generic-name="grid" title="Grid">
         <create-editable-function>glade_gtk_grid_create_editable</create-editable-function>
         <destroy-object-function>glade_gtk_grid_destroy_object</destroy-object-function>
         <create-widget-function>glade_gtk_create_fixed_widget</create-widget-function>
@@ -2384,16 +2385,16 @@
         <child-action-activate-function>glade_gtk_grid_child_action_activate</child-action-activate-function>
         
         <packing-actions>
-          <action id="insert_row" _name="Insert Row" stock="list-add">
-            <action id="before" _name="Before"/>
-            <action id="after" _name="After"/>
+          <action id="insert_row" name="Insert Row" stock="list-add">
+            <action id="before" name="Before"/>
+            <action id="after" name="After"/>
           </action>
-          <action id="insert_column" _name="Insert Column" stock="list-add">
-            <action id="before" _name="Before"/>
-            <action id="after" _name="After"/>
+          <action id="insert_column" name="Insert Column" stock="list-add">
+            <action id="before" name="Before"/>
+            <action id="after" name="After"/>
           </action>
-          <action id="remove_row" _name="Remove Row" stock="list-remove"/>
-          <action id="remove_column" _name="Remove Column" stock="list-remove"/>
+          <action id="remove_row" name="Remove Row" stock="list-remove"/>
+          <action id="remove_column" name="Remove Column" stock="list-remove"/>
         </packing-actions>
         
         <properties>
@@ -2403,17 +2404,17 @@
           <property id="row-spacing" custom-layout="True"/>
           <property id="column-spacing" custom-layout="True"/>
           <property id="baseline-row" since="3.10" custom-layout="True"/>
-          <property id="n-rows" _name="Rows" default="3" query="True" needs-sync="True" save="False" 
custom-layout="True">
+          <property id="n-rows" name="Rows" default="3" query="True" needs-sync="True" save="False" 
custom-layout="True">
             <parameter-spec>
               <type>GParamUInt</type>
             </parameter-spec>
-            <_tooltip>The number of rows for this grid</_tooltip>
+            <tooltip>The number of rows for this grid</tooltip>
           </property>
-          <property id="n-columns" _name="Columns" default="3" query="True" needs-sync="True" save="False" 
custom-layout="True">
+          <property id="n-columns" name="Columns" default="3" query="True" needs-sync="True" save="False" 
custom-layout="True">
             <parameter-spec>
               <type>GParamUInt</type>
             </parameter-spec>
-            <_tooltip>The number of columns for this grid</_tooltip>
+            <tooltip>The number of columns for this grid</tooltip>
           </property>
         </properties>
         
@@ -2422,8 +2423,8 @@
           <property id="top-attach" save-always="True" needs-sync="True"/>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkPaned" generic-name="paned" _title="Paned">
+
+      <glade-widget-class name="GtkPaned" generic-name="paned" title="Paned">
         <post-create-function>glade_gtk_paned_post_create</post-create-function>
         <add-child-function>glade_gtk_paned_add_child</add-child-function>
         <remove-child-function>glade_gtk_paned_remove_child</remove-child-function>
@@ -2435,9 +2436,9 @@
 
           <property id="wide-handle" since="3.16"/>
           <!--
-       Whether to add the child to the top/left or bottom/right pane.
-       This virtual property is used to remember child position in undo/redo.
-       -->
+             Whether to add the child to the top/left or bottom/right pane.
+             This virtual property is used to remember child position in undo/redo.
+          -->
           <property id="first" save="False" visible="False">
             <parameter-spec>
               <type>GParamBoolean</type>
@@ -2445,19 +2446,19 @@
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkHPaned" deprecated="True" generic-name="hpaned" _title="Horizontal Panes">
+
+      <glade-widget-class name="GtkHPaned" deprecated="True" generic-name="hpaned" title="Horizontal Panes">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      <glade-widget-class name="GtkVPaned" deprecated="True" generic-name="vpaned" _title="Vertical Panes">
+      <glade-widget-class name="GtkVPaned" deprecated="True" generic-name="vpaned" title="Vertical Panes">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkNotebook" generic-name="notebook" _title="Notebook">
+
+      <glade-widget-class name="GtkNotebook" generic-name="notebook" title="Notebook">
         <create-editable-function>glade_gtk_notebook_create_editable</create-editable-function>
         <post-create-function>glade_gtk_notebook_post_create</post-create-function>
         <add-child-function>glade_gtk_notebook_add_child</add-child-function>
@@ -2480,36 +2481,36 @@
         </signals>
         
         <packing-actions>
-          <action id="insert_page_before" _name="Insert Page Before" stock="list-add"/>
-          <action id="insert_page_after" _name="Insert Page After" stock="list-add"/>
-          <action id="remove_page" _name="Remove Page"  stock="list-remove"/>
+          <action id="insert_page_before" name="Insert Page Before" stock="list-add"/>
+          <action id="insert_page_after" name="Insert Page After" stock="list-add"/>
+          <action id="remove_page" name="Remove Page"  stock="list-remove"/>
         </packing-actions>
         
         <properties>
           <property id="group-name" since="2.24" custom-layout="True"/>
           <property id="page" save="False" custom-layout="True">
-            <_tooltip>Set the currently active page to edit, this property will not be saved</_tooltip>
+            <tooltip>Set the currently active page to edit, this property will not be saved</tooltip>
           </property>
           <property id="show-tabs" custom-layout="True"/>
           <property id="show-border" custom-layout="True"/>
           <property id="tab-pos" custom-layout="True"/>
           <property id="enable-popup" custom-layout="True"/>
           <property id="scrollable" custom-layout="True"/>
-          
-          <property id="pages" _name="Number of pages" visible="False" save="False" default="3" 
custom-layout="True">
+
+          <property id="pages" name="Number of pages" visible="False" save="False" default="3" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>1</min>
             </parameter-spec>
-            <_tooltip>The number of pages in the notebook</_tooltip>
+            <tooltip>The number of pages in the notebook</tooltip>
           </property>
 
-          <property id="has-action-start" _name="Start Action" visible="False" save="False" default="False" 
custom-layout="True">
+          <property id="has-action-start" name="Start Action" visible="False" save="False" default="False" 
custom-layout="True">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          <property id="has-action-end" _name="End Action" visible="False" save="False" default="False" 
custom-layout="True">
+          <property id="has-action-end" name="End Action" visible="False" save="False" default="False" 
custom-layout="True">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
@@ -2522,7 +2523,7 @@
         </packing-properties>
       </glade-widget-class>
 
-    <glade-widget-class name="GtkHeaderBar" generic-name="headerbar" _title="HeaderBar" since="3.10">
+    <glade-widget-class name="GtkHeaderBar" generic-name="headerbar" title="HeaderBar" since="3.10">
       <post-create-function>glade_gtk_header_bar_post_create</post-create-function>
       <get-children-function>glade_gtk_header_bar_get_children</get-children-function>
       <add-child-function>glade_gtk_header_bar_add_child</add-child-function>
@@ -2538,41 +2539,41 @@
       <create-editable-function>glade_gtk_header_bar_create_editable</create-editable-function>
       <special-child-type>type</special-child-type>
       <properties>
-       <property id="title" custom-layout="True" translatable="True"/>
-       <property id="subtitle" custom-layout="True" translatable="True"/>
-       <property id="has-subtitle" _name="Reserve space for subtitle" custom-layout="True">
-          <_tooltip>Keep the headerbar height the same as the subtitle changes dynamically.</_tooltip>
+        <property id="title" custom-layout="True" translatable="True"/>
+        <property id="subtitle" custom-layout="True" translatable="True"/>
+        <property id="has-subtitle" name="Reserve space for subtitle" custom-layout="True">
+          <tooltip>Keep the headerbar height the same as the subtitle changes dynamically.</tooltip>
         </property>
-       <property id="show-close-button" custom-layout="True" needs-sync="True"/>
-       <property id="spacing" custom-layout="True"/>
-       <property id="decoration-layout" custom-layout="True"/>
+        <property id="show-close-button" custom-layout="True" needs-sync="True"/>
+        <property id="spacing" custom-layout="True"/>
+        <property id="decoration-layout" custom-layout="True"/>
         <property id="decoration-layout-set" disabled="True"/>
         <property id="custom-title" disabled="True"/>
-        <property id="use-custom-title" _name="Custom Title" default="FALSE" visible="True" save="False" 
custom-layout="True">
+        <property id="use-custom-title" name="Custom Title" default="FALSE" visible="True" save="False" 
custom-layout="True">
           <parameter-spec>
             <type>GParamBoolean</type>
           </parameter-spec>
         </property>
-        <property visible="True" save="False" id="size" default="1" _name="Number of items" 
custom-layout="True">
+        <property visible="True" save="False" id="size" default="1" name="Number of items" 
custom-layout="True">
           <parameter-spec>
             <type>GParamInt</type>
             <min>0</min>
           </parameter-spec>
-            <_tooltip>The number of items in the header bar</_tooltip>
+            <tooltip>The number of items in the header bar</tooltip>
         </property>
       </properties>
       <packing-properties>
          <property id="pack-type" transfer-on-paste="True" />
       </packing-properties>
       <packing-actions>
-        <action id="remove_slot" _name="Remove Slot" stock="gtk-remove"/>
+        <action id="remove_slot" name="Remove Slot" stock="gtk-remove"/>
       </packing-actions>
       <actions>
-        <action id="add_slot" _name="Add Slot" stock="gtk-add"/>
+        <action id="add_slot" name="Add Slot" stock="gtk-add"/>
       </actions>
     </glade-widget-class>
-      
-      <glade-widget-class name="GtkStack" generic-name="stack" _title="Stack" since="3.10">
+
+      <glade-widget-class name="GtkStack" generic-name="stack" title="Stack" since="3.10">
         <create-editable-function>glade_gtk_stack_create_editable</create-editable-function>
         <post-create-function>glade_gtk_stack_post_create</post-create-function>
         <add-child-function>glade_gtk_stack_add_child</add-child-function>
@@ -2584,52 +2585,52 @@
         <child-set-property-function>glade_gtk_stack_set_child_property</child-set-property-function>
         <verify-function>glade_gtk_stack_verify_property</verify-function>
         <packing-actions>
-          <action id="insert_page_before" _name="Insert Page Before" stock="list-add"/>
-          <action id="insert_page_after" _name="Insert Page After" stock="list-add"/>
-          <action id="remove_page" _name="Remove Page"  stock="list-remove"/>
+          <action id="insert_page_before" name="Insert Page Before" stock="list-add"/>
+          <action id="insert_page_after" name="Insert Page After" stock="list-add"/>
+          <action id="remove_page" name="Remove Page"  stock="list-remove"/>
         </packing-actions>
         <properties>
-          <property id="pages" _name="Number of pages" save="False" default="1" custom-layout="True">
+          <property id="pages" name="Number of pages" save="False" default="1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>1</min>
             </parameter-spec>
-            <_tooltip>The number of pages in the stack</_tooltip>
+            <tooltip>The number of pages in the stack</tooltip>
           </property>
-          <property id="page" _name="Edit page" save="False" default="0" custom-layout="True">
+          <property id="page" name="Edit page" save="False" default="0" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>0</min>
             </parameter-spec>
-            <_tooltip>Set the currently active page to edit, this property will not be saved</_tooltip>
+            <tooltip>Set the currently active page to edit, this property will not be saved</tooltip>
           </property>
           <property id="visible-child" save="False" disabled="True"/>
-          <property id="visible-child-name" _name="Visible child" save="False" custom-layout="True"/>
+          <property id="visible-child-name" name="Visible child" save="False" custom-layout="True"/>
           <property id="homogeneous" save="False" disabled="True"/>
-          <property id="hhomogeneous" _name="Horizontal" custom-layout="True"/>
-          <property id="vhomogeneous" _name="Vertical" custom-layout="True"/>
+          <property id="hhomogeneous" name="Horizontal" custom-layout="True"/>
+          <property id="vhomogeneous" name="Vertical" custom-layout="True"/>
           <property id="transition-type" custom-layout="True">
             <displayable-values>
-              <value id="GTK_STACK_TRANSITION_TYPE_NONE"             _name="None" />
-              <value id="GTK_STACK_TRANSITION_TYPE_CROSSFADE"         _name="Crossfade" />
-              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT"       _name="Slide Right" />
-              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT"        _name="Slide Left" />
-              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_UP"          _name="Slide Up" />
-              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN"        _name="Slide Down" />
-              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT"  _name="Slide Left-Right" />
-              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN"     _name="Slide Up-Down" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_UP"           _name="Move Over Up" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_DOWN"         _name="Move Over Down" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_LEFT"         _name="Move Over Left" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_RIGHT"        _name="Move Over Right" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_UP_DOWN"      _name="Move Over Up-Down" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_DOWN_UP"      _name="Move Over Down-Up" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_LEFT_RIGHT"   _name="Move Over Left-Right" />
-              <value id="GTK_STACK_TRANSITION_TYPE_OVER_RIGHT_LEFT"   _name="Move Over Right-Left" />
-              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_UP"          _name="Move Under Up" />
-              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_DOWN"        _name="Move Under Down" />
-              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_LEFT"        _name="Move Under Left" />
-              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_RIGHT"       _name="Move Under Right" />
+              <value id="GTK_STACK_TRANSITION_TYPE_NONE"              name="None" />
+              <value id="GTK_STACK_TRANSITION_TYPE_CROSSFADE"         name="Crossfade" />
+              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT"       name="Slide Right" />
+              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT"        name="Slide Left" />
+              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_UP"          name="Slide Up" />
+              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN"        name="Slide Down" />
+              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT"  name="Slide Left-Right" />
+              <value id="GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN"     name="Slide Up-Down" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_UP"           name="Move Over Up" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_DOWN"         name="Move Over Down" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_LEFT"         name="Move Over Left" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_RIGHT"        name="Move Over Right" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_UP_DOWN"      name="Move Over Up-Down" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_DOWN_UP"      name="Move Over Down-Up" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_LEFT_RIGHT"   name="Move Over Left-Right" />
+              <value id="GTK_STACK_TRANSITION_TYPE_OVER_RIGHT_LEFT"   name="Move Over Right-Left" />
+              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_UP"          name="Move Under Up" />
+              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_DOWN"        name="Move Under Down" />
+              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_LEFT"        name="Move Under Left" />
+              <value id="GTK_STACK_TRANSITION_TYPE_UNDER_RIGHT"       name="Move Under Right" />
             </displayable-values>
           </property>
           <property id="transition-duration" custom-layout="True"/>
@@ -2639,7 +2640,7 @@
         </packing-properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkStackSwitcher" generic-name="stackswitcher" _title="Stack Switcher" 
since="3.10">
+      <glade-widget-class name="GtkStackSwitcher" generic-name="stackswitcher" title="Stack Switcher" 
since="3.10">
         <create-editable-function>glade_gtk_stack_switcher_create_editable</create-editable-function>
 
         <properties>
@@ -2655,35 +2656,34 @@
 
       </glade-widget-class>
 
-      <glade-widget-class name="GtkStackSidebar" generic-name="stacksidebar" _title="Stack Sidebar" 
since="3.16"/>
+      <glade-widget-class name="GtkStackSidebar" generic-name="stacksidebar" title="Stack Sidebar" 
since="3.16"/>
 
-      <glade-widget-class name="GtkRevealer" generic-name="revealer" _title="Revealer" since="3.10">
+      <glade-widget-class name="GtkRevealer" generic-name="revealer" title="Revealer" since="3.10">
         <post-create-function>glade_gtk_revealer_post_create</post-create-function>
         <properties>
           <property id="reveal-child" default="True" ignore="True"/>
           <property id="transition-type" default="GTK_REVEALER_TRANSITION_TYPE_NONE">
             <displayable-values>
               <!-- GtkRevealerTransitionType enumeration value -->
-              <value id="GTK_REVEALER_TRANSITION_TYPE_NONE"    _name="None" />
+              <value id="GTK_REVEALER_TRANSITION_TYPE_NONE"        name="None" />
               <!-- GtkRevealerTransitionType enumeration value -->
-              <value id="GTK_REVEALER_TRANSITION_TYPE_CROSSFADE"   _name="Crossfade" />
+              <value id="GTK_REVEALER_TRANSITION_TYPE_CROSSFADE"   name="Crossfade" />
               <!-- GtkRevealerTransitionType enumeration value -->
-              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT" _name="Slide Right" />
+              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT" name="Slide Right" />
               <!-- GtkRevealerTransitionType enumeration value -->
-              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT"  _name="Slide Left" />
+              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT"  name="Slide Left" />
               <!-- GtkRevealerTransitionType enumeration value -->
-              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP"    _name="Slide Up" />
+              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP"    name="Slide Up" />
               <!-- GtkRevealerTransitionType enumeration value -->
-              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN"  _name="Slide Down" />
+              <value id="GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN"  name="Slide Down" />
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      
-      <glade-widget-class name="GtkAlignment" generic-name="alignment" _title="Alignment"/>
-      
-      <glade-widget-class name="GtkFrame" generic-name="frame" _title="Frame">
+
+      <glade-widget-class name="GtkAlignment" generic-name="alignment" title="Alignment"/>
+
+      <glade-widget-class name="GtkFrame" generic-name="frame" title="Frame">
         <post-create-function>glade_gtk_frame_post_create</post-create-function>
         <add-child-function>glade_gtk_frame_add_child</add-child-function>
         <remove-child-function>glade_gtk_frame_remove_child</remove-child-function>
@@ -2699,10 +2699,10 @@
           <property id="shadow-type" default="GTK_SHADOW_NONE"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkAspectFrame" generic-name="aspectframe" _title="Aspect Frame"/>
-      
-      <glade-widget-class name="GtkListBox" generic-name="listbox" _title="List Box" 
use-placeholders="False" since="3.10">
+
+      <glade-widget-class name="GtkAspectFrame" generic-name="aspectframe" title="Aspect Frame"/>
+
+      <glade-widget-class name="GtkListBox" generic-name="listbox" title="List Box" use-placeholders="False" 
since="3.10">
         
         <action-activate-function>glade_gtk_listbox_action_activate</action-activate-function>
         
<child-action-activate-function>glade_gtk_listbox_child_action_activate</child-action-activate-function>
@@ -2716,12 +2716,12 @@
         <child-get-property-function>glade_gtk_listbox_get_child_property</child-get-property-function>
         
         <actions>
-          <action id="add_row" _name="Add Row" stock="list-add" important="True"/>
+          <action id="add_row" name="Add Row" stock="list-add" important="True"/>
         </actions>
         
         <packing-actions>
-          <action id="insert_before" _name="Insert Before" stock="list-add"/>
-          <action id="insert_after" _name="Insert After" stock="list-add"/>
+          <action id="insert_before" name="Insert Before" stock="list-add"/>
+          <action id="insert_after" name="Insert After" stock="list-add"/>
         </packing-actions>
         
         <properties>
@@ -2729,24 +2729,24 @@
           <property id="selection-mode">
             <displayable-values>
               <!-- GtkSelectionMode enumeration value -->
-              <value id="GTK_SELECTION_NONE" _name="None"/>
+              <value id="GTK_SELECTION_NONE" name="None"/>
               <!-- GtkSelectionMode enumeration value -->
-              <value id="GTK_SELECTION_SINGLE" _name="Single"/>
+              <value id="GTK_SELECTION_SINGLE" name="Single"/>
               <!-- GtkSelectionMode enumeration value -->
-              <value id="GTK_SELECTION_BROWSE" _name="Browse"/>
+              <value id="GTK_SELECTION_BROWSE" name="Browse"/>
               <!-- GtkSelectionMode enumeration value -->
-              <value id="GTK_SELECTION_MULTIPLE" _name="Multiple"/>
+              <value id="GTK_SELECTION_MULTIPLE" name="Multiple"/>
             </displayable-values>
           </property>
         </properties>
         
         <packing-properties>
-          <property id="position" _name="Position" default="0" save="False">
+          <property id="position" name="Position" default="0" save="False">
             <parameter-spec>
               <type>GParamInt</type>
               <min>0</min>
             </parameter-spec>
-            <_tooltip>The position of the row item in the listbox</_tooltip>
+            <tooltip>The position of the row item in the listbox</tooltip>
           </property>
         </packing-properties>
         
@@ -2756,15 +2756,15 @@
           <signal id="selected-rows-changed" since="3.14"/>
         </signals>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkListBoxRow" generic-name="listboxrow" _title="List Box Row" since="3.10">
+
+      <glade-widget-class name="GtkListBoxRow" generic-name="listboxrow" title="List Box Row" since="3.10">
         <properties>
           <property id="activatable" since="3.14"/>
           <property id="selectable" since="3.14"/>
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkFlowBox" generic-name="flowbox" _title="Flow Box" 
use-placeholders="False" since="3.12">
+      <glade-widget-class name="GtkFlowBox" generic-name="flowbox" title="Flow Box" use-placeholders="False" 
since="3.12">
         
         <action-activate-function>glade_gtk_flowbox_action_activate</action-activate-function>
         
<child-action-activate-function>glade_gtk_flowbox_child_action_activate</child-action-activate-function>
@@ -2778,12 +2778,12 @@
         <child-get-property-function>glade_gtk_flowbox_get_child_property</child-get-property-function>
         
         <actions>
-          <action id="add_child" _name="Add Child" stock="list-add" important="True"/>
+          <action id="add_child" name="Add Child" stock="list-add" important="True"/>
         </actions>
         
         <packing-actions>
-          <action id="insert_before" _name="Insert Before" stock="list-add"/>
-          <action id="insert_after" _name="Insert After" stock="list-add"/>
+          <action id="insert_before" name="Insert Before" stock="list-add"/>
+          <action id="insert_after" name="Insert After" stock="list-add"/>
         </packing-actions>
         
         <properties>
@@ -2791,20 +2791,20 @@
         </properties>
         
         <packing-properties>
-          <property id="position" _name="Position" default="0" save="False">
+          <property id="position" name="Position" default="0" save="False">
             <parameter-spec>
               <type>GParamInt</type>
               <min>0</min>
             </parameter-spec>
-            <_tooltip>The position of the child in the flowbox</_tooltip>
+            <tooltip>The position of the child in the flowbox</tooltip>
           </property>
         </packing-properties>
         
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFlowBoxChild" generic-name="flowboxchild" _title="Flow Box Child" 
since="3.12"/>
-      
-      <glade-widget-class name="GtkRange" _title="Range">
+
+      <glade-widget-class name="GtkFlowBoxChild" generic-name="flowboxchild" title="Flow Box Child" 
since="3.12"/>
+
+      <glade-widget-class name="GtkRange" title="Range">
         <properties>
           <property id="fill-level" since="2.12"/>
           <property id="restrict-to-fill-level" since="2.12"/>
@@ -2813,29 +2813,29 @@
           <property id="update-policy">
             <displayable-values>
               <!-- GtkUpdateType enumeration value -->
-              <value id="GTK_UPDATE_CONTINUOUS" _name="Continuous"/>
+              <value id="GTK_UPDATE_CONTINUOUS" name="Continuous"/>
               <!-- GtkUpdateType enumeration value -->
-              <value id="GTK_UPDATE_DISCONTINUOUS" _name="Discontinuous"/>
+              <value id="GTK_UPDATE_DISCONTINUOUS" name="Discontinuous"/>
               <!-- GtkUpdateType enumeration value -->
-              <value id="GTK_UPDATE_DELAYED" _name="Delayed"/>
+              <value id="GTK_UPDATE_DELAYED" name="Delayed"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkScale" generic-name="scale" _title="Scale">
+
+      <glade-widget-class name="GtkScale" generic-name="scale" title="Scale">
         <create-editable-function>glade_gtk_scale_create_editable</create-editable-function>
         <set-property-function>glade_gtk_scale_set_property</set-property-function>
         <properties>
           <property id="orientation" default="GTK_ORIENTATION_VERTICAL" custom-layout="True"/>
           <property id="adjustment" custom-layout="True"/>
           <property id="round-digits" custom-layout="True">
-            <_tooltip>The number of digits to round the value to when the value changes</_tooltip>
+            <tooltip>The number of digits to round the value to when the value changes</tooltip>
           </property>
           <property id="lower-stepper-sensitivity" custom-layout="True"/>
           <property id="upper-stepper-sensitivity" custom-layout="True"/>
           <property id="has-origin" custom-layout="True">
-            <_tooltip>Whether to highlight the area of the trough from the bottom or left leading up to the 
knob</_tooltip>
+            <tooltip>Whether to highlight the area of the trough from the bottom or left leading up to the 
knob</tooltip>
           </property>
           <property id="inverted" custom-layout="True"/>
           <property id="draw-value" custom-layout="True" needs-sync="True"/>
@@ -2847,32 +2847,32 @@
           
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkHScale" deprecated="True" generic-name="hscale" _title="Horizontal Scale">
+
+      <glade-widget-class name="GtkHScale" deprecated="True" generic-name="hscale" title="Horizontal Scale">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      <glade-widget-class name="GtkVScale" deprecated="True" generic-name="vscale" _title="Vertical Scale">
+      <glade-widget-class name="GtkVScale" deprecated="True" generic-name="vscale" title="Vertical Scale">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCalendar" generic-name="calendar" _title="Calendar">
+
+      <glade-widget-class name="GtkCalendar" generic-name="calendar" title="Calendar">
         <properties>
           <property id="detail-height-rows" since="2.14"/>
           <property id="detail-width-chars" since="2.14"/>
           <property id="show-details" since="2.14"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkMenu" generic-name="menu" _title="Popup Menu" toplevel="True">
+
+      <glade-widget-class name="GtkMenu" generic-name="menu" title="Popup Menu" toplevel="True">
         <constructor-function>glade_gtk_menu_constructor</constructor-function>
         <!-- We do not want glade_gtk_container_post_create be executed -->
         <post-create-function>empty</post-create-function>
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         <properties>
           <property id="accel-group" since="2.14"/>
@@ -2886,18 +2886,18 @@
         
       </glade-widget-class>
       
-      <glade-widget-class name="GtkRecentChooserMenu" generic-name="recentchoosermenu" 
-                       _title="Recent Chooser Menu" toplevel="True">
+      <glade-widget-class name="GtkRecentChooserMenu" generic-name="recentchoosermenu"
+                          title="Recent Chooser Menu" toplevel="True">
         
         <create-editable-function>glade_gtk_recent_chooser_menu_create_editable</create-editable-function>
         <set-property-function>glade_gtk_recent_chooser_menu_set_property</set-property-function>
         <properties>
           
           <!-- GtkActivatable -->
-          <property id="related-action" _name="Related Action" custom-layout="True" since="2.16" 
save="False" needs-sync="True"
-                 optional="True" optional-default="False" deprecated="True"/>
-          <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
-                 since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
+          <property id="related-action" name="Related Action" custom-layout="True" since="2.16" save="False" 
needs-sync="True"
+                    optional="True" optional-default="False" deprecated="True"/>
+          <property id="use-action-appearance" name="Use Action Appearance" custom-layout="True" 
save="False" needs-sync="True"
+                    since="2.16" default="False" optional="True" optional-default="False" deprecated="True"/>
           
           <!-- Claim the GladeRecentChooserEditor properties  -->
           <property id="recent-manager" custom-layout="True"/>
@@ -2913,14 +2913,14 @@
           <property id="show-numbers" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkScrollbar" generic-name="scrollbar" _title="Scrollbar">
+
+      <glade-widget-class name="GtkScrollbar" generic-name="scrollbar" title="Scrollbar">
         <create-editable-function>glade_gtk_scrollbar_create_editable</create-editable-function>
         <properties>
           <property id="orientation" default="GTK_ORIENTATION_VERTICAL" custom-layout="True"/>
           <property id="adjustment" custom-layout="True"/>
           <property id="round-digits" custom-layout="True">
-            <_tooltip>The number of digits to round the value to when the value changes</_tooltip>
+            <tooltip>The number of digits to round the value to when the value changes</tooltip>
           </property>
           <property id="lower-stepper-sensitivity" custom-layout="True"/>
           <property id="upper-stepper-sensitivity" custom-layout="True"/>
@@ -2930,60 +2930,60 @@
           <property id="fill-level" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkHScrollbar" deprecated="True" generic-name="hscrollbar" 
_title="Horizontal Scrollbar">
+
+      <glade-widget-class name="GtkHScrollbar" deprecated="True" generic-name="hscrollbar" title="Horizontal 
Scrollbar">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      <glade-widget-class name="GtkVScrollbar" deprecated="True" generic-name="vscrollbar" _title="Vertical 
Scrollbar">
+      <glade-widget-class name="GtkVScrollbar" deprecated="True" generic-name="vscrollbar" title="Vertical 
Scrollbar">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkButtonBox" generic-name="buttonbox" _title="Button Box">
+
+      <glade-widget-class name="GtkButtonBox" generic-name="buttonbox" title="Button Box">
         <properties>
           <property id="layout-style" default="GTK_BUTTONBOX_START">
             <displayable-values>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_DEFAULT_STYLE" _name="Default"/>
+              <value id="GTK_BUTTONBOX_DEFAULT_STYLE" name="Default"/>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_SPREAD" _name="Spread"/>
+              <value id="GTK_BUTTONBOX_SPREAD" name="Spread"/>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_EDGE" _name="Edge"/>
+              <value id="GTK_BUTTONBOX_EDGE" name="Edge"/>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_START" _name="Start"/>
+              <value id="GTK_BUTTONBOX_START" name="Start"/>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_END" _name="End"/>
+              <value id="GTK_BUTTONBOX_END" name="End"/>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_CENTER" _name="Center"/>
+              <value id="GTK_BUTTONBOX_CENTER" name="Center"/>
               <!-- GtkButtonBoxStyle enumeration value -->
-              <value id="GTK_BUTTONBOX_EXPAND" _name="Expand" since="3.12"/>
+              <value id="GTK_BUTTONBOX_EXPAND" name="Expand" since="3.12"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkHButtonBox" deprecated="True" generic-name="hbuttonbox" 
_title="Horizontal Button Box">
+
+      <glade-widget-class name="GtkHButtonBox" deprecated="True" generic-name="hbuttonbox" title="Horizontal 
Button Box">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      <glade-widget-class name="GtkVButtonBox" deprecated="True" generic-name="vbuttonbox" _title="Vertical 
Button Box">
+      <glade-widget-class name="GtkVButtonBox" deprecated="True" generic-name="vbuttonbox" title="Vertical 
Button Box">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSeparator" generic-name="separator" _title="Separator">
+
+      <glade-widget-class name="GtkSeparator" generic-name="separator" title="Separator">
         <packing-defaults>
           <parent-class name="GtkBox">
             <child-property id="expand" default="false"/>
           </parent-class>
         </packing-defaults>
       </glade-widget-class>
-      <glade-widget-class name="GtkHSeparator" deprecated="True" generic-name="hseparator" 
_title="Horizontal Separator">
+      <glade-widget-class name="GtkHSeparator" deprecated="True" generic-name="hseparator" title="Horizontal 
Separator">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
@@ -2993,7 +2993,7 @@
           </parent-class>
         </packing-defaults>
       </glade-widget-class>
-      <glade-widget-class name="GtkVSeparator" deprecated="True" generic-name="vseparator" _title="Vertical 
Separator">
+      <glade-widget-class name="GtkVSeparator" deprecated="True" generic-name="vseparator" title="Vertical 
Separator">
         <properties>
           <property id="orientation" disabled="True"/>
         </properties>
@@ -3003,8 +3003,8 @@
           </parent-class>
         </packing-defaults>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkStatusbar" generic-name="statusbar" _title="Status Bar">
+
+      <glade-widget-class name="GtkStatusbar" generic-name="statusbar" title="Status Bar">
         <property id="orientation" default="GTK_ORIENTATION_HORIZONTAL" needs-sync="True"/>
         <properties>
           <property id="size" default="1" query="False"/>
@@ -3015,24 +3015,24 @@
           </parent-class>
         </packing-defaults>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkAccelLabel" generic-name="accellabel" _title="Accel Label"/>
-      
-      <glade-widget-class name="GtkArrow" generic-name="arrow" _title="Arrow">
+
+      <glade-widget-class name="GtkAccelLabel" generic-name="accellabel" title="Accel Label"/>
+
+      <glade-widget-class name="GtkArrow" generic-name="arrow" title="Arrow">
         <create-editable-function>glade_gtk_arrow_create_editable</create-editable-function>
         <properties>
           <property id="arrow-type">
             <displayable-values>
               <!-- GtkArrowType enumeration value -->
-              <value id="GTK_ARROW_UP" _name="Up"/>
+              <value id="GTK_ARROW_UP" name="Up"/>
               <!-- GtkArrowType enumeration value -->
-              <value id="GTK_ARROW_DOWN" _name="Down"/>
+              <value id="GTK_ARROW_DOWN" name="Down"/>
               <!-- GtkArrowType enumeration value -->
-              <value id="GTK_ARROW_LEFT" _name="Left"/>
+              <value id="GTK_ARROW_LEFT" name="Left"/>
               <!-- GtkArrowType enumeration value -->
-              <value id="GTK_ARROW_RIGHT" _name="Right"/>
+              <value id="GTK_ARROW_RIGHT" name="Right"/>
               <!-- GtkArrowType enumeration value -->
-              <value id="GTK_ARROW_NONE" _name="None"/>
+              <value id="GTK_ARROW_NONE" name="None"/>
             </displayable-values>
           </property>
 
@@ -3045,7 +3045,7 @@
       </glade-widget-class>
       
       <!-- Declare menu button here because the arrow-type values already exist -->
-      <glade-widget-class name="GtkMenuButton" generic-name="menubutton" _title="Menu Button" since="3.6">
+      <glade-widget-class name="GtkMenuButton" generic-name="menubutton" title="Menu Button" since="3.6">
         <properties>
           <property id="label" default=""/>
           <property id="custom-child" default="True"/>
@@ -3057,7 +3057,7 @@
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkLockButton" generic-name="lockbutton" _title="Lock Button" since="3.2">
+      <glade-widget-class name="GtkLockButton" generic-name="lockbutton" title="Lock Button" since="3.2">
         <properties>
           <property id="permission" disabled="True"/>
           <property id="text-lock" translatable="True"/>
@@ -3088,11 +3088,11 @@
           
           <!-- GtkActionable -->
           <property id="action-name" disabled="True"/>
-          <property id="action-target" _name="Action Target" custom-layout="True" since="3.4"/>
+          <property id="action-target" name="Action Target" custom-layout="True" since="3.4"/>
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkLayout" generic-name="layout" _title="Layout" use-placeholders="False">
+      <glade-widget-class name="GtkLayout" generic-name="layout" title="Layout" use-placeholders="False">
         <create-editable-function>glade_gtk_layout_create_editable</create-editable-function>
         <create-widget-function>glade_gtk_create_fixed_widget</create-widget-function>
         <post-create-function>glade_gtk_fixed_layout_post_create</post-create-function>
@@ -3104,26 +3104,26 @@
           <property id="hadjustment" custom-layout="True"/>
           <property id="vadjustment" custom-layout="True"/>
           <property id="hscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural width</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural width</tooltip>
           </property>
           <property id="vscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural height</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural height</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFixed" generic-name="fixed" _title="Fixed" use-placeholders="False">
+
+      <glade-widget-class name="GtkFixed" generic-name="fixed" title="Fixed" use-placeholders="False">
         <create-widget-function>glade_gtk_create_fixed_widget</create-widget-function>
         <post-create-function>glade_gtk_fixed_layout_post_create</post-create-function>
         <add-child-function>glade_gtk_fixed_layout_add_child</add-child-function>
         <remove-child-function>glade_gtk_fixed_layout_remove_child</remove-child-function> 
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkDrawingArea" generic-name="drawingarea" _title="Drawing Area"/>
 
-      <glade-widget-class name="GtkGLArea" generic-name="glarea" _title="OpenGL Area"/>
+      <glade-widget-class name="GtkDrawingArea" generic-name="drawingarea" title="Drawing Area"/>
 
-      <glade-widget-class name="GtkInfoBar" generic-name="infobar" _title="Info Bar">
+      <glade-widget-class name="GtkGLArea" generic-name="glarea" title="OpenGL Area"/>
+
+      <glade-widget-class name="GtkInfoBar" generic-name="infobar" title="Info Bar">
         <read-child-function>glade_gtk_info_bar_read_child</read-child-function>
         <write-child-function>glade_gtk_info_bar_write_child</write-child-function>
         <internal-children>
@@ -3134,15 +3134,15 @@
           <property id="message-type">
             <displayable-values>
               <!-- GtkMessageType enumeration value -->
-              <value id="GTK_MESSAGE_INFO" _name="Info"/>
+              <value id="GTK_MESSAGE_INFO" name="Info"/>
               <!-- GtkMessageType enumeration value -->
-              <value id="GTK_MESSAGE_WARNING" _name="Warning"/>
+              <value id="GTK_MESSAGE_WARNING" name="Warning"/>
               <!-- GtkMessageType enumeration value -->
-              <value id="GTK_MESSAGE_QUESTION" _name="Question"/>
+              <value id="GTK_MESSAGE_QUESTION" name="Question"/>
               <!-- GtkMessageType enumeration value -->
-              <value id="GTK_MESSAGE_ERROR" _name="Error"/>
+              <value id="GTK_MESSAGE_ERROR" name="Error"/>
               <!-- GtkMessageType enumeration value -->
-              <value id="GTK_MESSAGE_OTHER" _name="Other"/>
+              <value id="GTK_MESSAGE_OTHER" name="Other"/>
             </displayable-values>
           </property>
           
@@ -3151,10 +3151,10 @@
           <property id="size" query="False" default="2"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkEventBox" generic-name="eventbox" _title="Event Box"/>
-      
-      <glade-widget-class name="GtkExpander" generic-name="expander" _title="Expander">
+
+      <glade-widget-class name="GtkEventBox" generic-name="eventbox" title="Event Box"/>
+
+      <glade-widget-class name="GtkExpander" generic-name="expander" title="Expander">
         <post-create-function>glade_gtk_expander_post_create</post-create-function>
         <add-child-function>glade_gtk_expander_add_child</add-child-function>
         <remove-child-function>glade_gtk_expander_remove_child</remove-child-function>
@@ -3170,32 +3170,32 @@
           <property id="resize-toplevel" since="3.2"/>
           
           <!-- Atk activate property -->
-          <property id="atk-activate" _name="Activate" ignore="True" atk-property="True" save="False" 
-                 multiline="True">
+          <property id="atk-activate" name="Activate" ignore="True" atk-property="True" save="False"
+                    multiline="True">
             <parameter-spec>
               <type>GParamString</type>
             </parameter-spec>
-            <_tooltip>Set the description of the Activate atk action</_tooltip>
+            <tooltip>Set the description of the Activate atk action</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkViewport" generic-name="viewport" _title="Viewport">
+
+      <glade-widget-class name="GtkViewport" generic-name="viewport" title="Viewport">
         <create-editable-function>glade_gtk_viewport_create_editable</create-editable-function>
         <properties>
           <!-- Scrollable attributes -->
           <property id="hadjustment" custom-layout="True"/>
           <property id="vadjustment" custom-layout="True"/>
           <property id="hscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural width</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural width</tooltip>
           </property>
           <property id="vscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural height</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural height</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkScrolledWindow" generic-name="scrolledwindow" _title="Scrolled Window">
+
+      <glade-widget-class name="GtkScrolledWindow" generic-name="scrolledwindow" title="Scrolled Window">
         <create-editable-function>glade_gtk_scrolled_window_create_editable</create-editable-function>
         <set-property-function>glade_gtk_scrolled_window_set_property</set-property-function>
         <add-child-verify-function>glade_gtk_scrolled_window_add_child_verify</add-child-verify-function>
@@ -3210,31 +3210,31 @@
           <property id="hscrollbar-policy" default="GTK_POLICY_AUTOMATIC" custom-layout="True">
             <displayable-values>
               <!-- GtkPolicyType enumeration value -->
-              <value id="GTK_POLICY_ALWAYS" _name="Always"/>
+              <value id="GTK_POLICY_ALWAYS" name="Always"/>
               <!-- GtkPolicyType enumeration value -->
-              <value id="GTK_POLICY_AUTOMATIC" _name="Automatic"/>
+              <value id="GTK_POLICY_AUTOMATIC" name="Automatic"/>
               <!-- GtkPolicyType enumeration value -->
-              <value id="GTK_POLICY_NEVER" _name="Never"/>
+              <value id="GTK_POLICY_NEVER" name="Never"/>
               <!-- GtkPolicyType enumeration value -->
-              <value id="GTK_POLICY_EXTERNAL" _name="External"/>
+              <value id="GTK_POLICY_EXTERNAL" name="External"/>
             </displayable-values>
           </property>
           <property id="vscrollbar-policy" default="GTK_POLICY_AUTOMATIC" custom-layout="True"/>
           <property id="window-placement" custom-layout="True">
             <displayable-values>
               <!-- GtkCornerType enumeration value -->
-              <value id="GTK_CORNER_TOP_LEFT" _name="Top Left"/>
+              <value id="GTK_CORNER_TOP_LEFT" name="Top Left"/>
               <!-- GtkCornerType enumeration value -->
-              <value id="GTK_CORNER_BOTTOM_LEFT" _name="Bottom Left"/>
+              <value id="GTK_CORNER_BOTTOM_LEFT" name="Bottom Left"/>
               <!-- GtkCornerType enumeration value -->
-              <value id="GTK_CORNER_TOP_RIGHT" _name="Top Right"/>
+              <value id="GTK_CORNER_TOP_RIGHT" name="Top Right"/>
               <!-- GtkCornerType enumeration value -->
-              <value id="GTK_CORNER_BOTTOM_RIGHT" _name="Bottom Right"/>
+              <value id="GTK_CORNER_BOTTOM_RIGHT" name="Bottom Right"/>
             </displayable-values>
           </property>
           <property id="overlay-scrolling" since="3.16" custom-layout="True">
-            <_tooltip>If overlay scrolling is enabled, scrollbars are only added as traditional widgets when 
a mouse is present</_tooltip>
-         </property>
+            <tooltip>If overlay scrolling is enabled, scrollbars are only added as traditional widgets when 
a mouse is present</tooltip>
+          </property>
         </properties>
          
         <signals>
@@ -3243,11 +3243,11 @@
       </glade-widget-class>
       
       <!-- NOT AVAILABLES ON WIN32
-    <glade-widget-class name="GtkPlug" generic-name="plug" _title="Plug"/>
-    <glade-widget-class name="GtkSocket" generic-name="socket" _title="Socket"/>
+    <glade-widget-class name="GtkPlug" generic-name="plug" title="Plug"/>
+    <glade-widget-class name="GtkSocket" generic-name="socket" title="Socket"/>
     -->
-      
-      <glade-widget-class name="GtkAboutDialog" generic-name="aboutdialog" _title="About Dialog">
+
+      <glade-widget-class name="GtkAboutDialog" generic-name="aboutdialog" title="About Dialog">
         
         <construct-object-function>glade_gtk_about_dialog_construct_object</construct-object-function>
         <read-widget-function>glade_gtk_about_dialog_read_widget</read-widget-function>
@@ -3271,31 +3271,31 @@
           <property id="license-type" since="3.0" custom-layout="True">
             <displayable-values>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_UNKNOWN" _name="Unknown"/>
+              <value id="GTK_LICENSE_UNKNOWN" name="Unknown"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_CUSTOM" _name="Custom"/>
+              <value id="GTK_LICENSE_CUSTOM" name="Custom"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_GPL_2_0" _name="GPL 2.0"/>
+              <value id="GTK_LICENSE_GPL_2_0" name="GPL 2.0"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_GPL_3_0" _name="GPL 3.0"/>
+              <value id="GTK_LICENSE_GPL_3_0" name="GPL 3.0"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_LGPL_2_1" _name="LGPL 2.1"/>
+              <value id="GTK_LICENSE_LGPL_2_1" name="LGPL 2.1"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_LGPL_3_0" _name="LGPL 3.0"/>
+              <value id="GTK_LICENSE_LGPL_3_0" name="LGPL 3.0"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_BSD" _name="BSD"/>
+              <value id="GTK_LICENSE_BSD" name="BSD"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_MIT_X11" _name="MIT X11"/>
+              <value id="GTK_LICENSE_MIT_X11" name="MIT X11"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_ARTISTIC" _name="Artistic"/>
+              <value id="GTK_LICENSE_ARTISTIC" name="Artistic"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_GPL_2_0_ONLY" _name="GPL 2.0 Only"/>
+              <value id="GTK_LICENSE_GPL_2_0_ONLY" name="GPL 2.0 Only"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_GPL_3_0_ONLY" _name="GPL 3.0 Only"/>
+              <value id="GTK_LICENSE_GPL_3_0_ONLY" name="GPL 3.0 Only"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_LGPL_2_1_ONLY" _name="LGPL 2.1 Only"/>
+              <value id="GTK_LICENSE_LGPL_2_1_ONLY" name="LGPL 2.1 Only"/>
               <!-- GtkLicense enumeration value -->
-              <value id="GTK_LICENSE_LGPL_3_0_ONLY" _name="LGPL 3.0 Only"/>
+              <value id="GTK_LICENSE_LGPL_3_0_ONLY" name="LGPL 3.0 Only"/>
             </displayable-values>
           </property>
           
@@ -3308,7 +3308,7 @@
           
           <!-- It is disputable whether this should really be translatable -->
           <property id="translator-credits" translatable="True" multiline="True" custom-layout="True">
-            <_tooltip>You can mark this as translatable and set one name/address if you want to show a 
translation specific translator, otherwise you should list all translators and unmark this string for 
translation</_tooltip>
+            <tooltip>You can mark this as translatable and set one name/address if you want to show a 
translation specific translator, otherwise you should list all translators and unmark this string for 
translation</tooltip>
           </property>
         </properties>
         <signals>
@@ -3317,7 +3317,7 @@
       </glade-widget-class>
       
       <glade-widget-class name="GtkColorSelectionDialog" generic-name="colorselectiondialog"
-                       deprecated="True" _title="Color Selection Dialog">
+                          deprecated="True" title="Color Selection Dialog">
         <internal-children>
           <object name="vbox">
             <object name="color_selection"/>
@@ -3329,8 +3329,8 @@
           </object>
         </internal-children>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFileChooserDialog" generic-name="filechooserdialog" _title="File Chooser 
Dialog">
+
+      <glade-widget-class name="GtkFileChooserDialog" generic-name="filechooserdialog" title="File Chooser 
Dialog">
         <properties>
           
           <!-- GtkFileChooser properties are custom-layout, handled in GladeFileChooserEditor -->
@@ -3351,8 +3351,8 @@
           <signal id="file-set" since="2.12"/>
         </signals>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFontSelectionDialog" deprecated="True" generic-name="fontselectiondialog" 
_title="Font Selection Dialog">
+
+      <glade-widget-class name="GtkFontSelectionDialog" deprecated="True" generic-name="fontselectiondialog" 
title="Font Selection Dialog">
         <internal-children>
           <object name="vbox">
             <object name="font_selection"/>
@@ -3365,16 +3365,16 @@
         </internal-children>
       </glade-widget-class>
       
-      <glade-widget-class name="GtkAppChooserDialog" generic-name="appchooserdialog" 
-                       _title="Application Chooser Dialog" since="3.0">
+      <glade-widget-class name="GtkAppChooserDialog" generic-name="appchooserdialog"
+                          title="Application Chooser Dialog" since="3.0">
         <properties>
           <property id="heading" translatable="True"/>
           <property id="gfile" disabled="True"/>
           <property id="content-type" ignore="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkMessageDialog" generic-name="messagedialog" _title="Message Dialog" 
default-width="400" default-height="115">
+
+      <glade-widget-class name="GtkMessageDialog" generic-name="messagedialog" title="Message Dialog" 
default-width="400" default-height="115">
         <set-property-function>glade_gtk_message_dialog_set_property</set-property-function>
         <get-property-function>glade_gtk_message_dialog_get_property</get-property-function>
         <verify-function>glade_gtk_message_dialog_verify_property</verify-function>
@@ -3392,23 +3392,23 @@
           <property id="buttons" custom-layout="True">
             <displayable-values>
               <!-- GtkButtonsType enumeration value -->
-              <value id="GTK_BUTTONS_NONE" _name="None"/>
+              <value id="GTK_BUTTONS_NONE" name="None"/>
               <!-- GtkButtonsType enumeration value -->
-              <value id="GTK_BUTTONS_OK" _name="Ok"/>
+              <value id="GTK_BUTTONS_OK" name="Ok"/>
               <!-- GtkButtonsType enumeration value -->
-              <value id="GTK_BUTTONS_CLOSE" _name="Close"/>
+              <value id="GTK_BUTTONS_CLOSE" name="Close"/>
               <!-- GtkButtonsType enumeration value -->
-              <value id="GTK_BUTTONS_CANCEL" _name="Cancel"/>
+              <value id="GTK_BUTTONS_CANCEL" name="Cancel"/>
               <!-- GtkButtonsType enumeration value -->
-              <value id="GTK_BUTTONS_YES_NO" _name="Yes, No"/>
+              <value id="GTK_BUTTONS_YES_NO" name="Yes, No"/>
               <!-- GtkButtonsType enumeration value -->
-              <value id="GTK_BUTTONS_OK_CANCEL" _name="Ok, Cancel"/>
+              <value id="GTK_BUTTONS_OK_CANCEL" name="Ok, Cancel"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkColorSelection" deprecated="True" generic-name="colorselection" 
_title="Color Selection">
+
+      <glade-widget-class name="GtkColorSelection" deprecated="True" generic-name="colorselection" 
title="Color Selection">
         <properties>
           <property id="current-color" default="Black" optional="True" optional-default="False"/>
           <property id="current-alpha" optional="True" optional-default="False"/>
@@ -3417,7 +3417,7 @@
       </glade-widget-class>
       
       <glade-widget-class name="GtkColorChooserWidget" generic-name="colorchooserwidget"
-                       _title="Color Chooser Widget" icon-name="widget-gtk-colorselection" since="3.4">
+                          title="Color Chooser Widget" icon-name="widget-gtk-colorselection" since="3.4">
         <properties>
           <!-- Disable GtkBox stuff -->
           <property id="size" disabled="True"/>
@@ -3430,9 +3430,9 @@
       </glade-widget-class>
 
       <glade-widget-class name="GtkColorChooserDialog" generic-name="colorchooserdialog"
-                       _title="Color Chooser Dialog" icon-name="widget-gtk-colorselectiondialog" 
since="3.4"/>
+                          title="Color Chooser Dialog" icon-name="widget-gtk-colorselectiondialog" 
since="3.4"/>
       <glade-widget-class name="GtkFontChooserWidget" generic-name="fontchooserwidget"
-                       _title="Font Chooser Widget" icon-name="widget-gtk-fontselection" since="3.2">
+                          title="Font Chooser Widget" icon-name="widget-gtk-fontselection" since="3.2">
         <create-editable-function>glade_gtk_font_chooser_widget_create_editable</create-editable-function>
         <properties>
           
@@ -3450,10 +3450,9 @@
           <property id="show-preview-entry" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-       
-      
+
       <glade-widget-class name="GtkFontChooserDialog" generic-name="fontchooserdialog"
-                       _title="Font Chooser Dialog" icon-name="widget-gtk-fontselectiondialog" since="3.2">
+                          title="Font Chooser Dialog" icon-name="widget-gtk-fontselectiondialog" since="3.2">
         <properties>
           <!-- Claim the GladeFontChooserEditor properties -->
           <property id="font" custom-layout="True"/>
@@ -3461,11 +3460,10 @@
           <property id="show-preview-entry" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-       
-      
-      <glade-widget-class name="GtkFontSelection" deprecated="True" generic-name="fontselection" 
_title="Font Selection"/>
-      
-      <glade-widget-class name="GtkAssistant" generic-name="assistant" _title="Assistant" since="2.10">
+
+      <glade-widget-class name="GtkFontSelection" deprecated="True" generic-name="fontselection" title="Font 
Selection"/>
+
+      <glade-widget-class name="GtkAssistant" generic-name="assistant" title="Assistant" since="2.10">
         <post-create-function>glade_gtk_assistant_post_create</post-create-function>
         <add-child-function>glade_gtk_assistant_add_child</add-child-function>
         <remove-child-function>glade_gtk_assistant_remove_child</remove-child-function>
@@ -3480,47 +3478,47 @@
           <object name="action_area"/>
         </internal-children>
         <properties>
-          <property save="False" id="n-pages" _name="Number of Pages">
+          <property save="False" id="n-pages" name="Number of Pages">
             <parameter-spec>
               <type>GParamInt</type>
               <min>0</min>
             </parameter-spec>
-            <_tooltip>Number of pages in this assistant</_tooltip>
+            <tooltip>Number of pages in this assistant</tooltip>
           </property>
         </properties>
         <packing-properties>
           <property id="title" translatable="True" since="2.10"/>
           <property id="header-image" since="2.10" deprecated="True"/>
           <property id="sidebar-image" since="2.10" deprecated="True"/>
-          <property id="complete" ignore="True" _name="Initially Complete">
-            <_tooltip>Whether this page will initially be marked as complete regardless of user 
input.</_tooltip>
+          <property id="complete" ignore="True" name="Initially Complete">
+            <tooltip>Whether this page will initially be marked as complete regardless of user 
input.</tooltip>
           </property>
           <property id="page-type" ignore="True">
             <displayable-values>
               <!-- GtkAssistantPageType enumeration value -->
-              <value id="GTK_ASSISTANT_PAGE_CONTENT" _name="Content"/>
+              <value id="GTK_ASSISTANT_PAGE_CONTENT" name="Content"/>
               <!-- GtkAssistantPageType enumeration value -->
-              <value id="GTK_ASSISTANT_PAGE_INTRO" _name="Intro"/>
+              <value id="GTK_ASSISTANT_PAGE_INTRO" name="Intro"/>
               <!-- GtkAssistantPageType enumeration value -->
-              <value id="GTK_ASSISTANT_PAGE_CONFIRM" _name="Confirm"/>
+              <value id="GTK_ASSISTANT_PAGE_CONFIRM" name="Confirm"/>
               <!-- GtkAssistantPageType enumeration value -->
-              <value id="GTK_ASSISTANT_PAGE_SUMMARY" _name="Summary"/>
+              <value id="GTK_ASSISTANT_PAGE_SUMMARY" name="Summary"/>
               <!-- GtkAssistantPageType enumeration value -->
-              <value id="GTK_ASSISTANT_PAGE_PROGRESS" _name="Progress"/>
+              <value id="GTK_ASSISTANT_PAGE_PROGRESS" name="Progress"/>
               <!-- GtkAssistantPageType enumeration value -->
-              <value id="GTK_ASSISTANT_PAGE_CUSTOM" _name="Custom"/>
+              <value id="GTK_ASSISTANT_PAGE_CUSTOM" name="Custom"/>
             </displayable-values>
           </property>
-          <property save="False" id="position" _name="Position">
+          <property save="False" id="position" name="Position">
             <parameter-spec>
               <type>GParamInt</type>
             </parameter-spec>
-            <_tooltip>The page position in the Assistant</_tooltip>
+            <tooltip>The page position in the Assistant</tooltip>
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkPopover" generic-name="popover" _title="Popover" toplevel="True" 
since="3.12">
+
+      <glade-widget-class name="GtkPopover" generic-name="popover" title="Popover" toplevel="True" 
since="3.12">
         <constructor-function>glade_gtk_popover_constructor</constructor-function>
         <create-editable-function>glade_gtk_popover_create_editable</create-editable-function>
         <post-create-function>glade_gtk_popover_post_create</post-create-function>
@@ -3531,18 +3529,18 @@
           <property id="constrain-to" ignore="True" custom-layout="True" since="3.20">
             <displayable-values>
               <!-- GtkPopoverConstraint enumeration value -->
-              <value id="GTK_POPOVER_CONSTRAINT_NONE" _name="None"/>
+              <value id="GTK_POPOVER_CONSTRAINT_NONE" name="None"/>
               <!-- GtkPopoverConstraint enumeration value -->
-              <value id="GTK_POPOVER_CONSTRAINT_WINDOW" _name="Window"/>
+              <value id="GTK_POPOVER_CONSTRAINT_WINDOW" name="Window"/>
             </displayable-values>
-         </property>
+          </property>
           <property id="position" ignore="True" custom-layout="True"/>
           <property id="transitions-enabled" ignore="True" custom-layout="True" since="3.16"/>
           <property id="modal" ignore="True" custom-layout="True"/>
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkPopoverMenu" generic-name="popovermenu" _title="Popover Menu" 
toplevel="True" since="3.16">
+      <glade-widget-class name="GtkPopoverMenu" generic-name="popovermenu" title="Popover Menu" 
toplevel="True" since="3.16">
         <create-editable-function>glade_gtk_popover_menu_create_editable</create-editable-function>
         <post-create-function>glade_gtk_popover_menu_post_create</post-create-function>
         <add-child-function>glade_gtk_popover_menu_add_child</add-child-function>
@@ -3558,24 +3556,24 @@
           <property id="visible" default="False"/>
           <property id="visible-submenu" disabled="True"/>
           <property id="pointing-to" disabled="True"/>
-          <property id="submenus" _name="Number of submenus" save="False" default="1" custom-layout="True">
+          <property id="submenus" name="Number of submenus" save="False" default="1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>1</min>
             </parameter-spec>
-            <_tooltip>The number of submenus in the popover menu</_tooltip>
+            <tooltip>The number of submenus in the popover menu</tooltip>
           </property>
-          <property id="current" _name="Edit menu" save="False" default="0" custom-layout="True">
+          <property id="current" name="Edit menu" save="False" default="0" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>0</min>
             </parameter-spec>
-            <_tooltip>Set the currently active submenu to edit, this property will not be saved</_tooltip>
+            <tooltip>Set the currently active submenu to edit, this property will not be saved</tooltip>
           </property>
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkModelButton" generic-name="modelbutton" _title="Model Button" 
since="3.16">
+      <glade-widget-class name="GtkModelButton" generic-name="modelbutton" title="Model Button" since="3.16">
         <post-create-function>glade_gtk_model_button_post_create</post-create-function>
         <read-widget-function>glade_gtk_model_button_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_model_button_write_widget</write-widget-function>
@@ -3608,17 +3606,17 @@
           <property id="use-action-appearance" disabled="True"/>
         </properties>
       </glade-widget-class>
-    
-      <glade-widget-class name="GtkLinkButton" generic-name="linkbutton" _title="Link Button">
+
+      <glade-widget-class name="GtkLinkButton" generic-name="linkbutton" title="Link Button">
         <properties>
           <!-- The pspec of this prop says that the default is http://www.gtk.org but gtk_link_button_init() 
does
-            not set it up... do we need to override it to avoid seting a NULL value ? -->
+               not set it up... do we need to override it to avoid seting a NULL value ? -->
           <property id="uri" default="http://glade.gnome.org"; since="2.10"/>
           <property id="visited" since="2.14"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRecentChooserWidget" generic-name="recentchooser" _title="Recent Chooser" 
since="2.10">
+
+      <glade-widget-class name="GtkRecentChooserWidget" generic-name="recentchooser" title="Recent Chooser" 
since="2.10">
         <create-editable-function>glade_gtk_recent_chooser_widget_create_editable</create-editable-function>
         
         <signals>
@@ -3648,19 +3646,19 @@
           <property id="sort-type" custom-layout="True">
             <displayable-values>
               <!-- GtkRecentSortType enumeration value -->
-              <value id="GTK_RECENT_SORT_NONE" _name="None"/>
+              <value id="GTK_RECENT_SORT_NONE" name="None"/>
               <!-- GtkRecentSortType enumeration value -->
-              <value id="GTK_RECENT_SORT_MRU" _name="Most Recently Used first"/>
+              <value id="GTK_RECENT_SORT_MRU" name="Most Recently Used first"/>
               <!-- GtkRecentSortType enumeration value -->
-              <value id="GTK_RECENT_SORT_LRU" _name="Least Recently Used first"/>
+              <value id="GTK_RECENT_SORT_LRU" name="Least Recently Used first"/>
               <!-- GtkRecentSortType enumeration value -->
-              <value id="GTK_RECENT_SORT_CUSTOM" _name="Custom"/>
+              <value id="GTK_RECENT_SORT_CUSTOM" name="Custom"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRecentChooserDialog" generic-name="recentchooserdialog" _title="Recent 
Chooser Dialog">
+
+      <glade-widget-class name="GtkRecentChooserDialog" generic-name="recentchooserdialog" title="Recent 
Chooser Dialog">
         <!-- Claim the GladeRecentChooserEditor properties  -->
         <properties>
           <property id="recent-manager" custom-layout="True"/>
@@ -3675,46 +3673,46 @@
           <property id="local-only" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkSizeGroup" generic-name="sizegroup" _title="Size Group" toplevel="True">
+
+      <glade-widget-class name="GtkSizeGroup" generic-name="sizegroup" title="Size Group" toplevel="True">
         <read-widget-function>glade_gtk_size_group_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_size_group_write_widget</write-widget-function>
         <set-property-function>glade_gtk_size_group_set_property</set-property-function>
         <properties>
-          <property id="widgets" _name="Widgets" save="False">
+          <property id="widgets" name="Widgets" save="False">
             <parameter-spec>
               <type>GladeParamObjects</type>
               <value-type>GtkWidget</value-type>
             </parameter-spec>
-            <_tooltip>List of widgets in this group</_tooltip>
+            <tooltip>List of widgets in this group</tooltip>
           </property>
           <property id="mode">
             <displayable-values>
               <!-- GtkSizeGroupMode enumeration value -->
-              <value id="GTK_SIZE_GROUP_NONE" _name="None"/>
+              <value id="GTK_SIZE_GROUP_NONE" name="None"/>
               <!-- GtkSizeGroupMode enumeration value -->
-              <value id="GTK_SIZE_GROUP_HORIZONTAL" _name="Horizontal"/>
+              <value id="GTK_SIZE_GROUP_HORIZONTAL" name="Horizontal"/>
               <!-- GtkSizeGroupMode enumeration value -->
-              <value id="GTK_SIZE_GROUP_VERTICAL" _name="Vertical"/>
+              <value id="GTK_SIZE_GROUP_VERTICAL" name="Vertical"/>
               <!-- GtkSizeGroupMode enumeration value -->
-              <value id="GTK_SIZE_GROUP_BOTH" _name="Both"/>
+              <value id="GTK_SIZE_GROUP_BOTH" name="Both"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
       
-      <glade-widget-class name="GtkWindowGroup" generic-name="windowgroup" 
-                       _title="Window Group" toplevel="True"/>
-      <glade-widget-class name="GtkAccelGroup" generic-name="accelgroup" 
-                       _title="Accel Group" toplevel="True"/>
-      <glade-widget-class name="GtkAdjustment" generic-name="adjustment" 
-                       _title="Adjustment" toplevel="True">
+      <glade-widget-class name="GtkWindowGroup" generic-name="windowgroup"
+                          title="Window Group" toplevel="True"/>
+      <glade-widget-class name="GtkAccelGroup" generic-name="accelgroup"
+                          title="Accel Group" toplevel="True"/>
+      <glade-widget-class name="GtkAdjustment" generic-name="adjustment"
+                          title="Adjustment" toplevel="True">
         <read-widget-function>glade_gtk_adjustment_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_adjustment_write_widget</write-widget-function>
         <set-property-function>glade_gtk_adjustment_set_property</set-property-function>
         <verify-function>glade_gtk_adjustment_verify_property</verify-function>
         <properties>
-          <property id="glade-digits" _name="Digits" save="False" weight="1.0">
+          <property id="glade-digits" name="Digits" save="False" weight="1.0">
             <parameter-spec>
               <type>GParamInt</type>
               <min>2</min>
@@ -3729,15 +3727,15 @@
           <property id="page-size" default="0.0"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkAction" generic-name="action" _title="Action" toplevel="True" 
use-placeholders="False" deprecated="True">
+
+      <glade-widget-class name="GtkAction" generic-name="action" title="Action" toplevel="True" 
use-placeholders="False" deprecated="True">
         <post-create-function>glade_gtk_action_post_create</post-create-function>
         <create-editor-property-function>glade_gtk_widget_create_eprop</create-editor-property-function>
         <string-from-value-function>glade_gtk_widget_string_from_value</string-from-value-function>
         <action-activate-function>glade_gtk_action_action_activate</action-activate-function>
         <create-editable-function>glade_gtk_action_create_editable</create-editable-function>
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         
         <properties>
@@ -3759,32 +3757,32 @@
           <property id="hide-if-empty" custom-layout="True"/>
           
           <!-- Accelerator -->
-          <property id="accelerator" _name="Accelerator" ignore="True" 
-                 save="False" weight="2.0" custom-layout="True">
+          <property id="accelerator" name="Accelerator" ignore="True"
+                    save="False" weight="2.0" custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeAccelGList</value-type>
             </parameter-spec>
-            <_tooltip>An accelerator key for this action</_tooltip>
+            <tooltip>An accelerator key for this action</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkToggleAction" generic-name="toggleaction" _title="Toggle Action" 
deprecated="True" >
+
+      <glade-widget-class name="GtkToggleAction" generic-name="toggleaction" title="Toggle Action" 
deprecated="True" >
         <properties>
           <property id="active" custom-layout="True"/>
           <property id="draw-as-radio" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      <glade-widget-class name="GtkRadioAction" generic-name="radioaction" _title="Radio Action" 
deprecated="True">
+      <glade-widget-class name="GtkRadioAction" generic-name="radioaction" title="Radio Action" 
deprecated="True">
         <properties>
           <property id="value" custom-layout="True"/>
           <property id="group" custom-layout="True"/>
           <property id="current-value" disabled="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRecentAction" generic-name="recentaction" _title="Recent Action" 
since="2.12" deprecated="True">
+
+      <glade-widget-class name="GtkRecentAction" generic-name="recentaction" title="Recent Action" 
since="2.12" deprecated="True">
         <properties>
           <!-- Claim the GladeRecentChooserEditor properties  -->
           <property id="recent-manager" custom-layout="True"/>
@@ -3800,9 +3798,9 @@
           <property id="show-numbers" custom-layout="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkActionGroup" generic-name="actiongroup" _title="Action Group" 
-                       toplevel="True" use-placeholders="False" deprecated="True">
+
+      <glade-widget-class name="GtkActionGroup" generic-name="actiongroup" title="Action Group"
+                          toplevel="True" use-placeholders="False" deprecated="True">
         <add-child-verify-function>glade_gtk_action_group_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_action_group_add_child</add-child-function>
         <remove-child-function>glade_gtk_action_group_remove_child</remove-child-function>
@@ -3812,11 +3810,11 @@
         <write-child-function>glade_gtk_action_group_write_child</write-child-function>
         <action-activate-function>glade_gtk_action_action_activate</action-activate-function>
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkEntryCompletion" generic-name="entrycompletion" _title="Entry Completion" 
toplevel="True">
+
+      <glade-widget-class name="GtkEntryCompletion" generic-name="entrycompletion" title="Entry Completion" 
toplevel="True">
         <add-child-verify-function>glade_gtk_cell_layout_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_cell_layout_add_child</add-child-function>
         <remove-child-function>glade_gtk_cell_layout_remove_child</remove-child-function> 
@@ -3828,15 +3826,15 @@
         <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         <signals>
           <signal id="no-matches" since="3.14"/>
         </signals>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkIconFactory" generic-name="iconfactory" _title="Icon Factory" 
-                       toplevel="True">
+
+      <glade-widget-class name="GtkIconFactory" generic-name="iconfactory" title="Icon Factory"
+                          toplevel="True">
         <post-create-function>glade_gtk_icon_factory_post_create</post-create-function>
         <destroy-object-function>glade_gtk_icon_factory_destroy_object</destroy-object-function>
         <read-widget-function>glade_gtk_icon_factory_read_widget</read-widget-function>
@@ -3846,18 +3844,18 @@
         
<create-editor-property-function>glade_gtk_icon_factory_create_eprop</create-editor-property-function>
         <create-editable-function>glade_gtk_icon_factory_create_editable</create-editable-function>
         <properties>
-          <property id="sources" _name="Icon Sources" save="False" custom-layout="True">
+          <property id="sources" name="Icon Sources" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeIconSources</value-type>
             </parameter-spec>
-            <_tooltip>A list of sources for this icon factory</_tooltip>
+            <tooltip>A list of sources for this icon factory</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkListStore" generic-name="liststore" _title="List Store" 
-                       toplevel="True">
+
+      <glade-widget-class name="GtkListStore" generic-name="liststore" title="List Store"
+                          toplevel="True">
         <post-create-function>glade_gtk_store_post_create</post-create-function>
         <set-property-function>glade_gtk_store_set_property</set-property-function>
         <create-editor-property-function>glade_gtk_store_create_eprop</create-editor-property-function>
@@ -3866,25 +3864,25 @@
         <write-widget-function>glade_gtk_store_write_widget</write-widget-function>
         <read-widget-function>glade_gtk_store_read_widget</read-widget-function>
         <properties>
-          <property id="columns" since="2.12" _name="Columns" save="False" construct-only="True" 
custom-layout="True">
+          <property id="columns" since="2.12" name="Columns" save="False" construct-only="True" 
custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeColumnTypeList</value-type>
             </parameter-spec>
-            <_tooltip>Enter a list of column types for this data store</_tooltip>
+            <tooltip>Enter a list of column types for this data store</tooltip>
           </property>
-          <property id="data" since="2.12" _name="Data" save="False" custom-layout="True">
+          <property id="data" since="2.12" name="Data" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeModelDataTree</value-type>
             </parameter-spec>
-            <_tooltip>Enter a list of values to be applied on each row</_tooltip>
+            <tooltip>Enter a list of values to be applied on each row</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTreeStore" generic-name="treestore" _title="Tree Store" 
-                       toplevel="True">
+
+      <glade-widget-class name="GtkTreeStore" generic-name="treestore" title="Tree Store"
+                          toplevel="True">
         <set-property-function>glade_gtk_store_set_property</set-property-function>
         <create-editor-property-function>glade_gtk_store_create_eprop</create-editor-property-function>
         <create-editable-function>glade_gtk_store_create_editable</create-editable-function>
@@ -3892,34 +3890,34 @@
         <write-widget-function>glade_gtk_store_write_widget</write-widget-function>
         <read-widget-function>glade_gtk_store_read_widget</read-widget-function>
         <properties>
-          <property id="columns" since="2.12" _name="Columns" save="False" construct-only="True" 
custom-layout="True">
+          <property id="columns" since="2.12" name="Columns" save="False" construct-only="True" 
custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeColumnTypeList</value-type>
             </parameter-spec>
-            <_tooltip>Enter a list of column types for this data store</_tooltip>
+            <tooltip>Enter a list of column types for this data store</tooltip>
           </property>
-          <property id="data" since="2.12" _name="Data" save="False" custom-layout="True">
+          <property id="data" since="2.12" name="Data" save="False" custom-layout="True">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeModelDataTree</value-type>
             </parameter-spec>
-            <_tooltip>Enter a list of values to be applied on each row</_tooltip>
+            <tooltip>Enter a list of values to be applied on each row</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTreeModelFilter" generic-name="treemodelfilter" _title="Tree Model 
Filter" 
-                       toplevel="True"/>
-      <glade-widget-class name="GtkTreeModelSort" generic-name="treemodelsort" _title="Tree Model Sort" 
-                       toplevel="True"/>
-      <glade-widget-class name="GtkTreeSelection" generic-name="treeselection" _title="Tree Selection">
+
+      <glade-widget-class name="GtkTreeModelFilter" generic-name="treemodelfilter" title="Tree Model Filter"
+                          toplevel="True"/>
+      <glade-widget-class name="GtkTreeModelSort" generic-name="treemodelsort" title="Tree Model Sort"
+                          toplevel="True"/>
+      <glade-widget-class name="GtkTreeSelection" generic-name="treeselection" title="Tree Selection">
         <properties>
           <property id="mode" since="3.2"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTreeView" generic-name="treeview" _title="Tree View">
+
+      <glade-widget-class name="GtkTreeView" generic-name="treeview" title="Tree View">
         <create-editable-function>glade_gtk_treeview_create_editable</create-editable-function>
         <post-create-function>empty</post-create-function>
         <set-property-function>glade_gtk_treeview_set_property</set-property-function>
@@ -3933,7 +3931,7 @@
         <action-activate-function>glade_gtk_treeview_action_activate</action-activate-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         
         <internal-children>
@@ -3953,13 +3951,13 @@
           <property id="enable-grid-lines" ignore="True" custom-layout="True">
             <displayable-values>
               <!-- GtkTreeViewGridLines enumeration value -->
-              <value id="GTK_TREE_VIEW_GRID_LINES_NONE" _name="None"/>
+              <value id="GTK_TREE_VIEW_GRID_LINES_NONE" name="None"/>
               <!-- GtkTreeViewGridLines enumeration value -->
-              <value id="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" _name="Horizontal"/>
+              <value id="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" name="Horizontal"/>
               <!-- GtkTreeViewGridLines enumeration value -->
-              <value id="GTK_TREE_VIEW_GRID_LINES_VERTICAL" _name="Vertical"/>
+              <value id="GTK_TREE_VIEW_GRID_LINES_VERTICAL" name="Vertical"/>
               <!-- GtkTreeViewGridLines enumeration value -->
-              <value id="GTK_TREE_VIEW_GRID_LINES_BOTH" _name="Horizontal and Vertical"/>
+              <value id="GTK_TREE_VIEW_GRID_LINES_BOTH" name="Horizontal and Vertical"/>
             </displayable-values>
           </property>
           <property id="reorderable" custom-layout="True"/>
@@ -3975,10 +3973,10 @@
           <property id="hadjustment" custom-layout="True"/>
           <property id="vadjustment" custom-layout="True"/>
           <property id="hscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural width</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural width</tooltip>
           </property>
           <property id="vscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural height</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural height</tooltip>
           </property>
         </properties>
         
@@ -3990,8 +3988,8 @@
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTreeViewColumn" generic-name="treeviewcolumn" _title="Tree View Column">
+
+      <glade-widget-class name="GtkTreeViewColumn" generic-name="treeviewcolumn" title="Tree View Column">
         <add-child-verify-function>glade_gtk_cell_layout_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_cell_layout_add_child</add-child-function>
         <remove-child-function>glade_gtk_cell_layout_remove_child</remove-child-function> 
@@ -4003,7 +4001,7 @@
         <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         
         <properties>
@@ -4014,20 +4012,20 @@
           <property id="sort-order">
             <displayable-values>
               <!-- GtkSortType enumeration value -->
-              <value id="GTK_SORT_ASCENDING" _name="Ascending"/>
+              <value id="GTK_SORT_ASCENDING" name="Ascending"/>
               <!-- GtkSortType enumeration value -->
-              <value id="GTK_SORT_DESCENDING" _name="Descending"/>
+              <value id="GTK_SORT_DESCENDING" name="Descending"/>
             </displayable-values>
           </property>
           <property id="title" default="column" translatable="True"/>
           <property id="sizing">
             <displayable-values>
               <!-- GtkTreeViewColumnSizing enumeration value -->
-              <value id="GTK_TREE_VIEW_COLUMN_GROW_ONLY" _name="Grow Only"/>
+              <value id="GTK_TREE_VIEW_COLUMN_GROW_ONLY" name="Grow Only"/>
               <!-- GtkTreeViewColumnSizing enumeration value -->
-              <value id="GTK_TREE_VIEW_COLUMN_AUTOSIZE" _name="Automatic"/>
+              <value id="GTK_TREE_VIEW_COLUMN_AUTOSIZE" name="Automatic"/>
               <!-- GtkTreeViewColumnSizing enumeration value -->
-              <value id="GTK_TREE_VIEW_COLUMN_FIXED" _name="Fixed"/>
+              <value id="GTK_TREE_VIEW_COLUMN_FIXED" name="Fixed"/>
             </displayable-values>
           </property>
         </properties>
@@ -4040,8 +4038,8 @@
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkIconView" generic-name="iconview" _title="Icon View">
+
+      <glade-widget-class name="GtkIconView" generic-name="iconview" title="Icon View">
         <create-editable-function>glade_gtk_icon_view_create_editable</create-editable-function>
         
         <post-create-function>empty</post-create-function>
@@ -4056,7 +4054,7 @@
         <child-get-property-function>glade_gtk_cell_layout_get_child_property</child-get-property-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         
         <properties>
@@ -4066,9 +4064,9 @@
           <property id="pixbuf-column" disabled="True"/>
           
           <!-- Reenable the margin property which is also declared on GtkWidgetClass with a different 
default,
-            must be 'save-always' because of original default mixup -->
+               must be 'save-always' because of original default mixup -->
           <property id="margin" disabled="False" save="True" ignore="False"
-                 visible="True" common="False" save-always="True" custom-layout="True"/>
+                    visible="True" common="False" save-always="True" custom-layout="True"/>
           
           <!-- Claim properties for the editor -->
           <property id="model" create-type="GtkListStore" query="True" custom-layout="True"/>
@@ -4088,10 +4086,10 @@
           <property id="hadjustment" custom-layout="True"/>
           <property id="vadjustment" custom-layout="True"/>
           <property id="hscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural width</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural width</tooltip>
           </property>
           <property id="vscroll-policy" custom-layout="True">
-            <_tooltip>Whether to start scrolling at less than minimum or natural height</_tooltip>
+            <tooltip>Whether to start scrolling at less than minimum or natural height</tooltip>
           </property>
         </properties>
         
@@ -4103,8 +4101,8 @@
           </property>
         </packing-properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRenderer" _title="Cell Renderer">
+
+      <glade-widget-class name="GtkCellRenderer" title="Cell Renderer">
         <deep-post-create-function>glade_gtk_cell_renderer_deep_post_create</deep-post-create-function>
         
<create-editor-property-function>glade_gtk_cell_renderer_create_eprop</create-editor-property-function>
         <create-editable-function>glade_gtk_cell_renderer_create_editable</create-editable-function>
@@ -4114,7 +4112,7 @@
         <action-activate-function>glade_gtk_cell_renderer_action_activate</action-activate-function>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
         
         <properties>
@@ -4125,12 +4123,12 @@
           
           <!-- Cell renderer properties with thier virtual attribute and control properties -->
           <property id="cell-background" common="True" save="False" custom-layout="True"/>
-          <property id="attr-cell-background" _name="Cell Background Color name column" save="False" 
default="-1" custom-layout="True">
+          <property id="attr-cell-background" name="Cell Background Color name column" save="False" 
default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-cell-background" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4139,13 +4137,13 @@
           </property>
           
           <property id="cell-background-gdk" common="True" save="False" custom-layout="True" 
deprecated="True"/>
-          <property id="attr-cell-background-gdk" _name="Cell Background Color column" save="False" 
default="-1"
-                  deprecated="True" custom-layout="True">
+          <property id="attr-cell-background-gdk" name="Cell Background Color column" save="False" 
default="-1"
+                    deprecated="True" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-cell-background-gdk" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4154,13 +4152,13 @@
           </property>
           
           <property id="cell-background-rgba" common="True" save="False" custom-layout="True" since="3.0"/>
-          <property id="attr-cell-background-rgba" _name="Cell Background RGBA column" save="False" 
-                 default="-1" custom-layout="True" since="3.0">
+          <property id="attr-cell-background-rgba" name="Cell Background RGBA column" save="False"
+                    default="-1" custom-layout="True" since="3.0">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-cell-background-rgba" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4169,12 +4167,12 @@
           </property>
           
           <property id="width" common="True" save="False" custom-layout="True"/>
-          <property id="attr-width" _name="Width column" save="False" default="-1" custom-layout="True">
+          <property id="attr-width" name="Width column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-width" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4183,68 +4181,68 @@
           </property>
           
           <property id="height" common="True" save="False" custom-layout="True"/>
-          <property id="attr-height" _name="Height column" save="False" default="-1" custom-layout="True">
+          <property id="attr-height" name="Height column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-height" default="True" save="False" visible="False">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          
-          <property id="xpad" _name="Horizontal Padding" common="True" save="False" custom-layout="True"/>
-          <property id="attr-xpad" _name="Horizontal Padding column" save="False" default="-1" 
custom-layout="True">   
+
+          <property id="xpad" name="Horizontal Padding" common="True" save="False" custom-layout="True"/>
+          <property id="attr-xpad" name="Horizontal Padding column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-xpad" default="True" save="False" visible="False">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          
-          <property id="ypad" _name="Vertical Padding" common="True" save="False" custom-layout="True"/>
-          <property id="attr-ypad" _name="Vertical Padding column" save="False" default="-1" 
custom-layout="True">
+
+          <property id="ypad" name="Vertical Padding" common="True" save="False" custom-layout="True"/>
+          <property id="attr-ypad" name="Vertical Padding column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-ypad" default="True" save="False" visible="False">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          
-          <property id="xalign" _name="Horizontal Alignment" common="True" save="False" 
custom-layout="True"/>
-          <property id="attr-xalign" _name="Horizontal Alignment column" save="False" default="-1" 
custom-layout="True">
+
+          <property id="xalign" name="Horizontal Alignment" common="True" save="False" custom-layout="True"/>
+          <property id="attr-xalign" name="Horizontal Alignment column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-xalign" default="True" save="False" visible="False">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          
-          <property id="yalign" _name="Vertical Alignment" common="True" save="False" custom-layout="True"/>
-          <property id="attr-yalign" _name="Vertical Alignment column" save="False" default="-1" 
custom-layout="True">
+
+          <property id="yalign" name="Vertical Alignment" common="True" save="False" custom-layout="True"/>
+          <property id="attr-yalign" name="Vertical Alignment column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-yalign" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4253,26 +4251,26 @@
           </property>
           
           <property id="sensitive" common="True" save="False" custom-layout="True"/>
-          <property id="attr-sensitive" _name="Sensitive column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-sensitive" name="Sensitive column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-sensitive" default="True" save="False" visible="False">
             <parameter-spec>
               <type>GParamBoolean</type>
             </parameter-spec>
           </property>
-          
-          <property id="visible" _name="Visible" common="True" save="False" custom-layout="True"/>
-          <property id="attr-visible" _name="Visible column" save="False" default="-1" custom-layout="True">
+
+          <property id="visible" name="Visible" common="True" save="False" custom-layout="True"/>
+          <property id="attr-visible" name="Visible column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-visible" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4281,8 +4279,8 @@
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRendererText" generic-name="cellrenderertext" _title="Text Renderer" >
+
+      <glade-widget-class name="GtkCellRendererText" generic-name="cellrenderertext" title="Text Renderer" >
         <properties>
           <property id="editable-set" disabled="True"/>
           <property id="ellipsize-set" disabled="True"/>
@@ -4304,19 +4302,19 @@
           <property id="alignment" save="False" custom-layout="True">
             <displayable-values>
               <!-- PangoAlignment enumeration value -->
-              <value id="PANGO_ALIGN_LEFT" _name="Left"/>
+              <value id="PANGO_ALIGN_LEFT" name="Left"/>
               <!-- PangoAlignment enumeration value -->
-              <value id="PANGO_ALIGN_CENTER" _name="Center"/>
+              <value id="PANGO_ALIGN_CENTER" name="Center"/>
               <!-- PangoAlignment enumeration value -->
-              <value id="PANGO_ALIGN_RIGHT" _name="Right"/>
+              <value id="PANGO_ALIGN_RIGHT" name="Right"/>
             </displayable-values>
           </property>
-          <property id="attr-alignment" _name="Alignment column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-alignment" name="Alignment column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-alignment" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4325,12 +4323,12 @@
           </property>
           
           <property id="attributes" save="False" custom-layout="True"/>
-          <property id="attr-attributes" _name="Attributes column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-attributes" name="Attributes column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-attributes" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4339,12 +4337,12 @@
           </property>
           
           <property id="background" save="False" custom-layout="True"/>
-          <property id="attr-background" _name="Background Color Name column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-background" name="Background Color Name column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-background" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4353,13 +4351,13 @@
           </property>
           
           <property id="background-gdk" save="False" custom-layout="True" deprecated="True"/>
-          <property id="attr-background-gdk" _name="Background Color column" save="False" default="-1"
-                 deprecated="True" custom-layout="True">
+          <property id="attr-background-gdk" name="Background Color column" save="False" default="-1"
+                    deprecated="True" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-background-gdk" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4368,12 +4366,12 @@
           </property>
           
           <property id="editable" save="False" custom-layout="True"/>
-          <property id="attr-editable" _name="Editable column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-editable" name="Editable column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-editable" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4382,12 +4380,12 @@
           </property>
           
           <property id="ellipsize" save="False" custom-layout="True"/>
-          <property id="attr-ellipsize" _name="Ellipsize column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-ellipsize" name="Ellipsize column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-ellipsize" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4396,12 +4394,12 @@
           </property>
           
           <property id="family" save="False" custom-layout="True"/>
-          <property id="attr-family" _name="Family column" save="False" default="-1" custom-layout="True">
+          <property id="attr-family" name="Family column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-family" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4410,12 +4408,12 @@
           </property>
           
           <property id="font" save="False" custom-layout="True"/>
-          <property id="attr-font" _name="Font column" save="False" default="-1" custom-layout="True">
+          <property id="attr-font" name="Font column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-font" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4424,13 +4422,13 @@
           </property>
           
           <property id="font-desc" save="False" custom-layout="True"/>
-          <property id="attr-font-desc" _name="Font Description column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-font-desc" name="Font Description column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-font-desc" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4439,13 +4437,13 @@
           </property>
           
           <property id="foreground" save="False" custom-layout="True"/>
-          <property id="attr-foreground" _name="Foreground Color Name column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-foreground" name="Foreground Color Name column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-foreground" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4454,13 +4452,13 @@
           </property>
           
           <property id="foreground-gdk" save="False" custom-layout="True" deprecated="True"/>
-          <property id="attr-foreground-gdk" _name="Foreground Color column" save="False" default="-1" 
-                  deprecated="True" custom-layout="True">
+          <property id="attr-foreground-gdk" name="Foreground Color column" save="False" default="-1"
+                    deprecated="True" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-foreground-gdk" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4469,12 +4467,12 @@
           </property>
           
           <property id="language" save="False" custom-layout="True"/>
-          <property id="attr-language" _name="Language column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-language" name="Language column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-language" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4483,12 +4481,12 @@
           </property>
           
           <property id="markup" save="False" custom-layout="True"/>
-          <property id="attr-markup" _name="Markup column" save="False" default="-1" custom-layout="True">
+          <property id="attr-markup" name="Markup column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-markup" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4497,12 +4495,12 @@
           </property>
           
           <property id="rise" save="False" custom-layout="True"/>
-          <property id="attr-rise" _name="Rise column" save="False" default="-1" custom-layout="True">
+          <property id="attr-rise" name="Rise column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-rise" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4511,12 +4509,12 @@
           </property>
           
           <property id="scale" save="False" custom-layout="True"/>
-          <property id="attr-scale" _name="Scale column" save="False" default="-1" custom-layout="True">
+          <property id="attr-scale" name="Scale column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-scale" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4525,13 +4523,13 @@
           </property>
           
           <property id="single-paragraph-mode" save="False" custom-layout="True"/>
-          <property id="attr-single-paragraph-mode" _name="Single Paragraph Mode column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-single-paragraph-mode" name="Single Paragraph Mode column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-single-paragraph-mode" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4540,12 +4538,12 @@
           </property>
           
           <property id="size" save="False" custom-layout="True"/>
-          <property id="attr-size" _name="Size column" save="False" default="-1" custom-layout="True">
+          <property id="attr-size" name="Size column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-size" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4554,12 +4552,12 @@
           </property>
           
           <property id="size-points" save="False" custom-layout="True"/>
-          <property id="attr-size-points" _name="Data column" save="False" default="-1" custom-layout="True">
+          <property id="attr-size-points" name="Data column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-size-points" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4570,32 +4568,32 @@
           <property id="stretch" save="False" custom-layout="True">
             <displayable-values>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_ULTRA_CONDENSED" _name="Ultra Condensed"/>
+              <value id="PANGO_STRETCH_ULTRA_CONDENSED" name="Ultra Condensed"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_EXTRA_CONDENSED" _name="Extra Condensed"/>
+              <value id="PANGO_STRETCH_EXTRA_CONDENSED" name="Extra Condensed"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_CONDENSED" _name="Condensed"/>
+              <value id="PANGO_STRETCH_CONDENSED" name="Condensed"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_SEMI_CONDENSED" _name="Semi Condensed"/>
+              <value id="PANGO_STRETCH_SEMI_CONDENSED" name="Semi Condensed"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_NORMAL" _name="Normal"/>
+              <value id="PANGO_STRETCH_NORMAL" name="Normal"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_SEMI_EXPANDED" _name="Semi Expanded"/>
+              <value id="PANGO_STRETCH_SEMI_EXPANDED" name="Semi Expanded"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_EXPANDED" _name="Expanded"/>
+              <value id="PANGO_STRETCH_EXPANDED" name="Expanded"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_EXTRA_EXPANDED" _name="Extra Expanded"/>
+              <value id="PANGO_STRETCH_EXTRA_EXPANDED" name="Extra Expanded"/>
               <!-- PangoStretch enumeration value -->
-              <value id="PANGO_STRETCH_ULTRA_EXPANDED" _name="Ultra Expanded"/>
+              <value id="PANGO_STRETCH_ULTRA_EXPANDED" name="Ultra Expanded"/>
             </displayable-values>
           </property>
-          
-          <property id="attr-stretch" _name="Stretch column" save="False" default="-1" custom-layout="True">
+
+          <property id="attr-stretch" name="Stretch column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-stretch" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4604,12 +4602,12 @@
           </property>
           
           <property id="strikethrough" save="False" custom-layout="True"/>
-          <property id="attr-strikethrough" _name="Strikethrough column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-strikethrough" name="Strikethrough column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-strikethrough" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4620,19 +4618,19 @@
           <property id="style" save="False" custom-layout="True">
             <displayable-values>
               <!-- PangoStyle enumeration value -->
-              <value id="PANGO_STYLE_NORMAL" _name="Normal"/>
+              <value id="PANGO_STYLE_NORMAL" name="Normal"/>
               <!-- PangoStyle enumeration value -->
-              <value id="PANGO_STYLE_OBLIQUE" _name="Oblique"/>
+              <value id="PANGO_STYLE_OBLIQUE" name="Oblique"/>
               <!-- PangoStyle enumeration value -->
-              <value id="PANGO_STYLE_ITALIC" _name="Italic"/>
+              <value id="PANGO_STYLE_ITALIC" name="Italic"/>
             </displayable-values>
           </property>
-          <property id="attr-style" _name="Style column" save="False" default="-1" custom-layout="True">
+          <property id="attr-style" name="Style column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-style" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4641,12 +4639,12 @@
           </property>
           
           <property id="text" save="False" custom-layout="True"/>
-          <property id="attr-text" _name="Text column" save="False" default="-1" custom-layout="True">
+          <property id="attr-text" name="Text column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-text" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4657,23 +4655,23 @@
           <property id="underline" save="False" custom-layout="True">
             <displayable-values>
               <!-- PangoUnderline enumeration value -->
-              <value id="PANGO_UNDERLINE_NONE" _name="None"/>
+              <value id="PANGO_UNDERLINE_NONE" name="None"/>
               <!-- PangoUnderline enumeration value -->
-              <value id="PANGO_UNDERLINE_SINGLE" _name="Single"/>
+              <value id="PANGO_UNDERLINE_SINGLE" name="Single"/>
               <!-- PangoUnderline enumeration value -->
-              <value id="PANGO_UNDERLINE_DOUBLE" _name="Double"/>
+              <value id="PANGO_UNDERLINE_DOUBLE" name="Double"/>
               <!-- PangoUnderline enumeration value -->
-              <value id="PANGO_UNDERLINE_LOW" _name="Low"/>
+              <value id="PANGO_UNDERLINE_LOW" name="Low"/>
               <!-- PangoUnderline enumeration value -->
-              <value id="PANGO_UNDERLINE_ERROR" _name="Error"/>
+              <value id="PANGO_UNDERLINE_ERROR" name="Error"/>
             </displayable-values>
           </property>
-          <property id="attr-underline" _name="Underline column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-underline" name="Underline column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-underline" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4684,17 +4682,17 @@
           <property id="variant" save="False" custom-layout="True">
             <displayable-values>
               <!-- PangoVariant enumeration value -->
-              <value id="PANGO_VARIANT_NORMAL" _name="Normal"/>
+              <value id="PANGO_VARIANT_NORMAL" name="Normal"/>
               <!-- PangoVariant enumeration value -->
-              <value id="PANGO_VARIANT_SMALL_CAPS" _name="Small Capitals"/>
+              <value id="PANGO_VARIANT_SMALL_CAPS" name="Small Capitals"/>
             </displayable-values>
           </property>
-          <property id="attr-variant" _name="Variant column" save="False" default="-1" custom-layout="True">
+          <property id="attr-variant" name="Variant column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-variant" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4703,12 +4701,12 @@
           </property>
           
           <property id="weight" save="False" custom-layout="True"/>
-          <property id="attr-weight" _name="Weight column" save="False" default="-1" custom-layout="True">
+          <property id="attr-weight" name="Weight column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-weight" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4717,12 +4715,12 @@
           </property>
           
           <property id="width-chars" save="False" custom-layout="True"/>
-          <property id="attr-width-chars" _name="Width in Characters column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-width-chars" name="Width in Characters column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-width-chars" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4731,12 +4729,12 @@
           </property>
           
           <property id="wrap-mode" save="False" custom-layout="True"/>
-          <property id="attr-wrap-mode" _name="Wrap Mode column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-wrap-mode" name="Wrap Mode column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-wrap-mode" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4745,12 +4743,12 @@
           </property>
           
           <property id="wrap-width" save="False" custom-layout="True"/>
-          <property id="attr-wrap-width" _name="Wrap Width column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-wrap-width" name="Wrap Width column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-wrap-width" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4759,13 +4757,13 @@
           </property>
           
           <property id="background-rgba" save="False" custom-layout="True" since="3.0"/>
-          <property id="attr-background-rgba" _name="Background RGBA column" save="False" 
-                 default="-1" custom-layout="True" since="3.0">
+          <property id="attr-background-rgba" name="Background RGBA column" save="False"
+                    default="-1" custom-layout="True" since="3.0">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-background-rgba" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4774,13 +4772,13 @@
           </property>
           
           <property id="foreground-rgba" save="False" custom-layout="True" since="3.0"/>
-          <property id="attr-foreground-rgba" _name="Foreground RGBA column" save="False" 
-                 default="-1" custom-layout="True" since="3.0">
+          <property id="attr-foreground-rgba" name="Foreground RGBA column" save="False"
+                    default="-1" custom-layout="True" since="3.0">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-foreground-rgba" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4789,13 +4787,13 @@
           </property>
           
           <property id="max-width-chars" save="False" custom-layout="True" since="3.0"/>
-          <property id="attr-max-width-chars" _name="Maximum width in characters" 
-                 save="False" default="-1" custom-layout="True" since="3.0">
+          <property id="attr-max-width-chars" name="Maximum width in characters"
+                    save="False" default="-1" custom-layout="True" since="3.0">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-max-width-chars" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4804,13 +4802,13 @@
           </property>
           
           <property id="placeholder-text" save="False" custom-layout="True" since="3.6"/>
-          <property id="attr-placeholder-text" _name="Placeholder text" 
-                 save="False" default="-1" custom-layout="True" since="3.6">
+          <property id="attr-placeholder-text" name="Placeholder text"
+                    save="False" default="-1" custom-layout="True" since="3.6">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-placeholder-text" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4820,16 +4818,16 @@
         </properties>
       </glade-widget-class>
       
-      <glade-widget-class name="GtkCellRendererAccel" 
-                       generic-name="cellrendereraccel" _title="Accelerator Renderer">
+      <glade-widget-class name="GtkCellRendererAccel"
+                          generic-name="cellrendereraccel" title="Accelerator Renderer">
         <properties>
           <property id="accel-key" save="False" custom-layout="True"/>
-          <property id="attr-accel-key" _name="Data column" save="False" default="-1" custom-layout="True">
+          <property id="attr-accel-key" name="Data column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-accel-key" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4840,17 +4838,17 @@
           <property id="accel-mode" save="False" custom-layout="True">
             <displayable-values>
               <!-- GtkCellRendererAccelMode enumeration value -->
-              <value id="GTK_CELL_RENDERER_ACCEL_MODE_GTK" _name="Gtk"/>
+              <value id="GTK_CELL_RENDERER_ACCEL_MODE_GTK" name="Gtk"/>
               <!-- GtkCellRendererAccelMode enumeration value -->
-              <value id="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" _name="Other"/>
+              <value id="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" name="Other"/>
             </displayable-values>
           </property>
-          <property id="attr-accel-mode" _name="Accelerator Mode column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-accel-mode" name="Accelerator Mode column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-accel-mode" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4861,41 +4859,41 @@
           <property id="accel-mods" save="False" custom-layout="True">
             <displayable-values>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_SHIFT_MASK" _name="Shift Key"/>
+              <value id="GDK_SHIFT_MASK" name="Shift Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_LOCK_MASK" _name="Lock Key"/>
+              <value id="GDK_LOCK_MASK" name="Lock Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_CONTROL_MASK" _name="Control Key"/>
+              <value id="GDK_CONTROL_MASK" name="Control Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_MOD1_MASK" _name="Alt Key"/>
+              <value id="GDK_MOD1_MASK" name="Alt Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_MOD2_MASK" _name="Fifth Key"/>
+              <value id="GDK_MOD2_MASK" name="Fifth Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_MOD3_MASK" _name="Sixth Key"/>
+              <value id="GDK_MOD3_MASK" name="Sixth Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_MOD4_MASK" _name="Seventh Key"/>
+              <value id="GDK_MOD4_MASK" name="Seventh Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_MOD5_MASK" _name="Eighth Key"/>
+              <value id="GDK_MOD5_MASK" name="Eighth Key"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_BUTTON1_MASK" _name="First Mouse Button"/>
+              <value id="GDK_BUTTON1_MASK" name="First Mouse Button"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_BUTTON2_MASK" _name="Second Mouse Button"/>
+              <value id="GDK_BUTTON2_MASK" name="Second Mouse Button"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_BUTTON3_MASK" _name="Third Mouse Button"/>
+              <value id="GDK_BUTTON3_MASK" name="Third Mouse Button"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_BUTTON4_MASK" _name="Fourth Mouse Button"/>
+              <value id="GDK_BUTTON4_MASK" name="Fourth Mouse Button"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_BUTTON5_MASK" _name="Fifth Mouse Button"/>
+              <value id="GDK_BUTTON5_MASK" name="Fifth Mouse Button"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_SUPER_MASK" _name="Super Modifier"/>
+              <value id="GDK_SUPER_MASK" name="Super Modifier"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_HYPER_MASK" _name="Hyper Modifier"/>
+              <value id="GDK_HYPER_MASK" name="Hyper Modifier"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_META_MASK" _name="Meta Modifier"/>
+              <value id="GDK_META_MASK" name="Meta Modifier"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_RELEASE_MASK" _name="Release Modifier"/>
+              <value id="GDK_RELEASE_MASK" name="Release Modifier"/>
               <!-- GdkModifierType enumeration value -->
-              <value id="GDK_MODIFIER_MASK" _name="All Modifiers"/>
+              <value id="GDK_MODIFIER_MASK" name="All Modifiers"/>
               <value id="GDK_MODIFIER_RESERVED_13_MASK" disabled="True"/>
               <value id="GDK_MODIFIER_RESERVED_14_MASK" disabled="True"/>
               <value id="GDK_MODIFIER_RESERVED_15_MASK" disabled="True"/>
@@ -4912,12 +4910,12 @@
               <value id="GDK_MODIFIER_RESERVED_29_MASK" disabled="True"/>
             </displayable-values>
           </property>
-          <property id="attr-accel-mods" _name="Accelerator Modifiers column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-accel-mods" name="Accelerator Modifiers column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-accel-mods" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4926,12 +4924,12 @@
           </property>
           
           <property id="keycode" save="False" custom-layout="True"/>
-          <property id="attr-keycode" _name="Keycode column" save="False" default="-1" custom-layout="True">
+          <property id="attr-keycode" name="Keycode column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-keycode" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4940,8 +4938,8 @@
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRendererCombo" generic-name="cellrenderercombo" _title="Combo 
Renderer" >
+
+      <glade-widget-class name="GtkCellRendererCombo" generic-name="cellrenderercombo" title="Combo 
Renderer" >
         
         <signals>
           <signal id="changed" since="2.14"/>
@@ -4949,12 +4947,12 @@
         
         <properties>
           <property id="has-entry" save="False" custom-layout="True"/>
-          <property id="attr-has-entry" _name="Has Entry column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-has-entry" name="Has Entry column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-has-entry" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4963,12 +4961,12 @@
           </property>
           
           <property id="model" save="False" custom-layout="True"/>
-          <property id="attr-model" _name="Model column" save="False" default="-1" custom-layout="True">
+          <property id="attr-model" name="Model column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-model" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4977,12 +4975,12 @@
           </property>
           
           <property id="text-column" save="False" custom-layout="True"/>
-          <property id="attr-text-column" _name="Text Column column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-text-column" name="Text Column column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-text-column" default="True" save="False" visible="False">
             <parameter-spec>
@@ -4992,16 +4990,16 @@
         </properties>
       </glade-widget-class>
       
-      
-      <glade-widget-class name="GtkCellRendererSpin" generic-name="cellrendererspin" _title="Spin Renderer" >
+
+      <glade-widget-class name="GtkCellRendererSpin" generic-name="cellrendererspin" title="Spin Renderer" >
         <properties>
           <property id="adjustment" save="False" custom-layout="True"/>
-          <property id="attr-adjustment" _name="Adjustment column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-adjustment" name="Adjustment column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-adjustment" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5010,12 +5008,12 @@
           </property>
           
           <property id="climb-rate" save="False" custom-layout="True"/>
-          <property id="attr-climb-rate" _name="Climb Rate column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-climb-rate" name="Climb Rate column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-climb-rate" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5024,12 +5022,12 @@
           </property>
           
           <property id="digits" save="False" custom-layout="True"/>
-          <property id="attr-digits" _name="Digits column" save="False" default="-1" custom-layout="True">
+          <property id="attr-digits" name="Digits column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-digits" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5038,17 +5036,17 @@
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRendererPixbuf" generic-name="cellrendererpixbuf" _title="Pixbuf 
Renderer">
+
+      <glade-widget-class name="GtkCellRendererPixbuf" generic-name="cellrendererpixbuf" title="Pixbuf 
Renderer">
         
         <properties>
           <property id="follow-state" save="False" custom-layout="True"/>
-          <property id="attr-follow-state" _name="Follow State column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-follow-state" name="Follow State column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-follow-state" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5057,12 +5055,12 @@
           </property>
           
           <property id="icon-name" save="False" themed-icon="True" custom-layout="True"/>
-          <property id="attr-icon-name" _name="Icon Name column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-icon-name" name="Icon Name column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-icon-name" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5071,12 +5069,12 @@
           </property>
           
           <property id="pixbuf" save="False" custom-layout="True"/>
-          <property id="attr-pixbuf" _name="Pixbuf column" save="False" default="-1" custom-layout="True">
+          <property id="attr-pixbuf" name="Pixbuf column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-pixbuf" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5085,12 +5083,12 @@
           </property>
           
           <property id="gicon" save="False" custom-layout="True"/>
-          <property id="attr-gicon" _name="GIcon column" save="False" default="-1" custom-layout="True">
+          <property id="attr-gicon" name="GIcon column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-gicon" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5099,13 +5097,13 @@
           </property>
           
           <property id="pixbuf-expander-closed" save="False" custom-layout="True"/>
-          <property id="attr-pixbuf-expander-closed" _name="Pixbuf Expander Closed column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-pixbuf-expander-closed" name="Pixbuf Expander Closed column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-pixbuf-expander-closed" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5114,13 +5112,13 @@
           </property>
           
           <property id="pixbuf-expander-open" save="False" custom-layout="True"/>
-          <property id="attr-pixbuf-expander-open" _name="Pixbuf Expander Open column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-pixbuf-expander-open" name="Pixbuf Expander Open column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-pixbuf-expander-open" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5129,12 +5127,12 @@
           </property>
           
           <property id="stock-detail" save="False" custom-layout="True"/>
-          <property id="attr-stock-detail" _name="Stock Detail column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-stock-detail" name="Stock Detail column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-stock-detail" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5143,12 +5141,12 @@
           </property>
           
           <property id="stock-id" save="False" stock-icon="True" custom-layout="True"/>
-          <property id="attr-stock-id" _name="Stock column" save="False" default="-1" custom-layout="True">
+          <property id="attr-stock-id" name="Stock column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-stock-id" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5163,12 +5161,12 @@
               <value-type>GtkIconSize</value-type>
             </parameter-spec>
           </property>
-          <property id="attr-stock-size" _name="Stock Size column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-stock-size" name="Stock Size column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-stock-size" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5177,16 +5175,16 @@
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRendererProgress" generic-name="cellrendererprogress" 
_title="Progress Renderer" >
+
+      <glade-widget-class name="GtkCellRendererProgress" generic-name="cellrendererprogress" title="Progress 
Renderer" >
         <properties>
           <property id="orientation" save="False" custom-layout="True"/>
-          <property id="attr-orientation" _name="Orientation column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-orientation" name="Orientation column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-orientation" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5195,12 +5193,12 @@
           </property>
           
           <property id="pulse" save="False" custom-layout="True"/>
-          <property id="attr-pulse" _name="Pulse column" save="False" default="-1" custom-layout="True">
+          <property id="attr-pulse" name="Pulse column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-pulse" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5209,12 +5207,12 @@
           </property>
           
           <property id="text" save="False" custom-layout="True"/>
-          <property id="attr-text" _name="Text column" save="False" default="-1" custom-layout="True">
+          <property id="attr-text" name="Text column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-text" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5223,13 +5221,13 @@
           </property>
           
           <property id="text-xalign" save="False" custom-layout="True"/>
-          <property id="attr-text-xalign" _name="Text Horizontal Alignment column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-text-xalign" name="Text Horizontal Alignment column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-text-xalign" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5238,13 +5236,13 @@
           </property>
           
           <property id="text-yalign" save="False" custom-layout="True"/>
-          <property id="attr-text-yalign" _name="Text Vertical Alignment column" save="False" 
-                 default="-1" custom-layout="True">
+          <property id="attr-text-yalign" name="Text Vertical Alignment column" save="False"
+                    default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-text-yalign" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5253,12 +5251,12 @@
           </property>
           
           <property id="value" save="False" custom-layout="True"/>
-          <property id="attr-value" _name="Value column" save="False" default="-1" custom-layout="True">
+          <property id="attr-value" name="Value column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-value" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5267,12 +5265,12 @@
           </property>
           
           <property id="inverted" save="False" custom-layout="True"/>
-          <property id="attr-inverted" _name="Inverted column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-inverted" name="Inverted column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-inverted" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5282,16 +5280,16 @@
           
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRendererSpinner" generic-name="cellrendererspinner" _title="Spinner 
Renderer" since="2.20">
+
+      <glade-widget-class name="GtkCellRendererSpinner" generic-name="cellrendererspinner" title="Spinner 
Renderer" since="2.20">
         <properties>
           <property id="active" save="False" custom-layout="True"/>
-          <property id="attr-active" _name="Active column" save="False" default="-1" custom-layout="True">
+          <property id="attr-active" name="Active column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-active" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5300,12 +5298,12 @@
           </property>
           
           <property id="pulse" save="False" custom-layout="True"/>
-          <property id="attr-pulse" _name="Pulse column" save="False" default="-1" custom-layout="True">
+          <property id="attr-pulse" name="Pulse column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-pulse" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5314,12 +5312,12 @@
           </property>
           
           <property id="size" save="False" custom-layout="True"/>
-          <property id="attr-size" _name="Icon Size" save="False" default="-1" custom-layout="True">
+          <property id="attr-size" name="Icon Size" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-size" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5329,16 +5327,16 @@
           
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkCellRendererToggle" generic-name="cellrenderertoggle" _title="Toggle 
Renderer">
+
+      <glade-widget-class name="GtkCellRendererToggle" generic-name="cellrenderertoggle" title="Toggle 
Renderer">
         <properties>
           <property id="activatable" save="False" custom-layout="True"/>
-          <property id="attr-activatable" _name="Activatable column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-activatable" name="Activatable column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-activatable" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5347,12 +5345,12 @@
           </property>
           
           <property id="active" save="False" custom-layout="True"/>
-          <property id="attr-active" _name="Active column" save="False" default="-1" custom-layout="True">
+          <property id="attr-active" name="Active column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-active" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5361,12 +5359,12 @@
           </property>
           
           <property id="inconsistent" save="False" custom-layout="True"/>
-          <property id="attr-inconsistent" _name="Inconsistent column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-inconsistent" name="Inconsistent column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-inconsistent" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5375,12 +5373,12 @@
           </property>
           
           <property id="indicator-size" save="False" custom-layout="True"/>
-          <property id="attr-indicator-size" _name="Indicator Size column" save="False" default="-1" 
custom-layout="True">
+          <property id="attr-indicator-size" name="Indicator Size column" save="False" default="-1" 
custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-indicator-size" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5389,12 +5387,12 @@
           </property>
           
           <property id="radio" save="False" custom-layout="True"/>
-          <property id="attr-radio" _name="Radio column" save="False" default="-1" custom-layout="True">
+          <property id="attr-radio" name="Radio column" save="False" default="-1" custom-layout="True">
             <parameter-spec>
               <type>GParamInt</type>
               <min>-1</min>
             </parameter-spec>
-            <_tooltip>The column in the model to load the value from</_tooltip>
+            <tooltip>The column in the model to load the value from</tooltip>
           </property>
           <property id="use-attr-radio" default="True" save="False" visible="False">
             <parameter-spec>
@@ -5403,8 +5401,8 @@
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkStatusIcon" generic-name="statusicon" _title="Status Icon" 
toplevel="True">
+
+      <glade-widget-class name="GtkStatusIcon" generic-name="statusicon" title="Status Icon" toplevel="True">
         <properties>
           <property id="visible" default="False"/>
           <property id="screen" disabled="True"/>
@@ -5414,8 +5412,8 @@
           <property id="tooltip-markup" since="2.16" translatable="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTextBuffer" generic-name="textbuffer" _title="Text Buffer" 
toplevel="True">
+
+      <glade-widget-class name="GtkTextBuffer" generic-name="textbuffer" title="Text Buffer" toplevel="True">
         <post-create-function>glade_gtk_text_buffer_post_create</post-create-function>
         <set-property-function>glade_gtk_text_buffer_set_property</set-property-function>
         <signals>
@@ -5426,9 +5424,9 @@
           <property id="text" translatable="True" multiline="True"/>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkEntryBuffer" generic-name="entrybuffer" _title="Entry Buffer" 
-                       toplevel="True" since="2.18">
+
+      <glade-widget-class name="GtkEntryBuffer" generic-name="entrybuffer" title="Entry Buffer"
+                          toplevel="True" since="2.18">
         <post-create-function>glade_gtk_entry_buffer_post_create</post-create-function>
         <set-property-function>glade_gtk_entry_buffer_set_property</set-property-function>
         <properties>
@@ -5436,7 +5434,7 @@
         </properties>
       </glade-widget-class>
 
-      <glade-widget-class name="GtkTextTag" generic-name="texttag" _title="Text Tag" >
+      <glade-widget-class name="GtkTextTag" generic-name="texttag" title="Text Tag" >
         <properties>
           <property id="background-gdk" default="White" deprecated="True" optional="True" 
optional-default="False"/>
           <property id="foreground-gdk" default="Black" deprecated="True" optional="True" 
optional-default="False"/>
@@ -5478,18 +5476,18 @@
           <property id="direction">
             <displayable-values>
               <!-- GtkTextDirection enumeration value -->
-              <value id="GTK_TEXT_DIR_NONE" _name="None"/>
+              <value id="GTK_TEXT_DIR_NONE" name="None"/>
               <!-- GtkTextDirection enumeration value -->
-              <value id="GTK_TEXT_DIR_LTR" _name="Left to Right"/>
+              <value id="GTK_TEXT_DIR_LTR" name="Left to Right"/>
               <!-- GtkTextDirection enumeration value -->
-              <value id="GTK_TEXT_DIR_RTL" _name="Right to Left"/>
+              <value id="GTK_TEXT_DIR_RTL" name="Right to Left"/>
             </displayable-values>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkTextTagTable" generic-name="texttagtable" _title="Text Tag Table" 
-                       toplevel="True">
+
+      <glade-widget-class name="GtkTextTagTable" generic-name="texttagtable" title="Text Tag Table"
+                          toplevel="True">
         <add-child-verify-function>glade_gtk_text_tag_table_add_verify</add-child-verify-function>
         <add-child-function>glade_gtk_text_tag_table_add_child</add-child-function>
         <remove-child-function>glade_gtk_text_tag_table_remove_child</remove-child-function> 
@@ -5498,74 +5496,74 @@
         <special-child-type>tag</special-child-type>
         
         <actions>
-          <action id="launch_editor" _name="Edit&#8230;" stock="gtk-edit" important="True"/>
+          <action id="launch_editor" name="Edit&#8230;" stock="gtk-edit" important="True"/>
         </actions>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkFileFilter" generic-name="filefilter" _title="File Filter" 
-                       toplevel="True">
+
+      <glade-widget-class name="GtkFileFilter" generic-name="filefilter" title="File Filter"
+                          toplevel="True">
         
<create-editor-property-function>glade_gtk_recent_file_filter_create_eprop</create-editor-property-function>
         
<string-from-value-function>glade_gtk_recent_file_filter_string_from_value</string-from-value-function>
         <read-widget-function>glade_gtk_recent_filter_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_recent_filter_write_widget</write-widget-function>
         <properties>
-          <property id="glade-mime-types" _name="Mime Types" save="False" ignore="True" since="3.0">
+          <property id="glade-mime-types" name="Mime Types" save="False" ignore="True" since="3.0">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>The list of mime types to add to the filter</_tooltip>
+            <tooltip>The list of mime types to add to the filter</tooltip>
           </property>
-          <property id="glade-patterns" _name="Patterns" save="False" ignore="True" since="3.0">
+          <property id="glade-patterns" name="Patterns" save="False" ignore="True" since="3.0">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>The list of file name patterns to add to the filter</_tooltip>
+            <tooltip>The list of file name patterns to add to the filter</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRecentFilter" generic-name="recentfilter" _title="Recent Filter" 
-                       toplevel="True">
+
+      <glade-widget-class name="GtkRecentFilter" generic-name="recentfilter" title="Recent Filter"
+                          toplevel="True">
         
<create-editor-property-function>glade_gtk_recent_file_filter_create_eprop</create-editor-property-function>
         
<string-from-value-function>glade_gtk_recent_file_filter_string_from_value</string-from-value-function>
         <read-widget-function>glade_gtk_recent_filter_read_widget</read-widget-function>
         <write-widget-function>glade_gtk_recent_filter_write_widget</write-widget-function>
         <properties>
-          <property id="glade-mime-types" _name="Mime Types" save="False" ignore="True" since="3.0">
+          <property id="glade-mime-types" name="Mime Types" save="False" ignore="True" since="3.0">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>The list of mime types to add to the filter</_tooltip>
+            <tooltip>The list of mime types to add to the filter</tooltip>
           </property>
-          <property id="glade-patterns" _name="Patterns" save="False" ignore="True" since="3.0">
+          <property id="glade-patterns" name="Patterns" save="False" ignore="True" since="3.0">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>The list of file name patterns to add to the filter</_tooltip>
+            <tooltip>The list of file name patterns to add to the filter</tooltip>
           </property>
-          <property id="glade-applications" _name="Applications" save="False" ignore="True" since="3.0">
+          <property id="glade-applications" name="Applications" save="False" ignore="True" since="3.0">
             <parameter-spec>
               <type>GParamBoxed</type>
               <value-type>GladeStringList</value-type>
             </parameter-spec>
-            <_tooltip>The list of application names to add to the filter</_tooltip>
+            <tooltip>The list of application names to add to the filter</tooltip>
           </property>
         </properties>
       </glade-widget-class>
-      
-      <glade-widget-class name="GtkRecentManager" generic-name="recentmanager" _title="Recent Manager" 
-                       toplevel="True"/>
 
-      <glade-widget-class name="GThemedIcon" generic-name="themedicon" _title="Themed Icon" toplevel="True"/>
-      <glade-widget-class name="GFileIcon" generic-name="fileicon" _title="File Icon" toplevel="True"/>
+      <glade-widget-class name="GtkRecentManager" generic-name="recentmanager" title="Recent Manager"
+                          toplevel="True"/>
+
+      <glade-widget-class name="GThemedIcon" generic-name="themedicon" title="Themed Icon" toplevel="True"/>
+      <glade-widget-class name="GFileIcon" generic-name="fileicon" title="File Icon" toplevel="True"/>
 
     </glade-widget-classes>
-    
-    <glade-widget-group name="gtk-toplevels" _title="Toplevels">
+
+    <glade-widget-group name="gtk-toplevels" title="Toplevels">
       <glade-widget-class-ref name="GtkWindow"/>
       <glade-widget-class-ref name="GtkOffscreenWindow"/>
       <glade-widget-class-ref name="GtkApplicationWindow"/>
@@ -5579,8 +5577,8 @@
       <glade-widget-class-ref name="GtkAssistant"/>
       <glade-widget-class-ref name="GtkAppChooserDialog"/>
     </glade-widget-group>
-    
-    <glade-widget-group name="gtk-containers" _title="Containers">
+
+    <glade-widget-group name="gtk-containers" title="Containers">
       <glade-widget-class-ref name="GladeInstantiableGtkBin"/>
       <glade-widget-class-ref name="GtkBox"/>
       <glade-widget-class-ref name="GtkGrid"/>
@@ -5611,8 +5609,8 @@
       <glade-widget-class-ref name="GtkPopoverMenu"/>
       <glade-widget-class-ref name="GtkActionBar" />
     </glade-widget-group>
-    
-    <glade-widget-group name="gtk-control" _title="Control">
+
+    <glade-widget-group name="gtk-control" title="Control">
       
       <glade-widget-class-ref name="GtkButton"/>
       <glade-widget-class-ref name="GtkEntry"/>
@@ -5646,7 +5644,7 @@
 
     </glade-widget-group>
 
-    <glade-widget-group name="gtk-display" _title="Display">
+    <glade-widget-group name="gtk-display" title="Display">
       <glade-widget-class-ref name="GtkLabel"/>
       <glade-widget-class-ref name="GtkAccelLabel"/>
       <glade-widget-class-ref name="GtkImage"/>
@@ -5667,7 +5665,7 @@
       <glade-widget-class-ref name="GtkInfoBar"/>
     </glade-widget-group>
 
-    <glade-widget-group name="gtk-composite" _title="Composite Widgets">
+    <glade-widget-group name="gtk-composite" title="Composite Widgets">
       
       <default-palette-state expanded="False"/>
       <glade-widget-class-ref name="GtkColorChooserWidget"/>
@@ -5677,8 +5675,8 @@
       <glade-widget-class-ref name="GtkAppChooserWidget"/>
       <glade-widget-class-ref name="GtkPlacesSidebar"/>
     </glade-widget-group>
-    
-    <glade-widget-group name="gtk-objects" _title="Miscellaneous">
+
+    <glade-widget-group name="gtk-objects" title="Miscellaneous">
       
       <default-palette-state expanded="False"/>
       
@@ -5705,8 +5703,8 @@
       <glade-widget-class-ref name="GThemedIcon"/>
       <glade-widget-class-ref name="GFileIcon"/>
     </glade-widget-group>
-    
-    <glade-widget-group name="gtk-deprecated" _title="Deprecated">
+
+    <glade-widget-group name="gtk-deprecated" title="Deprecated">
       <default-palette-state expanded="False"/>
 
       <glade-widget-class-ref name="GtkColorSelectionDialog"/>
@@ -5721,5 +5719,5 @@
       <glade-widget-class-ref name="GtkRadioAction"/>
       <glade-widget-class-ref name="GtkRecentAction"/>
     </glade-widget-group>
-    
+
   </glade-catalog>
diff --git a/plugins/gtk+/gtkunixprint.xml.in b/plugins/gtk+/gtkunixprint.xml.in
index 98297569..f49bed8d 100644
--- a/plugins/gtk+/gtkunixprint.xml.in
+++ b/plugins/gtk+/gtkunixprint.xml.in
@@ -1,35 +1,36 @@
 <glade-catalog name="unixprint"
-              library="gladegtk"
-              icon-prefix="gtk"
-              depends="gtk+"
-              domain="glade"
-              book="gtk">
+               library="gladegtk"
+               icon-prefix="gtk"
+               depends="gtk+"
+               domain="glade"
+               book="gtk">
 
   <glade-widget-classes>
-    <glade-widget-class name="GtkPageSetupUnixDialog" generic-name="pagesetupdialog" _title="Page Setup 
Dialog"/>
-    <glade-widget-class name="GtkPrintUnixDialog" generic-name="printdialog" _title="Print Dialog">
+
+    <glade-widget-class name="GtkPageSetupUnixDialog" generic-name="pagesetupdialog" title="Page Setup 
Dialog"/>
+    <glade-widget-class name="GtkPrintUnixDialog" generic-name="printdialog" title="Print Dialog">
       <properties>
         <property id="page-setup" disabled="True"/>
         <property id="manual-capabilities">
-         <displayable-values>
-           <value id="GTK_PRINT_CAPABILITY_PAGE_SET" _name="Page Set"/>
-           <value id="GTK_PRINT_CAPABILITY_COPIES" _name="Copies"/>
-           <value id="GTK_PRINT_CAPABILITY_COLLATE" _name="Collate"/>
-           <value id="GTK_PRINT_CAPABILITY_REVERSE" _name="Reverse"/>
-           <value id="GTK_PRINT_CAPABILITY_SCALE" _name="Scale"/>
-           <value id="GTK_PRINT_CAPABILITY_GENERATE_PDF" _name="Generate PDF"/>
-           <value id="GTK_PRINT_CAPABILITY_GENERATE_PS" _name="Generate PS"/>
-           <value id="GTK_PRINT_CAPABILITY_PREVIEW" _name="Preview"/>
-           <value id="GTK_PRINT_CAPABILITY_NUMBER_UP" _name="Number Up"/>
-           <value id="GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT" _name="Number Up Layout"/>
-         </displayable-values>
-       </property>
+          <displayable-values>
+            <value id="GTK_PRINT_CAPABILITY_PAGE_SET" name="Page Set"/>
+            <value id="GTK_PRINT_CAPABILITY_COPIES" name="Copies"/>
+            <value id="GTK_PRINT_CAPABILITY_COLLATE" name="Collate"/>
+            <value id="GTK_PRINT_CAPABILITY_REVERSE" name="Reverse"/>
+            <value id="GTK_PRINT_CAPABILITY_SCALE" name="Scale"/>
+            <value id="GTK_PRINT_CAPABILITY_GENERATE_PDF" name="Generate PDF"/>
+            <value id="GTK_PRINT_CAPABILITY_GENERATE_PS" name="Generate PS"/>
+            <value id="GTK_PRINT_CAPABILITY_PREVIEW" name="Preview"/>
+            <value id="GTK_PRINT_CAPABILITY_NUMBER_UP" name="Number Up"/>
+            <value id="GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT" name="Number Up Layout"/>
+          </displayable-values>
+        </property>
       </properties>
     </glade-widget-class>
 
   </glade-widget-classes>
-  
-  <glade-widget-group name="unixprint-toplevels" _title="GTK+ Unix Print Toplevels">
+
+  <glade-widget-group name="unixprint-toplevels" title="GTK+ Unix Print Toplevels">
     <glade-widget-class-ref name="GtkPageSetupUnixDialog"/>
     <glade-widget-class-ref name="GtkPrintUnixDialog"/>
   </glade-widget-group>
diff --git a/plugins/webkit2gtk/Makefile.am b/plugins/webkit2gtk/Makefile.am
index 30d20b44..9a46901a 100644
--- a/plugins/webkit2gtk/Makefile.am
+++ b/plugins/webkit2gtk/Makefile.am
@@ -31,10 +31,10 @@ endif
 # catalog data
 catalogsdir = $(pkgdatadir)/catalogs
 
-catalogs_DATA = webkit2gtk.xml
+catalogs_in_files = webkit2gtk.xml.in
 
-@INTLTOOL_XML_NOMERGE_RULE@
+catalogs_DATA = $(catalogs_in_files:.xml.in=.xml)
 
-EXTRA_DIST = webkit2gtk.xml webkit2gtk.xml.in
+EXTRA_DIST =  $(catalogs_in_files) $(catalog_DATA)
 
-CLEANFILES = webkit2gtk.xml
\ No newline at end of file
+CLEANFILES = $(catalog_DATA)
diff --git a/po/.gitignore b/po/.gitignore
index 7614a910..76d14b09 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -5,7 +5,6 @@
 /Makefile.in.in
 /POTFILES
 /stamp-it
-/.intltool-merge-cache
 
 /Makevars.template
 /Rules-quot
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..14dbec39
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,80 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+XGETTEXT := env GETTEXTDATADIRS="$(top_srcdir)/data/gettext" $(XGETTEXT)
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 
--keyword=g_dngettext:2,3 --add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Glade contributors
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/glade/issues
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = yes
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 356194c0..b846a0ba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 # List of source files containing translatable strings.
 
 # Main application
@@ -6,10 +5,10 @@ data/glade.desktop.in.in
 data/glade.appdata.xml.in
 src/glade-window.c
 src/main.c
-[type: gettext/glade]src/glade.glade
-[type: gettext/glade]src/glade-preferences.glade
+src/glade.glade
+src/glade-preferences.glade
 src/glade-registration.c
-[type: gettext/glade]src/glade-registration.glade
+src/glade-registration.glade
 
 # libgladeui shared core library
 gladeui/glade-app.c
@@ -50,10 +49,10 @@ gladeui/glade-widget-adaptor.c
 gladeui/glade-widget.c
 gladeui/glade-xml-utils.c
 gladeui/icon-naming-spec.c
-[type: gettext/glade]gladeui/glade-adaptor-chooser.ui
-[type: gettext/glade]gladeui/glade-editor.ui
-[type: gettext/glade]gladeui/glade-project-properties.ui
-[type: gettext/glade]gladeui/glade-property-label.ui
+gladeui/glade-adaptor-chooser.ui
+gladeui/glade-editor.ui
+gladeui/glade-project-properties.ui
+gladeui/glade-property-label.ui
 
 # gtk plugin backend
 plugins/gtk+/glade-about-dialog-editor.c
@@ -192,56 +191,57 @@ plugins/gtk+/glade-widget-editor.c
 plugins/gtk+/glade-window-editor.c
 plugins/gtk+/gtkunixprint.xml.in
 plugins/gtk+/gtk+.xml.in
-[type: gettext/glade]plugins/gtk+/glade-about-dialog-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-action-bar-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-action-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-activatable-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-app-chooser-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-app-chooser-widget-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-arrow-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-box-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-combo-box-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-combo-box-text-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-entry-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-file-chooser-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-file-chooser-dialog-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-file-chooser-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-file-chooser-widget-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-font-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-font-chooser-dialog-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-font-chooser-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-grid-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-header-bar-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-icon-view-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-image-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-label-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-layout-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-level-bar-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-message-dialog-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-misc-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-model-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-notebook-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-popover-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-popover-menu-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-progress-bar-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-real-tree-view-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-recent-action-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-recent-chooser-dialog-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-recent-chooser-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-recent-chooser-menu-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-recent-chooser-widget-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-scale-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-scale-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-scrollable-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-scrollbar-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-scrolled-window-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-spin-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-stack-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-stack-switcher-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-text-view-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-tool-button-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-tool-palette-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-viewport-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-widget-editor.ui
-[type: gettext/glade]plugins/gtk+/glade-window-editor.ui
+plugins/gtk+/glade-about-dialog-editor.ui
+plugins/gtk+/glade-action-bar-editor.ui
+plugins/gtk+/glade-action-editor.ui
+plugins/gtk+/glade-activatable-editor.ui
+plugins/gtk+/glade-app-chooser-button-editor.ui
+plugins/gtk+/glade-app-chooser-widget-editor.ui
+plugins/gtk+/glade-arrow-editor.ui
+plugins/gtk+/glade-box-editor.ui
+plugins/gtk+/glade-button-editor.ui
+plugins/gtk+/glade-combo-box-editor.ui
+plugins/gtk+/glade-combo-box-text-editor.ui
+plugins/gtk+/glade-entry-editor.ui
+plugins/gtk+/glade-file-chooser-button-editor.ui
+plugins/gtk+/glade-file-chooser-dialog-editor.ui
+plugins/gtk+/glade-file-chooser-editor.ui
+plugins/gtk+/glade-file-chooser-widget-editor.ui
+plugins/gtk+/glade-font-button-editor.ui
+plugins/gtk+/glade-font-chooser-dialog-editor.ui
+plugins/gtk+/glade-font-chooser-editor.ui
+plugins/gtk+/glade-grid-editor.ui
+plugins/gtk+/glade-header-bar-editor.ui
+plugins/gtk+/glade-icon-view-editor.ui
+plugins/gtk+/glade-image-editor.ui
+plugins/gtk+/glade-label-editor.ui
+plugins/gtk+/glade-layout-editor.ui
+plugins/gtk+/glade-level-bar-editor.ui
+plugins/gtk+/glade-message-dialog-editor.ui
+plugins/gtk+/glade-misc-editor.ui
+plugins/gtk+/glade-model-button-editor.ui
+plugins/gtk+/glade-notebook-editor.ui
+plugins/gtk+/glade-popover-editor.ui
+plugins/gtk+/glade-popover-menu-editor.ui
+plugins/gtk+/glade-progress-bar-editor.ui
+plugins/gtk+/glade-real-tree-view-editor.ui
+plugins/gtk+/glade-recent-action-editor.ui
+plugins/gtk+/glade-recent-chooser-dialog-editor.ui
+plugins/gtk+/glade-recent-chooser-editor.ui
+plugins/gtk+/glade-recent-chooser-menu-editor.ui
+plugins/gtk+/glade-recent-chooser-widget-editor.ui
+plugins/gtk+/glade-scale-button-editor.ui
+plugins/gtk+/glade-scale-editor.ui
+plugins/gtk+/glade-scrollable-editor.ui
+plugins/gtk+/glade-scrollbar-editor.ui
+plugins/gtk+/glade-scrolled-window-editor.ui
+plugins/gtk+/glade-spin-button-editor.ui
+plugins/gtk+/glade-stack-editor.ui
+plugins/gtk+/glade-stack-switcher-editor.ui
+plugins/gtk+/glade-text-view-editor.ui
+plugins/gtk+/glade-tool-button-editor.ui
+plugins/gtk+/glade-tool-palette-editor.ui
+plugins/gtk+/glade-viewport-editor.ui
+plugins/gtk+/glade-widget-editor.ui
+plugins/gtk+/glade-window-editor.ui
+plugins/webkit2gtk/webkit2gtk.xml.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9a1919e3..7113552b 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,4 @@
+# List of source files to skip.
+
+# Main application
 data/glade.desktop.in
-# distcheck will fail if we do not explicitly skip this because a bug in intltool
-# https://bugs.launchpad.net/intltool/+bug/1117944
-sub/data/glade.desktop.in
-tests/toplevel_order_test5.glade
-tests/toplevel_order_test6.glade


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]