diff --git a/ChangeLog b/ChangeLog
index 310508bbd..efe36ea1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-10  Mike Kestner  <mkestner@ximian.com>
+
+	* gtk/Gtk.metadata : hide some ctors and map some prop names.
+	* gtk/Makefile.am : add new customs.
+	* gtk/ItemFactory.custom : implement ctor for subclassing.
+	* gtk/Plug.custom : implement ctors for subclassing.
+
 2004-05-07  Todd Berman  <tberman@sevenl.net>
 
 	* gnome/Makefile.am: add DruidPageEdge.custom
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index b924d2f05..aa7203da1 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -112,10 +112,16 @@
   <attr path="/api/namespace/object[@cname='GtkHScrollbar']/constructor[@cname='gtk_hscrollbar_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_label']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_animation']/*/*[@name='animation']" name="property_name">pixbuf_animation</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_file']/*/*[@name='filename']" name="property_name">file</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_icon_set']/*/*[@name='icon_set']" name="property_name">icon_set</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_icon_set']/*/*[@name='size']" name="property_name">icon_size</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_stock']/*/*[@name='stock_id']" name="property_name">stock</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/constructor[@cname='gtk_image_new_from_stock']/*/*[@name='size']" name="property_name">icon_size</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromPixmap']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkIMContext']/signal[@name='DeleteSurrounding']" name="name">SurroundingDeleted</attr>
   <attr path="/api/namespace/object[@cname='GtkInvisible']/property[@name='Screen']" name="new_flag">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkItemFactory']/constructor[@cname='gtk_item_factory_new']/*/*[@type='GtkAccelGroup*']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkItemFactory']/constructor[@cname='gtk_item_factory_new']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkItemFactory']/method[@name='GetItemByAction']" name="name">GetItem</attr>
   <attr path="/api/namespace/object[@cname='GtkItemFactory']/method[@name='GetWidgetByAction']" name="name">GetWidget</attr>
   <attr path="/api/namespace/object[@cname='GtkItem']/signal[@name='Deselect']" name="name">Deselected</attr>
@@ -156,6 +162,8 @@
   <attr path="/api/namespace/object[@cname='GtkObject']/signal[@name='Destroy']" name="name">Destroyed</attr>
   <attr path="/api/namespace/object[@cname='GtkPixmap']/constructor[@cname='gtk_pixmap_new']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkPixmap']/method[@name='Set']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new_for_display']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkProgressBar']/constructor[@cname='gtk_progress_bar_new_with_adjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GtkProgressBar']" name="parent">GtkWidget</attr>
   <attr path="/api/namespace/object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new']" name="hidden">1</attr>
@@ -182,6 +190,7 @@
   <attr path="/api/namespace/object[@cname='GtkTable']/method[@name='SetColSpacings']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/method[@name='SetRowSpacings']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTextBuffer']/constructor[@cname='gtk_text_buffer_new']/*/*[@type='GtkTextTagTable*']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkTextBuffer']/constructor[@cname='gtk_text_buffer_new']/*/*[@type='GtkTextTagTable*']" name="property_name">tag_table</attr>
   <attr path="/api/namespace/object[@cname='GtkTextBuffer']/method[@name='ApplyTagByName']" name="name">ApplyTag</attr>
   <attr path="/api/namespace/object[@cname='GtkTextBuffer']/method[@name='DeleteMarkByName']" name="name">DeleteMark</attr>
   <attr path="/api/namespace/object[@cname='GtkTextBuffer']/method[@name='GetBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
diff --git a/gtk/ItemFactory.custom b/gtk/ItemFactory.custom
new file mode 100644
index 000000000..d1b032419
--- /dev/null
+++ b/gtk/ItemFactory.custom
@@ -0,0 +1,21 @@
+// Gtk.ItemFactory.custom - Gtk ItemFactory class customizations
+//
+// Author: Mike Kestner <mkestner@ximian.com> 
+//
+// Copyright (C) 2004 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+		
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		static extern IntPtr gtk_item_factory_new(IntPtr container_type, string path, IntPtr accel_group);
+
+		public ItemFactory (GLib.GType container_type, string path, Gtk.AccelGroup accel_group) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (ItemFactory)) {
+				CreateNativeObject (new string [0], new GLib.Value [0]);
+				Construct (container_type, path, accel_group);
+				return;
+			}
+			Raw = gtk_item_factory_new(container_type.Val, path, (accel_group != null) ? accel_group.Handle : IntPtr.Zero);
+		}
+
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 43c10aee1..2d6a97902 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -48,6 +48,7 @@ customs = 				\
 	IconFactory.custom		\
 	IconSet.custom			\
 	ImageMenuItem.custom		\
+	ItemFactory.custom		\
 	Label.custom			\
 	Layout.custom			\
 	ListStore.custom		\
@@ -56,6 +57,7 @@ customs = 				\
 	Notebook.custom			\
 	Object.custom			\
 	Paned.custom			\
+	Plug.custom			\
 	RadioButton.custom		\
 	RadioMenuItem.custom		\
 	ScrolledWindow.custom		\
diff --git a/gtk/Plug.custom b/gtk/Plug.custom
new file mode 100644
index 000000000..3e0c7ef1f
--- /dev/null
+++ b/gtk/Plug.custom
@@ -0,0 +1,34 @@
+// Gtk.Plug.custom - Gtk Plug class customizations
+//
+// Author: Mike Kestner <mkestner@ximian.com> 
+//
+// Copyright (C) 2004 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+		
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		static extern IntPtr gtk_plug_new(uint socket_id);
+
+		public Plug (uint socket_id) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (Plug)) {
+				CreateNativeObject (new string [0], new GLib.Value [0]);
+				Construct (socket_id);
+				return;
+			}
+			Raw = gtk_plug_new(socket_id);
+		}
+
+		[DllImport("libgtk-win32-2.0-0.dll")]
+		static extern IntPtr gtk_plug_new_for_display(IntPtr display, uint socket_id);
+
+		public Plug (Gdk.Display display, uint socket_id) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (Plug)) {
+				CreateNativeObject (new string [0], new GLib.Value [0]);
+				ConstructForDisplay (display, socket_id);
+				return;
+			}
+			Raw = gtk_plug_new_for_display(display.Handle, socket_id);
+		}
+