diff --git a/ChangeLog b/ChangeLog
index 8d97d6669..9ced67d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-22  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* gtk/Gtk.metadata: Added metadata from sources/Gtk.metadata
+	* gtk/gtk-api.xml: Reflects changes of the metadata move, 
+	  tags are swapped around.
+	* gtkhtml/Gtk.metadata: Added metadata from sources/Gtk.metadata
+	* gtkhtml/gtkhtml-api.xml: Reflects changes of the metadata move, 
+	  tags are swapped around.
+	* sources/Gtk.metadata: Removed metadata, which are moved to 
+	  gtk/Gtk.metadata and gtkhtml/Gtk.metadata
+
 2003-10-22  Mike Kestner  <mkestner@ximian.com>
 
 	* gtkhtml/gtkhtml-api.xml : regenerated
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 59cf22028..de765511d 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
 <metadata>
   <attr path="//callback[@cname='GtkClipboardGetFunc']/*/*[@type='GtkSelectionData*']" name="pass_as">ref</attr>
+  <attr path="//interface[@cname='GtkEditable']/method[@name='GetEditable']" name="name">GetIsEditable</attr>
+  <attr path="//interface[@cname='GtkEditable']/method[@name='SetEditable']" name="name">SetIsEditable</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='InsertText']/*/*[@name='position']" name="pass_as">ref</attr>
+  <attr path="//interface[@cname='GtkEditable']/signal[@name='InsertText']" name="name">TextInserted</attr>
+  <attr path="//interface[@cname='GtkEditable']/signal[@name='DeleteText']" name="name">TextDeleted</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIter']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFirst']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFromString']/*/*[@name='iter']" name="pass_as">out</attr>
@@ -10,11 +14,37 @@
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNthChild']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterParent']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkButton']/constructor[@cname='gtk_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkButton']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GtkButton']/signal[@name='Enter']" name="name">Entered</attr>
+  <attr path="//object[@cname='GtkButton']/signal[@name='Leave']" name="name">Left</attr>
+  <attr path="//object[@cname='GtkButton']/method[@name='Clicked']" name="name">Click</attr>
+  <attr path="//object[@cname='GtkButton']/method[@name='Pressed']" name="name">Press</attr>
+  <attr path="//object[@cname='GtkButton']/method[@name='Released']" name="name">Release</attr>
   <attr path="//object[@cname='GtkCheckButton']/constructor[@cname='gtk_check_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkContainer']/signal[@name='Add']" name="name">Added</attr>
+  <attr path="//object[@cname='GtkContainer']/signal[@name='Remove']" name="name">Removed</attr>
+  <attr path="//object[@cname='GtkContainer']/signal[@name='SetFocusChild']" name="name">FocusChildSet</attr>
+  <attr path="//object[@cname='GtkEntry']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GtkEntry']/signal[@name='PasteClipboard']" name="name">ClipboardPasted</attr>
+  <attr path="//object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr>
+  <attr path="//object[@cname='GtkEntry']/signal[@name='CopyClipboard']" name="name">ClipboardCopied</attr>
   <attr path="//object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkIMContext']/signal[@name='DeleteSurrounding']" name="name">SurroundingDeleted</attr>
+  <attr path="//object[@cname='GtkItem']/signal[@name='Select']" name="name">Selected</attr>
+  <attr path="//object[@cname='GtkItem']/signal[@name='Deselect']" name="name">Deselected</attr>
+  <attr path="//object[@cname='GtkItem']/signal[@name='Toggle']" name="name">Toggled</attr>
   <attr path="//object[@cname='GtkLabel']/constructor[@cname='gtk_label_new']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkMenuItem']/constructor[@cname='gtk_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='Deactivate']" name="name">Deactivated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ToggleSizeRequest']" name="name">ToggleSizeRequested</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ToggleSizeAllocate']" name="name">ToggleSizeAllocated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='SizeAllocate']" name="name">SizeAllocated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
   <attr path="//object[@cname='GtkListStore']/constructor[@cname='gtk_list_store_newv']/parameters" name="va_type">length_param</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
@@ -37,10 +67,20 @@
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetSelectionBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetStartIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetInsert']" name="name">GetInsertMark</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='ApplyTag']" name="name">TagApplied</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='InsertChildAnchor']" name="name">ChildAnchorInserted</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='InsertPixbuf']" name="name">PixbufInserted</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveTag']" name="name">TagRemoved</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveChildAnchor']" name="name">ChildAnchorRemoved</attr>
   <attr path="//object[@cname='GtkTextLayout']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextTag']/method[@name='Event']" name="name">ProcessEvent</attr>
+  <attr path="//object[@cname='GtkTextTag']/signal[@name='Event']" name="name">TextEvent</attr>
+  <attr path="//object[@cname='GtkTextTag']/property[@name='Weight']" name="type">PangoWeight</attr>
   <attr path="//object[@cname='GtkTextView']/method[@name='GetIterAtLocation']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextView']/method[@name='GetLineAtY']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkToggleButton']/constructor[@cname='gtk_toggle_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkToggleButton']/method[@name='Toggled']" name="name">Toggle</attr>
   <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertChildIterToIter']/*/*[@name='sort_iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertIterToChildIter']/*/*[@name='child_iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeSelection']/method[@name='GetSelected']/*/*" name="pass_as">out</attr>
@@ -60,10 +100,27 @@
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='pos']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='path']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='ClassPath']/*/*[@type='gchar**']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='Event']" name="name">ProcessEvent</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Intersect']/*/*[@name='intersection']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='IsFocus']" name="name">GetIsFocus</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Path']/*/*[@type='gchar**']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='SizeRequest']/*/*[@name='requisition']" name="pass_as">ref</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Event']" name="name">WidgetEvent</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Focus']" name="name">Focused</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='GrabFocus']" name="name">FocusGrabbed</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Hide']" name="name">Hidden</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Map']" name="name">Mapped</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Realize']" name="name">Realized</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Show']" name="name">Shown</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='ShowHelp']" name="name">HelpShown</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='SizeAllocate']" name="name">SizeAllocated</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Unmap']" name="name">Unmapped</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Unrealize']" name="name">Unrealized</attr>
   <attr path="//struct[@cname='GtkTargetEntry']/field[@cname='flags']" name="type">GtkTargetFlags</attr>
+  <attr path="//class[@cname='GtkAccelerator_']/method[@name='GetDefaultModMask']/return-type" name="type">GdkModifierType</attr>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintArrow']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBox']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBoxGap']">//object[@cname='GtkStyle']</move-node>
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index de585d585..85cfa327a 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -855,7 +855,7 @@
       </method>
     </interface>
     <interface name="Editable" cname="GtkEditable">
-      <signal name="TextInserted" cname="insert_text" when="LAST">
+      <signal cname="insert_text" when="LAST" name="TextInserted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEditable*" name="editable" />
@@ -864,7 +864,7 @@
           <parameter type="gint*" name="position" />
         </parameters>
       </signal>
-      <signal name="TextDeleted" cname="delete_text" when="LAST">
+      <signal cname="delete_text" when="LAST" name="TextDeleted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEditable*" name="editable" />
@@ -901,7 +901,7 @@
           <parameter type="gint" name="end_pos" />
         </parameters>
       </method>
-      <method name="GetIsEditable" cname="gtk_editable_get_editable">
+      <method cname="gtk_editable_get_editable" name="GetIsEditable">
         <return-type type="gboolean" />
       </method>
       <method name="GetPosition" cname="gtk_editable_get_position">
@@ -935,7 +935,7 @@
           <parameter type="gint" name="end" />
         </parameters>
       </method>
-      <method name="SetIsEditable" cname="gtk_editable_set_editable">
+      <method cname="gtk_editable_set_editable" name="SetIsEditable">
         <return-type type="void" />
         <parameters>
           <parameter type="gboolean" name="is_editable" />
@@ -1642,19 +1642,19 @@
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Entered" cname="enter" when="FIRST">
+      <signal cname="enter" when="FIRST" name="Entered">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Left" cname="leave" when="FIRST">
+      <signal cname="leave" when="FIRST" name="Left">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
         </parameters>
       </signal>
-      <signal name="Activated" cname="activate" when="FIRST">
+      <signal cname="activate" when="FIRST" name="Activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkButton*" name="button" />
@@ -1663,7 +1663,7 @@
       <method name="ActionGetType" cname="gtk_button_action_get_type" shared="true">
         <return-type type="GType" />
       </method>
-      <method name="Click" cname="gtk_button_clicked">
+      <method cname="gtk_button_clicked" name="Click">
         <return-type type="void" />
       </method>
       <method name="Enter" cname="gtk_button_enter">
@@ -1703,10 +1703,10 @@
           <parameter type="const-gchar*" name="label" />
         </parameters>
       </constructor>
-      <method name="Press" cname="gtk_button_pressed">
+      <method cname="gtk_button_pressed" name="Press">
         <return-type type="void" />
       </method>
-      <method name="Release" cname="gtk_button_released">
+      <method cname="gtk_button_released" name="Release">
         <return-type type="void" />
       </method>
       <method name="SetLabel" cname="gtk_button_set_label">
@@ -2441,14 +2441,14 @@
       <property name="ResizeMode" cname="resize_mode" type="GtkResizeMode" readable="true" writeable="true" />
       <property name="BorderWidth" cname="border_width" type="guint" readable="true" writeable="true" />
       <property name="Child" cname="child" type="GtkWidget" writeable="true" />
-      <signal name="Added" cname="add" when="FIRST">
+      <signal cname="add" when="FIRST" name="Added">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Removed" cname="remove" when="FIRST">
+      <signal cname="remove" when="FIRST" name="Removed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
@@ -2461,7 +2461,7 @@
           <parameter type="GtkContainer*" name="container" />
         </parameters>
       </signal>
-      <signal name="FocusChildSet" cname="set-focus-child" when="FIRST">
+      <signal cname="set-focus-child" when="FIRST" name="FocusChildSet">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkContainer*" name="container" />
@@ -2874,7 +2874,7 @@
           <parameter type="GtkMenu*" name="menu" />
         </parameters>
       </signal>
-      <signal name="Activated" cname="activate" when="LAST">
+      <signal cname="activate" when="LAST" name="Activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
@@ -2904,19 +2904,19 @@
           <parameter type="gint" name="count" />
         </parameters>
       </signal>
-      <signal name="ClipboardCut" cname="cut_clipboard" when="LAST">
+      <signal cname="cut_clipboard" when="LAST" name="ClipboardCut">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="ClipboardCopied" cname="copy_clipboard" when="LAST">
+      <signal cname="copy_clipboard" when="LAST" name="ClipboardCopied">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
         </parameters>
       </signal>
-      <signal name="ClipboardPasted" cname="paste_clipboard" when="LAST">
+      <signal cname="paste_clipboard" when="LAST" name="ClipboardPasted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkEntry*" name="entry" />
@@ -3703,7 +3703,7 @@
           <parameter type="GtkIMContext*" name="context" />
         </parameters>
       </signal>
-      <signal name="SurroundingDeleted" cname="delete_surrounding" when="LAST">
+      <signal cname="delete_surrounding" when="LAST" name="SurroundingDeleted">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkIMContext*" name="context" />
@@ -3865,19 +3865,19 @@
       </method>
     </object>
     <object name="Item" cname="GtkItem" parent="GtkBin">
-      <signal name="Selected" cname="select" when="FIRST">
+      <signal cname="select" when="FIRST" name="Selected">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
-      <signal name="Deselected" cname="deselect" when="FIRST">
+      <signal cname="deselect" when="FIRST" name="Deselected">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkItem*" name="item" />
         </parameters>
       </signal>
-      <signal name="Toggled" cname="toggle" when="FIRST">
+      <signal cname="toggle" when="FIRST" name="Toggled">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkItem*" name="item" />
@@ -4600,7 +4600,7 @@
       <field cname="right_justify" bits="1" type="guint" />
       <field cname="timer_from_keypress" bits="1" type="guint" />
       <field cname="timer" type="guint" />
-      <signal name="Activated" cname="activate" when="FIRST">
+      <signal cname="activate" when="FIRST" name="Activated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
@@ -4612,14 +4612,14 @@
           <parameter type="GtkMenuItem*" name="menu_item" />
         </parameters>
       </signal>
-      <signal name="ToggleSizeRequested" cname="toggle_size_request" when="FIRST">
+      <signal cname="toggle_size_request" when="FIRST" name="ToggleSizeRequested">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
           <parameter type="gint*" name="requisition" />
         </parameters>
       </signal>
-      <signal name="ToggleSizeAllocated" cname="toggle_size_allocate" when="FIRST">
+      <signal cname="toggle_size_allocate" when="FIRST" name="ToggleSizeAllocated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkMenuItem*" name="menu_item" />
@@ -6758,7 +6758,7 @@
           <parameter type="gint" name="length" />
         </parameters>
       </signal>
-      <signal name="PixbufInserted" cname="insert_pixbuf" when="LAST">
+      <signal cname="insert_pixbuf" when="LAST" name="PixbufInserted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -6766,7 +6766,7 @@
           <parameter type="GdkPixbuf*" name="pixbuf" />
         </parameters>
       </signal>
-      <signal name="ChildAnchorInserted" cname="insert_child_anchor" when="LAST">
+      <signal cname="insert_child_anchor" when="LAST" name="ChildAnchorInserted">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -6809,7 +6809,7 @@
           <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </signal>
-      <signal name="TagApplied" cname="apply_tag" when="LAST">
+      <signal cname="apply_tag" when="LAST" name="TagApplied">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -6818,7 +6818,7 @@
           <parameter type="const-GtkTextIter*" name="end_char" />
         </parameters>
       </signal>
-      <signal name="TagRemoved" cname="remove_tag" when="LAST">
+      <signal cname="remove_tag" when="LAST" name="TagRemoved">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer" />
@@ -6952,7 +6952,7 @@
           <parameter type="GtkTextIter*" name="iter" pass_as="out" />
         </parameters>
       </method>
-      <method name="GetInsertMark" cname="gtk_text_buffer_get_insert">
+      <method cname="gtk_text_buffer_get_insert" name="GetInsertMark">
         <return-type type="GtkTextMark*" />
       </method>
       <method name="GetIterAtChildAnchor" cname="gtk_text_buffer_get_iter_at_child_anchor">
@@ -7292,7 +7292,7 @@
       <property name="Family" cname="family" type="gchar*" readable="true" writeable="true" />
       <property name="Style" cname="style" type="PangoStyle" readable="true" writeable="true" />
       <property name="Variant" cname="variant" type="PangoVariant" readable="true" writeable="true" />
-      <property name="Weight" cname="weight" type="PangoWeight" readable="true" writeable="true" />
+      <property name="Weight" cname="weight" readable="true" writeable="true" type="PangoWeight" />
       <property name="Stretch" cname="stretch" type="PangoStretch" readable="true" writeable="true" />
       <property name="Size" cname="size" type="gint" readable="true" writeable="true" />
       <property name="Scale" cname="scale" type="gdouble" readable="true" writeable="true" />
@@ -7311,7 +7311,7 @@
       <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true" />
       <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true" />
       <property name="Invisible" cname="invisible" type="gboolean" readable="true" writeable="true" />
-      <signal name="TextEvent" cname="event" when="LAST">
+      <signal cname="event" when="LAST" name="TextEvent">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkTextTag*" name="tag" />
@@ -7320,7 +7320,7 @@
           <parameter type="const-GtkTextIter*" name="iter" />
         </parameters>
       </signal>
-      <method name="ProcessEvent" cname="gtk_text_tag_event">
+      <method cname="gtk_text_tag_event" name="ProcessEvent">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GObject*" name="event_object" />
@@ -7922,7 +7922,7 @@
           <parameter type="gboolean" name="draw_indicator" />
         </parameters>
       </method>
-      <method name="Toggle" cname="gtk_toggle_button_toggled">
+      <method cname="gtk_toggle_button_toggled" name="Toggle">
         <return-type type="void" />
       </method>
     </object>
@@ -9454,50 +9454,50 @@
       <property name="Style" cname="style" type="GtkStyle" readable="true" writeable="true" />
       <property name="Events" cname="events" type="GdkEventMask" readable="true" writeable="true" />
       <property name="ExtensionEvents" cname="extension_events" type="GdkExtensionMode" readable="true" writeable="true" />
-      <signal name="Shown" cname="show" when="FIRST">
+      <signal cname="show" when="FIRST" name="Shown">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Hidden" cname="hide" when="FIRST">
+      <signal cname="hide" when="FIRST" name="Hidden">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Mapped" cname="map" when="FIRST">
+      <signal cname="map" when="FIRST" name="Mapped">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Unmapped" cname="unmap" when="FIRST">
+      <signal cname="unmap" when="FIRST" name="Unmapped">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Realized" cname="realize" when="FIRST">
+      <signal cname="realize" when="FIRST" name="Realized">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Unrealized" cname="unrealize" when="LAST">
+      <signal cname="unrealize" when="LAST" name="Unrealized">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="SizeRequested" cname="size_request" when="FIRST">
+      <signal cname="size_request" when="FIRST" name="SizeRequested">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkRequisition*" name="requisition" />
         </parameters>
       </signal>
-      <signal name="SizeAllocated" cname="size_allocate" when="FIRST">
+      <signal cname="size_allocate" when="FIRST" name="SizeAllocated">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -9546,34 +9546,34 @@
           <parameter type="gboolean" name="was_grabbed" />
         </parameters>
       </signal>
-      <signal name="ChildNotified" cname="child_notify" when="FIRST">
+      <signal cname="child_notify" when="FIRST" name="ChildNotified">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GParamSpec*" name="pspec" />
         </parameters>
       </signal>
-      <signal name="MnemonicActivated" cname="mnemonic_activate" when="LAST">
+      <signal cname="mnemonic_activate" when="LAST" name="MnemonicActivated">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="gboolean" name="group_cycling" />
         </parameters>
       </signal>
-      <signal name="FocusGrabbed" cname="grab_focus" when="LAST">
+      <signal cname="grab_focus" when="LAST" name="FocusGrabbed">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="Focused" cname="focus" when="LAST">
+      <signal cname="focus" when="LAST" name="Focused">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
           <parameter type="GtkDirectionType" name="direction" />
         </parameters>
       </signal>
-      <signal name="WidgetEvent" cname="event" when="LAST">
+      <signal cname="event" when="LAST" name="WidgetEvent">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -9862,7 +9862,7 @@
           <parameter type="GtkWidget*" name="widget" />
         </parameters>
       </signal>
-      <signal name="HelpShown" cname="show_help" when="LAST">
+      <signal cname="show_help" when="LAST" name="HelpShown">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -9974,7 +9974,7 @@
       <method name="EnsureStyle" cname="gtk_widget_ensure_style">
         <return-type type="void" />
       </method>
-      <method name="ProcessEvent" cname="gtk_widget_event">
+      <method cname="gtk_widget_event" name="ProcessEvent">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GdkEvent*" name="event" />
@@ -10118,7 +10118,7 @@
           <parameter type="GtkWidget*" name="ancestor" />
         </parameters>
       </method>
-      <method name="GetIsFocus" cname="gtk_widget_is_focus">
+      <method cname="gtk_widget_is_focus" name="GetIsFocus">
         <return-type type="gboolean" />
       </method>
       <method name="ListAccelClosures" cname="gtk_widget_list_accel_closures" hidden="1">
diff --git a/gtkhtml/Gtk.metadata b/gtkhtml/Gtk.metadata
index a8e0f3048..f2a65afec 100644
--- a/gtkhtml/Gtk.metadata
+++ b/gtkhtml/Gtk.metadata
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <metadata>
+  <attr path="//object[@cname='GtkHTML']/signal[@name='Command']" name="name">OnCommand</attr>
+  <attr path="//object[@cname='GtkHTML']/method[@name='BeginContent']" name="name">Begin</attr>
+  <attr path="//object[@cname='GtkHTML']/method[@name='BeginFull']" name="name">Begin</attr>
   <attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="type">const-guchar*</attr>
   <attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="array">1</attr>
 </metadata>
diff --git a/gtkhtml/gtkhtml-api.xml b/gtkhtml/gtkhtml-api.xml
index 717453224..59adf97ce 100644
--- a/gtkhtml/gtkhtml-api.xml
+++ b/gtkhtml/gtkhtml-api.xml
@@ -433,7 +433,7 @@
           <parameter type="GtkHTMLCursorSkipType" name="skip" />
         </parameters>
       </signal>
-      <signal name="OnCommand" cname="command" when="LAST">
+      <signal cname="command" when="LAST" name="OnCommand">
         <return-type type="gboolean" />
         <parameters>
           <parameter type="GtkHTML*" name="html" />
@@ -459,13 +459,13 @@
       <method name="Begin" cname="gtk_html_begin">
         <return-type type="GtkHTMLStream*" />
       </method>
-      <method name="Begin" cname="gtk_html_begin_content">
+      <method cname="gtk_html_begin_content" name="Begin">
         <return-type type="GtkHTMLStream*" />
         <parameters>
           <parameter type="gchar*" name="content_type" />
         </parameters>
       </method>
-      <method name="Begin" cname="gtk_html_begin_full">
+      <method cname="gtk_html_begin_full" name="Begin">
         <return-type type="GtkHTMLStream*" />
         <parameters>
           <parameter type="char*" name="target_frame" />
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 3d532482e..c6e2346e9 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -2,768 +2,6 @@
 <metadata>
 
 <!-- renames -->
-<rule>
-  <class name="GtkAccelerator_">
-    <method>GetDefaultModMask</method>
-  </class>
-  <data>
-    <attribute target="return">
-      <name>type</name>
-      <value>GdkModifierType</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEditable">
-    <method>GetEditable</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetIsEditable</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEditable">
-    <method>SetEditable</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>SetIsEditable</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkContainer">
-    <signal>Add</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Added</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkContainer">
-    <signal>Remove</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Removed</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEditable">
-    <signal>InsertText</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>TextInserted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEditable">
-    <signal>DeleteText</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>TextDeleted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkIMContext">
-    <signal>DeleteSurrounding</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>SurroundingDeleted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Show</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Shown</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Hide</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Hidden</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Map</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Mapped</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Unmap</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Unmapped</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Realize</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Realized</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Unrealize</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Unrealized</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>GrabFocus</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>FocusGrabbed</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Focus</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Focused</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>SizeAllocate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>SizeAllocated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>MnemonicActivate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>MnemonicActivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>SizeRequest</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>SizeRequested</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>ChildNotify</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildNotified</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>ShowHelp</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>HelpShown</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <signal>Event</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>WidgetEvent</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextTag">
-    <signal>Event</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>TextEvent</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>IsFocus</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetIsFocus</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>Event</method>
-  </class>
-  <class name="GtkTextTag">
-    <method>Event</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>ProcessEvent</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextTag">
-    <property>Weight</property>
-  </class>
-  <data>
-    <attribute target="property">
-      <name>type</name>
-      <value>PangoWeight</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>InsertPixbuf</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>PixbufInserted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>ApplyTag</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>TagApplied</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>RemoveTag</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>TagRemoved</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>InsertChildAnchor</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildAnchorInserted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <signal>RemoveChildAnchor</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildAnchorRemoved</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <method>GetInsert</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetInsertMark</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkItem">
-    <signal>Select</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Selected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkItem">
-    <signal>Deselect</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Deselected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkItem">
-    <signal>Toggle</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Toggled</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkList">
-    <signal>SelectChild</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildSelected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkList">
-    <signal>UnselectChild</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildUnselected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCList">
-    <signal>SelectRow</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>RowSelected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCList">
-    <signal>UnselectRow</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>RowUnselected</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkTree">
-    <signal>SelectChild</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildSelected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTree">
-    <signal>UnselectChild</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildUnselected</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkTipsQuery">
-    <signal>StartQuery</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>QueryStarted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTipsQuery">
-    <signal>StopQuery</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>QueryStopped</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeItem">
-    <signal>Collapse</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Collapsed</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeItem">
-    <signal>Expand</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Expanded</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkContainer">
-    <signal>SetFocusChild</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>FocusChildSet</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEntry">
-    <signal>PasteClipboard</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ClipboardPasted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEntry">
-    <signal>CutClipboard</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ClipboardCut</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkEntry">
-    <signal>CopyClipboard</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ClipboardCopied</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkOldEditable">
-    <signal>PasteClipboard</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ClipboardPasted</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkOldEditable">
-    <signal>CutClipboard</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ClipboardCut</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkOldEditable">
-    <signal>CopyClipboard</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ClipboardCopied</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>Activate</signal>
-  </class>
-  <class name="GtkButton">
-    <signal>Activate</signal>
-  </class>
-  <class name="GtkOldEditable">
-    <signal>Activate</signal>
-  </class>
-  <class name="GtkEntry">
-    <signal>Activate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Activated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>Deactivate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Deactivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>Deactivate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Deactivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>ToggleSizeRequest</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ToggleSizeRequested</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>ToggleSizeAllocate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ToggleSizeAllocated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>RemoveWidget</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>WidgetRemoved</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>SizeAllocate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>SizeAllocated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>MnemonicActivate</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>MnemonicActivated</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>SizeRequest</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>SizeRequested</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <signal>ChildNotify</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>ChildNotified</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkToggleButton">
-    <method>Toggled</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Toggle</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkButton">
-    <method>Pressed</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Press</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkButton">
-    <method>Clicked</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Click</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkButton">
-    <method>Released</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Release</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkButton">
-    <signal>Enter</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Entered</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkButton">
-    <signal>Leave</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>Left</value>
-    </attribute>
-  </data>
-</rule>
 <rule>
   <class name="GtkMenuShell">
     <signal>Deactivate</signal>
@@ -855,18 +93,6 @@
     </attribute>
   </data>
 </rule>
-<rule>
-  <class name="GtkOldEditable">
-    <method>Changed</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Change</value>
-    </attribute>
-  </data>
-</rule>
-
 <rule>
   <class name="GtkAdjustment">
     <method>ValueChanged</method>
@@ -1044,53 +270,6 @@
   </data>
 </rule>
 <rule>
-  <class name="GtkCList">
-    <signal>RowMove</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>RowMoved</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCList">
-    <signal>SelectAll</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>AllSelected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCList">
-    <signal>UndoSelection</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>SelectionUndone</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCList">
-    <signal>UnselectAll</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>AllUnselected</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCList">
-    <signal>SetScrollAdjustments</signal>
-  </class>
   <class name="GtkLayout">
     <signal>SetScrollAdjustments</signal>
   </class>
@@ -1113,17 +292,6 @@
     </attribute>
   </data>
 </rule>
-<rule>
-  <class name="GtkHTML">
-    <signal>Command</signal>
-  </class>
-  <data>
-    <attribute target="signal">
-      <name>name</name>
-      <value>OnCommand</value>
-    </attribute>
-  </data>
-</rule>
 <rule>
   <class name="GtkCalendar">
     <method>DisplayOptions</method>
@@ -1391,28 +559,7 @@
     </attribute>
   </data>
 </rule>
-<rule>
-  <class name="GtkHTML">
-    <method>BeginContent</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Begin</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkHTML">
-    <method>BeginFull</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Begin</value>
-    </attribute>
-  </data>
-</rule>
+
 <!-- disable default constructor -->
 <rule>
   <class name="GtkScrolledWindow"/>
@@ -1427,102 +574,6 @@
 </rule>
 
 <!-- null args -->
-<rule>
-  <class name="GtkCList">
-    <method>SetPixmap</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>InsertNode</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkPixmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>InsertNode</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>Move</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkCTreeNode*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>NodeSetPixmap</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>NodeSetPixtext</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>SetNodeInfo</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkPixmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkCTree">
-    <method>SetNodeInfo</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
 <rule>
   <class name="GtkDialog">
     <constructor>gtk_dialog_new_with_buttons</constructor>